Mark QObject::disconnect overload const

Consistency with the non-static connect overload

Task-number: QTBUG-23622
Task-number: QTBUG-1772
Change-Id: Ic09df9cca1feaabb6b5cf335f04a0d6d4bbf011f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
index ad57362..833755f 100644 (file)
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
@@ -2817,7 +2817,7 @@ bool QObject::disconnect(const QObject *sender, const QMetaMethod &signal,
 /*!
     \threadsafe
 
-    \fn bool QObject::disconnect(const char *signal, const QObject *receiver, const char *method)
+    \fn bool QObject::disconnect(const char *signal, const QObject *receiver, const char *method) const
     \overload disconnect()
 
     Disconnects \a signal from \a method of \a receiver.
@@ -2827,7 +2827,7 @@ bool QObject::disconnect(const QObject *sender, const QMetaMethod &signal,
 */
 
 /*!
-    \fn bool QObject::disconnect(const QObject *receiver, const char *method)
+    \fn bool QObject::disconnect(const QObject *receiver, const char *method) const
     \overload disconnect()
 
     Disconnects all signals in this object from \a receiver's \a

diff --git a/src/corelib/kernel/qobject.h b/src/corelib/kernel/qobject.h
index 37057be..bbb583e 100644 (file)
--- a/src/corelib/kernel/qobject.h
+++ b/src/corelib/kernel/qobject.h
@@ -294,9 +294,9 @@ public:
     static bool disconnect(const QObject *sender, const QMetaMethod &signal,
                            const QObject *receiver, const QMetaMethod &member);
     inline bool disconnect(const char *signal = 0,
-                           const QObject *receiver = 0, const char *member = 0)
+                           const QObject *receiver = 0, const char *member = 0) const
         { return disconnect(this, signal, receiver, member); }
-    inline bool disconnect(const QObject *receiver, const char *member = 0)
+    inline bool disconnect(const QObject *receiver, const char *member = 0) const
         { return disconnect(this, 0, receiver, member); }
     static bool disconnect(const QMetaObject::Connection &);