[Development] Qt 5.5.0 header diff: QtDBus.diff

[Frederik Gladhorn]

diff --git a/src/dbus/qdbusabstractadaptor.h b/src/dbus/qdbusabstractadaptor.h
index 7344335..0ceb331 100644
--- a/src/dbus/qdbusabstractadaptor.h
+++ b/src/dbus/qdbusabstractadaptor.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/qdbusargument.h b/src/dbus/qdbusargument.h
index 83300c7..42b2667 100644
--- a/src/dbus/qdbusargument.h
+++ b/src/dbus/qdbusargument.h
@@ -35,6 +36,7 @@
 #define QDBUSCONNECTION_H
 
 #include <QtDBus/qdbusmacros.h>
+#include <QtCore/qobjectdefs.h>
 #include <QtCore/qstring.h>
 
 #ifndef QT_NO_DBUS
@@ -159,6 +161,8 @@ public:
 
     bool registerObject(const QString &path, QObject *object,
                         RegisterOptions options = ExportAdaptors);
+    bool registerObject(const QString &path, const QString &interface, QObject *object,
+                        RegisterOptions options = ExportAdaptors);
     void unregisterObject(const QString &path, UnregisterMode mode = UnregisterNode);
     QObject *objectRegisteredAt(const QString &path) const;
 
@@ -183,7 +187,10 @@ public:
     static QDBusConnection sessionBus();
     static QDBusConnection systemBus();
 
-    static QDBusConnection sender();
+#if QT_DEPRECATED_SINCE(5,5)
+    static QT_DEPRECATED_X("This function no longer works, use QDBusContext instead")
+    QDBusConnection sender();
+#endif
 
 protected:
     explicit QDBusConnection(QDBusConnectionPrivate *dd);
diff --git a/src/dbus/qdbusconnectioninterface.h b/src/dbus/qdbusconnectioninterface.h
index ed267ec..acbb7b2 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/qdbuscontext.h b/src/dbus/qdbuscontext.h
index e3e5f1b..004034c 100644
--- a/src/dbus/qdbuscontext.h
+++ b/src/dbus/qdbuscontext.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)
diff --git a/src/dbus/qdbusmacros.h b/src/dbus/qdbusmacros.h
index 5bdc63b..1f774b0 100644
--- a/src/dbus/qdbusmacros.h
+++ b/src/dbus/qdbusmacros.h
@@ -79,7 +79,11 @@ public:
     inline QDBusMessage createReply(const QVariant &argument) const
     { return createReply(QList<QVariant>() << argument); }
 
+#if QT_VERSION >= QT_VERSION_CHECK(6,0,0)
+    QDBusMessage createErrorReply(const QString &name, const QString &msg) const;
+#else
     QDBusMessage createErrorReply(const QString name, const QString &msg) const;
+#endif
     inline QDBusMessage createErrorReply(const QDBusError &err) const
     { return createErrorReply(err.name(), err.message()); }
     QDBusMessage createErrorReply(QDBusError::ErrorType type, const QString &msg) const;
diff --git a/src/dbus/qdbusmetatype.h b/src/dbus/qdbusmetatype.h
index ccf4334..bc051fb 100644
--- a/src/dbus/qdbusmetatype.h
+++ b/src/dbus/qdbusmetatype.h
@@ -139,9 +139,8 @@ public:
 
     inline int count() const { return Count; }
 
-#if defined(Q_QDOC) || defined(Q_NO_USING_KEYWORD)
-    inline QVariant argumentAt(int index) const
-    { return QDBusPendingReplyData::argumentAt(index); }
+#if defined(Q_QDOC)
+    QVariant argumentAt(int index) const;
 #else
     using QDBusPendingReplyData::argumentAt;
 #endif
diff --git a/src/dbus/qdbusreply.h b/src/dbus/qdbusreply.h
index 0a9f9a5..56830f6 100644
--- a/src/dbus/qdbusreply.h
+++ b/src/dbus/qdbusreply.h

_______________________________________________
Development mailing list
Development@qt-project.org
http://lists.qt-project.org/mailman/listinfo/development