Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/owncloud/client.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/src/creds
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@woboq.com>2014-07-10 01:22:28 +0400
committerOlivier Goffart <ogoffart@woboq.com>2014-07-10 01:31:56 +0400
commitbcfa34357b3472d250090fc8cfe04d72a45d0047 (patch)
tree971824546961ca9f0e9cec8829252de4d0bbc51b /src/creds
parente0c2e8ed86ad38ca47677bc0c5ab528125dfd372 (diff)
Add Q_DECL_OVERRIDE for all function that are overriding something
This was made automatically with clang-modernize -override-macros -add-override
Diffstat (limited to 'src/creds')
-rw-r--r--src/creds/dummycredentials.h22
-rw-r--r--src/creds/httpcredentials.cpp2
-rw-r--r--src/creds/httpcredentials.h22
-rw-r--r--src/creds/shibboleth/shibbolethuserjob.h4
-rw-r--r--src/creds/shibboleth/shibbolethwebview.h2
-rw-r--r--src/creds/shibbolethcredentials.h24
6 files changed, 38 insertions, 38 deletions
diff --git a/src/creds/dummycredentials.h b/src/creds/dummycredentials.h
index d6401b2ed..516280fe7 100644
--- a/src/creds/dummycredentials.h
+++ b/src/creds/dummycredentials.h
@@ -27,17 +27,17 @@ public:
QString _user;
QString _password;
- void syncContextPreInit(CSYNC* ctx);
- void syncContextPreStart(CSYNC* ctx);
- bool changed(AbstractCredentials* credentials) const;
- QString authType() const;
- QString user() const;
- QNetworkAccessManager* getQNAM() const;
- bool ready() const;
- bool stillValid(QNetworkReply *reply);
- void fetch(Account*);
- void persist(Account*);
- void invalidateToken(Account *) {}
+ void syncContextPreInit(CSYNC* ctx) Q_DECL_OVERRIDE;
+ void syncContextPreStart(CSYNC* ctx) Q_DECL_OVERRIDE;
+ bool changed(AbstractCredentials* credentials) const Q_DECL_OVERRIDE;
+ QString authType() const Q_DECL_OVERRIDE;
+ QString user() const Q_DECL_OVERRIDE;
+ QNetworkAccessManager* getQNAM() const Q_DECL_OVERRIDE;
+ bool ready() const Q_DECL_OVERRIDE;
+ bool stillValid(QNetworkReply *reply) Q_DECL_OVERRIDE;
+ void fetch(Account*) Q_DECL_OVERRIDE;
+ void persist(Account*) Q_DECL_OVERRIDE;
+ void invalidateToken(Account *) Q_DECL_OVERRIDE {}
};
} // ns Mirall
diff --git a/src/creds/httpcredentials.cpp b/src/creds/httpcredentials.cpp
index 72d238713..1312ee33e 100644
--- a/src/creds/httpcredentials.cpp
+++ b/src/creds/httpcredentials.cpp
@@ -85,7 +85,7 @@ public:
HttpCredentialsAccessManager(const HttpCredentials *cred, QObject* parent = 0)
: MirallAccessManager(parent), _cred(cred) {}
protected:
- QNetworkReply *createRequest(Operation op, const QNetworkRequest &request, QIODevice *outgoingData) {
+ QNetworkReply *createRequest(Operation op, const QNetworkRequest &request, QIODevice *outgoingData) Q_DECL_OVERRIDE {
QByteArray credHash = QByteArray(_cred->user().toUtf8()+":"+_cred->password().toUtf8()).toBase64();
QNetworkRequest req(request);
req.setRawHeader(QByteArray("Authorization"), QByteArray("Basic ") + credHash);
diff --git a/src/creds/httpcredentials.h b/src/creds/httpcredentials.h
index 38402fc8c..92360f376 100644
--- a/src/creds/httpcredentials.h
+++ b/src/creds/httpcredentials.h
@@ -38,19 +38,19 @@ public:
HttpCredentials();
HttpCredentials(const QString& user, const QString& password);
- void syncContextPreInit(CSYNC* ctx);
- void syncContextPreStart(CSYNC* ctx);
- bool changed(AbstractCredentials* credentials) const;
- QString authType() const;
- QNetworkAccessManager* getQNAM() const;
- bool ready() const;
- void fetch(Account *account);
- bool stillValid(QNetworkReply *reply);
- void persist(Account *account);
- QString user() const;
+ void syncContextPreInit(CSYNC* ctx) Q_DECL_OVERRIDE;
+ void syncContextPreStart(CSYNC* ctx) Q_DECL_OVERRIDE;
+ bool changed(AbstractCredentials* credentials) const Q_DECL_OVERRIDE;
+ QString authType() const Q_DECL_OVERRIDE;
+ QNetworkAccessManager* getQNAM() const Q_DECL_OVERRIDE;
+ bool ready() const Q_DECL_OVERRIDE;
+ void fetch(Account *account) Q_DECL_OVERRIDE;
+ bool stillValid(QNetworkReply *reply) Q_DECL_OVERRIDE;
+ void persist(Account *account) Q_DECL_OVERRIDE;
+ QString user() const Q_DECL_OVERRIDE;
QString password() const;
QString queryPassword(bool *ok);
- void invalidateToken(Account *account);
+ void invalidateToken(Account *account) Q_DECL_OVERRIDE;
QString fetchUser(Account *account);
private Q_SLOTS:
diff --git a/src/creds/shibboleth/shibbolethuserjob.h b/src/creds/shibboleth/shibbolethuserjob.h
index 8042fe939..3f2c10b59 100644
--- a/src/creds/shibboleth/shibbolethuserjob.h
+++ b/src/creds/shibboleth/shibbolethuserjob.h
@@ -27,14 +27,14 @@ class ShibbolethUserJob : public AbstractNetworkJob {
public:
explicit ShibbolethUserJob(Account *account, QObject* parent = 0);
public slots:
- void start();
+ void start() Q_DECL_OVERRIDE;
signals:
// is always emitted when the job is finished. user is empty in case of error.
void userFetched(const QString &user);
private slots:
- virtual bool finished();
+ virtual bool finished() Q_DECL_OVERRIDE;
};
diff --git a/src/creds/shibboleth/shibbolethwebview.h b/src/creds/shibboleth/shibbolethwebview.h
index 37b58c8cb..29e642a1f 100644
--- a/src/creds/shibboleth/shibbolethwebview.h
+++ b/src/creds/shibboleth/shibbolethwebview.h
@@ -37,7 +37,7 @@ public:
ShibbolethWebView(Account *account, ShibbolethCookieJar* jar, QWidget* parent = 0);
~ShibbolethWebView();
- void closeEvent(QCloseEvent *event);
+ void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE;
Q_SIGNALS:
void shibbolethCookieReceived(const QNetworkCookie &cookie, Account *account);
diff --git a/src/creds/shibbolethcredentials.h b/src/creds/shibbolethcredentials.h
index cb778f219..5a58fac4f 100644
--- a/src/creds/shibbolethcredentials.h
+++ b/src/creds/shibbolethcredentials.h
@@ -43,17 +43,17 @@ public:
/* create a credidentials for an already connected account */
ShibbolethCredentials(const QNetworkCookie &cookie, Account *acc);
- void syncContextPreInit(CSYNC* ctx);
- void syncContextPreStart(CSYNC* ctx);
- bool changed(AbstractCredentials* credentials) const;
- QString authType() const;
- QString user() const;
- QNetworkAccessManager* getQNAM() const;
- bool ready() const;
- void fetch(Account *account);
- bool stillValid(QNetworkReply *reply);
- void persist(Account *account);
- void invalidateToken(Account *account);
+ void syncContextPreInit(CSYNC* ctx) Q_DECL_OVERRIDE;
+ void syncContextPreStart(CSYNC* ctx) Q_DECL_OVERRIDE;
+ bool changed(AbstractCredentials* credentials) const Q_DECL_OVERRIDE;
+ QString authType() const Q_DECL_OVERRIDE;
+ QString user() const Q_DECL_OVERRIDE;
+ QNetworkAccessManager* getQNAM() const Q_DECL_OVERRIDE;
+ bool ready() const Q_DECL_OVERRIDE;
+ void fetch(Account *account) Q_DECL_OVERRIDE;
+ bool stillValid(QNetworkReply *reply) Q_DECL_OVERRIDE;
+ void persist(Account *account) Q_DECL_OVERRIDE;
+ void invalidateToken(Account *account) Q_DECL_OVERRIDE;
void showLoginWindow(Account*);
@@ -62,7 +62,7 @@ public:
static QByteArray shibCookieName();
public Q_SLOTS:
- void invalidateAndFetch(Account *account);
+ void invalidateAndFetch(Account *account) Q_DECL_OVERRIDE;
void slotHandleAuthentication(QNetworkReply*,QAuthenticator*);
private Q_SLOTS: