tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean up use of virtual and override keywords

Browse source 
Only use virtual when actually virtual, to override just use override.
This commit is contained in:
Aleix Pol 2016-06-20 09:05:02 +02:00
parent cc0fdacbf5
commit 596e4484f4
62 changed files with 157 additions and 155 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/backends/devicelink.h
View file

@ -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;

4
core/backends/lan/downloadjob.h
View file

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

10
core/backends/lan/landevicelink.h
View file

@ -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;
virtual void userRequestsUnpair() override;
void userRequestsPair() 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();

8
core/backends/lan/lanlinkprovider.h
View file

@ -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;
virtual void onStart() override;
virtual void onStop() override;
void onNetworkChange() override;
void onStart() override;
void onStop() override;
void connected();
void encrypted();
void connectError();

12
core/backends/lan/lanpairinghandler.h
View file

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

8
core/backends/lan/server.h
View file

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

2
core/backends/lan/uploadjob.h
View file

@ -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();

2
core/backends/linkprovider.h
View file

@ -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;

8
core/backends/loopback/loopbackdevicelink.h
View file

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

8
core/backends/loopback/loopbacklinkprovider.h
View file

@ -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;
virtual void onStop() override;
virtual void onNetworkChange() override;
void onStart() override;
void onStop() override;
void onNetworkChange() override;
private:
QPointer<LoopbackDeviceLink> loopbackDeviceLink;

2
core/backends/pairinghandler.h
View file

@ -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);

2
core/daemon.h
View file

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

3
core/device.h
View file

@ -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

4
core/filetransferjob.h
View file

@ -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();

2
core/kdeconnectplugin.h
View file

@ -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;

2
core/kdeconnectpluginconfig.h
View file

@ -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

6
daemon/kdeconnectd.cpp
View file

@ -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);

2
fileitemactionplugin/sendfileitemaction.h
View file

@ -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();

18
interfaces/dbusinterfaces.h
View file

@ -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

8
interfaces/devicesmodel.h
View file

@ -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;
virtual int rowCount(const QModelIndex& parent = QModelIndex()) const override;
QVariant data(const QModelIndex& index, int role) 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);

6
interfaces/devicessortproxymodel.h
View file

@ -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;
virtual bool filterAcceptsRow(int source_row, const QModelIndex& source_parent) const override;
virtual void setSourceModel(QAbstractItemModel *sourceModel) override;
bool lessThan(const QModelIndex& left, const QModelIndex& right) const override;
bool filterAcceptsRow(int source_row, const QModelIndex& source_parent) const override;
void setSourceModel(QAbstractItemModel *sourceModel) override;
public Q_SLOTS:
void sourceDataChanged();

8
interfaces/notificationsmodel.h
View file

@ -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;
virtual int rowCount(const QModelIndex& parent = QModelIndex()) const override;
QVariant data(const QModelIndex& index, int role) 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();

8
kcm/kcm.h
View file

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

2
kcmplugin/kdeconnectpluginkcm.h
View file

@ -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

4
plasmoid/declarativeplugin/kdeconnectdeclarativeplugin.h
View file

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

2
plasmoid/declarativeplugin/objectfactory.h
View file

@ -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();

2
plasmoid/declarativeplugin/processrunner.h
View file

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

2
plasmoid/declarativeplugin/responsewaiter.h
View file

@ -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);

2
plugins/battery/batterydbusinterface.h
View file

@ -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; }

6
plugins/battery/batteryplugin.h
View file

@ -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;
virtual void connected() override;
bool receivePackage(const NetworkPackage& np) override;
void connected() override;
private:
// Keep these values in sync with THRESHOLD* constants in

4
plugins/clipboard/clipboardplugin.h
View file

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

6
plugins/findmyphone/findmyphoneplugin.h
View file

@ -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();
virtual bool receivePackage(const NetworkPackage& np);
void connected() override;
bool receivePackage(const NetworkPackage& np) override;
private:
QString dbusPath() const;

2
plugins/lockdevice/lockdeviceplugin.h
View file

@ -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);

6
plugins/mousepad/mousepadplugin.h
View file

@ -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;
virtual void connected() override { }
bool receivePackage(const NetworkPackage& np) override;
void connected() override { }
private:
#if HAVE_X11

4
plugins/mpriscontrol/mpriscontrolplugin.h
View file

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

6
plugins/mprisremote/mprisremoteplugin.h
View file

@ -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);
virtual void connected();
bool receivePackage(const NetworkPackage& np) override;
void connected() override;
void seek(int offset) const;
void requestPlayerStatus();

2
plugins/notifications/notification.h
View file

@ -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; }

2
plugins/notifications/notificationsdbusinterface.h
View file

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

6
plugins/notifications/notificationsplugin.h
View file

@ -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;
virtual void connected() override;
bool receivePackage(const NetworkPackage& np) override;
void connected() override;
protected:
NotificationsDbusInterface* notificationsDbusInterface;

8
plugins/pausemusic/pausemusic_config.h
View file

@ -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;
virtual void load() override;
virtual void defaults() override;
void save() override;
void load() override;
void defaults() override;
private:
Ui::PauseMusicConfigUi* m_ui;

4
plugins/pausemusic/pausemusicplugin.h
View file

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

6
plugins/ping/pingplugin.h
View file

@ -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;
virtual void connected() override;
bool receivePackage(const NetworkPackage& np) override;
void connected() override;
private:
QString dbusPath() const;

8
plugins/runcommand/runcommand_config.h
View file

@ -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;
virtual void load() Q_DECL_OVERRIDE;
virtual void defaults() Q_DECL_OVERRIDE;
void save() override;
void load() override;
void defaults() override;
private Q_SLOTS:
void onDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight);

6
plugins/runcommand/runcommandplugin.h
View file

@ -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);
virtual void connected();
bool receivePackage(const NetworkPackage& np) override;
void connected() override;
private Q_SLOTS:
void configChanged();

6
plugins/screensaver-inhibit/screensaverinhibitplugin.h
View file

@ -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;
virtual void connected() override;
bool receivePackage(const NetworkPackage& np) override;
void connected() override;
private:
uint inhibitCookie;

2
plugins/sendnotifications/notificationslistener.h
View file

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

16
plugins/sendnotifications/notifyingapplicationmodel.h
View file

@ -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;
virtual bool setData(const QModelIndex &index, const QVariant &value, int role) override;
virtual int rowCount(const QModelIndex& parent = QModelIndex()) const override;
virtual int columnCount(const QModelIndex& parent = QModelIndex()) const override;
virtual Qt::ItemFlags flags(const QModelIndex & index) const override;
virtual QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
virtual void sort(int column, Qt::SortOrder order = Qt::AscendingOrder) override;
QVariant data(const QModelIndex& index, int role) const override;
bool setData(const QModelIndex &index, const QVariant &value, int role) override;
int rowCount(const QModelIndex& parent = QModelIndex()) const override;
int columnCount(const QModelIndex& parent = QModelIndex()) const override;
Qt::ItemFlags flags(const QModelIndex & index) const override;
QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
void sort(int column, Qt::SortOrder order = Qt::AscendingOrder) override;
QVector<NotifyingApplication> apps();
void clearApplications();

8
plugins/sendnotifications/sendnotifications_config.h
View file

@ -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;
virtual void load() override;
virtual void defaults() override;
void save() override;
void load() override;
void defaults() override;
private Q_SLOTS:
void loadApplications();

6
plugins/sendnotifications/sendnotificationsplugin.h
View file

@ -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;
virtual void connected() override;
bool receivePackage(const NetworkPackage& np) override;
void connected() override;
protected:
NotificationsListener* notificationsListener;

2
plugins/sftp/mounter.h
View file

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

6
plugins/sftp/sftpplugin.h
View file

@ -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;
virtual void connected() override;
bool receivePackage(const NetworkPackage& np) override;
void connected() override;
Q_SCRIPTABLE void mount();
Q_SCRIPTABLE void unmount();

2
plugins/share/autoclosingqfile.h
View file

@ -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();

8
plugins/share/share_config.h
View file

@ -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;
virtual void load() override;
virtual void defaults() override;
void save() override;
void load() override;
void defaults() override;
private:
Ui::ShareConfigUi* m_ui;

4
plugins/share/shareplugin.h
View file

@ -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;
virtual void connected() override;
bool receivePackage(const NetworkPackage& np) override;
void connected() override;
private Q_SLOTS:
void finished(KJob*);

2
plugins/telepathy/telepathy-cm/connection.h
View file

@ -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();

2
plugins/telepathy/telepathy-cm/protocol.h
View file

@ -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);

2
plugins/telepathy/telepathy-cm/textchannel.h
View file

@ -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);

2
plugins/telepathy/telepathyplugin.h
View file

@ -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);

2
plugins/telephony/sendsmsdialog.h
View file

@ -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();

5
plugins/telephony/telephonyplugin.h
View file

@ -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:

4
tests/testdaemon.h
View file

@ -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);

8
tests/testnotificationlistener.cpp
View file

@ -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()