TQt conversion fixes

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

181 files changed, 393 insertions, 393 deletions

diff --git a/dcoppython/shell/marshaller.h b/dcoppython/shell/marshaller.h
index 0e678f7f..6cb16d89 100644
--- a/dcoppython/shell/marshaller.h
+++ b/dcoppython/shell/marshaller.h
@@ -15,7 +15,7 @@
 #include <Python.h>
 #include <tqstring.h>
 
-class QDataStream;
+class TQDataStream;
 
 namespace PythonDCOP {
 //   class Marshaller;
diff --git a/dcoppython/shell/pcop.h b/dcoppython/shell/pcop.h
index c9728e37..f9c2d26b 100644
--- a/dcoppython/shell/pcop.h
+++ b/dcoppython/shell/pcop.h
@@ -20,7 +20,7 @@
 #include <dcopclient.h>
 #include <dcopobject.h>
 
-class QDataStream;
+class TQDataStream;
 
 namespace PythonDCOP {
   class Client;
diff --git a/kjsembed/bindings/kconfig_imp.h b/kjsembed/bindings/kconfig_imp.h
index 9daf5f17..5eb99973 100644
--- a/kjsembed/bindings/kconfig_imp.h
+++ b/kjsembed/bindings/kconfig_imp.h
@@ -36,7 +36,7 @@
 #ifndef QT_ONLY
 class KConfig;
 #else
-class QSettings;
+class TQSettings;
 #endif
 
 namespace KJSEmbed {
diff --git a/kjsembed/bindings/painter_imp.cpp b/kjsembed/bindings/painter_imp.cpp
index ef2f9ddd..df6673e8 100644
--- a/kjsembed/bindings/painter_imp.cpp
+++ b/kjsembed/bindings/painter_imp.cpp
@@ -63,7 +63,7 @@ namespace Bindings {
 PainterRef::PainterRef()
 {
 	m_device = 0L;
-	m_painter = new QPainter;
+	m_painter = new TQPainter;
   m_canDelete = true;
 }
 PainterRef::~PainterRef()
diff --git a/kjsembed/bindings/painter_imp.h b/kjsembed/bindings/painter_imp.h
index 8b71a191..f831b7fd 100644
--- a/kjsembed/bindings/painter_imp.h
+++ b/kjsembed/bindings/painter_imp.h
@@ -27,7 +27,7 @@
 #include <tqpen.h>
 #include <tqpainter.h>
 
-class QPixmap;
+class TQPixmap;
 
 namespace KJSEmbed {
 namespace Bindings {
diff --git a/kjsembed/builtins/qdir_imp.h b/kjsembed/builtins/qdir_imp.h
index 7a8aa86b..9bd6d770 100644
--- a/kjsembed/builtins/qdir_imp.h
+++ b/kjsembed/builtins/qdir_imp.h
@@ -10,7 +10,7 @@
 #include <kjsembed/jsobjectproxy_imp.h>
 #include <kjsembed/jsbindingbase.h>
 
-class QDir;
+class TQDir;
 
 /**
  * Namespace containing the KJSEmbed library.
diff --git a/kjsembed/builtins/qfile_imp.h b/kjsembed/builtins/qfile_imp.h
index d116040e..bf4df5ea 100644
--- a/kjsembed/builtins/qfile_imp.h
+++ b/kjsembed/builtins/qfile_imp.h
@@ -9,7 +9,7 @@
 
 #include <kjsembed/jsobjectproxy_imp.h>
 
-class QFile;
+class TQFile;
 
 /**
  * Namespace containing the KJSEmbed library.
diff --git a/kjsembed/builtins/textstream_imp.h b/kjsembed/builtins/textstream_imp.h
index 055cbe9d..c08470fc 100644
--- a/kjsembed/builtins/textstream_imp.h
+++ b/kjsembed/builtins/textstream_imp.h
@@ -27,7 +27,7 @@
 
 #include <kjsembed/jsobjectproxy_imp.h>
 
-class QTextStream;
+class TQTextStream;
 
 namespace KJSEmbed {
 namespace BuiltIns {
diff --git a/kjsembed/customobject_imp.cpp b/kjsembed/customobject_imp.cpp
index 104915d8..572a99e2 100644
--- a/kjsembed/customobject_imp.cpp
+++ b/kjsembed/customobject_imp.cpp
@@ -203,14 +203,14 @@ void CustomObjectImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 	    object.put( exec, "addChild", KJS::Object(obj) );
 	}
 
-	//ADDBINDING( QMenuItem, widget)
-	//ADDBINDING( QMenuData, widget)
-
-	ADDBINDING( QPopupMenu, widget )
-	ADDBINDING( QComboBox, widget )
-	//ADDBINDING( QFrame, widget )
-	/*ADDBINDING( QListView, widget )*/
-	ADDBINDING( QCanvasView, widget )
+	//ADDBINDING( TQMenuItem, widget)
+	//ADDBINDING( TQMenuData, widget)
+
+	ADDBINDING( TQPopupMenu, widget )
+	ADDBINDING( TQComboBox, widget )
+	//ADDBINDING( TQFrame, widget )
+	/*ADDBINDING( TQListView, widget )*/
+	ADDBINDING( TQCanvasView, widget )
 
 	/*
 	TQMenuData *md = dynamic_cast<TQMenuData *>( widget );
diff --git a/kjsembed/customobject_imp.h b/kjsembed/customobject_imp.h
index 553e55b9..50926dc0 100644
--- a/kjsembed/customobject_imp.h
+++ b/kjsembed/customobject_imp.h
@@ -28,7 +28,7 @@
 
 #include <kjsembed/jsobjectproxy_imp.h>
 
-class QObject;
+class TQObject;
 
 namespace KJSEmbed {
 namespace Bindings {
diff --git a/kjsembed/jsconsolewidget.h b/kjsembed/jsconsolewidget.h
index bf7100df..52a5e0bd 100644
--- a/kjsembed/jsconsolewidget.h
+++ b/kjsembed/jsconsolewidget.h
@@ -25,8 +25,8 @@
 #include <tqframe.h>
 #include <kjsembed/global.h>
 
-class QPushButton;
-class QHBox;
+class TQPushButton;
+class TQHBox;
 
 class KLineEdit;
 class KPopupTitle;
diff --git a/kjsembed/jsfactory.h b/kjsembed/jsfactory.h
index 9bef7f82..726a8344 100644
--- a/kjsembed/jsfactory.h
+++ b/kjsembed/jsfactory.h
@@ -29,10 +29,10 @@
 #include <kjs/interpreter.h>
 #include <kjs/object.h>
 
-class QEvent;
-class QObject;
-class QWidget;
-class QTextStream;
+class TQEvent;
+class TQObject;
+class TQWidget;
+class TQTextStream;
 
 namespace KParts {
     class ReadOnlyPart;
diff --git a/kjsembed/jsopaqueproxy.h b/kjsembed/jsopaqueproxy.h
index e5a4c1f0..fdad268b 100644
--- a/kjsembed/jsopaqueproxy.h
+++ b/kjsembed/jsopaqueproxy.h
@@ -31,7 +31,7 @@
 #include <algorithm>
 #include <typeinfo>
 
-class QTextStream;
+class TQTextStream;
 
 namespace KJSEmbed {
 
diff --git a/kjsembed/kjsembedpart.h b/kjsembed/kjsembedpart.h
index e9be3efc..0d87bb00 100644
--- a/kjsembed/kjsembedpart.h
+++ b/kjsembed/kjsembedpart.h
@@ -40,7 +40,7 @@
 #include <kjsembed/qtstubs.h>
 #endif
 
-class QWidget;
+class TQWidget;
 
 #define KJSEMBED_VERSION_STRING "0.3"
 #define KJSEMBED_VERSION_MAJOR 0
diff --git a/kjsembed/qtbindings/qcanvas_imp.h b/kjsembed/qtbindings/qcanvas_imp.h
index 4521bfe8..255bbe44 100644
--- a/kjsembed/qtbindings/qcanvas_imp.h
+++ b/kjsembed/qtbindings/qcanvas_imp.h
@@ -9,7 +9,7 @@
 
 #include <kjsembed/jsobjectproxy_imp.h>
 
-class QCanvas;
+class TQCanvas;
 
 /**
  * Namespace containing the KJSEmbed library.
diff --git a/kjsembed/qtbindings/qcanvasellipse_imp.h b/kjsembed/qtbindings/qcanvasellipse_imp.h
index 0d15d67b..2a61a439 100644
--- a/kjsembed/qtbindings/qcanvasellipse_imp.h
+++ b/kjsembed/qtbindings/qcanvasellipse_imp.h
@@ -9,7 +9,7 @@
 
 #include <kjsembed/jsobjectproxy_imp.h>
 
-class QCanvasEllipse;
+class TQCanvasEllipse;
 
 /**
  * Namespace containing the KJSEmbed library.
diff --git a/kjsembed/qtbindings/qcanvasitem_imp.h b/kjsembed/qtbindings/qcanvasitem_imp.h
index 8951eda0..d0823afe 100644
--- a/kjsembed/qtbindings/qcanvasitem_imp.h
+++ b/kjsembed/qtbindings/qcanvasitem_imp.h
@@ -9,7 +9,7 @@
 
 #include <kjsembed/jsobjectproxy_imp.h>
 
-class QCanvasItem;
+class TQCanvasItem;
 
 /**
  * Namespace containing the KJSEmbed library.
diff --git a/kjsembed/qtbindings/qcanvasitemlist_imp.h b/kjsembed/qtbindings/qcanvasitemlist_imp.h
index f6b7a0cc..3f2edae1 100644
--- a/kjsembed/qtbindings/qcanvasitemlist_imp.h
+++ b/kjsembed/qtbindings/qcanvasitemlist_imp.h
@@ -9,7 +9,7 @@
 
 #include <kjsembed/jsobjectproxy_imp.h>
 
-class QCanvasItemList;
+class TQCanvasItemList;
 
 /**
  * Namespace containing the KJSEmbed library.
diff --git a/kjsembed/qtbindings/qcanvasline_imp.h b/kjsembed/qtbindings/qcanvasline_imp.h
index 94b8f1ad..95ab8cb3 100644
--- a/kjsembed/qtbindings/qcanvasline_imp.h
+++ b/kjsembed/qtbindings/qcanvasline_imp.h
@@ -9,7 +9,7 @@
 
 #include <kjsembed/jsobjectproxy_imp.h>
 
-class QCanvasLine;
+class TQCanvasLine;
 
 /**
  * Namespace containing the KJSEmbed library.
diff --git a/kjsembed/qtbindings/qcanvaspixmap_imp.h b/kjsembed/qtbindings/qcanvaspixmap_imp.h
index 6e9525f0..607ff4d4 100644
--- a/kjsembed/qtbindings/qcanvaspixmap_imp.h
+++ b/kjsembed/qtbindings/qcanvaspixmap_imp.h
@@ -9,7 +9,7 @@
 
 #include <kjsembed/jsobjectproxy_imp.h>
 
-class QCanvasPixmap;
+class TQCanvasPixmap;
 
 /**
  * Namespace containing the KJSEmbed library.
diff --git a/kjsembed/qtbindings/qcanvaspixmaparray_imp.h b/kjsembed/qtbindings/qcanvaspixmaparray_imp.h
index 16f842a5..c1dba541 100644
--- a/kjsembed/qtbindings/qcanvaspixmaparray_imp.h
+++ b/kjsembed/qtbindings/qcanvaspixmaparray_imp.h
@@ -9,7 +9,7 @@
 
 #include <kjsembed/jsobjectproxy_imp.h>
 
-class QCanvasPixmapArray;
+class TQCanvasPixmapArray;
 
 /**
  * Namespace containing the KJSEmbed library.
diff --git a/kjsembed/qtbindings/qcanvaspolygon_imp.h b/kjsembed/qtbindings/qcanvaspolygon_imp.h
index 9bb1a99e..98398bf0 100644
--- a/kjsembed/qtbindings/qcanvaspolygon_imp.h
+++ b/kjsembed/qtbindings/qcanvaspolygon_imp.h
@@ -9,7 +9,7 @@
 
 #include <kjsembed/jsobjectproxy_imp.h>
 
-class QCanvasPolygon;
+class TQCanvasPolygon;
 
 /**
  * Namespace containing the KJSEmbed library.
diff --git a/kjsembed/qtbindings/qcanvaspolygonalitem_imp.h b/kjsembed/qtbindings/qcanvaspolygonalitem_imp.h
index 2316e7f9..389ed346 100644
--- a/kjsembed/qtbindings/qcanvaspolygonalitem_imp.h
+++ b/kjsembed/qtbindings/qcanvaspolygonalitem_imp.h
@@ -9,7 +9,7 @@
 
 #include <kjsembed/jsobjectproxy_imp.h>
 
-class QCanvasPolygonalItem;
+class TQCanvasPolygonalItem;
 
 /**
  * Namespace containing the KJSEmbed library.
diff --git a/kjsembed/qtbindings/qcanvasrectangle_imp.h b/kjsembed/qtbindings/qcanvasrectangle_imp.h
index b2ff92a3..1e141fe2 100644
--- a/kjsembed/qtbindings/qcanvasrectangle_imp.h
+++ b/kjsembed/qtbindings/qcanvasrectangle_imp.h
@@ -9,7 +9,7 @@
 
 #include <kjsembed/jsobjectproxy_imp.h>
 
-class QCanvasRectangle;
+class TQCanvasRectangle;
 
 /**
  * Namespace containing the KJSEmbed library.
diff --git a/kjsembed/qtbindings/qcanvasspline_imp.h b/kjsembed/qtbindings/qcanvasspline_imp.h
index 28679bcb..73f87999 100644
--- a/kjsembed/qtbindings/qcanvasspline_imp.h
+++ b/kjsembed/qtbindings/qcanvasspline_imp.h
@@ -9,7 +9,7 @@
 
 #include <kjsembed/jsobjectproxy_imp.h>
 
-class QCanvasSpline;
+class TQCanvasSpline;
 
 /**
  * Namespace containing the KJSEmbed library.
diff --git a/kjsembed/qtbindings/qcanvassprite_imp.h b/kjsembed/qtbindings/qcanvassprite_imp.h
index c62f86db..4fe40dc1 100644
--- a/kjsembed/qtbindings/qcanvassprite_imp.h
+++ b/kjsembed/qtbindings/qcanvassprite_imp.h
@@ -9,7 +9,7 @@
 
 #include <kjsembed/jsobjectproxy_imp.h>
 
-class QCanvasSprite;
+class TQCanvasSprite;
 
 /**
  * Namespace containing the KJSEmbed library.
diff --git a/kjsembed/qtbindings/qcanvastext_imp.h b/kjsembed/qtbindings/qcanvastext_imp.h
index bf2049bd..11f50a51 100644
--- a/kjsembed/qtbindings/qcanvastext_imp.h
+++ b/kjsembed/qtbindings/qcanvastext_imp.h
@@ -9,7 +9,7 @@
 
 #include <kjsembed/jsobjectproxy_imp.h>
 
-class QCanvasText;
+class TQCanvasText;
 
 /**
  * Namespace containing the KJSEmbed library.
diff --git a/kjsembed/qtbindings/qcanvasview_imp.h b/kjsembed/qtbindings/qcanvasview_imp.h
index 03fac913..24322716 100644
--- a/kjsembed/qtbindings/qcanvasview_imp.h
+++ b/kjsembed/qtbindings/qcanvasview_imp.h
@@ -9,7 +9,7 @@
 
 #include <kjsembed/jsobjectproxy_imp.h>
 
-class QCanvasView;
+class TQCanvasView;
 
 /**
  * Namespace containing the KJSEmbed library.
diff --git a/kjsembed/qtbindings/qchecklistitem_imp.h b/kjsembed/qtbindings/qchecklistitem_imp.h
index 5bc5bcd8..4ba46d32 100644
--- a/kjsembed/qtbindings/qchecklistitem_imp.h
+++ b/kjsembed/qtbindings/qchecklistitem_imp.h
@@ -10,7 +10,7 @@
 #include <kjsembed/jsobjectproxy_imp.h>
 #include <kjsembed/jsbindingbase.h>
 
-class QCheckListItem;
+class TQCheckListItem;
 
 /**
  * Namespace containing the KJSEmbed library.
diff --git a/kjsembed/qtbindings/qcombobox_imp.h b/kjsembed/qtbindings/qcombobox_imp.h
index 255e5323..a11fba7c 100644
--- a/kjsembed/qtbindings/qcombobox_imp.h
+++ b/kjsembed/qtbindings/qcombobox_imp.h
@@ -9,7 +9,7 @@
 
 #include <kjsembed/jsobjectproxy_imp.h>
 
-class QComboBox;
+class TQComboBox;
 
 /**
  * Namespace containing the KJSEmbed library.
diff --git a/kjsembed/qtbindings/qlistview_imp.h b/kjsembed/qtbindings/qlistview_imp.h
index 7fbee199..22786b8d 100644
--- a/kjsembed/qtbindings/qlistview_imp.h
+++ b/kjsembed/qtbindings/qlistview_imp.h
@@ -9,7 +9,7 @@
 
 #include <kjsembed/jsobjectproxy_imp.h>
 
-class QListView;
+class TQListView;
 
 /**
  * Namespace containing the KJSEmbed library.
diff --git a/kjsembed/qtbindings/qlistviewitem_imp.h b/kjsembed/qtbindings/qlistviewitem_imp.h
index 9f05bf89..2f0eb21b 100644
--- a/kjsembed/qtbindings/qlistviewitem_imp.h
+++ b/kjsembed/qtbindings/qlistviewitem_imp.h
@@ -10,7 +10,7 @@
 #include <kjsembed/jsobjectproxy_imp.h>
 #include <kjsembed/jsbindingbase.h>
 
-class QListViewItem;
+class TQListViewItem;
 
 /**
  * Namespace containing the KJSEmbed library.
diff --git a/kjsembed/qtbindings/qmenudata_imp.h b/kjsembed/qtbindings/qmenudata_imp.h
index b6b50fa7..83f84aa5 100644
--- a/kjsembed/qtbindings/qmenudata_imp.h
+++ b/kjsembed/qtbindings/qmenudata_imp.h
@@ -9,7 +9,7 @@
 
 #include <kjsembed/jsobjectproxy_imp.h>
 
-class QMenuData;
+class TQMenuData;
 
 /**
  * Namespace containing the KJSEmbed library.
diff --git a/kjsembed/qtbindings/qmenuitem_imp.h b/kjsembed/qtbindings/qmenuitem_imp.h
index 7af67bd6..59b7d996 100644
--- a/kjsembed/qtbindings/qmenuitem_imp.h
+++ b/kjsembed/qtbindings/qmenuitem_imp.h
@@ -9,7 +9,7 @@
 
 #include <kjsembed/jsobjectproxy_imp.h>
 
-class QMenuItem;
+class TQMenuItem;
 
 /**
  * Namespace containing the KJSEmbed library.
diff --git a/kjsembed/qtbindings/qpopupmenu_imp.h b/kjsembed/qtbindings/qpopupmenu_imp.h
index 9bb16af9..3a0c019d 100644
--- a/kjsembed/qtbindings/qpopupmenu_imp.h
+++ b/kjsembed/qtbindings/qpopupmenu_imp.h
@@ -9,7 +9,7 @@
 
 #include <kjsembed/jsobjectproxy_imp.h>
 
-class QPopupMenu;
+class TQPopupMenu;
 
 /**
  * Namespace containing the KJSEmbed library.
diff --git a/kjsembed/qtstubs.h b/kjsembed/qtstubs.h
index 5b646d02..cd676964 100644
--- a/kjsembed/qtstubs.h
+++ b/kjsembed/qtstubs.h
@@ -27,7 +27,7 @@
 #include <tqobject.h>
 #include <tqurl.h>
 
-class QWidget;
+class TQWidget;
 
 typedef TQUrl KURL;
 
diff --git a/kjsembed/slotproxy.h b/kjsembed/slotproxy.h
index 4ed96b24..2dc3565d 100644
--- a/kjsembed/slotproxy.h
+++ b/kjsembed/slotproxy.h
@@ -32,9 +32,9 @@
 #include <kjsembed/qtstubs.h>
 #endif // QT_ONLY
 
-class QDate;
-class QTime;
-class QDateTime;
+class TQDate;
+class TQTime;
+class TQDateTime;
 
 namespace KJS {
 class Interpreter;
diff --git a/kjsembed/slotutils.h b/kjsembed/slotutils.h
index 7043e590..7e5650d6 100644
--- a/kjsembed/slotutils.h
+++ b/kjsembed/slotutils.h
@@ -26,7 +26,7 @@
 #include <kjs/object.h>
 #include <kjsembed/jsbinding.h>
 
-class QObject;
+class TQObject;
 
 namespace KJS { class Interpreter; }
 
diff --git a/kjsembed/tools/headers/qbrush.h b/kjsembed/tools/headers/qbrush.h
index e85f0750..82b00044 100644
--- a/kjsembed/tools/headers/qbrush.h
+++ b/kjsembed/tools/headers/qbrush.h
@@ -46,7 +46,7 @@
 
 class Q_EXPORT TQBrush: public Qt
 {
-friend class QPainter;
+friend class TQPainter;
 public:
     TQBrush();
     TQBrush( BrushStyle );
diff --git a/kjsembed/tools/headers/qcanvas.h b/kjsembed/tools/headers/qcanvas.h
index 797c4bd3..8eb70959 100644
--- a/kjsembed/tools/headers/qcanvas.h
+++ b/kjsembed/tools/headers/qcanvas.h
@@ -59,18 +59,18 @@
 #ifndef QT_NO_CANVAS
 
 
-class QCanvasSprite;
-class QCanvasPolygonalItem;
-class QCanvasRectangle;
-class QCanvasPolygon;
-class QCanvasEllipse;
-class QCanvasText;
-class QCanvasLine;
-class QCanvasChunk;
-class QCanvas;
-class QCanvasItem;
-class QCanvasView;
-class QCanvasPixmap;
+class TQCanvasSprite;
+class TQCanvasPolygonalItem;
+class TQCanvasRectangle;
+class TQCanvasPolygon;
+class TQCanvasEllipse;
+class TQCanvasText;
+class TQCanvasLine;
+class TQCanvasChunk;
+class TQCanvas;
+class TQCanvasItem;
+class TQCanvasView;
+class TQCanvasPixmap;
 
 
 class QM_EXPORT_CANVAS TQCanvasItemList : public TQValueList<TQCanvasItem*> {
@@ -80,7 +80,7 @@ public:
 };
 
 
-class QCanvasItemExtra;
+class TQCanvasItemExtra;
 
 class QM_EXPORT_CANVAS TQCanvasItem : public Qt
 {
@@ -171,13 +171,13 @@ protected:
 private:
     // For friendly subclasses...
 
-    friend class QCanvasPolygonalItem;
-    friend class QCanvasSprite;
-    friend class QCanvasRectangle;
-    friend class QCanvasPolygon;
-    friend class QCanvasEllipse;
-    friend class QCanvasText;
-    friend class QCanvasLine;
+    friend class TQCanvasPolygonalItem;
+    friend class TQCanvasSprite;
+    friend class TQCanvasRectangle;
+    friend class TQCanvasPolygon;
+    friend class TQCanvasEllipse;
+    friend class TQCanvasText;
+    friend class TQCanvasLine;
 
     virtual TQPointArray chunks() const;
     virtual void addToChunks();
@@ -204,7 +204,7 @@ private:
 };
 
 
-class QCanvasData;
+class TQCanvasData;
 
 class QM_EXPORT_CANVAS TQCanvas : public QObject
 {
@@ -350,7 +350,7 @@ private:
 #endif
 };
 
-class QCanvasViewData;
+class TQCanvasViewData;
 
 class QM_EXPORT_CANVAS TQCanvasView : public QScrollView
 {
@@ -415,8 +415,8 @@ private:
     void init(const TQImage&);
     void init(const TQPixmap& pixmap, int hx, int hy);
 
-    friend class QCanvasSprite;
-    friend class QCanvasPixmapArray;
+    friend class TQCanvasSprite;
+    friend class TQCanvasPixmapArray;
     friend bool qt_testCollision(const TQCanvasSprite* s1, const TQCanvasSprite* s2);
 
     int hotx,hoty;
@@ -544,7 +544,7 @@ private:
     TQCanvasPixmapArray* images;
 };
 
-class QPolygonalProcessor;
+class TQPolygonalProcessor;
 
 class QM_EXPORT_CANVAS TQCanvasPolygonalItem : public QCanvasItem
 {
@@ -741,7 +741,7 @@ private:
 };
 
 
-class QCanvasTextExtra;
+class TQCanvasTextExtra;
 
 class QM_EXPORT_CANVAS TQCanvasText : public QCanvasItem
 {
diff --git a/kjsembed/tools/headers/qdir.h b/kjsembed/tools/headers/qdir.h
index 2056828e..200514dd 100644
--- a/kjsembed/tools/headers/qdir.h
+++ b/kjsembed/tools/headers/qdir.h
@@ -48,8 +48,8 @@
 #ifndef QT_NO_DIR
 typedef TQPtrList<TQFileInfo> QFileInfoList;
 typedef TQPtrListIterator<TQFileInfo> QFileInfoListIterator;
-class QStringList;
-template <class T> class QDeepCopy;
+class TQStringList;
+template <class T> class TQDeepCopy;
 
 
 class Q_EXPORT QDir
diff --git a/kjsembed/tools/headers/qpen.h b/kjsembed/tools/headers/qpen.h
index 7db9325e..585e7af2 100644
--- a/kjsembed/tools/headers/qpen.h
+++ b/kjsembed/tools/headers/qpen.h
@@ -71,7 +71,7 @@ public:
 					{ return !(operator==(p)); }
 
 private:
-    friend class QPainter;
+    friend class TQPainter;
 #ifdef Q_WS_WIN
     friend class QFontEngineWin;
 #endif
diff --git a/korundum/rubylib/korundum/Korundum.cpp b/korundum/rubylib/korundum/Korundum.cpp
index c1254f81..9fcd74df 100644
--- a/korundum/rubylib/korundum/Korundum.cpp
+++ b/korundum/rubylib/korundum/Korundum.cpp
@@ -1085,7 +1085,7 @@ konsole_part_startprogram(VALUE self, VALUE value_program, VALUE value_args)
 	smokeruby_object * o = value_obj_info(self);
 	TerminalInterface * t = static_cast<TerminalInterface*>(((KParts::ReadOnlyPart*) o->ptr)->qt_cast("TerminalInterface"));
 	
-	TQStrList *args = new QStrList;
+	TQStrList *args = new TQStrList;
 
 	if (value_args != Qnil) {
 		for (long i = 0; i < RARRAY(value_args)->len; i++) {
diff --git a/python/pykde/extra/kde300/kaccelaction.h b/python/pykde/extra/kde300/kaccelaction.h
index da8fc765..c1e53f5a 100644
--- a/python/pykde/extra/kde300/kaccelaction.h
+++ b/python/pykde/extra/kde300/kaccelaction.h
@@ -29,7 +29,7 @@
 
 class KAccelBase;
 
-class QObject;
+class TQObject;
 class KConfig;
 class KConfigBase;
 
diff --git a/python/pykde/extra/kde300/kaccelbase.h b/python/pykde/extra/kde300/kaccelbase.h
index d3411e2a..cd764bc3 100644
--- a/python/pykde/extra/kde300/kaccelbase.h
+++ b/python/pykde/extra/kde300/kaccelbase.h
@@ -29,8 +29,8 @@
 #include "kaccelaction.h"
 #include "kkeyserver_x11.h"
 
-class QPopupMenu;
-class QWidget;
+class TQPopupMenu;
+class TQWidget;
 
 //----------------------------------------------------
 
diff --git a/python/pykde/extra/kde300/konsole_part.h b/python/pykde/extra/kde300/konsole_part.h
index 00560d6e..6aba7064 100644
--- a/python/pykde/extra/kde300/konsole_part.h
+++ b/python/pykde/extra/kde300/konsole_part.h
@@ -34,10 +34,10 @@
 
 class KInstance;
 class konsoleBrowserExtension;
-class QPushButton;
-class QSpinBox;
+class TQPushButton;
+class TQSpinBox;
 class KPopupMenu;
-class QCheckBox;
+class TQCheckBox;
 class KRootPixmap;
 class KToggleAction;
 class KSelectAction;
diff --git a/python/pykde/extra/kde300/ksycocafactory.h b/python/pykde/extra/kde300/ksycocafactory.h
index f9de974b..ff1d43cb 100644
--- a/python/pykde/extra/kde300/ksycocafactory.h
+++ b/python/pykde/extra/kde300/ksycocafactory.h
@@ -25,8 +25,8 @@
 #include <tqdict.h>
 #include <tqptrlist.h>
 class KSycoca;
-class QStringList;
-class QString;
+class TQStringList;
+class TQString;
 class KSycocaDict;
 class KSycocaResourceList;
 
diff --git a/python/pykde/extra/kde300/ktoolbarbutton.h b/python/pykde/extra/kde300/ktoolbarbutton.h
index 5a15ca92..9b35b179 100644
--- a/python/pykde/extra/kde300/ktoolbarbutton.h
+++ b/python/pykde/extra/kde300/ktoolbarbutton.h
@@ -33,9 +33,9 @@
 class KToolBar;
 class KToolBarButtonPrivate;
 class KInstance;
-class QEvent;
-class QPopupMenu;
-class QPainter;
+class TQEvent;
+class TQPopupMenu;
+class TQPainter;
 
 /**
  * A toolbar button. This is used internally by @ref KToolBar, use the
diff --git a/python/pykde/extra/kde300/kurifilter.h b/python/pykde/extra/kde300/kurifilter.h
index 0c15d3ea..24e09985 100644
--- a/python/pykde/extra/kde300/kurifilter.h
+++ b/python/pykde/extra/kde300/kurifilter.h
@@ -29,7 +29,7 @@
 class KURIFilterPrivate;
 class KURIFilterDataPrivate;
 
-class QStringList;
+class TQStringList;
 class KCModule;
 
 /**
diff --git a/python/pykde/extra/kde301/kaccelaction.h b/python/pykde/extra/kde301/kaccelaction.h
index da8fc765..c1e53f5a 100644
--- a/python/pykde/extra/kde301/kaccelaction.h
+++ b/python/pykde/extra/kde301/kaccelaction.h
@@ -29,7 +29,7 @@
 
 class KAccelBase;
 
-class QObject;
+class TQObject;
 class KConfig;
 class KConfigBase;
 
diff --git a/python/pykde/extra/kde301/kaccelbase.h b/python/pykde/extra/kde301/kaccelbase.h
index d3411e2a..cd764bc3 100644
--- a/python/pykde/extra/kde301/kaccelbase.h
+++ b/python/pykde/extra/kde301/kaccelbase.h
@@ -29,8 +29,8 @@
 #include "kaccelaction.h"
 #include "kkeyserver_x11.h"
 
-class QPopupMenu;
-class QWidget;
+class TQPopupMenu;
+class TQWidget;
 
 //----------------------------------------------------
 
diff --git a/python/pykde/extra/kde301/konsole_part.h b/python/pykde/extra/kde301/konsole_part.h
index 00560d6e..6aba7064 100644
--- a/python/pykde/extra/kde301/konsole_part.h
+++ b/python/pykde/extra/kde301/konsole_part.h
@@ -34,10 +34,10 @@
 
 class KInstance;
 class konsoleBrowserExtension;
-class QPushButton;
-class QSpinBox;
+class TQPushButton;
+class TQSpinBox;
 class KPopupMenu;
-class QCheckBox;
+class TQCheckBox;
 class KRootPixmap;
 class KToggleAction;
 class KSelectAction;
diff --git a/python/pykde/extra/kde301/ksycocafactory.h b/python/pykde/extra/kde301/ksycocafactory.h
index f9de974b..ff1d43cb 100644
--- a/python/pykde/extra/kde301/ksycocafactory.h
+++ b/python/pykde/extra/kde301/ksycocafactory.h
@@ -25,8 +25,8 @@
 #include <tqdict.h>
 #include <tqptrlist.h>
 class KSycoca;
-class QStringList;
-class QString;
+class TQStringList;
+class TQString;
 class KSycocaDict;
 class KSycocaResourceList;
 
diff --git a/python/pykde/extra/kde301/ktoolbarbutton.h b/python/pykde/extra/kde301/ktoolbarbutton.h
index 732bda47..112be544 100644
--- a/python/pykde/extra/kde301/ktoolbarbutton.h
+++ b/python/pykde/extra/kde301/ktoolbarbutton.h
@@ -33,9 +33,9 @@
 class KToolBar;
 class KToolBarButtonPrivate;
 class KInstance;
-class QEvent;
-class QPopupMenu;
-class QPainter;
+class TQEvent;
+class TQPopupMenu;
+class TQPainter;
 
 /**
  * A toolbar button. This is used internally by @ref KToolBar, use the
diff --git a/python/pykde/extra/kde301/kurifilter.h b/python/pykde/extra/kde301/kurifilter.h
index 0c15d3ea..24e09985 100644
--- a/python/pykde/extra/kde301/kurifilter.h
+++ b/python/pykde/extra/kde301/kurifilter.h
@@ -29,7 +29,7 @@
 class KURIFilterPrivate;
 class KURIFilterDataPrivate;
 
-class QStringList;
+class TQStringList;
 class KCModule;
 
 /**
diff --git a/python/pykde/extra/kde303/kaccelaction.h b/python/pykde/extra/kde303/kaccelaction.h
index da8fc765..c1e53f5a 100644
--- a/python/pykde/extra/kde303/kaccelaction.h
+++ b/python/pykde/extra/kde303/kaccelaction.h
@@ -29,7 +29,7 @@
 
 class KAccelBase;
 
-class QObject;
+class TQObject;
 class KConfig;
 class KConfigBase;
 
diff --git a/python/pykde/extra/kde303/kaccelbase.h b/python/pykde/extra/kde303/kaccelbase.h
index d3411e2a..cd764bc3 100644
--- a/python/pykde/extra/kde303/kaccelbase.h
+++ b/python/pykde/extra/kde303/kaccelbase.h
@@ -29,8 +29,8 @@
 #include "kaccelaction.h"
 #include "kkeyserver_x11.h"
 
-class QPopupMenu;
-class QWidget;
+class TQPopupMenu;
+class TQWidget;
 
 //----------------------------------------------------
 
diff --git a/python/pykde/extra/kde303/konsole_part.h b/python/pykde/extra/kde303/konsole_part.h
index 00560d6e..6aba7064 100644
--- a/python/pykde/extra/kde303/konsole_part.h
+++ b/python/pykde/extra/kde303/konsole_part.h
@@ -34,10 +34,10 @@
 
 class KInstance;
 class konsoleBrowserExtension;
-class QPushButton;
-class QSpinBox;
+class TQPushButton;
+class TQSpinBox;
 class KPopupMenu;
-class QCheckBox;
+class TQCheckBox;
 class KRootPixmap;
 class KToggleAction;
 class KSelectAction;
diff --git a/python/pykde/extra/kde303/ksycocafactory.h b/python/pykde/extra/kde303/ksycocafactory.h
index f9de974b..ff1d43cb 100644
--- a/python/pykde/extra/kde303/ksycocafactory.h
+++ b/python/pykde/extra/kde303/ksycocafactory.h
@@ -25,8 +25,8 @@
 #include <tqdict.h>
 #include <tqptrlist.h>
 class KSycoca;
-class QStringList;
-class QString;
+class TQStringList;
+class TQString;
 class KSycocaDict;
 class KSycocaResourceList;
 
diff --git a/python/pykde/extra/kde303/ktoolbarbutton.h b/python/pykde/extra/kde303/ktoolbarbutton.h
index d4a2b8fc..c551a4a0 100644
--- a/python/pykde/extra/kde303/ktoolbarbutton.h
+++ b/python/pykde/extra/kde303/ktoolbarbutton.h
@@ -33,9 +33,9 @@
 class KToolBar;
 class KToolBarButtonPrivate;
 class KInstance;
-class QEvent;
-class QPopupMenu;
-class QPainter;
+class TQEvent;
+class TQPopupMenu;
+class TQPainter;
 
 /**
  * A toolbar button. This is used internally by @ref KToolBar, use the
diff --git a/python/pykde/extra/kde303/kurifilter.h b/python/pykde/extra/kde303/kurifilter.h
index 0c15d3ea..24e09985 100644
--- a/python/pykde/extra/kde303/kurifilter.h
+++ b/python/pykde/extra/kde303/kurifilter.h
@@ -29,7 +29,7 @@
 class KURIFilterPrivate;
 class KURIFilterDataPrivate;
 
-class QStringList;
+class TQStringList;
 class KCModule;
 
 /**
diff --git a/python/pykde/extra/kde310/kaccelaction.h b/python/pykde/extra/kde310/kaccelaction.h
index 2b9c07ba..8e422505 100644
--- a/python/pykde/extra/kde310/kaccelaction.h
+++ b/python/pykde/extra/kde310/kaccelaction.h
@@ -29,7 +29,7 @@
 
 class KAccelBase;
 
-class QObject;
+class TQObject;
 class KConfig;
 class KConfigBase;
 
diff --git a/python/pykde/extra/kde310/kaccelbase.h b/python/pykde/extra/kde310/kaccelbase.h
index f8dee73c..03fa9c87 100644
--- a/python/pykde/extra/kde310/kaccelbase.h
+++ b/python/pykde/extra/kde310/kaccelbase.h
@@ -29,8 +29,8 @@
 #include "kaccelaction.h"
 #include "kkeyserver_x11.h"
 
-class QPopupMenu;
-class QWidget;
+class TQPopupMenu;
+class TQWidget;
 
 //----------------------------------------------------
 
diff --git a/python/pykde/extra/kde310/konsole_part.h b/python/pykde/extra/kde310/konsole_part.h
index 00560d6e..6aba7064 100644
--- a/python/pykde/extra/kde310/konsole_part.h
+++ b/python/pykde/extra/kde310/konsole_part.h
@@ -34,10 +34,10 @@
 
 class KInstance;
 class konsoleBrowserExtension;
-class QPushButton;
-class QSpinBox;
+class TQPushButton;
+class TQSpinBox;
 class KPopupMenu;
-class QCheckBox;
+class TQCheckBox;
 class KRootPixmap;
 class KToggleAction;
 class KSelectAction;
diff --git a/python/pykde/extra/kde310/ksycocafactory.h b/python/pykde/extra/kde310/ksycocafactory.h
index d99addbc..1959edda 100644
--- a/python/pykde/extra/kde310/ksycocafactory.h
+++ b/python/pykde/extra/kde310/ksycocafactory.h
@@ -25,8 +25,8 @@
 #include <tqdict.h>
 #include <tqptrlist.h>
 class KSycoca;
-class QStringList;
-class QString;
+class TQStringList;
+class TQString;
 class KSycocaDict;
 class KSycocaResourceList;
 
diff --git a/python/pykde/extra/kde310/ktoolbarbutton.h b/python/pykde/extra/kde310/ktoolbarbutton.h
index 14c96f8b..6fafb1ed 100644
--- a/python/pykde/extra/kde310/ktoolbarbutton.h
+++ b/python/pykde/extra/kde310/ktoolbarbutton.h
@@ -33,9 +33,9 @@
 class KToolBar;
 class KToolBarButtonPrivate;
 class KInstance;
-class QEvent;
-class QPopupMenu;
-class QPainter;
+class TQEvent;
+class TQPopupMenu;
+class TQPainter;
 
 /**
  * A toolbar button. This is used internally by @ref KToolBar, use the
diff --git a/python/pykde/extra/kde310/kurifilter.h b/python/pykde/extra/kde310/kurifilter.h
index 80e5d369..6daf7769 100644
--- a/python/pykde/extra/kde310/kurifilter.h
+++ b/python/pykde/extra/kde310/kurifilter.h
@@ -29,7 +29,7 @@
 class KURIFilterPrivate;
 class KURIFilterDataPrivate;
 
-class QStringList;
+class TQStringList;
 class KCModule;
 
 /**
diff --git a/python/pykde/extra/kde311/kaccelaction.h b/python/pykde/extra/kde311/kaccelaction.h
index 2b9c07ba..8e422505 100644
--- a/python/pykde/extra/kde311/kaccelaction.h
+++ b/python/pykde/extra/kde311/kaccelaction.h
@@ -29,7 +29,7 @@
 
 class KAccelBase;
 
-class QObject;
+class TQObject;
 class KConfig;
 class KConfigBase;
 
diff --git a/python/pykde/extra/kde311/kaccelbase.h b/python/pykde/extra/kde311/kaccelbase.h
index f8dee73c..03fa9c87 100644
--- a/python/pykde/extra/kde311/kaccelbase.h
+++ b/python/pykde/extra/kde311/kaccelbase.h
@@ -29,8 +29,8 @@
 #include "kaccelaction.h"
 #include "kkeyserver_x11.h"
 
-class QPopupMenu;
-class QWidget;
+class TQPopupMenu;
+class TQWidget;
 
 //----------------------------------------------------
 
diff --git a/python/pykde/extra/kde311/konsole_part.h b/python/pykde/extra/kde311/konsole_part.h
index 00560d6e..6aba7064 100644
--- a/python/pykde/extra/kde311/konsole_part.h
+++ b/python/pykde/extra/kde311/konsole_part.h
@@ -34,10 +34,10 @@
 
 class KInstance;
 class konsoleBrowserExtension;
-class QPushButton;
-class QSpinBox;
+class TQPushButton;
+class TQSpinBox;
 class KPopupMenu;
-class QCheckBox;
+class TQCheckBox;
 class KRootPixmap;
 class KToggleAction;
 class KSelectAction;
diff --git a/python/pykde/extra/kde311/ksycocafactory.h b/python/pykde/extra/kde311/ksycocafactory.h
index d99addbc..1959edda 100644
--- a/python/pykde/extra/kde311/ksycocafactory.h
+++ b/python/pykde/extra/kde311/ksycocafactory.h
@@ -25,8 +25,8 @@
 #include <tqdict.h>
 #include <tqptrlist.h>
 class KSycoca;
-class QStringList;
-class QString;
+class TQStringList;
+class TQString;
 class KSycocaDict;
 class KSycocaResourceList;
 
diff --git a/python/pykde/extra/kde311/ktoolbarbutton.h b/python/pykde/extra/kde311/ktoolbarbutton.h
index 14c96f8b..6fafb1ed 100644
--- a/python/pykde/extra/kde311/ktoolbarbutton.h
+++ b/python/pykde/extra/kde311/ktoolbarbutton.h
@@ -33,9 +33,9 @@
 class KToolBar;
 class KToolBarButtonPrivate;
 class KInstance;
-class QEvent;
-class QPopupMenu;
-class QPainter;
+class TQEvent;
+class TQPopupMenu;
+class TQPainter;
 
 /**
  * A toolbar button. This is used internally by @ref KToolBar, use the
diff --git a/python/pykde/extra/kde311/kurifilter.h b/python/pykde/extra/kde311/kurifilter.h
index 80e5d369..6daf7769 100644
--- a/python/pykde/extra/kde311/kurifilter.h
+++ b/python/pykde/extra/kde311/kurifilter.h
@@ -29,7 +29,7 @@
 class KURIFilterPrivate;
 class KURIFilterDataPrivate;
 
-class QStringList;
+class TQStringList;
 class KCModule;
 
 /**
diff --git a/python/pykde/extra/kde312/kaccelaction.h b/python/pykde/extra/kde312/kaccelaction.h
index 2b9c07ba..8e422505 100644
--- a/python/pykde/extra/kde312/kaccelaction.h
+++ b/python/pykde/extra/kde312/kaccelaction.h
@@ -29,7 +29,7 @@
 
 class KAccelBase;
 
-class QObject;
+class TQObject;
 class KConfig;
 class KConfigBase;
 
diff --git a/python/pykde/extra/kde312/kaccelbase.h b/python/pykde/extra/kde312/kaccelbase.h
index f8dee73c..03fa9c87 100644
--- a/python/pykde/extra/kde312/kaccelbase.h
+++ b/python/pykde/extra/kde312/kaccelbase.h
@@ -29,8 +29,8 @@
 #include "kaccelaction.h"
 #include "kkeyserver_x11.h"
 
-class QPopupMenu;
-class QWidget;
+class TQPopupMenu;
+class TQWidget;
 
 //----------------------------------------------------
 
diff --git a/python/pykde/extra/kde312/konsole_part.h b/python/pykde/extra/kde312/konsole_part.h
index 00560d6e..6aba7064 100644
--- a/python/pykde/extra/kde312/konsole_part.h
+++ b/python/pykde/extra/kde312/konsole_part.h
@@ -34,10 +34,10 @@
 
 class KInstance;
 class konsoleBrowserExtension;
-class QPushButton;
-class QSpinBox;
+class TQPushButton;
+class TQSpinBox;
 class KPopupMenu;
-class QCheckBox;
+class TQCheckBox;
 class KRootPixmap;
 class KToggleAction;
 class KSelectAction;
diff --git a/python/pykde/extra/kde312/ksycocafactory.h b/python/pykde/extra/kde312/ksycocafactory.h
index d99addbc..1959edda 100644
--- a/python/pykde/extra/kde312/ksycocafactory.h
+++ b/python/pykde/extra/kde312/ksycocafactory.h
@@ -25,8 +25,8 @@
 #include <tqdict.h>
 #include <tqptrlist.h>
 class KSycoca;
-class QStringList;
-class QString;
+class TQStringList;
+class TQString;
 class KSycocaDict;
 class KSycocaResourceList;
 
diff --git a/python/pykde/extra/kde312/ktoolbarbutton.h b/python/pykde/extra/kde312/ktoolbarbutton.h
index 14c96f8b..6fafb1ed 100644
--- a/python/pykde/extra/kde312/ktoolbarbutton.h
+++ b/python/pykde/extra/kde312/ktoolbarbutton.h
@@ -33,9 +33,9 @@
 class KToolBar;
 class KToolBarButtonPrivate;
 class KInstance;
-class QEvent;
-class QPopupMenu;
-class QPainter;
+class TQEvent;
+class TQPopupMenu;
+class TQPainter;
 
 /**
  * A toolbar button. This is used internally by @ref KToolBar, use the
diff --git a/python/pykde/extra/kde312/kurifilter.h b/python/pykde/extra/kde312/kurifilter.h
index 80e5d369..6daf7769 100644
--- a/python/pykde/extra/kde312/kurifilter.h
+++ b/python/pykde/extra/kde312/kurifilter.h
@@ -29,7 +29,7 @@
 class KURIFilterPrivate;
 class KURIFilterDataPrivate;
 
-class QStringList;
+class TQStringList;
 class KCModule;
 
 /**
diff --git a/python/pykde/extra/kde313/kaccelaction.h b/python/pykde/extra/kde313/kaccelaction.h
index 2b9c07ba..8e422505 100644
--- a/python/pykde/extra/kde313/kaccelaction.h
+++ b/python/pykde/extra/kde313/kaccelaction.h
@@ -29,7 +29,7 @@
 
 class KAccelBase;
 
-class QObject;
+class TQObject;
 class KConfig;
 class KConfigBase;
 
diff --git a/python/pykde/extra/kde313/kaccelbase.h b/python/pykde/extra/kde313/kaccelbase.h
index f8dee73c..03fa9c87 100644
--- a/python/pykde/extra/kde313/kaccelbase.h
+++ b/python/pykde/extra/kde313/kaccelbase.h
@@ -29,8 +29,8 @@
 #include "kaccelaction.h"
 #include "kkeyserver_x11.h"
 
-class QPopupMenu;
-class QWidget;
+class TQPopupMenu;
+class TQWidget;
 
 //----------------------------------------------------
 
diff --git a/python/pykde/extra/kde313/konsole_part.h b/python/pykde/extra/kde313/konsole_part.h
index 00560d6e..6aba7064 100644
--- a/python/pykde/extra/kde313/konsole_part.h
+++ b/python/pykde/extra/kde313/konsole_part.h
@@ -34,10 +34,10 @@
 
 class KInstance;
 class konsoleBrowserExtension;
-class QPushButton;
-class QSpinBox;
+class TQPushButton;
+class TQSpinBox;
 class KPopupMenu;
-class QCheckBox;
+class TQCheckBox;
 class KRootPixmap;
 class KToggleAction;
 class KSelectAction;
diff --git a/python/pykde/extra/kde313/ksycocafactory.h b/python/pykde/extra/kde313/ksycocafactory.h
index d99addbc..1959edda 100644
--- a/python/pykde/extra/kde313/ksycocafactory.h
+++ b/python/pykde/extra/kde313/ksycocafactory.h
@@ -25,8 +25,8 @@
 #include <tqdict.h>
 #include <tqptrlist.h>
 class KSycoca;
-class QStringList;
-class QString;
+class TQStringList;
+class TQString;
 class KSycocaDict;
 class KSycocaResourceList;
 
diff --git a/python/pykde/extra/kde313/ktoolbarbutton.h b/python/pykde/extra/kde313/ktoolbarbutton.h
index 14c96f8b..6fafb1ed 100644
--- a/python/pykde/extra/kde313/ktoolbarbutton.h
+++ b/python/pykde/extra/kde313/ktoolbarbutton.h
@@ -33,9 +33,9 @@
 class KToolBar;
 class KToolBarButtonPrivate;
 class KInstance;
-class QEvent;
-class QPopupMenu;
-class QPainter;
+class TQEvent;
+class TQPopupMenu;
+class TQPainter;
 
 /**
  * A toolbar button. This is used internally by @ref KToolBar, use the
diff --git a/python/pykde/extra/kde313/kurifilter.h b/python/pykde/extra/kde313/kurifilter.h
index 80e5d369..6daf7769 100644
--- a/python/pykde/extra/kde313/kurifilter.h
+++ b/python/pykde/extra/kde313/kurifilter.h
@@ -29,7 +29,7 @@
 class KURIFilterPrivate;
 class KURIFilterDataPrivate;
 
-class QStringList;
+class TQStringList;
 class KCModule;
 
 /**
diff --git a/python/pykde/extra/kde314/kaccelaction.h b/python/pykde/extra/kde314/kaccelaction.h
index 2b9c07ba..8e422505 100644
--- a/python/pykde/extra/kde314/kaccelaction.h
+++ b/python/pykde/extra/kde314/kaccelaction.h
@@ -29,7 +29,7 @@
 
 class KAccelBase;
 
-class QObject;
+class TQObject;
 class KConfig;
 class KConfigBase;
 
diff --git a/python/pykde/extra/kde314/kaccelbase.h b/python/pykde/extra/kde314/kaccelbase.h
index f8dee73c..03fa9c87 100644
--- a/python/pykde/extra/kde314/kaccelbase.h
+++ b/python/pykde/extra/kde314/kaccelbase.h
@@ -29,8 +29,8 @@
 #include "kaccelaction.h"
 #include "kkeyserver_x11.h"
 
-class QPopupMenu;
-class QWidget;
+class TQPopupMenu;
+class TQWidget;
 
 //----------------------------------------------------
 
diff --git a/python/pykde/extra/kde314/konsole_part.h b/python/pykde/extra/kde314/konsole_part.h
index 00560d6e..6aba7064 100644
--- a/python/pykde/extra/kde314/konsole_part.h
+++ b/python/pykde/extra/kde314/konsole_part.h
@@ -34,10 +34,10 @@
 
 class KInstance;
 class konsoleBrowserExtension;
-class QPushButton;
-class QSpinBox;
+class TQPushButton;
+class TQSpinBox;
 class KPopupMenu;
-class QCheckBox;
+class TQCheckBox;
 class KRootPixmap;
 class KToggleAction;
 class KSelectAction;
diff --git a/python/pykde/extra/kde314/ksycocafactory.h b/python/pykde/extra/kde314/ksycocafactory.h
index d99addbc..1959edda 100644
--- a/python/pykde/extra/kde314/ksycocafactory.h
+++ b/python/pykde/extra/kde314/ksycocafactory.h
@@ -25,8 +25,8 @@
 #include <tqdict.h>
 #include <tqptrlist.h>
 class KSycoca;
-class QStringList;
-class QString;
+class TQStringList;
+class TQString;
 class KSycocaDict;
 class KSycocaResourceList;
 
diff --git a/python/pykde/extra/kde314/ktoolbarbutton.h b/python/pykde/extra/kde314/ktoolbarbutton.h
index 14c96f8b..6fafb1ed 100644
--- a/python/pykde/extra/kde314/ktoolbarbutton.h
+++ b/python/pykde/extra/kde314/ktoolbarbutton.h
@@ -33,9 +33,9 @@
 class KToolBar;
 class KToolBarButtonPrivate;
 class KInstance;
-class QEvent;
-class QPopupMenu;
-class QPainter;
+class TQEvent;
+class TQPopupMenu;
+class TQPainter;
 
 /**
  * A toolbar button. This is used internally by @ref KToolBar, use the
diff --git a/python/pykde/extra/kde314/kurifilter.h b/python/pykde/extra/kde314/kurifilter.h
index d79e4cb8..4e7ad792 100644
--- a/python/pykde/extra/kde314/kurifilter.h
+++ b/python/pykde/extra/kde314/kurifilter.h
@@ -29,7 +29,7 @@
 class KURIFilterPrivate;
 class KURIFilterDataPrivate;
 
-class QStringList;
+class TQStringList;
 class KCModule;
 
 /**
diff --git a/python/pykde/extra/kde315/kaccelaction.h b/python/pykde/extra/kde315/kaccelaction.h
index 2b9c07ba..8e422505 100644
--- a/python/pykde/extra/kde315/kaccelaction.h
+++ b/python/pykde/extra/kde315/kaccelaction.h
@@ -29,7 +29,7 @@
 
 class KAccelBase;
 
-class QObject;
+class TQObject;
 class KConfig;
 class KConfigBase;
 
diff --git a/python/pykde/extra/kde315/kaccelbase.h b/python/pykde/extra/kde315/kaccelbase.h
index f8dee73c..03fa9c87 100644
--- a/python/pykde/extra/kde315/kaccelbase.h
+++ b/python/pykde/extra/kde315/kaccelbase.h
@@ -29,8 +29,8 @@
 #include "kaccelaction.h"
 #include "kkeyserver_x11.h"
 
-class QPopupMenu;
-class QWidget;
+class TQPopupMenu;
+class TQWidget;
 
 //----------------------------------------------------
 
diff --git a/python/pykde/extra/kde315/konsole_part.h b/python/pykde/extra/kde315/konsole_part.h
index 00560d6e..6aba7064 100644
--- a/python/pykde/extra/kde315/konsole_part.h
+++ b/python/pykde/extra/kde315/konsole_part.h
@@ -34,10 +34,10 @@
 
 class KInstance;
 class konsoleBrowserExtension;
-class QPushButton;
-class QSpinBox;
+class TQPushButton;
+class TQSpinBox;
 class KPopupMenu;
-class QCheckBox;
+class TQCheckBox;
 class KRootPixmap;
 class KToggleAction;
 class KSelectAction;
diff --git a/python/pykde/extra/kde315/ksycocafactory.h b/python/pykde/extra/kde315/ksycocafactory.h
index d99addbc..1959edda 100644
--- a/python/pykde/extra/kde315/ksycocafactory.h
+++ b/python/pykde/extra/kde315/ksycocafactory.h
@@ -25,8 +25,8 @@
 #include <tqdict.h>
 #include <tqptrlist.h>
 class KSycoca;
-class QStringList;
-class QString;
+class TQStringList;
+class TQString;
 class KSycocaDict;
 class KSycocaResourceList;
 
diff --git a/python/pykde/extra/kde315/ktoolbarbutton.h b/python/pykde/extra/kde315/ktoolbarbutton.h
index 14c96f8b..6fafb1ed 100644
--- a/python/pykde/extra/kde315/ktoolbarbutton.h
+++ b/python/pykde/extra/kde315/ktoolbarbutton.h
@@ -33,9 +33,9 @@
 class KToolBar;
 class KToolBarButtonPrivate;
 class KInstance;
-class QEvent;
-class QPopupMenu;
-class QPainter;
+class TQEvent;
+class TQPopupMenu;
+class TQPainter;
 
 /**
  * A toolbar button. This is used internally by @ref KToolBar, use the
diff --git a/python/pykde/extra/kde315/kurifilter.h b/python/pykde/extra/kde315/kurifilter.h
index d79e4cb8..4e7ad792 100644
--- a/python/pykde/extra/kde315/kurifilter.h
+++ b/python/pykde/extra/kde315/kurifilter.h
@@ -29,7 +29,7 @@
 class KURIFilterPrivate;
 class KURIFilterDataPrivate;
 
-class QStringList;
+class TQStringList;
 class KCModule;
 
 /**
diff --git a/python/pykde/extra/kde320/kaccelaction.h b/python/pykde/extra/kde320/kaccelaction.h
index 83127675..0418297c 100644
--- a/python/pykde/extra/kde320/kaccelaction.h
+++ b/python/pykde/extra/kde320/kaccelaction.h
@@ -29,7 +29,7 @@
 
 class KAccelBase;
 
-class QObject;
+class TQObject;
 class KConfig;
 class KConfigBase;
 
diff --git a/python/pykde/extra/kde320/kaccelbase.h b/python/pykde/extra/kde320/kaccelbase.h
index 7cdbb618..e2ec66e9 100644
--- a/python/pykde/extra/kde320/kaccelbase.h
+++ b/python/pykde/extra/kde320/kaccelbase.h
@@ -29,8 +29,8 @@
 #include "kaccelaction.h"
 #include "kkeyserver_x11.h"
 
-class QPopupMenu;
-class QWidget;
+class TQPopupMenu;
+class TQWidget;
 
 //----------------------------------------------------
 
diff --git a/python/pykde/extra/kde320/konsole_part.h b/python/pykde/extra/kde320/konsole_part.h
index 00560d6e..6aba7064 100644
--- a/python/pykde/extra/kde320/konsole_part.h
+++ b/python/pykde/extra/kde320/konsole_part.h
@@ -34,10 +34,10 @@
 
 class KInstance;
 class konsoleBrowserExtension;
-class QPushButton;
-class QSpinBox;
+class TQPushButton;
+class TQSpinBox;
 class KPopupMenu;
-class QCheckBox;
+class TQCheckBox;
 class KRootPixmap;
 class KToggleAction;
 class KSelectAction;
diff --git a/python/pykde/extra/kde320/ksycocafactory.h b/python/pykde/extra/kde320/ksycocafactory.h
index 1ecd5d82..2a114ee0 100644
--- a/python/pykde/extra/kde320/ksycocafactory.h
+++ b/python/pykde/extra/kde320/ksycocafactory.h
@@ -25,8 +25,8 @@
 #include <tqdict.h>
 #include <tqptrlist.h>
 class KSycoca;
-class QStringList;
-class QString;
+class TQStringList;
+class TQString;
 class KSycocaDict;
 class KSycocaResourceList;
 
diff --git a/python/pykde/extra/kde320/ktoolbarbutton.h b/python/pykde/extra/kde320/ktoolbarbutton.h
index e2c5f5d7..5b7a85f9 100644
--- a/python/pykde/extra/kde320/ktoolbarbutton.h
+++ b/python/pykde/extra/kde320/ktoolbarbutton.h
@@ -33,9 +33,9 @@
 class KToolBar;
 class KToolBarButtonPrivate;
 class KInstance;
-class QEvent;
-class QPopupMenu;
-class QPainter;
+class TQEvent;
+class TQPopupMenu;
+class TQPainter;
 
 /**
  * A toolbar button. This is used internally by KToolBar, use the
diff --git a/python/pykde/extra/kde321/kaccelaction.h b/python/pykde/extra/kde321/kaccelaction.h
index 83127675..0418297c 100644
--- a/python/pykde/extra/kde321/kaccelaction.h
+++ b/python/pykde/extra/kde321/kaccelaction.h
@@ -29,7 +29,7 @@
 
 class KAccelBase;
 
-class QObject;
+class TQObject;
 class KConfig;
 class KConfigBase;
 
diff --git a/python/pykde/extra/kde321/kaccelbase.h b/python/pykde/extra/kde321/kaccelbase.h
index 7cdbb618..e2ec66e9 100644
--- a/python/pykde/extra/kde321/kaccelbase.h
+++ b/python/pykde/extra/kde321/kaccelbase.h
@@ -29,8 +29,8 @@
 #include "kaccelaction.h"
 #include "kkeyserver_x11.h"
 
-class QPopupMenu;
-class QWidget;
+class TQPopupMenu;
+class TQWidget;
 
 //----------------------------------------------------
 
diff --git a/python/pykde/extra/kde321/konsole_part.h b/python/pykde/extra/kde321/konsole_part.h
index 00560d6e..6aba7064 100644
--- a/python/pykde/extra/kde321/konsole_part.h
+++ b/python/pykde/extra/kde321/konsole_part.h
@@ -34,10 +34,10 @@
 
 class KInstance;
 class konsoleBrowserExtension;
-class QPushButton;
-class QSpinBox;
+class TQPushButton;
+class TQSpinBox;
 class KPopupMenu;
-class QCheckBox;
+class TQCheckBox;
 class KRootPixmap;
 class KToggleAction;
 class KSelectAction;
diff --git a/python/pykde/extra/kde321/ksycocafactory.h b/python/pykde/extra/kde321/ksycocafactory.h
index 1ecd5d82..2a114ee0 100644
--- a/python/pykde/extra/kde321/ksycocafactory.h
+++ b/python/pykde/extra/kde321/ksycocafactory.h
@@ -25,8 +25,8 @@
 #include <tqdict.h>
 #include <tqptrlist.h>
 class KSycoca;
-class QStringList;
-class QString;
+class TQStringList;
+class TQString;
 class KSycocaDict;
 class KSycocaResourceList;
 
diff --git a/python/pykde/extra/kde321/ktoolbarbutton.h b/python/pykde/extra/kde321/ktoolbarbutton.h
index e2c5f5d7..5b7a85f9 100644
--- a/python/pykde/extra/kde321/ktoolbarbutton.h
+++ b/python/pykde/extra/kde321/ktoolbarbutton.h
@@ -33,9 +33,9 @@
 class KToolBar;
 class KToolBarButtonPrivate;
 class KInstance;
-class QEvent;
-class QPopupMenu;
-class QPainter;
+class TQEvent;
+class TQPopupMenu;
+class TQPainter;
 
 /**
  * A toolbar button. This is used internally by KToolBar, use the
diff --git a/python/pykde/extra/kde322/kaccelaction.h b/python/pykde/extra/kde322/kaccelaction.h
index 83127675..0418297c 100644
--- a/python/pykde/extra/kde322/kaccelaction.h
+++ b/python/pykde/extra/kde322/kaccelaction.h
@@ -29,7 +29,7 @@
 
 class KAccelBase;
 
-class QObject;
+class TQObject;
 class KConfig;
 class KConfigBase;
 
diff --git a/python/pykde/extra/kde322/kaccelbase.h b/python/pykde/extra/kde322/kaccelbase.h
index 7cdbb618..e2ec66e9 100644
--- a/python/pykde/extra/kde322/kaccelbase.h
+++ b/python/pykde/extra/kde322/kaccelbase.h
@@ -29,8 +29,8 @@
 #include "kaccelaction.h"
 #include "kkeyserver_x11.h"
 
-class QPopupMenu;
-class QWidget;
+class TQPopupMenu;
+class TQWidget;
 
 //----------------------------------------------------
 
diff --git a/python/pykde/extra/kde322/konsole_part.h b/python/pykde/extra/kde322/konsole_part.h
index 00560d6e..6aba7064 100644
--- a/python/pykde/extra/kde322/konsole_part.h
+++ b/python/pykde/extra/kde322/konsole_part.h
@@ -34,10 +34,10 @@
 
 class KInstance;
 class konsoleBrowserExtension;
-class QPushButton;
-class QSpinBox;
+class TQPushButton;
+class TQSpinBox;
 class KPopupMenu;
-class QCheckBox;
+class TQCheckBox;
 class KRootPixmap;
 class KToggleAction;
 class KSelectAction;
diff --git a/python/pykde/extra/kde322/ksycocafactory.h b/python/pykde/extra/kde322/ksycocafactory.h
index 1ecd5d82..2a114ee0 100644
--- a/python/pykde/extra/kde322/ksycocafactory.h
+++ b/python/pykde/extra/kde322/ksycocafactory.h
@@ -25,8 +25,8 @@
 #include <tqdict.h>
 #include <tqptrlist.h>
 class KSycoca;
-class QStringList;
-class QString;
+class TQStringList;
+class TQString;
 class KSycocaDict;
 class KSycocaResourceList;
 
diff --git a/python/pykde/extra/kde322/ktoolbarbutton.h b/python/pykde/extra/kde322/ktoolbarbutton.h
index e2c5f5d7..5b7a85f9 100644
--- a/python/pykde/extra/kde322/ktoolbarbutton.h
+++ b/python/pykde/extra/kde322/ktoolbarbutton.h
@@ -33,9 +33,9 @@
 class KToolBar;
 class KToolBarButtonPrivate;
 class KInstance;
-class QEvent;
-class QPopupMenu;
-class QPainter;
+class TQEvent;
+class TQPopupMenu;
+class TQPainter;
 
 /**
  * A toolbar button. This is used internally by KToolBar, use the
diff --git a/python/pykde/extra/kde323/kaccelaction.h b/python/pykde/extra/kde323/kaccelaction.h
index 83127675..0418297c 100644
--- a/python/pykde/extra/kde323/kaccelaction.h
+++ b/python/pykde/extra/kde323/kaccelaction.h
@@ -29,7 +29,7 @@
 
 class KAccelBase;
 
-class QObject;
+class TQObject;
 class KConfig;
 class KConfigBase;
 
diff --git a/python/pykde/extra/kde323/kaccelbase.h b/python/pykde/extra/kde323/kaccelbase.h
index 7cdbb618..e2ec66e9 100644
--- a/python/pykde/extra/kde323/kaccelbase.h
+++ b/python/pykde/extra/kde323/kaccelbase.h
@@ -29,8 +29,8 @@
 #include "kaccelaction.h"
 #include "kkeyserver_x11.h"
 
-class QPopupMenu;
-class QWidget;
+class TQPopupMenu;
+class TQWidget;
 
 //----------------------------------------------------
 
diff --git a/python/pykde/extra/kde323/konsole_part.h b/python/pykde/extra/kde323/konsole_part.h
index 00560d6e..6aba7064 100644
--- a/python/pykde/extra/kde323/konsole_part.h
+++ b/python/pykde/extra/kde323/konsole_part.h
@@ -34,10 +34,10 @@
 
 class KInstance;
 class konsoleBrowserExtension;
-class QPushButton;
-class QSpinBox;
+class TQPushButton;
+class TQSpinBox;
 class KPopupMenu;
-class QCheckBox;
+class TQCheckBox;
 class KRootPixmap;
 class KToggleAction;
 class KSelectAction;
diff --git a/python/pykde/extra/kde323/ksycocafactory.h b/python/pykde/extra/kde323/ksycocafactory.h
index 1ecd5d82..2a114ee0 100644
--- a/python/pykde/extra/kde323/ksycocafactory.h
+++ b/python/pykde/extra/kde323/ksycocafactory.h
@@ -25,8 +25,8 @@
 #include <tqdict.h>
 #include <tqptrlist.h>
 class KSycoca;
-class QStringList;
-class QString;
+class TQStringList;
+class TQString;
 class KSycocaDict;
 class KSycocaResourceList;
 
diff --git a/python/pykde/extra/kde323/ktoolbarbutton.h b/python/pykde/extra/kde323/ktoolbarbutton.h
index e2c5f5d7..5b7a85f9 100644
--- a/python/pykde/extra/kde323/ktoolbarbutton.h
+++ b/python/pykde/extra/kde323/ktoolbarbutton.h
@@ -33,9 +33,9 @@
 class KToolBar;
 class KToolBarButtonPrivate;
 class KInstance;
-class QEvent;
-class QPopupMenu;
-class QPainter;
+class TQEvent;
+class TQPopupMenu;
+class TQPainter;
 
 /**
  * A toolbar button. This is used internally by KToolBar, use the
diff --git a/python/pykde/extra/kde330/kaccelaction.h b/python/pykde/extra/kde330/kaccelaction.h
index 83127675..0418297c 100644
--- a/python/pykde/extra/kde330/kaccelaction.h
+++ b/python/pykde/extra/kde330/kaccelaction.h
@@ -29,7 +29,7 @@
 
 class KAccelBase;
 
-class QObject;
+class TQObject;
 class KConfig;
 class KConfigBase;
 
diff --git a/python/pykde/extra/kde330/kaccelbase.h b/python/pykde/extra/kde330/kaccelbase.h
index 7cdbb618..e2ec66e9 100644
--- a/python/pykde/extra/kde330/kaccelbase.h
+++ b/python/pykde/extra/kde330/kaccelbase.h
@@ -29,8 +29,8 @@
 #include "kaccelaction.h"
 #include "kkeyserver_x11.h"
 
-class QPopupMenu;
-class QWidget;
+class TQPopupMenu;
+class TQWidget;
 
 //----------------------------------------------------
 
diff --git a/python/pykde/extra/kde330/konsole_part.h b/python/pykde/extra/kde330/konsole_part.h
index 52bab26b..e264732c 100644
--- a/python/pykde/extra/kde330/konsole_part.h
+++ b/python/pykde/extra/kde330/konsole_part.h
@@ -34,10 +34,10 @@
 
 class KInstance;
 class konsoleBrowserExtension;
-class QPushButton;
-class QSpinBox;
+class TQPushButton;
+class TQSpinBox;
 class KPopupMenu;
-class QCheckBox;
+class TQCheckBox;
 class KRootPixmap;
 class KToggleAction;
 class KSelectAction;
diff --git a/python/pykde/extra/kde330/ksycocafactory.h b/python/pykde/extra/kde330/ksycocafactory.h
index 1ecd5d82..2a114ee0 100644
--- a/python/pykde/extra/kde330/ksycocafactory.h
+++ b/python/pykde/extra/kde330/ksycocafactory.h
@@ -25,8 +25,8 @@
 #include <tqdict.h>
 #include <tqptrlist.h>
 class KSycoca;
-class QStringList;
-class QString;
+class TQStringList;
+class TQString;
 class KSycocaDict;
 class KSycocaResourceList;
 
diff --git a/python/pykde/extra/kde330/ktoolbarbutton.h b/python/pykde/extra/kde330/ktoolbarbutton.h
index 26868197..f6b899fb 100644
--- a/python/pykde/extra/kde330/ktoolbarbutton.h
+++ b/python/pykde/extra/kde330/ktoolbarbutton.h
@@ -32,9 +32,9 @@
 class KToolBar;
 class KToolBarButtonPrivate;
 class KInstance;
-class QEvent;
-class QPopupMenu;
-class QPainter;
+class TQEvent;
+class TQPopupMenu;
+class TQPainter;
 
 /**
  * A toolbar button. This is used internally by KToolBar, use the
diff --git a/python/pykde/extra/kde331/kaccelaction.h b/python/pykde/extra/kde331/kaccelaction.h
index 83127675..0418297c 100644
--- a/python/pykde/extra/kde331/kaccelaction.h
+++ b/python/pykde/extra/kde331/kaccelaction.h
@@ -29,7 +29,7 @@
 
 class KAccelBase;
 
-class QObject;
+class TQObject;
 class KConfig;
 class KConfigBase;
 
diff --git a/python/pykde/extra/kde331/kaccelbase.h b/python/pykde/extra/kde331/kaccelbase.h
index 7cdbb618..e2ec66e9 100644
--- a/python/pykde/extra/kde331/kaccelbase.h
+++ b/python/pykde/extra/kde331/kaccelbase.h
@@ -29,8 +29,8 @@
 #include "kaccelaction.h"
 #include "kkeyserver_x11.h"
 
-class QPopupMenu;
-class QWidget;
+class TQPopupMenu;
+class TQWidget;
 
 //----------------------------------------------------
 
diff --git a/python/pykde/extra/kde331/konsole_part.h b/python/pykde/extra/kde331/konsole_part.h
index 52bab26b..e264732c 100644
--- a/python/pykde/extra/kde331/konsole_part.h
+++ b/python/pykde/extra/kde331/konsole_part.h
@@ -34,10 +34,10 @@
 
 class KInstance;
 class konsoleBrowserExtension;
-class QPushButton;
-class QSpinBox;
+class TQPushButton;
+class TQSpinBox;
 class KPopupMenu;
-class QCheckBox;
+class TQCheckBox;
 class KRootPixmap;
 class KToggleAction;
 class KSelectAction;
diff --git a/python/pykde/extra/kde331/ksycocafactory.h b/python/pykde/extra/kde331/ksycocafactory.h
index 1ecd5d82..2a114ee0 100644
--- a/python/pykde/extra/kde331/ksycocafactory.h
+++ b/python/pykde/extra/kde331/ksycocafactory.h
@@ -25,8 +25,8 @@
 #include <tqdict.h>
 #include <tqptrlist.h>
 class KSycoca;
-class QStringList;
-class QString;
+class TQStringList;
+class TQString;
 class KSycocaDict;
 class KSycocaResourceList;
 
diff --git a/python/pykde/extra/kde331/ktoolbarbutton.h b/python/pykde/extra/kde331/ktoolbarbutton.h
index 26868197..f6b899fb 100644
--- a/python/pykde/extra/kde331/ktoolbarbutton.h
+++ b/python/pykde/extra/kde331/ktoolbarbutton.h
@@ -32,9 +32,9 @@
 class KToolBar;
 class KToolBarButtonPrivate;
 class KInstance;
-class QEvent;
-class QPopupMenu;
-class QPainter;
+class TQEvent;
+class TQPopupMenu;
+class TQPainter;
 
 /**
  * A toolbar button. This is used internally by KToolBar, use the
diff --git a/python/pykde/extra/kde332/kaccelaction.h b/python/pykde/extra/kde332/kaccelaction.h
index 83127675..0418297c 100644
--- a/python/pykde/extra/kde332/kaccelaction.h
+++ b/python/pykde/extra/kde332/kaccelaction.h
@@ -29,7 +29,7 @@
 
 class KAccelBase;
 
-class QObject;
+class TQObject;
 class KConfig;
 class KConfigBase;
 
diff --git a/python/pykde/extra/kde332/kaccelbase.h b/python/pykde/extra/kde332/kaccelbase.h
index 7cdbb618..e2ec66e9 100644
--- a/python/pykde/extra/kde332/kaccelbase.h
+++ b/python/pykde/extra/kde332/kaccelbase.h
@@ -29,8 +29,8 @@
 #include "kaccelaction.h"
 #include "kkeyserver_x11.h"
 
-class QPopupMenu;
-class QWidget;
+class TQPopupMenu;
+class TQWidget;
 
 //----------------------------------------------------
 
diff --git a/python/pykde/extra/kde332/konsole_part.h b/python/pykde/extra/kde332/konsole_part.h
index 52bab26b..e264732c 100644
--- a/python/pykde/extra/kde332/konsole_part.h
+++ b/python/pykde/extra/kde332/konsole_part.h
@@ -34,10 +34,10 @@
 
 class KInstance;
 class konsoleBrowserExtension;
-class QPushButton;
-class QSpinBox;
+class TQPushButton;
+class TQSpinBox;
 class KPopupMenu;
-class QCheckBox;
+class TQCheckBox;
 class KRootPixmap;
 class KToggleAction;
 class KSelectAction;
diff --git a/python/pykde/extra/kde332/ksycocafactory.h b/python/pykde/extra/kde332/ksycocafactory.h
index 1ecd5d82..2a114ee0 100644
--- a/python/pykde/extra/kde332/ksycocafactory.h
+++ b/python/pykde/extra/kde332/ksycocafactory.h
@@ -25,8 +25,8 @@
 #include <tqdict.h>
 #include <tqptrlist.h>
 class KSycoca;
-class QStringList;
-class QString;
+class TQStringList;
+class TQString;
 class KSycocaDict;
 class KSycocaResourceList;
 
diff --git a/python/pykde/extra/kde332/ktoolbarbutton.h b/python/pykde/extra/kde332/ktoolbarbutton.h
index 26868197..f6b899fb 100644
--- a/python/pykde/extra/kde332/ktoolbarbutton.h
+++ b/python/pykde/extra/kde332/ktoolbarbutton.h
@@ -32,9 +32,9 @@
 class KToolBar;
 class KToolBarButtonPrivate;
 class KInstance;
-class QEvent;
-class QPopupMenu;
-class QPainter;
+class TQEvent;
+class TQPopupMenu;
+class TQPainter;
 
 /**
  * A toolbar button. This is used internally by KToolBar, use the
diff --git a/python/pykde/extra/kde340/kaccelaction.h b/python/pykde/extra/kde340/kaccelaction.h
index c0cebf20..b868ee6f 100644
--- a/python/pykde/extra/kde340/kaccelaction.h
+++ b/python/pykde/extra/kde340/kaccelaction.h
@@ -29,7 +29,7 @@
 
 class KAccelBase;
 
-class QObject;
+class TQObject;
 class KConfig;
 class KConfigBase;
 
diff --git a/python/pykde/extra/kde340/kaccelbase.h b/python/pykde/extra/kde340/kaccelbase.h
index 84661cd3..0238c63a 100644
--- a/python/pykde/extra/kde340/kaccelbase.h
+++ b/python/pykde/extra/kde340/kaccelbase.h
@@ -29,8 +29,8 @@
 #include "kaccelaction.h"
 #include "kkeyserver.h"
 
-class QPopupMenu;
-class QWidget;
+class TQPopupMenu;
+class TQWidget;
 
 //----------------------------------------------------
 
diff --git a/python/pykde/extra/kde340/konsole_part.h b/python/pykde/extra/kde340/konsole_part.h
index 6a19a66e..51c49f5e 100644
--- a/python/pykde/extra/kde340/konsole_part.h
+++ b/python/pykde/extra/kde340/konsole_part.h
@@ -34,10 +34,10 @@
 
 class KInstance;
 class konsoleBrowserExtension;
-class QPushButton;
-class QSpinBox;
+class TQPushButton;
+class TQSpinBox;
 class KPopupMenu;
-class QCheckBox;
+class TQCheckBox;
 class KRootPixmap;
 class KToggleAction;
 class KSelectAction;
diff --git a/python/pykde/extra/kde340/ksycocafactory.h b/python/pykde/extra/kde340/ksycocafactory.h
index b7def536..536da286 100644
--- a/python/pykde/extra/kde340/ksycocafactory.h
+++ b/python/pykde/extra/kde340/ksycocafactory.h
@@ -25,8 +25,8 @@
 #include <tqdict.h>
 #include <tqptrlist.h>
 class KSycoca;
-class QStringList;
-class QString;
+class TQStringList;
+class TQString;
 class KSycocaDict;
 class KSycocaResourceList;
 
diff --git a/python/pykde/extra/kde340/ktoolbarbutton.h b/python/pykde/extra/kde340/ktoolbarbutton.h
index b0d79e19..297c296b 100644
--- a/python/pykde/extra/kde340/ktoolbarbutton.h
+++ b/python/pykde/extra/kde340/ktoolbarbutton.h
@@ -32,9 +32,9 @@
 class KToolBar;
 class KToolBarButtonPrivate;
 class KInstance;
-class QEvent;
-class QPopupMenu;
-class QPainter;
+class TQEvent;
+class TQPopupMenu;
+class TQPainter;
 
 /**
  * A toolbar button. This is used internally by KToolBar, use the
diff --git a/python/pykde/extra/kde341/kaccelaction.h b/python/pykde/extra/kde341/kaccelaction.h
index c0cebf20..b868ee6f 100644
--- a/python/pykde/extra/kde341/kaccelaction.h
+++ b/python/pykde/extra/kde341/kaccelaction.h
@@ -29,7 +29,7 @@
 
 class KAccelBase;
 
-class QObject;
+class TQObject;
 class KConfig;
 class KConfigBase;
 
diff --git a/python/pykde/extra/kde341/kaccelbase.h b/python/pykde/extra/kde341/kaccelbase.h
index 84661cd3..0238c63a 100644
--- a/python/pykde/extra/kde341/kaccelbase.h
+++ b/python/pykde/extra/kde341/kaccelbase.h
@@ -29,8 +29,8 @@
 #include "kaccelaction.h"
 #include "kkeyserver.h"
 
-class QPopupMenu;
-class QWidget;
+class TQPopupMenu;
+class TQWidget;
 
 //----------------------------------------------------
 
diff --git a/python/pykde/extra/kde341/konsole_part.h b/python/pykde/extra/kde341/konsole_part.h
index 6a19a66e..51c49f5e 100644
--- a/python/pykde/extra/kde341/konsole_part.h
+++ b/python/pykde/extra/kde341/konsole_part.h
@@ -34,10 +34,10 @@
 
 class KInstance;
 class konsoleBrowserExtension;
-class QPushButton;
-class QSpinBox;
+class TQPushButton;
+class TQSpinBox;
 class KPopupMenu;
-class QCheckBox;
+class TQCheckBox;
 class KRootPixmap;
 class KToggleAction;
 class KSelectAction;
diff --git a/python/pykde/extra/kde341/ksycocafactory.h b/python/pykde/extra/kde341/ksycocafactory.h
index b7def536..536da286 100644
--- a/python/pykde/extra/kde341/ksycocafactory.h
+++ b/python/pykde/extra/kde341/ksycocafactory.h
@@ -25,8 +25,8 @@
 #include <tqdict.h>
 #include <tqptrlist.h>
 class KSycoca;
-class QStringList;
-class QString;
+class TQStringList;
+class TQString;
 class KSycocaDict;
 class KSycocaResourceList;
 
diff --git a/python/pykde/extra/kde341/ktoolbarbutton.h b/python/pykde/extra/kde341/ktoolbarbutton.h
index b0d79e19..297c296b 100644
--- a/python/pykde/extra/kde341/ktoolbarbutton.h
+++ b/python/pykde/extra/kde341/ktoolbarbutton.h
@@ -32,9 +32,9 @@
 class KToolBar;
 class KToolBarButtonPrivate;
 class KInstance;
-class QEvent;
-class QPopupMenu;
-class QPainter;
+class TQEvent;
+class TQPopupMenu;
+class TQPainter;
 
 /**
  * A toolbar button. This is used internally by KToolBar, use the
diff --git a/python/pykde/extra/kde342/kaccelaction.h b/python/pykde/extra/kde342/kaccelaction.h
index c0cebf20..b868ee6f 100644
--- a/python/pykde/extra/kde342/kaccelaction.h
+++ b/python/pykde/extra/kde342/kaccelaction.h
@@ -29,7 +29,7 @@
 
 class KAccelBase;
 
-class QObject;
+class TQObject;
 class KConfig;
 class KConfigBase;
 
diff --git a/python/pykde/extra/kde342/kaccelbase.h b/python/pykde/extra/kde342/kaccelbase.h
index 84661cd3..0238c63a 100644
--- a/python/pykde/extra/kde342/kaccelbase.h
+++ b/python/pykde/extra/kde342/kaccelbase.h
@@ -29,8 +29,8 @@
 #include "kaccelaction.h"
 #include "kkeyserver.h"
 
-class QPopupMenu;
-class QWidget;
+class TQPopupMenu;
+class TQWidget;
 
 //----------------------------------------------------
 
diff --git a/python/pykde/extra/kde342/konsole_part.h b/python/pykde/extra/kde342/konsole_part.h
index 6a19a66e..51c49f5e 100644
--- a/python/pykde/extra/kde342/konsole_part.h
+++ b/python/pykde/extra/kde342/konsole_part.h
@@ -34,10 +34,10 @@
 
 class KInstance;
 class konsoleBrowserExtension;
-class QPushButton;
-class QSpinBox;
+class TQPushButton;
+class TQSpinBox;
 class KPopupMenu;
-class QCheckBox;
+class TQCheckBox;
 class KRootPixmap;
 class KToggleAction;
 class KSelectAction;
diff --git a/python/pykde/extra/kde342/ksycocafactory.h b/python/pykde/extra/kde342/ksycocafactory.h
index b7def536..536da286 100644
--- a/python/pykde/extra/kde342/ksycocafactory.h
+++ b/python/pykde/extra/kde342/ksycocafactory.h
@@ -25,8 +25,8 @@
 #include <tqdict.h>
 #include <tqptrlist.h>
 class KSycoca;
-class QStringList;
-class QString;
+class TQStringList;
+class TQString;
 class KSycocaDict;
 class KSycocaResourceList;
 
diff --git a/python/pykde/extra/kde342/ktoolbarbutton.h b/python/pykde/extra/kde342/ktoolbarbutton.h
index 8d3f5289..743c8bc8 100644
--- a/python/pykde/extra/kde342/ktoolbarbutton.h
+++ b/python/pykde/extra/kde342/ktoolbarbutton.h
@@ -32,9 +32,9 @@
 class KToolBar;
 class KToolBarButtonPrivate;
 class KInstance;
-class QEvent;
-class QPopupMenu;
-class QPainter;
+class TQEvent;
+class TQPopupMenu;
+class TQPainter;
 
 /**
  * A toolbar button. This is used internally by KToolBar, use the
diff --git a/python/pykde/extra/kde343/kaccelaction.h b/python/pykde/extra/kde343/kaccelaction.h
index c0cebf20..b868ee6f 100644
--- a/python/pykde/extra/kde343/kaccelaction.h
+++ b/python/pykde/extra/kde343/kaccelaction.h
@@ -29,7 +29,7 @@
 
 class KAccelBase;
 
-class QObject;
+class TQObject;
 class KConfig;
 class KConfigBase;
 
diff --git a/python/pykde/extra/kde343/kaccelbase.h b/python/pykde/extra/kde343/kaccelbase.h
index 84661cd3..0238c63a 100644
--- a/python/pykde/extra/kde343/kaccelbase.h
+++ b/python/pykde/extra/kde343/kaccelbase.h
@@ -29,8 +29,8 @@
 #include "kaccelaction.h"
 #include "kkeyserver.h"
 
-class QPopupMenu;
-class QWidget;
+class TQPopupMenu;
+class TQWidget;
 
 //----------------------------------------------------
 
diff --git a/python/pykde/extra/kde343/konsole_part.h b/python/pykde/extra/kde343/konsole_part.h
index 6a19a66e..51c49f5e 100644
--- a/python/pykde/extra/kde343/konsole_part.h
+++ b/python/pykde/extra/kde343/konsole_part.h
@@ -34,10 +34,10 @@
 
 class KInstance;
 class konsoleBrowserExtension;
-class QPushButton;
-class QSpinBox;
+class TQPushButton;
+class TQSpinBox;
 class KPopupMenu;
-class QCheckBox;
+class TQCheckBox;
 class KRootPixmap;
 class KToggleAction;
 class KSelectAction;
diff --git a/python/pykde/extra/kde343/ksycocafactory.h b/python/pykde/extra/kde343/ksycocafactory.h
index b7def536..536da286 100644
--- a/python/pykde/extra/kde343/ksycocafactory.h
+++ b/python/pykde/extra/kde343/ksycocafactory.h
@@ -25,8 +25,8 @@
 #include <tqdict.h>
 #include <tqptrlist.h>
 class KSycoca;
-class QStringList;
-class QString;
+class TQStringList;
+class TQString;
 class KSycocaDict;
 class KSycocaResourceList;
 
diff --git a/python/pykde/extra/kde343/ktoolbarbutton.h b/python/pykde/extra/kde343/ktoolbarbutton.h
index 8d3f5289..743c8bc8 100644
--- a/python/pykde/extra/kde343/ktoolbarbutton.h
+++ b/python/pykde/extra/kde343/ktoolbarbutton.h
@@ -32,9 +32,9 @@
 class KToolBar;
 class KToolBarButtonPrivate;
 class KInstance;
-class QEvent;
-class QPopupMenu;
-class QPainter;
+class TQEvent;
+class TQPopupMenu;
+class TQPainter;
 
 /**
  * A toolbar button. This is used internally by KToolBar, use the
diff --git a/python/pykde/extra/kde350/kaccelaction.h b/python/pykde/extra/kde350/kaccelaction.h
index 606bd3cc..d55e4517 100644
--- a/python/pykde/extra/kde350/kaccelaction.h
+++ b/python/pykde/extra/kde350/kaccelaction.h
@@ -29,7 +29,7 @@
 
 class KAccelBase;
 
-class QObject;
+class TQObject;
 class KConfig;
 class KConfigBase;
 
diff --git a/python/pykde/extra/kde350/kaccelbase.h b/python/pykde/extra/kde350/kaccelbase.h
index 7ac98914..babf304b 100644
--- a/python/pykde/extra/kde350/kaccelbase.h
+++ b/python/pykde/extra/kde350/kaccelbase.h
@@ -29,8 +29,8 @@
 #include "kaccelaction.h"
 #include "kkeyserver.h"
 
-class QPopupMenu;
-class QWidget;
+class TQPopupMenu;
+class TQWidget;
 
 //----------------------------------------------------
 
diff --git a/python/pykde/extra/kde350/konsole_part.h b/python/pykde/extra/kde350/konsole_part.h
index 69f80a4b..d526c1a6 100644
--- a/python/pykde/extra/kde350/konsole_part.h
+++ b/python/pykde/extra/kde350/konsole_part.h
@@ -34,11 +34,11 @@
 
 class KInstance;
 class konsoleBrowserExtension;
-class QPushButton;
-class QSpinBox;
+class TQPushButton;
+class TQSpinBox;
 class KPopupMenu;
 class KActionMenu;
-class QCheckBox;
+class TQCheckBox;
 class KRootPixmap;
 class KToggleAction;
 class KSelectAction;
diff --git a/python/pykde/extra/kde350/ksycocafactory.h b/python/pykde/extra/kde350/ksycocafactory.h
index b7def536..536da286 100644
--- a/python/pykde/extra/kde350/ksycocafactory.h
+++ b/python/pykde/extra/kde350/ksycocafactory.h
@@ -25,8 +25,8 @@
 #include <tqdict.h>
 #include <tqptrlist.h>
 class KSycoca;
-class QStringList;
-class QString;
+class TQStringList;
+class TQString;
 class KSycocaDict;
 class KSycocaResourceList;
 
diff --git a/python/pykde/extra/kde350/ktoolbarbutton.h b/python/pykde/extra/kde350/ktoolbarbutton.h
index a4fed43d..eab46983 100644
--- a/python/pykde/extra/kde350/ktoolbarbutton.h
+++ b/python/pykde/extra/kde350/ktoolbarbutton.h
@@ -32,9 +32,9 @@
 class KToolBar;
 class KToolBarButtonPrivate;
 class KInstance;
-class QEvent;
-class QPopupMenu;
-class QPainter;
+class TQEvent;
+class TQPopupMenu;
+class TQPainter;
 
 /**
  * A toolbar button. This is used internally by KToolBar, use the
diff --git a/python/pykde/extra/kde351/kaccelaction.h b/python/pykde/extra/kde351/kaccelaction.h
index 606bd3cc..d55e4517 100644
--- a/python/pykde/extra/kde351/kaccelaction.h
+++ b/python/pykde/extra/kde351/kaccelaction.h
@@ -29,7 +29,7 @@
 
 class KAccelBase;
 
-class QObject;
+class TQObject;
 class KConfig;
 class KConfigBase;
 
diff --git a/python/pykde/extra/kde351/kaccelbase.h b/python/pykde/extra/kde351/kaccelbase.h
index 7ac98914..babf304b 100644
--- a/python/pykde/extra/kde351/kaccelbase.h
+++ b/python/pykde/extra/kde351/kaccelbase.h
@@ -29,8 +29,8 @@
 #include "kaccelaction.h"
 #include "kkeyserver.h"
 
-class QPopupMenu;
-class QWidget;
+class TQPopupMenu;
+class TQWidget;
 
 //----------------------------------------------------
 
diff --git a/python/pykde/extra/kde351/konsole_part.h b/python/pykde/extra/kde351/konsole_part.h
index 69f80a4b..d526c1a6 100644
--- a/python/pykde/extra/kde351/konsole_part.h
+++ b/python/pykde/extra/kde351/konsole_part.h
@@ -34,11 +34,11 @@
 
 class KInstance;
 class konsoleBrowserExtension;
-class QPushButton;
-class QSpinBox;
+class TQPushButton;
+class TQSpinBox;
 class KPopupMenu;
 class KActionMenu;
-class QCheckBox;
+class TQCheckBox;
 class KRootPixmap;
 class KToggleAction;
 class KSelectAction;
diff --git a/python/pykde/extra/kde351/ksycocafactory.h b/python/pykde/extra/kde351/ksycocafactory.h
index b7def536..536da286 100644
--- a/python/pykde/extra/kde351/ksycocafactory.h
+++ b/python/pykde/extra/kde351/ksycocafactory.h
@@ -25,8 +25,8 @@
 #include <tqdict.h>
 #include <tqptrlist.h>
 class KSycoca;
-class QStringList;
-class QString;
+class TQStringList;
+class TQString;
 class KSycocaDict;
 class KSycocaResourceList;
 
diff --git a/python/pykde/extra/kde351/ktoolbarbutton.h b/python/pykde/extra/kde351/ktoolbarbutton.h
index a4fed43d..eab46983 100644
--- a/python/pykde/extra/kde351/ktoolbarbutton.h
+++ b/python/pykde/extra/kde351/ktoolbarbutton.h
@@ -32,9 +32,9 @@
 class KToolBar;
 class KToolBarButtonPrivate;
 class KInstance;
-class QEvent;
-class QPopupMenu;
-class QPainter;
+class TQEvent;
+class TQPopupMenu;
+class TQPainter;
 
 /**
  * A toolbar button. This is used internally by KToolBar, use the
diff --git a/python/pykde/extra/kde352/kaccelaction.h b/python/pykde/extra/kde352/kaccelaction.h
index 606bd3cc..d55e4517 100644
--- a/python/pykde/extra/kde352/kaccelaction.h
+++ b/python/pykde/extra/kde352/kaccelaction.h
@@ -29,7 +29,7 @@
 
 class KAccelBase;
 
-class QObject;
+class TQObject;
 class KConfig;
 class KConfigBase;
 
diff --git a/python/pykde/extra/kde352/kaccelbase.h b/python/pykde/extra/kde352/kaccelbase.h
index 7ac98914..babf304b 100644
--- a/python/pykde/extra/kde352/kaccelbase.h
+++ b/python/pykde/extra/kde352/kaccelbase.h
@@ -29,8 +29,8 @@
 #include "kaccelaction.h"
 #include "kkeyserver.h"
 
-class QPopupMenu;
-class QWidget;
+class TQPopupMenu;
+class TQWidget;
 
 //----------------------------------------------------
 
diff --git a/python/pykde/extra/kde352/konsole_part.h b/python/pykde/extra/kde352/konsole_part.h
index 69f80a4b..d526c1a6 100644
--- a/python/pykde/extra/kde352/konsole_part.h
+++ b/python/pykde/extra/kde352/konsole_part.h
@@ -34,11 +34,11 @@
 
 class KInstance;
 class konsoleBrowserExtension;
-class QPushButton;
-class QSpinBox;
+class TQPushButton;
+class TQSpinBox;
 class KPopupMenu;
 class KActionMenu;
-class QCheckBox;
+class TQCheckBox;
 class KRootPixmap;
 class KToggleAction;
 class KSelectAction;
diff --git a/python/pykde/extra/kde352/ksycocafactory.h b/python/pykde/extra/kde352/ksycocafactory.h
index b7def536..536da286 100644
--- a/python/pykde/extra/kde352/ksycocafactory.h
+++ b/python/pykde/extra/kde352/ksycocafactory.h
@@ -25,8 +25,8 @@
 #include <tqdict.h>
 #include <tqptrlist.h>
 class KSycoca;
-class QStringList;
-class QString;
+class TQStringList;
+class TQString;
 class KSycocaDict;
 class KSycocaResourceList;
 
diff --git a/python/pykde/extra/kde352/ktoolbarbutton.h b/python/pykde/extra/kde352/ktoolbarbutton.h
index a4fed43d..eab46983 100644
--- a/python/pykde/extra/kde352/ktoolbarbutton.h
+++ b/python/pykde/extra/kde352/ktoolbarbutton.h
@@ -32,9 +32,9 @@
 class KToolBar;
 class KToolBarButtonPrivate;
 class KInstance;
-class QEvent;
-class QPopupMenu;
-class QPainter;
+class TQEvent;
+class TQPopupMenu;
+class TQPainter;
 
 /**
  * A toolbar button. This is used internally by KToolBar, use the
diff --git a/python/pykde/extra/kde353/kaccelaction.h b/python/pykde/extra/kde353/kaccelaction.h
index 606bd3cc..d55e4517 100644
--- a/python/pykde/extra/kde353/kaccelaction.h
+++ b/python/pykde/extra/kde353/kaccelaction.h
@@ -29,7 +29,7 @@
 
 class KAccelBase;
 
-class QObject;
+class TQObject;
 class KConfig;
 class KConfigBase;
 
diff --git a/python/pykde/extra/kde353/kaccelbase.h b/python/pykde/extra/kde353/kaccelbase.h
index 7ac98914..babf304b 100644
--- a/python/pykde/extra/kde353/kaccelbase.h
+++ b/python/pykde/extra/kde353/kaccelbase.h
@@ -29,8 +29,8 @@
 #include "kaccelaction.h"
 #include "kkeyserver.h"
 
-class QPopupMenu;
-class QWidget;
+class TQPopupMenu;
+class TQWidget;
 
 //----------------------------------------------------
 
diff --git a/python/pykde/extra/kde353/konsole_part.h b/python/pykde/extra/kde353/konsole_part.h
index 69f80a4b..d526c1a6 100644
--- a/python/pykde/extra/kde353/konsole_part.h
+++ b/python/pykde/extra/kde353/konsole_part.h
@@ -34,11 +34,11 @@
 
 class KInstance;
 class konsoleBrowserExtension;
-class QPushButton;
-class QSpinBox;
+class TQPushButton;
+class TQSpinBox;
 class KPopupMenu;
 class KActionMenu;
-class QCheckBox;
+class TQCheckBox;
 class KRootPixmap;
 class KToggleAction;
 class KSelectAction;
diff --git a/python/pykde/extra/kde353/ksycocafactory.h b/python/pykde/extra/kde353/ksycocafactory.h
index b7def536..536da286 100644
--- a/python/pykde/extra/kde353/ksycocafactory.h
+++ b/python/pykde/extra/kde353/ksycocafactory.h
@@ -25,8 +25,8 @@
 #include <tqdict.h>
 #include <tqptrlist.h>
 class KSycoca;
-class QStringList;
-class QString;
+class TQStringList;
+class TQString;
 class KSycocaDict;
 class KSycocaResourceList;
 
diff --git a/python/pykde/extra/kde353/ktoolbarbutton.h b/python/pykde/extra/kde353/ktoolbarbutton.h
index a4fed43d..eab46983 100644
--- a/python/pykde/extra/kde353/ktoolbarbutton.h
+++ b/python/pykde/extra/kde353/ktoolbarbutton.h
@@ -32,9 +32,9 @@
 class KToolBar;
 class KToolBarButtonPrivate;
 class KInstance;
-class QEvent;
-class QPopupMenu;
-class QPainter;
+class TQEvent;
+class TQPopupMenu;
+class TQPainter;
 
 /**
  * A toolbar button. This is used internally by KToolBar, use the
diff --git a/python/pyqt/pylupdate3/metatranslator.h b/python/pyqt/pylupdate3/metatranslator.h
index eb2a645d..378a462e 100644
--- a/python/pyqt/pylupdate3/metatranslator.h
+++ b/python/pyqt/pylupdate3/metatranslator.h
@@ -22,7 +22,7 @@
 #include <tqtranslator.h>
 #include <tqvaluelist.h>
 
-class QTextCodec;
+class TQTextCodec;
 
 class MetaTranslatorMessage : public QTranslatorMessage
 {
diff --git a/python/pyqt/pyuic2/widgetdatabase.cpp b/python/pyqt/pyuic2/widgetdatabase.cpp
index ced269f3..db5158e9 100644
--- a/python/pyqt/pyuic2/widgetdatabase.cpp
+++ b/python/pyqt/pyuic2/widgetdatabase.cpp
@@ -95,8 +95,8 @@ void WidgetDatabase::setupDataBase()
     if ( dbcount )
 	return;
 
-    wGroups = new QStrList;
-    invisibleGroups = new QStrList;
+    wGroups = new TQStrList;
+    invisibleGroups = new TQStrList;
     invisibleGroups->append( "Forms" );
     invisibleGroups->append( "Temp" );
     className2Id = new TQDict<int>( dbdictsize );
diff --git a/python/pyqt/pyuic3/domtool.h b/python/pyqt/pyuic3/domtool.h
index a75e3d3f..d88e32eb 100644
--- a/python/pyqt/pyuic3/domtool.h
+++ b/python/pyqt/pyuic3/domtool.h
@@ -24,8 +24,8 @@
 #include <tqvariant.h>
 #include <tqnamespace.h>
 
-class QDomElement;
-class QDomDocument;
+class TQDomElement;
+class TQDomDocument;
 
 class DomTool : public Qt
 {
diff --git a/python/pyqt/pyuic3/widgetdatabase.cpp b/python/pyqt/pyuic3/widgetdatabase.cpp
index 79a2c8b8..0b1720a8 100644
--- a/python/pyqt/pyuic3/widgetdatabase.cpp
+++ b/python/pyqt/pyuic3/widgetdatabase.cpp
@@ -117,8 +117,8 @@ void WidgetDatabase::setupDataBase( int id )
 	return;
 #endif
 
-    wGroups = new QStrList;
-    invisibleGroups = new QStrList;
+    wGroups = new TQStrList;
+    invisibleGroups = new TQStrList;
     invisibleGroups->append( "Forms" );
     invisibleGroups->append( "Temp" );
     className2Id = new TQDict<int>( dbdictsize );
diff --git a/qtsharp/src/bindings/static/QString.cs b/qtsharp/src/bindings/static/QString.cs
index 1a790975..df25945e 100644
--- a/qtsharp/src/bindings/static/QString.cs
+++ b/qtsharp/src/bindings/static/QString.cs
@@ -698,28 +698,28 @@ namespace Qt {
 		private static extern IntPtr qt_QString_at (IntPtr raw, uint i);
 		public TQChar At (uint i)
 		{
-			return LookupObject (qt_QString_at (rawObject, i), typeof (TQChar)) as QChar;
+			return LookupObject (qt_QString_at (rawObject, i), typeof (TQChar)) as TQChar;
 		}
 
 		[DllImport("libqtc", CharSet=CharSet.Ansi)]
 		private static extern IntPtr qt_QString_constref (IntPtr raw, uint i);
 		public TQChar Constref (uint i)
 		{
-			return LookupObject (qt_QString_constref (rawObject, i), typeof (TQChar)) as QChar;
+			return LookupObject (qt_QString_constref (rawObject, i), typeof (TQChar)) as TQChar;
 		}
 
 		[DllImport("libqtc", CharSet=CharSet.Ansi)]
 		private static extern IntPtr qt_QString_ref (IntPtr raw, uint i);
 		public TQChar Q_ref (uint i)
 		{
-			return LookupObject (qt_QString_ref (rawObject, i), typeof (TQChar)) as QChar;
+			return LookupObject (qt_QString_ref (rawObject, i), typeof (TQChar)) as TQChar;
 		}
 
 		[DllImport("libqtc", CharSet=CharSet.Ansi)]
 		private static extern IntPtr qt_QString_unicode (IntPtr raw);
 		public TQChar Unicode ()
 		{
-			return LookupObject (qt_QString_unicode (rawObject), typeof (TQChar)) as QChar;
+			return LookupObject (qt_QString_unicode (rawObject), typeof (TQChar)) as TQChar;
 		}
 
 		[DllImport("libqtc", CharSet=CharSet.Ansi)]
@@ -740,14 +740,14 @@ namespace Qt {
 		private static extern IntPtr qt_QString_utf8 (IntPtr raw);
 		public TQCString Utf8 ()
 		{
-			return LookupObject (qt_QString_utf8 (rawObject), typeof (TQCString)) as QCString;
+			return LookupObject (qt_QString_utf8 (rawObject), typeof (TQCString)) as TQCString;
 		}
 
 		[DllImport("libqtc", CharSet=CharSet.Ansi)]
 		private static extern IntPtr qt_QString_local8Bit (IntPtr raw);
 		public TQCString Local8Bit ()
 		{
-			return LookupObject (qt_QString_local8Bit (rawObject), typeof (TQCString)) as QCString;
+			return LookupObject (qt_QString_local8Bit (rawObject), typeof (TQCString)) as TQCString;
 		}
 
 		[DllImport("libqtc", CharSet=CharSet.Ansi)]
diff --git a/qtsharp/src/bindings/static/QToolButton.cs b/qtsharp/src/bindings/static/QToolButton.cs
index 1ccc243f..e4779111 100644
--- a/qtsharp/src/bindings/static/QToolButton.cs
+++ b/qtsharp/src/bindings/static/QToolButton.cs
@@ -191,7 +191,7 @@ namespace Qt {
 			if (disposed)
 				throw new ObjectDisposedException (this+": Attempted use of disposed object");
 
-			return LookupObject (qt_QToolButton_iconSet (rawObject, on), typeof (TQIconSet)) as QIconSet;
+			return LookupObject (qt_QToolButton_iconSet (rawObject, on), typeof (TQIconSet)) as TQIconSet;
 		}
 
 		[DllImport("libqtc", CharSet=CharSet.Ansi)]
diff --git a/qtsharp/src/bindings/static/QWidgetStack.cs b/qtsharp/src/bindings/static/QWidgetStack.cs
index fea0944c..aed0b6c2 100644
--- a/qtsharp/src/bindings/static/QWidgetStack.cs
+++ b/qtsharp/src/bindings/static/QWidgetStack.cs
@@ -89,14 +89,14 @@ namespace Qt {
 		private static extern IntPtr qt_QWidgetStack_sizeHint (IntPtr raw);
 		public TQSize SizeHint ()
 		{
-			return LookupObject (qt_QWidgetStack_sizeHint (RawObject), typeof(TQSize)) as QSize;
+			return LookupObject (qt_QWidgetStack_sizeHint (RawObject), typeof(TQSize)) as TQSize;
 		}
 
 		[DllImport("libqtc", CharSet=CharSet.Ansi)]
 		private static extern IntPtr qt_QWidgetStack_minimumSizeHint (IntPtr raw);
 		public TQSize MinimumSizeHint ()
 		{
-			return LookupObject (qt_QWidgetStack_minimumSizeHint (RawObject), typeof(TQSize)) as QSize;
+			return LookupObject (qt_QWidgetStack_minimumSizeHint (RawObject), typeof(TQSize)) as TQSize;
 		}
 
 		[DllImport("libqtc", CharSet=CharSet.Ansi)]
@@ -110,7 +110,7 @@ namespace Qt {
 		private static extern IntPtr qt_QWidgetStack_widget (IntPtr raw, int arg1);
 		public TQWidget Widget (int arg1)
 		{
-			return LookupObject (qt_QWidgetStack_widget (RawObject, arg1), typeof(TQWidget)) as QWidget;
+			return LookupObject (qt_QWidgetStack_widget (RawObject, arg1), typeof(TQWidget)) as TQWidget;
 		}
 
 		[DllImport("libqtc", CharSet=CharSet.Ansi)]
@@ -124,7 +124,7 @@ namespace Qt {
 		private static extern IntPtr qt_QWidgetStack_visibleWidget (IntPtr raw);
 		public TQWidget VisibleWidget ()
 		{
-			return LookupObject (qt_QWidgetStack_visibleWidget (RawObject), typeof(TQWidget)) as QWidget;
+			return LookupObject (qt_QWidgetStack_visibleWidget (RawObject), typeof(TQWidget)) as TQWidget;
 		}
 
 		[DllImport("libqtc", CharSet=CharSet.Ansi)]
diff --git a/qtsharp/src/bindings/static/QtSlot.cs b/qtsharp/src/bindings/static/QtSlot.cs
index 462be9ad..a48c9d42 100644
--- a/qtsharp/src/bindings/static/QtSlot.cs
+++ b/qtsharp/src/bindings/static/QtSlot.cs
@@ -95,109 +95,109 @@ namespace Qt {
 
 		public void SlotBridge_QString (IntPtr value0)
 		{
-			TQString csvalue0 = QtSupport.LookupObject (value0, typeof (TQString)) as QString;
+			TQString csvalue0 = QtSupport.LookupObject (value0, typeof (TQString)) as TQString;
 		
 			Invoke (new object[] {csvalue0});
 		}
 		
 		public void SlotBridge_QDockWindow (IntPtr value0)
 		{
-			TQDockWindow csvalue0 = QtSupport.LookupObject (value0, typeof (TQDockWindow)) as QDockWindow;
+			TQDockWindow csvalue0 = QtSupport.LookupObject (value0, typeof (TQDockWindow)) as TQDockWindow;
 		
 			Invoke (new object[] {csvalue0});
 		}
 		
 		public void SlotBridge_QDropEvent (IntPtr value0)
 		{
-			TQDropEvent csvalue0 = QtSupport.LookupObject (value0, typeof (TQDropEvent)) as QDropEvent;
+			TQDropEvent csvalue0 = QtSupport.LookupObject (value0, typeof (TQDropEvent)) as TQDropEvent;
 		
 			Invoke (new object[] {csvalue0});
 		}
 		
 		public void SlotBridge_QDropEventQListViewItem (IntPtr value0, IntPtr value1)
 		{
-			TQDropEvent csvalue0 = QtSupport.LookupObject (value0, typeof (TQDropEvent)) as QDropEvent;
-			TQListViewItem csvalue1 = QtSupport.LookupObject (value1, typeof (TQListViewItem)) as QListViewItem;
+			TQDropEvent csvalue0 = QtSupport.LookupObject (value0, typeof (TQDropEvent)) as TQDropEvent;
+			TQListViewItem csvalue1 = QtSupport.LookupObject (value1, typeof (TQListViewItem)) as TQListViewItem;
 		
 			Invoke (new object[] {csvalue0, csvalue1});
 		}
 		
 		public void SlotBridge_QIconViewItem (IntPtr value0)
 		{
-			TQIconViewItem csvalue0 = QtSupport.LookupObject (value0, typeof (TQIconViewItem)) as QIconViewItem;
+			TQIconViewItem csvalue0 = QtSupport.LookupObject (value0, typeof (TQIconViewItem)) as TQIconViewItem;
 		
 			Invoke (new object[] {csvalue0});
 		}
 		
 		public void SlotBridge_QListBoxItem (IntPtr value0)
 		{
-			TQListBoxItem csvalue0 = QtSupport.LookupObject (value0, typeof (TQListBoxItem)) as QListBoxItem;
+			TQListBoxItem csvalue0 = QtSupport.LookupObject (value0, typeof (TQListBoxItem)) as TQListBoxItem;
 		
 			Invoke (new object[] {csvalue0});
 		}
 		
 		public void SlotBridge_QListViewItem (IntPtr value0)
 		{
-			TQListViewItem csvalue0 = QtSupport.LookupObject (value0, typeof (TQListViewItem)) as QListViewItem;
+			TQListViewItem csvalue0 = QtSupport.LookupObject (value0, typeof (TQListViewItem)) as TQListViewItem;
 		
 			Invoke (new object[] {csvalue0});
 		}
 		
 		public void SlotBridge_QListViewItemQListViewItem (IntPtr value0, IntPtr value1)
 		{
-			TQListViewItem csvalue0 = QtSupport.LookupObject (value0, typeof (TQListViewItem)) as QListViewItem;
-			TQListViewItem csvalue1 = QtSupport.LookupObject (value1, typeof (TQListViewItem)) as QListViewItem;
+			TQListViewItem csvalue0 = QtSupport.LookupObject (value0, typeof (TQListViewItem)) as TQListViewItem;
+			TQListViewItem csvalue1 = QtSupport.LookupObject (value1, typeof (TQListViewItem)) as TQListViewItem;
 		
 			Invoke (new object[] {csvalue0, csvalue1});
 		}
 		
 		public void SlotBridge_QListViewItemQListViewItemQListViewItem (IntPtr value0, IntPtr value1, IntPtr value2)
 		{
-			TQListViewItem csvalue0 = QtSupport.LookupObject (value0, typeof (TQListViewItem)) as QListViewItem;
-			TQListViewItem csvalue1 = QtSupport.LookupObject (value1, typeof (TQListViewItem)) as QListViewItem;
-			TQListViewItem csvalue2 = QtSupport.LookupObject (value2, typeof (TQListViewItem)) as QListViewItem;
+			TQListViewItem csvalue0 = QtSupport.LookupObject (value0, typeof (TQListViewItem)) as TQListViewItem;
+			TQListViewItem csvalue1 = QtSupport.LookupObject (value1, typeof (TQListViewItem)) as TQListViewItem;
+			TQListViewItem csvalue2 = QtSupport.LookupObject (value2, typeof (TQListViewItem)) as TQListViewItem;
 
 			Invoke (new object[] {csvalue0, csvalue1, csvalue2});
 		}
 		
 		public void SlotBridge_QNetworkOperation (IntPtr value0)
 		{
-			TQNetworkOperation csvalue0 = QtSupport.LookupObject (value0, typeof (TQNetworkOperation)) as QNetworkOperation;
+			TQNetworkOperation csvalue0 = QtSupport.LookupObject (value0, typeof (TQNetworkOperation)) as TQNetworkOperation;
 		
 			Invoke (new object[] {csvalue0});
 		}
 		
 		public void SlotBridge_QObject (IntPtr value0)
 		{
-			TQObject csvalue0 = QtSupport.LookupObject (value0, typeof (TQObject)) as QObject;
+			TQObject csvalue0 = QtSupport.LookupObject (value0, typeof (TQObject)) as TQObject;
 		
 			Invoke (new object[] {csvalue0});
 		}
 		
 		public void SlotBridge_QToolBar (IntPtr value0)
 		{
-			TQToolBar csvalue0 = QtSupport.LookupObject (value0, typeof (TQToolBar)) as QToolBar;
+			TQToolBar csvalue0 = QtSupport.LookupObject (value0, typeof (TQToolBar)) as TQToolBar;
 		
 			Invoke (new object[] {csvalue0});
 		}
 		
 		public void SlotBridge_QWidget (IntPtr value0)
 		{
-			TQWidget csvalue0 = QtSupport.LookupObject (value0, typeof (TQWidget)) as QWidget;
+			TQWidget csvalue0 = QtSupport.LookupObject (value0, typeof (TQWidget)) as TQWidget;
 		
 			Invoke (new object[] {csvalue0});
 		}
 		
 		public void SlotBridge_intQIconViewItem (int value0, IntPtr value1)
 		{
-			TQIconViewItem csvalue1 = QtSupport.LookupObject (value1, typeof (TQIconViewItem)) as QIconViewItem;
+			TQIconViewItem csvalue1 = QtSupport.LookupObject (value1, typeof (TQIconViewItem)) as TQIconViewItem;
 
 			Invoke (new object[] {value0, csvalue1});
 		}
 
 		public void SlotBridge_intQListBoxItem (int value0, IntPtr value1)
 		{
-			TQListBoxItem csvalue1 = QtSupport.LookupObject (value1, typeof (TQListBoxItem)) as QListBoxItem;
+			TQListBoxItem csvalue1 = QtSupport.LookupObject (value1, typeof (TQListBoxItem)) as TQListBoxItem;
 
 			Invoke (new object[] {value0, csvalue1});
 		}
diff --git a/qtsharp/src/bindings/static/QtSupport.cs b/qtsharp/src/bindings/static/QtSupport.cs
index af48d72a..01031446 100644
--- a/qtsharp/src/bindings/static/QtSupport.cs
+++ b/qtsharp/src/bindings/static/QtSupport.cs
@@ -346,7 +346,7 @@ namespace Qt {
 				if ((ev = (TQEvent)LookupObject (eventinstance)) == null) {
 					object[] args = new object[] { eventinstance };
 					BindingFlags bflags = BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public;
-					ev = Activator.CreateInstance (evtype, bflags, null, args, null) as QEvent;
+					ev = Activator.CreateInstance (evtype, bflags, null, args, null) as TQEvent;
 				}
 
 				// Notify global event handlers first.