diff --git a/kfilereplace/commandengine.h b/kfilereplace/commandengine.h
index a3b7d374..0b3c2106 100644
--- a/kfilereplace/commandengine.h
+++ b/kfilereplace/commandengine.h
@@ -20,7 +20,7 @@
 #define COMMANDENGINE_H
 
 // QT
-class QString;
+class TQString;
 #include <tqobject.h>
 
 //KDE
diff --git a/kfilereplace/report.h b/kfilereplace/report.h
index af221bc1..13856334 100644
--- a/kfilereplace/report.h
+++ b/kfilereplace/report.h
@@ -20,7 +20,7 @@
 #define REPORT_H
 
 // QT
-class QString;
+class TQString;
 
 // KDE
 #include <klocale.h>
diff --git a/kimagemapeditor/arealistview.h b/kimagemapeditor/arealistview.h
index 9171cd44..6e09aaef 100644
--- a/kimagemapeditor/arealistview.h
+++ b/kimagemapeditor/arealistview.h
@@ -22,7 +22,7 @@
 #include <tqvbox.h>
 
 class KListView;
-class QPushButton;
+class TQPushButton;
 class Area;
 
 /**
diff --git a/kimagemapeditor/kimagemapeditor.h b/kimagemapeditor/kimagemapeditor.h
index 6d655746..f6177f9b 100644
--- a/kimagemapeditor/kimagemapeditor.h
+++ b/kimagemapeditor/kimagemapeditor.h
@@ -36,11 +36,11 @@
   */
 
 
-class QListView;
-class QPushButton;
+class TQListView;
+class TQPushButton;
 class DrawZone;
-class QComboBox;
-class QListViewItem;
+class TQComboBox;
+class TQListViewItem;
 class KToggleAction;
 
 
@@ -114,10 +114,10 @@ class KAction;
 #if KDE_VERSION < 300
   class KAccel;
 #endif
-///class QListViewItem;
+///class TQListViewItem;
 class KCommandHistory;
 class KApplication;
-class QTabWidget;
+class TQTabWidget;
 class AreaListView;
 class ImagesListView;
 class MapsListView;
diff --git a/kimagemapeditor/kimearea.h b/kimagemapeditor/kimearea.h
index 8cd9677a..d23ad18c 100644
--- a/kimagemapeditor/kimearea.h
+++ b/kimagemapeditor/kimearea.h
@@ -26,10 +26,10 @@
 
 #include "kdeversion.h"
 
-class QPainter;
-class QPointArray;
-class QListViewItem;
-class QBitmap;
+class TQPainter;
+class TQPointArray;
+class TQListViewItem;
+class TQBitmap;
 
 typedef TQPtrList<TQRect> SelectionPointList;
 
diff --git a/kimagemapeditor/kimedialogs.h b/kimagemapeditor/kimedialogs.h
index 7e4f3809..7445e584 100644
--- a/kimagemapeditor/kimedialogs.h
+++ b/kimagemapeditor/kimedialogs.h
@@ -26,9 +26,9 @@
 
 #include "kdeversion.h"
 
-class QLineEdit;
-class QMultiLineEdit;
-class QSpinBox;
+class TQLineEdit;
+class TQMultiLineEdit;
+class TQSpinBox;
 
 
 class CoordsEdit : public TQWidget {
@@ -66,7 +66,7 @@ class CircleCoordsEdit : public CoordsEdit {
 		TQSpinBox *radiusSpin;
 };
 
-class QTable;
+class TQTable;
 
 class PolyCoordsEdit : public CoordsEdit {
 Q_OBJECT	
@@ -95,8 +95,8 @@ Q_OBJECT
 };
 
 
-class QCheckBox;
-class QGridLayout;
+class TQCheckBox;
+class TQGridLayout;
 
 class AreaDialog : public KDialog {
 Q_OBJECT
@@ -142,9 +142,9 @@ Q_OBJECT
 		void areaChanged(Area* a);
 };
 
-class QLineEdit;
-class QListBox;
-class QLabel;
+class TQLineEdit;
+class TQListBox;
+class TQLabel;
 
 
 class ImageMapChooseDialog : public KDialogBase {
diff --git a/klinkstatus/src/engine/linkstatus.h b/klinkstatus/src/engine/linkstatus.h
index 6e924129..59a45751 100644
--- a/klinkstatus/src/engine/linkstatus.h
+++ b/klinkstatus/src/engine/linkstatus.h
@@ -33,7 +33,7 @@ class TreeViewItem;
 #include <tqstring.h>
 #include <tqobject.h>
 #include <tqvaluevector.h>
-class QDomElement;
+class TQDomElement;
 
 #include <vector>
 #include <iostream>
diff --git a/klinkstatus/src/engine/searchmanager.h b/klinkstatus/src/engine/searchmanager.h
index 4dc68352..5f2410ac 100644
--- a/klinkstatus/src/engine/searchmanager.h
+++ b/klinkstatus/src/engine/searchmanager.h
@@ -28,7 +28,7 @@
 #include <tqdatetime.h>
 #include <tqregexp.h>
 #include <tqmap.h>
-class QDomElement;
+class TQDomElement;
 
 #include <vector>
 
diff --git a/klinkstatus/src/global.h b/klinkstatus/src/global.h
index 6f94c482..d93e17f4 100644
--- a/klinkstatus/src/global.h
+++ b/klinkstatus/src/global.h
@@ -13,7 +13,7 @@
 #define GLOBAL_H
 
 #include <tqobject.h>
-class QCString;
+class TQCString;
 
 class DCOPClient;
 class KURL;
diff --git a/klinkstatus/src/klinkstatus_part.h b/klinkstatus/src/klinkstatus_part.h
index 857a6a93..e1968d6d 100644
--- a/klinkstatus/src/klinkstatus_part.h
+++ b/klinkstatus/src/klinkstatus_part.h
@@ -26,8 +26,8 @@
 class TabWidgetSession;
 class ActionManager;
 
-class QWidget;
-class QPainter;
+class TQWidget;
+class TQPainter;
 
 class KURL;
 class KAboutData;
diff --git a/klinkstatus/src/parser/mstring.h b/klinkstatus/src/parser/mstring.h
index 198850db..808fe060 100644
--- a/klinkstatus/src/parser/mstring.h
+++ b/klinkstatus/src/parser/mstring.h
@@ -26,7 +26,7 @@
 #include <vector>
 #include <cctype>
 
-class QString;
+class TQString;
 
 typedef unsigned int uint;
 
diff --git a/klinkstatus/src/ui/sessionwidget.h b/klinkstatus/src/ui/sessionwidget.h
index 6b5e631d..ad6136b6 100644
--- a/klinkstatus/src/ui/sessionwidget.h
+++ b/klinkstatus/src/ui/sessionwidget.h
@@ -31,8 +31,8 @@ class LinkMatcher;
 
 #include <tqtimer.h>
 #include <tqstring.h>
-class QStringList;
-class QListViewItem;
+class TQStringList;
+class TQListViewItem;
 
 class KURL;
 class KConfig;
diff --git a/klinkstatus/src/ui/tablelinkstatus.h b/klinkstatus/src/ui/tablelinkstatus.h
index cb003209..3f7b5cb9 100644
--- a/klinkstatus/src/ui/tablelinkstatus.h
+++ b/klinkstatus/src/ui/tablelinkstatus.h
@@ -26,7 +26,7 @@
 #include <tqcolor.h>
 #include <tqpopupmenu.h>
 #include <tqvaluevector.h>
-class QStringList;
+class TQStringList;
 
 class KURL;
 
diff --git a/klinkstatus/src/ui/tabwidgetsession.h b/klinkstatus/src/ui/tabwidgetsession.h
index 90b755b6..52ec3ccd 100644
--- a/klinkstatus/src/ui/tabwidgetsession.h
+++ b/klinkstatus/src/ui/tabwidgetsession.h
@@ -24,7 +24,7 @@
 #include <kurl.h>
 
 #include <tqintdict.h>
-class QToolButton;
+class TQToolButton;
 
 class SessionWidget;
 class LinkStatus;
diff --git a/kommander/editor/actioneditorimpl.h b/kommander/editor/actioneditorimpl.h
index d6ad72fb..f6436d31 100644
--- a/kommander/editor/actioneditorimpl.h
+++ b/kommander/editor/actioneditorimpl.h
@@ -23,7 +23,7 @@
 
 #include "actioneditor.h"
 
-class QAction;
+class TQAction;
 class FormWindow;
 class ActionItem;
 
diff --git a/kommander/editor/command.h b/kommander/editor/command.h
index 0c86fc63..a2162dca 100644
--- a/kommander/editor/command.h
+++ b/kommander/editor/command.h
@@ -33,22 +33,22 @@
 #include <tqptrlist.h>
 #include <tqmap.h>
 
-class QWizard;
-class QTabWidget;
+class TQWizard;
+class TQTabWidget;
 class Command;
-class QWidget;
+class TQWidget;
 class FormWindow;
 class PropertyEditor;
-class QListBox;
-class QIconView;
-class QMultiLineEdit;
-class QTable;
-class QAction;
+class TQListBox;
+class TQIconView;
+class TQMultiLineEdit;
+class TQTable;
+class TQAction;
 class QDesignerToolBar;
-class QMainWindow;
+class TQMainWindow;
 class QDesignerPopupMenu;
 class QDesignerMenuBar;
-class QToolBox;
+class TQToolBox;
 
 class Command : public Qt
 {
diff --git a/kommander/editor/connectioneditorimpl.h b/kommander/editor/connectioneditorimpl.h
index 116e4b42..35a3445b 100644
--- a/kommander/editor/connectioneditorimpl.h
+++ b/kommander/editor/connectioneditorimpl.h
@@ -26,7 +26,7 @@
 
 #include <tqmap.h>
 
-class QListViewItem;
+class TQListViewItem;
 class FormWindow;
 
 class ConnectionEditor : public ConnectionEditorBase
diff --git a/kommander/editor/filechooser.h b/kommander/editor/filechooser.h
index f051eea4..aa60518f 100644
--- a/kommander/editor/filechooser.h
+++ b/kommander/editor/filechooser.h
@@ -3,8 +3,8 @@
 
 #include <tqwidget.h>
 
-class QLineEdit;
-class QPushButton;
+class TQLineEdit;
+class TQPushButton;
 
 class FileChooser : public QWidget
 {
diff --git a/kommander/editor/formwindow.cpp b/kommander/editor/formwindow.cpp
index 631def85..2b97dd3b 100644
--- a/kommander/editor/formwindow.cpp
+++ b/kommander/editor/formwindow.cpp
@@ -239,7 +239,7 @@ void FormWindow::beginUnclippedPainter(bool doNot)
   endUnclippedPainter();
   bool unclipped = testWFlags(WPaintUnclipped);
   setWFlags(WPaintUnclipped);
-  unclippedPainter = new QPainter;
+  unclippedPainter = new TQPainter;
   unclippedPainter->begin(this);
   if (!unclipped)
     clearWFlags(WPaintUnclipped);
diff --git a/kommander/editor/formwindow.h b/kommander/editor/formwindow.h
index 611e543d..fd0964e7 100644
--- a/kommander/editor/formwindow.h
+++ b/kommander/editor/formwindow.h
@@ -33,20 +33,20 @@
 #include <tqwidgetlist.h>
 #include <tqmap.h>
 
-class QPaintEvent;
-class QMouseEvent;
-class QKeyEvent;
-class QPainter;
-class QLabel;
+class TQPaintEvent;
+class TQMouseEvent;
+class TQKeyEvent;
+class TQPainter;
+class TQLabel;
 class MainWindow;
-class QTimer;
-class QFocusEvent;
-class QCloseEvent;
+class TQTimer;
+class TQFocusEvent;
+class TQCloseEvent;
 class Resource;
-class QResizeEvent;
+class TQResizeEvent;
 class BreakLayoutCommand;
-class QPixmap;
-class QSizeGrip;
+class TQPixmap;
+class TQSizeGrip;
 class FormFile;
 
 #if defined(Q_FULL_TEMPLATE_INSTANTIATION)
diff --git a/kommander/editor/hierarchyview.h b/kommander/editor/hierarchyview.h
index debdf6a6..8e833962 100644
--- a/kommander/editor/hierarchyview.h
+++ b/kommander/editor/hierarchyview.h
@@ -28,12 +28,12 @@
 #include <private/qcom_p.h>
 
 class FormWindow;
-class QCloseEvent;
-class QPopupMenu;
-class QKeyEvent;
-class QMouseEvent;
-class QWizard;
-class QToolBox;
+class TQCloseEvent;
+class TQPopupMenu;
+class TQKeyEvent;
+class TQMouseEvent;
+class TQWizard;
+class TQToolBox;
 
 class HierarchyItem:public QListViewItem
 {
diff --git a/kommander/editor/layout.h b/kommander/editor/layout.h
index e9874ca6..c8b85a3a 100644
--- a/kommander/editor/layout.h
+++ b/kommander/editor/layout.h
@@ -29,7 +29,7 @@
 #include <tqwidgetlist.h>
 
 class FormWindow;
-class QPaintEvent;
+class TQPaintEvent;
 
 class Layout : public QObject
 {
diff --git a/kommander/editor/listboxeditorimpl.h b/kommander/editor/listboxeditorimpl.h
index 8177feb5..41bcc8a7 100644
--- a/kommander/editor/listboxeditorimpl.h
+++ b/kommander/editor/listboxeditorimpl.h
@@ -21,7 +21,7 @@
 #ifndef LISTBOXEDITOR_H
 #define LISTBOXEDITOR_H
 
-class QListBox;
+class TQListBox;
 class FormWindow;
 
 #include "listboxeditor.h"
diff --git a/kommander/editor/mainwindow.h b/kommander/editor/mainwindow.h
index db685e55..1f4a9346 100644
--- a/kommander/editor/mainwindow.h
+++ b/kommander/editor/mainwindow.h
@@ -44,11 +44,11 @@ class KToggleAction;
 class KToolBar;
 class KURL;
 class PropertyEditor;
-class QCloseEvent;
-class QMenuBar;
-class QTimer;
-class QWidget;
-class QWorkspace;
+class TQCloseEvent;
+class TQMenuBar;
+class TQTimer;
+class TQWidget;
+class TQWorkspace;
 class MessageLog;
 class ReplaceDialog;
 class Workspace;
@@ -56,7 +56,7 @@ class Workspace;
 #if defined(Q_FULL_TEMPLATE_INSTANTIATION)
 #include <tqtoolbar.h>
 #else
-class QToolBar;
+class TQToolBar;
 #endif
 class Preferences;
 
diff --git a/kommander/editor/messagelog.h b/kommander/editor/messagelog.h
index 468a7d23..ef7c8638 100644
--- a/kommander/editor/messagelog.h
+++ b/kommander/editor/messagelog.h
@@ -24,7 +24,7 @@
 class KListBox;
 class KProcess;
 class KPopupMenu;
-class QListBoxItem;
+class TQListBoxItem;
    
 class MessageLog : public QTabWidget
 {
diff --git a/kommander/editor/metadatabase.h b/kommander/editor/metadatabase.h
index 4fd203b8..d5aceff5 100644
--- a/kommander/editor/metadatabase.h
+++ b/kommander/editor/metadatabase.h
@@ -33,8 +33,8 @@
 
 #include "pixmapchooser.h"
 
-class QObject;
-class QPixmap;
+class TQObject;
+class TQPixmap;
 
 class MetaDataBase
 {
diff --git a/kommander/editor/multilineeditorimpl.h b/kommander/editor/multilineeditorimpl.h
index 0f6ff96a..d26c7f78 100644
--- a/kommander/editor/multilineeditorimpl.h
+++ b/kommander/editor/multilineeditorimpl.h
@@ -24,7 +24,7 @@
 #include "multilineeditor.h"
 
 class FormWindow;
-class QMultiLineEdit;
+class TQMultiLineEdit;
 
 class MultiLineEditor : public MultiLineEditorBase
 {
diff --git a/kommander/editor/pics/images.h b/kommander/editor/pics/images.h
index 71009fb6..92094bdb 100644
--- a/kommander/editor/pics/images.h
+++ b/kommander/editor/pics/images.h
@@ -10961,7 +10961,7 @@ static const TQByteArray& qembed_findData( const char* name )
     if ( !ba ) {
 	for ( int i = 0; embed_vec[i].data; i++ ) {
 	    if ( strcmp(embed_vec[i].name, name) == 0 ) {
-		ba = new QByteArray;
+		ba = new TQByteArray;
 		ba->setRawData( (char*)embed_vec[i].data,
 				embed_vec[i].size );
 		dict.insert( name, ba );
diff --git a/kommander/editor/propertyeditor.cpp b/kommander/editor/propertyeditor.cpp
index bb35c570..ed5e68d5 100644
--- a/kommander/editor/propertyeditor.cpp
+++ b/kommander/editor/propertyeditor.cpp
@@ -102,7 +102,7 @@ static void cleanupFontDatabase()
 static TQStringList getFontList()
 {
     if ( !fontDataBase ) {
-	fontDataBase = new QFontDatabase;
+	fontDataBase = new TQFontDatabase;
 	qAddPostRoutine( cleanupFontDatabase );
     }
     return fontDataBase->families();
diff --git a/kommander/editor/propertyeditor.h b/kommander/editor/propertyeditor.h
index f34b7337..42e64e3e 100644
--- a/kommander/editor/propertyeditor.h
+++ b/kommander/editor/propertyeditor.h
@@ -32,17 +32,17 @@
 
 class PropertyList;
 class PropertyEditor;
-class QPainter;
-class QColorGroup;
-class QComboBox;
-class QLineEdit;
-class QPushButton;
-class QHBox;
-class QSpinBox;
-class QLabel;
+class TQPainter;
+class TQColorGroup;
+class TQComboBox;
+class TQLineEdit;
+class TQPushButton;
+class TQHBox;
+class TQSpinBox;
+class TQLabel;
 class FormWindow;
-class QCloseEvent;
-class QResizeEvent;
+class TQCloseEvent;
+class TQResizeEvent;
 class PropertyWhatsThis;
 class QDateEdit;
 class QTimeEdit;
diff --git a/kommander/editor/qcompletionedit.h b/kommander/editor/qcompletionedit.h
index 39518c58..169dacb5 100644
--- a/kommander/editor/qcompletionedit.h
+++ b/kommander/editor/qcompletionedit.h
@@ -4,8 +4,8 @@
 #include <tqlineedit.h>
 #include <tqstringlist.h>
 
-class QListBox;
-class QVBox;
+class TQListBox;
+class TQVBox;
 
 class QCompletionEdit : public QLineEdit
 {
diff --git a/kommander/editor/resource.h b/kommander/editor/resource.h
index e41a9fd7..b01bd233 100644
--- a/kommander/editor/resource.h
+++ b/kommander/editor/resource.h
@@ -30,17 +30,17 @@
 
 #include "metadatabase.h"
 
-class QWidget;
-class QObject;
-class QLayout;
-class QStyle;
-class QPalette;
+class TQWidget;
+class TQObject;
+class TQLayout;
+class TQStyle;
+class TQPalette;
 class FormWindow;
 class MainWindow;
-class QDomElement;
+class TQDomElement;
 class QDesignerGridLayout;
-class QListViewItem;
-class QMainWindow;
+class TQListViewItem;
+class TQMainWindow;
 #ifndef KOMMANDER
 struct LanguageInterface;
 #endif
diff --git a/kommander/editor/sizehandle.h b/kommander/editor/sizehandle.h
index 24413602..50d3ea1c 100644
--- a/kommander/editor/sizehandle.h
+++ b/kommander/editor/sizehandle.h
@@ -25,10 +25,10 @@
 #include <tqintdict.h>
 #include <tqptrdict.h>
 
-class QMouseEvent;
+class TQMouseEvent;
 class FormWindow;
 class WidgetSelection;
-class QPaintEvent;
+class TQPaintEvent;
 
 class SizeHandle : public QWidget
 {
diff --git a/kommander/editor/styledbutton.h b/kommander/editor/styledbutton.h
index ec60c22b..cb5f4e92 100644
--- a/kommander/editor/styledbutton.h
+++ b/kommander/editor/styledbutton.h
@@ -24,8 +24,8 @@
 #include <tqbutton.h>
 #include <tqpixmap.h>
 
-class QColor;
-class QBrush;
+class TQColor;
+class TQBrush;
 class FormWindow;
 
 class StyledButton : public QButton
diff --git a/kommander/editor/tableeditorimpl.h b/kommander/editor/tableeditorimpl.h
index 9d2909c9..5fb1ccc4 100644
--- a/kommander/editor/tableeditorimpl.h
+++ b/kommander/editor/tableeditorimpl.h
@@ -4,8 +4,8 @@
 #include "tableeditor.h"
 #include <tqmap.h>
 
-class QListBoxItem;
-class QTable;
+class TQListBoxItem;
+class TQTable;
 class FormWindow;
 
 class TableEditor : public TableEditorBase
diff --git a/kommander/editor/timestamp.cpp b/kommander/editor/timestamp.cpp
index 659cfcec..e92fc78f 100644
--- a/kommander/editor/timestamp.cpp
+++ b/kommander/editor/timestamp.cpp
@@ -22,7 +22,7 @@
 #include <tqfile.h>
 #include <tqfileinfo.h>
 
-class QTimer;
+class TQTimer;
 
 TimeStamp::TimeStamp( TQObject *parent, const TQString &f )
     : TQObject( parent ), filename( f ), autoCheck( false )
diff --git a/kommander/editor/widgetdatabase.cpp b/kommander/editor/widgetdatabase.cpp
index 940176c1..3661f700 100644
--- a/kommander/editor/widgetdatabase.cpp
+++ b/kommander/editor/widgetdatabase.cpp
@@ -122,8 +122,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/kommander/editor/widgetfactory.h b/kommander/editor/widgetfactory.h
index 68fcc9ea..44cb4f9d 100644
--- a/kommander/editor/widgetfactory.h
+++ b/kommander/editor/widgetfactory.h
@@ -54,8 +54,8 @@
 #include <tabwidget.h>
 #include "toolbox.h"
 
-class QWidget;
-class QLayout;
+class TQWidget;
+class TQLayout;
 class FormWindow;
 
 class WidgetFactory : public Qt
diff --git a/kommander/editor/wizardeditorimpl.h b/kommander/editor/wizardeditorimpl.h
index 8fdf4cce..128aa467 100644
--- a/kommander/editor/wizardeditorimpl.h
+++ b/kommander/editor/wizardeditorimpl.h
@@ -21,7 +21,7 @@
 #ifndef WIZARDEDITORIMPL_H
 #define WIZARDEDITORIMPL_H
 
-class QWizard;
+class TQWizard;
 class FormWindow;
 
 #include <tqptrlist.h>
diff --git a/kommander/editor/workspace.h b/kommander/editor/workspace.h
index 4058fc93..61f772dd 100644
--- a/kommander/editor/workspace.h
+++ b/kommander/editor/workspace.h
@@ -24,11 +24,11 @@
 #include <tqlistview.h>
 
 class FormWindow;
-class QResizeEvent;
-class QCloseEvent;
-class QDropEvent;
-class QDragMoveEvent;
-class QDragEnterEvent;
+class TQResizeEvent;
+class TQCloseEvent;
+class TQDropEvent;
+class TQDragMoveEvent;
+class TQDragEnterEvent;
 class MainWindow;
 #ifndef KOMMANDER
 class Project;
diff --git a/kommander/executor/instance.h b/kommander/executor/instance.h
index 443e8db5..95b52ead 100644
--- a/kommander/executor/instance.h
+++ b/kommander/executor/instance.h
@@ -33,9 +33,9 @@
 #include "dcopkommanderif.h"
 
 /* FORWARD DECLARATIONS */
-class QWidget;
-class QDialog;
-class QFile;
+class TQWidget;
+class TQDialog;
+class TQFile;
 class KommanderWidget;
 
 
diff --git a/kommander/factory/domtool.h b/kommander/factory/domtool.h
index 98e299a2..034cb98e 100644
--- a/kommander/factory/domtool.h
+++ b/kommander/factory/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/kommander/factory/kommanderfactory.h b/kommander/factory/kommanderfactory.h
index 03861c85..ba3d7744 100644
--- a/kommander/factory/kommanderfactory.h
+++ b/kommander/factory/kommanderfactory.h
@@ -31,12 +31,12 @@
 #include <tqaction.h>
 #include "kommander_export.h"
 
-class QWidget;
-class QLayout;
-class QDomElement;
-class QListViewItem;
-class QTable;
-class QIconSet;
+class TQWidget;
+class TQLayout;
+class TQDomElement;
+class TQListViewItem;
+class TQTable;
+class TQIconSet;
 class KommanderPlugin;
 
 struct KommanderWidgetInfo
diff --git a/kommander/part/kommander_part.h b/kommander/part/kommander_part.h
index 7b417a24..1519f6c3 100644
--- a/kommander/part/kommander_part.h
+++ b/kommander/part/kommander_part.h
@@ -19,7 +19,7 @@
 #include <kparts/factory.h>
 
 class Instance;
-class QGridLayout;
+class TQGridLayout;
 
 class KommanderPart : public KParts::ReadOnlyPart
 {
diff --git a/kommander/plugin/kommanderplugin.h b/kommander/plugin/kommanderplugin.h
index b22af6ac..d74abaa4 100644
--- a/kommander/plugin/kommanderplugin.h
+++ b/kommander/plugin/kommanderplugin.h
@@ -39,8 +39,8 @@
 #include <tqstringlist.h>
 #include "kommander_export.h"
 
-class QWidget;
-class QIconSet;
+class TQWidget;
+class TQIconSet;
 
 class KOMMANDER_EXPORT KommanderPlugin : public TQObject 
 {
diff --git a/kommander/widgets/buttongroup.h b/kommander/widgets/buttongroup.h
index f5a01be3..67252a5c 100644
--- a/kommander/widgets/buttongroup.h
+++ b/kommander/widgets/buttongroup.h
@@ -28,9 +28,9 @@
 #include <kommanderwidget.h>
 #include <kommander_export.h>
 
-class QWidget;
+class TQWidget;
 
-class QShowEvent;
+class TQShowEvent;
 class KOMMANDER_EXPORT ButtonGroup : public TQButtonGroup, public KommanderWidget
 {
   Q_OBJECT
diff --git a/kommander/widgets/checkbox.h b/kommander/widgets/checkbox.h
index f3da677f..4dde80de 100644
--- a/kommander/widgets/checkbox.h
+++ b/kommander/widgets/checkbox.h
@@ -28,9 +28,9 @@
 #include <kommanderwidget.h>
 #include <kommander_export.h>
 
-class QWidget;
+class TQWidget;
 
-class QShowEvent;
+class TQShowEvent;
 class KOMMANDER_EXPORT CheckBox : public TQCheckBox, public KommanderWidget
 {
   Q_OBJECT
diff --git a/kommander/widgets/closebutton.h b/kommander/widgets/closebutton.h
index 20c44eac..42ff3627 100644
--- a/kommander/widgets/closebutton.h
+++ b/kommander/widgets/closebutton.h
@@ -27,9 +27,9 @@
 /* OTHER INCLUDES */
 #include <kommanderwidget.h>
 #include <kommander_export.h>
-class QWidget;
+class TQWidget;
 
-class QShowEvent;
+class TQShowEvent;
 class KOMMANDER_EXPORT CloseButton : public KPushButton, public KommanderWidget
 {
   Q_OBJECT
diff --git a/kommander/widgets/combobox.h b/kommander/widgets/combobox.h
index 6dd4fb71..5fb5306d 100644
--- a/kommander/widgets/combobox.h
+++ b/kommander/widgets/combobox.h
@@ -28,9 +28,9 @@
 #include <kcombobox.h>
 #include <kommanderwidget.h>
 #include <kommander_export.h>
-class QWidget;
+class TQWidget;
 
-class QShowEvent;
+class TQShowEvent;
 class KOMMANDER_EXPORT ComboBox : public KComboBox, public KommanderWidget
 {
   Q_OBJECT
diff --git a/kommander/widgets/datepicker.h b/kommander/widgets/datepicker.h
index 242f1a65..61644f92 100644
--- a/kommander/widgets/datepicker.h
+++ b/kommander/widgets/datepicker.h
@@ -28,9 +28,9 @@
 #include <kdatepicker.h>
 #include <kommanderwidget.h>
 #include <kommander_export.h>
-class QWidget;
+class TQWidget;
 
-class QShowEvent;
+class TQShowEvent;
 class KOMMANDER_EXPORT DatePicker : public KDatePicker, public KommanderWidget
 {
   Q_OBJECT
diff --git a/kommander/widgets/dialog.h b/kommander/widgets/dialog.h
index 794e5dbc..90fa11c1 100644
--- a/kommander/widgets/dialog.h
+++ b/kommander/widgets/dialog.h
@@ -25,7 +25,7 @@
 /* OTHER INCLUDES */
 #include <kommanderwindow.h>
 #include <kommander_export.h>
-class QShowEvent;
+class TQShowEvent;
 class KOMMANDER_EXPORT Dialog : public TQDialog, public KommanderWindow
 {
   Q_OBJECT
diff --git a/kommander/widgets/execbutton.h b/kommander/widgets/execbutton.h
index 925fa498..b646e5e7 100644
--- a/kommander/widgets/execbutton.h
+++ b/kommander/widgets/execbutton.h
@@ -28,11 +28,11 @@
 #include <kommanderwidget.h>
 #include <kommander_export.h>
 
-class QWidget;
+class TQWidget;
 class KProcess;
 class MyProcess;
 
-class QShowEvent;
+class TQShowEvent;
 class KOMMANDER_EXPORT ExecButton : public KPushButton, public KommanderWidget
 {
   Q_OBJECT
diff --git a/kommander/widgets/fileselector.h b/kommander/widgets/fileselector.h
index c80648e0..44758131 100644
--- a/kommander/widgets/fileselector.h
+++ b/kommander/widgets/fileselector.h
@@ -28,11 +28,11 @@
 #include <kommanderwidget.h>
 #include <kommander_export.h>
 
-class QBoxLayout;
+class TQBoxLayout;
 class KPushButton;
 class KLineEdit;
 
-class QShowEvent;
+class TQShowEvent;
 class KOMMANDER_EXPORT FileSelector : public TQWidget, public KommanderWidget
 {
   Q_OBJECT
diff --git a/kommander/widgets/groupbox.h b/kommander/widgets/groupbox.h
index 47889416..b624cd15 100644
--- a/kommander/widgets/groupbox.h
+++ b/kommander/widgets/groupbox.h
@@ -28,9 +28,9 @@
 /* OTHER INCLUDES */
 #include <kommanderwidget.h>
 #include <kommander_export.h>
-class QWidget;
+class TQWidget;
 
-class QShowEvent;
+class TQShowEvent;
 class KOMMANDER_EXPORT GroupBox : public TQGroupBox, public KommanderWidget
 {
   Q_OBJECT
diff --git a/kommander/widgets/konsole.h b/kommander/widgets/konsole.h
index feddbbac..894060f9 100644
--- a/kommander/widgets/konsole.h
+++ b/kommander/widgets/konsole.h
@@ -26,7 +26,7 @@
 /* OTHER INCLUDES */
 #include <kommanderwidget.h>
 
-class QWidget;
+class TQWidget;
 class MyProcess;
 
 class KOMMANDER_EXPORT Konsole : public KTextEdit, public KommanderWidget
diff --git a/kommander/widgets/label.h b/kommander/widgets/label.h
index 8ce4b58c..70b8b248 100644
--- a/kommander/widgets/label.h
+++ b/kommander/widgets/label.h
@@ -27,9 +27,9 @@
 #include <kommanderwidget.h>
 #include <tqlabel.h>
 
-class QWidget;
+class TQWidget;
 
-class QShowEvent;
+class TQShowEvent;
 class KOMMANDER_EXPORT Label : public TQLabel, public KommanderWidget
 {
   Q_OBJECT
diff --git a/kommander/widgets/lineedit.h b/kommander/widgets/lineedit.h
index 05fb79c4..d0ee32f5 100644
--- a/kommander/widgets/lineedit.h
+++ b/kommander/widgets/lineedit.h
@@ -29,7 +29,7 @@
 #include <kommanderwidget.h>
 
 #include <kommander_export.h>
-class QShowEvent;
+class TQShowEvent;
 
 class KOMMANDER_EXPORT LineEdit : public KLineEdit, public KommanderWidget
 {
diff --git a/kommander/widgets/listbox.h b/kommander/widgets/listbox.h
index ebd5784f..dd59bc3b 100644
--- a/kommander/widgets/listbox.h
+++ b/kommander/widgets/listbox.h
@@ -28,9 +28,9 @@
 #include <kommanderwidget.h>
 #include <klistbox.h>
 #include <kommander_export.h>
-class QWidget;
+class TQWidget;
 
-class QShowEvent;
+class TQShowEvent;
 class KOMMANDER_EXPORT ListBox : public KListBox, public KommanderWidget
 {
   Q_OBJECT
diff --git a/kommander/widgets/pixmaplabel.h b/kommander/widgets/pixmaplabel.h
index a9ba9ca9..dbc3e113 100644
--- a/kommander/widgets/pixmaplabel.h
+++ b/kommander/widgets/pixmaplabel.h
@@ -28,9 +28,9 @@
 #include <kommanderwidget.h>
 #include <tqlabel.h>
 
-class QWidget;
+class TQWidget;
 
-class QShowEvent;
+class TQShowEvent;
 class KOMMANDER_EXPORT PixmapLabel : public TQLabel, public KommanderWidget
 {
   Q_OBJECT
diff --git a/kommander/widgets/progressbar.h b/kommander/widgets/progressbar.h
index d54e1185..ca5daf8c 100644
--- a/kommander/widgets/progressbar.h
+++ b/kommander/widgets/progressbar.h
@@ -27,9 +27,9 @@
 #include <kprogress.h>
 #include <kommanderwidget.h>
 
-class QWidget;
+class TQWidget;
 
-class QShowEvent;
+class TQShowEvent;
 class KOMMANDER_EXPORT ProgressBar: public KProgress, public KommanderWidget
 {
   Q_OBJECT
diff --git a/kommander/widgets/radiobutton.h b/kommander/widgets/radiobutton.h
index 88dcdcb1..e93a96af 100644
--- a/kommander/widgets/radiobutton.h
+++ b/kommander/widgets/radiobutton.h
@@ -27,9 +27,9 @@
 /* OTHER INCLUDES */
 #include <kommanderwidget.h>
 #include <kommander_export.h>
-class QWidget;
+class TQWidget;
 
-class QShowEvent;
+class TQShowEvent;
 class KOMMANDER_EXPORT RadioButton : public TQRadioButton, public KommanderWidget
 {
 	Q_OBJECT
diff --git a/kommander/widgets/richtexteditor.h b/kommander/widgets/richtexteditor.h
index 5a0ab8d6..17faf6b5 100644
--- a/kommander/widgets/richtexteditor.h
+++ b/kommander/widgets/richtexteditor.h
@@ -28,12 +28,12 @@
 #include <kommander_export.h>
 
 /* Forward Decls */
-class QTextEdit;
-class QFrame;
-class QToolButton;
-class QHButtonGroup;
+class TQTextEdit;
+class TQFrame;
+class TQToolButton;
+class TQHButtonGroup;
 
-class QShowEvent;
+class TQShowEvent;
 class KOMMANDER_EXPORT RichTextEditor : public TQWidget, public KommanderWidget
 {
 	Q_OBJECT
diff --git a/kommander/widgets/slider.h b/kommander/widgets/slider.h
index 365abe3c..1ed39a8b 100644
--- a/kommander/widgets/slider.h
+++ b/kommander/widgets/slider.h
@@ -26,7 +26,7 @@
 /* OTHER INCLUDES */
 #include <kommanderwidget.h>
 #include <kommander_export.h>
-class QShowEvent;
+class TQShowEvent;
 class KOMMANDER_EXPORT Slider: public TQSlider, public KommanderWidget
 {
   Q_OBJECT Q_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
diff --git a/kommander/widgets/spinboxint.h b/kommander/widgets/spinboxint.h
index ffd135e7..214692fe 100644
--- a/kommander/widgets/spinboxint.h
+++ b/kommander/widgets/spinboxint.h
@@ -27,9 +27,9 @@
 /* OTHER INCLUDES */
 #include <kommanderwidget.h>
 #include <kommander_export.h>
-class QWidget;
+class TQWidget;
 
-class QShowEvent;
+class TQShowEvent;
 class KOMMANDER_EXPORT SpinBoxInt : public TQSpinBox, public KommanderWidget
 {
   Q_OBJECT
diff --git a/kommander/widgets/statusbar.h b/kommander/widgets/statusbar.h
index 30b9beae..0971b1ce 100644
--- a/kommander/widgets/statusbar.h
+++ b/kommander/widgets/statusbar.h
@@ -27,9 +27,9 @@
 #include <kstatusbar.h>
 #include <kommanderwidget.h>
 
-class QWidget;
+class TQWidget;
 
-class QShowEvent;
+class TQShowEvent;
 class KOMMANDER_EXPORT StatusBar : public KStatusBar, public KommanderWidget
 {
   Q_OBJECT
diff --git a/kommander/widgets/subdialog.h b/kommander/widgets/subdialog.h
index 941455ca..c61eda15 100644
--- a/kommander/widgets/subdialog.h
+++ b/kommander/widgets/subdialog.h
@@ -27,10 +27,10 @@
 /* OTHER INCLUDES */
 #include <kommanderwidget.h>
 #include <kommander_export.h>
-class QWidget;
-class QDialog;
+class TQWidget;
+class TQDialog;
 
-class QShowEvent;
+class TQShowEvent;
 class KOMMANDER_EXPORT SubDialog : public TQPushButton, public KommanderWidget
 {
   Q_OBJECT
diff --git a/kommander/widgets/table.h b/kommander/widgets/table.h
index c2ec755e..1539597d 100644
--- a/kommander/widgets/table.h
+++ b/kommander/widgets/table.h
@@ -26,7 +26,7 @@
 /* OTHER INCLUDES */
 #include <kommanderwidget.h>
 
-class QWidget;
+class TQWidget;
 
 class KOMMANDER_EXPORT Table : public TQTable, public KommanderWidget
 {
diff --git a/kommander/widgets/tabwidget.h b/kommander/widgets/tabwidget.h
index 87376279..3bae4d0a 100644
--- a/kommander/widgets/tabwidget.h
+++ b/kommander/widgets/tabwidget.h
@@ -24,7 +24,7 @@
 /* OTHER INCLUDES */
 #include <kommanderwidget.h>
 #include <kommander_export.h>
-class QShowEvent;
+class TQShowEvent;
 class KOMMANDER_EXPORT TabWidget : public TQTabWidget, public KommanderWidget
 {
   Q_OBJECT
diff --git a/kommander/widgets/textbrowser.h b/kommander/widgets/textbrowser.h
index e640bb3f..3a106fcf 100644
--- a/kommander/widgets/textbrowser.h
+++ b/kommander/widgets/textbrowser.h
@@ -26,7 +26,7 @@
 /* OTHER INCLUDES */
 #include <kommanderwidget.h>
 
-class QShowEvent;
+class TQShowEvent;
 class KOMMANDER_EXPORT TextBrowser: public KTextBrowser, public KommanderWidget
 {
   Q_OBJECT
diff --git a/kommander/widgets/textedit.h b/kommander/widgets/textedit.h
index 4f118ffd..3132e315 100644
--- a/kommander/widgets/textedit.h
+++ b/kommander/widgets/textedit.h
@@ -28,7 +28,7 @@
 #include <kommanderwidget.h>
 #include <kommander_export.h>
 
-class QShowEvent;
+class TQShowEvent;
 class KOMMANDER_EXPORT TextEdit: public KTextEdit, public KommanderWidget
 {
   Q_OBJECT Q_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
diff --git a/kommander/widgets/timer.h b/kommander/widgets/timer.h
index 8d200f2f..095c7dac 100644
--- a/kommander/widgets/timer.h
+++ b/kommander/widgets/timer.h
@@ -23,7 +23,7 @@
 /* OTHER INCLUDES */
 #include <kommanderwidget.h>
 
-class QTimer;
+class TQTimer;
 class KOMMANDER_EXPORT Timer : public TQLabel, public KommanderWidget
 {
   Q_OBJECT
diff --git a/kommander/widgets/treewidget.h b/kommander/widgets/treewidget.h
index 28da108e..3988c9a8 100644
--- a/kommander/widgets/treewidget.h
+++ b/kommander/widgets/treewidget.h
@@ -29,9 +29,9 @@
 #include <kommanderwidget.h>
 #include <kommander_export.h>
 
-class QWidget;
+class TQWidget;
 
-class QShowEvent;
+class TQShowEvent;
 class KOMMANDER_EXPORT TreeWidget : public KListView, public KommanderWidget
 {
   Q_OBJECT
diff --git a/kommander/widgets/wizard.h b/kommander/widgets/wizard.h
index 131c6dd6..6852fc77 100644
--- a/kommander/widgets/wizard.h
+++ b/kommander/widgets/wizard.h
@@ -26,7 +26,7 @@
 #include <kommander_export.h>
 #include <myprocess.h>
 
-class QShowEvent;
+class TQShowEvent;
 class KOMMANDER_EXPORT Wizard : public TQWizard, public KommanderWidget
 {
   Q_OBJECT
diff --git a/kommander/working/plugintemplate/widget.h b/kommander/working/plugintemplate/widget.h
index 1ec87a5e..22638875 100644
--- a/kommander/working/plugintemplate/widget.h
+++ b/kommander/working/plugintemplate/widget.h
@@ -9,7 +9,7 @@
 
 #include <kommanderwidget.h>
 
-class QStringList;
+class TQStringList;
 
 //replace TQWidget with the widget you want to derive from
 class %{APPNAME}: public TQWidget, public KommanderWidget
diff --git a/kxsldbg/kxsldbgpart/kxsldbg_part.h b/kxsldbg/kxsldbgpart/kxsldbg_part.h
index 117452ef..0b57ee75 100644
--- a/kxsldbg/kxsldbgpart/kxsldbg_part.h
+++ b/kxsldbg/kxsldbgpart/kxsldbg_part.h
@@ -12,27 +12,27 @@
 #include <ktexteditor/document.h> 
 #include <ktexteditor/view.h> 
 
-class QVBoxLayout;
-class QHBoxLayout;
-class QGridLayout;
-class QAction;
-class QActionGroup;
-class QToolBar;
-class QPopupMenu;
-class QTextBrowser;
-class QLineEdit;
-class QDockWindow;
-class QWidgetStack;
+class TQVBoxLayout;
+class TQHBoxLayout;
+class TQGridLayout;
+class TQAction;
+class TQActionGroup;
+class TQToolBar;
+class TQPopupMenu;
+class TQTextBrowser;
+class TQLineEdit;
+class TQDockWindow;
+class TQWidgetStack;
 
 class XsldbgBrkStatusView;
 class QXsldbgDoc;
 class XsldbgOutputView;
 class XsldbgConfigImpl;
 
-class QWidget;
-class QPainter;
+class TQWidget;
+class TQPainter;
 class KURL;
-class QMultiLineEdit;
+class TQMultiLineEdit;
 class KAboutData;
 
 typedef TQDict<QXsldbgDoc> XsldbgDocDict;
diff --git a/kxsldbg/kxsldbgpart/libqtnotfier/xsldbgdebuggerbase.h b/kxsldbg/kxsldbgpart/libqtnotfier/xsldbgdebuggerbase.h
index fddc6034..df4f17fa 100644
--- a/kxsldbg/kxsldbgpart/libqtnotfier/xsldbgdebuggerbase.h
+++ b/kxsldbg/kxsldbgpart/libqtnotfier/xsldbgdebuggerbase.h
@@ -35,8 +35,8 @@
 #include <libxml/tree.h>
 
 class XsldbgEvent;
-class QApplication;
-class QStringList;
+class TQApplication;
+class TQStringList;
 
 /** 
     We delegate the task of emitting our signals to XsldbgEvent , so 
diff --git a/kxsldbg/kxsldbgpart/xsldbgdebugger.h b/kxsldbg/kxsldbgpart/xsldbgdebugger.h
index b4be5b5e..7cc64845 100644
--- a/kxsldbg/kxsldbgpart/xsldbgdebugger.h
+++ b/kxsldbg/kxsldbgpart/xsldbgdebugger.h
@@ -29,7 +29,7 @@
   *@author Keith Isdale
   */
 
-class QStringList;
+class TQStringList;
 
 class XsldbgWalkSpeedImpl;
 
diff --git a/kxsldbg/kxsldbgpart/xsldbginspector.h b/kxsldbg/kxsldbgpart/xsldbginspector.h
index 3b69a9e0..60e4a59f 100644
--- a/kxsldbg/kxsldbgpart/xsldbginspector.h
+++ b/kxsldbg/kxsldbgpart/xsldbginspector.h
@@ -10,14 +10,14 @@
 
 #include <tqvariant.h>
 #include <tqdialog.h>
-class QVBoxLayout;
-class QHBoxLayout;
-class QGridLayout;
-class QListBox;
-class QListBoxItem;
-class QPushButton;
-class QTabWidget;
-class QWidget;
+class TQVBoxLayout;
+class TQHBoxLayout;
+class TQGridLayout;
+class TQListBox;
+class TQListBoxItem;
+class TQPushButton;
+class TQTabWidget;
+class TQWidget;
 class KPushButton;
 
 class XsldbgDebugger;
diff --git a/kxsldbg/kxsldbgpart/xsldbgoutputview.h b/kxsldbg/kxsldbgpart/xsldbgoutputview.h
index 0ae11fec..3c4c453a 100644
--- a/kxsldbg/kxsldbgpart/xsldbgoutputview.h
+++ b/kxsldbg/kxsldbgpart/xsldbgoutputview.h
@@ -24,7 +24,7 @@
 #include <tqtextedit.h>
 #include <tqmessagebox.h>
 
-class QDialog;
+class TQDialog;
 class XsldbgMsgDialogImpl;
 
 class XsldbgOutputView : public TQTextEdit {
diff --git a/lib/compatibility/kmdi/qextmdi/kdockwidget.h b/lib/compatibility/kmdi/qextmdi/kdockwidget.h
index 849669ce..9c738d3c 100644
--- a/lib/compatibility/kmdi/qextmdi/kdockwidget.h
+++ b/lib/compatibility/kmdi/qextmdi/kdockwidget.h
@@ -75,17 +75,17 @@ class KDockWidgetPrivate;
 class KDockWidgetHeaderPrivate;
 class KDockArea;
 
-class QObjectList;
-class QPopupMenu;
-class QVBoxLayout;
-class QHBoxLayout;
-class QPixmap;
+class TQObjectList;
+class TQPopupMenu;
+class TQVBoxLayout;
+class TQHBoxLayout;
+class TQPixmap;
 
 #ifndef NO_KDE2
 class KToolBar;
 class KConfig;
 #else
-class QToolBar;
+class TQToolBar;
 #endif
 
 class KDockContainer;
diff --git a/lib/compatibility/kmdi/qextmdi/kdockwidget_private.h b/lib/compatibility/kmdi/qextmdi/kdockwidget_private.h
index 4ea30bd4..327471ed 100644
--- a/lib/compatibility/kmdi/qextmdi/kdockwidget_private.h
+++ b/lib/compatibility/kmdi/qextmdi/kdockwidget_private.h
@@ -30,7 +30,7 @@
 #include <netwm_def.h>
 #endif
 
-class QFrame;
+class TQFrame;
 class KDockContainer;
 
 
diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildfrm.h b/lib/compatibility/kmdi/qextmdi/kmdichildfrm.h
index c6d1a618..23435479 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdichildfrm.h
+++ b/lib/compatibility/kmdi/qextmdi/kmdichildfrm.h
@@ -41,8 +41,8 @@
 
 class KMdiChildArea;
 class KMdiChildView;
-class QPopupMenu;
-class QToolButton;
+class TQPopupMenu;
+class TQToolButton;
 
 //==============================================================================
 /**
diff --git a/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.h b/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.h
index e13b7371..cb0d6e4c 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.h
+++ b/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.h
@@ -30,7 +30,7 @@
 
 #include <tqpushbutton.h>
 
-class QWidgetStack;
+class TQWidgetStack;
 class KMultiTabBar;
 class KDockButton_Private;
 
diff --git a/lib/compatibility/kmdi/qextmdi/kmdilistiterator.h b/lib/compatibility/kmdi/qextmdi/kmdilistiterator.h
index 04c8af3b..40e4aef2 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdilistiterator.h
+++ b/lib/compatibility/kmdi/qextmdi/kmdilistiterator.h
@@ -30,9 +30,9 @@
 #include <kmdiiterator.h>
 
 template <class I>
-class QPtrList;
+class TQPtrList;
 template <class I>
-class QPtrListIterator;
+class TQPtrListIterator;
 
 template <class Item>
 class KMdiListIterator : public KMdiIterator<Item*>
diff --git a/lib/compatibility/kmdi/qextmdi/kmdimainfrm.h b/lib/compatibility/kmdi/qextmdi/kmdimainfrm.h
index 9de6d8b7..68322f69 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdimainfrm.h
+++ b/lib/compatibility/kmdi/qextmdi/kmdimainfrm.h
@@ -49,12 +49,12 @@
 #include "kmdinulliterator.h"
 #include "kmditoolviewaccessor.h"
 
-class QTimer;
-class QPopupMenu;
-class QMenuBar;
+class TQTimer;
+class TQPopupMenu;
+class TQMenuBar;
 
 
-class QToolButton;
+class TQToolButton;
 
 namespace KMDIPrivate
 {
diff --git a/lib/compatibility/kmdi/qextmdi/kmultitabbar.h b/lib/compatibility/kmdi/qextmdi/kmultitabbar.h
index a0731c01..575c3c65 100644
--- a/lib/compatibility/kmdi/qextmdi/kmultitabbar.h
+++ b/lib/compatibility/kmdi/qextmdi/kmultitabbar.h
@@ -35,9 +35,9 @@
 
 #include <kdelibs_export.h>
 
-class QPixmap;
-class QPainter;
-class QFrame;
+class TQPixmap;
+class TQPainter;
+class TQFrame;
 
 class KMultiTabBarPrivate;
 class KMultiTabBarTabPrivate;
diff --git a/lib/compatibility/kmdi/qextmdi/ktabbar.h b/lib/compatibility/kmdi/qextmdi/ktabbar.h
index c8f81169..a1928aab 100644
--- a/lib/compatibility/kmdi/qextmdi/ktabbar.h
+++ b/lib/compatibility/kmdi/qextmdi/ktabbar.h
@@ -25,8 +25,8 @@
 
 #include <kdelibs_export.h>
 
-class QTimer;
-class QPushButton;
+class TQTimer;
+class TQPushButton;
 class KTabBarPrivate;
 
 /**
diff --git a/lib/compatibility/knewstuff/downloaddialog.h b/lib/compatibility/knewstuff/downloaddialog.h
index 81f88de4..75fafae4 100644
--- a/lib/compatibility/knewstuff/downloaddialog.h
+++ b/lib/compatibility/knewstuff/downloaddialog.h
@@ -29,8 +29,8 @@ namespace KIO
 }
 
 class KListView;
-class QTextBrowser;
-class QFrame;
+class TQTextBrowser;
+class TQFrame;
 class KNewStuffGeneric;
 
 namespace KNS
diff --git a/lib/compatibility/knewstuff/knewstuff.h b/lib/compatibility/knewstuff/knewstuff.h
index 2f266a0b..455063a3 100644
--- a/lib/compatibility/knewstuff/knewstuff.h
+++ b/lib/compatibility/knewstuff/knewstuff.h
@@ -24,8 +24,8 @@
 
 #include <kdemacros.h>
 
-class QObject;
-class QWidget;
+class TQObject;
+class TQWidget;
 class KAction;
 class KActionCollection;
 
diff --git a/lib/compatibility/knewstuff/uploaddialog.h b/lib/compatibility/knewstuff/uploaddialog.h
index a289da11..cd14cbca 100644
--- a/lib/compatibility/knewstuff/uploaddialog.h
+++ b/lib/compatibility/knewstuff/uploaddialog.h
@@ -22,11 +22,11 @@
 
 #include <kdialogbase.h>
 
-class QLineEdit;
-class QSpinBox;
+class TQLineEdit;
+class TQSpinBox;
 class KURLRequester;
-class QTextEdit;
-class QComboBox;
+class TQTextEdit;
+class TQComboBox;
 
 namespace KNS {
 
diff --git a/quanta/components/csseditor/csseditor.cpp b/quanta/components/csseditor/csseditor.cpp
index 553d5478..5393d875 100644
--- a/quanta/components/csseditor/csseditor.cpp
+++ b/quanta/components/csseditor/csseditor.cpp
@@ -48,11 +48,11 @@
 
 
 myCheckListItem::myCheckListItem(TQListView * parent, const TQString & text):TQCheckListItem(parent, text, TQCheckListItem::CheckBox),m_checkedChildren(0){
-  m_sig = new QSignal;
+  m_sig = new TQSignal;
 }
 
 myCheckListItem::myCheckListItem(TQCheckListItem * parent, const TQString & text):TQCheckListItem(parent, text, TQCheckListItem::CheckBox),m_checkedChildren(0){
-  m_sig = new QSignal;
+  m_sig = new TQSignal;
 }
 
 myCheckListItem::~myCheckListItem(){
diff --git a/quanta/components/csseditor/csseditor.h b/quanta/components/csseditor/csseditor.h
index 3bb44228..e54667f5 100644
--- a/quanta/components/csseditor/csseditor.h
+++ b/quanta/components/csseditor/csseditor.h
@@ -28,9 +28,9 @@
 class propertySetter;
 class KConfig;
 class KHTMLPart;
-class QListViewItem;
-class QDomNodeList;
-class QVariant;
+class TQListViewItem;
+class TQDomNodeList;
+class TQVariant;
 class QMyHighlighter;
 
 
diff --git a/quanta/components/csseditor/cssselector.h b/quanta/components/csseditor/cssselector.h
index a569929a..2c0fe426 100644
--- a/quanta/components/csseditor/cssselector.h
+++ b/quanta/components/csseditor/cssselector.h
@@ -22,8 +22,8 @@
 #include <tqpair.h>
 #include "cssselectors.h"
 
-class QListViewItem;
-class QStringList;
+class TQListViewItem;
+class TQStringList;
 /**
   *@author gulmini luciano
   */
diff --git a/quanta/components/csseditor/doubleeditors.h b/quanta/components/csseditor/doubleeditors.h
index ed3b91cd..4797f7c7 100644
--- a/quanta/components/csseditor/doubleeditors.h
+++ b/quanta/components/csseditor/doubleeditors.h
@@ -20,8 +20,8 @@
 
  class mySpinBox;
  class specialSB;
- class QSpinBox;
- class QComboBox;
+ class TQSpinBox;
+ class TQComboBox;
 
 class doubleEditorBase : public miniEditor {
     Q_OBJECT
diff --git a/quanta/components/csseditor/fontfamilychooser.h b/quanta/components/csseditor/fontfamilychooser.h
index fa5c947e..d67ce92d 100644
--- a/quanta/components/csseditor/fontfamilychooser.h
+++ b/quanta/components/csseditor/fontfamilychooser.h
@@ -19,7 +19,7 @@
 
 #include "fontfamilychoosers.h"
 #include <tqmap.h>
-class QStringList;
+class TQStringList;
 
 class fontFamilyChooser : public fontFamilyChooserS
 {
diff --git a/quanta/components/csseditor/shorthandformer.h b/quanta/components/csseditor/shorthandformer.h
index 8673c01e..b0bb3224 100644
--- a/quanta/components/csseditor/shorthandformer.h
+++ b/quanta/components/csseditor/shorthandformer.h
@@ -24,8 +24,8 @@
 @author Gulmini Luciano
 */
 #include <tqmap.h>
-class QString;
-class QStringList;
+class TQString;
+class TQStringList;
 
 class ShorthandFormer{
 public:
diff --git a/quanta/components/csseditor/tlpeditors.h b/quanta/components/csseditor/tlpeditors.h
index 28881573..8388c6b6 100644
--- a/quanta/components/csseditor/tlpeditors.h
+++ b/quanta/components/csseditor/tlpeditors.h
@@ -22,8 +22,8 @@
 #include "propertysetter.h"
 
 class KPushButton;
-class QLineEdit;
-class QLabel;
+class TQLineEdit;
+class TQLabel;
 /**
   *@author gulmini luciano
   */
diff --git a/quanta/components/cvsservice/cvsservice.h b/quanta/components/cvsservice/cvsservice.h
index 70d9c66a..9cfc1328 100644
--- a/quanta/components/cvsservice/cvsservice.h
+++ b/quanta/components/cvsservice/cvsservice.h
@@ -25,7 +25,7 @@
 //own includes
 #include "cvsservicedcopif.h"
 
-class QTimer;
+class TQTimer;
 class KPopupMenu;
 class KActionCollection;
 class CvsJob_stub;
diff --git a/quanta/components/framewizard/framewizard.h b/quanta/components/framewizard/framewizard.h
index 6a5c3a54..42386982 100644
--- a/quanta/components/framewizard/framewizard.h
+++ b/quanta/components/framewizard/framewizard.h
@@ -20,7 +20,7 @@
 
 #include <framewizards.h>
 #include "visualframeeditor.h"
-class QStringList;
+class TQStringList;
 
 /** FrameWizard is the base class of the project */
 class FrameWizard : public FrameWizardS
diff --git a/quanta/components/tableeditor/tableeditor.h b/quanta/components/tableeditor/tableeditor.h
index 15393b9c..4748414e 100644
--- a/quanta/components/tableeditor/tableeditor.h
+++ b/quanta/components/tableeditor/tableeditor.h
@@ -21,8 +21,8 @@
 #include "tableeditors.h"
 #include "document.h"
 
-class QSpinBox;
-class QTable;
+class TQSpinBox;
+class TQTable;
 class KPopupMenu;
 class Tag;
 struct DTDStruct;
diff --git a/quanta/dialogs/actionconfigdialog.h b/quanta/dialogs/actionconfigdialog.h
index d58567ee..6eaa9746 100644
--- a/quanta/dialogs/actionconfigdialog.h
+++ b/quanta/dialogs/actionconfigdialog.h
@@ -18,8 +18,8 @@
 #include <tqmap.h>
 #include "actionconfigdialogs.h"
 
-class QDomDocument;
-class QPopupMenu;
+class TQDomDocument;
+class TQPopupMenu;
 
 class KAction;
 class KMainWindow;
diff --git a/quanta/dialogs/dirtydlg.h b/quanta/dialogs/dirtydlg.h
index 4f71f64e..ec457d25 100644
--- a/quanta/dialogs/dirtydlg.h
+++ b/quanta/dialogs/dirtydlg.h
@@ -24,7 +24,7 @@ class DirtyDialog;
 class KDialogBase;
 
 class KProcess;
-class QCloseEvent;
+class TQCloseEvent;
 
 class DirtyDlg : public KDialogBase  {
    Q_OBJECT
diff --git a/quanta/dialogs/filecombo.h b/quanta/dialogs/filecombo.h
index 9ec8198c..6991243b 100644
--- a/quanta/dialogs/filecombo.h
+++ b/quanta/dialogs/filecombo.h
@@ -25,8 +25,8 @@
   *@author Dmitry Poplavsky & Alexander Yakovlev & Eric Laffoon & Andras Mantia
   */
 
-class QComboBox;
-class QPushButton;
+class TQComboBox;
+class TQPushButton;
 class KURL;
 
 class FileCombo : public TQWidget  {
diff --git a/quanta/dialogs/settings/abbreviation.h b/quanta/dialogs/settings/abbreviation.h
index 24db8e3b..d2ba7ea6 100644
--- a/quanta/dialogs/settings/abbreviation.h
+++ b/quanta/dialogs/settings/abbreviation.h
@@ -20,7 +20,7 @@
 
 #include <abbreviations.h>
 
-class QListViewItem;
+class TQListViewItem;
 class Abbreviation;
 struct DTDStruct;
 
diff --git a/quanta/dialogs/tagdialogs/listdlg.h b/quanta/dialogs/tagdialogs/listdlg.h
index 7b84e032..ea455d70 100644
--- a/quanta/dialogs/tagdialogs/listdlg.h
+++ b/quanta/dialogs/tagdialogs/listdlg.h
@@ -18,9 +18,9 @@
 
 #include <kdialogbase.h>
 
-class QPushButton;
-class QString;
-class QStringList;
+class TQPushButton;
+class TQString;
+class TQStringList;
 class KListBox;
 
 /**Select an item from a list. The list is given in
diff --git a/quanta/dialogs/tagdialogs/pictureview.h b/quanta/dialogs/tagdialogs/pictureview.h
index 1688314d..59a71609 100644
--- a/quanta/dialogs/tagdialogs/pictureview.h
+++ b/quanta/dialogs/tagdialogs/pictureview.h
@@ -20,7 +20,7 @@
 
 #include <tqwidget.h>
 #include <tqframe.h>
-class QImage;
+class TQImage;
 
 /**Class for images preview
 used by TagImgDlg
diff --git a/quanta/dialogs/tagdialogs/tagattr.h b/quanta/dialogs/tagdialogs/tagattr.h
index 2741a10c..bbd562c6 100644
--- a/quanta/dialogs/tagdialogs/tagattr.h
+++ b/quanta/dialogs/tagdialogs/tagattr.h
@@ -32,8 +32,8 @@
 #include "colorcombo.h"
 #include "filecombo.h"
 
-class QDomElement;
-class QWidget;
+class TQDomElement;
+class TQWidget;
 class QTag;
 
 
diff --git a/quanta/dialogs/tagdialogs/tagdialog.h b/quanta/dialogs/tagdialogs/tagdialog.h
index 3575c8e5..c715085f 100644
--- a/quanta/dialogs/tagdialogs/tagdialog.h
+++ b/quanta/dialogs/tagdialogs/tagdialog.h
@@ -35,7 +35,7 @@ class Tagxml;
 class QTag;
 class Tag;
 class KURL;
-class QShowEvent;
+class TQShowEvent;
 
 class TagDialog : public TQTabDialog  {
    Q_OBJECT
diff --git a/quanta/dialogs/tagdialogs/tagimgdlg.h b/quanta/dialogs/tagdialogs/tagimgdlg.h
index 73730c84..9f67d0f9 100644
--- a/quanta/dialogs/tagdialogs/tagimgdlg.h
+++ b/quanta/dialogs/tagdialogs/tagimgdlg.h
@@ -31,8 +31,8 @@
 #include "qtag.h"
 
 class PictureView;
-class QSpinBox;
-class QImage;
+class TQSpinBox;
+class TQImage;
 
 /**
   *@author Dmitry Poplavsky & Yacovlev Alexander
diff --git a/quanta/dialogs/tagdialogs/tagquicklistdlg.h b/quanta/dialogs/tagdialogs/tagquicklistdlg.h
index 90ea666b..15f0f21d 100644
--- a/quanta/dialogs/tagdialogs/tagquicklistdlg.h
+++ b/quanta/dialogs/tagdialogs/tagquicklistdlg.h
@@ -21,11 +21,11 @@
 #include <tqwidget.h>
 
 #include <tqdialog.h>
-class QLabel;
-class QSpinBox;
-class QPushButton;
-class QRadioButton;
-class QButtonGroup;
+class TQLabel;
+class TQSpinBox;
+class TQPushButton;
+class TQRadioButton;
+class TQButtonGroup;
 
 /**
   *@author Dmitry Poplavsky & Yacovlev Alexander
diff --git a/quanta/dialogs/tagdialogs/tagwidget.h b/quanta/dialogs/tagdialogs/tagwidget.h
index 83508aab..b73c6782 100644
--- a/quanta/dialogs/tagdialogs/tagwidget.h
+++ b/quanta/dialogs/tagdialogs/tagwidget.h
@@ -20,10 +20,10 @@
 #include <tqwidget.h>
 #include <tqdict.h>
 
-class QComboBox;
-class QLineEdit;
-class QSpinBox;
-class QCheckBox;
+class TQComboBox;
+class TQLineEdit;
+class TQSpinBox;
+class TQCheckBox;
 class KColorButton;
 class KURL;
 
diff --git a/quanta/messages/annotationoutput.h b/quanta/messages/annotationoutput.h
index 50e293d6..51c08ead 100644
--- a/quanta/messages/annotationoutput.h
+++ b/quanta/messages/annotationoutput.h
@@ -19,9 +19,9 @@
 @author Andras Mantia
 */
 
-class QDomDocument;
-class QListViewItem;
-class QTimer;
+class TQDomDocument;
+class TQListViewItem;
+class TQTimer;
 
 class KListView;
 class KListViewItem;
diff --git a/quanta/parsers/dtd/dtdparser.h b/quanta/parsers/dtd/dtdparser.h
index 77c608ee..800fa445 100644
--- a/quanta/parsers/dtd/dtdparser.h
+++ b/quanta/parsers/dtd/dtdparser.h
@@ -20,7 +20,7 @@
 
 //forward declarations
 class KURL;
-class QString;
+class TQString;
 struct Attribute;
 
 /** libxml2 based XML DTD parser and DTEP creation class*/
diff --git a/quanta/parsers/node.h b/quanta/parsers/node.h
index 87d54141..4e3451af 100644
--- a/quanta/parsers/node.h
+++ b/quanta/parsers/node.h
@@ -23,8 +23,8 @@
 #include <tqmap.h>
 #include <dom/dom_node.h>
 
-class QDomElement;
-class QListViewItem;
+class TQDomElement;
+class TQListViewItem;
 
 class Tag;
 class Node;
diff --git a/quanta/parsers/parser.h b/quanta/parsers/parser.h
index 94f24aff..8c4b2335 100644
--- a/quanta/parsers/parser.h
+++ b/quanta/parsers/parser.h
@@ -34,7 +34,7 @@
 
 class Document;
 class KDirWatch;
-class QRegExp;
+class TQRegExp;
 class NodeModifsSet;
 class SAParser;
 
diff --git a/quanta/parsers/sagroupparser.h b/quanta/parsers/sagroupparser.h
index 6cc15311..1045cc74 100644
--- a/quanta/parsers/sagroupparser.h
+++ b/quanta/parsers/sagroupparser.h
@@ -21,7 +21,7 @@
 #include <tqobject.h>
 
 //forward definitions
-class QTimer;
+class TQTimer;
 class Document;
 class Node;
 class SAParser;
diff --git a/quanta/parsers/saparser.h b/quanta/parsers/saparser.h
index c59a01bc..74b00b3e 100644
--- a/quanta/parsers/saparser.h
+++ b/quanta/parsers/saparser.h
@@ -28,9 +28,9 @@
 //forward definitions
 struct DTDStruct;
 class Document;
-class QString;
-class QStringList;
-class QTimer;
+class TQString;
+class TQStringList;
+class TQTimer;
 class KDirWatch;
 class SAGroupParser;
 
diff --git a/quanta/parsers/tag.h b/quanta/parsers/tag.h
index 43ed610a..de7e0123 100644
--- a/quanta/parsers/tag.h
+++ b/quanta/parsers/tag.h
@@ -19,7 +19,7 @@
 #include <tqstring.h>
 #include <tqdict.h>
 #include <tqvaluelist.h>
-class QDomElement;
+class TQDomElement;
 
 #include "qtag.h"
 
diff --git a/quanta/parts/kafka/domtreeview.h b/quanta/parts/kafka/domtreeview.h
index 60c6fed3..e8899b59 100644
--- a/quanta/parts/kafka/domtreeview.h
+++ b/quanta/parts/kafka/domtreeview.h
@@ -28,8 +28,8 @@
 #include <dom/dom_core.h>
 #include <tqdialog.h>
 
-class QString;
-class QGridLayout;
+class TQString;
+class TQGridLayout;
 
 /**
  * This class is very useful to see the DOM tree in a KListView
diff --git a/quanta/parts/kafka/kafkahtmlpart.h b/quanta/parts/kafka/kafkahtmlpart.h
index 52a7b031..53a872dc 100644
--- a/quanta/parts/kafka/kafkahtmlpart.h
+++ b/quanta/parts/kafka/kafkahtmlpart.h
@@ -36,7 +36,7 @@ class DOMString;
 class KafkaWidgetPrivate;
 class KafkaDocument;
 class NodeModifsSet;
-class QPopupMenu;
+class TQPopupMenu;
 
 /*
  * It is the main central widget which get the cursor focus and takes care of "simple" edition
diff --git a/quanta/plugins/quantaplugin.h b/quanta/plugins/quantaplugin.h
index fb01477c..e3cd1758 100644
--- a/quanta/plugins/quantaplugin.h
+++ b/quanta/plugins/quantaplugin.h
@@ -25,7 +25,7 @@
 #include <tqguardedptr.h>
 #include <tqobject.h>
 
-class QString;
+class TQString;
 
 /**Base class for quanta plugins
   *@author Marc Britton
diff --git a/quanta/plugins/quantapluginconfig.h b/quanta/plugins/quantapluginconfig.h
index 7fa81750..26cf53e5 100644
--- a/quanta/plugins/quantapluginconfig.h
+++ b/quanta/plugins/quantapluginconfig.h
@@ -25,7 +25,7 @@ class KDialogBase;
   *@author Marc Britton
   */
 
-class QString;
+class TQString;
 
 class QuantaPluginConfig : public KDialogBase
 {
diff --git a/quanta/plugins/quantaplugineditor.h b/quanta/plugins/quantaplugineditor.h
index 88da3cfc..9f66e519 100644
--- a/quanta/plugins/quantaplugineditor.h
+++ b/quanta/plugins/quantaplugineditor.h
@@ -34,8 +34,8 @@
   */
 
 /* FORWARD DECLARATIONS */
-class QWidget;
-class QListView;
+class TQWidget;
+class TQListView;
 class KDialogBase;
 class PluginEditor;
 
diff --git a/quanta/project/eventconfigurationdlg.h b/quanta/project/eventconfigurationdlg.h
index 170a681c..c1451c81 100644
--- a/quanta/project/eventconfigurationdlg.h
+++ b/quanta/project/eventconfigurationdlg.h
@@ -19,7 +19,7 @@
 
 #include "eventconfigurationdlgs.h"
 
-class QDomDocument;
+class TQDomDocument;
 class KActionCollection;
 struct EventAction;
 typedef  TQMap<TQString, TQValueList<EventAction> > EventActions;
diff --git a/quanta/project/eventeditordlg.h b/quanta/project/eventeditordlg.h
index 86ef5d08..9f89a09c 100644
--- a/quanta/project/eventeditordlg.h
+++ b/quanta/project/eventeditordlg.h
@@ -20,7 +20,7 @@
 
 #include "eventeditordlgs.h"
 
-class QLabel;
+class TQLabel;
 class KActionCollection;
 class KComboBox;
 
diff --git a/quanta/project/projectlist.h b/quanta/project/projectlist.h
index 87593daf..7106e142 100644
--- a/quanta/project/projectlist.h
+++ b/quanta/project/projectlist.h
@@ -20,7 +20,7 @@
 #include "projecturl.h"
 #include "qextfileinfo.h"
 
-class QDomDocument;
+class TQDomDocument;
 
 
 /**
diff --git a/quanta/project/projectprivate.h b/quanta/project/projectprivate.h
index e09977a2..a0b37fa3 100644
--- a/quanta/project/projectprivate.h
+++ b/quanta/project/projectprivate.h
@@ -28,7 +28,7 @@
 #include "projectlist.h"
 #include "projectupload.h"
 
-class QWidgetStack;
+class TQWidgetStack;
 
 class KAction;
 class KActionCollection;
diff --git a/quanta/project/uploadprofiles.h b/quanta/project/uploadprofiles.h
index b04c376d..db83e125 100644
--- a/quanta/project/uploadprofiles.h
+++ b/quanta/project/uploadprofiles.h
@@ -22,7 +22,7 @@
 #include <kurl.h>
 
 
-class QObject;
+class TQObject;
 
 /**
        @short The internal representation of upload profiles.
diff --git a/quanta/src/document.h b/quanta/src/document.h
index ac5e3f84..b812ddb9 100644
--- a/quanta/src/document.h
+++ b/quanta/src/document.h
@@ -34,11 +34,11 @@
   *@author Dmitry Poplavsky & Alexander Yakovlev & Eric Laffoon & Andras Mantia
   */
 
-class QDomDocument;
-class QEvent;
-class QFocusEvent;
-class QTextCodec;
-class QStringList;
+class TQDomDocument;
+class TQEvent;
+class TQFocusEvent;
+class TQTextCodec;
+class TQStringList;
 class KConfig;
 class KTempFile;
 class KURL;
diff --git a/quanta/src/dtds.h b/quanta/src/dtds.h
index a56da5b1..120157a8 100644
--- a/quanta/src/dtds.h
+++ b/quanta/src/dtds.h
@@ -32,11 +32,11 @@
 #include <kdebug.h>
 
 
-class QDomNode;
-class QDomDocument;
+class TQDomNode;
+class TQDomDocument;
 class QTag;
-class QString;
-class QStringList;
+class TQString;
+class TQStringList;
 class KConfig;
 struct DTDStruct;
 
diff --git a/quanta/src/quanta.cpp b/quanta/src/quanta.cpp
index 55be7e18..07e2ae26 100644
--- a/quanta/src/quanta.cpp
+++ b/quanta/src/quanta.cpp
@@ -2272,7 +2272,7 @@ void QuantaApp::slotLoadToolbarFile(const KURL& url)
    guiFactory()->addClient(toolbarGUI);
 
    //Plug in the actions & build the menu
-   TQPopupMenu *menu = new QPopupMenu;
+   TQPopupMenu *menu = new TQPopupMenu;
    KAction *action;
    nodeList = toolbarGUI->domDocument().elementsByTagName("Action");
    for (uint i = 0; i < nodeList.count(); i++)
@@ -2318,7 +2318,7 @@ void QuantaApp::showToolbarFile(const KURL &url)
   } else
   {
     TQDomNodeList nodeList;
-    TQPopupMenu *menu = new QPopupMenu;
+    TQPopupMenu *menu = new TQPopupMenu;
     KAction *action;
     KActionCollection *ac = actionCollection();
     nodeList = p_toolbar->guiClient->domDocument().elementsByTagName("Action");
@@ -2631,7 +2631,7 @@ void QuantaApp::slotAddToolbar()
   p_toolbar->user = true;
   p_toolbar->visible = true;
   p_toolbar->nameModified = false;
-  p_toolbar->menu = new QPopupMenu;
+  p_toolbar->menu = new TQPopupMenu;
   p_toolbar->id = toolbarId;
   m_tagsMenu->insertItem(p_toolbar->name, p_toolbar->menu);
   m_toolbarList.insert(toolbarId, p_toolbar);
diff --git a/quanta/src/quanta.h b/quanta/src/quanta.h
index a29ba1f4..7bb5bde3 100644
--- a/quanta/src/quanta.h
+++ b/quanta/src/quanta.h
@@ -62,11 +62,11 @@ class QNewTemplateStuff;
 class QNewScriptStuff;
 class QNewDocStuff;
 
-class QTabWidget;
-class QWidgetStack;
-class QListViewItem;
+class TQTabWidget;
+class TQWidgetStack;
+class TQListViewItem;
 
-class QPopupMenu;
+class TQPopupMenu;
 
 class WHTMLPart;
 class KHTMLView;
@@ -89,7 +89,7 @@ class EnhancedTagAttributeTree;
 class Project;
 class AnnotationOutput;
 class MessageOutput;
-class QDomDocument;
+class TQDomDocument;
 class Document;
 class DebuggerManager;
 class QuantaInit;
diff --git a/quanta/src/quantaview.h b/quanta/src/quantaview.h
index f8033133..e3688d93 100644
--- a/quanta/src/quantaview.h
+++ b/quanta/src/quantaview.h
@@ -36,9 +36,9 @@ class ToolbarTabWidget;
 class KafkaDocument;
 class QuantaPlugin;
 
-class QSplitter;
+class TQSplitter;
 class KURL;
-class QGridLayout;
+class TQGridLayout;
 
 namespace DOM
 {
@@ -49,7 +49,7 @@ namespace KTextEditor
 {
   class Mark;
 }
-class QSplitter;
+class TQSplitter;
 class Node;
 
 /** The QuantaView class provides the view widget for the QuantaApp
diff --git a/quanta/treeviews/basetreeview.h b/quanta/treeviews/basetreeview.h
index 2ec49022..75dbaf9d 100644
--- a/quanta/treeviews/basetreeview.h
+++ b/quanta/treeviews/basetreeview.h
@@ -30,12 +30,12 @@
 #include "quantacommon.h"
 
 //foward declarations
-class QListViewItem;
-class QString;
-class QPixmap;
-class QPoint;
-class QRegExp;
-class QCloseEvent;
+class TQListViewItem;
+class TQString;
+class TQPixmap;
+class TQPoint;
+class TQRegExp;
+class TQCloseEvent;
 
 class KAction;
 class KFileItem;
diff --git a/quanta/treeviews/filestreeview.h b/quanta/treeviews/filestreeview.h
index 7522b74e..1b9e6068 100644
--- a/quanta/treeviews/filestreeview.h
+++ b/quanta/treeviews/filestreeview.h
@@ -25,8 +25,8 @@
 #include "basetreeview.h"
 
 //foward declarations
-class QListViewItem;
-class QPoint;
+class TQListViewItem;
+class TQPoint;
 class KPopupMenu;
 class KURL;
 
diff --git a/quanta/treeviews/servertreeview.h b/quanta/treeviews/servertreeview.h
index d0c9c3db..162540e0 100644
--- a/quanta/treeviews/servertreeview.h
+++ b/quanta/treeviews/servertreeview.h
@@ -22,8 +22,8 @@
 #include "basetreeview.h"
 
 //foward declarations
-class QListViewItem;
-class QPoint;
+class TQListViewItem;
+class TQPoint;
 class KPopupMenu;
 class KURL;
 class ProjectList;
diff --git a/quanta/treeviews/structtreeview.h b/quanta/treeviews/structtreeview.h
index 2d87f038..45150579 100644
--- a/quanta/treeviews/structtreeview.h
+++ b/quanta/treeviews/structtreeview.h
@@ -30,7 +30,7 @@
 class KPopupMenu;
 class KConfig;
 class KURL;
-class QTime;
+class TQTime;
 
 class Node;
 class StructTreeTag;
diff --git a/quanta/treeviews/tagattributeitems.h b/quanta/treeviews/tagattributeitems.h
index 2ff774d9..81f5cb43 100644
--- a/quanta/treeviews/tagattributeitems.h
+++ b/quanta/treeviews/tagattributeitems.h
@@ -21,9 +21,9 @@ class KColorCombo;
 class KURLRequester;
 class KListView;
 class KListViewItem;
-class QListViewItem;
-class QLineEdit;
-class QComboBox;
+class TQListViewItem;
+class TQLineEdit;
+class TQComboBox;
 
 class Attribute;
 class EditableTree;
diff --git a/quanta/treeviews/tagattributetree.h b/quanta/treeviews/tagattributetree.h
index c07db51b..f396589f 100644
--- a/quanta/treeviews/tagattributetree.h
+++ b/quanta/treeviews/tagattributetree.h
@@ -24,12 +24,12 @@
 //app includes
 
 class KListView;
-class QListViewItem;
+class TQListViewItem;
 class ParentItem;
 class Node;
-class QLabel;
+class TQLabel;
 class KPushButton;
-class QGridLayout;
+class TQGridLayout;
 
 class EditableTree : public KListView {
 Q_OBJECT
diff --git a/quanta/utility/quantabookmarks.h b/quanta/utility/quantabookmarks.h
index 5170a774..440f4fea 100644
--- a/quanta/utility/quantabookmarks.h
+++ b/quanta/utility/quantabookmarks.h
@@ -35,8 +35,8 @@ class Document;
 class KAction;
 class KToggleAction;
 class KActionCollection;
-class QPopupMenu;
-class QMenuData;
+class TQPopupMenu;
+class TQMenuData;
 
 
 
diff --git a/quanta/utility/quantacommon.h b/quanta/utility/quantacommon.h
index c9e283fa..ac209570 100644
--- a/quanta/utility/quantacommon.h
+++ b/quanta/utility/quantacommon.h
@@ -28,11 +28,11 @@
 
 #define DEFAULT_DTD TQString("-//W3C//DTD HTML 4.01 Transitional//EN")
 
-class QString;
+class TQString;
 class DCOPReply;
 class KURL;
 class KStandardDirs;
-class QWidget;
+class TQWidget;
 class Tag;
 
 class KConfig;
diff --git a/quanta/utility/resource.h b/quanta/utility/resource.h
index 72160dac..6e7bf950 100644
--- a/quanta/utility/resource.h
+++ b/quanta/utility/resource.h
@@ -22,7 +22,7 @@
 class KDirWatch;
 class KProgress;
 class QuantaApp;
-class QStringList;
+class TQStringList;
 class KTempFile;
 class KTempDir;
 
diff --git a/quanta/utility/tagaction.h b/quanta/utility/tagaction.h
index 56fcde0e..b24addac 100644
--- a/quanta/utility/tagaction.h
+++ b/quanta/utility/tagaction.h
@@ -28,9 +28,9 @@
 class KMainWindow;
 class QuantaView;
 class KProcess;
-class QDomElement;
-class QFile;
-class QTimer;
+class TQDomElement;
+class TQFile;
+class TQTimer;
 class MessageOutput;
 class Node;
 class NodeModifsSet;
diff --git a/quanta/utility/tagactionmanager.h b/quanta/utility/tagactionmanager.h
index 6f5968c8..0977d32c 100644
--- a/quanta/utility/tagactionmanager.h
+++ b/quanta/utility/tagactionmanager.h
@@ -25,7 +25,7 @@ class Node;
 }
 
 #include <tqptrlist.h>
-class QWidget;
+class TQWidget;
 
 class TagActionSetAbstract;
 class TagActionSet;
diff --git a/quanta/utility/tagactionset.h b/quanta/utility/tagactionset.h
index b5a962c5..00d3341f 100644
--- a/quanta/utility/tagactionset.h
+++ b/quanta/utility/tagactionset.h
@@ -25,7 +25,7 @@ class Node;
 class KActionSeparator;
 
 #include <tqobject.h>
-class QWidget;
+class TQWidget;
 class KActionSet;
 class KActionMenu;
 
diff --git a/quanta/utility/toolbartabwidget.h b/quanta/utility/toolbartabwidget.h
index 2fcc6718..6be17eda 100644
--- a/quanta/utility/toolbartabwidget.h
+++ b/quanta/utility/toolbartabwidget.h
@@ -18,10 +18,10 @@
 #include <tqwidget.h>
 #include <tqmap.h>
 
-class QTabWidget;
+class TQTabWidget;
 class KPopupMenu;
-class QWidgetStack;
-class QTabBar;
+class TQWidgetStack;
+class TQTabBar;
 class KToolBar;
 
 class ToolbarTabWidget: public QTabWidget