Use override

parent 3e057091
......@@ -29,7 +29,7 @@ class BluetoothPlugin : public QQmlExtensionPlugin
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
public:
void registerTypes(const char *uri) Q_DECL_OVERRIDE;
void registerTypes(const char *uri) override;
};
#endif // BLUETOOTHPLUGIN_H
......@@ -36,9 +36,9 @@ public:
explicit DevicesProxyModel(QObject *parent = Q_NULLPTR);
QHash<int, QByteArray> roleNames() const Q_DECL_OVERRIDE;
QVariant data(const QModelIndex &index, int role) const Q_DECL_OVERRIDE;
bool lessThan(const QModelIndex &left, const QModelIndex &right) const Q_DECL_OVERRIDE;
QHash<int, QByteArray> roleNames() const override;
QVariant data(const QModelIndex &index, int role) const override;
bool lessThan(const QModelIndex &left, const QModelIndex &right) const override;
Q_INVOKABLE QString adapterHciString(const QString &ubi) const;
......
......@@ -35,7 +35,7 @@ class SendFileItemAction : public KAbstractFileItemActionPlugin
public:
SendFileItemAction(QObject *parent, const QVariantList&);
QList<QAction*> actions(const KFileItemListProperties &fileItemInfos, QWidget *parent) Q_DECL_OVERRIDE;
QList<QAction*> actions(const KFileItemListProperties &fileItemInfos, QWidget *parent) override;
private Q_SLOTS:
void deviceTriggered();
......
......@@ -98,9 +98,9 @@ class KCMBlueDevilAdapters : public KCModule
public:
KCMBlueDevilAdapters(QWidget *parent, const QVariantList&);
void load() Q_DECL_OVERRIDE;
void save() Q_DECL_OVERRIDE;
void defaults() Q_DECL_OVERRIDE;
void load() override;
void save() override;
void defaults() override;
private Q_SLOTS:
void initJobResult(BluezQt::InitManagerJob *job);
......
......@@ -48,8 +48,8 @@ class DevicesProxyModel : public QSortFilterProxyModel
public:
explicit DevicesProxyModel(QObject *parent = Q_NULLPTR);
QVariant data(const QModelIndex &index, int role) const Q_DECL_OVERRIDE;
bool lessThan(const QModelIndex &left, const QModelIndex &right) const Q_DECL_OVERRIDE;
QVariant data(const QModelIndex &index, int role) const override;
bool lessThan(const QModelIndex &left, const QModelIndex &right) const override;
private:
bool duplicateIndexAddress(const QModelIndex &idx) const;
......@@ -61,10 +61,10 @@ class KCMBlueDevilDevices : public KCModule
public:
KCMBlueDevilDevices(QWidget *parent, const QVariantList&);
~KCMBlueDevilDevices();
~KCMBlueDevilDevices() override;
void load() Q_DECL_OVERRIDE;
void save() Q_DECL_OVERRIDE;
void load() override;
void save() override;
private Q_SLOTS:
void initJobResult(BluezQt::InitManagerJob *job);
......
......@@ -40,7 +40,7 @@ class KCMBlueDevilGlobal : public KCModule
public:
KCMBlueDevilGlobal(QWidget *parent, const QVariantList&);
void save() Q_DECL_OVERRIDE;
void save() override;
private Q_SLOTS:
void initJobResult(BluezQt::InitManagerJob *job);
......
......@@ -40,7 +40,7 @@ class Q_DECL_EXPORT BlueDevilDaemon : public KDEDModule
public:
BlueDevilDaemon(QObject *parent, const QList<QVariant>&);
~BlueDevilDaemon();
~BlueDevilDaemon() override;
/**
* Returns whether the daemon is in online mode (eg. Bluez services are
......
......@@ -32,14 +32,14 @@ class BluezAgent : public BluezQt::Agent
public:
explicit BluezAgent(QObject *parent);
QDBusObjectPath objectPath() const Q_DECL_OVERRIDE;
void authorizeService(BluezQt::DevicePtr device, const QString &uuid, const BluezQt::Request<> &request) Q_DECL_OVERRIDE;
void requestPinCode(BluezQt::DevicePtr device, const BluezQt::Request<QString> &request) Q_DECL_OVERRIDE;
void requestPasskey(BluezQt::DevicePtr device, const BluezQt::Request<quint32> &request) Q_DECL_OVERRIDE;
void requestConfirmation(BluezQt::DevicePtr device, const QString &passkey, const BluezQt::Request<> &request) Q_DECL_OVERRIDE;
void requestAuthorization(BluezQt::DevicePtr device, const BluezQt::Request<> &request) Q_DECL_OVERRIDE;
void release() Q_DECL_OVERRIDE;
QDBusObjectPath objectPath() const override;
void authorizeService(BluezQt::DevicePtr device, const QString &uuid, const BluezQt::Request<> &request) override;
void requestPinCode(BluezQt::DevicePtr device, const BluezQt::Request<QString> &request) override;
void requestPasskey(BluezQt::DevicePtr device, const BluezQt::Request<quint32> &request) override;
void requestConfirmation(BluezQt::DevicePtr device, const QString &passkey, const BluezQt::Request<> &request) override;
void requestAuthorization(BluezQt::DevicePtr device, const BluezQt::Request<> &request) override;
void release() override;
Q_SIGNALS:
void agentReleased();
......
......@@ -37,8 +37,8 @@ public:
bool shouldAutoAcceptTransfer(const QString &address) const;
QDBusObjectPath objectPath() const Q_DECL_OVERRIDE;
void authorizePush(BluezQt::ObexTransferPtr transfer, BluezQt::ObexSessionPtr session, const BluezQt::Request<QString> &request) Q_DECL_OVERRIDE;
QDBusObjectPath objectPath() const override;
void authorizePush(BluezQt::ObexTransferPtr transfer, BluezQt::ObexSessionPtr session, const BluezQt::Request<QString> &request) override;
private Q_SLOTS:
void receiveFileJobFinished(KJob *job);
......
......@@ -39,8 +39,8 @@ public:
QString deviceAddress() const;
void start() Q_DECL_OVERRIDE;
bool doKill() Q_DECL_OVERRIDE;
void start() override;
bool doKill() override;
private Q_SLOTS:
void init();
......
......@@ -55,7 +55,7 @@ public:
* get function shall not do much other than setting a mimetype and returning some data that
* could be useful for the mimetype handler.
*/
void get(const QUrl &url) Q_DECL_OVERRIDE;
void get(const QUrl &url) override;
/**
* List current directory. There are two types of current directories in this kio:
......@@ -65,16 +65,16 @@ public:
* 2. Remote device directory (something like bluetoth:/00_12_34_56_6d_34). This directory lists
* the services provided by the given remote device.
*/
void listDir(const QUrl &url) Q_DECL_OVERRIDE;
void listDir(const QUrl &url) override;
void stat(const QUrl &url) Q_DECL_OVERRIDE;
void stat(const QUrl &url) override;
/**
* As at the momento we don't handle more than one level url paths, @p setHost has not much
* difference with @p listDir
*
*/
void setHost(const QString &hostname, quint16 port, const QString &user, const QString &pass) Q_DECL_OVERRIDE;
void setHost(const QString &hostname, quint16 port, const QString &user, const QString &pass) override;
/**
* Returns a list of supported service names corresponding to the given uuids list. If an uuid is
......
......@@ -39,14 +39,14 @@ class KioFtp : public QObject, public KIO::SlaveBase
public:
KioFtp(const QByteArray &pool, const QByteArray &app);
void copy(const QUrl &src, const QUrl &dest, int permissions, KIO::JobFlags flags) Q_DECL_OVERRIDE;
void listDir(const QUrl &url) Q_DECL_OVERRIDE;
void setHost(const QString &host, quint16 port, const QString &user, const QString &pass) Q_DECL_OVERRIDE;
void stat(const QUrl &url) Q_DECL_OVERRIDE;
void del(const QUrl &url, bool isfile) Q_DECL_OVERRIDE;
void mkdir(const QUrl &url, int permissions) Q_DECL_OVERRIDE;
void rename(const QUrl &src, const QUrl &dest, KIO::JobFlags flags) Q_DECL_OVERRIDE;
void get(const QUrl &url) Q_DECL_OVERRIDE;
void copy(const QUrl &src, const QUrl &dest, int permissions, KIO::JobFlags flags) override;
void listDir(const QUrl &url) override;
void setHost(const QString &host, quint16 port, const QString &user, const QString &pass) override;
void stat(const QUrl &url) override;
void del(const QUrl &url, bool isfile) override;
void mkdir(const QUrl &url, int permissions) override;
void rename(const QUrl &src, const QUrl &dest, KIO::JobFlags flags) override;
void get(const QUrl &url) override;
bool cancelTransfer(const QString &transfer);
......
......@@ -34,7 +34,7 @@ class TransferFileJob : public KJob
public:
explicit TransferFileJob(BluezQt::ObexTransferPtr transfer, KioFtp *parent = 0);
void start() Q_DECL_OVERRIDE;
void start() override;
private Q_SLOTS:
void doStart();
......
......@@ -47,8 +47,8 @@ public:
void setDevicesModel(BluezQt::DevicesModel *model);
QVariant data(const QModelIndex &index, int role) const Q_DECL_OVERRIDE;
bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const Q_DECL_OVERRIDE;
QVariant data(const QModelIndex &index, int role) const override;
bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
BluezQt::DevicePtr device(const QModelIndex &index) const;
......
......@@ -38,8 +38,8 @@ class ConnectingPage : public QWizardPage, public Ui::Connecting
public:
explicit ConnectingPage(SendFileWizard *wizard = Q_NULLPTR);
void initializePage() Q_DECL_OVERRIDE;
bool isComplete() const Q_DECL_OVERRIDE;
void initializePage() override;
bool isComplete() const override;
private Q_SLOTS:
void initJobResult(BluezQt::InitObexManagerJob *job);
......
......@@ -35,7 +35,7 @@ class FailPage : public QWizardPage, Ui::FailPage
public:
explicit FailPage(SendFileWizard *parent = Q_NULLPTR);
void initializePage() Q_DECL_OVERRIDE;
void initializePage() override;
private:
SendFileWizard *m_wizard;
......
......@@ -38,7 +38,7 @@ class SelectDeviceAndFilesPage : public QWizardPage, public Ui::SelectFileDiscov
public:
explicit SelectDeviceAndFilesPage(SendFileWizard *wizard);
bool isComplete() const Q_DECL_OVERRIDE;
bool isComplete() const override;
private Q_SLOTS:
void deviceSelected(BluezQt::DevicePtr device);
......
......@@ -38,7 +38,7 @@ class SelectDevicePage : public QWizardPage, public Ui::SelectFileDiscover
public:
explicit SelectDevicePage(SendFileWizard *wizard);
bool isComplete() const Q_DECL_OVERRIDE;
bool isComplete() const override;
private Q_SLOTS:
void deviceSelected(BluezQt::DevicePtr device);
......
......@@ -34,8 +34,8 @@ class SelectFilesPage : public QWizardPage
public:
explicit SelectFilesPage(QWidget *parent = 0);
void initializePage() Q_DECL_OVERRIDE;
bool isComplete() const Q_DECL_OVERRIDE;
void initializePage() override;
bool isComplete() const override;
private Q_SLOTS:
void selectionChanged();
......
......@@ -44,8 +44,8 @@ class SendFilesJob : public KJob
public:
explicit SendFilesJob(const QStringList &files, BluezQt::DevicePtr device, const QDBusObjectPath &session, QObject *parent = Q_NULLPTR);
void start() Q_DECL_OVERRIDE;
bool doKill() Q_DECL_OVERRIDE;
void start() override;
bool doKill() override;
private Q_SLOTS:
void doStart();
......
......@@ -41,9 +41,9 @@ class SendFileWizard : public QWizard
public:
explicit SendFileWizard(const QString &device, const QStringList &files);
~SendFileWizard();
~SendFileWizard() override;
void done(int result) Q_DECL_OVERRIDE;
void done(int result) override;
BluezQt::Manager *manager() const;
......
......@@ -51,7 +51,7 @@ private Q_SLOTS:
void operationalChanged(bool operational);
private:
void done(int result) Q_DECL_OVERRIDE;
void done(int result) override;
BluezQt::Manager *m_manager;
WizardAgent *m_agent;
......
......@@ -41,8 +41,8 @@ class ConnectPage : public QWizardPage, Ui::Connect
public:
explicit ConnectPage(BlueWizard *parent = 0);
int nextId() const Q_DECL_OVERRIDE;
void initializePage() Q_DECL_OVERRIDE;
int nextId() const override;
void initializePage() override;
protected:
QList<QWizard::WizardButton> wizardButtonsLayout() const;
......
......@@ -44,9 +44,9 @@ public:
void setDevicesModel(BluezQt::DevicesModel *model);
QVariant data(const QModelIndex &index, int role) const Q_DECL_OVERRIDE;
bool lessThan(const QModelIndex &left, const QModelIndex &right) const Q_DECL_OVERRIDE;
bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const Q_DECL_OVERRIDE;
QVariant data(const QModelIndex &index, int role) const override;
bool lessThan(const QModelIndex &left, const QModelIndex &right) const override;
bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
BluezQt::DevicePtr device(const QModelIndex &index) const;
......
......@@ -36,9 +36,9 @@ class DiscoverPage : public QWizardPage, public Ui::Discover
public:
explicit DiscoverPage(BlueWizard *parent = 0);
void initializePage() Q_DECL_OVERRIDE;
bool isComplete() const Q_DECL_OVERRIDE;
int nextId() const Q_DECL_OVERRIDE;
void initializePage() override;
bool isComplete() const override;
int nextId() const override;
private Q_SLOTS:
void indexSelected(const QModelIndex &index);
......
......@@ -36,7 +36,7 @@ class FailPage : public QWizardPage, Ui::Fail
public:
explicit FailPage(BlueWizard *parent = 0);
void initializePage() Q_DECL_OVERRIDE;
void initializePage() override;
private:
BlueWizard *m_wizard;
......
......@@ -38,8 +38,8 @@ class PairingPage : public QWizardPage, Ui::Pairing
public:
explicit PairingPage(BlueWizard *parent = Q_NULLPTR);
int nextId() const Q_DECL_OVERRIDE;
void initializePage() Q_DECL_OVERRIDE;
int nextId() const override;
void initializePage() override;
public Q_SLOTS:
void pairingFinished(BluezQt::PendingCall *call);
......
......@@ -37,8 +37,8 @@ class SuccessPage : public QWizardPage, Ui::Success
public:
explicit SuccessPage(BlueWizard *parent = 0);
int nextId() const Q_DECL_OVERRIDE;
void initializePage() Q_DECL_OVERRIDE;
int nextId() const override;
void initializePage() override;
private:
BlueWizard *m_wizard;
......
......@@ -36,13 +36,13 @@ public:
bool isFromDatabase();
QString getPin(BluezQt::DevicePtr device);
QDBusObjectPath objectPath() const Q_DECL_OVERRIDE;
QDBusObjectPath objectPath() const override;
void requestPinCode(BluezQt::DevicePtr device, const BluezQt::Request<QString> &req) Q_DECL_OVERRIDE;
void displayPinCode(BluezQt::DevicePtr device, const QString &pinCode) Q_DECL_OVERRIDE;
void requestPasskey(BluezQt::DevicePtr device, const BluezQt::Request<quint32> &req) Q_DECL_OVERRIDE;
void displayPasskey(BluezQt::DevicePtr device, const QString &passkey, const QString &entered) Q_DECL_OVERRIDE;
void requestConfirmation(BluezQt::DevicePtr device, const QString &passkey, const BluezQt::Request<> &req) Q_DECL_OVERRIDE;
void requestPinCode(BluezQt::DevicePtr device, const BluezQt::Request<QString> &req) override;
void displayPinCode(BluezQt::DevicePtr device, const QString &pinCode) override;
void requestPasskey(BluezQt::DevicePtr device, const BluezQt::Request<quint32> &req) override;
void displayPasskey(BluezQt::DevicePtr device, const QString &passkey, const QString &entered) override;
void requestConfirmation(BluezQt::DevicePtr device, const QString &passkey, const BluezQt::Request<> &req) override;
Q_SIGNALS:
void pinRequested(const QString &pin);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment