[Pkg-owncloud-commits] [owncloud-client] 10/47: Credentials: Remove unused fetchFromUser methods

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit bee5940c4234b52e73d4dc5e506ea985a4a5df5b
Author: Daniel Molkentin <danimo at owncloud.com>
Date:   Thu Feb 6 12:55:28 2014 +0100

    Credentials: Remove unused fetchFromUser methods
---
 src/creds/abstractcredentials.h     |  1 -
 src/creds/dummycredentials.cpp      |  6 ------
 src/creds/dummycredentials.h        |  1 -
 src/creds/httpcredentials.cpp       | 12 ------------
 src/creds/httpcredentials.h         |  1 -
 src/creds/shibbolethcredentials.cpp |  6 ------
 src/creds/shibbolethcredentials.h   |  1 -
 7 files changed, 28 deletions(-)

diff --git a/src/creds/abstractcredentials.h b/src/creds/abstractcredentials.h
index 58612bf..cde85f8 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 478020f..06c25a4 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 7c883ce..d9e16f3 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 630840d..171596f 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<ReadPasswordJob*>(job);
diff --git a/src/creds/httpcredentials.h b/src/creds/httpcredentials.h
index 8220e72..00bd8ee 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 051361e..babf19b 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 6f53925..b94fcb5 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);
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git