diff options
Diffstat (limited to 'src/dbus')
-rw-r--r-- | src/dbus/qdbusabstractinterface.h | 6 | ||||
-rw-r--r-- | src/dbus/qdbusconnection_p.h | 4 | ||||
-rw-r--r-- | src/dbus/qdbusconnectioninterface.h | 4 | ||||
-rw-r--r-- | src/dbus/qdbusintegrator_p.h | 4 | ||||
-rw-r--r-- | src/dbus/qdbusinterface.h | 6 |
5 files changed, 12 insertions, 12 deletions
diff --git a/src/dbus/qdbusabstractinterface.h b/src/dbus/qdbusabstractinterface.h index e01cfad36b..7ad0048246 100644 --- a/src/dbus/qdbusabstractinterface.h +++ b/src/dbus/qdbusabstractinterface.h @@ -56,7 +56,7 @@ class QDBusAbstractInterfacePrivate; class Q_DBUS_EXPORT QDBusAbstractInterfaceBase: public QObject { public: - int qt_metacall(QMetaObject::Call, int, void**); + int qt_metacall(QMetaObject::Call, int, void**) Q_DECL_OVERRIDE; protected: QDBusAbstractInterfaceBase(QDBusAbstractInterfacePrivate &dd, QObject *parent); private: @@ -136,8 +136,8 @@ protected: const QDBusConnection &connection, QObject *parent); QDBusAbstractInterface(QDBusAbstractInterfacePrivate &, QObject *parent); - void connectNotify(const QMetaMethod &signal); - void disconnectNotify(const QMetaMethod &signal); + void connectNotify(const QMetaMethod &signal) Q_DECL_OVERRIDE; + void disconnectNotify(const QMetaMethod &signal) Q_DECL_OVERRIDE; QVariant internalPropGet(const char *propname) const; void internalPropSet(const char *propname, const QVariant &value); QDBusMessage internalConstCall(QDBus::CallMode mode, diff --git a/src/dbus/qdbusconnection_p.h b/src/dbus/qdbusconnection_p.h index 00c3aced0e..dc83ee9af5 100644 --- a/src/dbus/qdbusconnection_p.h +++ b/src/dbus/qdbusconnection_p.h @@ -253,8 +253,8 @@ private: QString getNameOwnerNoCache(const QString &service); protected: - void customEvent(QEvent *e); - void timerEvent(QTimerEvent *e); + void customEvent(QEvent *e) Q_DECL_OVERRIDE; + void timerEvent(QTimerEvent *e) Q_DECL_OVERRIDE; public slots: // public slots diff --git a/src/dbus/qdbusconnectioninterface.h b/src/dbus/qdbusconnectioninterface.h index ed267ecc79..a6b18b7dc1 100644 --- a/src/dbus/qdbusconnectioninterface.h +++ b/src/dbus/qdbusconnectioninterface.h @@ -106,8 +106,8 @@ Q_SIGNALS: void NameLost(const QString &); void NameOwnerChanged(const QString &, const QString &, const QString &); protected: - void connectNotify(const QMetaMethod &); - void disconnectNotify(const QMetaMethod &); + void connectNotify(const QMetaMethod &) Q_DECL_OVERRIDE; + void disconnectNotify(const QMetaMethod &) Q_DECL_OVERRIDE; #endif }; diff --git a/src/dbus/qdbusintegrator_p.h b/src/dbus/qdbusintegrator_p.h index 38aad9fa86..116d77cca6 100644 --- a/src/dbus/qdbusintegrator_p.h +++ b/src/dbus/qdbusintegrator_p.h @@ -90,7 +90,7 @@ public: : QMetaCallEvent(0, id, 0, sender, -1), connection(c), message(msg), metaTypes(types), flags(f) { } - void placeMetaCall(QObject *object) + void placeMetaCall(QObject *object) Q_DECL_OVERRIDE { QDBusConnectionPrivate::d(connection)->deliverCall(object, flags, message, metaTypes, id()); } @@ -113,7 +113,7 @@ public: { } ~QDBusActivateObjectEvent(); - void placeMetaCall(QObject *); + void placeMetaCall(QObject *) Q_DECL_OVERRIDE; private: QDBusConnection connection; // just for refcounting diff --git a/src/dbus/qdbusinterface.h b/src/dbus/qdbusinterface.h index 04adaced88..8e6fe02f1f 100644 --- a/src/dbus/qdbusinterface.h +++ b/src/dbus/qdbusinterface.h @@ -55,9 +55,9 @@ public: QObject *parent = 0); ~QDBusInterface(); - virtual const QMetaObject *metaObject() const; - virtual void *qt_metacast(const char *); - virtual int qt_metacall(QMetaObject::Call, int, void **); + virtual const QMetaObject *metaObject() const Q_DECL_OVERRIDE; + virtual void *qt_metacast(const char *) Q_DECL_OVERRIDE; + virtual int qt_metacall(QMetaObject::Call, int, void **) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QDBusInterface) |