diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-01 21:03:36 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-01 21:03:36 +0000 |
| commit | d88be03ff79b47d2211d719652430eb3780cfc87 (patch) | |
| tree | 5e5dc5728433e668af5ec8dbf68548386165eb20 /qtinterface/tqt.h | |
| parent | 726035ac640c790b839ef68006a24f991fd832a3 (diff) | |
| download | tqtinterface-d88be03ff79b47d2211d719652430eb3780cfc87.tar.gz tqtinterface-d88be03ff79b47d2211d719652430eb3780cfc87.zip | |
API more in line with TQt for Qt4 3.4.0 TPI
This WILL cause Trinity build failures
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/dependencies/tqtinterface@1210711 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'qtinterface/tqt.h')
| -rw-r--r-- | qtinterface/tqt.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/qtinterface/tqt.h b/qtinterface/tqt.h index 4c14184..fdd3e94 100644 --- a/qtinterface/tqt.h +++ b/qtinterface/tqt.h @@ -22,7 +22,11 @@ Boston, MA 02110-1301, USA. #ifndef TQT_H #define TQT_H -#define USE_QTX +#define USE_QTX // WARNING: KEEP THIS ON LINE 25 AT ALL TIMES OTHERWISE BUILD FAILURE WILL OCCUR + +#ifdef USE_QTX +#define USE_QT3 // Default to Qt3 +#endif #ifdef USE_QT4 #define QT3_SUPPORT @@ -382,9 +386,9 @@ Boston, MA 02110-1301, USA. #define TQNetworkOperation QNetworkOperation #define TQObjectCleanupHandler QObjectCleanupHandler #define TQObjectDictionary QObjectDictionary -#define TQObject QObject +//#define TQObject QObject #define TQObjectUserData QObjectUserData -#define TQObject QObject +//#define TQObject QObject #define TQObjectList QObjectList #define TQObjectListIterator QObjectListIterator #define TQObjectListIt QObjectListIt @@ -614,7 +618,7 @@ Boston, MA 02110-1301, USA. #define tqStatus Status #define tqmetaObject metaObject #define tqfind find -#define tqchildren children +//#define tqchildren children #define tqsetObjectName setObjectName #define tqtopLevelWidget topLevelWidget #define tqparent parent @@ -683,7 +687,7 @@ Boston, MA 02110-1301, USA. #define TQT_TQMETAOBJECT(x) (static_cast<TQMetaObject*>(static_cast<QMetaObject*>(x))) #define TQT_TQSTYLEOPTION(x) (static_cast<TQStyleOption*>(static_cast<TQStyleOption*>(x))) -#define TQT_TQOBJECT_OBJECT(x) x +#define TQT_TQOBJECT_OBJECT(x) (convertFromQObject(x)) #define TQT_TQSIZEPOLICY_OBJECT(x) x #define TQT_TQLAYOUT_OBJECT(x) x #define TQT_TQCOLOR_OBJECT(x) x |