Fix compilation under native TQt3

1 files changed, 88 insertions, 17 deletions

diff --git a/qtinterface/tqt.h.cmake b/qtinterface/tqt.h.cmake
index 8beddcf..545a28b 100644
--- a/qtinterface/tqt.h.cmake
+++ b/qtinterface/tqt.h.cmake
@@ -60,22 +60,23 @@ Boston, MA 02110-1301, USA.
 
 #define TQ_OBJECT		/* UNUSED */
 
+#define TQ_INLINE_TEMPLATES		Q_INLINE_TEMPLATES
+#define TQ_DUMMY_COMPARISON_OPERATOR	Q_DUMMY_COMPARISON_OPERATOR
+#define TQ_OVERRIDE			Q_OVERRIDE
+#define TQ_REFCOUNT			Q_REFCOUNT
+#define TQ_TYPENAME			Q_TYPENAME
+
 #ifndef TQT_REAL_TQT
 
 #define TQWIDGETSIZE_MAX		QWIDGETSIZE_MAX
-#define TQ_INLINE_TEMPLATES		Q_INLINE_TEMPLATES
-#define TQ_DUMMY_COMPARISON_OPERATOR	Q_DUMMY_COMPARISON_OPERATOR
 #define TQM_EXPORT_SQL			QM_EXPORT_SQL
 
 #define TQSIGNAL_CODE			QSIGNAL_CODE
 #define TQSLOT_CODE			QSLOT_CODE
-#define TQ_OVERRIDE			Q_OVERRIDE
 #define TQRESULT			QRESULT
-#define TQ_REFCOUNT			Q_REFCOUNT
 #define TQE_NOINTERFACE			QE_NOINTERFACE
 #define TQS_OK				QS_OK
 #define TQTSFUNC			QTSFUNC
-#define TQ_TYPENAME			Q_TYPENAME
 #define TQT_CHECK_INVALID_MAP_ELEMENT	QT_CHECK_INVALID_MAP_ELEMENT
 
 #define TQT_VERSION			QT_VERSION
@@ -87,18 +88,8 @@ Boston, MA 02110-1301, USA.
 #define qint64			long
 #define quint64			unsigned long
 
-#ifndef TQT_REAL_TQT
-
-#define tqtr			tr
-#define tqaccess		access
-#define tqcolorTable		colorTable
-#define TQSO_Default		Default
-#define SO_Default		Default
 #define TQ_PrimitiveElement	PrimitiveElement
 #define TQ_StyleHint		StyleHint
-#define tqstrcmp		qstrcmp
-#define tqqt_cast		qt_cast
-#define tqt_dynamic_cast	dynamic_cast
 #define TQ_StrongFocus		QWidget::StrongFocus
 #define TQ_NoFocus		QWidget::NoFocus
 #define TQ_WheelFocus		QWidget::WheelFocus
@@ -108,7 +99,6 @@ Boston, MA 02110-1301, USA.
 #define TQ_Horizontal		Horizontal
 #define TQ_Vertical		Vertical
 #define TQ_Alignment		Qt::AlignmentFlags
-#define TQImage_ScaleFree	QImage::ScaleFree
 #define TQ_ScaleFree		QImage::ScaleFree
 #define TQ_ScaleMin		QImage::ScaleMin
 #define TQ_ScaleMax		QImage::ScaleMax
@@ -130,12 +120,24 @@ Boston, MA 02110-1301, USA.
 #define TQ_AltButton		AltButton
 #define TQ_MetaButton		MetaButton
 #define TQ_WFlags		TQt::WFlags
-#define TQIODevice_OpenModeFlag int
 #define TQ_OpenMode		int
 #define TQ_SPVertically		TQSizePolicy::Vertically
 #define TQ_SPHorizontally	TQSizePolicy::Horizontally
 #define TQ_SPNoDirection	TQSizePolicy::NoDirection
 
+#ifndef TQT_REAL_TQT
+
+#define tqtr			tr
+#define tqaccess		access
+#define tqcolorTable		colorTable
+#define TQSO_Default		Default
+#define SO_Default		Default
+#define tqstrcmp		qstrcmp
+#define tqqt_cast		qt_cast
+#define tqt_dynamic_cast	dynamic_cast
+#define TQImage_ScaleFree	QImage::ScaleFree
+#define TQIODevice_OpenModeFlag int
+
 #define TQPOINT_OBJECT_NAME_STRING		"QPoint"
 #define TQBYTEARRAY_OBJECT_NAME_STRING		"QByteArray"
 #define TQPIXMAP_OBJECT_NAME_STRING		"QPixmap"
@@ -1092,6 +1094,8 @@ Boston, MA 02110-1301, USA.
    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 */
 
+#ifndef TQT_REAL_TQT
+
 #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)))
@@ -1131,6 +1135,49 @@ Boston, MA 02110-1301, USA.
 #define TQT_TQTABLETEVENT(x) (static_cast<TQTabletEvent*>(static_cast<QTabletEvent*>(static_cast<QEvent*>(x))))
 #define TQT_TQCONTEXTMENUEVENT(x) (static_cast<TQContextMenuEvent*>(static_cast<QContextMenuEvent*>(static_cast<QEvent*>(x))))
 
+#else
+
+#define TQT_TQOBJECT(x) (static_cast<TQObject*>(static_cast<TQObject*>(x)))
+#define TQT_TQWIDGET(x) (static_cast<TQWidget*>(static_cast<TQWidget*>(x)))
+#define TQT_TQSIZEPOLICY(x) (static_cast<TQSizePolicy*>(static_cast<TQSizePolicy*>(x)))
+#define TQT_TQLAYOUT(x) (static_cast<TQLayout*>(static_cast<TQLayout*>(x)))
+#define TQT_TQGRIDLAYOUT(x) (static_cast<TQGridLayout*>(static_cast<TQGridLayout*>(x)))
+#define TQT_TQPAINTER(x) (static_cast<TQPainter*>(static_cast<TQPainter*>(x)))
+#define TQT_TQPAINTDEVICE(x) (static_cast<TQPaintDevice*>(static_cast<TQPaintDevice*>(x)))
+#define TQT_TQLAYOUTITEM(x) (static_cast<TQLayoutItem*>(static_cast<TQLayoutItem*>(x)))
+#define TQT_TQIODEVICE(x) (static_cast<TQIODevice*>(static_cast<TQIODevice*>(x)))
+#define TQT_TQCOLOR(x) (static_cast<TQColor*>(static_cast<TQColor*>(x)))
+#define TQT_TQCHAR(x) TQChar(x)
+#define TQT_TQSTRING(x) TQString(x)
+#define TQT_TQBUFFER(x) (static_cast<TQBuffer*>(static_cast<TQBuffer*>(x)))
+#define TQT_TQWMATRIX(x) (static_cast<TQWMatrix*>(static_cast<TQMatrix*>(x)))
+#define TQT_TQFILE(x) (static_cast<TQFile*>(static_cast<TQFile*>(x)))
+#define TQT_TQBYTEARRAY(x) (static_cast<TQByteArray*>(static_cast<TQByteArray*>(x)))
+#define TQT_TQMIMESOURCE(x) (static_cast<TQMimeSource*>(static_cast<TQMimeSource*>(x)))
+#define TQT_TQWEXTRA(x) (static_cast<TQWExtra*>(static_cast<TQWExtra*>(x)))
+#define TQT_TQPIXMAP(x) (static_cast<TQPixmap*>(static_cast<TQPixmap*>(x)))
+#define TQT_TQCLIPBOARD(x) (static_cast<TQClipboard*>(static_cast<TQClipboard*>(x)))
+#define TQT_TQPRINTER(x) (static_cast<TQPrinter*>(static_cast<TQPrinter*>(x)))
+#define TQT_TQVARIANT(x) (static_cast<TQVariant*>(static_cast<TQVariant*>(x)))
+#define TQT_TQMETAOBJECT(x) (static_cast<TQMetaObject*>(static_cast<TQMetaObject*>(x)))
+#define TQT_TQSTYLEOPTION(x) (static_cast<TQStyleOption*>(static_cast<TQStyleOption*>(x)))
+#define TQT_TQEVENT(x) (static_cast<TQEvent*>(static_cast<TQEvent*>(x)))
+#define TQT_TQKEYEVENT(x) (static_cast<TQKeyEvent*>(static_cast<TQKeyEvent*>(static_cast<TQEvent*>(x))))
+#define TQT_TQMOVEEVENT(x) (static_cast<TQMoveEvent*>(static_cast<TQMoveEvent*>(static_cast<TQEvent*>(x))))
+#define TQT_TQSHOWEVENT(x) (static_cast<TQShowEvent*>(static_cast<TQShowEvent*>(static_cast<TQEvent*>(x))))
+#define TQT_TQMOUSEEVENT(x) (static_cast<TQMouseEvent*>(static_cast<TQMouseEvent*>(static_cast<TQEvent*>(x))))
+#define TQT_TQWHEELEVENT(x) (static_cast<TQWheelEvent*>(static_cast<TQWheelEvent*>(static_cast<TQEvent*>(x))))
+#define TQT_TQFOCUSEVENT(x) (static_cast<TQFocusEvent*>(static_cast<TQFocusEvent*>(static_cast<TQEvent*>(x))))
+#define TQT_TQPAINTEVENT(x) (static_cast<TQPaintEvent*>(static_cast<TQPaintEvent*>(static_cast<TQEvent*>(x))))
+#define TQT_TQCHILDEVENT(x) (static_cast<TQChildEvent*>(static_cast<TQChildEvent*>(static_cast<TQEvent*>(x))))
+#define TQT_TQCLOSEEVENT(x) (static_cast<TQCloseEvent*>(static_cast<TQCloseEvent*>(static_cast<TQEvent*>(x))))
+#define TQT_TQTIMEREVENT(x) (static_cast<TQTimerEvent*>(static_cast<TQTimerEvent*>(static_cast<TQEvent*>(x))))
+#define TQT_TQRESIZEEVENT(x) (static_cast<TQResizeEvent*>(static_cast<TQResizeEvent*>(static_cast<TQEvent*>(x))))
+#define TQT_TQTABLETEVENT(x) (static_cast<TQTabletEvent*>(static_cast<TQTabletEvent*>(static_cast<TQEvent*>(x))))
+#define TQT_TQCONTEXTMENUEVENT(x) (static_cast<TQContextMenuEvent*>(static_cast<TQContextMenuEvent*>(static_cast<TQEvent*>(x))))
+
+#endif
+
 #define TQT_TQOBJECT_OBJECT(x) x
 #define TQT_TQSIZEPOLICY_OBJECT(x) x
 #define TQT_TQLAYOUT_OBJECT(x) x
@@ -1155,6 +1202,8 @@ Boston, MA 02110-1301, USA.
 #define TQT_TQIODEVICE_OBJECT(x) x
 #define TQT_TQSTYLEOPTION_OBJECT(x) x
 
+#ifndef TQT_REAL_TQT
+
 #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)))
@@ -1168,7 +1217,29 @@ Boston, MA 02110-1301, USA.
 #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)))
 
+#else
+
+#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 TQWidget*>(x)))
+#define TQT_TQMIMESOURCE_CONST(x) (static_cast<const TQMimeSource*>(static_cast<const TQMimeSource*>(x)))
+#define TQT_TQBRUSH_CONST(x) (static_cast<const TQBrush*>(static_cast<const TQBrush*>(x)))
+#define TQT_TQPIXMAP_CONST(x) (static_cast<const TQPixmap*>(static_cast<const TQPixmap*>(x)))
+#define TQT_TQPAINTDEVICE_CONST(x) (static_cast<const TQPaintDevice*>(static_cast<const TQPaintDevice*>(x)))
+#define TQT_TQCOLOR_CONST(x) (static_cast<const TQColor*>(static_cast<const TQColor*>(x)))
+#define TQT_TQPRINTER_CONST(x) (static_cast<const TQPrinter*>(static_cast<const TQPrinter*>(x)))
+#define TQT_TQIODEVICE_CONST(x) (static_cast<const TQIODevice*>(static_cast<const TQIODevice*>(x)))
+#define TQT_TQVARIANT_CONST(x) (static_cast<const TQVariant*>(static_cast<const TQVariant*>(x)))
+#define TQT_TQMETAOBJECT_CONST(x) (static_cast<const TQMetaObject*>(static_cast<const TQMetaObject*>(x)))
+#define TQT_TQSTYLEOPTION_CONST(x) (static_cast<const TQStyleOption*>(static_cast<const TQStyleOption*>(x)))
+
+#endif
+
+#ifndef TQT_REAL_TQT
 #define TQT_BASE_OBJECT_NAME QObject
+#else
+#define TQT_BASE_OBJECT_NAME TQObject
+#endif
+
 #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))