From 25669938fd4fb33a9b6f12be30232d7f0fafc758 Mon Sep 17 00:00:00 2001 From: Matthieu Gallien Date: Tue, 17 Aug 2021 12:39:31 +0200 Subject: [PATCH] let clang-tidy add missing override after enabling again the check Signed-off-by: Matthieu Gallien --- .../QProgressIndicator/QProgressIndicator.h | 8 +++--- src/3rdparty/qtlockedfile/qtlockedfile.h | 2 +- .../qtsingleapplication/qtsingleapplication.h | 2 +- src/common/checksums.h | 2 +- src/common/syncjournaldb.h | 2 +- src/common/vfs.h | 4 +-- src/csync/csync_exclude.h | 2 +- src/gui/accountmanager.h | 2 +- src/gui/accountsettings.h | 2 +- src/gui/accountstate.h | 2 +- src/gui/addcertificatedialog.h | 2 +- src/gui/application.h | 4 +-- src/gui/cloudproviders/cloudproviderwrapper.h | 2 +- src/gui/creds/flow2auth.h | 2 +- src/gui/creds/oauth.h | 2 +- src/gui/folder.h | 2 +- src/gui/foldercreationdialog.h | 2 +- src/gui/folderman.h | 2 +- src/gui/folderstatusmodel.h | 2 +- src/gui/folderwatcher.h | 2 +- src/gui/folderwatcher_linux.h | 2 +- src/gui/folderwizard.h | 8 +++--- src/gui/generalsettings.h | 2 +- src/gui/ignorelisteditor.h | 2 +- src/gui/ignorelisttablewidget.h | 2 +- src/gui/legalnotice.h | 2 +- src/gui/logbrowser.h | 2 +- src/gui/networksettings.h | 2 +- src/gui/owncloudsetupwizard.h | 2 +- src/gui/proxyauthdialog.h | 2 +- src/gui/proxyauthhandler.h | 2 +- src/gui/settingsdialog.h | 2 +- src/gui/sharedialog.h | 2 +- src/gui/sharelinkwidget.h | 2 +- src/gui/shareusergroupwidget.h | 4 +-- src/gui/socketapi/socketapi.h | 2 +- src/gui/sslerrordialog.h | 2 +- src/gui/systray.h | 2 +- src/gui/tray/UserModel.h | 4 +-- src/gui/updater/sparkleupdater.h | 2 +- src/gui/wizard/flow2authwidget.h | 2 +- .../wizard/owncloudconnectionmethoddialog.h | 2 +- src/gui/wizard/owncloudsetuppage.h | 2 +- src/gui/wizard/owncloudwizardresultpage.h | 2 +- src/gui/wizard/webview.h | 2 +- src/gui/wizard/webviewpage.h | 2 +- src/libsync/abstractnetworkjob.h | 2 +- .../abstractpropagateremotedeleteencrypted.h | 2 +- src/libsync/account.h | 2 +- src/libsync/bandwidthmanager.h | 2 +- src/libsync/cookiejar.h | 2 +- src/libsync/creds/keychainchunk.h | 2 +- src/libsync/owncloudpropagator.h | 10 +++---- src/libsync/progressdispatcher.h | 2 +- src/libsync/propagatedownload.h | 6 ++--- src/libsync/propagateremotedeleteencrypted.h | 2 +- ...propagateremotedeleteencryptedrootfolder.h | 2 +- src/libsync/propagateupload.h | 4 +-- src/libsync/propagateuploadencrypted.h | 2 +- src/libsync/pushnotifications.h | 2 +- src/libsync/syncengine.h | 2 +- src/libsync/theme.h | 2 +- src/libsync/vfs/suffix/vfs_suffix.h | 2 +- src/libsync/vfs/xattr/vfs_xattr.h | 2 +- test/pushnotificationstestutils.h | 26 +++++++++---------- test/syncenginetestutils.h | 24 ++++++++--------- 66 files changed, 106 insertions(+), 106 deletions(-) diff --git a/src/3rdparty/QProgressIndicator/QProgressIndicator.h b/src/3rdparty/QProgressIndicator/QProgressIndicator.h index 4871cb8a2..536516106 100644 --- a/src/3rdparty/QProgressIndicator/QProgressIndicator.h +++ b/src/3rdparty/QProgressIndicator/QProgressIndicator.h @@ -67,8 +67,8 @@ public: */ const QColor & color() const { return m_color; } - virtual QSize sizeHint() const; - int heightForWidth(int w) const; + QSize sizeHint() const override; + int heightForWidth(int w) const override; public slots: /*! Starts the spin animation. \sa stopAnimation isAnimated @@ -98,8 +98,8 @@ public slots: */ void setColor(const QColor & color); protected: - virtual void timerEvent(QTimerEvent * event); - virtual void paintEvent(QPaintEvent * event); + void timerEvent(QTimerEvent * event) override; + void paintEvent(QPaintEvent * event) override; private: int m_angle = 0; int m_timerId = -1; diff --git a/src/3rdparty/qtlockedfile/qtlockedfile.h b/src/3rdparty/qtlockedfile/qtlockedfile.h index fcfb8cc24..128cbf0ff 100644 --- a/src/3rdparty/qtlockedfile/qtlockedfile.h +++ b/src/3rdparty/qtlockedfile/qtlockedfile.h @@ -57,7 +57,7 @@ public: QtLockedFile(); QtLockedFile(const QString &name); - ~QtLockedFile(); + ~QtLockedFile() override; bool lock(LockMode mode, bool block = true); bool unlock(); diff --git a/src/3rdparty/qtsingleapplication/qtsingleapplication.h b/src/3rdparty/qtsingleapplication/qtsingleapplication.h index 384a71ce8..2c203d414 100644 --- a/src/3rdparty/qtsingleapplication/qtsingleapplication.h +++ b/src/3rdparty/qtsingleapplication/qtsingleapplication.h @@ -44,7 +44,7 @@ class QtSingleApplication : public QApplication public: QtSingleApplication(const QString &id, int &argc, char **argv); - ~QtSingleApplication(); + ~QtSingleApplication() override; bool isRunning(qint64 pid = -1); diff --git a/src/common/checksums.h b/src/common/checksums.h index 5c8d39d5c..351fa745d 100644 --- a/src/common/checksums.h +++ b/src/common/checksums.h @@ -81,7 +81,7 @@ class OCSYNC_EXPORT ComputeChecksum : public QObject Q_OBJECT public: explicit ComputeChecksum(QObject *parent = nullptr); - ~ComputeChecksum(); + ~ComputeChecksum() override; /** * Sets the checksum type to be used. The default is empty. diff --git a/src/common/syncjournaldb.h b/src/common/syncjournaldb.h index 3c77a2641..8436d4775 100644 --- a/src/common/syncjournaldb.h +++ b/src/common/syncjournaldb.h @@ -47,7 +47,7 @@ class OCSYNC_EXPORT SyncJournalDb : public QObject Q_OBJECT public: explicit SyncJournalDb(const QString &dbFilePath, QObject *parent = nullptr); - virtual ~SyncJournalDb(); + ~SyncJournalDb() override; /// Create a journal path for a specific configuration static QString makeDbName(const QString &localPath, diff --git a/src/common/vfs.h b/src/common/vfs.h index 0f12f8c2e..259dadbe7 100644 --- a/src/common/vfs.h +++ b/src/common/vfs.h @@ -126,7 +126,7 @@ public: public: explicit Vfs(QObject* parent = nullptr); - virtual ~Vfs(); + ~Vfs() override; virtual Mode mode() const = 0; @@ -291,7 +291,7 @@ class OCSYNC_EXPORT VfsOff : public Vfs public: VfsOff(QObject* parent = nullptr); - virtual ~VfsOff(); + ~VfsOff() override; Mode mode() const override { return Vfs::Off; } diff --git a/src/csync/csync_exclude.h b/src/csync/csync_exclude.h index bbb0a2cda..cc4de9923 100644 --- a/src/csync/csync_exclude.h +++ b/src/csync/csync_exclude.h @@ -69,7 +69,7 @@ public: using Version = std::tuple; explicit ExcludedFiles(const QString &localPath = QStringLiteral("/")); - ~ExcludedFiles(); + ~ExcludedFiles() override; /** * Adds a new path to a file containing exclude patterns. diff --git a/src/gui/accountmanager.h b/src/gui/accountmanager.h index 9a1b50497..0cec19053 100644 --- a/src/gui/accountmanager.h +++ b/src/gui/accountmanager.h @@ -28,7 +28,7 @@ class AccountManager : public QObject Q_OBJECT public: static AccountManager *instance(); - ~AccountManager() = default; + ~AccountManager() override = default; /** * Saves the accounts to a given settings file diff --git a/src/gui/accountsettings.h b/src/gui/accountsettings.h index 17e839839..a9908138f 100644 --- a/src/gui/accountsettings.h +++ b/src/gui/accountsettings.h @@ -55,7 +55,7 @@ class AccountSettings : public QWidget public: explicit AccountSettings(AccountState *accountState, QWidget *parent = nullptr); - ~AccountSettings(); + ~AccountSettings() override; QSize sizeHint() const override { return ownCloudGui::settingsDialogSize(); } bool canEncryptOrDecrypt(const FolderStatusModel::SubFolderInfo* folderInfo); diff --git a/src/gui/accountstate.h b/src/gui/accountstate.h index 6249159a1..74e41ad6a 100644 --- a/src/gui/accountstate.h +++ b/src/gui/accountstate.h @@ -82,7 +82,7 @@ public: /// Use the account as parent explicit AccountState(AccountPtr account); - ~AccountState(); + ~AccountState() override; /** Creates an account state from settings and an Account object. * diff --git a/src/gui/addcertificatedialog.h b/src/gui/addcertificatedialog.h index 158327b72..bf7322ec8 100644 --- a/src/gui/addcertificatedialog.h +++ b/src/gui/addcertificatedialog.h @@ -35,7 +35,7 @@ class AddCertificateDialog : public QDialog public: explicit AddCertificateDialog(QWidget *parent = nullptr); - ~AddCertificateDialog(); + ~AddCertificateDialog() override; QString getCertificatePath(); QString getCertificatePasswd(); void showErrorMessage(const QString message); diff --git a/src/gui/application.h b/src/gui/application.h index aabaa63b0..3f1436e65 100644 --- a/src/gui/application.h +++ b/src/gui/application.h @@ -57,7 +57,7 @@ class Application : public SharedTools::QtSingleApplication Q_OBJECT public: explicit Application(int &argc, char **argv); - ~Application(); + ~Application() override; bool giveHelp(); void showHelp(); @@ -88,7 +88,7 @@ protected: void parseOptions(const QStringList &); void setupTranslations(); void setupLogging(); - bool event(QEvent *event); + bool event(QEvent *event) override; signals: void folderRemoved(); diff --git a/src/gui/cloudproviders/cloudproviderwrapper.h b/src/gui/cloudproviders/cloudproviderwrapper.h index 22caf3629..58d00336e 100644 --- a/src/gui/cloudproviders/cloudproviderwrapper.h +++ b/src/gui/cloudproviders/cloudproviderwrapper.h @@ -39,7 +39,7 @@ class CloudProviderWrapper : public QObject Q_OBJECT public: explicit CloudProviderWrapper(QObject *parent = nullptr, Folder *folder = nullptr, int folderId = 0, CloudProvidersProviderExporter* cloudprovider = nullptr); - ~CloudProviderWrapper(); + ~CloudProviderWrapper() override; CloudProvidersAccountExporter* accountExporter(); Folder* folder(); GMenuModel* getMenuModel(); diff --git a/src/gui/creds/flow2auth.h b/src/gui/creds/flow2auth.h index 6cb05c1d3..3ac1cd0cd 100644 --- a/src/gui/creds/flow2auth.h +++ b/src/gui/creds/flow2auth.h @@ -42,7 +42,7 @@ public: }; Flow2Auth(Account *account, QObject *parent); - ~Flow2Auth(); + ~Flow2Auth() override; enum Result { NotSupported, LoggedIn, diff --git a/src/gui/creds/oauth.h b/src/gui/creds/oauth.h index 1c6b519e1..0fa543b5e 100644 --- a/src/gui/creds/oauth.h +++ b/src/gui/creds/oauth.h @@ -47,7 +47,7 @@ public: , _account(account) { } - ~OAuth(); + ~OAuth() override; enum Result { NotSupported, LoggedIn, diff --git a/src/gui/folder.h b/src/gui/folder.h index 4e0e9fa97..f87e028bf 100644 --- a/src/gui/folder.h +++ b/src/gui/folder.h @@ -117,7 +117,7 @@ public: */ Folder(const FolderDefinition &definition, AccountState *accountState, std::unique_ptr vfs, QObject *parent = nullptr); - ~Folder(); + ~Folder() override; using Map = QMap; using MapIterator = QMapIterator; diff --git a/src/gui/foldercreationdialog.h b/src/gui/foldercreationdialog.h index 4797b5f93..3786b9f51 100644 --- a/src/gui/foldercreationdialog.h +++ b/src/gui/foldercreationdialog.h @@ -29,7 +29,7 @@ class FolderCreationDialog : public QDialog public: explicit FolderCreationDialog(const QString &destination, QWidget *parent = nullptr); - ~FolderCreationDialog(); + ~FolderCreationDialog() override; private slots: void accept() override; diff --git a/src/gui/folderman.h b/src/gui/folderman.h index 815c1288f..c3a1b1466 100644 --- a/src/gui/folderman.h +++ b/src/gui/folderman.h @@ -62,7 +62,7 @@ class FolderMan : public QObject { Q_OBJECT public: - ~FolderMan(); + ~FolderMan() override; static FolderMan *instance(); int setupFolders(); diff --git a/src/gui/folderstatusmodel.h b/src/gui/folderstatusmodel.h index 39d937f09..896a19550 100644 --- a/src/gui/folderstatusmodel.h +++ b/src/gui/folderstatusmodel.h @@ -42,7 +42,7 @@ public: enum {FileIdRole = Qt::UserRole+1}; FolderStatusModel(QObject *parent = nullptr); - ~FolderStatusModel(); + ~FolderStatusModel() override; void setAccountState(const AccountState *accountState); Qt::ItemFlags flags(const QModelIndex &) const override; diff --git a/src/gui/folderwatcher.h b/src/gui/folderwatcher.h index c98db8f68..9972dd50f 100644 --- a/src/gui/folderwatcher.h +++ b/src/gui/folderwatcher.h @@ -53,7 +53,7 @@ class FolderWatcher : public QObject public: // Construct, connect signals, call init() explicit FolderWatcher(Folder *folder = nullptr); - virtual ~FolderWatcher(); + ~FolderWatcher() override; /** * @param root Path of the root of the folder diff --git a/src/gui/folderwatcher_linux.h b/src/gui/folderwatcher_linux.h index 277736b40..620e037ed 100644 --- a/src/gui/folderwatcher_linux.h +++ b/src/gui/folderwatcher_linux.h @@ -37,7 +37,7 @@ class FolderWatcherPrivate : public QObject public: FolderWatcherPrivate() = default; FolderWatcherPrivate(FolderWatcher *p, const QString &path); - ~FolderWatcherPrivate(); + ~FolderWatcherPrivate() override; int testWatchCount() const { return _pathToWatch.size(); } diff --git a/src/gui/folderwizard.h b/src/gui/folderwizard.h index 7e7dd9c32..c6e7d48ce 100644 --- a/src/gui/folderwizard.h +++ b/src/gui/folderwizard.h @@ -53,7 +53,7 @@ class FolderWizardLocalPath : public FormatWarningsWizardPage Q_OBJECT public: explicit FolderWizardLocalPath(const AccountPtr &account); - ~FolderWizardLocalPath(); + ~FolderWizardLocalPath() override; bool isComplete() const override; void initializePage() override; @@ -80,7 +80,7 @@ class FolderWizardRemotePath : public FormatWarningsWizardPage Q_OBJECT public: explicit FolderWizardRemotePath(const AccountPtr &account); - ~FolderWizardRemotePath(); + ~FolderWizardRemotePath() override; bool isComplete() const override; @@ -124,7 +124,7 @@ class FolderWizardSelectiveSync : public QWizardPage Q_OBJECT public: explicit FolderWizardSelectiveSync(const AccountPtr &account); - ~FolderWizardSelectiveSync(); + ~FolderWizardSelectiveSync() override; bool validatePage() override; @@ -154,7 +154,7 @@ public: }; explicit FolderWizard(AccountPtr account, QWidget *parent = nullptr); - ~FolderWizard(); + ~FolderWizard() override; bool eventFilter(QObject *watched, QEvent *event) override; void resizeEvent(QResizeEvent *event) override; diff --git a/src/gui/generalsettings.h b/src/gui/generalsettings.h index 9012b5eca..06675c8cc 100644 --- a/src/gui/generalsettings.h +++ b/src/gui/generalsettings.h @@ -36,7 +36,7 @@ class GeneralSettings : public QWidget public: explicit GeneralSettings(QWidget *parent = nullptr); - ~GeneralSettings(); + ~GeneralSettings() override; QSize sizeHint() const override; public slots: diff --git a/src/gui/ignorelisteditor.h b/src/gui/ignorelisteditor.h index 39c38d74d..e425fc784 100644 --- a/src/gui/ignorelisteditor.h +++ b/src/gui/ignorelisteditor.h @@ -36,7 +36,7 @@ class IgnoreListEditor : public QDialog public: IgnoreListEditor(QWidget *parent = nullptr); - ~IgnoreListEditor(); + ~IgnoreListEditor() override; bool ignoreHiddenFiles(); diff --git a/src/gui/ignorelisttablewidget.h b/src/gui/ignorelisttablewidget.h index 3bded0462..39d43fde9 100644 --- a/src/gui/ignorelisttablewidget.h +++ b/src/gui/ignorelisttablewidget.h @@ -16,7 +16,7 @@ class IgnoreListTableWidget : public QWidget public: IgnoreListTableWidget(QWidget *parent = nullptr); - ~IgnoreListTableWidget(); + ~IgnoreListTableWidget() override; void readIgnoreFile(const QString &file, bool readOnly = false); int addPattern(const QString &pattern, bool deletable, bool readOnly); diff --git a/src/gui/legalnotice.h b/src/gui/legalnotice.h index ee0cb9d4e..031ca6740 100644 --- a/src/gui/legalnotice.h +++ b/src/gui/legalnotice.h @@ -35,7 +35,7 @@ class LegalNotice : public QDialog public: explicit LegalNotice(QDialog *parent = nullptr); - ~LegalNotice(); + ~LegalNotice() override; protected: void changeEvent(QEvent *) override; diff --git a/src/gui/logbrowser.h b/src/gui/logbrowser.h index c49e26b73..b1bb547ad 100644 --- a/src/gui/logbrowser.h +++ b/src/gui/logbrowser.h @@ -38,7 +38,7 @@ class LogBrowser : public QDialog Q_OBJECT public: explicit LogBrowser(QWidget *parent = nullptr); - ~LogBrowser(); + ~LogBrowser() override; protected: void closeEvent(QCloseEvent *) override; diff --git a/src/gui/networksettings.h b/src/gui/networksettings.h index 4fd6db572..97b892731 100644 --- a/src/gui/networksettings.h +++ b/src/gui/networksettings.h @@ -34,7 +34,7 @@ class NetworkSettings : public QWidget public: explicit NetworkSettings(QWidget *parent = nullptr); - ~NetworkSettings(); + ~NetworkSettings() override; QSize sizeHint() const override; private slots: diff --git a/src/gui/owncloudsetupwizard.h b/src/gui/owncloudsetupwizard.h index 877c6703d..d7288ee6c 100644 --- a/src/gui/owncloudsetupwizard.h +++ b/src/gui/owncloudsetupwizard.h @@ -71,7 +71,7 @@ private slots: private: explicit OwncloudSetupWizard(QObject *parent = nullptr); - ~OwncloudSetupWizard(); + ~OwncloudSetupWizard() override; void startWizard(); void testOwnCloudConnect(); void createRemoteFolder(); diff --git a/src/gui/proxyauthdialog.h b/src/gui/proxyauthdialog.h index 9ce75f691..63a262b8a 100644 --- a/src/gui/proxyauthdialog.h +++ b/src/gui/proxyauthdialog.h @@ -34,7 +34,7 @@ class ProxyAuthDialog : public QDialog public: explicit ProxyAuthDialog(QWidget *parent = nullptr); - ~ProxyAuthDialog(); + ~ProxyAuthDialog() override; void setProxyAddress(const QString &address); diff --git a/src/gui/proxyauthhandler.h b/src/gui/proxyauthhandler.h index e1a291411..06d28a62a 100644 --- a/src/gui/proxyauthhandler.h +++ b/src/gui/proxyauthhandler.h @@ -49,7 +49,7 @@ class ProxyAuthHandler : public QObject public: static ProxyAuthHandler *instance(); - virtual ~ProxyAuthHandler(); + ~ProxyAuthHandler() override; public slots: /// Intended for QNetworkAccessManager::proxyAuthenticationRequired() diff --git a/src/gui/settingsdialog.h b/src/gui/settingsdialog.h index f46208d53..0d84a1cb1 100644 --- a/src/gui/settingsdialog.h +++ b/src/gui/settingsdialog.h @@ -49,7 +49,7 @@ class SettingsDialog : public QDialog public: explicit SettingsDialog(ownCloudGui *gui, QWidget *parent = nullptr); - ~SettingsDialog(); + ~SettingsDialog() override; QWidget* currentPage(); diff --git a/src/gui/sharedialog.h b/src/gui/sharedialog.h index 96a5f07e0..6431cb131 100644 --- a/src/gui/sharedialog.h +++ b/src/gui/sharedialog.h @@ -51,7 +51,7 @@ public: const QByteArray &numericFileId, ShareDialogStartPage startPage, QWidget *parent = nullptr); - ~ShareDialog(); + ~ShareDialog() override; private slots: void done(int r) override; diff --git a/src/gui/sharelinkwidget.h b/src/gui/sharelinkwidget.h index a9087b6bc..61c558264 100644 --- a/src/gui/sharelinkwidget.h +++ b/src/gui/sharelinkwidget.h @@ -52,7 +52,7 @@ public: const QString &localPath, SharePermissions maxSharingPermissions, QWidget *parent = nullptr); - ~ShareLinkWidget(); + ~ShareLinkWidget() override; void toggleButton(bool show); void setupUiOptions(); diff --git a/src/gui/shareusergroupwidget.h b/src/gui/shareusergroupwidget.h index bb7f54998..75a74590e 100644 --- a/src/gui/shareusergroupwidget.h +++ b/src/gui/shareusergroupwidget.h @@ -59,7 +59,7 @@ public: SharePermissions maxSharingPermissions, const QString &privateLinkUrl, QWidget *parent = nullptr); - ~ShareUserGroupWidget(); + ~ShareUserGroupWidget() override; signals: void togglePublicLinkShare(bool); @@ -128,7 +128,7 @@ public: SharePermissions maxSharingPermissions, bool isFile, QWidget *parent = nullptr); - ~ShareUserLine(); + ~ShareUserLine() override; QSharedPointer share() const; diff --git a/src/gui/socketapi/socketapi.h b/src/gui/socketapi/socketapi.h index 1350607e4..25837bd19 100644 --- a/src/gui/socketapi/socketapi.h +++ b/src/gui/socketapi/socketapi.h @@ -54,7 +54,7 @@ class SocketApi : public QObject public: explicit SocketApi(QObject *parent = nullptr); - virtual ~SocketApi(); + ~SocketApi() override; public slots: void slotUpdateFolderView(Folder *f); diff --git a/src/gui/sslerrordialog.h b/src/gui/sslerrordialog.h index 0ef1d3e5a..327573260 100644 --- a/src/gui/sslerrordialog.h +++ b/src/gui/sslerrordialog.h @@ -49,7 +49,7 @@ class SslErrorDialog : public QDialog Q_OBJECT public: explicit SslErrorDialog(AccountPtr account, QWidget *parent = nullptr); - ~SslErrorDialog(); + ~SslErrorDialog() override; bool checkFailingCertsKnown(const QList &errors); bool trustConnection(); QList unknownCerts() const { return _unknownCerts; } diff --git a/src/gui/systray.h b/src/gui/systray.h index af3739485..8ac13c071 100644 --- a/src/gui/systray.h +++ b/src/gui/systray.h @@ -48,7 +48,7 @@ class Systray public: static Systray *instance(); - virtual ~Systray() = default; + ~Systray() override = default; enum class TaskBarPosition { Bottom, Left, Top, Right }; Q_ENUM(TaskBarPosition); diff --git a/src/gui/tray/UserModel.h b/src/gui/tray/UserModel.h index b1a97da2a..b45fde7c3 100644 --- a/src/gui/tray/UserModel.h +++ b/src/gui/tray/UserModel.h @@ -130,7 +130,7 @@ class UserModel : public QAbstractListModel Q_PROPERTY(int currentUserId READ currentUserId NOTIFY newUserSelected) public: static UserModel *instance(); - virtual ~UserModel() = default; + ~UserModel() override = default; void addUser(AccountStatePtr &user, const bool &isCurrent = false); int currentUserIndex(); @@ -205,7 +205,7 @@ class UserAppsModel : public QAbstractListModel Q_OBJECT public: static UserAppsModel *instance(); - virtual ~UserAppsModel() = default; + ~UserAppsModel() override = default; int rowCount(const QModelIndex &parent = QModelIndex()) const override; diff --git a/src/gui/updater/sparkleupdater.h b/src/gui/updater/sparkleupdater.h index d03e76360..00aa51047 100644 --- a/src/gui/updater/sparkleupdater.h +++ b/src/gui/updater/sparkleupdater.h @@ -26,7 +26,7 @@ class SparkleUpdater : public Updater Q_OBJECT public: SparkleUpdater(const QUrl &appCastUrl); - ~SparkleUpdater(); + ~SparkleUpdater() override; void setUpdateUrl(const QUrl &url); diff --git a/src/gui/wizard/flow2authwidget.h b/src/gui/wizard/flow2authwidget.h index 90095c79c..cc1b01d57 100644 --- a/src/gui/wizard/flow2authwidget.h +++ b/src/gui/wizard/flow2authwidget.h @@ -31,7 +31,7 @@ class Flow2AuthWidget : public QWidget Q_OBJECT public: Flow2AuthWidget(QWidget *parent = nullptr); - virtual ~Flow2AuthWidget(); + ~Flow2AuthWidget() override; void startAuth(Account *account); void resetAuth(Account *account = nullptr); diff --git a/src/gui/wizard/owncloudconnectionmethoddialog.h b/src/gui/wizard/owncloudconnectionmethoddialog.h index 9ccccc3f3..d82d52e45 100644 --- a/src/gui/wizard/owncloudconnectionmethoddialog.h +++ b/src/gui/wizard/owncloudconnectionmethoddialog.h @@ -36,7 +36,7 @@ class OwncloudConnectionMethodDialog : public QDialog public: explicit OwncloudConnectionMethodDialog(QWidget *parent = nullptr); - ~OwncloudConnectionMethodDialog(); + ~OwncloudConnectionMethodDialog() override; enum { Closed = 0, No_TLS, diff --git a/src/gui/wizard/owncloudsetuppage.h b/src/gui/wizard/owncloudsetuppage.h index a03b33639..b4cee856d 100644 --- a/src/gui/wizard/owncloudsetuppage.h +++ b/src/gui/wizard/owncloudsetuppage.h @@ -43,7 +43,7 @@ class OwncloudSetupPage : public QWizardPage Q_OBJECT public: OwncloudSetupPage(QWidget *parent = nullptr); - ~OwncloudSetupPage(); + ~OwncloudSetupPage() override; bool isComplete() const override; void initializePage() override; diff --git a/src/gui/wizard/owncloudwizardresultpage.h b/src/gui/wizard/owncloudwizardresultpage.h index 416f075e0..9ce1a3767 100644 --- a/src/gui/wizard/owncloudwizardresultpage.h +++ b/src/gui/wizard/owncloudwizardresultpage.h @@ -31,7 +31,7 @@ class OwncloudWizardResultPage : public QWizardPage Q_OBJECT public: OwncloudWizardResultPage(); - ~OwncloudWizardResultPage(); + ~OwncloudWizardResultPage() override; bool isComplete() const override; void initializePage() override; diff --git a/src/gui/wizard/webview.h b/src/gui/wizard/webview.h index 93baf6b59..6cfbcb8c0 100644 --- a/src/gui/wizard/webview.h +++ b/src/gui/wizard/webview.h @@ -21,7 +21,7 @@ class WebView : public QWidget Q_OBJECT public: WebView(QWidget *parent = nullptr); - virtual ~WebView(); + ~WebView() override; void setUrl(const QUrl &url); signals: diff --git a/src/gui/wizard/webviewpage.h b/src/gui/wizard/webviewpage.h index c621e99f1..db4febec1 100644 --- a/src/gui/wizard/webviewpage.h +++ b/src/gui/wizard/webviewpage.h @@ -14,7 +14,7 @@ class WebViewPage : public AbstractCredentialsWizardPage Q_OBJECT public: WebViewPage(QWidget *parent = nullptr); - ~WebViewPage(); + ~WebViewPage() override; void initializePage() override; void cleanupPage() override; diff --git a/src/libsync/abstractnetworkjob.h b/src/libsync/abstractnetworkjob.h index babdffdaa..d1f3f6bc5 100644 --- a/src/libsync/abstractnetworkjob.h +++ b/src/libsync/abstractnetworkjob.h @@ -41,7 +41,7 @@ class OWNCLOUDSYNC_EXPORT AbstractNetworkJob : public QObject Q_OBJECT public: explicit AbstractNetworkJob(AccountPtr account, const QString &path, QObject *parent = nullptr); - virtual ~AbstractNetworkJob(); + ~AbstractNetworkJob() override; virtual void start(); diff --git a/src/libsync/abstractpropagateremotedeleteencrypted.h b/src/libsync/abstractpropagateremotedeleteencrypted.h index c36fc956d..68db266aa 100644 --- a/src/libsync/abstractpropagateremotedeleteencrypted.h +++ b/src/libsync/abstractpropagateremotedeleteencrypted.h @@ -32,7 +32,7 @@ class AbstractPropagateRemoteDeleteEncrypted : public QObject Q_OBJECT public: AbstractPropagateRemoteDeleteEncrypted(OwncloudPropagator *propagator, SyncFileItemPtr item, QObject *parent); - virtual ~AbstractPropagateRemoteDeleteEncrypted() = default; + ~AbstractPropagateRemoteDeleteEncrypted() override = default; QNetworkReply::NetworkError networkError() const; QString errorString() const; diff --git a/src/libsync/account.h b/src/libsync/account.h index 803774685..00930b2b3 100644 --- a/src/libsync/account.h +++ b/src/libsync/account.h @@ -84,7 +84,7 @@ class OWNCLOUDSYNC_EXPORT Account : public QObject public: static AccountPtr create(); - ~Account(); + ~Account() override; AccountPtr sharedFromThis(); diff --git a/src/libsync/bandwidthmanager.h b/src/libsync/bandwidthmanager.h index 43b4a36b9..adef4e668 100644 --- a/src/libsync/bandwidthmanager.h +++ b/src/libsync/bandwidthmanager.h @@ -35,7 +35,7 @@ class BandwidthManager : public QObject Q_OBJECT public: BandwidthManager(OwncloudPropagator *p); - ~BandwidthManager(); + ~BandwidthManager() override; bool usingAbsoluteUploadLimit() { return _currentUploadLimit > 0; } bool usingRelativeUploadLimit() { return _currentUploadLimit < 0; } diff --git a/src/libsync/cookiejar.h b/src/libsync/cookiejar.h index ecdd69971..6d3703aaa 100644 --- a/src/libsync/cookiejar.h +++ b/src/libsync/cookiejar.h @@ -30,7 +30,7 @@ class OWNCLOUDSYNC_EXPORT CookieJar : public QNetworkCookieJar Q_OBJECT public: explicit CookieJar(QObject *parent = nullptr); - ~CookieJar(); + ~CookieJar() override; bool setCookiesFromUrl(const QList &cookieList, const QUrl &url) override; QList cookiesForUrl(const QUrl &url) const override; diff --git a/src/libsync/creds/keychainchunk.h b/src/libsync/creds/keychainchunk.h index 0a08b8f2f..0e8684372 100644 --- a/src/libsync/creds/keychainchunk.h +++ b/src/libsync/creds/keychainchunk.h @@ -45,7 +45,7 @@ class OWNCLOUDSYNC_EXPORT Job : public QObject public: Job(QObject *parent = nullptr); - virtual ~Job(); + ~Job() override; QKeychain::Error error() const; QString errorString() const; diff --git a/src/libsync/owncloudpropagator.h b/src/libsync/owncloudpropagator.h index 24b6ec0e7..afb0900c8 100644 --- a/src/libsync/owncloudpropagator.h +++ b/src/libsync/owncloudpropagator.h @@ -192,7 +192,7 @@ public: // As an alternative, we could optimize Lock/Unlock calls, so we do a batch-write on one folder and only lock and unlock a folder once per batch. _parallelism = (_item->_isEncrypted || hasEncryptedAncestor()) ? WaitForFinished : FullParallelism; } - ~PropagateItemJob(); + ~PropagateItemJob() override; bool scheduleSelfOrChild() override { @@ -206,7 +206,7 @@ public: return true; } - virtual JobParallelism parallelism() override { return _parallelism; } + JobParallelism parallelism() override { return _parallelism; } SyncFileItemPtr _item; @@ -237,7 +237,7 @@ public: // Don't delete jobs in _jobsToDo and _runningJobs: they have parents // that will be responsible for cleanup. Deleting them here would risk // deleting something that has already been deleted by a shared parent. - virtual ~PropagatorCompositeJob() = default; + ~PropagatorCompositeJob() override = default; void appendJob(PropagatorJob *job); void appendTask(const SyncFileItemPtr &item) @@ -419,7 +419,7 @@ public: qRegisterMetaType("PropagatorJob::AbortType"); } - ~OwncloudPropagator(); + ~OwncloudPropagator() override; void start(SyncFileItemVector &&_syncedItems); @@ -646,7 +646,7 @@ public: { } - ~CleanupPollsJob(); + ~CleanupPollsJob() override; /** * Start the job. After the job is completed, it will emit either finished or aborted, and it diff --git a/src/libsync/progressdispatcher.h b/src/libsync/progressdispatcher.h index 99415d544..3e34fdd8f 100644 --- a/src/libsync/progressdispatcher.h +++ b/src/libsync/progressdispatcher.h @@ -269,7 +269,7 @@ class OWNCLOUDSYNC_EXPORT ProgressDispatcher : public QObject friend class Folder; // only allow Folder class to access the setting slots. public: static ProgressDispatcher *instance(); - ~ProgressDispatcher(); + ~ProgressDispatcher() override; signals: /** diff --git a/src/libsync/propagatedownload.h b/src/libsync/propagatedownload.h index f8690af9c..fc4942c4e 100644 --- a/src/libsync/propagatedownload.h +++ b/src/libsync/propagatedownload.h @@ -62,7 +62,7 @@ public: explicit GETFileJob(AccountPtr account, const QUrl &url, QIODevice *device, const QMap &headers, const QByteArray &expectedEtagForResume, qint64 resumeStart, QObject *parent = nullptr); - virtual ~GETFileJob() + ~GETFileJob() override { if (_bandwidthManager) { _bandwidthManager->unregisterDownloadJob(this); @@ -139,10 +139,10 @@ public: explicit GETEncryptedFileJob(AccountPtr account, const QUrl &url, QIODevice *device, const QMap &headers, const QByteArray &expectedEtagForResume, qint64 resumeStart, EncryptedFile encryptedInfo, QObject *parent = nullptr); - virtual ~GETEncryptedFileJob() = default; + ~GETEncryptedFileJob() override = default; protected: - virtual qint64 writeToDevice(const QByteArray &data) override; + qint64 writeToDevice(const QByteArray &data) override; private: QSharedPointer _decryptor; diff --git a/src/libsync/propagateremotedeleteencrypted.h b/src/libsync/propagateremotedeleteencrypted.h index f29ae1939..acb36befc 100644 --- a/src/libsync/propagateremotedeleteencrypted.h +++ b/src/libsync/propagateremotedeleteencrypted.h @@ -24,7 +24,7 @@ class PropagateRemoteDeleteEncrypted : public AbstractPropagateRemoteDeleteEncry public: PropagateRemoteDeleteEncrypted(OwncloudPropagator *propagator, SyncFileItemPtr item, QObject *parent); - virtual void start() Q_DECL_OVERRIDE; + void start() Q_DECL_OVERRIDE; private: void slotFolderUnLockedSuccessfully(const QByteArray &folderId) override; diff --git a/src/libsync/propagateremotedeleteencryptedrootfolder.h b/src/libsync/propagateremotedeleteencryptedrootfolder.h index 6cb083a5d..eb554ac66 100644 --- a/src/libsync/propagateremotedeleteencryptedrootfolder.h +++ b/src/libsync/propagateremotedeleteencryptedrootfolder.h @@ -27,7 +27,7 @@ class PropagateRemoteDeleteEncryptedRootFolder : public AbstractPropagateRemoteD public: PropagateRemoteDeleteEncryptedRootFolder(OwncloudPropagator *propagator, SyncFileItemPtr item, QObject *parent); - virtual void start() Q_DECL_OVERRIDE; + void start() Q_DECL_OVERRIDE; private: void slotFolderUnLockedSuccessfully(const QByteArray &folderId) override; diff --git a/src/libsync/propagateupload.h b/src/libsync/propagateupload.h index 7238a0f32..1a547a3b6 100644 --- a/src/libsync/propagateupload.h +++ b/src/libsync/propagateupload.h @@ -39,7 +39,7 @@ class UploadDevice : public QIODevice Q_OBJECT public: UploadDevice(const QString &fileName, qint64 start, qint64 size, BandwidthManager *bwm); - ~UploadDevice(); + ~UploadDevice() override; bool open(QIODevice::OpenMode mode) override; void close() override; @@ -118,7 +118,7 @@ public: { _device->setParent(this); } - ~PUTFileJob(); + ~PUTFileJob() override; int _chunk; diff --git a/src/libsync/propagateuploadencrypted.h b/src/libsync/propagateuploadencrypted.h index 6f5b25ba1..246b32cac 100644 --- a/src/libsync/propagateuploadencrypted.h +++ b/src/libsync/propagateuploadencrypted.h @@ -33,7 +33,7 @@ class PropagateUploadEncrypted : public QObject Q_OBJECT public: PropagateUploadEncrypted(OwncloudPropagator *propagator, const QString &remoteParentPath, SyncFileItemPtr item, QObject *parent = nullptr); - ~PropagateUploadEncrypted() = default; + ~PropagateUploadEncrypted() override = default; void start(); diff --git a/src/libsync/pushnotifications.h b/src/libsync/pushnotifications.h index 9d6b8445d..1409c92a0 100644 --- a/src/libsync/pushnotifications.h +++ b/src/libsync/pushnotifications.h @@ -31,7 +31,7 @@ class OWNCLOUDSYNC_EXPORT PushNotifications : public QObject public: explicit PushNotifications(Account *account, QObject *parent = nullptr); - ~PushNotifications(); + ~PushNotifications() override; /** * Setup push notifications diff --git a/src/libsync/syncengine.h b/src/libsync/syncengine.h index 0f5e2264e..925e15b4b 100644 --- a/src/libsync/syncengine.h +++ b/src/libsync/syncengine.h @@ -59,7 +59,7 @@ class OWNCLOUDSYNC_EXPORT SyncEngine : public QObject public: SyncEngine(AccountPtr account, const QString &localPath, const QString &remotePath, SyncJournalDb *journal); - ~SyncEngine(); + ~SyncEngine() override; Q_INVOKABLE void startSync(); void setNetworkLimits(int upload, int download); diff --git a/src/libsync/theme.h b/src/libsync/theme.h index c40cdb0b6..f47aebe63 100644 --- a/src/libsync/theme.h +++ b/src/libsync/theme.h @@ -72,7 +72,7 @@ public: /* returns a singleton instance. */ static Theme *instance(); - ~Theme(); + ~Theme() override; /** * @brief isBranded indicates if the current application is branded diff --git a/src/libsync/vfs/suffix/vfs_suffix.h b/src/libsync/vfs/suffix/vfs_suffix.h index 8ac8c1217..e3ddaed69 100644 --- a/src/libsync/vfs/suffix/vfs_suffix.h +++ b/src/libsync/vfs/suffix/vfs_suffix.h @@ -27,7 +27,7 @@ class VfsSuffix : public Vfs public: explicit VfsSuffix(QObject *parent = nullptr); - ~VfsSuffix(); + ~VfsSuffix() override; Mode mode() const override; QString fileSuffix() const override; diff --git a/src/libsync/vfs/xattr/vfs_xattr.h b/src/libsync/vfs/xattr/vfs_xattr.h index 745ad8ef9..2170a42a7 100644 --- a/src/libsync/vfs/xattr/vfs_xattr.h +++ b/src/libsync/vfs/xattr/vfs_xattr.h @@ -27,7 +27,7 @@ class VfsXAttr : public Vfs public: explicit VfsXAttr(QObject *parent = nullptr); - ~VfsXAttr(); + ~VfsXAttr() override; Mode mode() const override; QString fileSuffix() const override; diff --git a/test/pushnotificationstestutils.h b/test/pushnotificationstestutils.h index f1eca050f..57e56831e 100644 --- a/test/pushnotificationstestutils.h +++ b/test/pushnotificationstestutils.h @@ -29,7 +29,7 @@ class FakeWebSocketServer : public QObject public: explicit FakeWebSocketServer(quint16 port = 12345, QObject *parent = nullptr); - ~FakeWebSocketServer(); + ~FakeWebSocketServer() override; QWebSocket *authenticateAccount( const OCC::AccountPtr account, std::function beforeAuthentication = [](OCC::PushNotifications *) {}, std::function afterAuthentication = [] {}); @@ -70,18 +70,18 @@ class CredentialsStub : public OCC::AbstractCredentials public: CredentialsStub(const QString &user, const QString &password); - virtual QString authType() const; - virtual QString user() const; - virtual QString password() const; - virtual QNetworkAccessManager *createQNAM() const; - virtual bool ready() const; - virtual void fetchFromKeychain(); - virtual void askFromUser(); - - virtual bool stillValid(QNetworkReply *reply); - virtual void persist(); - virtual void invalidateToken(); - virtual void forgetSensitiveData(); + QString authType() const override; + QString user() const override; + QString password() const override; + QNetworkAccessManager *createQNAM() const override; + bool ready() const override; + void fetchFromKeychain() override; + void askFromUser() override; + + bool stillValid(QNetworkReply *reply) override; + void persist() override; + void invalidateToken() override; + void forgetSensitiveData() override; private: QString _user; diff --git a/test/syncenginetestutils.h b/test/syncenginetestutils.h index 9cca62d1c..7596bbd90 100644 --- a/test/syncenginetestutils.h +++ b/test/syncenginetestutils.h @@ -175,7 +175,7 @@ class FakeReply : public QNetworkReply Q_OBJECT public: FakeReply(QObject *parent); - virtual ~FakeReply(); + ~FakeReply() override; // useful to be public for testing using QNetworkReply::setRawHeader; @@ -414,17 +414,17 @@ class FakeCredentials : public OCC::AbstractCredentials QNetworkAccessManager *_qnam; public: FakeCredentials(QNetworkAccessManager *qnam) : _qnam{qnam} { } - virtual QString authType() const { return "test"; } - virtual QString user() const { return "admin"; } - virtual QString password() const { return "password"; } - virtual QNetworkAccessManager *createQNAM() const { return _qnam; } - virtual bool ready() const { return true; } - virtual void fetchFromKeychain() { } - virtual void askFromUser() { } - virtual bool stillValid(QNetworkReply *) { return true; } - virtual void persist() { } - virtual void invalidateToken() { } - virtual void forgetSensitiveData() { } + QString authType() const override { return "test"; } + QString user() const override { return "admin"; } + QString password() const override { return "password"; } + QNetworkAccessManager *createQNAM() const override { return _qnam; } + bool ready() const override { return true; } + void fetchFromKeychain() override { } + void askFromUser() override { } + bool stillValid(QNetworkReply *) override { return true; } + void persist() override { } + void invalidateToken() override { } + void forgetSensitiveData() override { } }; class FakeFolder -- 2.30.2