diff --git a/src/creds/abstractcredentials.h b/src/creds/abstractcredentials.h index 58612bffbc..cde85f8398 100644 --- a/src/creds/abstractcredentials.h +++ b/src/creds/abstractcredentials.h @@ -39,7 +39,6 @@ public: virtual bool ready() const = 0; virtual void fetch(Account *account) = 0; virtual bool stillValid(QNetworkReply *reply) = 0; - virtual bool fetchFromUser(Account *account) = 0; virtual void persist(Account *account) = 0; /** Invalidates auth token, or password for basic auth */ virtual void invalidateToken(Account *account) = 0; diff --git a/src/creds/dummycredentials.cpp b/src/creds/dummycredentials.cpp index 478020fe56..06c25a417a 100644 --- a/src/creds/dummycredentials.cpp +++ b/src/creds/dummycredentials.cpp @@ -56,12 +56,6 @@ bool DummyCredentials::stillValid(QNetworkReply *reply) return true; } -bool DummyCredentials::fetchFromUser(Account *account) -{ - Q_UNUSED(account) - return false; -} - void DummyCredentials::fetch(Account*) { Q_EMIT(fetched()); diff --git a/src/creds/dummycredentials.h b/src/creds/dummycredentials.h index 7c883ced4c..d9e16f3576 100644 --- a/src/creds/dummycredentials.h +++ b/src/creds/dummycredentials.h @@ -32,7 +32,6 @@ public: QNetworkAccessManager* getQNAM() const; bool ready() const; bool stillValid(QNetworkReply *reply); - bool fetchFromUser(Account *account); void fetch(Account*); void persist(Account*); void invalidateToken(Account *) {} diff --git a/src/creds/httpcredentials.cpp b/src/creds/httpcredentials.cpp index 630840ddb4..171596f5e2 100644 --- a/src/creds/httpcredentials.cpp +++ b/src/creds/httpcredentials.cpp @@ -203,18 +203,6 @@ bool HttpCredentials::stillValid(QNetworkReply *reply) && (reply->error() != QNetworkReply::OperationCanceledError)); } -bool HttpCredentials::fetchFromUser(Account *account) -{ - bool ok = false; - QString password = queryPassword(&ok); - if (ok) { - _password = password; - _ready = true; - persist(account); - } - return ok; -} - void HttpCredentials::slotReadJobDone(QKeychain::Job *job) { ReadPasswordJob *readJob = static_cast(job); diff --git a/src/creds/httpcredentials.h b/src/creds/httpcredentials.h index 8220e728d2..00bd8eef8d 100644 --- a/src/creds/httpcredentials.h +++ b/src/creds/httpcredentials.h @@ -46,7 +46,6 @@ public: bool ready() const; void fetch(Account *account); bool stillValid(QNetworkReply *reply); - bool fetchFromUser(Account *account); void persist(Account *account); QString user() const; QString password() const; diff --git a/src/creds/shibbolethcredentials.cpp b/src/creds/shibbolethcredentials.cpp index 051361e00e..babf19b022 100644 --- a/src/creds/shibbolethcredentials.cpp +++ b/src/creds/shibbolethcredentials.cpp @@ -198,12 +198,6 @@ bool ShibbolethCredentials::stillValid(QNetworkReply *reply) return true; } -bool ShibbolethCredentials::fetchFromUser(Account *account) -{ - Q_UNUSED(account) - return false; -} - void ShibbolethCredentials::persist(Account* /*account*/) { ShibbolethConfigFile cfg; diff --git a/src/creds/shibbolethcredentials.h b/src/creds/shibbolethcredentials.h index 6f53925e58..b94fcb5c8e 100644 --- a/src/creds/shibbolethcredentials.h +++ b/src/creds/shibbolethcredentials.h @@ -43,7 +43,6 @@ public: bool ready() const; void fetch(Account *account); bool stillValid(QNetworkReply *reply); - virtual bool fetchFromUser(Account *account); void persist(Account *account); void invalidateToken(Account *account);