* More TQt/Qt4 features

* Various compilation fixes for Slackware


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

1 files changed, 42 insertions, 28 deletions

diff --git a/qtinterface/tqt.h b/qtinterface/tqt.h
index 40344c0..82a3a9d 100644
--- a/qtinterface/tqt.h
+++ b/qtinterface/tqt.h
@@ -159,7 +159,6 @@ Boston, MA 02110-1301, USA.
 #define TQShared QShared
 #define TQColor QColor
 #define TQColorDialog QColorDialog
-#define TQStringList QStringList
 #define TQStringPairList QStringPairList
 #define TQLineEdit QLineEdit
 #define TQValidator QValidator
@@ -394,6 +393,7 @@ Boston, MA 02110-1301, USA.
 #define TQPaintDevice QPaintDevice
 #define TQPaintDeviceMetrics QPaintDeviceMetrics
 #define TQColorGroup QColorGroup
+#define TQPair QPair
 #define TQPalette QPalette
 #define TQPen QPen
 #define TQPicture QPicture
@@ -584,7 +584,8 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 //#define TQT_QT_STRING_LIST_TYPE QStringList
-#define TQT_QT_STRING_LIST_TYPE Q3StrList
+//#define TQT_QT_STRING_LIST_TYPE Q3StrList
+#define TQT_QT_STRING_LIST_TYPE TQStrList
 
 #ifdef __cplusplus
 class TQT_QT_STRING_LIST_TYPE;
@@ -612,6 +613,7 @@ class QUObject;
 #include <tqt4/Qt/qpixmap.h>
 #include <tqt4/Qt/qwidget.h>
 #include <tqt4/Qt/q3painter.h>
+#include <tqt4/Qt/qicon.h>
 #include <tqt4/Qt/qstyle.h>
 #include <tqt4/Qt/qtabbar.h>
 #include <tqt4/Qt/qstyleoption.h>
@@ -628,6 +630,8 @@ class QUObject;
 #include <tqt4/Qt/qdir.h>
 #include <tqt4/Qt/qtooltip.h>
 #include <tqt4/Qt/qmovie.h>
+#include <tqt4/Qt/q3whatsthis.h>
+#include <tqt4/Qt/qtextcodec.h>
 
 #include <Qt/q3strlist.h>
 #include <Qt/qx11info_x11.h>
@@ -642,6 +646,8 @@ class QUObject;
 #include <Qt/qevent.h>
 
 #include <tqlistiterator.h>
+
+#include <tqstringlist.h>
 #endif // __cplusplus
 
 #define tqchildren		ptrchildren
@@ -684,7 +690,8 @@ class QUObject;
 #define qt_xget_temp_gc QPaintDevice::qt_xget_temp_gc
 #define TickSetting TickPosition
 #define ButtonState Qt::ButtonState
-#define qHeapSort qStableSort
+//#define qHeapSort qStableSort
+#define qHeapSort tqHeapSort
 
 #define ColorOnly Qt::ColorOnly
 #define MonoOnly Qt::MonoOnly
@@ -703,15 +710,17 @@ class QUObject;
 #define tqdarkMagenta Qt::darkMagenta
 #define tqdarkYellow Qt::darkYellow
 #define tqwhite Qt::white
-#define tqwhiteptr &((QColor)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 tqblackptr &((QColor)Qt::black)
 #define tqcolor0 Qt::color0
 #define tqcolor1 Qt::color1
 
+#define tqblackptr &tqblackptr_core
+
 #define SubRect			SubElement
 #define SR_PushButtonContents	SE_PushButtonContents
 #define SR_PushButtonFocusRect	SE_PushButtonFocusRect
@@ -879,7 +888,6 @@ class QUObject;
 #define TQShared Q3Shared
 #define TQColor QColor
 #define TQColorDialog QColorDialog
-#define TQStringList QStringList
 #define TQStringPairList Q3StringPairList
 #define TQLineEdit QLineEdit
 #define TQValidator QValidator
@@ -1030,7 +1038,7 @@ class QUObject;
 #define TQHttpRequestHeader Q3HttpRequestHeader
 #define TQHttp Q3Http
 #define TQIconSet QIcon
-#define TQIconFactory QIconFactory
+//#define TQIconFactory QIconFactory
 #define TQIconDragItem Q3IconDragItem
 #define TQIconDrag Q3IconDrag
 #define TQIconViewItem Q3IconViewItem
@@ -1074,11 +1082,13 @@ class QUObject;
 #define TQLocale QLocale
 #define TQLocalFs Q3LocalFs
 #define TQMainWindow Q3MainWindow
-#define TQMapIterator QMapIterator
-#define TQMapConstIterator QMapConstIterator
-#define TQMapPrivateBase QMapPrivateBase
-#define TQMapPrivate QMapPrivate
-#define TQMap QMap
+//#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
@@ -1109,13 +1119,16 @@ class QUObject;
 #define TQObject QObject
 #define TQObjectUserData QObjectUserData
 #define TQObject QObject
-#define TQObjectList QObjectList
-#define TQObjectListIterator TQListIterator<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
@@ -1136,9 +1149,10 @@ class QUObject;
 #define TQPtrCollection Q3PtrCollection
 #define TQPtrDict Q3PtrDict
 #define TQPtrDictIterator Q3PtrDictIterator
-#define TQPtrListStdIterator Q3PtrListStdIterator
-#define TQPtrList Q3PtrList
-#define TQPtrListIterator Q3PtrListIterator
+// #define TQPtrListStdIterator Q3PtrListStdIterator
+// #define TQPtrList Q3PtrList
+// #define TQPtrListIterator Q3PtrListIterator
+//#define TQPtrListIterator QListIterator
 #define TQPtrQueue Q3PtrQueue
 #define TQPtrStack Q3PtrStack
 #define TQPtrVector Q3PtrVector
@@ -1202,10 +1216,10 @@ class QUObject;
 #define TQString QString
 #define TQCharRef QCharRef
 #define TQConstString QConstString
-#define TQStringList QStringList
-#define TQStrListIterator Q3StrListIterator
-#define TQStrIList Q3StrIList
-#define TQStrList Q3StrList
+//#define TQStringList QStringList
+// #define TQStrListIterator Q3StrListIterator
+// #define TQStrIList Q3StrIList
+// #define TQStrList Q3StrList
 #define TQStrVec QStrVec
 #define TQStrIVec QStrIVec
 #define TQStyleFactory QStyleFactory
@@ -1261,11 +1275,11 @@ 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 TQValueListNode QValueListNode
+// #define TQValueListIterator Q3ValueListIterator
+// #define TQValueListConstIterator Q3ValueListConstIterator
+// #define TQValueListPrivate QValueListPrivate
+// #define TQValueList Q3ValueList
 #define TQValueStack Q3ValueStack
 #define TQValueVectorPrivate QValueVectorPrivate
 #define TQValueVector Q3ValueVector
@@ -1279,8 +1293,8 @@ class QUObject;
 #define TQWidget QWidget
 #define TQWidgetIntDict QWidgetIntDict
 #define TQWidgetIntDictIt QWidgetIntDictIt
-#define TQWidgetList QWidgetList
-#define TQWidgetListIt QWidgetListIt
+// #define TQWidgetList QWidgetList
+// #define TQWidgetListIt QWidgetListIt
 #define TQWidgetPlugin QWidgetPlugin
 #define TQWidgetContainerPlugin QWidgetContainerPlugin
 #define TQWidgetStack Q3WidgetStack