Additional Qt4 support...

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

1 files changed, 46 insertions, 20 deletions

diff --git a/qtinterface/tqt.h b/qtinterface/tqt.h
index 9971813..0533d74 100644
--- a/qtinterface/tqt.h
+++ b/qtinterface/tqt.h
@@ -48,14 +48,23 @@ Boston, MA 02110-1301, USA.
 #endif // __cplusplus
 
 #ifdef USE_QT3
-#define tqchildren children
-#define tqaccess access
-#define tqcolorTable colorTable
-#define TQSO_Default Default
-#define tqqt_cast ::qt_cast
-#define TQ_Horizontal Horizontal
-#define TQ_Vertical Vertical
-#define TQImage_ScaleFree QImage::ScaleFree
+#define tqchildren		children
+#define tqaccess		access
+#define tqcolorTable		colorTable
+#define tqmask			mask
+#define TQSO_Default		Default
+#define tqqt_cast		::qt_cast
+#define TQ_Horizontal		Horizontal
+#define TQ_Vertical		Vertical
+#define TQImage_ScaleFree	QImage::ScaleFree
+#define TQ_Key_Shift		Key_Shift
+#define TQ_Key_Control		Key_Control
+#define TQ_Key_Alt		Key_Alt
+#define TQ_Key_Meta		Key_Meta
+#define TQ_Key_Super_L		Key_Super_L
+#define TQ_Key_Super_R		Key_Super_R
+#define TQ_Key_Hyper_L		Key_Hyper_L
+#define TQ_Key_Hyper_R		Key_Hyper_R
 
 #define TQAlignCenter AlignCenter
 #define TQNoBrush NoBrush
@@ -73,10 +82,12 @@ Boston, MA 02110-1301, USA.
 #define tqdarkMagenta darkMagenta
 #define tqdarkYellow darkYellow
 #define tqwhite white
+#define tqwhiteptr &white
 #define tqlightGray lightGray
 #define tqgray gray
 #define tqdarkGray darkGray
 #define tqblack black
+#define tqblackptr &black
 #define tqcolor0 color0
 #define tqcolor1 color1
 
@@ -588,6 +599,7 @@ class QUObject;
 #include <tqt4/Qt/qpixmap.h>
 #include <tqt4/Qt/qwidget.h>
 #include <tqt4/Qt/q3painter.h>
+#include <tqt4/Qt/qstyle.h>
 #include <tqt4/Qt/qstyleoption.h>
 #include <tqt4/Qt/qcommonstyle.h>
 #include <tqt4/Qt/qapplication.h>
@@ -596,6 +608,7 @@ class QUObject;
 #include <tqt4/Qt/qslider.h>
 #include <tqt4/Qt/qscrollbar.h>
 #include <tqt4/Qt/qfileinfo.h>
+#include <tqt4/Qt/qmenudata.h>
 
 #include <Qt/q3strlist.h>
 #include <Qt/qx11info_x11.h>
@@ -606,19 +619,29 @@ class QUObject;
 #include <Qt/q3textstream.h>
 #include <Qt/q3valuelist.h>
 #include <Qt/q3url.h>
+#include <Qt/qdesktopwidget.h>
 #include <Qt/qevent.h>
 
 #include <tqlistiterator.h>
 #endif // __cplusplus
 
-#define tqchildren ptrchildren
-#define tqaccess access()
-#define tqcolorTable ptrColorTable
-#define TQSO_Default SO_Default
-#define tqqt_cast qobject_cast
-#define TQ_Horizontal Qt::Horizontal
-#define TQ_Vertical Qt::Vertical
-#define TQImage_ScaleFree Qt::ScaleFree
+#define tqchildren		ptrchildren
+#define tqaccess		access()
+#define tqcolorTable		ptrColorTable
+#define tqmask			ptrmask
+#define TQSO_Default		SO_Default
+#define tqqt_cast		qobject_cast
+#define TQ_Horizontal		Qt::Horizontal
+#define TQ_Vertical		Qt::Vertical
+#define TQImage_ScaleFree	Qt::ScaleFree
+#define TQ_Key_Shift		Qt::Key_Shift
+#define TQ_Key_Control		Qt::Key_Control
+#define TQ_Key_Alt		Qt::Key_Alt
+#define TQ_Key_Meta		Qt::Key_Meta
+#define TQ_Key_Super_L		Qt::Key_Super_L
+#define TQ_Key_Super_R		Qt::Key_Super_R
+#define TQ_Key_Hyper_L		Qt::Key_Hyper_L
+#define TQ_Key_Hyper_R		Qt::Key_Hyper_R
 
 #define TQAlignCenter Qt::AlignCenter
 #define TQNoBrush Qt::NoBrush
@@ -646,10 +669,12 @@ class QUObject;
 #define tqdarkMagenta Qt::darkMagenta
 #define tqdarkYellow Qt::darkYellow
 #define tqwhite Qt::white
+#define tqwhiteptr &((QColor)Qt::white)
 #define tqlightGray Qt::lightGray
 #define tqgray Qt::gray
 #define tqdarkGray Qt::darkGray
 #define tqblack Qt::black
+#define tqblackptr &((QColor)Qt::black)
 #define tqcolor0 Qt::color0
 #define tqcolor1 Qt::color1
 
@@ -741,6 +766,7 @@ class QUObject;
 
 #define WState			Qt::WidgetAttribute
 #define	WState_Polished		Qt::WA_WState_Polished
+#define WState_ForceHide	Qt::WA_WState_ForceHide
 
 #define WStyle_Customize	Qt::WStyle_Customize
 #define WType_Popup		Qt::WType_Popup
@@ -949,9 +975,9 @@ class QUObject;
 #define TQGLContext QGLContext
 #define TQGLWidget QGLWidget
 #define TQLNode QLNode
-#define TQGList QGList
-#define TQGListIterator QGListIterator
-#define TQGListStdIterator QGListStdIterator
+#define TQGList Q3GList
+#define TQGListIterator Q3GListIterator
+#define TQGListStdIterator Q3GListStdIterator
 #define TQGPlugin QGPlugin
 #define TQGrid Q3Grid
 #define TQGridView Q3GridView
@@ -1149,7 +1175,7 @@ class QUObject;
 #define TQStrIVec QStrIVec
 #define TQStyleFactory QStyleFactory
 #define TQStyleOption QStyleOption
-//#define TQStyle QStyle
+#define TQStyle QStyle
 #define TQStyleHintReturn QStyleHintReturn
 #define TQStylePlugin QStylePlugin
 #define TQStyleSheetItem Q3StyleSheetItem