Additional compatibility changes to bring this in line with 3.4.0 TP1

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

1 files changed, 74 insertions, 1 deletions

diff --git a/qtinterface/tqt.h b/qtinterface/tqt.h
index 77a4b14..4c14184 100644
--- a/qtinterface/tqt.h
+++ b/qtinterface/tqt.h
@@ -652,7 +652,80 @@ Boston, MA 02110-1301, USA.
 #define tqdrawTextItem	drawTextItem
 #define tqsetLibraryPaths	setLibraryPaths
 #define tqsetColorGroup	setColorGroup
-#endif
+
+#define TQUObject QUObject
+
+// BEGIN BLOCK ONE
+// This block of text is taken (mostly) straight from TQt for Qt4 tqtglobaldefines.h
+// It will need to be updated now and then as TQt for Qt4 changes
+
+#define TQT_TQOBJECT(x) (static_cast<TQObject*>(static_cast<QObject*>(x)))
+#define TQT_TQWIDGET(x) (static_cast<TQWidget*>(static_cast<QWidget*>(x)))
+#define TQT_TQSIZEPOLICY(x) (static_cast<TQSizePolicy*>(static_cast<QSizePolicy*>(x)))
+#define TQT_TQLAYOUT(x) (static_cast<TQLayout*>(static_cast<QLayout*>(x)))
+#define TQT_TQPAINTER(x) (static_cast<TQPainter*>(static_cast<QPainter*>(x)))
+#define TQT_TQPAINTDEVICE(x) (static_cast<TQPaintDevice*>(static_cast<QPaintDevice*>(x)))
+#define TQT_TQLAYOUTITEM(x) (static_cast<TQLayoutItem*>(static_cast<QLayoutItem*>(x)))
+#define TQT_TQIODEVICE(x) (static_cast<TQIODevice*>(static_cast<QIODevice*>(x)))
+#define TQT_TQCOLOR(x) (static_cast<TQColor*>(static_cast<QColor*>(x)))
+#define TQT_TQCHAR(x) TQChar(x)
+#define TQT_TQSTRING(x) TQString(x)
+#define TQT_TQBUFFER(x) (static_cast<TQBuffer*>(static_cast<QBuffer*>(x)))
+#define TQT_TQWMATRIX(x) (static_cast<TQWMatrix*>(static_cast<QMatrix*>(x)))
+#define TQT_TQFILE(x) (static_cast<TQFile*>(static_cast<QFile*>(x)))
+#define TQT_TQBYTEARRAY(x) (static_cast<TQByteArray*>(static_cast<QByteArray*>(x)))
+#define TQT_TQMIMESOURCE(x) (static_cast<TQMimeSource*>(static_cast<QMimeSource*>(x)))
+#define TQT_TQWEXTRA(x) (static_cast<TQWExtra*>(static_cast<QWExtra*>(x)))
+#define TQT_TQPIXMAP(x) (static_cast<TQPixmap*>(static_cast<QPixmap*>(x)))
+#define TQT_TQCLIPBOARD(x) (static_cast<TQClipboard*>(static_cast<QClipboard*>(x)))
+#define TQT_TQPRINTER(x) (static_cast<TQPrinter*>(static_cast<QPrinter*>(x)))
+#define TQT_TQVARIANT(x) (static_cast<TQVariant*>(static_cast<QVariant*>(x)))
+#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_TQSIZEPOLICY_OBJECT(x) x
+#define TQT_TQLAYOUT_OBJECT(x) x
+#define TQT_TQCOLOR_OBJECT(x) x
+#define TQT_TQSTRING_OBJECT(x) x
+#define TQT_TQSTRLIST_OBJECT(x) x
+#define TQT_TQSTRINGLIST_OBJECT(x) x
+#define TQT_TQWMATRIX_OBJECT(x) x
+#define TQT_TQRECT_OBJECT(x) x
+#define TQT_TQBYTEARRAY_OBJECT(x) x
+#define TQT_TQPIXMAP_OBJECT(x) x
+#define TQT_TQTIME_OBJECT(x) x
+#define TQT_TQDATE_OBJECT(x) x
+#define TQT_TQDATETIME_OBJECT(x) x
+#define TQT_TQBRUSH_OBJECT(x) x
+#define TQT_TQPALETTE_OBJECT(x) x
+#define TQT_TQPOINT_OBJECT(x) x
+#define TQT_TQREGION_OBJECT(x) x
+#define TQT_TQIMAGE_OBJECT(x) x
+#define TQT_TQPAINTDEVICE_OBJECT(x) x
+#define TQT_TQVARIANT_OBJECT(x) x
+#define TQT_TQIODEVICE_OBJECT(x) x
+#define TQT_TQSTYLEOPTION_OBJECT(x) x
+
+#define TQT_TQOBJECT_CONST(x) (static_cast<const TQObject*>(static_cast<const TQObject*>(x)))
+#define TQT_TQWIDGET_CONST(x) (static_cast<const TQWidget*>(static_cast<const QWidget*>(x)))
+#define TQT_TQMIMESOURCE_CONST(x) (static_cast<const TQMimeSource*>(static_cast<const QMimeSource*>(x)))
+#define TQT_TQBRUSH_CONST(x) (static_cast<const TQBrush*>(static_cast<const QBrush*>(x)))
+#define TQT_TQPIXMAP_CONST(x) (static_cast<const TQPixmap*>(static_cast<const QPixmap*>(x)))
+#define TQT_TQCOLOR_CONST(x) (static_cast<const TQColor*>(static_cast<const QColor*>(x)))
+#define TQT_TQPRINTER_CONST(x) (static_cast<const TQPrinter*>(static_cast<const QPrinter*>(x)))
+#define TQT_TQIODEVICE_CONST(x) (static_cast<const TQIODevice*>(static_cast<const QIODevice*>(x)))
+#define TQT_TQVARIANT_CONST(x) (static_cast<const TQVariant*>(static_cast<const QVariant*>(x)))
+#define TQT_TQMETAOBJECT_CONST(x) (static_cast<const TQMetaObject*>(static_cast<const QMetaObject*>(x)))
+#define TQT_TQSTYLEOPTION_CONST(x) (static_cast<const TQStyleOption*>(static_cast<const TQStyleOption*>(x)))
+
+#define TQT_BASE_OBJECT_NAME QObject
+#define TQT_BASE_OBJECT(x) (static_cast<TQT_BASE_OBJECT_NAME*>(x))
+#define TQT_BASE_OBJECT_CONST(x) (static_cast<const TQT_BASE_OBJECT_NAME*>(x))
+
+// END BLOCK ONE
+
+#endif // USE_QT3
 
 #ifdef USE_QT4