Changeset 561 for trunk/src/corelib/kernel/qobject_p.h

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/corelib/kernel/qobject_p.h (modified) (12 diffs)

trunk/src/corelib/kernel/qobject_p.h

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you 
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -61 +61 @@
 #include "QtCore/qreadwritelock.h"
 #include "QtCore/qvariant.h"
+
 
 QT_BEGIN_NAMESPACE
@@ -67 +68 @@
 class QThreadData;
 class QObjectConnectionListVector;
+
 
 /* mirrored in QtTestLib, DON'T CHANGE without prior warning */
@@ -82 +84 @@
 extern QSignalSpyCallbackSet Q_CORE_EXPORT qt_signal_spy_callback_set;
 
-inline QObjectData::~QObjectData() {}
-
 enum { QObjectPrivateVersion = QT_VERSION };
 
+
+
+
+
+
+
+
 class Q_CORE_EXPORT QObjectPrivate : public QObjectData
 {
@@ -91 +98 @@
 
 public:
-    QObjectPrivate(int version = QObjectPrivateVersion);
-    virtual ~QObjectPrivate();
-
-#ifdef QT3_SUPPORT
-    QList<QObject *> pendingChildInsertedEvents;
-    void sendPendingChildInsertedEvents();
-    void removePendingChildInsertedEvents(QObject *child);
-#else
-    // preserve binary compatibility with code compiled without Qt 3 support
-    QList<QObject *> unused;
+    struct ExtraData
+    {
+        ExtraData() : objectGuards(0) {}
+#ifndef QT_NO_USERDATA
+        QVector<QObjectUserData *> userData;
 #endif
-
-    // id of the thread that owns the object
-    QThreadData *threadData;
-    void moveToThread_helper();
-    void setThreadData_helper(QThreadData *currentData, QThreadData *targetData);
-    void _q_reregisterTimers(void *pointer);
+        QList<QByteArray> propertyNames;
+        QList<QVariant> propertyValues;
+        QGuard<QObject> *objectGuards; //linked list handle of QGuards
+    };
+
+    struct Connection
+    {
+        QObject *sender;
+        QObject *receiver;
+        int method;
+        uint connectionType : 3; // 0 == auto, 1 == direct, 2 == queued, 4 == blocking
+        QBasicAtomicPointer<int> argumentTypes;
+        // The next pointer for the singly-linked ConnectionList
+        Connection *nextConnectionList;
+        //senders linked list
+        Connection *next;
+        Connection **prev;
+        ~Connection();
+    };
+    // ConnectionList is a singly-linked list
+    struct ConnectionList {
+        ConnectionList() : first(0), last(0) {}
+        Connection *first;
+        Connection *last;
+    };
 
     struct Sender
@@ -116 +137 @@
     };
 
-    // object currently activating the object
-    Sender *currentSender;
-
-    QObject *currentChildBeingDeleted;
+
+    QObjectPrivate(int version = QObjectPrivateVersion);
+    virtual ~QObjectPrivate();
+    void deleteChildren();
+
+    void setParent_helper(QObject *);
+    void moveToThread_helper();
+    void setThreadData_helper(QThreadData *currentData, QThreadData *targetData);
+    void _q_reregisterTimers(void *pointer);
 
     bool isSender(const QObject *receiver, const char *signal) const;
@@ -125 +151 @@
     QObjectList senderList() const;
 
-    QList<QPointer<QObject> > eventFilters;
-
-    void setParent_helper(QObject *);
-
-    void deleteChildren();
-
-    static void clearGuards(QObject *);
-
-    struct ExtraData
-    {
-#ifndef QT_NO_USERDATA
-        QVector<QObjectUserData *> userData;
+    void addConnection(int signal, Connection *c);
+    void cleanConnectionLists();
+
+#ifdef QT3_SUPPORT
+    void sendPendingChildInsertedEvents();
+    void removePendingChildInsertedEvents(QObject *child);
 #endif
-        QList<QByteArray> propertyNames;
-        QList<QVariant> propertyValues;
-    };
-    ExtraData *extraData;
-    mutable quint32 connectedSignals;
-
-    QString objectName;
-
-    // Note: you must hold the signalSlotLock() before accessing the lists below or calling the functions
-    struct Connection
-    {
-        QObject *receiver;
-        int method;
-        uint connectionType : 3; // 0 == auto, 1 == direct, 2 == queued, 4 == blocking
-        QBasicAtomicPointer<int> argumentTypes;
-    };
-    typedef QList<Connection> ConnectionList;
-
-    QObjectConnectionListVector *connectionLists;
-    void addConnection(int signal, Connection *c);
-    void removeReceiver(int signal, QObject *receiver);
-    void cleanConnectionLists();
-
-    QList<Sender> senders;
-    void refSender(QObject *sender, int signal);
-    void derefSender(QObject *sender, int signal);
-    void removeSender(QObject *sender, int signal);
 
     static Sender *setCurrentSender(QObject *receiver,
@@ -173 +166 @@
     static int *setDeleteWatch(QObjectPrivate *d, int *newWatch);
     static void resetDeleteWatch(QObjectPrivate *d, int *oldWatch, int deleteWatch);
-
-    int *deleteWatch;
+    static void clearGuards(QObject *);
 
     static QObjectPrivate *get(QObject *o) {
         return o->d_func();
     }
-};
+
+    int signalIndex(const char *signalName) const;
+    inline bool isSignalConnected(uint signalIdx) const;
+
+public:
+    QString objectName;
+    ExtraData *extraData;    // extra data set by the user
+    QThreadData *threadData; // id of the thread that owns the object
+
+    QObjectConnectionListVector *connectionLists;
+
+    Connection *senders;     // linked list of connections connected to this object
+    Sender *currentSender;   // object currently activating the object
+    mutable quint32 connectedSignals[2];
+
+#ifdef QT3_SUPPORT
+    QList<QObject *> pendingChildInsertedEvents;
+#else
+    // preserve binary compatibility with code compiled without Qt 3 support
+    // ### why?
+    QList<QObject *> unused;
+#endif
+
+    QList<QPointer<QObject> > eventFilters;
+    union {
+        QObject *currentChildBeingDeleted;
+        QDeclarativeData *declarativeData; //extra data used by the DeclarativeUI project.
+    };
+
+    // these objects are all used to indicate that a QObject was deleted
+    // plus QPointer, which keeps a separate list
+    QAtomicPointer<QtSharedPointer::ExternalRefCountData> sharedRefcount;
+    int *deleteWatch;
+};
+
+
+/*! \internal
+
+  Returns true if the signal with index \a signal_index from object \a sender is connected.
+  Signals with indices above a certain range are always considered connected (see connectedSignals
+  in QObjectPrivate). If a signal spy is installed, all signals are considered connected.
+
+  \a signal_index must be the index returned by QObjectPrivate::signalIndex;
+*/
+inline bool QObjectPrivate::isSignalConnected(uint signal_index) const
+{
+    return signal_index >= sizeof(connectedSignals) * 8
+        || qt_signal_spy_callback_set.signal_begin_callback
+        || qt_signal_spy_callback_set.signal_end_callback
+        || (connectedSignals[signal_index >> 5] & (1 << (signal_index & 0x1f)));
+}
+
+
+inline void q_guard_addGuard(QGuard<QObject> *g)
+{
+    QObjectPrivate *p = QObjectPrivate::get(g->o);
+    if (p->wasDeleted) {
+        qWarning("QGuard: cannot add guard to deleted object");
+        g->o = 0;
+        return;
+    }
+
+    if (!p->extraData)
+        p->extraData = new QObjectPrivate::ExtraData;
+
+    g->next = p->extraData->objectGuards;
+    p->extraData->objectGuards = g;
+    g->prev = &p->extraData->objectGuards;
+    if (g->next)
+        g->next->prev = &g->next;
+}
+
+inline void q_guard_removeGuard(QGuard<QObject> *g)
+{
+    if (g->next) g->next->prev = g->prev;
+    *g->prev = g->next;
+    g->next = 0;
+    g->prev = 0;
+}
 
 Q_DECLARE_TYPEINFO(QObjectPrivate::Connection, Q_MOVABLE_TYPE);
@@ -209 +279 @@
 };
 
-class Q_CORE_EXPORT QBoolBlocker
+class QBoolBlocker
 {
 public:
@@ -221 +291 @@
 void Q_CORE_EXPORT qDeleteInEventHandler(QObject *o);
 
+
+
+
+
+
+
+
+
 QT_END_NAMESPACE