From 934d4b9852060b2870f6774cd854331422147d3e Mon Sep 17 00:00:00 2001
From: Olivier Goffart <ogoffart@trolltech.com>
Date: Tue, 8 Dec 2009 10:50:01 +0100
Subject: Use 64bit for the connectedSignals

as QML objects may have lots of signals

Do not use quint64 as it would produce lots of useless padding
on MSVC 32bit

Reviewed-by: Brad
---
 src/corelib/kernel/qobject.cpp     |  6 +++---
 src/corelib/kernel/qobject_p.h     | 11 ++++++-----
 tests/auto/qobject/tst_qobject.cpp |  8 ++++----
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
index 30cd011..85915c2 100644
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
@@ -145,7 +145,7 @@ QObjectPrivate::QObjectPrivate(int version)
     receiveChildEvents = true;
     postedEvents = 0;
     extraData = 0;
-    connectedSignals = 0;
+    connectedSignals[0] = connectedSignals[1] = 0;
     inEventHandler = false;
     inThreadChangeEvent = false;
     deleteWatch = 0;
@@ -2924,9 +2924,9 @@ bool QMetaObjectPrivate::connect(const QObject *sender, int signal_index,
 
     QObjectPrivate *const sender_d = QObjectPrivate::get(s);
     if (signal_index < 0) {
-        sender_d->connectedSignals = ~ulong(0);
+        sender_d->connectedSignals[0] = sender_d->connectedSignals[1] = ~0;
     } else if (signal_index < (int)sizeof(sender_d->connectedSignals) * 8) {
-        sender_d->connectedSignals |= ulong(1) << signal_index;
+        sender_d->connectedSignals[signal_index >> 5] |= (1 << (signal_index & 0x1f));
     }
 
     return true;
diff --git a/src/corelib/kernel/qobject_p.h b/src/corelib/kernel/qobject_p.h
index f899c78..d1841be 100644
--- a/src/corelib/kernel/qobject_p.h
+++ b/src/corelib/kernel/qobject_p.h
@@ -172,7 +172,7 @@ public:
     }
 
     int signalIndex(const char *signalName) const;
-    inline bool isSignalConnected(int signalIdx) const;
+    inline bool isSignalConnected(uint signalIdx) const;
 
 public:
     QString objectName;
@@ -183,7 +183,7 @@ public:
 
     Connection *senders;     // linked list of connections connected to this object
     Sender *currentSender;   // object currently activating the object
-    mutable ulong connectedSignals;
+    mutable quint32 connectedSignals[2];
 
 #ifdef QT3_SUPPORT
     QList<QObject *> pendingChildInsertedEvents;
@@ -205,6 +205,7 @@ public:
     int *deleteWatch;
 };
 
+
 /*! \internal
 
   Returns true if the signal with index \a signal_index from object \a sender is connected.
@@ -213,12 +214,12 @@ public:
 
   \a signal_index must be the index returned by QObjectPrivate::signalIndex;
 */
-inline bool QObjectPrivate::isSignalConnected(int signal_index) const
+inline bool QObjectPrivate::isSignalConnected(uint signal_index) const
 {
-    return signal_index >= (int)sizeof(connectedSignals) * 8
+    return signal_index >= sizeof(connectedSignals) * 8
         || qt_signal_spy_callback_set.signal_begin_callback
         || qt_signal_spy_callback_set.signal_end_callback
-        || (connectedSignals & (ulong(1) << signal_index));
+        || (connectedSignals[signal_index >> 5] & (1 << (signal_index & 0x1f)));
 }
 
 
diff --git a/tests/auto/qobject/tst_qobject.cpp b/tests/auto/qobject/tst_qobject.cpp
index 67a9c46..a2524aa 100644
--- a/tests/auto/qobject/tst_qobject.cpp
+++ b/tests/auto/qobject/tst_qobject.cpp
@@ -3058,10 +3058,8 @@ void tst_QObject::isSignalConnected()
     QVERIFY(!priv->isSignalConnected(priv->signalIndex("sig05()")));
     QVERIFY(!priv->isSignalConnected(priv->signalIndex("sig15()")));
     QVERIFY(!priv->isSignalConnected(priv->signalIndex("sig29()")));
-    if (sizeof(void *) >= 8) { //on 32bit isSignalConnected only works with the first 32 signals
-        QVERIFY(!priv->isSignalConnected(priv->signalIndex("sig60()")));
-        QVERIFY(!priv->isSignalConnected(priv->signalIndex("sig61()")));
-    }
+    QVERIFY(!priv->isSignalConnected(priv->signalIndex("sig60()")));
+    QVERIFY(!priv->isSignalConnected(priv->signalIndex("sig61()")));
 #endif
 
     QObject::connect(&o, SIGNAL(sig00()), &o, SIGNAL(sig69()));
@@ -3115,6 +3113,8 @@ void tst_QObject::isSignalConnected()
     QVERIFY(!priv->isSignalConnected(priv->signalIndex("sig04()")));
     QVERIFY(!priv->isSignalConnected(priv->signalIndex("sig21()")));
     QVERIFY(!priv->isSignalConnected(priv->signalIndex("sig25()")));
+    QVERIFY(!priv->isSignalConnected(priv->signalIndex("sig55()")));
+    QVERIFY(!priv->isSignalConnected(priv->signalIndex("sig61()")));
 #endif
 
     emit o.sig00();
-- 
cgit v0.12