1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
|
--- include/qobject.h 2008-01-15 13:09:13.000000000 -0600
+++ include/qobject.h 2011-01-01 18:33:19.715656496 -0600
@@ -101,8 +101,11 @@
QObject *child( const char *objName, const char *inheritsClass = 0, bool recursiveSearch = TRUE ); //### const in 4.0
const QObjectList *children() const { return childObjects; }
+ QObjectList childrenListObject();
+ const QObjectList childrenListObject() const;
static const QObjectList *objectTrees();
+ static const QObjectList objectTreesListObject();
QObjectList *queryList( const char *inheritsClass = 0,
const char *objName = 0,
--- src/kernel/qobject.cpp 2008-01-15 13:09:13.000000000 -0600
+++ src/kernel/qobject.cpp 2011-01-01 18:28:16.191270264 -0600
@@ -360,6 +360,30 @@
}
}
+/*! \internal
+ TQt compatibility function
+*/
+QObjectList QObject::childrenListObject() {
+ if (children()) return *(children());
+ else return QObjectList();
+}
+
+/*! \internal
+ TQt compatibility function
+*/
+const QObjectList QObject::childrenListObject() const {
+ if (children()) return *(children());
+ else return QObjectList();
+}
+
+/*! \internal
+ TQt compatibility function
+*/
+const QObjectList QObject::objectTreesListObject() {
+ if (objectTrees()) return *(objectTrees());
+ else return QObjectList();
+}
+
/*****************************************************************************
QObject member functions
--- src/kernel/qobject.h 2008-01-15 13:09:13.000000000 -0600
+++ src/kernel/qobject.h 2011-01-01 18:33:19.715656496 -0600
@@ -101,8 +101,11 @@
QObject *child( const char *objName, const char *inheritsClass = 0, bool recursiveSearch = TRUE ); //### const in 4.0
const QObjectList *children() const { return childObjects; }
+ QObjectList childrenListObject();
+ const QObjectList childrenListObject() const;
static const QObjectList *objectTrees();
+ static const QObjectList objectTreesListObject();
QObjectList *queryList( const char *inheritsClass = 0,
const char *objName = 0,
--- src/tools/qglobal.h 2008-01-15 21:09:13.000000000 +0200
+++ src/tools/qglobal.h 2011-03-15 00:28:11.221711757 +0200
@@ -41,7 +41,7 @@
#ifndef QGLOBAL_H
#define QGLOBAL_H
-#define QT_VERSION_STR "3.3.8b"
+#define QT_VERSION_STR "3.3.8c"
/*
QT_VERSION is (major << 16) + (minor << 8) + patch.
*/
|
