diff options
| -rw-r--r-- | qtinterface/tqt.h.cmake | 80 |
1 files changed, 8 insertions, 72 deletions
diff --git a/qtinterface/tqt.h.cmake b/qtinterface/tqt.h.cmake index 10fb68d..3d72936 100644 --- a/qtinterface/tqt.h.cmake +++ b/qtinterface/tqt.h.cmake @@ -42,7 +42,7 @@ Boston, MA 02110-1301, USA. #define TQT_METHOD(a) METHOD(a) #define TQT_SLOT(a) SLOT(a) #define TQT_SIGNAL(a) SIGNAL(a) -#endif // __cplusplus +#endif /* __cplusplus */ #ifdef USE_QT3 #define TQ_OBJECT /* UNUSED */ @@ -62,7 +62,6 @@ Boston, MA 02110-1301, USA. #define TQ_PrimitiveElement PrimitiveElement #define TQ_StyleHint StyleHint #define tqstrcmp qstrcmp -//#define tqqt_cast ::qt_cast #define tqqt_cast qt_cast #define tqt_dynamic_cast dynamic_cast #define TQ_StrongFocus QWidget::StrongFocus @@ -918,9 +917,9 @@ Boston, MA 02110-1301, USA. #define tqt_mo_access access -// 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 +/* 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))) @@ -1005,7 +1004,7 @@ Boston, MA 02110-1301, USA. #define setTqalignment tqsetAlignment #define setTqgeometry setGeometry -// END BLOCK ONE +/* END BLOCK ONE */ #define tqarrowCursor Qt::arrowCursor #define tqupArrowCursor Qt::upArrowCursor @@ -1030,12 +1029,10 @@ Boston, MA 02110-1301, USA. #define SET_QT_X_USER_TIME(x) set_tqt_x_time(x) #define GET_QT_X_USER_TIME(x) get_tqt_x_time() -#endif // USE_QT3 +#endif /* USE_QT3 */ #ifdef USE_QT4 -//#define TQT_QT_STRING_LIST_TYPE QStringList -//#define TQT_QT_STRING_LIST_TYPE Q3StrList #define TQT_QT_STRING_LIST_TYPE TQStrList #ifdef __cplusplus @@ -1099,7 +1096,7 @@ class QUObject; #include <tqlistiterator.h> #include <tqstringlist.h> -#endif // __cplusplus +#endif /* __cplusplus */ #define tqchildren ptrchildren #define tqaccess access() @@ -1132,16 +1129,12 @@ class QUObject; #define TQNoBrush Qt::NoBrush #define QMetaData QMetaMethod -//#define qt_xdisplay QPaintDevice::x11Display #define qt_xdisplay QX11Info::display -//#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 qHeapSort tqHeapSort #define ColorOnly Qt::ColorOnly @@ -1161,12 +1154,10 @@ 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 @@ -1201,18 +1192,7 @@ class QUObject; #define SR_CustomBase SE_CustomBase #define StylePixmap StandardPixmap -// #define SP_TitleBarMinButton SC_TitleBarMinButton -// #define SP_TitleBarMaxButton SC_TitleBarMaxButton -// #define SP_TitleBarCloseButton SC_TitleBarCloseButton -// #define SP_TitleBarNormalButton SC_TitleBarNormalButton -// #define SP_TitleBarShadeButton SC_TitleBarShadeButton -// #define SP_TitleBarUnshadeButton SC_TitleBarUnshadeButton #define SP_DockWindowCloseButton SP_DockWidgetCloseButton -// #define SP_MessageBoxInformation SC_MessageBoxInformation -// #define SP_MessageBoxWarning SC_MessageBoxWarning -// #define SP_MessageBoxCritical SC_MessageBoxCritical -// #define SP_MessageBoxQuestion SC_MessageBoxQuestion -// #define SP_CustomBase SC_CustomBase #define StyleFlags StateFlags #define Style_Default QStyle::State_Default @@ -1240,7 +1220,7 @@ class QUObject; #define PE_ButtonTool PE_PanelButtonTool #define PE_DockWindowHandle PE_IndicatorToolBarHandle #define PE_DockWindowSeparator PE_Q3DockWindowSeparator -// Verify this one -------------v + #define PE_FocusRect PE_FrameFocusRect #define PE_Panel PE_Frame #define PE_RubberBand CE_RubberBand @@ -1260,7 +1240,6 @@ class QUObject; #define WState Qt::WidgetAttribute #define WState_Polished Qt::WA_WState_Polished -//#define WState_ForceHide Qt::WA_WState_ForceHide #define WState_ForceHide Qt::WA_WState_Hidden #define WStyle_Customize Qt::WStyle_Customize @@ -1333,9 +1312,6 @@ class QUObject; #define TQCanvasText Q3CanvasText #define TQCDEStyle QCDEStyle #define TQCheckBox QCheckBox -// #define TQCleanupHandler QCleanupHandler -// #define TQSingleCleanupHandler QSingleCleanupHandler -// #define TQSharedCleanupHandler QSharedCleanupHandler #define TQShared Q3Shared #define TQColor QColor #define TQColorDialog QColorDialog @@ -1431,18 +1407,13 @@ class QUObject; #define TQDragLeaveEvent QDragLeaveEvent #define TQChildEvent QChildEvent #define TQCustomEvent QCustomEvent -//#define TQEventLoop QAbstractEventDispatcher #define TQFileIconProvider Q3FileIconProvider #define TQFilePreview Q3FilePreview #define TQFileDialog Q3FileDialog #define TQFile QFile #define TQFileInfo QFileInfo #define TQFileInfoList QFileInfoList -//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 @@ -1489,7 +1460,6 @@ class QUObject; #define TQHttpRequestHeader Q3HttpRequestHeader #define TQHttp Q3Http #define TQIconSet QIcon -//#define TQIconFactory QIconFactory #define TQIconDragItem Q3IconDragItem #define TQIconDrag Q3IconDrag #define TQIconViewItem Q3IconViewItem @@ -1497,7 +1467,6 @@ class QUObject; #define TQImageFormatPlugin QImageFormatPlugin #define TQImageTextKeyLang QImageTextKeyLang #define TQImage QImage -//#define TQImageIO QImageIO #define TQInputContextFactory QInputContextFactory #define TQInputContext QInputContext #define TQIntCache Q3IntCache @@ -1533,13 +1502,6 @@ class QUObject; #define TQLocale QLocale #define TQLocalFs Q3LocalFs #define TQMainWindow Q3MainWindow -//#define TQMapIterator QMapIterator -//#define TQMapIterator QMap::iterator -//#define TQMapConstIterator QMapConstIterator -//#define TQMapConstIterator QMapIterator -//#define TQMapPrivateBase QMapPrivateBase -//#define TQMapPrivate QMapPrivate -//#define TQMap QMap #define TQMemArray Q3MemArray #define TQMenuBar QMenuBar #define TQMenuItem QMenuItem @@ -1555,7 +1517,6 @@ class QUObject; #define TQMacMime QMacMime #define TQMotifPlusStyle QMotifPlusStyle #define TQMotifStyle QMotifStyle -//#define TQMovie QMovie #define TQMultiLineEdit Q3MultiLineEdit #define TQMutex QMutex #define TQMutexLocker QMutexLocker @@ -1570,16 +1531,13 @@ class QUObject; #define TQObject QObject #define TQObjectUserData QObjectUserData #define TQObject QObject -//#define TQObjectList QObjectList #define TQObjectList TQPtrList<QObject> -//#define TQObjectListIterator TQListIterator<QObject *> #define TQObjectListIterator TQPtrListIterator<QObject> #define TQObjectListIt TQObjectListIterator #define TQPaintDevice QPaintDevice #define TQPaintDeviceMetrics Q3PaintDeviceMetrics #define TQPainter Q3Painter #define TQColorGroup QColorGroup -//#define TQPair QPair #define TQPalette QPalette #define TQPen QPen #define TQPicture Q3Picture @@ -1600,10 +1558,6 @@ class QUObject; #define TQPtrCollection Q3PtrCollection #define TQPtrDict Q3PtrDict #define TQPtrDictIterator Q3PtrDictIterator -// #define TQPtrListStdIterator Q3PtrListStdIterator -// #define TQPtrList Q3PtrList -// #define TQPtrListIterator Q3PtrListIterator -//#define TQPtrListIterator QListIterator #define TQPtrQueue Q3PtrQueue #define TQPtrStack Q3PtrStack #define TQPtrVector Q3PtrVector @@ -1667,10 +1621,6 @@ class QUObject; #define TQString QString #define TQCharRef QCharRef #define TQConstString QConstString -//#define TQStringList QStringList -// #define TQStrListIterator Q3StrListIterator -// #define TQStrIList Q3StrIList -// #define TQStrList Q3StrList #define TQStrVec QStrVec #define TQStrIVec QStrIVec #define TQStyleFactory QStyleFactory @@ -1726,11 +1676,6 @@ class QUObject; #define TQIntValidator QIntValidator #define TQDoubleValidator QDoubleValidator #define TQRegExpValidator QRegExpValidator -// #define TQValueListNode QValueListNode -// #define TQValueListIterator Q3ValueListIterator -// #define TQValueListConstIterator Q3ValueListConstIterator -// #define TQValueListPrivate QValueListPrivate -// #define TQValueList Q3ValueList #define TQValueStack Q3ValueStack #define TQValueVectorPrivate QValueVectorPrivate #define TQValueVector Q3ValueVector @@ -1744,8 +1689,6 @@ class QUObject; #define TQWidget QWidget #define TQWidgetIntDict QWidgetIntDict #define TQWidgetIntDictIt QWidgetIntDictIt -// #define TQWidgetList QWidgetList -// #define TQWidgetListIt QWidgetListIt #define TQWidgetPlugin QWidgetPlugin #define TQWidgetContainerPlugin QWidgetContainerPlugin #define TQWidgetStack Q3WidgetStack @@ -1770,11 +1713,4 @@ class QUObject; #define TQXmlDefaultHandler QXmlDefaultHandler #endif -// Undo any damage caused by the tqt-replace utility -//#define QCStringList TQCStringList -//#define QtWIN TQtWIN - -//#include "kdemacros.h.in" -//#define TQT_EXPORT KDE_EXPORT - #endif /* TQT_H */ |