Starting work on Qt4 interface...

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/dependencies/tqtinterface@1158413 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 28 insertions, 20 deletions

diff --git a/qtinterface/tqt.h b/qtinterface/tqt.h
index d2c00ea..b11ebf4 100644
--- a/qtinterface/tqt.h
+++ b/qtinterface/tqt.h
@@ -22,8 +22,10 @@ Boston, MA 02110-1301, USA.
 #ifndef TQT_H
 #define TQT_H
 
-#define USE_QT3
-//#define USE_QT4
+#define USE_QTX
+
+// DEBUG ONLY REMOVE ME TEST
+#define USE_QT4
 
 #ifdef USE_QT4
 #define QT3_SUPPORT
@@ -46,6 +48,9 @@ Boston, MA 02110-1301, USA.
 #endif // __cplusplus
 
 #ifdef USE_QT3
+#define tqchildren children
+#define tqaccess access
+
 #define TQAccel QAccel
 #define TQAccessible QAccessible
 #define TQAccessibleObject QAccessibleObject
@@ -105,7 +110,6 @@ Boston, MA 02110-1301, USA.
 #define TQShared QShared
 #define TQColor QColor
 #define TQColorDialog QColorDialog
-#define TQStrList QStrList
 #define TQStringList QStringList
 #define TQStringPairList QStringPairList
 #define TQLineEdit QLineEdit
@@ -290,7 +294,6 @@ Boston, MA 02110-1301, USA.
 #define TQLCDNumber QLCDNumber
 #define TQLibrary QLibrary
 #define TQLineEdit QLineEdit
-#define TQListBox QListBox
 #define TQListBoxItem QListBoxItem
 #define TQListBoxText QListBoxText
 #define TQListBoxPixmap QListBoxPixmap
@@ -341,7 +344,6 @@ Boston, MA 02110-1301, USA.
 #define TQObjectListIt QObjectListIt
 #define TQPaintDevice QPaintDevice
 #define TQPaintDeviceMetrics QPaintDeviceMetrics
-#define TQPainter QPainter
 #define TQColorGroup QColorGroup
 #define TQPalette QPalette
 #define TQPen QPen
@@ -412,10 +414,8 @@ Boston, MA 02110-1301, USA.
 #define TQSqlFieldPrivate QSqlFieldPrivate
 #define TQSqlField QSqlField
 #define TQSqlFieldInfo QSqlFieldInfo
-#define TQSqlForm QSqlForm
 #define TQSql QSql
 #define TQSqlIndex QSqlIndex
-#define TQSqlPropertyMap QSqlPropertyMap
 #define TQSqlQuery QSqlQuery
 #define TQSqlResultShared QSqlResultShared
 #define TQSqlRecordShared QSqlRecordShared
@@ -448,7 +448,6 @@ Boston, MA 02110-1301, USA.
 #define TQTabDialog QTabDialog
 #define TQTableSelection QTableSelection
 #define TQTableItem QTableItem
-#define TQComboTableItem QComboTableItem
 #define TQCheckTableItem QCheckTableItem
 #define TQTable QTable
 #define TQTabWidget QTabWidget
@@ -532,6 +531,21 @@ Boston, MA 02110-1301, USA.
 #endif
 
 #ifdef USE_QT4
+#include <tqt4/Qt/qobjectdefs.h>
+#include <tqt4/Qt/qlist.h>
+#include <tqt4/Qt/qbytearray.h>
+#include <tqt4/Qt/qobject.h>
+#include <tqeventloop.h>
+#include <tqt4/Qt/qapplication.h>
+#include <tqt4/Qt/q3cstring.h>
+
+#include <tqlistiterator.h>
+
+#define tqchildren ptrchildren
+#define tqaccess access()
+
+#define QMetaData QMetaMethod
+
 #define TQAccel Q3Accel
 #define TQAccessible QAccessible
 #define TQAccessibleObject QAccessibleObject
@@ -591,12 +605,10 @@ Boston, MA 02110-1301, USA.
 #define TQShared Q3Shared
 #define TQColor QColor
 #define TQColorDialog QColorDialog
-#define TQStrList QStrList
 #define TQStringList QStringList
 #define TQStringPairList Q3StringPairList
 #define TQLineEdit QLineEdit
 #define TQValidator QValidator
-#define TQListBox QListBox
 #define TQComboBoxData Q3ComboBoxData
 #define TQComboTableItem Q3ComboTableItem
 #define TQWheelEvent QWheelEvent
@@ -606,13 +618,10 @@ Boston, MA 02110-1301, USA.
 #define TQConnection QConnection
 #define TQCString Q3CString
 #define TQCursor QCursor
-#define TQSqlForm QSqlForm
 #define TQDataBrowserPrivate Q3DataBrowserPrivate
 #define TQDataBrowser Q3DataBrowser
 #define TQDataStream QDataStream
-#define TQPainter QPainter
 #define TQSqlField QSqlField
-#define TQSqlPropertyMap QSqlPropertyMap
 #define TQDataTablePrivate QDataTablePrivate
 #define TQDataTable Q3DataTable
 #define TQDataView Q3DataView
@@ -689,7 +698,7 @@ Boston, MA 02110-1301, USA.
 #define TQDragLeaveEvent QDragLeaveEvent
 #define TQChildEvent QChildEvent
 #define TQCustomEvent QCustomEvent
-#define TQEventLoop QEventLoop
+//#define TQEventLoop QAbstractEventDispatcher
 #define TQFileIconProvider Q3FileIconProvider
 #define TQFilePreview Q3FilePreview
 #define TQFileDialog Q3FileDialog
@@ -730,8 +739,8 @@ Boston, MA 02110-1301, USA.
 #define TQGrid Q3Grid
 #define TQGridView Q3GridView
 #define TQGroupBox Q3GroupBox
-#define TQGuardedPtr QGuardedPtr
-#define TQGuardedPtrPrivate QGuardedPtrPrivate
+#define TQGuardedPtr QPointer
+#define TQGuardedPtrPrivate QPointerPrivate
 #define TQGVector QGVector
 #define TQHBox Q3HBox
 #define TQHButtonGroup Q3HButtonGroup
@@ -799,7 +808,7 @@ Boston, MA 02110-1301, USA.
 #define TQMenuData QMenuData
 #define TQMessageBox QMessageBox
 #define TQMetaProperty QMetaProperty
-#define TQMetaObject QMetaObject
+#define TQMetaObject const QMetaObject
 #define TQMetaObjectCleanUp QMetaObjectCleanUp
 #define TQMimeSource QMimeSource
 #define TQMimeSourceFactory Q3MimeSourceFactory
@@ -823,8 +832,8 @@ Boston, MA 02110-1301, USA.
 #define TQObjectUserData QObjectUserData
 #define TQObject QObject
 #define TQObjectList QObjectList
-#define TQObjectListIterator QObjectListIterator
-#define TQObjectListIt QObjectListIt
+#define TQObjectListIterator TQListIterator<QObject *>
+#define TQObjectListIt TQObjectListIterator
 #define TQPaintDevice QPaintDevice
 #define TQPaintDeviceMetrics Q3PaintDeviceMetrics
 #define TQPainter Q3Painter
@@ -934,7 +943,6 @@ Boston, MA 02110-1301, USA.
 #define TQTabDialog Q3TabDialog
 #define TQTableSelection Q3TableSelection
 #define TQTableItem Q3TableItem
-#define TQComboTableItem QComboTableItem
 #define TQCheckTableItem Q3CheckTableItem
 #define TQTable Q3Table
 #define TQTabWidget QTabWidget