summaryrefslogtreecommitdiffstats
path: root/qtinterface/tqt.h
diff options
context:
space:
mode:
Diffstat (limited to 'qtinterface/tqt.h')
-rw-r--r--qtinterface/tqt.h53
1 files changed, 47 insertions, 6 deletions
diff --git a/qtinterface/tqt.h b/qtinterface/tqt.h
index 8db5e27..55631d4 100644
--- a/qtinterface/tqt.h
+++ b/qtinterface/tqt.h
@@ -53,6 +53,9 @@ Boston, MA 02110-1301, USA.
#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 TQAlignCenter AlignCenter
#define TQNoBrush NoBrush
@@ -565,23 +568,44 @@ Boston, MA 02110-1301, USA.
class TQT_QT_STRING_LIST_TYPE;
class QUObject;
+#include <tqt4/Qt/qglobal.h>
+#include <tqt4/Qt/qchar.h>
+#include <tqt4/Qt/qnamespace.h>
#include <tqt4/Qt/qobjectdefs.h>
#include <tqt4/Qt/qlist.h>
#include <tqt4/Qt/qbytearray.h>
+#include <tqt4/Qt/qstring.h>
#include <tqt4/Qt/qobject.h>
#include <tqucomextra_p.h>
+#define QT_NO_QOBJECT
+#include <tqt4/Qt/qiodevice.h>
+#undef QT_NO_QOBJECT
+#include <tqt4/Qt/qdatastream.h>
#include <tqt4/Qt/qmetaobject.h>
#include <tqeventloop.h>
+#include <tqt4/Qt/qpaintdevice.h>
#include <tqt4/Qt/qimage.h>
#include <tqt4/Qt/qpixmap.h>
#include <tqt4/Qt/qwidget.h>
+#include <tqt4/Qt/q3painter.h>
+#include <tqt4/Qt/qstyleoption.h>
+#include <tqt4/Qt/qcommonstyle.h>
#include <tqt4/Qt/qapplication.h>
#include <tqt4/Qt/q3cstring.h>
#include <tqt4/Qt/q3pointarray.h>
+#include <tqt4/Qt/qslider.h>
+#include <tqt4/Qt/qscrollbar.h>
+#include <tqt4/Qt/qfileinfo.h>
#include <Qt/q3strlist.h>
+#include <Qt/qx11info_x11.h>
#include <Qt/q3popupmenu.h>
+#include <Qt/q3progressbar.h>
+#include <Qt/q3textstream.h>
+#include <Qt/q3valuelist.h>
+#include <Qt/q3url.h>
+#include <Qt/qevent.h>
#include <tqlistiterator.h>
#endif // __cplusplus
@@ -591,11 +615,18 @@ class QUObject;
#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 TQAlignCenter Qt::AlignCenter
#define TQNoBrush Qt::NoBrush
#define QMetaData QMetaMethod
+#define qt_xdisplay QX11Info::display
+#define qt_xrootwin QPaintDevice::x11AppRootWindow
+#define TickSetting TickPosition
+#define ButtonState Qt::ButtonState
#define ColorOnly Qt::ColorOnly
#define MonoOnly Qt::MonoOnly
@@ -656,7 +687,7 @@ class QUObject;
// #define SP_TitleBarNormalButton SC_TitleBarNormalButton
// #define SP_TitleBarShadeButton SC_TitleBarShadeButton
// #define SP_TitleBarUnshadeButton SC_TitleBarUnshadeButton
-// #define SP_DockWindowCloseButton SC_DockWindowCloseButton
+#define SP_DockWindowCloseButton SP_DockWidgetCloseButton
// #define SP_MessageBoxInformation SC_MessageBoxInformation
// #define SP_MessageBoxWarning SC_MessageBoxWarning
// #define SP_MessageBoxCritical SC_MessageBoxCritical
@@ -705,9 +736,15 @@ class QUObject;
#define SC_ListViewBranch SC_Q3ListViewBranch
#define SC_ListViewExpand SC_Q3ListViewExpand
+#define CC_ListView CC_Q3ListView
+
#define WState Qt::WidgetAttribute
#define WState_Polished Qt::WA_WState_Polished
+#define WStyle_Customize Qt::WStyle_Customize
+#define WType_Popup Qt::WType_Popup
+#define WX11BypassWM Qt::WX11BypassWM
+
#define SH_PopupMenu_Scrollable SH_Menu_Scrollable
#define SH_PopupMenu_SloppySubMenus SH_Menu_SloppySubMenus
#define SH_PopupMenu_SubMenuPopupDelay SH_Menu_SubMenuPopupDelay
@@ -806,7 +843,7 @@ class QUObject;
#define TQDateTimeEditBase Q3DateTimeEditBase
#define TQDate QDate
#define TQTime QTime
-#define TQDateTime Q3DateTime
+#define TQDateTime QDateTime
#define TQDeepCopy Q3DeepCopy
#define TQDesktopWidget QDesktopWidget
#define TQDial QDial
@@ -880,7 +917,11 @@ class QUObject;
#define TQFile QFile
#define TQFileInfo QFileInfo
#define TQFileInfoList QFileInfoList
-#define TQFileInfoListIterator QFileInfoListIterator
+//typedef QList<QFileInfo> TQFileInfoList;
+//typedef QList<QFileInfo *> TQFileInfoList;
+//#define TQFileInfoListIterator TQListIterator<QFileInfo>
+#define TQFileInfoListIterator TQListIteratorRetPtr<QFileInfo>
+//#define TQFileInfoListIterator TQListIterator<QFileInfo *>
#define TQFocusData QFocusData
#define TQFontDatabase QFontDatabase
#define TQFont QFont
@@ -926,7 +967,7 @@ class QUObject;
#define TQHttpResponseHeader Q3HttpResponseHeader
#define TQHttpRequestHeader Q3HttpRequestHeader
#define TQHttp Q3Http
-#define TQIconSet QIconSet
+#define TQIconSet QIcon
#define TQIconFactory QIconFactory
#define TQIconDragItem Q3IconDragItem
#define TQIconDrag Q3IconDrag
@@ -1028,7 +1069,7 @@ class QUObject;
#define TQPrintDialog QPrintDialog
#define TQPrinter QPrinter
#define TQProcess Q3Process
-#define TQProgressBar QP3rogressBar
+#define TQProgressBar Q3ProgressBar
#define TQProgressDialog Q3ProgressDialog
#define TQPtrCollection Q3PtrCollection
#define TQPtrDict Q3PtrDict
@@ -1182,7 +1223,7 @@ class QUObject;
#define TQWidgetStackAccelManager Q3WidgetStackAccelManager
#define TQWindowsStyle QWindowsStyle
#define TQWizard Q3Wizard
-#define TQWMatrix QWMatrix
+#define TQWMatrix QMatrix
#define TQWorkspace QWorkspace
#define TQXmlNamespaceSupport QXmlNamespaceSupport
#define TQXmlAttributes QXmlAttributes