diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-08-21 02:35:53 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-08-21 02:35:53 +0000 |
| commit | 32073e28f0e425c066e65f3fc6a3101feab22598 (patch) | |
| tree | 7e78a6f72b314bd555a49597c38ecabfc24a8714 /qtinterface/tqt.h | |
| parent | 90cbdd552d7ab58c8534b0f3d0980d5059adc422 (diff) | |
| download | tqtinterface-32073e28f0e425c066e65f3fc6a3101feab22598.tar.gz tqtinterface-32073e28f0e425c066e65f3fc6a3101feab22598.zip | |
More TQt functionality in place for Qt4...
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/dependencies/tqtinterface@1166130 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'qtinterface/tqt.h')
| -rw-r--r-- | qtinterface/tqt.h | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/qtinterface/tqt.h b/qtinterface/tqt.h index c18ca87..6b0b89c 100644 --- a/qtinterface/tqt.h +++ b/qtinterface/tqt.h @@ -24,6 +24,9 @@ Boston, MA 02110-1301, USA. #define USE_QTX +// DEBUG ONLY REMOVE ME TEST +#define USE_QT4 + #ifdef USE_QT4 #define QT3_SUPPORT #endif @@ -91,12 +94,12 @@ Boston, MA 02110-1301, USA. #define tqdarkMagenta darkMagenta #define tqdarkYellow darkYellow #define tqwhite white -#define tqwhiteptr &white +#define tqwhiteptr &Qt::white #define tqlightGray lightGray #define tqgray gray #define tqdarkGray darkGray #define tqblack black -#define tqblackptr &black +#define tqblackptr &Qt::black #define tqcolor0 color0 #define tqcolor1 color1 @@ -613,6 +616,7 @@ class QUObject; #include <tqt4/Qt/qwidget.h> #include <tqt4/Qt/q3painter.h> #include <tqt4/Qt/qstyle.h> +#include <tqt4/Qt/qtabbar.h> #include <tqt4/Qt/qstyleoption.h> #include <tqt4/Qt/qcommonstyle.h> #include <tqt4/Qt/qapplication.h> @@ -622,18 +626,17 @@ class QUObject; #include <tqt4/Qt/qscrollbar.h> #include <tqt4/Qt/qfileinfo.h> #include <tqt4/Qt/qmenu.h> +#include <tqt4/Qt/q3popupmenu.h> #include <tqt4/Qt/qmenudata.h> #include <tqt4/Qt/qdir.h> #include <tqt4/Qt/qtooltip.h> #include <tqt4/Qt/qmovie.h> - #include <Qt/q3strlist.h> #include <Qt/qx11info_x11.h> #include <Qt/q3combobox.h> #include <Qt/q3groupbox.h> -#include <Qt/q3popupmenu.h> #include <Qt/q3progressbar.h> #include <Qt/q3textstream.h> #include <Qt/q3valuelist.h> @@ -677,11 +680,14 @@ class QUObject; #define QMetaData QMetaMethod //#define qt_xdisplay QPaintDevice::x11Display #define qt_xdisplay QX11Info::display -#define qt_xrootwin QPaintDevice::x11AppRootWindow -#define qt_xscreen QPaintDevice::x11Screen +//#define qt_xrootwin QPaintDevice::x11AppRootWindow +#define qt_xrootwin QX11Info::appRootWindow +//#define qt_xscreen QPaintDevice::x11Screen +#define qt_xscreen QX11Info::appScreen #define qt_xget_temp_gc QPaintDevice::qt_xget_temp_gc #define TickSetting TickPosition #define ButtonState Qt::ButtonState +#define qHeapSort qStableSort #define ColorOnly Qt::ColorOnly #define MonoOnly Qt::MonoOnly |