From d17d83120564cc6f2d1ed446275c1e511bdb3fee Mon Sep 17 00:00:00 2001 From: Matthieu Gallien Date: Wed, 25 Aug 2021 16:08:36 +0200 Subject: [PATCH] switch from Q_DECL_OVERRIDE to plain override our requirements guarantee availability of override keyword so we just use it Signed-off-by: Matthieu Gallien --- shell_integration/dolphin/ownclouddolphinactionplugin.cpp | 2 +- src/3rdparty/qtsingleapplication/qtsingleapplication.h | 2 +- src/cmd/cmd.cpp | 4 ++-- src/cmd/simplesslerrorhandler.h | 2 +- src/libsync/discoveryphase.h | 2 +- src/libsync/propagateremotedeleteencrypted.h | 2 +- src/libsync/propagateremotedeleteencryptedrootfolder.h | 2 +- test/testhelper.h | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/shell_integration/dolphin/ownclouddolphinactionplugin.cpp b/shell_integration/dolphin/ownclouddolphinactionplugin.cpp index 4e5966e7f..5403a0b5d 100644 --- a/shell_integration/dolphin/ownclouddolphinactionplugin.cpp +++ b/shell_integration/dolphin/ownclouddolphinactionplugin.cpp @@ -37,7 +37,7 @@ public: explicit OwncloudDolphinPluginAction(QObject* parent, const QList&) : KAbstractFileItemActionPlugin(parent) { } - QList actions(const KFileItemListProperties& fileItemInfos, QWidget* parentWidget) Q_DECL_OVERRIDE + QList actions(const KFileItemListProperties& fileItemInfos, QWidget* parentWidget) override { auto helper = OwncloudDolphinPluginHelper::instance(); if (!helper->isConnected() || !fileItemInfos.isLocal()) diff --git a/src/3rdparty/qtsingleapplication/qtsingleapplication.h b/src/3rdparty/qtsingleapplication/qtsingleapplication.h index 2c203d414..674649e4c 100644 --- a/src/3rdparty/qtsingleapplication/qtsingleapplication.h +++ b/src/3rdparty/qtsingleapplication/qtsingleapplication.h @@ -50,7 +50,7 @@ public: void setActivationWindow(QWidget* aw, bool activateOnMessage = true); QWidget* activationWindow() const; - bool event(QEvent *event) Q_DECL_OVERRIDE; + bool event(QEvent *event) override; QString applicationId() const; void setBlock(bool value); diff --git a/src/cmd/cmd.cpp b/src/cmd/cmd.cpp index db446abaa..191dcc547 100644 --- a/src/cmd/cmd.cpp +++ b/src/cmd/cmd.cpp @@ -142,7 +142,7 @@ public: { } - void askFromUser() Q_DECL_OVERRIDE + void askFromUser() override { _password = ::queryPassword(user()); _ready = true; @@ -155,7 +155,7 @@ public: _sslTrusted = isTrusted; } - bool sslIsTrusted() Q_DECL_OVERRIDE + bool sslIsTrusted() override { return _sslTrusted; } diff --git a/src/cmd/simplesslerrorhandler.h b/src/cmd/simplesslerrorhandler.h index 33376b820..31e89bff1 100644 --- a/src/cmd/simplesslerrorhandler.h +++ b/src/cmd/simplesslerrorhandler.h @@ -28,7 +28,7 @@ namespace OCC { class SimpleSslErrorHandler : public OCC::AbstractSslErrorHandler { public: - bool handleErrors(QList errors, const QSslConfiguration &conf, QList *certs, OCC::AccountPtr) Q_DECL_OVERRIDE; + bool handleErrors(QList errors, const QSslConfiguration &conf, QList *certs, OCC::AccountPtr) override; }; } diff --git a/src/libsync/discoveryphase.h b/src/libsync/discoveryphase.h index 945b74e79..c1fbefa6b 100644 --- a/src/libsync/discoveryphase.h +++ b/src/libsync/discoveryphase.h @@ -92,7 +92,7 @@ class DiscoverySingleLocalDirectoryJob : public QObject, public QRunnable public: explicit DiscoverySingleLocalDirectoryJob(const AccountPtr &account, const QString &localPath, OCC::Vfs *vfs, QObject *parent = nullptr); - void run() Q_DECL_OVERRIDE; + void run() override; signals: void finished(QVector result); void finishedFatalError(QString errorString); diff --git a/src/libsync/propagateremotedeleteencrypted.h b/src/libsync/propagateremotedeleteencrypted.h index acb36befc..85bad2094 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); - void start() Q_DECL_OVERRIDE; + void start() override; private: void slotFolderUnLockedSuccessfully(const QByteArray &folderId) override; diff --git a/src/libsync/propagateremotedeleteencryptedrootfolder.h b/src/libsync/propagateremotedeleteencryptedrootfolder.h index eb554ac66..d0210f7f3 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); - void start() Q_DECL_OVERRIDE; + void start() override; private: void slotFolderUnLockedSuccessfully(const QByteArray &folderId) override; diff --git a/test/testhelper.h b/test/testhelper.h index 5eaa2c591..40379577c 100644 --- a/test/testhelper.h +++ b/test/testhelper.h @@ -11,7 +11,7 @@ public: : HttpCredentials(user, password) {} - void askFromUser() Q_DECL_OVERRIDE { + void askFromUser() override { } }; -- 2.30.2