diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-07-10 21:32:26 -0500 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-07-10 21:32:26 -0500 |
commit | 6848d2bd98a338151ca1fb48370358085d0c8997 (patch) | |
tree | a1289f3493c46a8bcdea99416a312d56e5e4b2c1 /arch/master/trinity-qt3/qt3_3.3.8c.arch.diff | |
parent | 9b2075d9b89fc628c447fbb98f43ef72e4a9c81d (diff) | |
download | tde-packaging-6848d2bd98a338151ca1fb48370358085d0c8997.tar.gz tde-packaging-6848d2bd98a338151ca1fb48370358085d0c8997.zip |
Added arch directory for cmorrison
Diffstat (limited to 'arch/master/trinity-qt3/qt3_3.3.8c.arch.diff')
-rw-r--r-- | arch/master/trinity-qt3/qt3_3.3.8c.arch.diff | 72 |
1 files changed, 72 insertions, 0 deletions
diff --git a/arch/master/trinity-qt3/qt3_3.3.8c.arch.diff b/arch/master/trinity-qt3/qt3_3.3.8c.arch.diff new file mode 100644 index 000000000..39c751a71 --- /dev/null +++ b/arch/master/trinity-qt3/qt3_3.3.8c.arch.diff @@ -0,0 +1,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. + */ |