Changeset 561 for trunk/src/corelib/kernel/qobjectdefs.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/qobjectdefs.h (modified) (10 diffs)

trunk/src/corelib/kernel/qobjectdefs.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$
 **
@@ -56 +56 @@
 
 #ifndef Q_MOC_OUTPUT_REVISION
-#define Q_MOC_OUTPUT_REVISION 61
+#define Q_MOC_OUTPUT_REVISION 6
 #endif
 
@@ -146 +146 @@
 #endif // QT_NO_MEMBER_TEMPLATES
 
+
+
+
+
+
+
 /* tmake ignore Q_OBJECT */
 #define Q_OBJECT \
@@ -151 +157 @@
     Q_OBJECT_CHECK \
     static const QMetaObject staticMetaObject; \
+
     virtual const QMetaObject *metaObject() const; \
     virtual void *qt_metacast(const char *); \
@@ -162 +169 @@
 public: \
     static const QMetaObject staticMetaObject; \
+
 private:
 #else // Q_MOC_RUN
@@ -331 +339 @@
 
     // internal index-based signal activation
-    static void activate(QObject *sender, int signal_index, void **argv);
-    static void activate(QObject *sender, int from_signal_index, int to_signal_index, void **argv);
+    static void activate(QObject *sender, int signal_index, void **argv);
+    static void activate(QObject *sender, int from_signal_index, int to_signal_index, void **argv);
     static void activate(QObject *sender, const QMetaObject *, int local_signal_index, void **argv);
-    static void activate(QObject *sender, const QMetaObject *, int from_local_signal_index, int to_local_signal_index, void **argv);
+    static void activate(QObject *sender, const QMetaObject *, int from_local_signal_index, int to_local_signal_index, void **argv); //obsolete
+
     // internal guarded pointers
     static void addGuard(QObject **ptr);
@@ -429 +438 @@
 
     int static_metacall(Call, int, void **) const;
+
 
 #ifdef QT3_SUPPORT
@@ -440 +450 @@
         const void *extradata;
     } d;
-};
+
+};
+
+typedef const QMetaObject& (*QMetaObjectAccessor)();
 
 struct QMetaObjectExtraData
 {
+
+
+
     const QMetaObject **objects;
+
     int (*static_metacall)(QMetaObject::Call, int, void **);
 };