chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2025-04-18 17:15:45 +02:00
Code

libsync: search'n'replace "Q_DECL_OVERRIDE" with "override"

Browse Source
This commit is contained in:
J-P Nurmi 2018-11-12 18:39:50 +01:00
parent 9f6bb617e9
commit 48acaec66f
15 changed files with 109 additions and 109 deletions

2
src/libsync/accessmanager.h
View File

@ -37,7 +37,7 @@ public:
void setRawCookie(const QByteArray &rawCookie, const QUrl &url);
protected:
QNetworkReply *createRequest(QNetworkAccessManager::Operation op, const QNetworkRequest &request, QIODevice *outgoingData = 0) Q_DECL_OVERRIDE;
QNetworkReply *createRequest(QNetworkAccessManager::Operation op, const QNetworkRequest &request, QIODevice *outgoingData = 0) override;
};
} // namespace OCC

4
src/libsync/cookiejar.h
View File

@ -31,8 +31,8 @@ class OWNCLOUDSYNC_EXPORT CookieJar : public QNetworkCookieJar
public:
explicit CookieJar(QObject *parent = 0);
~CookieJar();
bool setCookiesFromUrl(const QList<QNetworkCookie> &cookieList, const QUrl &url) Q_DECL_OVERRIDE;
QList<QNetworkCookie> cookiesForUrl(const QUrl &url) const Q_DECL_OVERRIDE;
bool setCookiesFromUrl(const QList<QNetworkCookie> &cookieList, const QUrl &url) override;
QList<QNetworkCookie> cookiesForUrl(const QUrl &url) const override;
void clearSessionCookies();

20
src/libsync/creds/dummycredentials.h
View File

@ -26,16 +26,16 @@ class OWNCLOUDSYNC_EXPORT DummyCredentials : public AbstractCredentials
public:
QString _user;
QString _password;
QString authType() const Q_DECL_OVERRIDE;
QString user() const Q_DECL_OVERRIDE;
QNetworkAccessManager *createQNAM() const Q_DECL_OVERRIDE;
bool ready() const Q_DECL_OVERRIDE;
bool stillValid(QNetworkReply *reply) Q_DECL_OVERRIDE;
void fetchFromKeychain() Q_DECL_OVERRIDE;
void askFromUser() Q_DECL_OVERRIDE;
void persist() Q_DECL_OVERRIDE;
void invalidateToken() Q_DECL_OVERRIDE {}
void forgetSensitiveData() Q_DECL_OVERRIDE{};
QString authType() const override;
QString user() const override;
QNetworkAccessManager *createQNAM() const override;
bool ready() const override;
bool stillValid(QNetworkReply *reply) override;
void fetchFromKeychain() override;
void askFromUser() override;
void persist() override;
void invalidateToken() override {}
void forgetSensitiveData() override{};
};
} // namespace OCC

2
src/libsync/creds/httpcredentials.cpp
View File

@ -57,7 +57,7 @@ public:
}
protected:
QNetworkReply *createRequest(Operation op, const QNetworkRequest &request, QIODevice *outgoingData) Q_DECL_OVERRIDE
QNetworkReply *createRequest(Operation op, const QNetworkRequest &request, QIODevice *outgoingData) override
{
QNetworkRequest req(request);
if (!req.attribute(HttpCredentials::DontAddCredentialsAttribute).toBool()) {

20
src/libsync/creds/httpcredentials.h
View File

@ -82,17 +82,17 @@ public:
explicit HttpCredentials();
HttpCredentials(const QString &user, const QString &password, const QSslCertificate &certificate = QSslCertificate(), const QSslKey &key = QSslKey());
QString authType() const Q_DECL_OVERRIDE;
QNetworkAccessManager *createQNAM() const Q_DECL_OVERRIDE;
bool ready() const Q_DECL_OVERRIDE;
void fetchFromKeychain() Q_DECL_OVERRIDE;
bool stillValid(QNetworkReply *reply) Q_DECL_OVERRIDE;
void persist() Q_DECL_OVERRIDE;
QString user() const Q_DECL_OVERRIDE;
QString authType() const override;
QNetworkAccessManager *createQNAM() const override;
bool ready() const override;
void fetchFromKeychain() override;
bool stillValid(QNetworkReply *reply) override;
void persist() override;
QString user() const override;
// the password or token
QString password() const;
void invalidateToken() Q_DECL_OVERRIDE;
void forgetSensitiveData() Q_DECL_OVERRIDE;
void invalidateToken() override;
void forgetSensitiveData() override;
QString fetchUser();
virtual bool sslIsTrusted() { return false; }
@ -102,7 +102,7 @@ public:
bool refreshAccessToken();
// To fetch the user name as early as possible
void setAccount(Account *account) Q_DECL_OVERRIDE;
void setAccount(Account *account) override;
// Whether we are using OAuth
bool isUsingOAuth() const { return !_refreshToken.isNull(); }

20
src/libsync/creds/tokencredentials.h
View File

@ -39,16 +39,16 @@ public:
TokenCredentials();
TokenCredentials(const QString &user, const QString &password, const QString &token);
QString authType() const Q_DECL_OVERRIDE;
QNetworkAccessManager *createQNAM() const Q_DECL_OVERRIDE;
bool ready() const Q_DECL_OVERRIDE;
void askFromUser() Q_DECL_OVERRIDE;
void fetchFromKeychain() Q_DECL_OVERRIDE;
bool stillValid(QNetworkReply *reply) Q_DECL_OVERRIDE;
void persist() Q_DECL_OVERRIDE;
QString user() const Q_DECL_OVERRIDE;
void invalidateToken() Q_DECL_OVERRIDE;
void forgetSensitiveData() Q_DECL_OVERRIDE;
QString authType() const override;
QNetworkAccessManager *createQNAM() const override;
bool ready() const override;
void askFromUser() override;
void fetchFromKeychain() override;
bool stillValid(QNetworkReply *reply) override;
void persist() override;
QString user() const override;
void invalidateToken() override;
void forgetSensitiveData() override;
QString password() const;
private Q_SLOTS:

40
src/libsync/networkjobs.h
View File

@ -36,13 +36,13 @@ class OWNCLOUDSYNC_EXPORT EntityExistsJob : public AbstractNetworkJob
Q_OBJECT
public:
explicit EntityExistsJob(AccountPtr account, const QString &path, QObject *parent = 0);
void start() Q_DECL_OVERRIDE;
void start() override;
signals:
void exists(QNetworkReply *);
private slots:
virtual bool finished() Q_DECL_OVERRIDE;
virtual bool finished() override;
};
/**
@ -98,7 +98,7 @@ class OWNCLOUDSYNC_EXPORT LsColJob : public AbstractNetworkJob
public:
explicit LsColJob(AccountPtr account, const QString &path, QObject *parent = 0);
explicit LsColJob(AccountPtr account, const QUrl &url, QObject *parent = 0);
void start() Q_DECL_OVERRIDE;
void start() override;
QHash<QString, ExtraFolderInfo> _folderInfos;
/**
@ -119,7 +119,7 @@ signals:
void finishedWithoutError();
private slots:
virtual bool finished() Q_DECL_OVERRIDE;
virtual bool finished() override;
private:
QList<QByteArray> _properties;
@ -141,7 +141,7 @@ class OWNCLOUDSYNC_EXPORT PropfindJob : public AbstractNetworkJob
Q_OBJECT
public:
explicit PropfindJob(AccountPtr account, const QString &path, QObject *parent = 0);
void start() Q_DECL_OVERRIDE;
void start() override;
/**
* Used to specify which properties shall be retrieved.
@ -159,7 +159,7 @@ signals:
void finishedWithError(QNetworkReply *reply = 0);
private slots:
virtual bool finished() Q_DECL_OVERRIDE;
virtual bool finished() override;
private:
QList<QByteArray> _properties;
@ -183,7 +183,7 @@ public:
*/
explicit AvatarJob(AccountPtr account, const QString &userId, int size, QObject *parent = 0);
void start() Q_DECL_OVERRIDE;
void start() override;
/** The retrieved avatar images don't have the circle shape by default */
static QImage makeCircularAvatar(const QImage &baseAvatar);
@ -196,7 +196,7 @@ signals:
void avatarPixmap(const QImage &);
private slots:
virtual bool finished() Q_DECL_OVERRIDE;
virtual bool finished() override;
private:
QUrl _avatarUrl;
@ -217,7 +217,7 @@ class OWNCLOUDSYNC_EXPORT ProppatchJob : public AbstractNetworkJob
Q_OBJECT
public:
explicit ProppatchJob(AccountPtr account, const QString &path, QObject *parent = 0);
void start() Q_DECL_OVERRIDE;
void start() override;
/**
* Used to specify which properties shall be set.
@ -235,7 +235,7 @@ signals:
void finishedWithError();
private slots:
virtual bool finished() Q_DECL_OVERRIDE;
virtual bool finished() override;
private:
QMap<QByteArray, QByteArray> _properties;
@ -255,13 +255,13 @@ public:
explicit MkColJob(AccountPtr account, const QString &path, QObject *parent = 0);
explicit MkColJob(AccountPtr account, const QUrl &url,
const QMap<QByteArray, QByteArray> &extraHeaders, QObject *parent = 0);
void start() Q_DECL_OVERRIDE;
void start() override;
signals:
void finished(QNetworkReply::NetworkError);
private slots:
virtual bool finished() Q_DECL_OVERRIDE;
virtual bool finished() override;
};
/**
@ -273,7 +273,7 @@ class OWNCLOUDSYNC_EXPORT CheckServerJob : public AbstractNetworkJob
Q_OBJECT
public:
explicit CheckServerJob(AccountPtr account, QObject *parent = 0);
void start() Q_DECL_OVERRIDE;
void start() override;
static QString version(const QJsonObject &info);
static QString versionString(const QJsonObject &info);
@ -300,8 +300,8 @@ signals:
void timeout(const QUrl &url);
private:
bool finished() Q_DECL_OVERRIDE;
void onTimedOut() Q_DECL_OVERRIDE;
bool finished() override;
void onTimedOut() override;
private slots:
virtual void metaDataChangedSlot();
virtual void encryptedSlot();
@ -330,13 +330,13 @@ class OWNCLOUDSYNC_EXPORT RequestEtagJob : public AbstractNetworkJob
Q_OBJECT
public:
explicit RequestEtagJob(AccountPtr account, const QString &path, QObject *parent = 0);
void start() Q_DECL_OVERRIDE;
void start() override;
signals:
void etagRetreived(const QString &etag);
private slots:
virtual bool finished() Q_DECL_OVERRIDE;
virtual bool finished() override;
};
/**
@ -374,10 +374,10 @@ public:
void addRawHeader(const QByteArray &headerName, const QByteArray &value);
public slots:
void start() Q_DECL_OVERRIDE;
void start() override;
protected:
bool finished() Q_DECL_OVERRIDE;
bool finished() override;
signals:
/**
@ -449,7 +449,7 @@ public:
signals:
void finishedSignal(QNetworkReply *reply);
private slots:
bool finished() Q_DECL_OVERRIDE;
bool finished() override;
};
/**

8
src/libsync/nextcloudtheme.h
View File

@ -30,11 +30,11 @@ public:
NextcloudTheme();
#ifndef TOKEN_AUTH_ONLY
QVariant customMedia(CustomMediaType type) Q_DECL_OVERRIDE;
QVariant customMedia(CustomMediaType type) override;
QColor wizardHeaderBackgroundColor() const Q_DECL_OVERRIDE;
QColor wizardHeaderTitleColor() const Q_DECL_OVERRIDE;
QPixmap wizardHeaderLogo() const Q_DECL_OVERRIDE;
QColor wizardHeaderBackgroundColor() const override;
QColor wizardHeaderTitleColor() const override;
QPixmap wizardHeaderLogo() const override;
#endif
private:

20
src/libsync/owncloudpropagator.h
View File

@ -186,7 +186,7 @@ public:
}
~PropagateItemJob();
bool scheduleSelfOrChild() Q_DECL_OVERRIDE
bool scheduleSelfOrChild() override
{
if (_state != NotYetStarted) {
return false;
@ -238,15 +238,15 @@ public:
_tasksToDo.append(item);
}
virtual bool scheduleSelfOrChild() Q_DECL_OVERRIDE;
virtual JobParallelism parallelism() Q_DECL_OVERRIDE;
virtual bool scheduleSelfOrChild() override;
virtual JobParallelism parallelism() override;
/*
* Abort synchronously or asynchronously - some jobs
* require to be finished without immediete abort (abort on job might
* cause conflicts/duplicated files - owncloud/client/issues/5949)
*/
virtual void abort(PropagatorJob::AbortType abortType) Q_DECL_OVERRIDE
virtual void abort(PropagatorJob::AbortType abortType) override
{
if (!_runningJobs.empty()) {
_abortsCount = _runningJobs.size();
@ -262,7 +262,7 @@ public:
}
}
qint64 committedDiskSpace() const Q_DECL_OVERRIDE;
qint64 committedDiskSpace() const override;
private slots:
void slotSubJobAbortFinished();
@ -304,9 +304,9 @@ public:
_subJobs.appendTask(item);
}
virtual bool scheduleSelfOrChild() Q_DECL_OVERRIDE;
virtual JobParallelism parallelism() Q_DECL_OVERRIDE;
virtual void abort(PropagatorJob::AbortType abortType) Q_DECL_OVERRIDE
virtual bool scheduleSelfOrChild() override;
virtual JobParallelism parallelism() override;
virtual void abort(PropagatorJob::AbortType abortType) override
{
if (_firstJob)
// Force first job to abort synchronously
@ -325,7 +325,7 @@ public:
}
qint64 committedDiskSpace() const Q_DECL_OVERRIDE
qint64 committedDiskSpace() const override
{
return _subJobs.committedDiskSpace();
}
@ -350,7 +350,7 @@ public:
: PropagateItemJob(propagator, item)
{
}
void start() Q_DECL_OVERRIDE
void start() override
{
SyncFileItem::Status status = _item->_status;
done(status == SyncFileItem::NoStatus ? SyncFileItem::FileIgnored : status, _item->_errorString);

14
src/libsync/propagatedownload.h
View File

@ -64,8 +64,8 @@ public:
}
}
virtual void start() Q_DECL_OVERRIDE;
virtual bool finished() Q_DECL_OVERRIDE
virtual void start() override;
virtual bool finished() override
{
if (reply()->bytesAvailable()) {
return false;
@ -95,7 +95,7 @@ public:
SyncFileItem::Status errorStatus() { return _errorStatus; }
void setErrorStatus(const SyncFileItem::Status &s) { _errorStatus = s; }
void onTimedOut() Q_DECL_OVERRIDE;
void onTimedOut() override;
QByteArray &etag() { return _etag; }
quint64 resumeStart() { return _resumeStart; }
@ -159,11 +159,11 @@ public:
, _deleteExisting(false)
{
}
void start() Q_DECL_OVERRIDE;
qint64 committedDiskSpace() const Q_DECL_OVERRIDE;
void start() override;
qint64 committedDiskSpace() const override;
// We think it might finish quickly because it is a small file.
bool isLikelyFinishedQuickly() Q_DECL_OVERRIDE { return _item->_size < propagator()->smallFileSize(); }
bool isLikelyFinishedQuickly() override { return _item->_size < propagator()->smallFileSize(); }
/**
* Whether an existing folder with the same name may be deleted before
@ -192,7 +192,7 @@ private slots:
/// Called when it's time to update the db metadata
void updateMetadata(bool isConflict);
void abort(PropagatorJob::AbortType abortType) Q_DECL_OVERRIDE;
void abort(PropagatorJob::AbortType abortType) override;
void slotDownloadProgress(qint64, qint64);
void slotChecksumFail(const QString &errMsg);

10
src/libsync/propagateremotedelete.h
View File

@ -30,8 +30,8 @@ public:
explicit DeleteJob(AccountPtr account, const QString &path, QObject *parent = 0);
explicit DeleteJob(AccountPtr account, const QUrl &url, QObject *parent = 0);
void start() Q_DECL_OVERRIDE;
bool finished() Q_DECL_OVERRIDE;
void start() override;
bool finished() override;
signals:
void finishedSignal();
@ -51,11 +51,11 @@ public:
: PropagateItemJob(propagator, item)
{
}
void start() Q_DECL_OVERRIDE;
void start() override;
void createDeleteJob(const QString &filename);
void abort(PropagatorJob::AbortType abortType) Q_DECL_OVERRIDE;
void abort(PropagatorJob::AbortType abortType) override;
bool isLikelyFinishedQuickly() Q_DECL_OVERRIDE { return !_item->isDirectory(); }
bool isLikelyFinishedQuickly() override { return !_item->isDirectory(); }
private slots:
void slotDeleteJobFinished();

6
src/libsync/propagateremotemkdir.h
View File

@ -34,11 +34,11 @@ public:
, _deleteExisting(false)
{
}
void start() Q_DECL_OVERRIDE;
void abort(PropagatorJob::AbortType abortType) Q_DECL_OVERRIDE;
void start() override;
void abort(PropagatorJob::AbortType abortType) override;
// Creating a directory should be fast.
bool isLikelyFinishedQuickly() Q_DECL_OVERRIDE { return true; }
bool isLikelyFinishedQuickly() override { return true; }
/**
* Whether an existing entity with the same name may be deleted before

10
src/libsync/propagateremotemove.h
View File

@ -34,8 +34,8 @@ public:
explicit MoveJob(AccountPtr account, const QUrl &url, const QString &destination,
QMap<QByteArray, QByteArray> _extraHeaders, QObject *parent = 0);
void start() Q_DECL_OVERRIDE;
bool finished() Q_DECL_OVERRIDE;
void start() override;
bool finished() override;
signals:
void finishedSignal();
@ -55,9 +55,9 @@ public:
: PropagateItemJob(propagator, item)
{
}
void start() Q_DECL_OVERRIDE;
void abort(PropagatorJob::AbortType abortType) Q_DECL_OVERRIDE;
JobParallelism parallelism() Q_DECL_OVERRIDE { return _item->isDirectory() ? WaitForFinished : FullParallelism; }
void start() override;
void abort(PropagatorJob::AbortType abortType) override;
JobParallelism parallelism() override { return _item->isDirectory() ? WaitForFinished : FullParallelism; }
/**
* Rename the directory in the selective sync list

34
src/libsync/propagateupload.h
View File

@ -42,13 +42,13 @@ public:
/** Reads the data from the file and opens the device */
bool prepareAndOpen(const QString &fileName, qint64 start, qint64 size);
qint64 writeData(const char *, qint64) Q_DECL_OVERRIDE;
qint64 readData(char *data, qint64 maxlen) Q_DECL_OVERRIDE;
bool atEnd() const Q_DECL_OVERRIDE;
qint64 size() const Q_DECL_OVERRIDE;
qint64 bytesAvailable() const Q_DECL_OVERRIDE;
bool isSequential() const Q_DECL_OVERRIDE;
bool seek(qint64 pos) Q_DECL_OVERRIDE;
qint64 writeData(const char *, qint64) override;
qint64 readData(char *data, qint64 maxlen) override;
bool atEnd() const override;
qint64 size() const override;
qint64 bytesAvailable() const override;
bool isSequential() const override;
bool seek(qint64 pos) override;
void setBandwidthLimited(bool);
bool isBandwidthLimited() { return _bandwidthLimited; }
@ -115,9 +115,9 @@ public:
int _chunk;
virtual void start() Q_DECL_OVERRIDE;
virtual void start() override;
virtual bool finished() Q_DECL_OVERRIDE
virtual bool finished() override
{
qCInfo(lcPutJob) << "PUT of" << reply()->request().url().toString() << "FINISHED WITH STATUS"
<< replyStatusString()
@ -174,8 +174,8 @@ public:
{
}
void start() Q_DECL_OVERRIDE;
bool finished() Q_DECL_OVERRIDE;
void start() override;
bool finished() override;
signals:
void finishedSignal();
@ -246,12 +246,12 @@ public:
void setDeleteExisting(bool enabled);
/* start should setup the file, path and size that will be send to the server */
void start() Q_DECL_OVERRIDE;
void start() override;
void setupEncryptedFile(const QString& path, const QString& filename, quint64 size);
void setupUnencryptedFile();
void startUploadFile();
void callUnlockFolder();
bool isLikelyFinishedQuickly() Q_DECL_OVERRIDE { return _item->_size < propagator()->smallFileSize(); }
bool isLikelyFinishedQuickly() override { return _item->_size < propagator()->smallFileSize(); }
private slots:
void slotComputeContentChecksum();
@ -352,9 +352,9 @@ public:
{
}
void doStartUpload() Q_DECL_OVERRIDE;
void doStartUpload() override;
public slots:
void abort(PropagatorJob::AbortType abortType) Q_DECL_OVERRIDE;
void abort(PropagatorJob::AbortType abortType) override;
private slots:
void startNextChunk();
void slotPutFinished();
@ -398,13 +398,13 @@ public:
{
}
void doStartUpload() Q_DECL_OVERRIDE;
void doStartUpload() override;
private:
void startNewUpload();
void startNextChunk();
public slots:
void abort(AbortType abortType) Q_DECL_OVERRIDE;
void abort(AbortType abortType) override;
private slots:
void slotPropfindFinished();
void slotPropfindFinishedWithError();

8
src/libsync/propagatorjobs.h
View File

@ -39,7 +39,7 @@ public:
: PropagateItemJob(propagator, item)
{
}
void start() Q_DECL_OVERRIDE;
void start() override;
private:
bool removeRecursively(const QString &path);
@ -60,7 +60,7 @@ public:
, _deleteExistingFile(false)
{
}
void start() Q_DECL_OVERRIDE;
void start() override;
/**
* Whether an existing file with the same name may be deleted before
@ -86,7 +86,7 @@ public:
: PropagateItemJob(propagator, item)
{
}
void start() Q_DECL_OVERRIDE;
JobParallelism parallelism() Q_DECL_OVERRIDE { return _item->isDirectory() ? WaitForFinished : FullParallelism; }
void start() override;
JobParallelism parallelism() override { return _item->isDirectory() ? WaitForFinished : FullParallelism; }
};
}