소스 검색

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 <matthieu.gallien@nextcloud.com>
Matthieu Gallien 4 년 전
부모
커밋
d17d831205

+ 1 - 1
shell_integration/dolphin/ownclouddolphinactionplugin.cpp

@@ -37,7 +37,7 @@ public:
     explicit OwncloudDolphinPluginAction(QObject* parent, const QList<QVariant>&)
         : KAbstractFileItemActionPlugin(parent) { }
 
-    QList<QAction*> actions(const KFileItemListProperties& fileItemInfos, QWidget* parentWidget) Q_DECL_OVERRIDE
+    QList<QAction*> actions(const KFileItemListProperties& fileItemInfos, QWidget* parentWidget) override
     {
         auto helper = OwncloudDolphinPluginHelper::instance();
         if (!helper->isConnected() || !fileItemInfos.isLocal())

+ 1 - 1
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);

+ 2 - 2
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;
     }

+ 1 - 1
src/cmd/simplesslerrorhandler.h

@@ -28,7 +28,7 @@ namespace OCC {
 class SimpleSslErrorHandler : public OCC::AbstractSslErrorHandler
 {
 public:
-    bool handleErrors(QList<QSslError> errors, const QSslConfiguration &conf, QList<QSslCertificate> *certs, OCC::AccountPtr) Q_DECL_OVERRIDE;
+    bool handleErrors(QList<QSslError> errors, const QSslConfiguration &conf, QList<QSslCertificate> *certs, OCC::AccountPtr) override;
 };
 }
 

+ 1 - 1
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<LocalInfo> result);
     void finishedFatalError(QString errorString);

+ 1 - 1
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;

+ 1 - 1
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;

+ 1 - 1
test/testhelper.h

@@ -11,7 +11,7 @@ public:
     : HttpCredentials(user, password)
     {}
 
-    void askFromUser() Q_DECL_OVERRIDE {
+    void askFromUser() override {
 
     }
 };