Clean up use of virtual and override keywords

Only use virtual when actually virtual, to override just use override.

core/backends/devicelink.h

@@ -40,7 +40,7 @@ public:
     enum PairStatus : bool { NotPaired, Paired };
 
     DeviceLink(const QString& deviceId, LinkProvider* parent);
-    virtual ~DeviceLink() { };
+    virtual ~DeviceLink() = default;
 
     virtual QString name() = 0;
 

core/backends/lan/downloadjob.h

@@ -38,8 +38,8 @@ class KDECONNECTCORE_EXPORT DownloadJob
     Q_OBJECT
 public:
     DownloadJob(const QHostAddress &address, const QVariantMap &transferInfo);
-    ~DownloadJob();
+    ~DownloadJob() override;
-    void start() Q_DECL_OVERRIDE;
+    void start() override;
     QSharedPointer<QIODevice> getPayload();
 
 private:

core/backends/lan/landevicelink.h

@@ -43,16 +43,16 @@ public:
     LanDeviceLink(const QString& deviceId, LinkProvider* parent, QSslSocket* socket, ConnectionStarted connectionSource);
     void reset(QSslSocket* socket, ConnectionStarted connectionSource);
 
-    virtual QString name() Q_DECL_OVERRIDE;
+    QString name() override;
     bool sendPackage(NetworkPackage& np) override;
     UploadJob* sendPayload(NetworkPackage& np);
 
-    virtual void userRequestsPair() override;
+    void userRequestsPair() override;
-    virtual void userRequestsUnpair() override;
+    void userRequestsUnpair() override;
 
-    virtual void setPairStatus(PairStatus status) override;
+    void setPairStatus(PairStatus status) override;
 
-    virtual bool linkShouldBeKeptAlive() override;
+    bool linkShouldBeKeptAlive() override;
 
 private Q_SLOTS:
     void dataReceived();

core/backends/lan/lanlinkprovider.h

@@ -41,7 +41,7 @@ class KDECONNECTCORE_EXPORT LanLinkProvider
 
 public:
     LanLinkProvider(bool testMode = false);
-    ~LanLinkProvider();
+    ~LanLinkProvider() override;
 
     QString name() override { return "LanLinkProvider"; }
     int priority() override { return PRIORITY_HIGH; }
@@ -51,9 +51,9 @@ public:
     void incomingPairPackage(DeviceLink* device, const NetworkPackage& np);
 
 public Q_SLOTS:
-    virtual void onNetworkChange() override;
+    void onNetworkChange() override;
-    virtual void onStart() override;
+    void onStart() override;
-    virtual void onStop() override;
+    void onStop() override;
     void connected();
     void encrypted();
     void connectError();

core/backends/lan/lanpairinghandler.h

@@ -39,13 +39,13 @@ public:
     };
 
     LanPairingHandler(DeviceLink* deviceLink);
-    virtual ~LanPairingHandler() { }
+    ~LanPairingHandler() override { }
 
-    virtual void packageReceived(const NetworkPackage& np) Q_DECL_OVERRIDE;
+    void packageReceived(const NetworkPackage& np) override;
-    virtual bool requestPairing() Q_DECL_OVERRIDE;
+    bool requestPairing() override;
-    virtual bool acceptPairing() Q_DECL_OVERRIDE;
+    bool acceptPairing() override;
-    virtual void rejectPairing() Q_DECL_OVERRIDE;
+    void rejectPairing() override;
-    virtual void unpair() Q_DECL_OVERRIDE;
+    void unpair() override;
 
     bool isPairRequested() const { return m_status == Requested; }
     bool isPaired() const { return m_status == Paired; }

core/backends/lan/server.h

@@ -38,13 +38,13 @@ private:
 
 public:
     Server(QObject* parent = 0);
-    virtual ~Server() {}
+    ~Server() override = default;
 
-    QSslSocket* nextPendingConnection() Q_DECL_OVERRIDE;
+    QSslSocket* nextPendingConnection() override;
-    bool hasPendingConnections() const Q_DECL_OVERRIDE;
+    bool hasPendingConnections() const override;
 
 protected:
-    void incomingConnection(qintptr socketDescriptor) Q_DECL_OVERRIDE;
+    void incomingConnection(qintptr socketDescriptor) override;
 };
 
 #endif //KDECONNECT_SERVER_H

core/backends/lan/uploadjob.h

@@ -36,7 +36,7 @@ class UploadJob
 public:
     explicit UploadJob(const QSharedPointer<QIODevice>& source, const QString& deviceId);
 
-    virtual void start() override;
+    void start() override;
 
     QVariantMap transferInfo();
 

core/backends/linkprovider.h

@@ -42,7 +42,7 @@ public:
     const static int PRIORITY_HIGH = 100;   //eg: lan
 
     LinkProvider();
-    virtual ~LinkProvider() { }
+    ~LinkProvider() override = default;
 
     virtual QString name() = 0;
     virtual int priority() = 0;

core/backends/loopback/loopbackdevicelink.h

@@ -32,11 +32,11 @@ class LoopbackDeviceLink
 public:
     LoopbackDeviceLink(const QString& d, LoopbackLinkProvider* a);
 
-    virtual QString name() override;
+    QString name() override;
-    virtual bool sendPackage(NetworkPackage& np) override;
+    bool sendPackage(NetworkPackage& np) override;
 
-    virtual void userRequestsPair() override { setPairStatus(Paired); }
+    void userRequestsPair() override { setPairStatus(Paired); }
-    virtual void userRequestsUnpair() override { setPairStatus(NotPaired); }
+    void userRequestsUnpair() override { setPairStatus(NotPaired); }
 };
 
 #endif

core/backends/loopback/loopbacklinkprovider.h

@@ -31,14 +31,14 @@ class LoopbackLinkProvider
     Q_OBJECT
 public:
     LoopbackLinkProvider();
-    ~LoopbackLinkProvider();
+    ~LoopbackLinkProvider() override;
 
     QString name() override { return "LoopbackLinkProvider"; }
     int priority() override { return PRIORITY_LOW; }
 
-    virtual void onStart() override;
+    void onStart() override;
-    virtual void onStop() override;
+    void onStop() override;
-    virtual void onNetworkChange() override;
+    void onNetworkChange() override;
 
 private:
     QPointer<LoopbackDeviceLink> loopbackDeviceLink;

core/backends/pairinghandler.h

@@ -43,7 +43,7 @@ class KDECONNECTCORE_EXPORT PairingHandler : public QObject
 
 public:
     PairingHandler(DeviceLink* parent);
-    virtual ~PairingHandler() { }
+    ~PairingHandler() override = default;
 
     DeviceLink* deviceLink() const;
     void setDeviceLink(DeviceLink* dl);

core/daemon.h

@@ -42,7 +42,7 @@ class KDECONNECTCORE_EXPORT Daemon
 
 public:
     explicit Daemon(QObject *parent, bool testMode = false);
-    ~Daemon();
+    ~Daemon() override;
 
     /**
      * Returns the daemon.

core/device.h

@@ -78,7 +78,7 @@ public:
      */
     Device(QObject* parent, const NetworkPackage& np, DeviceLink* dl);
 
-    virtual ~Device();
+    ~Device() override;
 
     QString id() const { return m_deviceId; }
     QString name() const { return m_deviceName; }
@@ -113,6 +113,7 @@ public:
 
 public Q_SLOTS:
     ///sends a @p np package to the device
+    ///virtual for testing purposes.
     virtual bool sendPackage(NetworkPackage& np);
 
     //Dbus operations

core/filetransferjob.h

@@ -53,7 +53,7 @@ public:
      * @p destination specifies where these contents should be stored
      */
     FileTransferJob(const QSharedPointer<QIODevice>& origin, qint64 size, const QUrl &destination);
-    virtual void start() Q_DECL_OVERRIDE;
+    void start() override;
     QUrl destination() const { return mDestination; }
     void setOriginName(QString from) { mFrom = from; }
 
@@ -61,7 +61,7 @@ private Q_SLOTS:
     void doStart();
 
 protected:
-    bool doKill() Q_DECL_OVERRIDE;
+    bool doKill() override;
 
 private:
     void startTransfer();

core/kdeconnectplugin.h

@@ -38,7 +38,7 @@ class KDECONNECTCORE_EXPORT KdeConnectPlugin
 
 public:
     KdeConnectPlugin(QObject* parent, const QVariantList& args);
-    virtual ~KdeConnectPlugin();
+    ~KdeConnectPlugin() override;
 
     const Device* device();
     Device const* device() const;

core/kdeconnectpluginconfig.h

@@ -37,7 +37,7 @@ class KDECONNECTCORE_EXPORT KdeConnectPluginConfig : public QObject
 
 public:
     KdeConnectPluginConfig(const QString& deviceId, const QString& pluginName);
-    ~KdeConnectPluginConfig();
+    ~KdeConnectPluginConfig() override;
 
     /**
      * A directory to store stuff for this device and plugin. It's private in the sense

daemon/kdeconnectd.cpp

@@ -41,7 +41,7 @@ public:
         , m_nam(Q_NULLPTR)
     {}
 
-    void askPairingConfirmation(PairingHandler* d) Q_DECL_OVERRIDE
+    void askPairingConfirmation(PairingHandler* d) override
     {
         KNotification* notification = new KNotification("pairingRequest");
         notification->setIconName(QStringLiteral("dialog-information"));
@@ -54,12 +54,12 @@ public:
         notification->sendEvent();
     }
 
-    void reportError(const QString & title, const QString & description) Q_DECL_OVERRIDE
+    void reportError(const QString & title, const QString & description) override
     {
         KNotification::event(KNotification::Error, title, description);
     }
 
-    QNetworkAccessManager* networkAccessManager() Q_DECL_OVERRIDE
+    QNetworkAccessManager* networkAccessManager() override
     {
         if (!m_nam) {
             m_nam = new KIO::AccessManager(this);

fileitemactionplugin/sendfileitemaction.h

@@ -35,7 +35,7 @@ class SendFileItemAction : public KAbstractFileItemActionPlugin
 Q_OBJECT
 public:
     SendFileItemAction(QObject* parent, const QVariantList &args);
-    virtual QList< QAction* > actions(const KFileItemListProperties& fileItemInfos, QWidget* parentWidget) override;
+    QList< QAction* > actions(const KFileItemListProperties& fileItemInfos, QWidget* parentWidget) override;
 
 private Q_SLOTS:
     void sendFile();

interfaces/dbusinterfaces.h

@@ -45,7 +45,7 @@ class KDECONNECTINTERFACES_EXPORT DaemonDbusInterface
     Q_OBJECT
 public:
     explicit DaemonDbusInterface(QObject* parent = nullptr);
-    virtual ~DaemonDbusInterface();
+    ~DaemonDbusInterface() override;
 
     static QString activatedService();
 
@@ -63,7 +63,7 @@ class KDECONNECTINTERFACES_EXPORT DeviceDbusInterface
 
 public:
     explicit DeviceDbusInterface(const QString& deviceId, QObject* parent = nullptr);
-    virtual ~DeviceDbusInterface();
+    ~DeviceDbusInterface() override;
 
     Q_SCRIPTABLE QString id() const;
     Q_SCRIPTABLE void pluginCall(const QString &plugin, const QString &method);
@@ -81,7 +81,7 @@ class KDECONNECTINTERFACES_EXPORT DeviceBatteryDbusInterface
     Q_OBJECT
 public:
     explicit DeviceBatteryDbusInterface(const QString& deviceId, QObject* parent = nullptr);
-    virtual ~DeviceBatteryDbusInterface();
+    ~DeviceBatteryDbusInterface() override;
 };
 
 class KDECONNECTINTERFACES_EXPORT DeviceNotificationsDbusInterface
@@ -90,7 +90,7 @@ class KDECONNECTINTERFACES_EXPORT DeviceNotificationsDbusInterface
     Q_OBJECT
 public:
     explicit DeviceNotificationsDbusInterface(const QString& deviceId, QObject* parent = nullptr);
-    virtual ~DeviceNotificationsDbusInterface();
+    ~DeviceNotificationsDbusInterface() override;
 };
 
 class KDECONNECTINTERFACES_EXPORT NotificationDbusInterface
@@ -99,7 +99,7 @@ class KDECONNECTINTERFACES_EXPORT NotificationDbusInterface
     Q_OBJECT
 public:
     NotificationDbusInterface(const QString& deviceId, const QString& notificationId, QObject* parent = nullptr);
-    virtual ~NotificationDbusInterface();
+    ~NotificationDbusInterface() override;
 
     QString notificationId() { return id; }
 private:
@@ -113,7 +113,7 @@ class KDECONNECTINTERFACES_EXPORT SftpDbusInterface
     Q_OBJECT
 public:
     explicit SftpDbusInterface(const QString& deviceId, QObject* parent = nullptr);
-    virtual ~SftpDbusInterface();
+    ~SftpDbusInterface() override;
 };
 
 class KDECONNECTINTERFACES_EXPORT MprisDbusInterface
@@ -130,7 +130,7 @@ class KDECONNECTINTERFACES_EXPORT MprisDbusInterface
     Q_PROPERTY(int position READ position WRITE setPosition NOTIFY propertiesChangedProxy)
 public:
     explicit MprisDbusInterface(const QString& deviceId, QObject* parent = nullptr);
-    virtual ~MprisDbusInterface();
+    ~MprisDbusInterface() override;
 
 Q_SIGNALS:
     void propertiesChangedProxy();
@@ -152,7 +152,7 @@ class KDECONNECTINTERFACES_EXPORT LockDeviceDbusInterface
     Q_PROPERTY(bool isLocked READ isLocked WRITE setIsLocked NOTIFY lockedChangedProxy)
 public:
     explicit LockDeviceDbusInterface(const QString& deviceId, QObject* parent = nullptr);
-    virtual ~LockDeviceDbusInterface();
+    ~LockDeviceDbusInterface() override;
 
 Q_SIGNALS:
     void lockedChangedProxy(bool isLocked);
@@ -164,7 +164,7 @@ class KDECONNECTINTERFACES_EXPORT FindMyPhoneDeviceDbusInterface
     Q_OBJECT
 public:
     explicit FindMyPhoneDeviceDbusInterface(const QString& deviceId, QObject* parent = nullptr);
-    virtual ~FindMyPhoneDeviceDbusInterface();
+    ~FindMyPhoneDeviceDbusInterface() override;
 };
 
 class KDECONNECTINTERFACES_EXPORT RemoteCommandsDbusInterface

interfaces/devicesmodel.h

@@ -61,16 +61,16 @@ public:
     Q_ENUM(StatusFilterFlag)
 
     explicit DevicesModel(QObject *parent = nullptr);
-    virtual ~DevicesModel();
+    ~DevicesModel() override;
 
     void setDisplayFilter(int flags);
     int displayFilter() const;
 
-    virtual QVariant data(const QModelIndex& index, int role) const override;
+    QVariant data(const QModelIndex& index, int role) const override;
-    virtual int rowCount(const QModelIndex& parent = QModelIndex()) const override;
+    int rowCount(const QModelIndex& parent = QModelIndex()) const override;
 
     Q_SCRIPTABLE DeviceDbusInterface* getDevice(int row) const;
-    virtual QHash<int, QByteArray> roleNames() const override;
+    QHash<int, QByteArray> roleNames() const override;
 
 private Q_SLOTS:
     void deviceAdded(const QString& id);

interfaces/devicessortproxymodel.h

@@ -31,9 +31,9 @@ class KDECONNECTINTERFACES_EXPORT DevicesSortProxyModel : public QSortFilterProx
     Q_OBJECT
 public:
     explicit DevicesSortProxyModel(DevicesModel* devicesModel = Q_NULLPTR);
-    virtual bool lessThan(const QModelIndex& left, const QModelIndex& right) const override;
+    bool lessThan(const QModelIndex& left, const QModelIndex& right) const override;
-    virtual bool filterAcceptsRow(int source_row, const QModelIndex& source_parent) const override;
+    bool filterAcceptsRow(int source_row, const QModelIndex& source_parent) const override;
-    virtual void setSourceModel(QAbstractItemModel *sourceModel) override;
+    void setSourceModel(QAbstractItemModel *sourceModel) override;
 
 public Q_SLOTS:
     void sourceDataChanged();

interfaces/notificationsmodel.h

@@ -48,18 +48,18 @@ public:
     };
 
     explicit NotificationsModel(QObject* parent = nullptr);
-    virtual ~NotificationsModel();
+    ~NotificationsModel() override;
 
     QString deviceId() const;
     void setDeviceId(const QString& deviceId);
 
-    virtual QVariant data(const QModelIndex& index, int role) const override;
+    QVariant data(const QModelIndex& index, int role) const override;
-    virtual int rowCount(const QModelIndex& parent = QModelIndex()) const override;
+    int rowCount(const QModelIndex& parent = QModelIndex()) const override;
 
     NotificationDbusInterface* getNotification(const QModelIndex& index) const;
 
     Q_INVOKABLE bool isAnyDimissable() const;
-    virtual QHash<int, QByteArray> roleNames() const override;
+    QHash<int, QByteArray> roleNames() const override;
 
 public Q_SLOTS:
     void dismissAll();

kcm/kcm.h

@@ -40,12 +40,12 @@ class KdeConnectKcm
     Q_OBJECT
 public:
     KdeConnectKcm(QWidget *parent, const QVariantList&);
-    virtual ~KdeConnectKcm();
+    ~KdeConnectKcm() override;
 
 private:
-    virtual void save();
+    void save() override;
-    virtual QSize sizeHint() const;
+    QSize sizeHint() const override;
-    virtual QSize minimumSizeHint() const;
+    QSize minimumSizeHint() const override;
 
 private Q_SLOTS:
     void deviceSelected(const QModelIndex& current);

kcmplugin/kdeconnectpluginkcm.h

@@ -39,7 +39,7 @@ class KDECONNECTPLUGINKCM_EXPORT KdeConnectPluginKcm
 
 public:
     KdeConnectPluginKcm(QWidget* parent, const QVariantList& args, const QString& componentName);
-    virtual ~KdeConnectPluginKcm();
+    ~KdeConnectPluginKcm() override;
 
     /**
      * The device this kcm is instantiated for

plasmoid/declarativeplugin/kdeconnectdeclarativeplugin.h

@@ -29,8 +29,8 @@ class KdeConnectDeclarativePlugin : public QQmlExtensionPlugin
 
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 
-    virtual void registerTypes(const char* uri) override;
+    void registerTypes(const char* uri) override;
-    virtual void initializeEngine(QQmlEngine *engine, const char *uri) override;
+    void initializeEngine(QQmlEngine *engine, const char *uri) override;
 };
 
 #endif // KDECONNECTDECLARATIVEPLUGIN_H

plasmoid/declarativeplugin/objectfactory.h

@@ -19,7 +19,7 @@ public:
     ObjectFactory(QObject* parent, Func1 f1) : QObject(parent), m_f0(nullptr), m_f1(f1), m_f2(nullptr) {}
     ObjectFactory(QObject* parent, Func2 f2) : QObject(parent), m_f0(nullptr), m_f1(nullptr), m_f2(f2) {}
     
-    virtual ~ObjectFactory() {}
+    ~ObjectFactory() override = default;
 
     Q_INVOKABLE QObject* create() {
         if (m_f0) return m_f0();

plasmoid/declarativeplugin/processrunner.h

@@ -28,7 +28,7 @@ class ProcessRunner : public QObject
 
 public:
     explicit ProcessRunner(QObject *parent = nullptr);
-    ~ProcessRunner();
+    ~ProcessRunner() override;
 
     Q_INVOKABLE void runKdeconnectKCM();
 };

plasmoid/declarativeplugin/responsewaiter.h

@@ -37,7 +37,7 @@ class DBusAsyncResponse : public QObject
     
 public:
     explicit DBusAsyncResponse(QObject* parent = nullptr);
-    virtual ~DBusAsyncResponse() {}; 
+    ~DBusAsyncResponse() override = default;
 
     Q_INVOKABLE void setPendingCall(QVariant e);
     

plugins/battery/batterydbusinterface.h

@@ -33,7 +33,7 @@ class BatteryDbusInterface
 
 public:
     explicit BatteryDbusInterface(const Device *device);
-    virtual ~BatteryDbusInterface();
+    ~BatteryDbusInterface() override;
     
     Q_SCRIPTABLE int charge() const { return mCharge; }
     Q_SCRIPTABLE bool isCharging() const { return mIsCharging; }

plugins/battery/batteryplugin.h

@@ -36,11 +36,11 @@ class BatteryPlugin
 
 public:
     explicit BatteryPlugin(QObject *parent, const QVariantList &args);
-    virtual ~BatteryPlugin();
+    ~BatteryPlugin() override;
 
 public Q_SLOTS:
-    virtual bool receivePackage(const NetworkPackage& np) override;
+    bool receivePackage(const NetworkPackage& np) override;
-    virtual void connected() override;
+    void connected() override;
 
 private:
     // Keep these values in sync with THRESHOLD* constants in

plugins/clipboard/clipboardplugin.h

@@ -38,8 +38,8 @@ public:
     explicit ClipboardPlugin(QObject *parent, const QVariantList &args);
 
 public Q_SLOTS:
-    virtual bool receivePackage(const NetworkPackage& np) override;
+    bool receivePackage(const NetworkPackage& np) override;
-    virtual void connected() override { }
+    void connected() override { }
     
 private Q_SLOTS:
     void clipboardChanged(QClipboard::Mode mode);

plugins/findmyphone/findmyphoneplugin.h

@@ -35,13 +35,13 @@ class FindMyPhonePlugin
 
 public:
     explicit FindMyPhonePlugin(QObject *parent, const QVariantList &args);
-    virtual ~FindMyPhonePlugin();
+    ~FindMyPhonePlugin() override;
     
     Q_SCRIPTABLE void ring();
 
 public Q_SLOTS:
-    virtual void connected();
+    void connected() override;
-    virtual bool receivePackage(const NetworkPackage& np);
+    bool receivePackage(const NetworkPackage& np) override;
 
 private:
     QString dbusPath() const;

plugins/lockdevice/lockdeviceplugin.h

@@ -39,7 +39,7 @@ class Q_DECL_EXPORT LockDevicePlugin
 
 public:
     explicit LockDevicePlugin(QObject *parent, const QVariantList &args);
-    virtual ~LockDevicePlugin();
+    ~LockDevicePlugin() override;
 
     bool isLocked() const;
     void setLocked(bool b);

plugins/mousepad/mousepadplugin.h

@@ -44,10 +44,10 @@ class MousepadPlugin
 
 public:
     explicit MousepadPlugin(QObject *parent, const QVariantList &args);
-    virtual ~MousepadPlugin();
+    ~MousepadPlugin() override;
 
-    virtual bool receivePackage(const NetworkPackage& np) override;
+    bool receivePackage(const NetworkPackage& np) override;
-    virtual void connected() override { }
+    void connected() override { }
 
 private:
 #if HAVE_X11

plugins/mpriscontrol/mpriscontrolplugin.h

@@ -41,8 +41,8 @@ public:
     explicit MprisControlPlugin(QObject *parent, const QVariantList &args);
 
 public Q_SLOTS:
-    virtual bool receivePackage(const NetworkPackage& np) override;
+    bool receivePackage(const NetworkPackage& np) override;
-    virtual void connected() override { }
+    void connected() override { }
 
 private Q_SLOTS:
     void propertiesChanged(const QString& propertyInterface, const QVariantMap& properties);

plugins/mprisremote/mprisremoteplugin.h

@@ -43,7 +43,7 @@ class Q_DECL_EXPORT MprisRemotePlugin
 
 public:
     explicit MprisRemotePlugin(QObject *parent, const QVariantList &args);
-    virtual ~MprisRemotePlugin();
+    ~MprisRemotePlugin() override;
 
     long position() const;
     int volume() const { return m_volume; }
@@ -58,8 +58,8 @@ public:
     void setPlayer(const QString& player);
 
 public Q_SLOTS:
-    virtual bool receivePackage(const NetworkPackage& np);
+    bool receivePackage(const NetworkPackage& np) override;
-    virtual void connected();
+    void connected() override;
 
     void seek(int offset) const;
     void requestPlayerStatus();

plugins/notifications/notification.h

@@ -39,7 +39,7 @@ class Notification
 
 public:
     Notification(const NetworkPackage& np, const QString& iconPath, QObject* parent);
-    virtual ~Notification();
+    ~Notification() override;
 
     QString internalId() const { return mInternalId; }
     QString appName() const { return mAppName; }

plugins/notifications/notificationsdbusinterface.h

@@ -40,7 +40,7 @@ class NotificationsDbusInterface
 
 public:
     explicit NotificationsDbusInterface(KdeConnectPlugin* plugin);
-    virtual ~NotificationsDbusInterface();
+    ~NotificationsDbusInterface() override;
 
     void processPackage(const NetworkPackage& np);
     void clearNotifications();

plugins/notifications/notificationsplugin.h

@@ -42,11 +42,11 @@ class NotificationsPlugin
 
 public:
     explicit NotificationsPlugin(QObject *parent, const QVariantList &args);
-    virtual ~NotificationsPlugin();
+    ~NotificationsPlugin() override;
     
 public Q_SLOTS:
-    virtual bool receivePackage(const NetworkPackage& np) override;
+    bool receivePackage(const NetworkPackage& np) override;
-    virtual void connected() override;
+    void connected() override;
 
 protected:
     NotificationsDbusInterface* notificationsDbusInterface;

plugins/pausemusic/pausemusic_config.h

@@ -33,12 +33,12 @@ class PauseMusicConfig
     Q_OBJECT
 public:
     PauseMusicConfig(QWidget *parent, const QVariantList&);
-    virtual ~PauseMusicConfig();
+    ~PauseMusicConfig() override;
 
 public Q_SLOTS:
-    virtual void save() override;
+    void save() override;
-    virtual void load() override;
+    void load() override;
-    virtual void defaults() override;
+    void defaults() override;
 
 private:
     Ui::PauseMusicConfigUi* m_ui;

plugins/pausemusic/pausemusicplugin.h

@@ -36,8 +36,8 @@ public:
     explicit PauseMusicPlugin(QObject *parent, const QVariantList &args);
 
 public Q_SLOTS:
-    virtual bool receivePackage(const NetworkPackage& np) override;
+    bool receivePackage(const NetworkPackage& np) override;
-    virtual void connected() override { }
+    void connected() override { }
 
     /**
      * @returns 0 if not muted, 1 if muted or -1 if there was an error

plugins/ping/pingplugin.h

@@ -35,14 +35,14 @@ class Q_DECL_EXPORT PingPlugin
 
 public:
     explicit PingPlugin(QObject *parent, const QVariantList &args);
-    virtual ~PingPlugin();
+    ~PingPlugin() override;
 
     Q_SCRIPTABLE void sendPing();
     Q_SCRIPTABLE void sendPing(const QString& customMessage);
 
 public Q_SLOTS:
-    virtual bool receivePackage(const NetworkPackage& np) override;
+    bool receivePackage(const NetworkPackage& np) override;
-    virtual void connected() override;
+    void connected() override;
 
 private:
     QString dbusPath() const;

plugins/runcommand/runcommand_config.h

@@ -31,12 +31,12 @@ class RunCommandConfig
     Q_OBJECT
 public:
     RunCommandConfig(QWidget *parent, const QVariantList&);
-    virtual ~RunCommandConfig();
+    ~RunCommandConfig() override;
 
 public Q_SLOTS:
-    virtual void save() Q_DECL_OVERRIDE;
+    void save() override;
-    virtual void load() Q_DECL_OVERRIDE;
+    void load() override;
-    virtual void defaults() Q_DECL_OVERRIDE;
+    void defaults() override;
 
 private Q_SLOTS:
     void onDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight);

plugins/runcommand/runcommandplugin.h

@@ -37,12 +37,12 @@ class Q_DECL_EXPORT RunCommandPlugin
 
 public:
     explicit RunCommandPlugin(QObject *parent, const QVariantList &args);
-    virtual ~RunCommandPlugin();
+    ~RunCommandPlugin() override;
 
 
 public Q_SLOTS:
-    virtual bool receivePackage(const NetworkPackage& np);
+    bool receivePackage(const NetworkPackage& np) override;
-    virtual void connected();
+    void connected() override;
 
 private Q_SLOTS:
     void configChanged();

plugins/screensaver-inhibit/screensaverinhibitplugin.h

@@ -32,11 +32,11 @@ class Q_DECL_EXPORT ScreensaverInhibitPlugin
 
 public:
     explicit ScreensaverInhibitPlugin(QObject *parent, const QVariantList &args);
-    virtual ~ScreensaverInhibitPlugin();
+    ~ScreensaverInhibitPlugin() override;
 
 public Q_SLOTS:
-    virtual bool receivePackage(const NetworkPackage& np) override;
+    bool receivePackage(const NetworkPackage& np) override;
-    virtual void connected() override;
+    void connected() override;
 
 private:
     uint inhibitCookie;

plugins/sendnotifications/notificationslistener.h

@@ -32,7 +32,7 @@ class NotificationsListener : public QDBusAbstractAdaptor
 
 public:
     explicit NotificationsListener(KdeConnectPlugin* aPlugin);
-    virtual ~NotificationsListener();
+    ~NotificationsListener() override;
 
 protected:
     KdeConnectPlugin* mPlugin;

plugins/sendnotifications/notifyingapplicationmodel.h

@@ -31,15 +31,15 @@ class NotifyingApplicationModel: public QAbstractTableModel
 
 public:
     explicit NotifyingApplicationModel(QObject *parent = nullptr);
-    virtual ~NotifyingApplicationModel();
+    ~NotifyingApplicationModel() override;
 
-    virtual QVariant data(const QModelIndex& index, int role) const override;
+    QVariant data(const QModelIndex& index, int role) const override;
-    virtual bool setData(const QModelIndex &index, const QVariant &value, int role) override;
+    bool setData(const QModelIndex &index, const QVariant &value, int role) override;
-    virtual int rowCount(const QModelIndex& parent = QModelIndex()) const override;
+    int rowCount(const QModelIndex& parent = QModelIndex()) const override;
-    virtual int columnCount(const QModelIndex& parent = QModelIndex()) const override;
+    int columnCount(const QModelIndex& parent = QModelIndex()) const override;
-    virtual Qt::ItemFlags flags(const QModelIndex & index) const override;
+    Qt::ItemFlags flags(const QModelIndex & index) const override;
-    virtual QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
+    QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
-    virtual void sort(int column, Qt::SortOrder order = Qt::AscendingOrder) override;
+    void sort(int column, Qt::SortOrder order = Qt::AscendingOrder) override;
 
     QVector<NotifyingApplication> apps();
     void clearApplications();

plugins/sendnotifications/sendnotifications_config.h

@@ -35,12 +35,12 @@ class SendNotificationsConfig
     Q_OBJECT
 public:
     SendNotificationsConfig(QWidget *parent, const QVariantList&);
-    virtual ~SendNotificationsConfig();
+    ~SendNotificationsConfig() override;
 
 public Q_SLOTS:
-    virtual void save() override;
+    void save() override;
-    virtual void load() override;
+    void load() override;
-    virtual void defaults() override;
+    void defaults() override;
 
 private Q_SLOTS:
     void loadApplications();

plugins/sendnotifications/sendnotificationsplugin.h

@@ -41,11 +41,11 @@ class SendNotificationsPlugin
 
 public:
     explicit SendNotificationsPlugin(QObject *parent, const QVariantList &args);
-    virtual ~SendNotificationsPlugin();
+    ~SendNotificationsPlugin() override;
     
 public Q_SLOTS:
-    virtual bool receivePackage(const NetworkPackage& np) override;
+    bool receivePackage(const NetworkPackage& np) override;
-    virtual void connected() override;
+    void connected() override;
 
 protected:
     NotificationsListener* notificationsListener;

plugins/sftp/mounter.h

@@ -35,7 +35,7 @@ class Mounter
 public:
   
     explicit Mounter(SftpPlugin *sftp);
-    virtual ~Mounter();
+    ~Mounter() override;
     
     bool wait();
     bool isMounted() const { return m_started; }

plugins/sftp/sftpplugin.h

@@ -36,7 +36,7 @@ class SftpPlugin
     
 public:
     explicit SftpPlugin(QObject *parent, const QVariantList &args);
-    virtual ~SftpPlugin();
+    ~SftpPlugin() override;
 
 Q_SIGNALS:
     void packageReceived(const NetworkPackage& np);
@@ -44,8 +44,8 @@ Q_SIGNALS:
     Q_SCRIPTABLE void unmounted();
     
 public Q_SLOTS:
-    virtual bool receivePackage(const NetworkPackage& np) override;
+    bool receivePackage(const NetworkPackage& np) override;
-    virtual void connected() override;
+    void connected() override;
 
     Q_SCRIPTABLE void mount();
     Q_SCRIPTABLE void unmount();

plugins/share/autoclosingqfile.h

@@ -29,7 +29,7 @@ class AutoClosingQFile : public QFile
 public:
 
     explicit AutoClosingQFile(const QString &name);
-    qint64 readData(char* data, qint64 maxlen) Q_DECL_OVERRIDE {
+    qint64 readData(char* data, qint64 maxlen) override {
         qint64 read = QFile::readData(data, maxlen);
         if (read == -1 || read == bytesAvailable()) {
             close();

plugins/share/share_config.h

@@ -33,12 +33,12 @@ class ShareConfig
     Q_OBJECT
 public:
     ShareConfig(QWidget *parent, const QVariantList&);
-    virtual ~ShareConfig();
+    ~ShareConfig() override;
 
 public Q_SLOTS:
-    virtual void save() override;
+    void save() override;
-    virtual void load() override;
+    void load() override;
-    virtual void defaults() override;
+    void defaults() override;
 
 private:
     Ui::ShareConfigUi* m_ui;

plugins/share/shareplugin.h

@@ -40,8 +40,8 @@ public:
     ///Helper method, QDBus won't recognize QUrl
     Q_SCRIPTABLE void shareUrl(const QString& url) { shareUrl(QUrl(url)); }
 public Q_SLOTS:
-    virtual bool receivePackage(const NetworkPackage& np) override;
+    bool receivePackage(const NetworkPackage& np) override;
-    virtual void connected() override;
+    void connected() override;
 
 private Q_SLOTS:
     void finished(KJob*);

plugins/telepathy/telepathy-cm/connection.h

@@ -24,7 +24,7 @@ public:
     ConnectConnection(const QDBusConnection &dbusConnection,
             const QString &cmName, const QString &protocolName,
             const QVariantMap &parameters);
-    ~ConnectConnection();
+    ~ConnectConnection() override;
 
     static Tp::SimpleStatusSpecMap getSimpleStatusSpecMap();
 

plugins/telepathy/telepathy-cm/protocol.h

@@ -26,7 +26,7 @@ class KDEConnectTelepathyProtocol : public Tp::BaseProtocol
 
 public:
     KDEConnectTelepathyProtocol(const QDBusConnection &dbusConnection, const QString &name);
-    virtual ~KDEConnectTelepathyProtocol();
+    ~KDEConnectTelepathyProtocol() override;
 
     QString connectionManagerName() const;
     void setConnectionManagerName(const QString &newName);

plugins/telepathy/telepathy-cm/textchannel.h

@@ -25,7 +25,7 @@ class ConnectTextChannel : public Tp::BaseChannelTextType
     Q_OBJECT
 public:
     static ConnectTextChannelPtr create(QObject *connection, Tp::BaseChannel *baseChannel, uint targetHandle, const QString &identifier);
-    virtual ~ConnectTextChannel();
+    ~ConnectTextChannel() override;
 
     QString sendMessageCallback(const Tp::MessagePartList &messageParts, uint flags, Tp::DBusError *error);
 

plugins/telepathy/telepathyplugin.h

@@ -41,7 +41,7 @@ public:
     void connected() override {}
 
 public Q_SLOTS:
-    virtual bool receivePackage(const NetworkPackage& np) override;
+    bool receivePackage(const NetworkPackage& np) override;
 
 private Q_SLOTS:
     void sendSms(const QString& phoneNumber, const QString& messageBody);

plugins/telephony/sendsmsdialog.h

@@ -34,7 +34,7 @@ class SendSmsDialog : public QDialog
 
 public:
     explicit SendSmsDialog(const QString& originalMessage, const QString& phoneNumber, const QString& contactName, QWidget *parent = nullptr);
-    virtual QSize sizeHint() const override;
+    QSize sizeHint() const override;
 
 private Q_SLOTS:
     void sendButtonClicked();

plugins/telephony/telephonyplugin.h

@@ -40,9 +40,10 @@ class TelephonyPlugin
 public:
     explicit TelephonyPlugin(QObject *parent, const QVariantList &args);
 
+    bool receivePackage(const NetworkPackage& np) override;
+    void connected() override { }
+
 public Q_SLOTS:
-    virtual bool receivePackage(const NetworkPackage& np) override;
-    virtual void connected() override { }
     void sendMutePackage();
 
 private Q_SLOTS:

tests/testdaemon.h

@@ -33,7 +33,7 @@ public:
     {
     }
 
-    void reportError(const QString & title, const QString & description) Q_DECL_OVERRIDE
+    void reportError(const QString & title, const QString & description) override
     {
         qWarning() << "error:" << title << description;
     }
@@ -42,7 +42,7 @@ public:
         d->acceptPairing();
     }
 
-    QNetworkAccessManager* networkAccessManager() Q_DECL_OVERRIDE
+    QNetworkAccessManager* networkAccessManager() override
     {
         if (!m_nam) {
             m_nam = new KIO::AccessManager(this);

tests/testnotificationlistener.cpp

@@ -45,7 +45,7 @@ public:
     {
     }
 
-    virtual ~TestNotificationsPlugin() {};
+    ~TestNotificationsPlugin() override = default;
 
     // allow to access notificationsListener for testing:
     NotificationsListener* getNotificationsListener() const
@@ -75,7 +75,7 @@ public:
         , lastPackage(nullptr)
     {}
 
-    virtual ~TestDevice()
+    ~TestDevice() override
     {
         delete lastPackage;
     }
@@ -91,7 +91,7 @@ public:
     }
 
 public Q_SLOTS:
-    virtual bool sendPackage(NetworkPackage& np) override
+    bool sendPackage(NetworkPackage& np) override
     {
         ++sentPackages;
         // copy package manually to allow for inspection (can't use copy-constructor)
@@ -115,7 +115,7 @@ public:
         : NotificationsListener(aPlugin)
     {}
 
-    virtual ~TestedNotificationsListener()
+    ~TestedNotificationsListener() override
     {}
 
     QHash<QString, NotifyingApplication>& getApplications()