TQt conversion fixes

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

128 files changed, 253 insertions, 253 deletions

diff --git a/arts/builder/createtool.cpp b/arts/builder/createtool.cpp
index a08515f3..77781483 100644
--- a/arts/builder/createtool.cpp
+++ b/arts/builder/createtool.cpp
@@ -92,7 +92,7 @@ void CreateTool::mouseMoveEvent(TQMouseEvent *e)
 	mwidget->repaint(componentRect);
 	componentRect = TQRect(cellx, celly, cellx2 - cellx, celly2 - celly);
 
-	TQPainter *p = new QPainter;
+	TQPainter *p = new TQPainter;
 
 	p->begin(mwidget);
 	p->save();
diff --git a/arts/builder/execdlg.cpp b/arts/builder/execdlg.cpp
index ccd1ae40..6d2ea2bf 100644
--- a/arts/builder/execdlg.cpp
+++ b/arts/builder/execdlg.cpp
@@ -89,7 +89,7 @@ ExecDlg::ExecDlg(TQWidget *parent, ExecutableStructure *structure)
 
 //	sliders, controlpanels
 
-	sliderlayout = new QVBoxLayout;
+	sliderlayout = new TQVBoxLayout;
 	mainlayout->addLayout(sliderlayout);
 
 #if 0 /* PORT */
@@ -107,7 +107,7 @@ ExecDlg::ExecDlg(TQWidget *parent, ExecutableStructure *structure)
 
 // buttons
 
-	TQHBoxLayout *buttonlayout = new QHBoxLayout;
+	TQHBoxLayout *buttonlayout = new TQHBoxLayout;
 	mainlayout->addSpacing(5);
 	mainlayout->addLayout(buttonlayout);
 	mainlayout->addSpacing(5);
diff --git a/arts/builder/interfacedlg.cpp b/arts/builder/interfacedlg.cpp
index a96a1b35..706576d1 100644
--- a/arts/builder/interfacedlg.cpp
+++ b/arts/builder/interfacedlg.cpp
@@ -46,7 +46,7 @@ InterfaceDlg::InterfaceDlg(TQWidget *parent) :TQDialog(parent,"Props", TRUE)
 	setCaption(i18n("aRts: Structureport View"));
 
 	TQVBoxLayout *mainlayout = new TQVBoxLayout(this);
-	//TQHBoxLayout *contentslayout = new QHBoxLayout;
+	//TQHBoxLayout *contentslayout = new TQHBoxLayout;
 
 // object type
 /*
@@ -104,7 +104,7 @@ InterfaceDlg::InterfaceDlg(TQWidget *parent) :TQDialog(parent,"Props", TRUE)
 
 // buttons
 
-	TQHBoxLayout *buttonlayout = new QHBoxLayout;
+	TQHBoxLayout *buttonlayout = new TQHBoxLayout;
 	mainlayout->addSpacing(5);
 	mainlayout->addLayout(buttonlayout);
 	mainlayout->addSpacing(5);
diff --git a/arts/builder/portposdlg.cpp b/arts/builder/portposdlg.cpp
index 3584de45..72bd4379 100644
--- a/arts/builder/portposdlg.cpp
+++ b/arts/builder/portposdlg.cpp
@@ -47,7 +47,7 @@ PortPosDlg::PortPosDlg(TQWidget *parent, Structure *structure) :TQDialog(parent,
 	setCaption(i18n("aRts: Structureport View"));
 
 	TQVBoxLayout *mainlayout = new TQVBoxLayout(this);
-	//TQHBoxLayout *contentslayout = new QHBoxLayout;
+	//TQHBoxLayout *contentslayout = new TQHBoxLayout;
 
 // object type
 /*
@@ -103,7 +103,7 @@ PortPosDlg::PortPosDlg(TQWidget *parent, Structure *structure) :TQDialog(parent,
 
 // buttons
 
-	TQHBoxLayout *buttonlayout = new QHBoxLayout;
+	TQHBoxLayout *buttonlayout = new TQHBoxLayout;
 	mainlayout->addSpacing(5);
 	mainlayout->addLayout(buttonlayout);
 	mainlayout->addSpacing(5);
diff --git a/arts/builder/qttableview.h b/arts/builder/qttableview.h
index 9acf0179..ab83d152 100644
--- a/arts/builder/qttableview.h
+++ b/arts/builder/qttableview.h
@@ -21,7 +21,7 @@
 
 #ifndef QT_NO_QTTABLEVIEW
 
-class QScrollBar;
+class TQScrollBar;
 class QCornerSquare;
 
 
diff --git a/arts/builder/retrievedlg.cpp b/arts/builder/retrievedlg.cpp
index 4e091928..57cfde36 100644
--- a/arts/builder/retrievedlg.cpp
+++ b/arts/builder/retrievedlg.cpp
@@ -96,7 +96,7 @@ RetrieveDlg::RetrieveDlg(TQWidget *parent) :TQDialog(parent,"X", TRUE)
 
 // buttons
 
-	TQHBoxLayout *buttonlayout = new QHBoxLayout;
+	TQHBoxLayout *buttonlayout = new TQHBoxLayout;
 	mainlayout->addSpacing(5);
 	mainlayout->addLayout(buttonlayout);
 	mainlayout->addSpacing(5);
diff --git a/arts/builder/scomponent.h b/arts/builder/scomponent.h
index e35b3708..cc65bb39 100644
--- a/arts/builder/scomponent.h
+++ b/arts/builder/scomponent.h
@@ -26,8 +26,8 @@
 #include <list>
 
 class ModulePort;
-class QPainter;
-class QPixmap;
+class TQPainter;
+class TQPixmap;
 
 class StructureCanvas {
 public:
diff --git a/arts/gui/kde/kframe_impl.h b/arts/gui/kde/kframe_impl.h
index 68585b5c..febc0057 100644
--- a/arts/gui/kde/kframe_impl.h
+++ b/arts/gui/kde/kframe_impl.h
@@ -22,7 +22,7 @@
 #define KFRAME_IMPL
 #include "kwidget_impl.h"
 #include <kdelibs_export.h>
-class QFrame;
+class TQFrame;
 
 namespace Arts {
 
diff --git a/arts/gui/kde/khbox_impl.h b/arts/gui/kde/khbox_impl.h
index 7b020b39..d46e47f3 100644
--- a/arts/gui/kde/khbox_impl.h
+++ b/arts/gui/kde/khbox_impl.h
@@ -23,7 +23,7 @@
 
 #include "kframe_impl.h"
 
-class QHBox;
+class TQHBox;
 
 namespace Arts {
 
diff --git a/arts/gui/kde/klayoutbox_impl.h b/arts/gui/kde/klayoutbox_impl.h
index cdebba71..bb5302ea 100644
--- a/arts/gui/kde/klayoutbox_impl.h
+++ b/arts/gui/kde/klayoutbox_impl.h
@@ -28,7 +28,7 @@
 #include <kdelibs_export.h>
 
 class KArtsWidget;
-class QBoxLayout;
+class TQBoxLayout;
 
 namespace Arts {
 
diff --git a/arts/gui/kde/klevelmeter_firebars.h b/arts/gui/kde/klevelmeter_firebars.h
index 5d7ff2d7..da740961 100644
--- a/arts/gui/kde/klevelmeter_firebars.h
+++ b/arts/gui/kde/klevelmeter_firebars.h
@@ -23,7 +23,7 @@
 
 #include "klevelmeter_template.h"
 
-class QPixmap;
+class TQPixmap;
 class KLevelMeter_FireBars;
 
 class KLevelMeter_FireBars_private : public TQWidget {
diff --git a/arts/gui/kde/klevelmeter_impl.h b/arts/gui/kde/klevelmeter_impl.h
index b2f58ce8..6bf175fb 100644
--- a/arts/gui/kde/klevelmeter_impl.h
+++ b/arts/gui/kde/klevelmeter_impl.h
@@ -25,7 +25,7 @@
 
 #include "kframe_impl.h"
 
-class QFrame;
+class TQFrame;
 
 class KLevelMeter_Private;
 
diff --git a/arts/gui/kde/klevelmeter_normalbars.h b/arts/gui/kde/klevelmeter_normalbars.h
index 5705ef5e..b0e1c81a 100644
--- a/arts/gui/kde/klevelmeter_normalbars.h
+++ b/arts/gui/kde/klevelmeter_normalbars.h
@@ -26,7 +26,7 @@
 #include <tqptrlist.h>
 
 class Bar;
-class QBoxLayout;
+class TQBoxLayout;
 
 class KLevelMeter_NormalBars : public KLevelMeter_Template {
    Q_OBJECT
diff --git a/arts/gui/kde/klevelmeter_private.h b/arts/gui/kde/klevelmeter_private.h
index 79fe49b2..213ade38 100644
--- a/arts/gui/kde/klevelmeter_private.h
+++ b/arts/gui/kde/klevelmeter_private.h
@@ -26,7 +26,7 @@
 #include "klevelmeter_impl.h"
 
 class KLevelMeter_Template;
-class QBoxLayout;
+class TQBoxLayout;
 class KArtsWidget;
 
 class KLevelMeter_Private : public TQObject {
diff --git a/arts/gui/kde/kpopupbox_impl.h b/arts/gui/kde/kpopupbox_impl.h
index 782a8d91..ebda82c5 100644
--- a/arts/gui/kde/kpopupbox_impl.h
+++ b/arts/gui/kde/kpopupbox_impl.h
@@ -25,7 +25,7 @@
 #include <kframe_impl.h>
 #include <artsgui.h>
 
-class QBoxLayout;
+class TQBoxLayout;
 class KPopupBox_widget;
 //class KPopupBoxEventMapper; // The EventMapper isn't needed at present, but perhaps in the future...
 
diff --git a/arts/gui/kde/kpopupbox_private.h b/arts/gui/kde/kpopupbox_private.h
index a5072b05..8fb25bea 100644
--- a/arts/gui/kde/kpopupbox_private.h
+++ b/arts/gui/kde/kpopupbox_private.h
@@ -28,7 +28,7 @@ class ShowButton;
 class OwnButton;
 class KArtsWidget;
 class OwnWidget;
-class QBoxLayout;
+class TQBoxLayout;
 
 #include <tqframe.h>
 
diff --git a/arts/gui/kde/kpoti.h b/arts/gui/kde/kpoti.h
index 278d6350..2994dd1e 100644
--- a/arts/gui/kde/kpoti.h
+++ b/arts/gui/kde/kpoti.h
@@ -24,7 +24,7 @@
 #include <tqrangecontrol.h>
 
 
-class QTimer;
+class TQTimer;
 struct QPotiData;
 
 
diff --git a/arts/gui/kde/kvbox_impl.h b/arts/gui/kde/kvbox_impl.h
index 8f9c5b48..03f59705 100644
--- a/arts/gui/kde/kvbox_impl.h
+++ b/arts/gui/kde/kvbox_impl.h
@@ -23,7 +23,7 @@
 
 #include "kframe_impl.h"
 
-class QVBox;
+class TQVBox;
 
 namespace Arts {
 
diff --git a/arts/tools/audiomanager.cpp b/arts/tools/audiomanager.cpp
index 3e3789ae..eff4f6f9 100644
--- a/arts/tools/audiomanager.cpp
+++ b/arts/tools/audiomanager.cpp
@@ -91,7 +91,7 @@ void Gui_AUDIO_MANAGER::setParent(TQWidget *parent, TQBoxLayout * /*layout*/)
  ************************************************************************/
 
 	TQVBoxLayout *mainlayout = new TQVBoxLayout(parent);
-	/*TQHBoxLayout *contentslayout = new QHBoxLayout;*/
+	/*TQHBoxLayout *contentslayout = new TQHBoxLayout;*/
 
 // list
 
diff --git a/arts/tools/audiomanager.h b/arts/tools/audiomanager.h
index 8b08184f..bef1c463 100644
--- a/arts/tools/audiomanager.h
+++ b/arts/tools/audiomanager.h
@@ -32,7 +32,7 @@
 
 class KListView;
 class GuiAudioManagerProxy;
-class QBoxLayout;
+class TQBoxLayout;
 
 class Gui_AUDIO_MANAGER : public Template_ArtsView
 {
diff --git a/arts/tools/choosebusdlg.h b/arts/tools/choosebusdlg.h
index 252226bd..6f1a506d 100644
--- a/arts/tools/choosebusdlg.h
+++ b/arts/tools/choosebusdlg.h
@@ -24,9 +24,9 @@
 
 #include <kdialog.h>
 
-class QListBox;
+class TQListBox;
 class KLineEdit;
-class QPushButton;
+class TQPushButton;
 
 class ChooseBusDlg :public KDialog {
 	Q_OBJECT
diff --git a/arts/tools/environmentview.h b/arts/tools/environmentview.h
index 351a5df0..e4b3b908 100644
--- a/arts/tools/environmentview.h
+++ b/arts/tools/environmentview.h
@@ -28,7 +28,7 @@
 
 #include "templateview.h"
 
-class QListBoxItem;
+class TQListBoxItem;
 class KListBox;
 
 class EnvironmentView : public Template_ArtsView {
diff --git a/arts/tools/fftscopeview.h b/arts/tools/fftscopeview.h
index a6e14f57..945c52e3 100644
--- a/arts/tools/fftscopeview.h
+++ b/arts/tools/fftscopeview.h
@@ -32,7 +32,7 @@
 #include <artsgui.h>
 #include <kdelibs_export.h>
 
-class QTimer;
+class TQTimer;
 class KPopupMenu;
 class KAction;
 class KArtsWidget;
diff --git a/arts/tools/midiinstdlg.cpp b/arts/tools/midiinstdlg.cpp
index f606bbae..97867cd8 100644
--- a/arts/tools/midiinstdlg.cpp
+++ b/arts/tools/midiinstdlg.cpp
@@ -127,7 +127,7 @@ MidiInstDlg::MidiInstDlg(TQWidget *parent)
 
 // buttons
 
-	TQHBoxLayout *buttonlayout = new QHBoxLayout;
+	TQHBoxLayout *buttonlayout = new TQHBoxLayout;
 	mainlayout->addSpacing(5);
 	mainlayout->addLayout(buttonlayout);
 	mainlayout->addSpacing(5);
diff --git a/arts/tools/midiportdlg.cpp b/arts/tools/midiportdlg.cpp
index 8dd71d2b..33ca6bce 100644
--- a/arts/tools/midiportdlg.cpp
+++ b/arts/tools/midiportdlg.cpp
@@ -72,7 +72,7 @@ MidiPortDlg::MidiPortDlg(TQWidget *parent, const char *oldname, const char *titl
 
 // buttons
 
-	TQHBoxLayout *buttonlayout = new QHBoxLayout;
+	TQHBoxLayout *buttonlayout = new TQHBoxLayout;
 	mainlayout->addSpacing(5);
 	mainlayout->addLayout(buttonlayout);
 	mainlayout->addSpacing(5);
diff --git a/arts/tools/statusview.h b/arts/tools/statusview.h
index e1f167ab..ab5ff8e8 100644
--- a/arts/tools/statusview.h
+++ b/arts/tools/statusview.h
@@ -29,9 +29,9 @@
 
 #include "templateview.h"
 
-class QButton;
-class QTimer;
-class QLabel;
+class TQButton;
+class TQTimer;
+class TQLabel;
 
 class ArtsStatusView : public Template_ArtsView {
 	Q_OBJECT
diff --git a/juk/advancedsearchdialog.h b/juk/advancedsearchdialog.h
index 3cfb7163..699d5eb8 100644
--- a/juk/advancedsearchdialog.h
+++ b/juk/advancedsearchdialog.h
@@ -20,8 +20,8 @@
 
 class KLineEdit;
 class KPushButton;
-class QGroupBox;
-class QRadioButton;
+class TQGroupBox;
+class TQRadioButton;
 class SearchLine;
 
 class AdvancedSearchDialog : public KDialogBase
diff --git a/juk/categoryreaderinterface.h b/juk/categoryreaderinterface.h
index 2b037c1a..a7324ae5 100644
--- a/juk/categoryreaderinterface.h
+++ b/juk/categoryreaderinterface.h
@@ -19,9 +19,9 @@
 #include "tagrenameroptions.h"
 
 enum TagType;
-class QString;
+class TQString;
 
-template<class T> class QValueList;
+template<class T> class TQValueList;
 
 /**
  * This class is used to map categories into values.  You should implement the
diff --git a/juk/covermanager.h b/juk/covermanager.h
index a935b810..d7eda155 100644
--- a/juk/covermanager.h
+++ b/juk/covermanager.h
@@ -22,9 +22,9 @@
 #include <tqdragobject.h>
 
 class CoverManagerPrivate;
-class QString;
-class QPixmap;
-class QDataStream;
+class TQString;
+class TQPixmap;
+class TQDataStream;
 
 /**
  * This class holds the data on a cover.  This includes the path to the cover
diff --git a/juk/deletedialog.h b/juk/deletedialog.h
index 4a442b23..34a98a6a 100644
--- a/juk/deletedialog.h
+++ b/juk/deletedialog.h
@@ -21,10 +21,10 @@
 
 #include "deletedialogbase.h"
 
-class QStringList;
+class TQStringList;
 class KListBox;
-class QLabel;
-class QWidgetStack;
+class TQLabel;
+class TQWidgetStack;
 
 class DeleteWidget : public DeleteDialogBase
 {
diff --git a/juk/filehandle.h b/juk/filehandle.h
index 846e3320..bbfd6c67 100644
--- a/juk/filehandle.h
+++ b/juk/filehandle.h
@@ -18,9 +18,9 @@
 
 #include <tqstringlist.h>
 
-class QFileInfo;
-class QDateTime;
-class QDataStream;
+class TQFileInfo;
+class TQDateTime;
+class TQDataStream;
 class CoverInfo;
 
 class Tag;
diff --git a/juk/filerenamer.h b/juk/filerenamer.h
index 66548039..0978a390 100644
--- a/juk/filerenamer.h
+++ b/juk/filerenamer.h
@@ -28,13 +28,13 @@
 #include "playlistitem.h"
 
 class ExampleOptionsDialog;
-class QCheckBox;
-class QLayout;
-class QLayoutItem;
-class QPushButton;
-class QVBox;
+class TQCheckBox;
+class TQLayout;
+class TQLayoutItem;
+class TQPushButton;
+class TQVBox;
 class PlaylistItem;
-class QSignalMapper;
+class TQSignalMapper;
 
 // Used to decide what direction the FileRenamerWidget will move rows in.
 enum MovementDirection { MoveUp, MoveDown };
diff --git a/juk/juk.h b/juk/juk.h
index 0c4ce27a..bdb3499f 100644
--- a/juk/juk.h
+++ b/juk/juk.h
@@ -20,8 +20,8 @@
 
 #include "playermanager.h"
 
-class QTimer;
-class QListViewItem;
+class TQTimer;
+class TQListViewItem;
 
 class KToggleAction;
 class KSelectAction;
diff --git a/juk/k3bexporter.h b/juk/k3bexporter.h
index 7f23fb0e..0c414107 100644
--- a/juk/k3bexporter.h
+++ b/juk/k3bexporter.h
@@ -19,7 +19,7 @@
 #include "playlistexporter.h"
 #include "playlistitem.h"
 
-class QWidget;
+class TQWidget;
 class DCOPRef;
 class PlaylistBox;
 class PlaylistAction;
diff --git a/juk/nowplaying.h b/juk/nowplaying.h
index fb12197d..0a60c278 100644
--- a/juk/nowplaying.h
+++ b/juk/nowplaying.h
@@ -25,8 +25,8 @@
 #include "filehandle.h"
 #include "playlist.h"
 
-class QTimer;
-class QPoint;
+class TQTimer;
+class TQPoint;
 
 class NowPlayingItem;
 class PlaylistCollection;
diff --git a/juk/playermanager.h b/juk/playermanager.h
index fecb6995..c23c0752 100644
--- a/juk/playermanager.h
+++ b/juk/playermanager.h
@@ -19,7 +19,7 @@
 #include "player.h"
 #include "jukIface.h"
 
-class QTimer;
+class TQTimer;
 class KSelectAction;
 class SliderAction;
 class StatusLabel;
diff --git a/juk/playlist.h b/juk/playlist.h
index a221d20e..aa1e1d84 100644
--- a/juk/playlist.h
+++ b/juk/playlist.h
@@ -34,7 +34,7 @@
 class KPopupMenu;
 class KActionMenu;
 
-class QEvent;
+class TQEvent;
 
 class PlaylistCollection;
 class WebImageFetcher;
diff --git a/juk/playlistcollection.h b/juk/playlistcollection.h
index ab35a7dc..3c7eecbd 100644
--- a/juk/playlistcollection.h
+++ b/juk/playlistcollection.h
@@ -25,7 +25,7 @@
 
 #include <tqguardedptr.h>
 
-class QWidgetStack;
+class TQWidgetStack;
 class KAction;
 class Playlist;
 class PlaylistItem;
diff --git a/juk/searchwidget.h b/juk/searchwidget.h
index 577fc1c0..604b289b 100644
--- a/juk/searchwidget.h
+++ b/juk/searchwidget.h
@@ -26,7 +26,7 @@
 #include "playlistsearch.h"
 #include "jukIface.h"
 
-class QCheckBox;
+class TQCheckBox;
 
 class KComboBox;
 
diff --git a/juk/slideraction.h b/juk/slideraction.h
index ead3a93f..2b88c8e3 100644
--- a/juk/slideraction.h
+++ b/juk/slideraction.h
@@ -19,8 +19,8 @@
 #include <kaction.h>
 #include <tqslider.h>
 
-class QBoxLayout;
-class QDockWindow;
+class TQBoxLayout;
+class TQDockWindow;
 
 class VolumeSlider : public QSlider
 {
diff --git a/juk/statuslabel.h b/juk/statuslabel.h
index ba519590..f0a64393 100644
--- a/juk/statuslabel.h
+++ b/juk/statuslabel.h
@@ -20,7 +20,7 @@
 
 #include <tqhbox.h>
 
-class QLabel;
+class TQLabel;
 class KSqueezedTextLabel;
 
 class FileHandle;
diff --git a/juk/systemtray.h b/juk/systemtray.h
index 34e638c8..05b3c6dc 100644
--- a/juk/systemtray.h
+++ b/juk/systemtray.h
@@ -25,8 +25,8 @@
 #include <tqcolor.h>
 
 class FlickerFreeLabel;
-class QTimer;
-class QVBox;
+class TQTimer;
+class TQVBox;
 class FileHandle;
 
 /**
diff --git a/juk/tageditor.h b/juk/tageditor.h
index 1820a179..c62df207 100644
--- a/juk/tageditor.h
+++ b/juk/tageditor.h
@@ -25,8 +25,8 @@ class KEdit;
 class KPushButton;
 class KConfigBase;
 
-class QCheckBox;
-class QBoxLayout;
+class TQCheckBox;
+class TQBoxLayout;
 
 class Playlist;
 class PlaylistItem;
diff --git a/juk/tagguesserconfigdlg.h b/juk/tagguesserconfigdlg.h
index f704eeeb..e0585f07 100644
--- a/juk/tagguesserconfigdlg.h
+++ b/juk/tagguesserconfigdlg.h
@@ -11,7 +11,7 @@
 
 #include <kdialogbase.h>
 
-class QListViewItem;
+class TQListViewItem;
 
 class TagGuesserConfigDlgWidget;
 class TagGuesserConfigDlg : public KDialogBase
diff --git a/juk/tagtransactionmanager.h b/juk/tagtransactionmanager.h
index 85bfc0b7..7f8ef8d0 100644
--- a/juk/tagtransactionmanager.h
+++ b/juk/tagtransactionmanager.h
@@ -19,7 +19,7 @@
 
 
 class PlaylistItem;
-class QWidget;
+class TQWidget;
 class Tag;
 
 /**
diff --git a/juk/treeviewitemplaylist.h b/juk/treeviewitemplaylist.h
index 7458172b..be7337c9 100644
--- a/juk/treeviewitemplaylist.h
+++ b/juk/treeviewitemplaylist.h
@@ -19,7 +19,7 @@
 #include "searchplaylist.h"
 #include "playlistitem.h"
 
-class QStringList;
+class TQStringList;
 
 class TreeViewItemPlaylist : public SearchPlaylist
 {
diff --git a/juk/viewmode.h b/juk/viewmode.h
index 9ec3e0db..2f164177 100644
--- a/juk/viewmode.h
+++ b/juk/viewmode.h
@@ -21,8 +21,8 @@
 
 #include "playlistbox.h"
 
-class QPainter;
-class QColorGroup;
+class TQPainter;
+class TQColorGroup;
 
 class SearchPlaylist;
 
diff --git a/juk/webimagefetcher.h b/juk/webimagefetcher.h
index 9706e6ad..803fd434 100644
--- a/juk/webimagefetcher.h
+++ b/juk/webimagefetcher.h
@@ -27,7 +27,7 @@
 
 class KURL;
 
-class QHttp;
+class TQHttp;
 
 class WebImageFetcherDialog;
 
diff --git a/kaboodle/conf.h b/kaboodle/conf.h
index a79bc08a..884593ba 100644
--- a/kaboodle/conf.h
+++ b/kaboodle/conf.h
@@ -28,7 +28,7 @@
 
 #include <kdialogbase.h>
 
-class QCheckBox;
+class TQCheckBox;
 
 namespace Kaboodle
 {
diff --git a/kaboodle/controls.h b/kaboodle/controls.h
index a434489f..c89ee8d5 100644
--- a/kaboodle/controls.h
+++ b/kaboodle/controls.h
@@ -31,8 +31,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqslider.h>
 #include <tqstringlist.h>
 
-class QComboBox;
-class QLabel;
+class TQComboBox;
+class TQLabel;
 
 namespace Kaboodle
 {
diff --git a/kaboodle/view.h b/kaboodle/view.h
index 8ac94db4..4e2f3edf 100644
--- a/kaboodle/view.h
+++ b/kaboodle/view.h
@@ -36,8 +36,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "controls.h"
 #include "player.h"
 
-class QButton;
-class QLabel;
+class TQButton;
+class TQLabel;
 class KVideoWidget;
 
 namespace Kaboodle
diff --git a/kaudiocreator/jobqueimp.h b/kaudiocreator/jobqueimp.h
index ef5de4b3..133a020a 100644
--- a/kaudiocreator/jobqueimp.h
+++ b/kaudiocreator/jobqueimp.h
@@ -26,9 +26,9 @@
 #include <tqlistview.h>
 
 class Job;
-class QPainter;
-class QColorGroup;
-class QListView;
+class TQPainter;
+class TQColorGroup;
+class TQListView;
 
 /**
  * Helper class to allow for progress bars in list view items.
diff --git a/kfile-plugins/au/kfile_au.h b/kfile-plugins/au/kfile_au.h
index 9912ef70..7968d87c 100644
--- a/kfile-plugins/au/kfile_au.h
+++ b/kfile-plugins/au/kfile_au.h
@@ -22,7 +22,7 @@
 
 #include <kfilemetainfo.h>
 
-class QStringList;
+class TQStringList;
 
 class KAuPlugin: public KFilePlugin
 {
diff --git a/kfile-plugins/avi/kfile_avi.h b/kfile-plugins/avi/kfile_avi.h
index db60fc72..43bc72e0 100644
--- a/kfile-plugins/avi/kfile_avi.h
+++ b/kfile-plugins/avi/kfile_avi.h
@@ -32,7 +32,7 @@ typedef unsigned int   uint32_t;
 
 
 
-class QStringList;
+class TQStringList;
 
 class KAviPlugin: public KFilePlugin
 {
diff --git a/kfile-plugins/flac/kfile_flac.h b/kfile-plugins/flac/kfile_flac.h
index 03ad51bb..b08e2136 100644
--- a/kfile-plugins/flac/kfile_flac.h
+++ b/kfile-plugins/flac/kfile_flac.h
@@ -26,8 +26,8 @@
 
 #include <kfilemetainfo.h>
 
-class QString;
-class QStringList;
+class TQString;
+class TQStringList;
 
 class KFlacPlugin: public KFilePlugin
 {
diff --git a/kfile-plugins/m3u/kfile_m3u.h b/kfile-plugins/m3u/kfile_m3u.h
index d10e3264..2787c81b 100644
--- a/kfile-plugins/m3u/kfile_m3u.h
+++ b/kfile-plugins/m3u/kfile_m3u.h
@@ -24,7 +24,7 @@
 #include <kfilemetainfo.h>
 #include <kurl.h>
 
-class QStringList;
+class TQStringList;
 
 class KM3uPlugin: public KFilePlugin
 {
diff --git a/kfile-plugins/mp3/kfile_mp3.h b/kfile-plugins/mp3/kfile_mp3.h
index e1923bad..6f3fc44c 100644
--- a/kfile-plugins/mp3/kfile_mp3.h
+++ b/kfile-plugins/mp3/kfile_mp3.h
@@ -21,7 +21,7 @@
 
 #include <kfilemetainfo.h>
 
-class QStringList;
+class TQStringList;
 
 class KMp3Plugin: public KFilePlugin
 {
diff --git a/kfile-plugins/mpc/kfile_mpc.h b/kfile-plugins/mpc/kfile_mpc.h
index 576cc5cc..9deb7d71 100644
--- a/kfile-plugins/mpc/kfile_mpc.h
+++ b/kfile-plugins/mpc/kfile_mpc.h
@@ -26,8 +26,8 @@
 
 #include <kfilemetainfo.h>
 
-class QString;
-class QStringList;
+class TQString;
+class TQStringList;
 
 class KMpcPlugin: public KFilePlugin
 {
diff --git a/kfile-plugins/mpeg/kfile_mpeg.h b/kfile-plugins/mpeg/kfile_mpeg.h
index 5fcba670..2aa313d2 100644
--- a/kfile-plugins/mpeg/kfile_mpeg.h
+++ b/kfile-plugins/mpeg/kfile_mpeg.h
@@ -23,7 +23,7 @@
 #include <kfilemetainfo.h>
 #include <tqfile.h>
 
-class QStringList;
+class TQStringList;
 
 class KMpegPlugin: public KFilePlugin
 {
diff --git a/kfile-plugins/ogg/kfile_ogg.h b/kfile-plugins/ogg/kfile_ogg.h
index ed511ec4..79130527 100644
--- a/kfile-plugins/ogg/kfile_ogg.h
+++ b/kfile-plugins/ogg/kfile_ogg.h
@@ -23,8 +23,8 @@
 
 #include <kfilemetainfo.h>
 
-class QString;
-class QStringList;
+class TQString;
+class TQStringList;
 
 class KOggPlugin: public KFilePlugin
 {
diff --git a/kfile-plugins/sid/kfile_sid.h b/kfile-plugins/sid/kfile_sid.h
index 6c221bd3..eb809c56 100644
--- a/kfile-plugins/sid/kfile_sid.h
+++ b/kfile-plugins/sid/kfile_sid.h
@@ -23,7 +23,7 @@
 
 #include <kfilemetainfo.h>
 
-class QStringList;
+class TQStringList;
 
 class KSidPlugin: public KFilePlugin
 {
diff --git a/kfile-plugins/theora/kfile_theora.h b/kfile-plugins/theora/kfile_theora.h
index 2bc9fd54..740dea2b 100644
--- a/kfile-plugins/theora/kfile_theora.h
+++ b/kfile-plugins/theora/kfile_theora.h
@@ -26,7 +26,7 @@
  */
 #include <kfilemetainfo.h>
 
-class QStringList;
+class TQStringList;
 
 class theoraPlugin: public KFilePlugin
 {
diff --git a/kfile-plugins/wav/kfile_wav.h b/kfile-plugins/wav/kfile_wav.h
index a80f49ec..a2f8ae40 100644
--- a/kfile-plugins/wav/kfile_wav.h
+++ b/kfile-plugins/wav/kfile_wav.h
@@ -22,7 +22,7 @@
 
 #include <kfilemetainfo.h>
 
-class QStringList;
+class TQStringList;
 
 class KWavPlugin: public KFilePlugin
 {
diff --git a/kmid/channel.h b/kmid/channel.h
index c86e91a1..7051247b 100644
--- a/kmid/channel.h
+++ b/kmid/channel.h
@@ -33,8 +33,8 @@
 #define CHN_CHANGE_PGM 1
 #define CHN_CHANGE_FORCED_STATE 2
 
-class QFont;
-class QComboBox;
+class TQFont;
+class TQComboBox;
 class KMidButton;
 class KMidChannel : public QWidget
 {
diff --git a/kmid/channelcfgdlg.h b/kmid/channelcfgdlg.h
index ed088dd2..c845be3e 100644
--- a/kmid/channelcfgdlg.h
+++ b/kmid/channelcfgdlg.h
@@ -26,8 +26,8 @@
 
 #include <kdialogbase.h>
 
-class QVButtonGroup;
-class QRadioButton;
+class TQVButtonGroup;
+class TQRadioButton;
 class ChannelViewConfigDialog : public KDialogBase
 {
     Q_OBJECT
diff --git a/kmid/collectdlg.h b/kmid/collectdlg.h
index 6283f4eb..ae9a0b3a 100644
--- a/kmid/collectdlg.h
+++ b/kmid/collectdlg.h
@@ -28,10 +28,10 @@
 #include "songlist.h"
 #include "slman.h"
 
-class QLabel;
+class TQLabel;
 class KPushButton;
-class QPushButton;
-class QListBox;
+class TQPushButton;
+class TQListBox;
 class KURL;
 class CollectionDialog : public QDialog
 {
diff --git a/kmid/kdisptext.h b/kmid/kdisptext.h
index 6470b904..d23787c0 100644
--- a/kmid/kdisptext.h
+++ b/kmid/kdisptext.h
@@ -44,9 +44,9 @@ struct kdispt_line
     kdispt_line *next;
 };
 
-class QFont;
-class QFontMetrics;
-class QScrollBar;
+class TQFont;
+class TQFontMetrics;
+class TQScrollBar;
 
 class KDisplayText : public TQScrollView 
 {
diff --git a/kmid/klcdnumber.h b/kmid/klcdnumber.h
index 99b21126..aaf58dbc 100644
--- a/kmid/klcdnumber.h
+++ b/kmid/klcdnumber.h
@@ -26,9 +26,9 @@
 
 #include <tqwidget.h>
 
-class QPainter;
+class TQPainter;
 class KTriangleButton;
-class QColor;
+class TQColor;
 
 class KLCDNumber : public QWidget
 {
diff --git a/kmid/kmidclient.h b/kmid/kmidclient.h
index 9444b34d..204aefac 100644
--- a/kmid/kmidclient.h
+++ b/kmid/kmidclient.h
@@ -46,11 +46,11 @@ class DeviceManager;
 class KApplication;
 class KConfig;
 class KLCDNumber;
-class QLabel;
-class QComboBox;
+class TQLabel;
+class TQComboBox;
 class RhythmView;
 class ChannelView;
-class QString;
+class TQString;
 
 class kmidClient : public TQWidget, virtual public KMidIface
 {
diff --git a/kmid/midicfgdlg.h b/kmid/midicfgdlg.h
index 820a67d1..14cff5a4 100644
--- a/kmid/midicfgdlg.h
+++ b/kmid/midicfgdlg.h
@@ -28,9 +28,9 @@
 
 class DeviceManager;
 
-class QLabel;
-class QPushButton;
-class QListBox;
+class TQLabel;
+class TQPushButton;
+class TQListBox;
 class MidiConfigDialog : public KDialogBase
 {
   Q_OBJECT
diff --git a/kmid/qslidertime.h b/kmid/qslidertime.h
index 31614b5c..fcefdc13 100644
--- a/kmid/qslidertime.h
+++ b/kmid/qslidertime.h
@@ -26,7 +26,7 @@
 
 #include <tqslider.h>
 
-class QWidget;
+class TQWidget;
 
 class QSliderTime : public QWidget
 {
diff --git a/kmix/dialogselectmaster.h b/kmix/dialogselectmaster.h
index 71ee1d57..c454a3fe 100644
--- a/kmix/dialogselectmaster.h
+++ b/kmix/dialogselectmaster.h
@@ -1,12 +1,12 @@
 #ifndef DIALOGSELECTMASTER_H
 #define DIALOGSELECTMASTER_H
 
-class QButtonGroup;
+class TQButtonGroup;
 #include <tqradiobutton.h>
-class QScrollView;
+class TQScrollView;
 #include <tqstringlist.h>
-class QVBox;
-class QVBoxLayout;
+class TQVBox;
+class TQVBoxLayout;
 
 class KComboBox;
 #include <kdialogbase.h>
diff --git a/kmix/dialogviewconfiguration.h b/kmix/dialogviewconfiguration.h
index 5ad17ba8..6ee8c83f 100644
--- a/kmix/dialogviewconfiguration.h
+++ b/kmix/dialogviewconfiguration.h
@@ -3,7 +3,7 @@
 
 #include <tqcheckbox.h>
 #include <tqptrlist.h>
-class QVBoxLayout;
+class TQVBoxLayout;
 
 #include <kdialogbase.h>
 
diff --git a/kmix/kmix.h b/kmix/kmix.h
index 4404e7f5..76f3f32c 100644
--- a/kmix/kmix.h
+++ b/kmix/kmix.h
@@ -31,8 +31,8 @@
 #include <tqstring.h>
 #include <tqmap.h>
 
-class QHBox;
-class QWidgetStack;
+class TQHBox;
+class TQWidgetStack;
 
 // include files for KDE
 #include <kmainwindow.h>
diff --git a/kmix/kmixdockwidget.h b/kmix/kmixdockwidget.h
index ee4eb89e..e536be4b 100644
--- a/kmix/kmixdockwidget.h
+++ b/kmix/kmixdockwidget.h
@@ -23,8 +23,8 @@
 #ifndef KMIXDOCKWIDGET_H
 #define KMIXDOCKWIDGET_H
 
-class QFrame;
-class QString;
+class TQFrame;
+class TQString;
 #include <tqwidget.h>
 #include <tqvbox.h>
 
diff --git a/kmix/kmixerwidget.h b/kmix/kmixerwidget.h
index b6733c02..6e793ca6 100644
--- a/kmix/kmixerwidget.h
+++ b/kmix/kmixerwidget.h
@@ -26,8 +26,8 @@
 
 #include <tqwidget.h>
 #include <tqptrlist.h>
-class QString;
-class QGridLayout;
+class TQString;
+class TQGridLayout;
 
 #include <kpanelapplet.h>
 class KPopupMenu;
@@ -36,7 +36,7 @@ class KPopupMenu;
 #include "mixdevicewidget.h"
 
 // QT
-class QSlider;
+class TQSlider;
 
 
 // KDE
diff --git a/kmix/kmixprefdlg.h b/kmix/kmixprefdlg.h
index 13b6a761..b2e294ab 100644
--- a/kmix/kmixprefdlg.h
+++ b/kmix/kmixprefdlg.h
@@ -26,8 +26,8 @@
 
 class KMixPrefWidget;
 class KMixApp;
-class QCheckBox;
-class QRadioButton;
+class TQCheckBox;
+class TQRadioButton;
 
 class 
 KMixPrefDlg : public KDialogBase  
diff --git a/kmix/mdwenum.h b/kmix/mdwenum.h
index 17fea239..a541f155 100644
--- a/kmix/mdwenum.h
+++ b/kmix/mdwenum.h
@@ -26,7 +26,7 @@
 #include <tqwidget.h>
 #include "volume.h"
 
-class QBoxLayout;
+class TQBoxLayout;
 
 class KAction;
 class KActionCollection;
diff --git a/kmix/mdwslider.h b/kmix/mdwslider.h
index f55667ae..fad6d983 100644
--- a/kmix/mdwslider.h
+++ b/kmix/mdwslider.h
@@ -32,10 +32,10 @@
 #include <tqpixmap.h>
 #include <tqrangecontrol.h>
 
-class QBoxLayout;
-class QLabel;
-class QPopupMenu;
-class QSlider;
+class TQBoxLayout;
+class TQLabel;
+class TQPopupMenu;
+class TQSlider;
 
 class KLed;
 class KLedButton;
diff --git a/kmix/mdwswitch.h b/kmix/mdwswitch.h
index 44ddaa79..3bb5eeab 100644
--- a/kmix/mdwswitch.h
+++ b/kmix/mdwswitch.h
@@ -31,10 +31,10 @@
 #include <tqpixmap.h>
 #include <tqrangecontrol.h>
 
-class QBoxLayout;
-class QLabel;
-class QPopupMenu;
-class QSlider;
+class TQBoxLayout;
+class TQLabel;
+class TQPopupMenu;
+class TQSlider;
 
 class KLedButton;
 class KAction;
diff --git a/kmix/mixdevicewidget.h b/kmix/mixdevicewidget.h
index 1f5fa0fc..d3c533d8 100644
--- a/kmix/mixdevicewidget.h
+++ b/kmix/mixdevicewidget.h
@@ -33,10 +33,10 @@
 #include <tqpixmap.h>
 #include <tqrangecontrol.h>
 
-class QBoxLayout;
-class QLabel;
-class QPopupMenu;
-class QSlider;
+class TQBoxLayout;
+class TQLabel;
+class TQPopupMenu;
+class TQSlider;
 
 class KLed;
 class KLedButton;
diff --git a/kmix/mixer_alsa.h b/kmix/mixer_alsa.h
index 5773181b..cb759e3f 100644
--- a/kmix/mixer_alsa.h
+++ b/kmix/mixer_alsa.h
@@ -5,8 +5,8 @@
 #include <tqvaluelist.h>
 
 // Forward QT includes
-class QString;
-class QSocketNotifier;
+class TQString;
+class TQSocketNotifier;
 
 #include "mixer_backend.h"
 
diff --git a/kmix/viewapplet.h b/kmix/viewapplet.h
index 7fd35b31..80dc417e 100644
--- a/kmix/viewapplet.h
+++ b/kmix/viewapplet.h
@@ -4,9 +4,9 @@
 #include "viewbase.h"
 #include <kpanelapplet.h>
 
-class QBoxLayout;
-class QHBox;
-class QSize;
+class TQBoxLayout;
+class TQHBox;
+class TQSize;
 
 class Mixer;
 
diff --git a/kmix/viewdockareapopup.h b/kmix/viewdockareapopup.h
index 1ba283f9..7f0c1bf1 100644
--- a/kmix/viewdockareapopup.h
+++ b/kmix/viewdockareapopup.h
@@ -3,17 +3,17 @@
 
 #include "viewbase.h"
 
-class QMouseEvent;
-class QGridLayout;
-class QWidget;
-class QPushButton;
+class TQMouseEvent;
+class TQGridLayout;
+class TQWidget;
+class TQPushButton;
 
 class Mixer;
 class KMixDockWidget;
 class MixDeviceWidget;
 class MixDevice;
-class QFrame;
-class QTime;
+class TQFrame;
+class TQTime;
 
 class ViewDockAreaPopup : public ViewBase
 {
diff --git a/kmix/viewgrid.h b/kmix/viewgrid.h
index c9440cdf..94b03446 100644
--- a/kmix/viewgrid.h
+++ b/kmix/viewgrid.h
@@ -1,9 +1,9 @@
 #ifndef ViewGrid_h
 #define ViewGrid_h
 
-class QBoxLayout;
+class TQBoxLayout;
 #include "tqsize.h"
-class QWidget;
+class TQWidget;
 
 class Mixer;
 #include "viewbase.h"
diff --git a/kmix/viewinput.h b/kmix/viewinput.h
index c8d0f663..aa28c7d8 100644
--- a/kmix/viewinput.h
+++ b/kmix/viewinput.h
@@ -2,7 +2,7 @@
 #define ViewInput_h
 
 #include "viewsliders.h"
-class QWidget;
+class TQWidget;
 class Mixer;
 
 class ViewInput : public ViewSliders
diff --git a/kmix/viewoutput.h b/kmix/viewoutput.h
index aa297a51..d39c8680 100644
--- a/kmix/viewoutput.h
+++ b/kmix/viewoutput.h
@@ -2,7 +2,7 @@
 #define ViewOutput_h
 
 #include "viewsliders.h"
-class QWidget;
+class TQWidget;
 class Mixer;
 
 class ViewOutput : public ViewSliders
diff --git a/kmix/viewsliders.h b/kmix/viewsliders.h
index 43877758..c4c0c3d2 100644
--- a/kmix/viewsliders.h
+++ b/kmix/viewsliders.h
@@ -1,8 +1,8 @@
 #ifndef ViewSliders_h
 #define ViewSliders_h
 
-class QBoxLayout;
-class QWidget;
+class TQBoxLayout;
+class TQWidget;
 
 class Mixer;
 #include "viewbase.h"
diff --git a/kmix/viewsurround.h b/kmix/viewsurround.h
index 9eea6138..6690d35a 100644
--- a/kmix/viewsurround.h
+++ b/kmix/viewsurround.h
@@ -1,9 +1,9 @@
 #ifndef ViewSurround_h
 #define ViewSurround_h
 
-class QBoxLayout;
-class QGridLayout;
-class QWidget;
+class TQBoxLayout;
+class TQGridLayout;
+class TQWidget;
 
 class MixDevice;
 class MixDeviceWidget;
diff --git a/kmix/viewswitches.h b/kmix/viewswitches.h
index f58ba750..0946ab8a 100644
--- a/kmix/viewswitches.h
+++ b/kmix/viewswitches.h
@@ -1,8 +1,8 @@
 #ifndef ViewSwitches_h
 #define ViewSwitches_h
 
-class QLayout;
-class QWidget;
+class TQLayout;
+class TQWidget;
 
 class Mixer;
 #include "viewbase.h"
diff --git a/krec/krecconfig_files.h b/krec/krecconfig_files.h
index dcf474c7..f8f78691 100644
--- a/krec/krecconfig_files.h
+++ b/krec/krecconfig_files.h
@@ -18,12 +18,12 @@
 #include <tqstringlist.h>
 #include <tqstring.h>
 
-class QBoxLayout;
-class QRadioButton;
-class QButtonGroup;
-class QLineEdit;
-class QHBox;
-class QLabel;
+class TQBoxLayout;
+class TQRadioButton;
+class TQButtonGroup;
+class TQLineEdit;
+class TQHBox;
+class TQLabel;
 
 class KRecConfigFilesWidget;
 
diff --git a/krec/krecconfig_fileswidget.h b/krec/krecconfig_fileswidget.h
index 2dfb1b36..458f0395 100644
--- a/krec/krecconfig_fileswidget.h
+++ b/krec/krecconfig_fileswidget.h
@@ -21,11 +21,11 @@
 #include <tqstringlist.h>
 #include <tqstring.h>
 
-class QRadioButton;
-class QCheckBox;
-class QButtonGroup;
-class QLineEdit;
-class QLabel;
+class TQRadioButton;
+class TQCheckBox;
+class TQButtonGroup;
+class TQLineEdit;
+class TQLabel;
 
 class KRecConfigFilesWidget : public TQVBox {
    Q_OBJECT
diff --git a/krec/krecconfigure.h b/krec/krecconfigure.h
index 00d1317e..db061f2b 100644
--- a/krec/krecconfigure.h
+++ b/krec/krecconfigure.h
@@ -18,13 +18,13 @@
 #include <tqstringlist.h>
 #include <tqstring.h>
 
-class QBoxLayout;
-class QRadioButton;
-class QButtonGroup;
-class QLineEdit;
-class QHBox;
-class QLabel;
-class QCheckBox;
+class TQBoxLayout;
+class TQRadioButton;
+class TQButtonGroup;
+class TQLineEdit;
+class TQHBox;
+class TQLabel;
+class TQCheckBox;
 class KPushButton;
 
 class KRecConfigGeneral : public KCModule {
diff --git a/krec/krecexport_wave.h b/krec/krecexport_wave.h
index 664ad35a..6390eb48 100644
--- a/krec/krecexport_wave.h
+++ b/krec/krecexport_wave.h
@@ -17,7 +17,7 @@
 #include "krecexport_template.h"
 
 class KTempFile;
-class QFile;
+class TQFile;
 
 class KRecExport_Wave : public KRecExportItem {
    Q_OBJECT
diff --git a/krec/krecfile.h b/krec/krecfile.h
index 8b030833..895a6a6d 100644
--- a/krec/krecfile.h
+++ b/krec/krecfile.h
@@ -23,7 +23,7 @@
 class KRecBuffer;
 class KTempDir;
 class KSimpleConfig;
-class QFile;
+class TQFile;
 class KRecFileViewWidget;
 
 class KRecFile : virtual public TQObject {
@@ -117,11 +117,11 @@ private:
 	void init();
 };
 
-class QFile;
-class QDir;
-class QFileInfo;
+class TQFile;
+class TQDir;
+class TQFileInfo;
 class KConfig;
-class QDataStream;
+class TQDataStream;
 
 class KRecBuffer : virtual public TQObject {
    Q_OBJECT
diff --git a/krec/krecfileview.h b/krec/krecfileview.h
index 42cf7c12..de47d0f4 100644
--- a/krec/krecfileview.h
+++ b/krec/krecfileview.h
@@ -18,9 +18,9 @@
 
 class KRecFile;
 class KRecBuffer;
-class QBoxLayout;
-class QLabel;
-class QLineEdit;
+class TQBoxLayout;
+class TQLabel;
+class TQLineEdit;
 
 class KRecFileWidget;
 class KRecBufferWidget;
diff --git a/krec/krecfileviewhelpers.h b/krec/krecfileviewhelpers.h
index db53d911..bd78c4d6 100644
--- a/krec/krecfileviewhelpers.h
+++ b/krec/krecfileviewhelpers.h
@@ -20,9 +20,9 @@
 #include <tqpoint.h>
 #include <kglobalsettings.h>
 
-class QBoxLayout;
+class TQBoxLayout;
 class AKLabel;
-class QPopupMenu;
+class TQPopupMenu;
 class KPopupMenu;
 
 class KRecTimeBar : public TQFrame {
diff --git a/krec/krecfilewidgets.h b/krec/krecfilewidgets.h
index fe389b16..e183474b 100644
--- a/krec/krecfilewidgets.h
+++ b/krec/krecfilewidgets.h
@@ -21,17 +21,17 @@
 class KRecFile;
 class KRecBuffer;
 class TimeDisplay;
-class QBoxLayout;
-class QLabel;
-class QLineEdit;
+class TQBoxLayout;
+class TQLabel;
+class TQLineEdit;
 
 class KRecFileWidget;
 class KRecBufferWidget;
 class KRecTimeBar;
 class KRecTimeDisplay;
 
-class QRegion;
-class QPainter;
+class TQRegion;
+class TQPainter;
 class KAction;
 class KToggleAction;
 
diff --git a/krec/krecglobal.h b/krec/krecglobal.h
index f29a786d..102dc3f8 100644
--- a/krec/krecglobal.h
+++ b/krec/krecglobal.h
@@ -20,7 +20,7 @@
 #include <tqdict.h>
 
 class KConfig;
-class QWidget;
+class TQWidget;
 class KStatusBar;
 
 class KRecExportItem;
diff --git a/krec/krecnewproperties.h b/krec/krecnewproperties.h
index 53996f13..886ffdef 100644
--- a/krec/krecnewproperties.h
+++ b/krec/krecnewproperties.h
@@ -17,12 +17,12 @@
 #include <tqdialog.h>
 
 class KConfig;
-class QBoxLayout;
-class QButtonGroup;
-class QRadioButton;
+class TQBoxLayout;
+class TQButtonGroup;
+class TQRadioButton;
 class KPushButton;
-class QHBox;
-class QVBox;
+class TQHBox;
+class TQVBox;
 
 class KRecConfigFilesWidget;
 
diff --git a/krec/mp3_export/krecexport_mp3.h b/krec/mp3_export/krecexport_mp3.h
index baa40914..e6481309 100644
--- a/krec/mp3_export/krecexport_mp3.h
+++ b/krec/mp3_export/krecexport_mp3.h
@@ -19,7 +19,7 @@
 #include <lame/lame.h>
 
 class KTempFile;
-class QFile;
+class TQFile;
 
 class KRecExport_MP3 : public KRecExportItem {
    Q_OBJECT
diff --git a/krec/ogg_export/krecexport_ogg.h b/krec/ogg_export/krecexport_ogg.h
index 15c0337d..787f8e34 100644
--- a/krec/ogg_export/krecexport_ogg.h
+++ b/krec/ogg_export/krecexport_ogg.h
@@ -23,7 +23,7 @@
 #include <vorbis/vorbisenc.h>
 
 class KTempFile;
-class QFile;
+class TQFile;
 
 class KRecExport_OGG : public KRecExportItem {
    Q_OBJECT
diff --git a/kscd/kscd.h b/kscd/kscd.h
index 0a6bca7d..f4903590 100644
--- a/kscd/kscd.h
+++ b/kscd/kscd.h
@@ -61,7 +61,7 @@ class KCompactDisc;
 
 class CDDBDlg;
 class DockWidget;
-class QGridLayout;
+class TQGridLayout;
 class KActionCollection;
 class KToggleAction;
 
diff --git a/noatun/library/cmodule.h b/noatun/library/cmodule.h
index 881842a9..89aa37f0 100644
--- a/noatun/library/cmodule.h
+++ b/noatun/library/cmodule.h
@@ -6,17 +6,17 @@
 #include "noatun/pref.h"
 
 class KListView;
-class QSplitter;
-class QListViewItem;
+class TQSplitter;
+class TQListViewItem;
 class NoatunLibraryInfo;
-class QTextView;
-class QButtonGroup;
+class TQTextView;
+class TQButtonGroup;
 class MimeTypeTree;
 class KLineEdit;
 
 namespace Arts {class TraderOffer;}
 
-class QCheckBox;
+class TQCheckBox;
 class KURLRequester;
 
 class General : public CModule
diff --git a/noatun/library/effectview.h b/noatun/library/effectview.h
index 2a6e3ce6..28b26c9f 100644
--- a/noatun/library/effectview.h
+++ b/noatun/library/effectview.h
@@ -31,7 +31,7 @@
 class EffectList;
 class Effect;
 class KComboBox;
-class QToolButton;
+class TQToolButton;
 
 class EffectView : public KDialogBase
 {
diff --git a/noatun/library/equalizerview.h b/noatun/library/equalizerview.h
index 321b5ef0..8c29aadb 100644
--- a/noatun/library/equalizerview.h
+++ b/noatun/library/equalizerview.h
@@ -6,11 +6,11 @@
 #include <klistview.h>
 
 class VBand;
-class QSlider;
-class QLabel;
-class QListViewItem;
+class TQSlider;
+class TQLabel;
+class TQListViewItem;
 class VPreset;
-class QHBoxLayout;
+class TQHBoxLayout;
 class EqualizerWidget;
 
 
diff --git a/noatun/library/noatun/controls.h b/noatun/library/noatun/controls.h
index 27186c08..4c11aac7 100644
--- a/noatun/library/noatun/controls.h
+++ b/noatun/library/noatun/controls.h
@@ -9,8 +9,8 @@
 #include <tqstringlist.h>
 #include <kdemacros.h>
 
-class QComboBox;
-class QLabel;
+class TQComboBox;
+class TQLabel;
 
 /**
  * A slider that can be moved around while being
diff --git a/noatun/library/noatun/downloader.h b/noatun/library/noatun/downloader.h
index 624518d0..a4c08ad7 100644
--- a/noatun/library/noatun/downloader.h
+++ b/noatun/library/noatun/downloader.h
@@ -5,8 +5,8 @@
 #include <tqobject.h>
 #include <tqptrlist.h>
 
-class QFile;
-class QTimer;
+class TQFile;
+class TQTimer;
 class Downloader;
 
 
diff --git a/noatun/library/noatun/video.h b/noatun/library/noatun/video.h
index e6fde310..a659401e 100644
--- a/noatun/library/noatun/video.h
+++ b/noatun/library/noatun/video.h
@@ -4,7 +4,7 @@
 #include <kvideowidget.h>
 #include <arts/kmedia2.h>
 
-class QPopupMenu;
+class TQPopupMenu;
 
 /**
  * a widget that contains the video being played
diff --git a/noatun/library/titleproxy.h b/noatun/library/titleproxy.h
index 541f3190..7bbb3143 100644
--- a/noatun/library/titleproxy.h
+++ b/noatun/library/titleproxy.h
@@ -24,7 +24,7 @@ email                :
 #include <tqserversocket.h>    //baseclass
 #include <tqsocket.h>          //stack allocated
 
-class QString;
+class TQString;
 
 namespace TitleProxy
 {
diff --git a/noatun/modules/artseffects/extrastereogui_impl.h b/noatun/modules/artseffects/extrastereogui_impl.h
index d807644a..47311d37 100644
--- a/noatun/modules/artseffects/extrastereogui_impl.h
+++ b/noatun/modules/artseffects/extrastereogui_impl.h
@@ -2,7 +2,7 @@
 #include "stdsynthmodule.h"
 #include <tqwidget.h>
 
-class QSlider;
+class TQSlider;
 
 namespace Arts {
 
diff --git a/noatun/modules/excellent/userinterface.h b/noatun/modules/excellent/userinterface.h
index 7b30bd93..c6a958de 100644
--- a/noatun/modules/excellent/userinterface.h
+++ b/noatun/modules/excellent/userinterface.h
@@ -36,9 +36,9 @@ class KAction;
 class KPopupMenu;
 class KStatusBar;
 class Player;
-class QHBox;
-class QLabel;
-class QSlider;
+class TQHBox;
+class TQLabel;
+class TQSlider;
 class L33tSlider;
 class KToggleAction;
 
diff --git a/noatun/modules/infrared/irprefs.h b/noatun/modules/infrared/irprefs.h
index 1d7196a9..925acaa0 100644
--- a/noatun/modules/infrared/irprefs.h
+++ b/noatun/modules/infrared/irprefs.h
@@ -5,8 +5,8 @@
 #include <tqmap.h>
 #include <noatun/pref.h>
 
-class QCheckBox;
-class QListViewItem;
+class TQCheckBox;
+class TQListViewItem;
 class KListView;
 class KComboBox;
 class KIntSpinBox;
diff --git a/noatun/modules/infrared/lirc.cpp b/noatun/modules/infrared/lirc.cpp
index 657172d5..363849c1 100644
--- a/noatun/modules/infrared/lirc.cpp
+++ b/noatun/modules/infrared/lirc.cpp
@@ -32,7 +32,7 @@ Lirc::Lirc(TQObject *parent)
 		return;
 	}
 	
-	m_socket = new QSocket;
+	m_socket = new TQSocket;
 	m_socket->setSocket(sock);
 	connect(m_socket, TQT_SIGNAL(readyRead()), TQT_SLOT(slotRead()));
 	update();
diff --git a/noatun/modules/infrared/lirc.h b/noatun/modules/infrared/lirc.h
index de9665fd..8519bb8a 100644
--- a/noatun/modules/infrared/lirc.h
+++ b/noatun/modules/infrared/lirc.h
@@ -6,7 +6,7 @@
 #include <tqstringlist.h>
 #include <tqmap.h>
 
-class QSocket;
+class TQSocket;
 
 typedef TQMap<TQString, TQStringList> Remotes;
 
diff --git a/noatun/modules/kaiman/pref.h b/noatun/modules/kaiman/pref.h
index 4f473859..d252e394 100644
--- a/noatun/modules/kaiman/pref.h
+++ b/noatun/modules/kaiman/pref.h
@@ -22,7 +22,7 @@
 #include <noatun/pref.h>
 
 class KListBox;
-class QLabel;
+class TQLabel;
 
 class KaimanPrefDlg : public CModule
 {
diff --git a/noatun/modules/kjofol-skin/kjloader.h b/noatun/modules/kjofol-skin/kjloader.h
index 2510b14d..6fec9f05 100644
--- a/noatun/modules/kjofol-skin/kjloader.h
+++ b/noatun/modules/kjofol-skin/kjloader.h
@@ -20,7 +20,7 @@
 
 #include <kwinmodule.h>
 
-class QLabel;
+class TQLabel;
 class KJWidget;
 class KHelpMenu;
 class KJSeeker;
diff --git a/noatun/modules/kjofol-skin/kjprefs.h b/noatun/modules/kjofol-skin/kjprefs.h
index fcd6dc98..a8f52e29 100644
--- a/noatun/modules/kjofol-skin/kjprefs.h
+++ b/noatun/modules/kjofol-skin/kjprefs.h
@@ -12,13 +12,13 @@
 #include <kio/job.h>
 #include <kurlrequester.h>
 
-class QVBoxLayout; 
-class QHBoxLayout; 
-class QGridLayout; 
-class QComboBox;
-class QLabel;
-class QPushButton;
-class QTabWidget;
+class TQVBoxLayout; 
+class TQHBoxLayout; 
+class TQGridLayout; 
+class TQComboBox;
+class TQLabel;
+class TQPushButton;
+class TQTabWidget;
 class KConfig;
 class KJLoader;
 
diff --git a/noatun/modules/metatag/edit.h b/noatun/modules/metatag/edit.h
index ad928ff0..e2d53f89 100644
--- a/noatun/modules/metatag/edit.h
+++ b/noatun/modules/metatag/edit.h
@@ -8,7 +8,7 @@
 
 class KFileMetaInfo;
 class KFileMetaInfoItem;
-class QGridLayout;
+class TQGridLayout;
 
 struct MetaWidget {
     TQWidget *widget;
diff --git a/noatun/modules/net/net.cpp b/noatun/modules/net/net.cpp
index f5898c71..dbdd7e2f 100644
--- a/noatun/modules/net/net.cpp
+++ b/noatun/modules/net/net.cpp
@@ -24,7 +24,7 @@ Net::~Net()
 
 void Net::newConnection(int fd)
 {
-	TQSocket *s=new QSocket;
+	TQSocket *s=new TQSocket;
 	s->setSocket(fd);
 	mFDs.append(s);
 }
diff --git a/noatun/modules/noatunui/userinterface.h b/noatun/modules/noatunui/userinterface.h
index 1df5b160..d20b2536 100644
--- a/noatun/modules/noatunui/userinterface.h
+++ b/noatun/modules/noatunui/userinterface.h
@@ -12,8 +12,8 @@
 #include <noatun/pref.h>
 
 class Player;
-class QSlider;
-class QPushButton;
+class TQSlider;
+class TQPushButton;
 class KStatusBar;
 
 /**
diff --git a/noatun/modules/splitplaylist/find.h b/noatun/modules/splitplaylist/find.h
index 752bc8dd..8c0d461e 100644
--- a/noatun/modules/splitplaylist/find.h
+++ b/noatun/modules/splitplaylist/find.h
@@ -4,8 +4,8 @@
 #include <kdialogbase.h>
 
 class KHistoryCombo;
-class QCheckBox;
-class QPushButton;
+class TQCheckBox;
+class TQPushButton;
 
 class Finder : public KDialogBase
 {
diff --git a/noatun/modules/splitplaylist/playlist.h b/noatun/modules/splitplaylist/playlist.h
index 204d97c2..6f9b5ae6 100644
--- a/noatun/modules/splitplaylist/playlist.h
+++ b/noatun/modules/splitplaylist/playlist.h
@@ -23,7 +23,7 @@ class PlaylistItem
 class SafeListViewItem;
 class View;
 class List;
-class QListViewItem;
+class TQListViewItem;
 
 class SplitPlaylist : public Playlist, public Plugin
 {
diff --git a/noatun/modules/systray/kitsystemtray.h b/noatun/modules/systray/kitsystemtray.h
index d697ca95..6d5a2908 100644
--- a/noatun/modules/systray/kitsystemtray.h
+++ b/noatun/modules/systray/kitsystemtray.h
@@ -32,7 +32,7 @@
 
 class KPopupMenu;
 class KMainWindow;
-class QPixmap;
+class TQPixmap;
 
 class KitSystemTray : public KSystemTray
 {
diff --git a/noatun/modules/systray/systray.h b/noatun/modules/systray/systray.h
index aa723eb5..1865479b 100644
--- a/noatun/modules/systray/systray.h
+++ b/noatun/modules/systray/systray.h
@@ -35,7 +35,7 @@
 #include <kmainwindow.h>
 
 class KitSystemTray;
-class QTimer;
+class TQTimer;
 class PassivePopup;
 
 class NoatunSystray : public KMainWindow, public Plugin
diff --git a/noatun/modules/winskin/waSkinModel.cpp b/noatun/modules/winskin/waSkinModel.cpp
index bbe20a39..e7562c04 100644
--- a/noatun/modules/winskin/waSkinModel.cpp
+++ b/noatun/modules/winskin/waSkinModel.cpp
@@ -59,7 +59,7 @@ WaPixmapEntry waPixmapEntries[11] = {
 WaSkinModel::WaSkinModel()
 { 
     for (int x = 0;x < 11;x++) 
-        waPixmapEntries[x].pixmap = new QPixmap;    
+        waPixmapEntries[x].pixmap = new TQPixmap;    
 
     resetSkinModel();
     _waskinmodel_instance = this;
diff --git a/noatun/modules/winskin/waSkinModel.h b/noatun/modules/winskin/waSkinModel.h
index bc3e83c1..f200bf83 100644
--- a/noatun/modules/winskin/waSkinModel.h
+++ b/noatun/modules/winskin/waSkinModel.h
@@ -21,7 +21,7 @@
 
 enum skin_models { WA_MODEL_NORMAL, WA_MODEL_WINDOWSHADE };
 
-class QChar;
+class TQChar;
 class WaSkinModel;
 extern WaSkinModel *_waskinmodel_instance;
 
diff --git a/noatun/modules/winskin/winSkinConfig.h b/noatun/modules/winskin/winSkinConfig.h
index 0aabb1f5..3ba04cad 100644
--- a/noatun/modules/winskin/winSkinConfig.h
+++ b/noatun/modules/winskin/winSkinConfig.h
@@ -4,9 +4,9 @@
 #include <noatun/pref.h>
 #include <tqwidget.h>
 
-class QVBoxLayout;
+class TQVBoxLayout;
 class WaSkinManager;
-class QSlider;
+class TQSlider;
 
 class WinSkinConfig:public CModule {
     Q_OBJECT