Changeset 651 for trunk/src/corelib/kernel/qobject.cpp

Timestamp:

Mar 8, 2010, 12:52:58 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.2 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/corelib/kernel/qobject.cpp (modified) (8 diffs)

trunk/src/corelib/kernel/qobject.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -2946 +2946 @@
 }
 
-
 /*!\internal
  */
@@ -2955 +2954 @@
     return QMetaObjectPrivate::disconnect(sender, signal_index,
                                           receiver, method_index);
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }
 
@@ -2962 +2976 @@
 bool QMetaObjectPrivate::disconnectHelper(QObjectPrivate::Connection *c,
                                           const QObject *receiver, int method_index,
-                                          QMutex *senderMutex)
+                                          QMutex *senderMutex)
 {
     bool success = false;
@@ -2988 +3002 @@
 
             success = true;
+
+
+
         }
         c = c->nextConnectionList;
@@ -2998 +3015 @@
  */
 bool QMetaObjectPrivate::disconnect(const QObject *sender, int signal_index,
-                                    const QObject *receiver, int method_index)
+                                    const QObject *receiver, int method_index,
+                                    DisconnectType disconnectType)
 {
     if (!sender)
@@ -3022 +3040 @@
             QObjectPrivate::Connection *c =
                 (*connectionLists)[signal_index].first;
-            if (disconnectHelper(c, receiver, method_index, senderMutex)) {
+            if (disconnectHelper(c, receiver, method_index, senderMutex)) {
                 success = true;
                 connectionLists->dirty = true;
@@ -3030 +3048 @@
         QObjectPrivate::Connection *c =
             (*connectionLists)[signal_index].first;
-        if (disconnectHelper(c, receiver, method_index, senderMutex)) {
+        if (disconnectHelper(c, receiver, method_index, senderMutex)) {
             success = true;
             connectionLists->dirty = true;