TQt conversion fixes

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

587 files changed, 1349 insertions, 1349 deletions

diff --git a/akregator/src/actionmanager.h b/akregator/src/actionmanager.h
index 045375d89..17dae1fab 100644
--- a/akregator/src/actionmanager.h
+++ b/akregator/src/actionmanager.h
@@ -27,7 +27,7 @@
 
 #include <tqobject.h>
 
-class QWidget;
+class TQWidget;
 
 class KAction;
 
diff --git a/akregator/src/actionmanagerimpl.h b/akregator/src/actionmanagerimpl.h
index ecf964780..871edc94b 100644
--- a/akregator/src/actionmanagerimpl.h
+++ b/akregator/src/actionmanagerimpl.h
@@ -27,8 +27,8 @@
 
 #include "actionmanager.h"
 
-class QStringList;
-class QWidget;
+class TQStringList;
+class TQWidget;
 class KAction;
 class KActionMenu;
 class KActionCollection;
diff --git a/akregator/src/akregator_part.h b/akregator/src/akregator_part.h
index 6d43a7f12..c3e997563 100644
--- a/akregator/src/akregator_part.h
+++ b/akregator/src/akregator_part.h
@@ -34,8 +34,8 @@
 
 #include "akregator_partiface.h"
 
-class QDomDocument;
-class QTimer;
+class TQDomDocument;
+class TQTimer;
 
 class KAboutData;
 class KConfig;
diff --git a/akregator/src/akregator_view.h b/akregator/src/akregator_view.h
index 303de0aa6..cb3e032c7 100644
--- a/akregator/src/akregator_view.h
+++ b/akregator/src/akregator_view.h
@@ -35,12 +35,12 @@
 #include "akregator_run.h"
 #include "feed.h"
 
-class QSplitter;
-class QDomDocument;
-class QDomElement;
-class QHBox;
-class QToolButton;
-class QListViewItem;
+class TQSplitter;
+class TQDomDocument;
+class TQDomElement;
+class TQHBox;
+class TQToolButton;
+class TQListViewItem;
 class KComboBox;
 class KConfig;
 class KFileItem;
diff --git a/akregator/src/article.h b/akregator/src/article.h
index 29bbfdd77..e9dae588e 100644
--- a/akregator/src/article.h
+++ b/akregator/src/article.h
@@ -26,14 +26,14 @@
 #ifndef AKREGATOR_ARTICLE_H
 #define AKREGATOR_ARTICLE_H
 
-class QDateTime;
-class QDomDocument;
-class QDomElement;
-class QString;
-class QStringList;
-class QWidget;
-
-template <class T> class QValueList;
+class TQDateTime;
+class TQDomDocument;
+class TQDomElement;
+class TQString;
+class TQStringList;
+class TQWidget;
+
+template <class T> class TQValueList;
 
 typedef unsigned int uint;
 
diff --git a/akregator/src/articleinterceptor.h b/akregator/src/articleinterceptor.h
index 137d88856..5cf74a2b9 100644
--- a/akregator/src/articleinterceptor.h
+++ b/akregator/src/articleinterceptor.h
@@ -3,7 +3,7 @@
 
 #include "akregator_export.h"
 
-template <class T> class QValueList;
+template <class T> class TQValueList;
 
 namespace Akregator {
 
diff --git a/akregator/src/articlelistview.h b/akregator/src/articlelistview.h
index cb3a7b5dd..d38f90267 100644
--- a/akregator/src/articlelistview.h
+++ b/akregator/src/articlelistview.h
@@ -26,9 +26,9 @@
 
 #include <klistview.h>
 
-class QKeyEvent;
-class QDragObject;
-template <class T> class QValueList;
+class TQKeyEvent;
+class TQDragObject;
+template <class T> class TQValueList;
 
 namespace Akregator
 {
diff --git a/akregator/src/articleviewer.h b/akregator/src/articleviewer.h
index 25928395e..0839c4461 100644
--- a/akregator/src/articleviewer.h
+++ b/akregator/src/articleviewer.h
@@ -35,7 +35,7 @@
 #include "articlefilter.h"
 #include "viewer.h"
 
-class QKeyEvent;
+class TQKeyEvent;
 
 namespace Akregator
 {
diff --git a/akregator/src/dragobjects.h b/akregator/src/dragobjects.h
index ac95b0eed..cc1be89f4 100644
--- a/akregator/src/dragobjects.h
+++ b/akregator/src/dragobjects.h
@@ -33,7 +33,7 @@
 #include <tqstring.h>
 #include <tqvaluelist.h>
 
-typedef class TQMemArray<char> QByteArray;
+typedef class TQMemArray<char> TQByteArray;
 
 namespace Akregator {
 
diff --git a/akregator/src/feed.h b/akregator/src/feed.h
index 102415fdb..86c98bd80 100644
--- a/akregator/src/feed.h
+++ b/akregator/src/feed.h
@@ -29,10 +29,10 @@
 #include "treenode.h"
 #include "librss/librss.h"
 
-class QDomElement;
-class QPixmap;
-class QString;
-class QStringList;
+class TQDomElement;
+class TQPixmap;
+class TQString;
+class TQStringList;
 class KURL;
 
 
diff --git a/akregator/src/feediconmanager.h b/akregator/src/feediconmanager.h
index b0e7fed41..af4d5828a 100644
--- a/akregator/src/feediconmanager.h
+++ b/akregator/src/feediconmanager.h
@@ -30,8 +30,8 @@
 
 #include <tqobject.h>
 
-class QPixmap;
-class QString;
+class TQPixmap;
+class TQString;
 
 class DCOPClient;
 class KURL;
diff --git a/akregator/src/feedlist.h b/akregator/src/feedlist.h
index 7a44a12b3..10e492179 100644
--- a/akregator/src/feedlist.h
+++ b/akregator/src/feedlist.h
@@ -27,9 +27,9 @@
 
 #include "nodelist.h"
 
-class QDomDocument;
-class QDomNode;
-class QString;
+class TQDomDocument;
+class TQDomNode;
+class TQString;
 
 namespace Akregator
 {
diff --git a/akregator/src/feedstorage.h b/akregator/src/feedstorage.h
index 8ab9626e6..5b2f2a50f 100644
--- a/akregator/src/feedstorage.h
+++ b/akregator/src/feedstorage.h
@@ -29,7 +29,7 @@
 
 #include "akregator_export.h"
 
-class QStringList;
+class TQStringList;
 
 
 namespace Akregator {
diff --git a/akregator/src/folder.h b/akregator/src/folder.h
index ca12c164a..bb5529bc3 100644
--- a/akregator/src/folder.h
+++ b/akregator/src/folder.h
@@ -28,10 +28,10 @@
 
 #include "treenode.h"
 
-class QDomDocument;
-class QDomElement;
-class QStringList;
-template <class T> class QValueList;
+class TQDomDocument;
+class TQDomElement;
+class TQStringList;
+template <class T> class TQValueList;
 
 namespace Akregator
 {
diff --git a/akregator/src/folderitem.h b/akregator/src/folderitem.h
index 7c24b01e5..9f8dcec52 100644
--- a/akregator/src/folderitem.h
+++ b/akregator/src/folderitem.h
@@ -30,7 +30,7 @@
 
 #include <tqpixmap.h>
 
-class QPoint;
+class TQPoint;
 
 namespace Akregator 
 {
diff --git a/akregator/src/librss/article.h b/akregator/src/librss/article.h
index 4aa11850a..2cbbca06f 100644
--- a/akregator/src/librss/article.h
+++ b/akregator/src/librss/article.h
@@ -15,11 +15,11 @@
 
 #include "global.h"
 
-class QDateTime;
-class QDomNode;
-template <class> class QValueList;
-class QString;
-class QWidget;
+class TQDateTime;
+class TQDomNode;
+template <class> class TQValueList;
+class TQString;
+class TQWidget;
 class KURL;
 class KURLLabel;
 
diff --git a/akregator/src/librss/category.cpp b/akregator/src/librss/category.cpp
index 3fd5bee22..ae757714c 100644
--- a/akregator/src/librss/category.cpp
+++ b/akregator/src/librss/category.cpp
@@ -28,7 +28,7 @@
 #include <tqdom.h>
 #include <tqstring.h>
 
-class QString;
+class TQString;
 
 namespace RSS
 {
diff --git a/akregator/src/librss/category.h b/akregator/src/librss/category.h
index 597b34e1f..9baec64e5 100644
--- a/akregator/src/librss/category.h
+++ b/akregator/src/librss/category.h
@@ -27,9 +27,9 @@
 
 #include "global.h"
 
-class QDomDocument;
-class QDomElement;
-class QString;
+class TQDomDocument;
+class TQDomElement;
+class TQString;
 
 namespace RSS
 {
diff --git a/akregator/src/librss/document.h b/akregator/src/librss/document.h
index 450dcf3ba..55ac264cc 100644
--- a/akregator/src/librss/document.h
+++ b/akregator/src/librss/document.h
@@ -14,8 +14,8 @@
 #include "article.h"
 #include "global.h"
 
-class QDateTime;
-class QDomDocument;
+class TQDateTime;
+class TQDomDocument;
 
 namespace RSS
 {
diff --git a/akregator/src/librss/enclosure.h b/akregator/src/librss/enclosure.h
index d97fbd4bf..e15c86782 100644
--- a/akregator/src/librss/enclosure.h
+++ b/akregator/src/librss/enclosure.h
@@ -27,9 +27,9 @@
 
 #include "global.h"
 
-class QDomDocument;
-class QDomElement;
-class QString;
+class TQDomDocument;
+class TQDomElement;
+class TQString;
 
 namespace RSS
 {
diff --git a/akregator/src/librss/feeddetector.h b/akregator/src/librss/feeddetector.h
index 2f502acd4..94eab63b4 100644
--- a/akregator/src/librss/feeddetector.h
+++ b/akregator/src/librss/feeddetector.h
@@ -28,7 +28,7 @@
 #include <tqstring.h>
 #include <tqvaluelist.h>
 
-class QStringList;
+class TQStringList;
 class KURL;
 
 namespace RSS
diff --git a/akregator/src/librss/global.h b/akregator/src/librss/global.h
index 68cfb83a3..33c7a03b7 100644
--- a/akregator/src/librss/global.h
+++ b/akregator/src/librss/global.h
@@ -14,7 +14,7 @@
 #include <kdepimmacros.h>
 
 template <class>
-class QValueList;
+class TQValueList;
 
 namespace RSS
 {
diff --git a/akregator/src/librss/image.cpp b/akregator/src/librss/image.cpp
index 265c37117..cb8d7c86b 100644
--- a/akregator/src/librss/image.cpp
+++ b/akregator/src/librss/image.cpp
@@ -108,7 +108,7 @@ void Image::getPixmap()
 	if (d->pixmapBuffer)
 		return;
 
-	d->pixmapBuffer = new QBuffer;
+	d->pixmapBuffer = new TQBuffer;
 	d->pixmapBuffer->open(IO_WriteOnly);
 
 	d->job = KIO::get(d->url, false, false);
diff --git a/akregator/src/librss/image.h b/akregator/src/librss/image.h
index f79026683..41f7a33de 100644
--- a/akregator/src/librss/image.h
+++ b/akregator/src/librss/image.h
@@ -15,7 +15,7 @@
 
 #include <tqobject.h>
 
-class QDomNode;
+class TQDomNode;
 
 namespace KIO
 {
diff --git a/akregator/src/librss/loader.cpp b/akregator/src/librss/loader.cpp
index df7f51a66..74467d01c 100644
--- a/akregator/src/librss/loader.cpp
+++ b/akregator/src/librss/loader.cpp
@@ -95,7 +95,7 @@ void FileRetriever::retrieveData(const KURL &url)
    if (d->buffer)
       return;
 
-   d->buffer = new QBuffer;
+   d->buffer = new TQBuffer;
    d->buffer->open(IO_WriteOnly);
 
    KURL u=url;
@@ -203,7 +203,7 @@ void OutputRetriever::retrieveData(const KURL &url)
    if (d->buffer || d->process)
       return;
 
-   d->buffer = new QBuffer;
+   d->buffer = new TQBuffer;
    d->buffer->open(IO_WriteOnly);
 
    d->process = new KShellProcess();
diff --git a/akregator/src/librss/textinput.h b/akregator/src/librss/textinput.h
index fa16108ce..9cc873cf3 100644
--- a/akregator/src/librss/textinput.h
+++ b/akregator/src/librss/textinput.h
@@ -15,8 +15,8 @@
 
 class KURL;
 
-class QDomNode;
-class QString;
+class TQDomNode;
+class TQString;
 
 namespace RSS
 {
diff --git a/akregator/src/librss/tools_p.h b/akregator/src/librss/tools_p.h
index 9fad6f9e2..47be905d8 100644
--- a/akregator/src/librss/tools_p.h
+++ b/akregator/src/librss/tools_p.h
@@ -15,9 +15,9 @@
 #include <time.h>
 
 
-class QDomNode;
-class QDomElement;
-class QString;
+class TQDomNode;
+class TQDomElement;
+class TQString;
 
 namespace RSS
 {
diff --git a/akregator/src/listtabwidget.h b/akregator/src/listtabwidget.h
index 5cf7bf193..86c148919 100644
--- a/akregator/src/listtabwidget.h
+++ b/akregator/src/listtabwidget.h
@@ -27,9 +27,9 @@
 
 #include <tqwidget.h>
 
-class QIconSet;
-class QPixmap;
-class QString;
+class TQIconSet;
+class TQPixmap;
+class TQString;
 
 namespace Akregator {
 
diff --git a/akregator/src/mk4storage/mk4plugin.h b/akregator/src/mk4storage/mk4plugin.h
index 0c46e4fb5..b512a8096 100644
--- a/akregator/src/mk4storage/mk4plugin.h
+++ b/akregator/src/mk4storage/mk4plugin.h
@@ -27,7 +27,7 @@
 
 #include "../plugin.h"
 
-class QString;
+class TQString;
 
 namespace Akregator {
 namespace Backend {
diff --git a/akregator/src/mk4storage/storagefactorymk4impl.h b/akregator/src/mk4storage/storagefactorymk4impl.h
index 2fa915934..85afb48ee 100644
--- a/akregator/src/mk4storage/storagefactorymk4impl.h
+++ b/akregator/src/mk4storage/storagefactorymk4impl.h
@@ -27,8 +27,8 @@
 
 #include "storagefactory.h"
 
-class QString;
-class QStringList;
+class TQString;
+class TQStringList;
 
 namespace Akregator {
 namespace Backend {
diff --git a/akregator/src/nodelist.h b/akregator/src/nodelist.h
index d5b0024c0..b65078cc5 100644
--- a/akregator/src/nodelist.h
+++ b/akregator/src/nodelist.h
@@ -27,12 +27,12 @@
 
 #include <tqobject.h>
 
-class QDomDocument;
-class QDomNode;
-class QString;
+class TQDomDocument;
+class TQDomNode;
+class TQString;
 
-template <class K,class T> class QMap;
-template <class T> class QValueList;
+template <class K,class T> class TQMap;
+template <class T> class TQValueList;
 
 // hack for KDE 3.x series
 #ifdef signals
diff --git a/akregator/src/pageviewer.h b/akregator/src/pageviewer.h
index 357f5a4ac..a07fd2a9b 100644
--- a/akregator/src/pageviewer.h
+++ b/akregator/src/pageviewer.h
@@ -31,7 +31,7 @@
 
 class KAction;
 class KToolBarPopupAction;
-class QString;
+class TQString;
 
 namespace Akregator
 {
diff --git a/akregator/src/searchbar.h b/akregator/src/searchbar.h
index 8787f2927..932275788 100644
--- a/akregator/src/searchbar.h
+++ b/akregator/src/searchbar.h
@@ -27,7 +27,7 @@
 
 #include <tqhbox.h>
 
-class QString;
+class TQString;
 
 namespace Akregator
 {
diff --git a/akregator/src/settings_advanced.h b/akregator/src/settings_advanced.h
index ff8a75e73..2bca66146 100644
--- a/akregator/src/settings_advanced.h
+++ b/akregator/src/settings_advanced.h
@@ -5,8 +5,8 @@
 
 #include <tqmap.h>
 
-class QString;
-class QWidget;
+class TQString;
+class TQWidget;
 
 namespace Akregator {
 
diff --git a/akregator/src/simplenodeselector.h b/akregator/src/simplenodeselector.h
index aea9cd141..ba9ddda2d 100644
--- a/akregator/src/simplenodeselector.h
+++ b/akregator/src/simplenodeselector.h
@@ -29,7 +29,7 @@
 
 #include <kdialogbase.h>
 
-class QListViewItem;
+class TQListViewItem;
 
 namespace Akregator {
 
diff --git a/akregator/src/speechclient.h b/akregator/src/speechclient.h
index 56e1c7148..8a564cd80 100644
--- a/akregator/src/speechclient.h
+++ b/akregator/src/speechclient.h
@@ -30,8 +30,8 @@
 
 #include <tqobject.h>
 
-class QString;
-template <class T> class QValueList;
+class TQString;
+template <class T> class TQValueList;
 
 namespace Akregator
 {
diff --git a/akregator/src/storage.h b/akregator/src/storage.h
index 3b53bb7ef..8c02a9f7e 100644
--- a/akregator/src/storage.h
+++ b/akregator/src/storage.h
@@ -29,8 +29,8 @@
 
 #include "akregator_export.h"
 
-class QString;
-class QStringList;
+class TQString;
+class TQStringList;
 
 namespace Akregator {
 namespace Backend {
diff --git a/akregator/src/storagefactory.h b/akregator/src/storagefactory.h
index fbcd90074..12f18a0b3 100644
--- a/akregator/src/storagefactory.h
+++ b/akregator/src/storagefactory.h
@@ -27,9 +27,9 @@
 
 #include "akregator_export.h"
 
-class QString;
-class QStringList;
-class QWidget;
+class TQString;
+class TQStringList;
+class TQWidget;
 namespace Akregator {
 namespace Backend {
 
diff --git a/akregator/src/storagefactorydummyimpl.h b/akregator/src/storagefactorydummyimpl.h
index abb4e599d..0e8d2d44e 100644
--- a/akregator/src/storagefactorydummyimpl.h
+++ b/akregator/src/storagefactorydummyimpl.h
@@ -27,8 +27,8 @@
 
 #include "storagefactory.h"
 
-class QString;
-class QStringList;
+class TQString;
+class TQStringList;
 
 namespace Akregator {
 namespace Backend {
diff --git a/akregator/src/storagefactoryregistry.h b/akregator/src/storagefactoryregistry.h
index fde3191ac..75976e269 100644
--- a/akregator/src/storagefactoryregistry.h
+++ b/akregator/src/storagefactoryregistry.h
@@ -27,8 +27,8 @@
 
 #include "akregator_export.h"
 
-class QString;
-class QStringList;
+class TQString;
+class TQStringList;
 
 namespace Akregator {
 namespace Backend {
diff --git a/akregator/src/tabwidget.h b/akregator/src/tabwidget.h
index f3b529b97..b4e3722f5 100644
--- a/akregator/src/tabwidget.h
+++ b/akregator/src/tabwidget.h
@@ -28,7 +28,7 @@
 #include <tqptrlist.h>
 #include <ktabwidget.h>
 
-class QString;
+class TQString;
 
 namespace Akregator
 {
diff --git a/akregator/src/tagaction.h b/akregator/src/tagaction.h
index 98ebcdc5b..7225f2ce2 100644
--- a/akregator/src/tagaction.h
+++ b/akregator/src/tagaction.h
@@ -27,8 +27,8 @@
 
 #include <kactionclasses.h>
 
-class QString;
-class QWidget;
+class TQString;
+class TQWidget;
 
 namespace Akregator {
 
diff --git a/akregator/src/tagfolder.h b/akregator/src/tagfolder.h
index 11437d637..6e416e543 100644
--- a/akregator/src/tagfolder.h
+++ b/akregator/src/tagfolder.h
@@ -27,8 +27,8 @@
 
 #include "folder.h"
 
-class QDomDocument;
-class QDomElement;
+class TQDomDocument;
+class TQDomElement;
 
 namespace Akregator {
 
diff --git a/akregator/src/tagfolderitem.h b/akregator/src/tagfolderitem.h
index d80d19e59..ac339aec3 100644
--- a/akregator/src/tagfolderitem.h
+++ b/akregator/src/tagfolderitem.h
@@ -31,7 +31,7 @@
 
 #include <tqpixmap.h>
 
-class QPoint;
+class TQPoint;
 
 namespace Akregator 
 {
diff --git a/akregator/src/tagnode.h b/akregator/src/tagnode.h
index df66c4b5c..efe54ae9c 100644
--- a/akregator/src/tagnode.h
+++ b/akregator/src/tagnode.h
@@ -27,11 +27,11 @@
 
 #include <treenode.h>
 
-class QDomDocument;
-class QDomElement;
-class QString;
-class QStringList;
-template <class T> class QValueList;
+class TQDomDocument;
+class TQDomElement;
+class TQString;
+class TQStringList;
+template <class T> class TQValueList;
 
 namespace Akregator 
 {
diff --git a/akregator/src/tagnodelist.h b/akregator/src/tagnodelist.h
index 64d2048f4..f909c8276 100644
--- a/akregator/src/tagnodelist.h
+++ b/akregator/src/tagnodelist.h
@@ -27,8 +27,8 @@
 
 #include "tagfolder.h"
 
-class QDomDocument;
-template <class T> class QValueList;
+class TQDomDocument;
+template <class T> class TQValueList;
 
 namespace Akregator {
 
diff --git a/akregator/src/tagset.h b/akregator/src/tagset.h
index be4bbdd93..aea004c82 100644
--- a/akregator/src/tagset.h
+++ b/akregator/src/tagset.h
@@ -27,10 +27,10 @@
 
 #include <tqobject.h>
 
-class QDomDocument;
-template <class K,class T> class QMap;
-class QString;
-class QStringList;
+class TQDomDocument;
+template <class K,class T> class TQMap;
+class TQString;
+class TQStringList;
 
 namespace Akregator {
 
diff --git a/akregator/src/treenode.h b/akregator/src/treenode.h
index 43ac418d5..1e8a1cf69 100644
--- a/akregator/src/treenode.h
+++ b/akregator/src/treenode.h
@@ -28,11 +28,11 @@
 
 #include <tqobject.h>
 
-class QDomDocument;
-class QDomElement;
-class QString;
-class QStringList;
-template <class T> class QValueList;
+class TQDomDocument;
+class TQDomElement;
+class TQString;
+class TQStringList;
+template <class T> class TQValueList;
 
 namespace Akregator 
 {
diff --git a/akregator/src/treenodeitem.h b/akregator/src/treenodeitem.h
index 5ce02a93c..b4bae9649 100644
--- a/akregator/src/treenodeitem.h
+++ b/akregator/src/treenodeitem.h
@@ -27,8 +27,8 @@
 
 #include <klistview.h>
 
-class QPoint;
-class QString;
+class TQPoint;
+class TQString;
 
 namespace Akregator {
 
diff --git a/akregator/src/utils.h b/akregator/src/utils.h
index f4f86363e..8ab0fea10 100644
--- a/akregator/src/utils.h
+++ b/akregator/src/utils.h
@@ -25,7 +25,7 @@
 #ifndef AKREGATOR_UTILS_H
 #define AKREGATOR_UTILS_H
 
-class QString;
+class TQString;
 typedef unsigned int uint;
 
 namespace Akregator {
diff --git a/certmanager/certificateinfowidgetimpl.h b/certmanager/certificateinfowidgetimpl.h
index 9123d2c64..53950e3b6 100644
--- a/certmanager/certificateinfowidgetimpl.h
+++ b/certmanager/certificateinfowidgetimpl.h
@@ -40,7 +40,7 @@
 #include <tqvaluelist.h>
 
 class KProcess;
-class QListViewItem;
+class TQListViewItem;
 
 namespace GpgME {
   class KeyListResult;
diff --git a/certmanager/certmanager.h b/certmanager/certmanager.h
index 4aacaf70d..fb9308ee3 100644
--- a/certmanager/certmanager.h
+++ b/certmanager/certmanager.h
@@ -65,9 +65,9 @@ class LineEditAction;
 class ComboAction;
 
 class KURL;
-class QFile;
-class QStringList;
-class QLabel;
+class TQFile;
+class TQStringList;
+class TQLabel;
 
 namespace GpgME {
   class ImportResult;
diff --git a/certmanager/conf/dirservconfigpage.h b/certmanager/conf/dirservconfigpage.h
index 2ec688204..bb440d4bb 100644
--- a/certmanager/conf/dirservconfigpage.h
+++ b/certmanager/conf/dirservconfigpage.h
@@ -36,7 +36,7 @@
 #include <kleo/cryptoconfig.h>
 #include <kdepimmacros.h>
 
-class QCheckBox;
+class TQCheckBox;
 class QTimeEdit;
 class KIntNumInput;
 namespace Kleo {
diff --git a/certmanager/crlview.h b/certmanager/crlview.h
index 05b55ca33..c801410e6 100644
--- a/certmanager/crlview.h
+++ b/certmanager/crlview.h
@@ -36,10 +36,10 @@
 #include <tqdialog.h>
 #include <tqstring.h>
 
-class QTextEdit;
-class QPushButton;
+class TQTextEdit;
+class TQPushButton;
 class KProcess;
-class QTimer;
+class TQTimer;
 
 class CRLView : public TQDialog {
   Q_OBJECT
diff --git a/certmanager/customactions.h b/certmanager/customactions.h
index ad3505b78..288aeb163 100644
--- a/certmanager/customactions.h
+++ b/certmanager/customactions.h
@@ -37,7 +37,7 @@
 
 #include <tqstringlist.h>
 
-class QLineEdit;
+class TQLineEdit;
 
 class LabelAction : public KAction {
   Q_OBJECT
diff --git a/certmanager/kwatchgnupg/kwatchgnupgconfig.h b/certmanager/kwatchgnupg/kwatchgnupgconfig.h
index e95959e50..c73f5f6db 100644
--- a/certmanager/kwatchgnupg/kwatchgnupgconfig.h
+++ b/certmanager/kwatchgnupg/kwatchgnupgconfig.h
@@ -35,9 +35,9 @@
 
 #include <kdialogbase.h>
 
-class QCheckBox;
-class QComboBox;
-class QSpinBox;
+class TQCheckBox;
+class TQComboBox;
+class TQSpinBox;
 class KURLRequester;
 
 class KWatchGnuPGConfig : public KDialogBase {
diff --git a/certmanager/kwatchgnupg/kwatchgnupgmainwin.h b/certmanager/kwatchgnupg/kwatchgnupgmainwin.h
index 64d0bbe54..f37b24226 100644
--- a/certmanager/kwatchgnupg/kwatchgnupgmainwin.h
+++ b/certmanager/kwatchgnupg/kwatchgnupgmainwin.h
@@ -38,7 +38,7 @@
 class KWatchGnuPGTray;
 class KWatchGnuPGConfig;
 class KProcIO;
-class QTextEdit;
+class TQTextEdit;
 
 class KWatchGnuPGMainWindow : public KMainWindow {
   Q_OBJECT
diff --git a/certmanager/lib/backends/chiasmus/chiasmusbackend.h b/certmanager/lib/backends/chiasmus/chiasmusbackend.h
index 9b97723d4..96eda06e7 100644
--- a/certmanager/lib/backends/chiasmus/chiasmusbackend.h
+++ b/certmanager/lib/backends/chiasmus/chiasmusbackend.h
@@ -41,7 +41,7 @@ class CryptPlugWrapper;
 namespace Kleo {
   class CryptoConfig;
 }
-class QString;
+class TQString;
 
 namespace Kleo {
 
diff --git a/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.h b/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.h
index e28cf90fd..3c3690ae6 100644
--- a/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.h
+++ b/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.h
@@ -37,7 +37,7 @@
 
 #include <tqcstring.h>
 
-class QString;
+class TQString;
 
 namespace Kleo {
 
diff --git a/certmanager/lib/backends/kpgp/gpg1backend.h b/certmanager/lib/backends/kpgp/gpg1backend.h
index c95df1a51..c965673d3 100644
--- a/certmanager/lib/backends/kpgp/gpg1backend.h
+++ b/certmanager/lib/backends/kpgp/gpg1backend.h
@@ -36,7 +36,7 @@
 
 #include "kpgpbackendbase.h"
 
-class QString;
+class TQString;
 
 namespace Kleo {
 
diff --git a/certmanager/lib/backends/kpgp/kpgpbackendbase.h b/certmanager/lib/backends/kpgp/kpgpbackendbase.h
index 9c21c12bd..c91c23914 100644
--- a/certmanager/lib/backends/kpgp/kpgpbackendbase.h
+++ b/certmanager/lib/backends/kpgp/kpgpbackendbase.h
@@ -44,7 +44,7 @@
 namespace Kleo {
   class CryptoConfig;
 }
-class QString;
+class TQString;
 class KpgpWrapper;
 
 namespace Kleo {
diff --git a/certmanager/lib/backends/kpgp/pgp2backend.h b/certmanager/lib/backends/kpgp/pgp2backend.h
index afb8a87c2..d5b1988ec 100644
--- a/certmanager/lib/backends/kpgp/pgp2backend.h
+++ b/certmanager/lib/backends/kpgp/pgp2backend.h
@@ -36,7 +36,7 @@
 
 #include "kpgpbackendbase.h"
 
-class QString;
+class TQString;
 
 namespace Kleo {
 
diff --git a/certmanager/lib/backends/kpgp/pgp5backend.h b/certmanager/lib/backends/kpgp/pgp5backend.h
index 2cf995741..f45f4acef 100644
--- a/certmanager/lib/backends/kpgp/pgp5backend.h
+++ b/certmanager/lib/backends/kpgp/pgp5backend.h
@@ -36,7 +36,7 @@
 
 #include "kpgpbackendbase.h"
 
-class QString;
+class TQString;
 
 namespace Kleo {
 
diff --git a/certmanager/lib/backends/kpgp/pgp6backend.h b/certmanager/lib/backends/kpgp/pgp6backend.h
index d0babccd1..6e174503c 100644
--- a/certmanager/lib/backends/kpgp/pgp6backend.h
+++ b/certmanager/lib/backends/kpgp/pgp6backend.h
@@ -36,7 +36,7 @@
 
 #include "kpgpbackendbase.h"
 
-class QString;
+class TQString;
 
 namespace Kleo {
 
diff --git a/certmanager/lib/backends/qgpgme/qgpgmebackend.h b/certmanager/lib/backends/qgpgme/qgpgmebackend.h
index d5309032f..c4971e62a 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmebackend.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmebackend.h
@@ -42,7 +42,7 @@ namespace Kleo {
   class CryptoConfig;
 }
 class QGpgMECryptoConfig;
-class QString;
+class TQString;
 
 namespace Kleo {
 
diff --git a/certmanager/lib/backends/qgpgme/qgpgmejob.h b/certmanager/lib/backends/qgpgme/qgpgmejob.h
index d35080a72..984bed445 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmejob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmejob.h
@@ -58,8 +58,8 @@ namespace QGpgME {
   class QByteArrayDataProvider;
 }
 
-class QString;
-class QStringList;
+class TQString;
+class TQStringList;
 
 namespace Kleo {
 
diff --git a/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.h b/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.h
index 2d62f0ca5..d3731f4fd 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.h
@@ -35,7 +35,7 @@
 #define __KLEO_QGPGMEPROGRESSTOKENMAPPER_H__
 
 
-class QString;
+class TQString;
 
 namespace Kleo {
 
diff --git a/certmanager/lib/kleo/cryptobackend.h b/certmanager/lib/kleo/cryptobackend.h
index a004fc899..0c2c79268 100644
--- a/certmanager/lib/kleo/cryptobackend.h
+++ b/certmanager/lib/kleo/cryptobackend.h
@@ -54,9 +54,9 @@ namespace Kleo {
   class SpecialJob;
 }
 
-class QString;
-class QVariant;
-template <typename T_Key, typename T_Value> class QMap;
+class TQString;
+class TQVariant;
+template <typename T_Key, typename T_Value> class TQMap;
 
 namespace Kleo {
 
diff --git a/certmanager/lib/kleo/cryptobackendfactory.h b/certmanager/lib/kleo/cryptobackendfactory.h
index 09136f7e3..3ced2c503 100644
--- a/certmanager/lib/kleo/cryptobackendfactory.h
+++ b/certmanager/lib/kleo/cryptobackendfactory.h
@@ -45,7 +45,7 @@ namespace Kleo {
   class BackendConfigWidget;
 }
 
-class QString;
+class TQString;
 class KConfig;
 
 namespace Kleo {
diff --git a/certmanager/lib/kleo/dn.h b/certmanager/lib/kleo/dn.h
index 440bb4b0b..13a3c02e4 100644
--- a/certmanager/lib/kleo/dn.h
+++ b/certmanager/lib/kleo/dn.h
@@ -37,8 +37,8 @@
 #include <tqvaluevector.h>
 #include <kdepimmacros.h>
 
-class QStringList;
-class QWidget;
+class TQStringList;
+class TQWidget;
 
 namespace Kleo {
   class DNAttributeOrderConfigWidget;
diff --git a/certmanager/lib/kleo/downloadjob.h b/certmanager/lib/kleo/downloadjob.h
index 6fa5a3e4b..bac195d99 100644
--- a/certmanager/lib/kleo/downloadjob.h
+++ b/certmanager/lib/kleo/downloadjob.h
@@ -41,7 +41,7 @@ namespace GpgME {
   class Error;
 }
 
-class QStringList;
+class TQStringList;
 
 namespace Kleo {
 
diff --git a/certmanager/lib/kleo/enum.h b/certmanager/lib/kleo/enum.h
index bf4a44a60..ff9ac1c69 100644
--- a/certmanager/lib/kleo/enum.h
+++ b/certmanager/lib/kleo/enum.h
@@ -35,8 +35,8 @@
 
 #include <kdepimmacros.h>
 
-class QString;
-class QStringList;
+class TQString;
+class TQStringList;
 
 namespace Kleo {
 
diff --git a/certmanager/lib/kleo/exportjob.h b/certmanager/lib/kleo/exportjob.h
index 9e84c1351..363006e60 100644
--- a/certmanager/lib/kleo/exportjob.h
+++ b/certmanager/lib/kleo/exportjob.h
@@ -41,7 +41,7 @@ namespace GpgME {
   class Error;
 }
 
-class QStringList;
+class TQStringList;
 
 namespace Kleo {
 
diff --git a/certmanager/lib/kleo/job.h b/certmanager/lib/kleo/job.h
index 57d0592d6..1c091bab3 100644
--- a/certmanager/lib/kleo/job.h
+++ b/certmanager/lib/kleo/job.h
@@ -36,7 +36,7 @@
 #include <tqobject.h>
 #include <tqstring.h>
 
-class QWidget;
+class TQWidget;
 
 namespace Kleo {
 
diff --git a/certmanager/lib/kleo/keyfilter.h b/certmanager/lib/kleo/keyfilter.h
index e8d8eb1f1..49d8cce31 100644
--- a/certmanager/lib/kleo/keyfilter.h
+++ b/certmanager/lib/kleo/keyfilter.h
@@ -37,9 +37,9 @@ namespace GpgME {
   class Key;
 }
 
-class QFont;
-class QColor;
-class QString;
+class TQFont;
+class TQColor;
+class TQString;
 
 namespace Kleo {
 
diff --git a/certmanager/lib/kleo/keylistjob.h b/certmanager/lib/kleo/keylistjob.h
index 9d566bcbc..ed6571847 100644
--- a/certmanager/lib/kleo/keylistjob.h
+++ b/certmanager/lib/kleo/keylistjob.h
@@ -43,7 +43,7 @@ namespace GpgME {
   class KeyListResult;
 }
 
-class QStringList;
+class TQStringList;
 
 namespace Kleo {
 
diff --git a/certmanager/lib/kleo/refreshkeysjob.h b/certmanager/lib/kleo/refreshkeysjob.h
index 5ace60b6e..29467a1cd 100644
--- a/certmanager/lib/kleo/refreshkeysjob.h
+++ b/certmanager/lib/kleo/refreshkeysjob.h
@@ -42,7 +42,7 @@ namespace GpgME {
   class Key;
 }
 
-class QStringList;
+class TQStringList;
 
 namespace Kleo {
 
diff --git a/certmanager/lib/tests/gnupgviewer.h b/certmanager/lib/tests/gnupgviewer.h
index 98fb44a61..059d1f769 100644
--- a/certmanager/lib/tests/gnupgviewer.h
+++ b/certmanager/lib/tests/gnupgviewer.h
@@ -40,7 +40,7 @@ namespace Kleo {
   class GnuPGProcessBase;
 }
 class KProcess;
-class QStringList;
+class TQStringList;
 
 class GnuPGViewer : public TQTextEdit {
   Q_OBJECT
diff --git a/certmanager/lib/tests/test_keygen.h b/certmanager/lib/tests/test_keygen.h
index 80aec1e6f..f066756c5 100644
--- a/certmanager/lib/tests/test_keygen.h
+++ b/certmanager/lib/tests/test_keygen.h
@@ -41,7 +41,7 @@ namespace GpgME {
   class KeyGenerationResult;
 }
 
-class QLineEdit;
+class TQLineEdit;
 
 class KeyGenerator : public KDialogBase {
   Q_OBJECT
diff --git a/certmanager/lib/ui/backendconfigwidget.h b/certmanager/lib/ui/backendconfigwidget.h
index 57a1675a7..c8b45848c 100644
--- a/certmanager/lib/ui/backendconfigwidget.h
+++ b/certmanager/lib/ui/backendconfigwidget.h
@@ -41,7 +41,7 @@ namespace Kleo {
   class CryptoBackendFactory;
 }
 
-class QListViewItem;
+class TQListViewItem;
 
 namespace Kleo {
 
diff --git a/certmanager/lib/ui/cryptoconfigmodule.cpp b/certmanager/lib/ui/cryptoconfigmodule.cpp
index 70b0a0be4..33e7129c4 100644
--- a/certmanager/lib/ui/cryptoconfigmodule.cpp
+++ b/certmanager/lib/ui/cryptoconfigmodule.cpp
@@ -578,7 +578,7 @@ Kleo::CryptoConfigEntryLDAPURL::CryptoConfigEntryLDAPURL(
 
   const int row = glay->numRows();
   glay->addWidget( new TQLabel( mPushButton, description(), widget ), row, 1 );
-  TQHBoxLayout * hlay = new QHBoxLayout;
+  TQHBoxLayout * hlay = new TQHBoxLayout;
   glay->addLayout( hlay, row, 2 );
   hlay->addWidget( mLabel, 1 );
   hlay->addWidget( mPushButton );
diff --git a/certmanager/lib/ui/cryptoconfigmodule_p.h b/certmanager/lib/ui/cryptoconfigmodule_p.h
index 3e71b8de1..8bc52f211 100644
--- a/certmanager/lib/ui/cryptoconfigmodule_p.h
+++ b/certmanager/lib/ui/cryptoconfigmodule_p.h
@@ -40,8 +40,8 @@
 class KLineEdit;
 class KIntNumInput;
 class KURLRequester;
-class QPushButton;
-class QGridLayout;
+class TQPushButton;
+class TQGridLayout;
 
 namespace Kleo {
 
diff --git a/certmanager/lib/ui/dnattributeorderconfigwidget.h b/certmanager/lib/ui/dnattributeorderconfigwidget.h
index d57dfbdcf..b33c00778 100644
--- a/certmanager/lib/ui/dnattributeorderconfigwidget.h
+++ b/certmanager/lib/ui/dnattributeorderconfigwidget.h
@@ -39,7 +39,7 @@ namespace Kleo {
   class DNAttributeMapper;
 }
 
-class QListViewItem;
+class TQListViewItem;
 
 namespace Kleo {
 
diff --git a/certmanager/lib/ui/keyapprovaldialog.h b/certmanager/lib/ui/keyapprovaldialog.h
index e669690ec..b596fc7cd 100644
--- a/certmanager/lib/ui/keyapprovaldialog.h
+++ b/certmanager/lib/ui/keyapprovaldialog.h
@@ -51,7 +51,7 @@ namespace GpgME {
   class Key;
 }
 
-class QStringList;
+class TQStringList;
 
 namespace Kleo {
 
diff --git a/certmanager/lib/ui/keylistview.h b/certmanager/lib/ui/keylistview.h
index 11301fe5e..2ade61a39 100644
--- a/certmanager/lib/ui/keylistview.h
+++ b/certmanager/lib/ui/keylistview.h
@@ -38,10 +38,10 @@
 #include <gpgmepp/key.h>
 #include <kdepimmacros.h>
 
-class QPainter;
-class QColorGroup;
-class QFont;
-class QColor;
+class TQPainter;
+class TQColorGroup;
+class TQFont;
+class TQColor;
 
 namespace Kleo {
 
diff --git a/certmanager/lib/ui/keyrequester.h b/certmanager/lib/ui/keyrequester.h
index 6392f5c67..07f01b64b 100644
--- a/certmanager/lib/ui/keyrequester.h
+++ b/certmanager/lib/ui/keyrequester.h
@@ -65,10 +65,10 @@ namespace GpgME {
   class KeyListResult;
 }
 
-class QStringList;
-class QString;
-class QPushButton;
-class QLabel;
+class TQStringList;
+class TQString;
+class TQPushButton;
+class TQLabel;
 
 namespace Kleo {
 
diff --git a/certmanager/lib/ui/keyselectiondialog.h b/certmanager/lib/ui/keyselectiondialog.h
index efb87d5e6..fd8f67394 100644
--- a/certmanager/lib/ui/keyselectiondialog.h
+++ b/certmanager/lib/ui/keyselectiondialog.h
@@ -44,13 +44,13 @@
 #include <kdepimmacros.h>
 #include <vector>
 
-class QVBoxLayout;
-class QCheckBox;
-class QPixmap;
-class QTimer;
-class QListViewItem;
-class QRegExp;
-class QPoint;
+class TQVBoxLayout;
+class TQCheckBox;
+class TQPixmap;
+class TQTimer;
+class TQListViewItem;
+class TQRegExp;
+class TQPoint;
 
 namespace Kleo {
   class KeyListView;
diff --git a/certmanager/lib/ui/messagebox.h b/certmanager/lib/ui/messagebox.h
index dad984d06..5ed2edaf4 100644
--- a/certmanager/lib/ui/messagebox.h
+++ b/certmanager/lib/ui/messagebox.h
@@ -46,8 +46,8 @@ namespace Kleo {
     class Job;
 }
 
-class QWidget;
-class QString;
+class TQWidget;
+class TQString;
 
 namespace Kleo {
 
diff --git a/certmanager/lib/ui/progressbar.h b/certmanager/lib/ui/progressbar.h
index 1120a0dd4..21953606d 100644
--- a/certmanager/lib/ui/progressbar.h
+++ b/certmanager/lib/ui/progressbar.h
@@ -35,7 +35,7 @@
 
 #include <tqprogressbar.h>
 #include <kdepimmacros.h>
-class QTimer;
+class TQTimer;
 
 namespace Kleo {
 
diff --git a/kaddressbook/addresseditwidget.h b/kaddressbook/addresseditwidget.h
index 8c02ee681..1fccc604a 100644
--- a/kaddressbook/addresseditwidget.h
+++ b/kaddressbook/addresseditwidget.h
@@ -33,11 +33,11 @@
 #include "addresseeconfig.h"
 #include "typecombo.h"
 
-class QButtonGroup;
-class QCheckBox;
-class QListView;
-class QTextEdit;
-class QToolButton;
+class TQButtonGroup;
+class TQCheckBox;
+class TQListView;
+class TQTextEdit;
+class TQToolButton;
 
 class KActiveLabel;
 class KComboBox;
diff --git a/kaddressbook/addresseeeditordialog.h b/kaddressbook/addresseeeditordialog.h
index 5427a588d..0cd093977 100644
--- a/kaddressbook/addresseeeditordialog.h
+++ b/kaddressbook/addresseeeditordialog.h
@@ -29,7 +29,7 @@
 #include <kabc/addressbook.h>
 
 class AddresseeEditorBase;
-class QWidget;
+class TQWidget;
 namespace KAB { class Core; }
 
 class AddresseeEditorDialog : public KDialogBase
diff --git a/kaddressbook/addresseeeditorwidget.h b/kaddressbook/addresseeeditorwidget.h
index 36711773b..f3e6dc595 100644
--- a/kaddressbook/addresseeeditorwidget.h
+++ b/kaddressbook/addresseeeditorwidget.h
@@ -34,10 +34,10 @@
 #include "contacteditorwidgetmanager.h"
 #include "extensionwidget.h"
 
-class QCheckBox;
-class QSpinBox;
-class QTabWidget;
-class QTextEdit;
+class TQCheckBox;
+class TQSpinBox;
+class TQTabWidget;
+class TQTextEdit;
 
 class KComboBox;
 class KDateEdit;
diff --git a/kaddressbook/addviewdialog.h b/kaddressbook/addviewdialog.h
index a3c956792..13cf2ef89 100644
--- a/kaddressbook/addviewdialog.h
+++ b/kaddressbook/addviewdialog.h
@@ -28,8 +28,8 @@
 #include <tqdict.h>
 #include <tqstring.h>
 
-class QButtonGroup;
-class QLineEdit;
+class TQButtonGroup;
+class TQLineEdit;
 class ViewFactory;
 
 
diff --git a/kaddressbook/contacteditorwidgetmanager.h b/kaddressbook/contacteditorwidgetmanager.h
index 8ffbd1832..d0b03ddf5 100644
--- a/kaddressbook/contacteditorwidgetmanager.h
+++ b/kaddressbook/contacteditorwidgetmanager.h
@@ -32,7 +32,7 @@ namespace KABC {
 class Addressee;
 }
 
-class QGridLayout;
+class TQGridLayout;
 
 class ContactEditorWidgetManager : public QObject
 {
diff --git a/kaddressbook/customfieldswidget.h b/kaddressbook/customfieldswidget.h
index 19e962027..b4c113264 100644
--- a/kaddressbook/customfieldswidget.h
+++ b/kaddressbook/customfieldswidget.h
@@ -36,12 +36,12 @@
 
 #include "contacteditorwidget.h"
 
-class QCheckBox;
-class QGridLayout;
-class QLabel;
-class QPushButton;
-class QVBoxLayout;
-class QWidget;
+class TQCheckBox;
+class TQGridLayout;
+class TQLabel;
+class TQPushButton;
+class TQVBoxLayout;
+class TQWidget;
 
 class KComboBox;
 class KLineEdit;
diff --git a/kaddressbook/distributionlisteditor.cpp b/kaddressbook/distributionlisteditor.cpp
index 1c57a134b..1b379b4a1 100644
--- a/kaddressbook/distributionlisteditor.cpp
+++ b/kaddressbook/distributionlisteditor.cpp
@@ -164,7 +164,7 @@ KPIM::DistributionListEditor::EditorWidget::EditorWidget( KABC::AddressBook* boo
     mainLayout->setMargin( KDialog::marginHint() );
     mainLayout->setSpacing( KDialog::spacingHint() );
 
-    TQHBoxLayout* nameLayout = new QHBoxLayout;
+    TQHBoxLayout* nameLayout = new TQHBoxLayout;
     nameLayout->setSpacing( KDialog::spacingHint() );
     d->nameLabel = new TQLabel( main );
     d->nameLabel->setText( i18n( "Name:" ) );
@@ -186,7 +186,7 @@ KPIM::DistributionListEditor::EditorWidget::EditorWidget( KABC::AddressBook* boo
     d->memberListWidget = new TQWidget( d->scrollView->viewport() );
     d->memberListWidget->setSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding );
     TQVBoxLayout* memberLayout = new TQVBoxLayout( d->memberListWidget );
-    d->addresseeLayout = new QVBoxLayout;
+    d->addresseeLayout = new TQVBoxLayout;
     d->addresseeLayout->setSpacing( KDialog::spacingHint() );
     memberLayout->addItem( d->addresseeLayout );
     memberLayout->addStretch();
diff --git a/kaddressbook/distributionlisteditor_p.h b/kaddressbook/distributionlisteditor_p.h
index 61573ae97..6deb2d004 100644
--- a/kaddressbook/distributionlisteditor_p.h
+++ b/kaddressbook/distributionlisteditor_p.h
@@ -29,7 +29,7 @@
 #include <tqpushbutton.h>
 #include <tqstring.h>
 
-class QToolButton;
+class TQToolButton;
 
 namespace KABC {
     class Addressee;
diff --git a/kaddressbook/distributionlistentryview.cpp b/kaddressbook/distributionlistentryview.cpp
index 8e421a760..c28cbec2b 100644
--- a/kaddressbook/distributionlistentryview.cpp
+++ b/kaddressbook/distributionlistentryview.cpp
@@ -26,7 +26,7 @@ KAB::DistributionListEntryView::DistributionListEntryView( KAB::Core* core, TQWi
     m_mainLayout->setSpacing( KDialog::spacingHint() );
     m_mainLayout->setMargin( KDialog::marginHint() );
 
-    TQBoxLayout* headerLayout = new QHBoxLayout;
+    TQBoxLayout* headerLayout = new TQHBoxLayout;
     headerLayout->setSpacing( KDialog::spacingHint() * 3 );
 
     m_imageLabel = new TQLabel( this );
@@ -39,7 +39,7 @@ KAB::DistributionListEntryView::DistributionListEntryView( KAB::Core* core, TQWi
 
     m_mainLayout->addItem( headerLayout );
 
-    TQBoxLayout* distLayout = new QHBoxLayout;
+    TQBoxLayout* distLayout = new TQHBoxLayout;
     distLayout->setSpacing( KDialog::spacingHint() );
 
     TQLabel* distLabel = new TQLabel( this );
@@ -60,16 +60,16 @@ KAB::DistributionListEntryView::DistributionListEntryView( KAB::Core* core, TQWi
     emailLabel->setAlignment( Qt::SingleLine );
     m_mainLayout->addWidget( emailLabel );
 
-    TQBoxLayout* emailLayout = new QHBoxLayout;
+    TQBoxLayout* emailLayout = new TQHBoxLayout;
     emailLayout->setSpacing( KDialog::spacingHint() );
     emailLayout->addSpacing( 30 );
 
-    m_radioLayout = new QGridLayout;
+    m_radioLayout = new TQGridLayout;
     emailLayout->addItem( m_radioLayout );
     emailLayout->addStretch();
     m_mainLayout->addItem( emailLayout );
 
-    TQBoxLayout* resourceLayout = new QHBoxLayout;
+    TQBoxLayout* resourceLayout = new TQHBoxLayout;
     resourceLayout->setSpacing( KDialog::spacingHint() );
     m_resourceLabel = new TQLabel( this );
     resourceLayout->addWidget( m_resourceLabel );
diff --git a/kaddressbook/distributionlistentryview.h b/kaddressbook/distributionlistentryview.h
index e3d9b8625..3ee06309b 100644
--- a/kaddressbook/distributionlistentryview.h
+++ b/kaddressbook/distributionlistentryview.h
@@ -7,11 +7,11 @@
 #include <tqstring.h>
 #include <tqwidget.h>
 
-class QBoxLayout;
-class QButtonGroup;
-class QComboBox;
-class QGridLayout;
-class QLabel;
+class TQBoxLayout;
+class TQButtonGroup;
+class TQComboBox;
+class TQGridLayout;
+class TQLabel;
 
 class KURLLabel;
 
diff --git a/kaddressbook/editors/cryptowidget.h b/kaddressbook/editors/cryptowidget.h
index 559279855..8037a4a49 100644
--- a/kaddressbook/editors/cryptowidget.h
+++ b/kaddressbook/editors/cryptowidget.h
@@ -26,12 +26,12 @@
 
 #include "contacteditorwidget.h"
 
-class QComboBox;
+class TQComboBox;
 
 namespace Kleo {
   class KeyRequester;
 }
-class QCheckBox;
+class TQCheckBox;
 
 class CryptoWidget : public KAB::ContactEditorWidget
 {
diff --git a/kaddressbook/emaileditwidget.h b/kaddressbook/emaileditwidget.h
index ee9ec0119..ea1af4c3f 100644
--- a/kaddressbook/emaileditwidget.h
+++ b/kaddressbook/emaileditwidget.h
@@ -27,11 +27,11 @@
 #include <kabc/addressee.h>
 #include <kdialogbase.h>
 
-class QButtonGroup;
-class QCheckBox;
-class QListView;
-class QTextEdit;
-class QToolButton;
+class TQButtonGroup;
+class TQCheckBox;
+class TQListView;
+class TQTextEdit;
+class TQToolButton;
 
 class KComboBox;
 class KLineEdit;
diff --git a/kaddressbook/extensionmanager.h b/kaddressbook/extensionmanager.h
index 44cf24c36..054266205 100644
--- a/kaddressbook/extensionmanager.h
+++ b/kaddressbook/extensionmanager.h
@@ -31,8 +31,8 @@
 #include <tqptrlist.h>
 #include <tqstringlist.h>
 
-class QSignalMapper;
-class QWidgetStack;
+class TQSignalMapper;
+class TQWidgetStack;
 class KActionCollection;
 
 namespace KAB {
diff --git a/kaddressbook/features/distributionlistngwidget.h b/kaddressbook/features/distributionlistngwidget.h
index 0bfa3d29d..8c90c0dc5 100644
--- a/kaddressbook/features/distributionlistngwidget.h
+++ b/kaddressbook/features/distributionlistngwidget.h
@@ -31,11 +31,11 @@
 
 #include <tqstringlist.h>
 
-class QDragEnterEvent;
-class QDragMoveEvent;
-class QDropEvent;
-class QPoint;
-class QPushButton;
+class TQDragEnterEvent;
+class TQDragMoveEvent;
+class TQDropEvent;
+class TQPoint;
+class TQPushButton;
 
 namespace KABC {
     class DistributionListManager;
diff --git a/kaddressbook/features/distributionlistwidget.h b/kaddressbook/features/distributionlistwidget.h
index 4ee5e76ad..e74ac758f 100644
--- a/kaddressbook/features/distributionlistwidget.h
+++ b/kaddressbook/features/distributionlistwidget.h
@@ -30,9 +30,9 @@
 
 #include "extensionwidget.h"
 
-class QButtonGroup;
-class QComboBox;
-class QListView;
+class TQButtonGroup;
+class TQComboBox;
+class TQListView;
 
 class DistributionListView;
 
diff --git a/kaddressbook/features/resourceselection.h b/kaddressbook/features/resourceselection.h
index 831cc4a55..21c3ee841 100644
--- a/kaddressbook/features/resourceselection.h
+++ b/kaddressbook/features/resourceselection.h
@@ -28,8 +28,8 @@
 
 #include "extensionwidget.h"
 
-class QListViewItem;
-class QPushButton;
+class TQListViewItem;
+class TQPushButton;
 
 namespace KPIM { class ResourceABC; }
 
diff --git a/kaddressbook/filtereditdialog.h b/kaddressbook/filtereditdialog.h
index b52966b64..2b5d38b6b 100644
--- a/kaddressbook/filtereditdialog.h
+++ b/kaddressbook/filtereditdialog.h
@@ -24,10 +24,10 @@
 #ifndef FILTEREDITDIALOG_H
 #define FILTEREDITDIALOG_H
 
-class QButtonGroup;
-class QString;
-class QToolButton;
-class QWidget;
+class TQButtonGroup;
+class TQString;
+class TQToolButton;
+class TQWidget;
 
 class KLineEdit;
 class KListBox;
diff --git a/kaddressbook/geowidget.h b/kaddressbook/geowidget.h
index 70b677232..0713d02ec 100644
--- a/kaddressbook/geowidget.h
+++ b/kaddressbook/geowidget.h
@@ -37,10 +37,10 @@ class GeoMapWidget;
 class KComboBox;
 class KDoubleSpinBox;
 
-class QCheckBox;
-class QLabel;
-class QSpinBox;
-class QPushButton;
+class TQCheckBox;
+class TQLabel;
+class TQSpinBox;
+class TQPushButton;
 
 typedef struct {
   double latitude;
diff --git a/kaddressbook/imeditwidget.h b/kaddressbook/imeditwidget.h
index 2252981ca..0d1ee222b 100644
--- a/kaddressbook/imeditwidget.h
+++ b/kaddressbook/imeditwidget.h
@@ -27,11 +27,11 @@
 #include <kabc/addressee.h>
 #include <kdialogbase.h>
 
-class QButtonGroup;
-class QCheckBox;
-class QListView;
-class QTextEdit;
-class QToolButton;
+class TQButtonGroup;
+class TQCheckBox;
+class TQListView;
+class TQTextEdit;
+class TQToolButton;
 
 class KComboBox;
 class KLineEdit;
diff --git a/kaddressbook/incsearchwidget.h b/kaddressbook/incsearchwidget.h
index f1ef00f45..0d400c0fb 100644
--- a/kaddressbook/incsearchwidget.h
+++ b/kaddressbook/incsearchwidget.h
@@ -28,8 +28,8 @@
 
 #include <kabc/field.h>
 
-class QComboBox;
-class QTimer;
+class TQComboBox;
+class TQTimer;
 class KLineEdit;
 
 class IncSearchWidget : public QWidget
diff --git a/kaddressbook/interfaces/core.h b/kaddressbook/interfaces/core.h
index 1897a0bd1..16fa4c839 100644
--- a/kaddressbook/interfaces/core.h
+++ b/kaddressbook/interfaces/core.h
@@ -42,7 +42,7 @@ class AddressBook;
 class Resource;
 }
 
-class QWidget;
+class TQWidget;
 
 class KActionCollection;
 class KConfig;
diff --git a/kaddressbook/jumpbuttonbar.h b/kaddressbook/jumpbuttonbar.h
index b092a7587..7ff678985 100644
--- a/kaddressbook/jumpbuttonbar.h
+++ b/kaddressbook/jumpbuttonbar.h
@@ -29,9 +29,9 @@
 #include <tqptrlist.h>
 #include <tqstringlist.h>
 
-class QButtonGroup;
-class QResizeEvent;
-class QPushButton;
+class TQButtonGroup;
+class TQResizeEvent;
+class TQPushButton;
 
 namespace KAB {
 class Core;
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h
index ed6b4ab5f..5a3b0c4b1 100644
--- a/kaddressbook/kabcore.h
+++ b/kaddressbook/kabcore.h
@@ -52,9 +52,9 @@ class KStatusBar;
 class KToggleAction;
 class KXMLGUIClient;
 
-class QSplitter;
-class QHBoxLayout;
-class QWidgetStack;
+class TQSplitter;
+class TQHBoxLayout;
+class TQWidgetStack;
 
 class AddresseeEditorDialog;
 class ExtensionManager;
diff --git a/kaddressbook/kaddressbookview.h b/kaddressbook/kaddressbookview.h
index eb5e25156..a851e684c 100644
--- a/kaddressbook/kaddressbookview.h
+++ b/kaddressbook/kaddressbookview.h
@@ -39,7 +39,7 @@
 class KConfig;
 class KXMLGUIClient;
 
-class QDropEvent;
+class TQDropEvent;
 
 namespace KAB { class Core; }
 namespace KABC { class AddressBook; }
diff --git a/kaddressbook/kcmconfigs/addhostdialog.h b/kaddressbook/kcmconfigs/addhostdialog.h
index 12d145f08..702bb323b 100644
--- a/kaddressbook/kcmconfigs/addhostdialog.h
+++ b/kaddressbook/kcmconfigs/addhostdialog.h
@@ -29,8 +29,8 @@
 #include <libkdepim/ldapclient.h>
 
 class KLineEdit;
-class QPushButton;
-class QSpinBox;
+class TQPushButton;
+class TQSpinBox;
 
 class AddHostDialog : public KDialogBase
 {
diff --git a/kaddressbook/kcmconfigs/addresseewidget.h b/kaddressbook/kcmconfigs/addresseewidget.h
index 9f4b4332a..b8bbf217e 100644
--- a/kaddressbook/kcmconfigs/addresseewidget.h
+++ b/kaddressbook/kcmconfigs/addresseewidget.h
@@ -29,9 +29,9 @@
 class KComboBox;
 class KLineEdit;
 
-class QListBox;
-class QListBoxItem;
-class QPushButton;
+class TQListBox;
+class TQListBoxItem;
+class TQPushButton;
 
 class NamePartWidget : public QWidget
 {
diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.h b/kaddressbook/kcmconfigs/kabconfigwidget.h
index 3e5718690..54cdbf0ee 100644
--- a/kaddressbook/kcmconfigs/kabconfigwidget.h
+++ b/kaddressbook/kcmconfigs/kabconfigwidget.h
@@ -26,11 +26,11 @@
 
 #include <tqwidget.h>
 
-class QCheckBox;
-class QLineEdit;
-class QListViewItem;
-class QPushButton;
-class QComboBox;
+class TQCheckBox;
+class TQLineEdit;
+class TQListViewItem;
+class TQPushButton;
+class TQComboBox;
 
 class KListView;
 
diff --git a/kaddressbook/kcmconfigs/ldapoptionswidget.h b/kaddressbook/kcmconfigs/ldapoptionswidget.h
index 22b7e621e..10f1d90d8 100644
--- a/kaddressbook/kcmconfigs/ldapoptionswidget.h
+++ b/kaddressbook/kcmconfigs/ldapoptionswidget.h
@@ -26,10 +26,10 @@
 
 #include <tqwidget.h>
 
-class QToolButton;
+class TQToolButton;
 class KListView;
-class QListViewItem;
-class QPushButton;
+class TQListViewItem;
+class TQPushButton;
 
 class LDAPOptionsWidget : public QWidget
 {
diff --git a/kaddressbook/keywidget.h b/kaddressbook/keywidget.h
index 2b3b83a0c..566589dde 100644
--- a/kaddressbook/keywidget.h
+++ b/kaddressbook/keywidget.h
@@ -29,7 +29,7 @@
 
 class KComboBox;
 
-class QPushButton;
+class TQPushButton;
 
 class KeyWidget : public QWidget
 {
diff --git a/kaddressbook/ldapsearchdialog.h b/kaddressbook/ldapsearchdialog.h
index 8c368a116..f7f384d50 100644
--- a/kaddressbook/ldapsearchdialog.h
+++ b/kaddressbook/ldapsearchdialog.h
@@ -37,9 +37,9 @@ class KAddressBookTableView;
 class KComboBox;
 class KLineEdit;
 
-class QCheckBox;
-class QListView;
-class QPushButton;
+class TQCheckBox;
+class TQListView;
+class TQPushButton;
 class KABCore;
 class ContactListItem;
 
diff --git a/kaddressbook/nameeditdialog.h b/kaddressbook/nameeditdialog.h
index 6ba602c92..793c1a8f3 100644
--- a/kaddressbook/nameeditdialog.h
+++ b/kaddressbook/nameeditdialog.h
@@ -29,7 +29,7 @@
 
 #include "addresseeconfig.h"
 
-class QCheckBox;
+class TQCheckBox;
 
 class KLineEdit;
 class KComboBox;
diff --git a/kaddressbook/phoneeditwidget.h b/kaddressbook/phoneeditwidget.h
index 7089d1c2b..0db2301ed 100644
--- a/kaddressbook/phoneeditwidget.h
+++ b/kaddressbook/phoneeditwidget.h
@@ -29,9 +29,9 @@
 
 #include "addresseeconfig.h"
 
-class QButtonGroup;
-class QCheckBox;
-class QSignalMapper;
+class TQButtonGroup;
+class TQCheckBox;
+class TQSignalMapper;
 
 class KLineEdit;
 class KComboBox;
diff --git a/kaddressbook/printing/printingwizard.h b/kaddressbook/printing/printingwizard.h
index 8e6a678b5..ab82a8bcb 100644
--- a/kaddressbook/printing/printingwizard.h
+++ b/kaddressbook/printing/printingwizard.h
@@ -39,7 +39,7 @@
 
 
 class KPrinter;
-class QVBoxLayout;
+class TQVBoxLayout;
 
 namespace KABPrinting {
 
diff --git a/kaddressbook/printing/printprogress.h b/kaddressbook/printing/printprogress.h
index 83c6f3391..916d82058 100644
--- a/kaddressbook/printing/printprogress.h
+++ b/kaddressbook/printing/printprogress.h
@@ -26,9 +26,9 @@
 
 #include <tqwidget.h>
 
-class QProgressBar;
-class QString;
-class QTextBrowser;
+class TQProgressBar;
+class TQString;
+class TQTextBrowser;
 
 namespace KABPrinting {
 
diff --git a/kaddressbook/printing/selectionpage.h b/kaddressbook/printing/selectionpage.h
index 457d7f679..031b0b5e2 100644
--- a/kaddressbook/printing/selectionpage.h
+++ b/kaddressbook/printing/selectionpage.h
@@ -26,11 +26,11 @@
 
 #include <tqwidget.h>
 
-class QButtonGroup;
-class QComboBox;
-class QListView;
-class QListViewItem;
-class QRadioButton;
+class TQButtonGroup;
+class TQComboBox;
+class TQListView;
+class TQListViewItem;
+class TQRadioButton;
 
 class SelectionPage : public QWidget
 {
diff --git a/kaddressbook/printing/stylepage.h b/kaddressbook/printing/stylepage.h
index 961ddd84e..91be390fc 100644
--- a/kaddressbook/printing/stylepage.h
+++ b/kaddressbook/printing/stylepage.h
@@ -30,9 +30,9 @@
 #include <kabc/addressbook.h>
 #include <kabc/field.h>
 
-class QLabel;
-class QPixmap;
-class QRadioButton;
+class TQLabel;
+class TQPixmap;
+class TQRadioButton;
 class KComboBox;
 
 class StylePage : public QWidget
diff --git a/kaddressbook/soundwidget.h b/kaddressbook/soundwidget.h
index 7dd0e116a..679609c6c 100644
--- a/kaddressbook/soundwidget.h
+++ b/kaddressbook/soundwidget.h
@@ -30,8 +30,8 @@
 
 class KURLRequester;
 
-class QCheckBox;
-class QPushButton;
+class TQCheckBox;
+class TQPushButton;
 
 class SoundWidget : public KAB::ContactEditorWidget
 {
diff --git a/kaddressbook/viewconfigurefieldspage.h b/kaddressbook/viewconfigurefieldspage.h
index e0ccdb8ba..eae950850 100644
--- a/kaddressbook/viewconfigurefieldspage.h
+++ b/kaddressbook/viewconfigurefieldspage.h
@@ -30,10 +30,10 @@
 #include <kabc/addressbook.h>
 
 class KComboBox;
-class QListBox;
-class QListBoxItem;
-class QPushButton;
-class QToolButton;
+class TQListBox;
+class TQListBoxItem;
+class TQPushButton;
+class TQToolButton;
 
 class ViewConfigureFieldsPage : public QWidget
 {
diff --git a/kaddressbook/viewconfigurefilterpage.h b/kaddressbook/viewconfigurefilterpage.h
index fbb8b987b..77d0bde65 100644
--- a/kaddressbook/viewconfigurefilterpage.h
+++ b/kaddressbook/viewconfigurefilterpage.h
@@ -26,7 +26,7 @@
 
 #include <tqwidget.h>
 
-class QButtonGroup;
+class TQButtonGroup;
 
 class KComboBox;
 class KConfig;
diff --git a/kaddressbook/viewconfigurewidget.h b/kaddressbook/viewconfigurewidget.h
index 590b9fa1e..d3f7022ca 100644
--- a/kaddressbook/viewconfigurewidget.h
+++ b/kaddressbook/viewconfigurewidget.h
@@ -32,8 +32,8 @@
 
 class KJanusWidget;
 
-class QString;
-class QVBox;
+class TQString;
+class TQVBox;
 
 class ViewConfigureFieldsPage;
 class ViewConfigureFilterPage;
diff --git a/kaddressbook/viewmanager.h b/kaddressbook/viewmanager.h
index 4b37b10ba..06405ac64 100644
--- a/kaddressbook/viewmanager.h
+++ b/kaddressbook/viewmanager.h
@@ -28,8 +28,8 @@
 #include <tqwidget.h>
 #include <kaddressbookview.h>
 
-class QDropEvent;
-class QWidgetStack;
+class TQDropEvent;
+class TQWidgetStack;
 
 class KAction;
 class KSelectAction;
diff --git a/kaddressbook/views/cardview.h b/kaddressbook/views/cardview.h
index 6539f4459..5ab75e6ca 100644
--- a/kaddressbook/views/cardview.h
+++ b/kaddressbook/views/cardview.h
@@ -31,10 +31,10 @@
 #include <tqscrollview.h>
 #include <tqstring.h>
 
-class QLabel;
-class QMouseEvent;
-class QPainter;
-class QResizeEvent;
+class TQLabel;
+class TQMouseEvent;
+class TQPainter;
+class TQResizeEvent;
 
 class CardView;
 class CardViewItemPrivate;
diff --git a/kaddressbook/views/configurecardviewdialog.h b/kaddressbook/views/configurecardviewdialog.h
index 4d9d19be5..441a1e89c 100644
--- a/kaddressbook/views/configurecardviewdialog.h
+++ b/kaddressbook/views/configurecardviewdialog.h
@@ -30,10 +30,10 @@
 #include <tqwidget.h>
 #include <tqfont.h>
 
-class QString;
-class QWidget;
-class QCheckBox;
-class QLabel;
+class TQString;
+class TQWidget;
+class TQCheckBox;
+class TQLabel;
 class KConfig;
 
 namespace KABC { class AddressBook; }
diff --git a/kaddressbook/views/configuretableviewdialog.h b/kaddressbook/views/configuretableviewdialog.h
index f1f89d0dc..58bac86d3 100644
--- a/kaddressbook/views/configuretableviewdialog.h
+++ b/kaddressbook/views/configuretableviewdialog.h
@@ -26,10 +26,10 @@
 
 #include "viewconfigurewidget.h"
 
-class QString;
-class QWidget;
-class QRadioButton;
-class QCheckBox;
+class TQString;
+class TQWidget;
+class TQRadioButton;
+class TQCheckBox;
 class KURLRequester;
 class KConfig;
 
diff --git a/kaddressbook/views/contactlistview.h b/kaddressbook/views/contactlistview.h
index ff09dbe35..7936333aa 100644
--- a/kaddressbook/views/contactlistview.h
+++ b/kaddressbook/views/contactlistview.h
@@ -33,7 +33,7 @@
 
 #include <kabc/field.h>
 
-class QDropEvent;
+class TQDropEvent;
 class KAddressBookTableView;
 class ContactListView;
 class KIMProxy;
diff --git a/kaddressbook/views/kaddressbookcardview.h b/kaddressbook/views/kaddressbookcardview.h
index de0120a09..045c1e051 100644
--- a/kaddressbook/views/kaddressbookcardview.h
+++ b/kaddressbook/views/kaddressbookcardview.h
@@ -31,7 +31,7 @@
 #include "kaddressbookview.h"
 
 class QDragEntryEvent;
-class QDropEvent;
+class TQDropEvent;
 class KConfig;
 class AddresseeCardView;
 
diff --git a/kaddressbook/views/kaddressbookiconview.h b/kaddressbook/views/kaddressbookiconview.h
index 21d9bac8e..dc6dddae0 100644
--- a/kaddressbook/views/kaddressbookiconview.h
+++ b/kaddressbook/views/kaddressbookiconview.h
@@ -28,7 +28,7 @@
 #include <kiconview.h>
 #include "kaddressbookview.h"
 
-class QIconViewItem;
+class TQIconViewItem;
 class KConfig;
 class AddresseeIconView;
 class AddresseeIconViewItem;
diff --git a/kaddressbook/views/kaddressbooktableview.h b/kaddressbook/views/kaddressbooktableview.h
index ac0515e9e..d45314123 100644
--- a/kaddressbook/views/kaddressbooktableview.h
+++ b/kaddressbook/views/kaddressbooktableview.h
@@ -38,9 +38,9 @@
 
 #include "kaddressbookview.h"
 
-class QListViewItem;
-class QListBox;
-class QVBoxLayout;
+class TQListViewItem;
+class TQListBox;
+class TQVBoxLayout;
 class KConfig;
 class KIMProxy;
 
diff --git a/kaddressbook/xxport/csvimportdialog.h b/kaddressbook/xxport/csvimportdialog.h
index a34f681e6..baa538e03 100644
--- a/kaddressbook/xxport/csvimportdialog.h
+++ b/kaddressbook/xxport/csvimportdialog.h
@@ -30,13 +30,13 @@
 
 class KURLRequester;
 
-class QButtonGroup;
-class QComboBox;
-class QCheckBox;
-class QLineEdit;
-class QPushButton;
-class QRadioButton;
-class QTable;
+class TQButtonGroup;
+class TQComboBox;
+class TQCheckBox;
+class TQLineEdit;
+class TQPushButton;
+class TQRadioButton;
+class TQTable;
 
 class CSVImportDialog : public KDialogBase
 {
diff --git a/kaddressbook/xxportselectdialog.h b/kaddressbook/xxportselectdialog.h
index 535ad4743..cb620fd39 100644
--- a/kaddressbook/xxportselectdialog.h
+++ b/kaddressbook/xxportselectdialog.h
@@ -30,11 +30,11 @@
 
 #include "filter.h"
 
-class QButtonGroup;
-class QComboBox;
-class QListView;
-class QListViewItem;
-class QRadioButton;
+class TQButtonGroup;
+class TQComboBox;
+class TQListView;
+class TQListViewItem;
+class TQRadioButton;
 
 namespace KAB {
 class Core;
diff --git a/kalarm/alarmtext.h b/kalarm/alarmtext.h
index 56f3cf17e..b839ace28 100644
--- a/kalarm/alarmtext.h
+++ b/kalarm/alarmtext.h
@@ -22,7 +22,7 @@
 #define ALARMTEXT_H
 
 #include <tqstring.h>
-class QStringList;
+class TQStringList;
 class KAEvent;
 
 
diff --git a/kalarm/birthdaydlg.h b/kalarm/birthdaydlg.h
index 412e0ac5e..321288eae 100644
--- a/kalarm/birthdaydlg.h
+++ b/kalarm/birthdaydlg.h
@@ -26,7 +26,7 @@
 
 #include "alarmevent.h"
 
-class QCheckBox;
+class TQCheckBox;
 class KListView;
 class CheckBox;
 class FontColourButton;
diff --git a/kalarm/editdlg.h b/kalarm/editdlg.h
index 069e873f4..500eccb2a 100644
--- a/kalarm/editdlg.h
+++ b/kalarm/editdlg.h
@@ -31,12 +31,12 @@
 #include "datetime.h"
 #include "soundpicker.h"
 
-class QButton;
-class QGroupBox;
-class QComboBox;
-class QTabWidget;
-class QVBox;
-class QHBox;
+class TQButton;
+class TQGroupBox;
+class TQComboBox;
+class TQTabWidget;
+class TQVBox;
+class TQHBox;
 class EmailIdCombo;
 class FontColourButton;
 class ColourCombo;
diff --git a/kalarm/eventlistviewbase.h b/kalarm/eventlistviewbase.h
index 8da8d2c7f..d9b2b097a 100644
--- a/kalarm/eventlistviewbase.h
+++ b/kalarm/eventlistviewbase.h
@@ -28,7 +28,7 @@
 
 #include "alarmevent.h"
 
-class QPixmap;
+class TQPixmap;
 class EventListViewItemBase;
 class Find;
 
diff --git a/kalarm/find.h b/kalarm/find.h
index 12e2a520c..3dba48d94 100644
--- a/kalarm/find.h
+++ b/kalarm/find.h
@@ -25,7 +25,7 @@
 #include <tqguardedptr.h>
 #include <tqstringlist.h>
 
-class QCheckBox;
+class TQCheckBox;
 class KFindDialog;
 class KFind;
 class KSeparator;
diff --git a/kalarm/fontcolour.h b/kalarm/fontcolour.h
index 091e6bd7a..1c91bfa2a 100644
--- a/kalarm/fontcolour.h
+++ b/kalarm/fontcolour.h
@@ -28,7 +28,7 @@
 #include "colourlist.h"
 
 class ColourCombo;
-class QPushButton;
+class TQPushButton;
 class CheckBox;
 
 
diff --git a/kalarm/fontcolourbutton.h b/kalarm/fontcolourbutton.h
index 1b78c434a..f49942eea 100644
--- a/kalarm/fontcolourbutton.h
+++ b/kalarm/fontcolourbutton.h
@@ -26,7 +26,7 @@
 #include <tqframe.h>
 #include <kdialogbase.h>
 
-class QLineEdit;
+class TQLineEdit;
 class FontColourChooser;
 class PushButton;
 
diff --git a/kalarm/functions.h b/kalarm/functions.h
index 359eca65d..762aecc6e 100644
--- a/kalarm/functions.h
+++ b/kalarm/functions.h
@@ -28,9 +28,9 @@
 
 #include "alarmevent.h"
 
-class QObject;
-class QWidget;
-class QString;
+class TQObject;
+class TQWidget;
+class TQString;
 class KAction;
 class KActionCollection;
 namespace KCal { class Event; }
diff --git a/kalarm/kalarmapp.h b/kalarm/kalarmapp.h
index 3f33bfa51..ce1787ff5 100644
--- a/kalarm/kalarmapp.h
+++ b/kalarm/kalarmapp.h
@@ -24,8 +24,8 @@
 /** @file kalarmapp.h - the KAlarm application object */
 
 #include <tqguardedptr.h>
-class QTimer;
-class QDateTime;
+class TQTimer;
+class TQDateTime;
 
 #include <kuniqueapplication.h>
 #include <kurl.h>
diff --git a/kalarm/kalarmiface.h b/kalarm/kalarmiface.h
index 2654072ee..9f74e2824 100644
--- a/kalarm/kalarmiface.h
+++ b/kalarm/kalarmiface.h
@@ -27,7 +27,7 @@
 #include <dcopobject.h>
 #include <kurl.h>
 #include <tqstringlist.h>
-class QString;
+class TQString;
 
 /** KAlarmIface provides a DCOP interface for other applications to request
  *  KAlarm actions.
diff --git a/kalarm/latecancel.h b/kalarm/latecancel.h
index ff20866bd..04d08d62f 100644
--- a/kalarm/latecancel.h
+++ b/kalarm/latecancel.h
@@ -25,8 +25,8 @@
 
 #include "timeperiod.h"
 #include "timeselector.h"
-class QBoxLayout;
-class QWidgetStack;
+class TQBoxLayout;
+class TQWidgetStack;
 class CheckBox;
 
 
diff --git a/kalarm/lib/label.h b/kalarm/lib/label.h
index 4c0d74216..d5f46c4fe 100644
--- a/kalarm/lib/label.h
+++ b/kalarm/lib/label.h
@@ -22,7 +22,7 @@
 #define LABEL_H
 
 #include <tqlabel.h>
-class QRadioButton;
+class TQRadioButton;
 class LabelFocusWidget;
 
 /**
diff --git a/kalarm/lib/synchtimer.h b/kalarm/lib/synchtimer.h
index 1860815e7..bbb3ae833 100644
--- a/kalarm/lib/synchtimer.h
+++ b/kalarm/lib/synchtimer.h
@@ -27,7 +27,7 @@
 #include <tqvaluelist.h>
 #include <tqcstring.h>
 #include <tqdatetime.h>
-class QTimer;
+class TQTimer;
 
 /** SynchTimer is a virtual base class for application-wide timers synchronised
  *  to a time boundary.
diff --git a/kalarm/lib/timeperiod.h b/kalarm/lib/timeperiod.h
index 2f9513dcd..f6f6304fb 100644
--- a/kalarm/lib/timeperiod.h
+++ b/kalarm/lib/timeperiod.h
@@ -24,7 +24,7 @@
 #include <tqhbox.h>
 #include <tqstring.h>
 
-class QWidgetStack;
+class TQWidgetStack;
 class ComboBox;
 class SpinBox;
 class TimeSpinBox;
diff --git a/kalarm/mainwindow.h b/kalarm/mainwindow.h
index 21e47e05e..0faaa75e8 100644
--- a/kalarm/mainwindow.h
+++ b/kalarm/mainwindow.h
@@ -28,7 +28,7 @@
 #include "mainwindowbase.h"
 #include "undo.h"
 
-class QListViewItem;
+class TQListViewItem;
 class KAction;
 class KToggleAction;
 class KToolBarPopupAction;
diff --git a/kalarm/messagewin.h b/kalarm/messagewin.h
index d8f49ec4b..f3ac45f4a 100644
--- a/kalarm/messagewin.h
+++ b/kalarm/messagewin.h
@@ -28,10 +28,10 @@
 #include "mainwindowbase.h"
 #include "alarmevent.h"
 
-class QPushButton;
+class TQPushButton;
 class KPushButton;
-class QLabel;
-class QTimer;
+class TQLabel;
+class TQTimer;
 class KWinModule;
 class AlarmTimeWidget;
 class DeferAlarmDlg;
diff --git a/kalarm/pickfileradio.h b/kalarm/pickfileradio.h
index 974d55023..6d989d5c2 100644
--- a/kalarm/pickfileradio.h
+++ b/kalarm/pickfileradio.h
@@ -25,7 +25,7 @@
 
 #include "radiobutton.h"
 
-class QPushButton;
+class TQPushButton;
 class LineEdit;
 
 /**
diff --git a/kalarm/prefdlg.h b/kalarm/prefdlg.h
index 5eec5f224..6e7c30c55 100644
--- a/kalarm/prefdlg.h
+++ b/kalarm/prefdlg.h
@@ -30,12 +30,12 @@
 #include "recurrenceedit.h"
 #include "soundpicker.h"
 
-class QButtonGroup;
-class QCheckBox;
-class QRadioButton;
-class QPushButton;
-class QComboBox;
-class QLineEdit;
+class TQButtonGroup;
+class TQCheckBox;
+class TQRadioButton;
+class TQPushButton;
+class TQComboBox;
+class TQLineEdit;
 class KColorCombo;
 class FontColourChooser;
 class ButtonGroup;
diff --git a/kalarm/preferences.h b/kalarm/preferences.h
index 38cf9ad8a..de3e04911 100644
--- a/kalarm/preferences.h
+++ b/kalarm/preferences.h
@@ -28,7 +28,7 @@
 #include <tqfont.h>
 #include <tqdatetime.h>
 #include <tqvaluelist.h>
-class QWidget;
+class TQWidget;
 
 #include "colourlist.h"
 #include "editdlg.h"
diff --git a/kalarm/recurrenceedit.h b/kalarm/recurrenceedit.h
index 7700877aa..ca428645f 100644
--- a/kalarm/recurrenceedit.h
+++ b/kalarm/recurrenceedit.h
@@ -29,13 +29,13 @@
 #include <tqvaluelist.h>
 
 #include "datetime.h"
-class QWidgetStack;
-class QGroupBox;
-class QLabel;
-class QListBox;
-class QButton;
-class QPushButton;
-class QBoxLayout;
+class TQWidgetStack;
+class TQGroupBox;
+class TQLabel;
+class TQListBox;
+class TQButton;
+class TQPushButton;
+class TQBoxLayout;
 class SpinBox;
 class CheckBox;
 class RadioButton;
diff --git a/kalarm/recurrenceeditprivate.h b/kalarm/recurrenceeditprivate.h
index b9a1fced5..47dfaa6c2 100644
--- a/kalarm/recurrenceeditprivate.h
+++ b/kalarm/recurrenceeditprivate.h
@@ -25,15 +25,15 @@
 #include <tqvaluelist.h>
 #include <tqbitarray.h>
 
-class QWidget;
-class QVBoxLayout;
+class TQWidget;
+class TQVBoxLayout;
 class ButtonGroup;
 class RadioButton;
 class ComboBox;
 class CheckBox;
 class SpinBox;
 class TimeSpinBox;
-class QString;
+class TQString;
 
 
 class NoRule : public QFrame
diff --git a/kalarm/sounddlg.h b/kalarm/sounddlg.h
index 6bca01d16..639a1c83f 100644
--- a/kalarm/sounddlg.h
+++ b/kalarm/sounddlg.h
@@ -25,8 +25,8 @@
 #include <tqstring.h>
 #include <kdialogbase.h>
 
-class QHBox;
-class QPushButton;
+class TQHBox;
+class TQPushButton;
 class KArtsDispatcher;
 namespace KDE { class PlayObject; }
 class LineEdit;
diff --git a/kalarm/soundpicker.h b/kalarm/soundpicker.h
index b07d63e39..a0a9b83cd 100644
--- a/kalarm/soundpicker.h
+++ b/kalarm/soundpicker.h
@@ -25,7 +25,7 @@
 #include <tqstring.h>
 #include <kurl.h>
 
-class QHBox;
+class TQHBox;
 class ComboBox;
 class PushButton;
 
diff --git a/kalarm/templatedlg.h b/kalarm/templatedlg.h
index f06f0edc4..25b7b66f6 100644
--- a/kalarm/templatedlg.h
+++ b/kalarm/templatedlg.h
@@ -22,7 +22,7 @@
 
 #include <kdialogbase.h>
 
-class QPushButton;
+class TQPushButton;
 class TemplateListView;
 class KAEvent;
 
diff --git a/kalarm/timeselector.h b/kalarm/timeselector.h
index 5c9ca7d56..a2b872423 100644
--- a/kalarm/timeselector.h
+++ b/kalarm/timeselector.h
@@ -24,7 +24,7 @@
 #include <tqframe.h>
 #include "timeperiod.h"
 
-class QLabel;
+class TQLabel;
 class CheckBox;
 
 
diff --git a/kandy/src/atcommand.cpp b/kandy/src/atcommand.cpp
index 20e771cc1..87a2cfdc8 100644
--- a/kandy/src/atcommand.cpp
+++ b/kandy/src/atcommand.cpp
@@ -168,7 +168,7 @@ void ATCommand::setResultFields( TQString fieldsString )
   if ( ( fieldsString[ 0 ] == '(' ) && ( fieldsString[ fieldsString.length() - 1 ] == ')' ) )
     fieldsString = fieldsString.mid( 1, fieldsString.length() - 2 );
 
-  TQStringList *fields = new QStringList;
+  TQStringList *fields = new TQStringList;
   TQStringList TmpFields = TQStringList::split( ',', fieldsString );
   TQString TmpString = "";
   
diff --git a/kandy/src/commanditem.h b/kandy/src/commanditem.h
index ccd89a0a0..39d4a8216 100644
--- a/kandy/src/commanditem.h
+++ b/kandy/src/commanditem.h
@@ -29,8 +29,8 @@
 
 class ATCommand;
 class ATParameter;
-class QDomElement;
-class QDomDocument;
+class TQDomElement;
+class TQDomDocument;
 
 /**
   TQListView item representing a modem command.
diff --git a/kandy/src/commandset.h b/kandy/src/commandset.h
index 3f385fea5..8c3cbc426 100644
--- a/kandy/src/commandset.h
+++ b/kandy/src/commandset.h
@@ -28,8 +28,8 @@
 
 class ATCommand;
 class ATParameter;
-class QDomElement;
-class QDomDocument;
+class TQDomElement;
+class TQDomDocument;
 
 /**
   TQListView item representing a modem command.
diff --git a/kandy/src/kandy.cpp b/kandy/src/kandy.cpp
index d7da32e86..95bf20ac6 100644
--- a/kandy/src/kandy.cpp
+++ b/kandy/src/kandy.cpp
@@ -224,7 +224,7 @@ void Kandy::filePrint()
     // this slot is called whenever the File->Print menu is selected,
     // the Print shortcut is pressed (usually CTRL+P) or the Print toolbar
     // button is clicked
-    if (!mPrinter) mPrinter = new QPrinter;
+    if (!mPrinter) mPrinter = new TQPrinter;
     if (TQPrintDialog::getPrinterSetup(mPrinter))
     {
         // setup the printer.  with Qt, you always "print" to a
diff --git a/kandy/src/kandy.h b/kandy/src/kandy.h
index 3d122dc93..e2a7754bf 100644
--- a/kandy/src/kandy.h
+++ b/kandy/src/kandy.h
@@ -33,7 +33,7 @@
  
 #include "kandyview.h"
 
-class QPrinter;
+class TQPrinter;
 
 class KandyPrefsDialog;
 
diff --git a/kandy/src/kandyview.h b/kandy/src/kandyview.h
index ed5171cac..7c1a1c7ab 100644
--- a/kandy/src/kandyview.h
+++ b/kandy/src/kandyview.h
@@ -26,13 +26,13 @@
 
 #include <tqwidget.h>
 
-class QPainter;
-class QTextStream;
-class QDataStream;
-class QDomDocument;
-class QDomElement;
-class QTextEdit;
-class QListView;
+class TQPainter;
+class TQTextStream;
+class TQDataStream;
+class TQDomDocument;
+class TQDomElement;
+class TQTextEdit;
+class TQListView;
 
 class KURL;
 
diff --git a/kandy/src/mobilegui.cpp b/kandy/src/mobilegui.cpp
index 14c828381..86f075148 100644
--- a/kandy/src/mobilegui.cpp
+++ b/kandy/src/mobilegui.cpp
@@ -916,7 +916,7 @@ void MobileGui::writeKabc()
       
       if ( !equivalentEntryFound ) {
         KABC::Addressee entry;
-        TQStringList *fields = new QStringList;
+        TQStringList *fields = new TQStringList;
 
   
         *fields = TQStringList::split( ',', name );
diff --git a/karm/desktoptracker.h b/karm/desktoptracker.h
index a0377b68d..aa8de2e27 100644
--- a/karm/desktoptracker.h
+++ b/karm/desktoptracker.h
@@ -8,7 +8,7 @@
 #include "desktoplist.h"
 
 class Task;
-class QTimer;
+class TQTimer;
 
 typedef std::vector<Task *> TaskVector;
 const int maxDesktops = 20;
diff --git a/karm/edittaskdialog.h b/karm/edittaskdialog.h
index 91eb361d8..2586d491e 100644
--- a/karm/edittaskdialog.h
+++ b/karm/edittaskdialog.h
@@ -28,11 +28,11 @@
 
 #include "desktoplist.h"
 
-class QComboBox;
-class QLabel;
-class QLineEdit;
-class QRadioButton;
-class QString;
+class TQComboBox;
+class TQLabel;
+class TQLineEdit;
+class TQRadioButton;
+class TQString;
 
 class KArmTimeWidget;
 
diff --git a/karm/idletimedetector.h b/karm/idletimedetector.h
index 8234b427b..42b41d083 100644
--- a/karm/idletimedetector.h
+++ b/karm/idletimedetector.h
@@ -6,7 +6,7 @@
 #include <tqdatetime.h>
 #include <kdebug.h>
 
-class QTimer;
+class TQTimer;
 
 #ifdef HAVE_LIBXSS
  #include <X11/Xlib.h>
diff --git a/karm/kaccelmenuwatch.h b/karm/kaccelmenuwatch.h
index 89da1ce8f..042e4fda7 100644
--- a/karm/kaccelmenuwatch.h
+++ b/karm/kaccelmenuwatch.h
@@ -10,7 +10,7 @@
 
 #include <kaccel.h>
 
-class QPopupMenu;
+class TQPopupMenu;
 
 /**
  * Easy updating of menu accels when changing a KAccel object. 
diff --git a/karm/karm_part.h b/karm/karm_part.h
index 86308b09c..ed0098ad8 100644
--- a/karm/karm_part.h
+++ b/karm/karm_part.h
@@ -11,8 +11,8 @@
 class KAccel;
 class KAccelMenuWatch;
 class KarmTray;
-class QWidget;
-class QPainter;
+class TQWidget;
+class TQPainter;
 class KURL;
 
 class Preferences;
diff --git a/karm/karmstorage.h b/karm/karmstorage.h
index 6c02ca901..c9d91e15f 100644
--- a/karm/karmstorage.h
+++ b/karm/karmstorage.h
@@ -36,7 +36,7 @@
 #include "resourcecalendar.h"
 #include <kdepimmacros.h>
 
-class QDateTime;
+class TQDateTime;
 class Preferences;
 class Task;
 class TaskView;
diff --git a/karm/ktimewidget.h b/karm/ktimewidget.h
index a079fdc9a..88f298b22 100644
--- a/karm/ktimewidget.h
+++ b/karm/ktimewidget.h
@@ -1,8 +1,8 @@
 #ifndef KARM_K_TIME_WIDGET_H
 #define KARM_K_TIME_WIDGET_H
 
-class QLineEdit;
-class QWidget;
+class TQLineEdit;
+class TQWidget;
 
 class KarmLineEdit;
 
diff --git a/karm/mainwindow.h b/karm/mainwindow.h
index f4f25f7d1..b6d77e8a3 100644
--- a/karm/mainwindow.h
+++ b/karm/mainwindow.h
@@ -10,9 +10,9 @@
 class KAccel;
 class KAccelMenuWatch;
 class KarmTray;
-class QListViewItem;
-class QPoint;
-class QString;
+class TQListViewItem;
+class TQPoint;
+class TQString;
 
 class Preferences;
 class PrintDialog;
diff --git a/karm/preferences.h b/karm/preferences.h
index adfcd14ec..33d51dd0c 100644
--- a/karm/preferences.h
+++ b/karm/preferences.h
@@ -3,10 +3,10 @@
 
 #include <kdialogbase.h>
 
-class QCheckBox;
-class QLabel;
-class QSpinBox;
-class QString;
+class TQCheckBox;
+class TQLabel;
+class TQSpinBox;
+class TQString;
 class KURLRequester;
 
 /**
diff --git a/karm/print.h b/karm/print.h
index 22e0d6570..60347f405 100644
--- a/karm/print.h
+++ b/karm/print.h
@@ -5,8 +5,8 @@
 #undef GrayScale // X11 headers
 #include <kprinter.h>
 
-class QPainter;
-class QString;
+class TQPainter;
+class TQString;
 
 class Task;
 class TaskView;
diff --git a/karm/printdialog.h b/karm/printdialog.h
index 089950f8e..1bd1604ec 100644
--- a/karm/printdialog.h
+++ b/karm/printdialog.h
@@ -25,7 +25,7 @@
 #include <kdialogbase.h>
 #include <libkdepim/kdateedit.h>
 
-class QCheckBox;
+class TQCheckBox;
 class KDateEdit;
 
 class PrintDialog : public KDialogBase
diff --git a/karm/reportcriteria.h b/karm/reportcriteria.h
index e8b4c248e..c6c1106e5 100644
--- a/karm/reportcriteria.h
+++ b/karm/reportcriteria.h
@@ -23,7 +23,7 @@
 
 #include <tqdatetime.h>
 #include <kurl.h>
-class QString;
+class TQString;
 
 /**
  Stores entries from export dialog.
diff --git a/karm/task.h b/karm/task.h
index 37e75f12a..8114b3cb6 100644
--- a/karm/task.h
+++ b/karm/task.h
@@ -16,15 +16,15 @@
 // TaskView is a subclass or QListView?)
 #include "taskview.h"
 
-class QFile;
-class QString;
+class TQFile;
+class TQString;
 class KarmStorage;
 
-class QTimer;
+class TQTimer;
 class KCal::Incidence;
 class KCal::Todo;
-class QObject;
-class QPixmap;
+class TQObject;
+class TQPixmap;
 
 /// \class Task
 /** \brief A class representing a task
diff --git a/karm/taskview.h b/karm/taskview.h
index 7b60f7e8f..a3a1a6769 100644
--- a/karm/taskview.h
+++ b/karm/taskview.h
@@ -17,10 +17,10 @@
 
 //#include "karmutility.h"
 
-class QListBox;
-class QString;
-class QTextStream;
-class QTimer;
+class TQListBox;
+class TQString;
+class TQTextStream;
+class TQTimer;
 
 class KMenuBar;
 class KToolBar;
diff --git a/karm/test/lockerthread.h b/karm/test/lockerthread.h
index 95915b478..3aee4a6a2 100644
--- a/karm/test/lockerthread.h
+++ b/karm/test/lockerthread.h
@@ -1,6 +1,6 @@
 #include <tqthread.h>
 
-class QString;
+class TQString;
 
 /** 
  * Attempt to open and lock a calendar resource in a seperate thread.
diff --git a/karm/test/script.h b/karm/test/script.h
index 318d2872b..207d64b54 100644
--- a/karm/test/script.h
+++ b/karm/test/script.h
@@ -23,10 +23,10 @@
 //#include <tqvariant.h>
 #include <tqobject.h>
 
-class QDir;
-class QProcess;
-class QString;
-class QStringList;
+class TQDir;
+class TQProcess;
+class TQString;
+class TQStringList;
 
 class Script : public QObject
 {
diff --git a/karm/timekard.h b/karm/timekard.h
index df0bd3285..5110efdf5 100644
--- a/karm/timekard.h
+++ b/karm/timekard.h
@@ -30,8 +30,8 @@
 
 #include "karmstorage.h"
 
-class QString;
-class QDate;
+class TQString;
+class TQDate;
 
 class TaskView;
 
diff --git a/karm/tray.h b/karm/tray.h
index 6868e060b..255e2d960 100644
--- a/karm/tray.h
+++ b/karm/tray.h
@@ -13,8 +13,8 @@
 
 class KarmPart;
 
-class QPopupMenu;
-class QTimer;
+class TQPopupMenu;
+class TQTimer;
 
 class KSystemTray;
 class MainWindow;
diff --git a/kdgantt/KDGanttMinimizeSplitter.cpp b/kdgantt/KDGanttMinimizeSplitter.cpp
index 60908e8e8..bdd166c5e 100644
--- a/kdgantt/KDGanttMinimizeSplitter.cpp
+++ b/kdgantt/KDGanttMinimizeSplitter.cpp
@@ -323,7 +323,7 @@ void kdganttGeomCalc( TQMemArray<QLayoutStruct> &chain, int start, int count, in
   widget with minimize buttons.
 
   This class (and its documentation) is largely a copy of Qt's
-  QSplitter; the copying was necessary because TQSplitter is not
+  TQSplitter; the copying was necessary because TQSplitter is not
   extensible at all. TQSplitter and its documentation are licensed
   according to the GPL and the Qt Professional License (if you hold
   such a license) and are (C) Trolltech AS.
diff --git a/kdgantt/KDGanttSemiSizingControl.h b/kdgantt/KDGanttSemiSizingControl.h
index af7a74e74..ad7569951 100644
--- a/kdgantt/KDGanttSemiSizingControl.h
+++ b/kdgantt/KDGanttSemiSizingControl.h
@@ -37,8 +37,8 @@
 
 #include "KDGanttSizingControl.h"
 #include <tqlayout.h>
-class QPushButton;
-class QBoxLayout;
+class TQPushButton;
+class TQBoxLayout;
 
 class KDGanttSemiSizingControl : public KDGanttSizingControl
 {
diff --git a/kdgantt/KDGanttView.h b/kdgantt/KDGanttView.h
index b3913d671..4e6b338a6 100644
--- a/kdgantt/KDGanttView.h
+++ b/kdgantt/KDGanttView.h
@@ -52,8 +52,8 @@
 
 class KDIntervalColorRectangle;
 class KDGanttViewTaskLink;
-class QPrinter;
-class QIODevice;
+class TQPrinter;
+class TQIODevice;
 class itemAttributeDialog;
 class KDListView;
 class KDGanttViewItem;
diff --git a/kdgantt/KDGanttViewEventItem.cpp b/kdgantt/KDGanttViewEventItem.cpp
index 01172af82..19bfaeb90 100644
--- a/kdgantt/KDGanttViewEventItem.cpp
+++ b/kdgantt/KDGanttViewEventItem.cpp
@@ -166,7 +166,7 @@ void KDGanttViewEventItem::setStartTime( const TQDateTime& start )
 
 void KDGanttViewEventItem::setLeadTime( const TQDateTime& leadTimeStart )
 {
-  if (!myLeadTime) myLeadTime = new QDateTime;
+  if (!myLeadTime) myLeadTime = new TQDateTime;
   *myLeadTime =  leadTimeStart;
   if ( startTime() < leadTime() )
       setStartTime( leadTimeStart );
diff --git a/kdgantt/KDGanttViewSummaryItem.cpp b/kdgantt/KDGanttViewSummaryItem.cpp
index d73a27257..cb7e2893c 100644
--- a/kdgantt/KDGanttViewSummaryItem.cpp
+++ b/kdgantt/KDGanttViewSummaryItem.cpp
@@ -141,7 +141,7 @@ void KDGanttViewSummaryItem::setMiddleTime( const TQDateTime& dateTime )
     qDebug("KDGanttViewSummaryItem::setMiddleTime():Invalid parameter-no time set");
     return;
   }
-  if (!myMiddleTime) myMiddleTime = new QDateTime;
+  if (!myMiddleTime) myMiddleTime = new TQDateTime;
   *myMiddleTime = dateTime;
   if ( myEndTime < middleTime() )
       setEndTime( middleTime() );
@@ -223,7 +223,7 @@ void KDGanttViewSummaryItem::setStartTime( const TQDateTime& start )
 */
 void KDGanttViewSummaryItem::setActualEndTime( const TQDateTime& end )
 {
-  if (!myActualEndTime) myActualEndTime = new QDateTime;
+  if (!myActualEndTime) myActualEndTime = new TQDateTime;
   *myActualEndTime =  end;
 
   updateCanvasItems();
diff --git a/kdgantt/KDGanttViewTaskItem.h b/kdgantt/KDGanttViewTaskItem.h
index 63b4678e2..6cdb92daf 100644
--- a/kdgantt/KDGanttViewTaskItem.h
+++ b/kdgantt/KDGanttViewTaskItem.h
@@ -38,7 +38,7 @@
 
 #include "KDGanttViewItem.h"
 class KDCanvasRectangle;
-class QBrush;
+class TQBrush;
 
 class KDGanttViewTaskItem : public KDGanttViewItem
 {
diff --git a/kfile-plugins/ics/kfile_ics.h b/kfile-plugins/ics/kfile_ics.h
index 50f0b84c7..f8f29e9cc 100644
--- a/kfile-plugins/ics/kfile_ics.h
+++ b/kfile-plugins/ics/kfile_ics.h
@@ -22,7 +22,7 @@
 
 #include <kfilemetainfo.h>
 
-class QStringList;
+class TQStringList;
 
 class ICSPlugin : public KFilePlugin
 {
diff --git a/kfile-plugins/palm-databases/kfile_palm.h b/kfile-plugins/palm-databases/kfile_palm.h
index d397d49de..1797ee9a9 100644
--- a/kfile-plugins/palm-databases/kfile_palm.h
+++ b/kfile-plugins/palm-databases/kfile_palm.h
@@ -24,7 +24,7 @@
 
 #include <kfilemetainfo.h>
 
-class QStringList;
+class TQStringList;
 
 class KPalmPlugin: public KFilePlugin
 {
diff --git a/kfile-plugins/rfc822/kfile_rfc822.h b/kfile-plugins/rfc822/kfile_rfc822.h
index e78cd3f55..85f026e1e 100644
--- a/kfile-plugins/rfc822/kfile_rfc822.h
+++ b/kfile-plugins/rfc822/kfile_rfc822.h
@@ -22,7 +22,7 @@
 
 #include <kfilemetainfo.h>
 
-class QStringList;
+class TQStringList;
 
 class KRfc822Plugin: public KFilePlugin
 {
diff --git a/kfile-plugins/vcf/kfile_vcf.h b/kfile-plugins/vcf/kfile_vcf.h
index 3bd75fb48..705a9bd7a 100644
--- a/kfile-plugins/vcf/kfile_vcf.h
+++ b/kfile-plugins/vcf/kfile_vcf.h
@@ -22,7 +22,7 @@
 
 #include <kfilemetainfo.h>
 
-class QStringList;
+class TQStringList;
 
 class KVcfPlugin: public KFilePlugin
 {
diff --git a/kioslaves/imap4/imapparser.h b/kioslaves/imap4/imapparser.h
index 61bc2a805..2595d094b 100644
--- a/kioslaves/imap4/imapparser.h
+++ b/kioslaves/imap4/imapparser.h
@@ -39,7 +39,7 @@
 #include "mailheader.h"
 
 class KURL;
-class QString;
+class TQString;
 class mailAddress;
 class mimeHeader;
 
diff --git a/kioslaves/imap4/rfcdecoder.h b/kioslaves/imap4/rfcdecoder.h
index 98a34dc7e..2095b2ed2 100644
--- a/kioslaves/imap4/rfcdecoder.h
+++ b/kioslaves/imap4/rfcdecoder.h
@@ -25,7 +25,7 @@
 
 #include <tqstring.h>
 
-class QTextCodec;
+class TQTextCodec;
 
 /**
  * handler for various rfc/mime encodings
diff --git a/kioslaves/mbox/mbox.h b/kioslaves/mbox/mbox.h
index c8741bf2b..6d207ab3c 100644
--- a/kioslaves/mbox/mbox.h
+++ b/kioslaves/mbox/mbox.h
@@ -21,7 +21,7 @@
 
 #include <kio/slavebase.h>
 
-class QCString;
+class TQCString;
 class KURL;
 
 /**
diff --git a/kioslaves/mbox/readmbox.h b/kioslaves/mbox/readmbox.h
index 6fb7394cb..0f7c4d836 100644
--- a/kioslaves/mbox/readmbox.h
+++ b/kioslaves/mbox/readmbox.h
@@ -24,9 +24,9 @@
 class UrlInfo;
 class MBox;
 
-class QFile;
-class QString;
-class QTextStream;
+class TQFile;
+class TQString;
+class TQTextStream;
 
 struct utimbuf;
 
diff --git a/kioslaves/mbox/stat.h b/kioslaves/mbox/stat.h
index c7474d82a..3efbcaf64 100644
--- a/kioslaves/mbox/stat.h
+++ b/kioslaves/mbox/stat.h
@@ -26,7 +26,7 @@ class UrlInfo;
 
 class KURL;
 
-class QString;
+class TQString;
 
 /**
  * This class is used to get the stats of a mbox-email or mbox-file.
diff --git a/kioslaves/mbox/urlinfo.h b/kioslaves/mbox/urlinfo.h
index feebd689c..b15f64fb1 100644
--- a/kioslaves/mbox/urlinfo.h
+++ b/kioslaves/mbox/urlinfo.h
@@ -20,7 +20,7 @@
 #define URLINFO_H
 class KURL;
 
-class QString;
+class TQString;
 
 class UrlInfo
 {
diff --git a/kitchensync/libqopensync/callbackhandler.h b/kitchensync/libqopensync/callbackhandler.h
index 72845de14..fa6b97c60 100644
--- a/kitchensync/libqopensync/callbackhandler.h
+++ b/kitchensync/libqopensync/callbackhandler.h
@@ -34,7 +34,7 @@ class OSyncMappingUpdate;
 class OSyncEngineUpdate;
 class OSyncMemberUpdate;
 
-class QCustomEvent;
+class TQCustomEvent;
 
 namespace QSync {
 
diff --git a/kitchensync/src/configgui.h b/kitchensync/src/configgui.h
index f339604fc..4309db1b2 100644
--- a/kitchensync/src/configgui.h
+++ b/kitchensync/src/configgui.h
@@ -25,9 +25,9 @@
 
 #include <tqwidget.h>
 
-class QBoxLayout;
+class TQBoxLayout;
 class KLineEdit;
-class QTextEdit;
+class TQTextEdit;
 
 class ConfigGui : public QWidget
 {
diff --git a/kitchensync/src/configguifile.h b/kitchensync/src/configguifile.h
index 4f1a0b345..db9385223 100644
--- a/kitchensync/src/configguifile.h
+++ b/kitchensync/src/configguifile.h
@@ -24,7 +24,7 @@
 #include "configgui.h"
 
 class KURLRequester;
-class QCheckBox;
+class TQCheckBox;
 
 class ConfigGuiFile : public ConfigGui
 {
diff --git a/kitchensync/src/configguigcalendar.h b/kitchensync/src/configguigcalendar.h
index e1ebdef84..198cf77ca 100644
--- a/kitchensync/src/configguigcalendar.h
+++ b/kitchensync/src/configguigcalendar.h
@@ -24,7 +24,7 @@
 
 #include "configgui.h"
 
-class QLineEdit;
+class TQLineEdit;
 
 class ConfigGuiGoogleCalendar : public ConfigGui
 {
diff --git a/kitchensync/src/configguignokii.h b/kitchensync/src/configguignokii.h
index 939e46730..fcb5eaad1 100644
--- a/kitchensync/src/configguignokii.h
+++ b/kitchensync/src/configguignokii.h
@@ -27,9 +27,9 @@
 #include <tqvaluelist.h>
 #include <tqpair.h>
 
-class QLabel;
-class QLineEdit;
-class QComboBox;
+class TQLabel;
+class TQLineEdit;
+class TQComboBox;
 
 class ConfigGuiGnokii : public ConfigGui
 {
diff --git a/kitchensync/src/configguigpe.h b/kitchensync/src/configguigpe.h
index 141f084e3..e1fc10c6e 100644
--- a/kitchensync/src/configguigpe.h
+++ b/kitchensync/src/configguigpe.h
@@ -24,7 +24,7 @@
 
 #include "configgui.h"
 
-class QSpinBox;
+class TQSpinBox;
 
 class KComboBox;
 class KLineEdit;
diff --git a/kitchensync/src/configguiirmc.h b/kitchensync/src/configguiirmc.h
index 20f1197c8..5e8250d17 100644
--- a/kitchensync/src/configguiirmc.h
+++ b/kitchensync/src/configguiirmc.h
@@ -30,9 +30,9 @@
 
 class KComboBox;
 class KLineEdit;
-class QCheckBox;
-class QPushButton;
-class QSpinBox;
+class TQCheckBox;
+class TQPushButton;
+class TQSpinBox;
 
 class ConfigGuiIRMC : public ConfigGui
 {
diff --git a/kitchensync/src/configguijescs.h b/kitchensync/src/configguijescs.h
index 672d81b72..1667900c9 100644
--- a/kitchensync/src/configguijescs.h
+++ b/kitchensync/src/configguijescs.h
@@ -25,7 +25,7 @@
 #include "configgui.h"
 
 class KLineEdit;
-class QCheckBox;
+class TQCheckBox;
 
 class ConfigGuiJescs : public ConfigGui
 {
diff --git a/kitchensync/src/configguildap.h b/kitchensync/src/configguildap.h
index d40c01e38..a73eae5b3 100644
--- a/kitchensync/src/configguildap.h
+++ b/kitchensync/src/configguildap.h
@@ -25,9 +25,9 @@
 #include "configgui.h"
 #include "kabc/ldapconfigwidget.h"
 
-class QCheckBox;
-class QLabel;
-class QSpinBox;
+class TQCheckBox;
+class TQLabel;
+class TQSpinBox;
 
 class KABC::LdapConfigWidget;
 class KComboBox;
diff --git a/kitchensync/src/configguiopie.h b/kitchensync/src/configguiopie.h
index 8d5e195a2..e90f4acfe 100644
--- a/kitchensync/src/configguiopie.h
+++ b/kitchensync/src/configguiopie.h
@@ -23,9 +23,9 @@
 
 #include "configgui.h"
 
-class QComboBox;
-class QLineEdit;
-class QSpinBox;
+class TQComboBox;
+class TQLineEdit;
+class TQSpinBox;
 
 class ConfigGuiOpie : public ConfigGui
 {
diff --git a/kitchensync/src/configguipalm.h b/kitchensync/src/configguipalm.h
index bfae30a24..354e5a29f 100644
--- a/kitchensync/src/configguipalm.h
+++ b/kitchensync/src/configguipalm.h
@@ -26,9 +26,9 @@
 
 class KComboBox;
 class KLineEdit;
-class QCheckBox;
-class QRadioButton;
-class QSpinBox;
+class TQCheckBox;
+class TQRadioButton;
+class TQSpinBox;
 
 class ConfigGuiPalm : public ConfigGui
 {
diff --git a/kitchensync/src/configguisunbird.h b/kitchensync/src/configguisunbird.h
index 98164a2e1..d8401bd83 100644
--- a/kitchensync/src/configguisunbird.h
+++ b/kitchensync/src/configguisunbird.h
@@ -25,12 +25,12 @@
 
 #include "configgui.h"
 
-class QWidget;
-class QSpinBox;
-class QCheckBox;
-class QVBoxLayout;
-class QSpacerItem;
-class QSignalMapper;
+class TQWidget;
+class TQSpinBox;
+class TQCheckBox;
+class TQVBoxLayout;
+class TQSpacerItem;
+class TQSignalMapper;
 
 class KURLRequester;
 class KPushButton;
diff --git a/kitchensync/src/configguisynce.h b/kitchensync/src/configguisynce.h
index 9d5f126be..680b1b128 100644
--- a/kitchensync/src/configguisynce.h
+++ b/kitchensync/src/configguisynce.h
@@ -24,7 +24,7 @@
 
 #include "configgui.h"
 
-class QCheckBox;
+class TQCheckBox;
 
 class KLineEdit;
 
diff --git a/kitchensync/src/configguisyncmlhttp.h b/kitchensync/src/configguisyncmlhttp.h
index 8230f6d0c..784a7fe08 100644
--- a/kitchensync/src/configguisyncmlhttp.h
+++ b/kitchensync/src/configguisyncmlhttp.h
@@ -25,10 +25,10 @@
 
 #include "configgui.h"
 
-class QCheckBox;
-class QComboBox;
-class QGridLayout;
-class QSpinBox;
+class TQCheckBox;
+class TQComboBox;
+class TQGridLayout;
+class TQSpinBox;
 class KComboBox;
 class KLineEdit;
 
diff --git a/kitchensync/src/configguisyncmlobex.h b/kitchensync/src/configguisyncmlobex.h
index 028f8b077..c45f842b8 100644
--- a/kitchensync/src/configguisyncmlobex.h
+++ b/kitchensync/src/configguisyncmlobex.h
@@ -27,10 +27,10 @@
 #include "configgui.h"
 #include "connectionwidgets.h"
 
-class QCheckBox;
-class QComboBox;
-class QGridLayout;
-class QSpinBox;
+class TQCheckBox;
+class TQComboBox;
+class TQGridLayout;
+class TQSpinBox;
 class KComboBox;
 class KLineEdit;
 class KURLRequester;
diff --git a/kitchensync/src/connectionwidgets.h b/kitchensync/src/connectionwidgets.h
index b9cc25e8a..d3326acbb 100644
--- a/kitchensync/src/connectionwidgets.h
+++ b/kitchensync/src/connectionwidgets.h
@@ -27,10 +27,10 @@
 
 #include "configgui.h"
 
-class QCheckBox;
-class QLabel;
-class QPushButton;
-class QSpinBox;
+class TQCheckBox;
+class TQLabel;
+class TQPushButton;
+class TQSpinBox;
 
 class KComboBox;
 class KLineEdit;
diff --git a/kitchensync/src/groupconfig.h b/kitchensync/src/groupconfig.h
index 3c23b6925..8dc300b6b 100644
--- a/kitchensync/src/groupconfig.h
+++ b/kitchensync/src/groupconfig.h
@@ -23,8 +23,8 @@
 #include <tqwidget.h>
 #include <tqvaluelist.h>
 
-class QFrame;
-class QLabel;
+class TQFrame;
+class TQLabel;
 class KJanusWidget;
 
 class GroupConfigCommon;
diff --git a/kitchensync/src/groupconfigcommon.h b/kitchensync/src/groupconfigcommon.h
index 6721358e6..a953607fe 100644
--- a/kitchensync/src/groupconfigcommon.h
+++ b/kitchensync/src/groupconfigcommon.h
@@ -28,7 +28,7 @@
 
 class KLineEdit;
 class SyncProcess;
-class QCheckBox;
+class TQCheckBox;
 
 class ObjectTypeSelector : public QWidget
 {
diff --git a/kitchensync/src/groupitem.h b/kitchensync/src/groupitem.h
index c53f26c0b..5f2543a72 100644
--- a/kitchensync/src/groupitem.h
+++ b/kitchensync/src/groupitem.h
@@ -33,9 +33,9 @@ class Engine;
 
 class MemberItem;
 class KURLLabel;
-class QLabel;
-class QProgressBar;
-class QVBox;
+class TQLabel;
+class TQProgressBar;
+class TQVBox;
 
 class GroupItem : public KWidgetListItem
 {
diff --git a/kitchensync/src/groupview.h b/kitchensync/src/groupview.h
index 4d2917b42..5d1e4791c 100644
--- a/kitchensync/src/groupview.h
+++ b/kitchensync/src/groupview.h
@@ -24,7 +24,7 @@
 
 class AboutPage;
 class SyncProcess;
-class QVBoxLayout;
+class TQVBoxLayout;
 
 class GroupView : public QWidget
 {
diff --git a/kitchensync/src/memberconfig.h b/kitchensync/src/memberconfig.h
index 6e10da3dd..c6457972d 100644
--- a/kitchensync/src/memberconfig.h
+++ b/kitchensync/src/memberconfig.h
@@ -24,7 +24,7 @@
 
 #include <tqwidget.h>
 
-class QTextEdit;
+class TQTextEdit;
 class ConfigGui;
 
 class MemberConfig : public QWidget
diff --git a/kmail/accountdialog.h b/kmail/accountdialog.h
index 837e23cf7..085e40d99 100644
--- a/kmail/accountdialog.h
+++ b/kmail/accountdialog.h
@@ -29,19 +29,19 @@
 #include <tqguardedptr.h>
 #include "imapaccountbase.h"
 
-class QRegExpValidator;
-class QCheckBox;
-class QComboBox;
-class QPushButton;
-class QLabel;
-class QLineEdit;
-class QRadioButton;
-class QToolButton;
+class TQRegExpValidator;
+class TQCheckBox;
+class TQComboBox;
+class TQPushButton;
+class TQLabel;
+class TQLineEdit;
+class TQRadioButton;
+class TQToolButton;
 class KIntNumInput;
 class KMAccount;
 class KMFolder;
 class KMServerTest;
-class QButtonGroup;
+class TQButtonGroup;
 
 namespace KPIM {
 class IdentityCombo;
diff --git a/kmail/accountmanager.h b/kmail/accountmanager.h
index 95b7b49e9..94bf470ad 100644
--- a/kmail/accountmanager.h
+++ b/kmail/accountmanager.h
@@ -24,8 +24,8 @@
 #include "kmaccount.h"
 #include <kdepimmacros.h>
 
-class QString;
-class QStringList;
+class TQString;
+class TQStringList;
 
 namespace KMail {
 /**
diff --git a/kmail/accountwizard.h b/kmail/accountwizard.h
index 56cba599c..51e19b10d 100644
--- a/kmail/accountwizard.h
+++ b/kmail/accountwizard.h
@@ -32,9 +32,9 @@
 #include <kwizard.h>
 
 class KLineEdit;
-class QCheckBox;
-class QLabel;
-class QPushButton;
+class TQCheckBox;
+class TQLabel;
+class TQPushButton;
 
 class KMAccount;
 class KMKernel;
diff --git a/kmail/antispamconfig.h b/kmail/antispamconfig.h
index b4e73041e..e2aa2eca5 100644
--- a/kmail/antispamconfig.h
+++ b/kmail/antispamconfig.h
@@ -37,8 +37,8 @@
 #include <tqvaluelist.h>
 #include <tqregexp.h>
 
-class QString;
-class QCString;
+class TQString;
+class TQCString;
 
 namespace KMail {
 
diff --git a/kmail/antispamwizard.h b/kmail/antispamwizard.h
index be2e67e87..e9707e822 100644
--- a/kmail/antispamwizard.h
+++ b/kmail/antispamwizard.h
@@ -40,7 +40,7 @@
 class KActionCollection;
 class KMFolder;
 class KMFolderTree;
-class QLabel;
+class TQLabel;
 
 namespace KMail {
 
diff --git a/kmail/attachmentlistview.h b/kmail/attachmentlistview.h
index cd9a6e560..2c8f2800a 100644
--- a/kmail/attachmentlistview.h
+++ b/kmail/attachmentlistview.h
@@ -18,9 +18,9 @@
 
 #include <klistview.h>
 
-class QDragEnterEvent;
-class QDragMoveEvent;
-class QDropEvent;
+class TQDragEnterEvent;
+class TQDragMoveEvent;
+class TQDropEvent;
 class KMComposeWin;
 
 namespace KMail {
diff --git a/kmail/attachmentstrategy.h b/kmail/attachmentstrategy.h
index 7d052b695..e4440b246 100644
--- a/kmail/attachmentstrategy.h
+++ b/kmail/attachmentstrategy.h
@@ -32,7 +32,7 @@
 #ifndef __KMAIL_ATTACHMENTSTRATEGY_H__
 #define __KMAIL_ATTACHMENTSTRATEGY_H__
 
-class QString;
+class TQString;
 class partNode;
 
 namespace KMail {
diff --git a/kmail/bodypartformatterfactory.h b/kmail/bodypartformatterfactory.h
index 4763a7d8a..90217153d 100644
--- a/kmail/bodypartformatterfactory.h
+++ b/kmail/bodypartformatterfactory.h
@@ -34,8 +34,8 @@
 #ifndef __KMAIL_BODYPARTFORMATTERFACTORY_H__
 #define __KMAIL_BODYPARTFORMATTERFACTORY_H__
 
-class QString;
-class QCString;
+class TQString;
+class TQCString;
 
 namespace KMail {
 
diff --git a/kmail/chiasmuskeyselector.h b/kmail/chiasmuskeyselector.h
index 0272016a9..8ee24c713 100644
--- a/kmail/chiasmuskeyselector.h
+++ b/kmail/chiasmuskeyselector.h
@@ -4,7 +4,7 @@
 #include <kdialogbase.h>
 class KListBox;
 class KLineEdit;
-class QLabel;
+class TQLabel;
 
 class ChiasmusKeySelector : public KDialogBase
 {
diff --git a/kmail/composer.h b/kmail/composer.h
index a4eb179d1..4c176aa14 100644
--- a/kmail/composer.h
+++ b/kmail/composer.h
@@ -16,7 +16,7 @@
 class KMMessage;
 class KMFolder;
 class KMMessagePart;
-class QListViewItem;
+class TQListViewItem;
 class MailComposerIface;
 
 namespace KIO {
diff --git a/kmail/configuredialog_p.h b/kmail/configuredialog_p.h
index 4a3321094..54db5c8e7 100644
--- a/kmail/configuredialog_p.h
+++ b/kmail/configuredialog_p.h
@@ -20,20 +20,20 @@
 #include <klocale.h>
 #include <kdepimmacros.h>
 
-class QPushButton;
-class QLabel;
-class QCheckBox;
+class TQPushButton;
+class TQLabel;
+class TQCheckBox;
 class KURLRequester;
 class KFontChooser;
-class QRadioButton;
+class TQRadioButton;
 class ColorListBox;
-class QFont;
-class QListViewItem;
-class QTabWidget;
-class QListBox;
-class QButtonGroup;
-class QRegExpValidator;
-class QVBox;
+class TQFont;
+class TQListViewItem;
+class TQTabWidget;
+class TQListBox;
+class TQButtonGroup;
+class TQRegExpValidator;
+class TQVBox;
 class KMAccount;
 class KMTransportInfo;
 class ListView;
@@ -41,23 +41,23 @@ class ConfigureDialog;
 class KIntSpinBox;
 class SimpleStringListEditor;
 class KConfig;
-class QPoint;
+class TQPoint;
 class ComposerCryptoConfiguration;
 class WarningConfiguration;
 class SMimeConfiguration;
 class TemplatesConfiguration;
 class CustomTemplates;
-class QGroupBox;
-class QVGroupBox;
+class TQGroupBox;
+class TQVGroupBox;
 #include <tqdict.h>
-class QLineEdit;
+class TQLineEdit;
 class KMMsgTagDesc;
 class KListBox;
 class KColorCombo;
 class KFontRequester;
 class KIconButton;
 class KKeyButton;
-class QSpinBox;
+class TQSpinBox;
 
 namespace Kpgp {
   class Config;
diff --git a/kmail/dictionarycombobox.h b/kmail/dictionarycombobox.h
index 0fcbdceb2..1222e1250 100644
--- a/kmail/dictionarycombobox.h
+++ b/kmail/dictionarycombobox.h
@@ -35,8 +35,8 @@
 #include <tqcombobox.h>
 
 class KSpellConfig;
-class QStringList;
-class QString;
+class TQStringList;
+class TQString;
 
 namespace KMail {
 
diff --git a/kmail/distributionlistdialog.h b/kmail/distributionlistdialog.h
index 84c96d5f2..6643557c4 100644
--- a/kmail/distributionlistdialog.h
+++ b/kmail/distributionlistdialog.h
@@ -25,7 +25,7 @@
 
 #include "recipientseditor.h"
 
-class QLineEdit;
+class TQLineEdit;
 class KListView;
 
 class DistributionListDialog : public KDialogBase
diff --git a/kmail/encodingdetector.h b/kmail/encodingdetector.h
index 0d1c000ab..378a1e07c 100644
--- a/kmail/encodingdetector.h
+++ b/kmail/encodingdetector.h
@@ -25,8 +25,8 @@
 
 #include <tqstring.h>
 
-class QTextCodec;
-class QTextDecoder;
+class TQTextCodec;
+class TQTextDecoder;
 class EncodingDetectorPrivate;
 
 /**
diff --git a/kmail/expirypropertiesdialog.h b/kmail/expirypropertiesdialog.h
index d23bab2a0..d3ef7cfd3 100644
--- a/kmail/expirypropertiesdialog.h
+++ b/kmail/expirypropertiesdialog.h
@@ -13,16 +13,16 @@
 #include <tqvariant.h>
 #include <kdialogbase.h>
 
-class QVBoxLayout;
-class QHBoxLayout;
-class QGridLayout;
-class QSpacerItem;
-class QGroupBox;
-class QCheckBox;
-class QSpinBox;
-class QLabel;
-class QRadioButton;
-class QButtonGroup;
+class TQVBoxLayout;
+class TQHBoxLayout;
+class TQGridLayout;
+class TQSpacerItem;
+class TQGroupBox;
+class TQCheckBox;
+class TQSpinBox;
+class TQLabel;
+class TQRadioButton;
+class TQButtonGroup;
 class KMFolderTree;
 class KMFolder;
 
diff --git a/kmail/filehtmlwriter.h b/kmail/filehtmlwriter.h
index 9897bc5e4..b9090c63e 100644
--- a/kmail/filehtmlwriter.h
+++ b/kmail/filehtmlwriter.h
@@ -37,7 +37,7 @@
 #include <tqfile.h>
 #include <tqtextstream.h>
 
-class QString;
+class TQString;
 
 namespace KMail {
 
diff --git a/kmail/filterimporterexporter.h b/kmail/filterimporterexporter.h
index c6386b42f..75f43d14f 100644
--- a/kmail/filterimporterexporter.h
+++ b/kmail/filterimporterexporter.h
@@ -34,7 +34,7 @@
 
 class KMFilter;
 class KConfig;
-class QWidget;
+class TQWidget;
 
 namespace KMail
 {
diff --git a/kmail/filterlogdlg.h b/kmail/filterlogdlg.h
index 5b8cd6af6..af1be64ef 100644
--- a/kmail/filterlogdlg.h
+++ b/kmail/filterlogdlg.h
@@ -31,10 +31,10 @@
 
 #include <kdialogbase.h>
 
-class QTextEdit;
-class QCheckBox;
-class QSpinBox;
-class QGroupBox;
+class TQTextEdit;
+class TQCheckBox;
+class TQSpinBox;
+class TQGroupBox;
 
 namespace KMail {
 
diff --git a/kmail/folderdiaacltab.h b/kmail/folderdiaacltab.h
index 466ec2d62..87b296eef 100644
--- a/kmail/folderdiaacltab.h
+++ b/kmail/folderdiaacltab.h
@@ -37,9 +37,9 @@
 
 class KMFolderImap;
 class KPushButton;
-class QWidgetStack;
-class QHBox;
-class QVButtonGroup;
+class TQWidgetStack;
+class TQHBox;
+class TQVButtonGroup;
 class KListView;
 namespace KIO { class Job; }
 
diff --git a/kmail/folderdiaquotatab.h b/kmail/folderdiaquotatab.h
index 79032d524..e0b570ee0 100644
--- a/kmail/folderdiaquotatab.h
+++ b/kmail/folderdiaquotatab.h
@@ -39,8 +39,8 @@
 namespace KMail {
   class QuotaWidget;
 }
-class QVBox;
-class QWidgetStack;
+class TQVBox;
+class TQWidgetStack;
 
 namespace KMail {
 
diff --git a/kmail/folderstorage.h b/kmail/folderstorage.h
index 8c4c648f1..e132c7b07 100644
--- a/kmail/folderstorage.h
+++ b/kmail/folderstorage.h
@@ -55,7 +55,7 @@ class KMAccount;
 class KMFolderDir;
 class KMMsgDict; // for the rDict manipulations
 class KMMsgDictREntry;
-class QTimer;
+class TQTimer;
 class KMSearchPattern;
 
 namespace KMail {
diff --git a/kmail/globalsettings.h b/kmail/globalsettings.h
index 665d919cc..eedac97a0 100644
--- a/kmail/globalsettings.h
+++ b/kmail/globalsettings.h
@@ -26,7 +26,7 @@
 
 #include "globalsettings_base.h"
 
-class QTimer;
+class TQTimer;
 
 class GlobalSettings : public TQObject, public GlobalSettingsBase
 {
diff --git a/kmail/headerlistquicksearch.h b/kmail/headerlistquicksearch.h
index a0f7bb14b..09898f95b 100644
--- a/kmail/headerlistquicksearch.h
+++ b/kmail/headerlistquicksearch.h
@@ -35,8 +35,8 @@
 #include "kmsearchpattern.h"
 #include <klistviewsearchline.h>
 #include <tqvaluevector.h>
-class QComboBox;
-class QLabel;
+class TQComboBox;
+class TQLabel;
 class KListView;
 class KActionCollection;
 
diff --git a/kmail/headerstrategy.h b/kmail/headerstrategy.h
index 421117db6..4f49d5491 100644
--- a/kmail/headerstrategy.h
+++ b/kmail/headerstrategy.h
@@ -32,8 +32,8 @@
 #ifndef __KMAIL_HEADERSTRATEGY_H__
 #define __KMAIL_HEADERSTRATEGY_H__
 
-class QString;
-class QStringList;
+class TQString;
+class TQStringList;
 
 namespace KMail {
 
diff --git a/kmail/headerstyle.h b/kmail/headerstyle.h
index f3f89ff8b..2613f6be1 100644
--- a/kmail/headerstyle.h
+++ b/kmail/headerstyle.h
@@ -32,7 +32,7 @@
 #ifndef __KMAIL_HEADERSTYLE_H__
 #define __KMAIL_HEADERSTYLE_H__
 
-class QString;
+class TQString;
 class KMMessage;
 
 namespace KMail {
diff --git a/kmail/htmlstatusbar.h b/kmail/htmlstatusbar.h
index 7c5e7655a..dd7da106e 100644
--- a/kmail/htmlstatusbar.h
+++ b/kmail/htmlstatusbar.h
@@ -34,8 +34,8 @@
 
 #include <tqlabel.h>
 
-class QString;
-class QColor;
+class TQString;
+class TQColor;
 
 namespace KMail {
 
diff --git a/kmail/identitydialog.h b/kmail/identitydialog.h
index c90747fd7..20bb55a70 100644
--- a/kmail/identitydialog.h
+++ b/kmail/identitydialog.h
@@ -35,11 +35,11 @@
 #include <kdialogbase.h>
 
 
-class QLineEdit;
-class QCheckBox;
-class QComboBox;
-class QString;
-class QStringList;
+class TQLineEdit;
+class TQCheckBox;
+class TQComboBox;
+class TQString;
+class TQStringList;
 class TemplatesConfiguration;
 class KPushButton;
 namespace Kleo {
diff --git a/kmail/identitylistview.h b/kmail/identitylistview.h
index 6b8e36e24..556132bf5 100644
--- a/kmail/identitylistview.h
+++ b/kmail/identitylistview.h
@@ -35,7 +35,7 @@
 #include <klistview.h>
 
 namespace KPIM { class Identity; }
-class QDropEvent;
+class TQDropEvent;
 class QDragEvent;
 
 namespace KMail {
diff --git a/kmail/imapaccountbase.h b/kmail/imapaccountbase.h
index 46fd577c5..26d7a4b01 100644
--- a/kmail/imapaccountbase.h
+++ b/kmail/imapaccountbase.h
@@ -39,7 +39,7 @@ class KMMessagePart;
 class DwBodyPart;
 class DwMessage;
 class FolderStorage;
-template <typename T> class QValueVector;
+template <typename T> class TQValueVector;
 
 namespace KIO {
   class Job;
diff --git a/kmail/interfaces/bodypart.h b/kmail/interfaces/bodypart.h
index e38296a56..8d3e1bbca 100644
--- a/kmail/interfaces/bodypart.h
+++ b/kmail/interfaces/bodypart.h
@@ -34,9 +34,9 @@
 #ifndef __KMAIL_INTERFACES_BODYPART_H__
 #define __KMAIL_INTERFACES_BODYPART_H__
 
-template <typename T> class QMemArray;
-typedef TQMemArray<char> QByteArray;
-class QString;
+template <typename T> class TQMemArray;
+typedef TQMemArray<char> TQByteArray;
+class TQString;
 
 namespace KMail {
   namespace Interface {
diff --git a/kmail/interfaces/bodyparturlhandler.h b/kmail/interfaces/bodyparturlhandler.h
index 5dff819e8..be34e74a3 100644
--- a/kmail/interfaces/bodyparturlhandler.h
+++ b/kmail/interfaces/bodyparturlhandler.h
@@ -33,8 +33,8 @@
 #ifndef __KMAIL_INTERFACE_BODYPARTURLHANDLER_H__
 #define __KMAIL_INTERFACE_BODYPARTURLHANDLER_H__
 
-class QString;
-class QPoint;
+class TQString;
+class TQPoint;
 
 namespace KMail {
   class Callback;
diff --git a/kmail/interfaces/htmlwriter.h b/kmail/interfaces/htmlwriter.h
index b95526b3c..963835357 100644
--- a/kmail/interfaces/htmlwriter.h
+++ b/kmail/interfaces/htmlwriter.h
@@ -33,8 +33,8 @@
 #ifndef __KMAIL_INTERFACES_HTMLWRITER_H__
 #define __KMAIL_INTERFACES_HTMLWRITER_H__
 
-class QCString;
-class QString;
+class TQCString;
+class TQString;
 
 namespace KMail {
 
diff --git a/kmail/interfaces/rulewidgethandler.h b/kmail/interfaces/rulewidgethandler.h
index 36b09110b..4d3eca8b3 100644
--- a/kmail/interfaces/rulewidgethandler.h
+++ b/kmail/interfaces/rulewidgethandler.h
@@ -35,11 +35,11 @@
 
 #include "../kmsearchpattern.h"
 
-class QWidget;
-class QWidgetStack;
-class QCString;
-class QString;
-class QObject;
+class TQWidget;
+class TQWidgetStack;
+class TQCString;
+class TQString;
+class TQObject;
 
 namespace KMail {
   /**
diff --git a/kmail/interfaces/urlhandler.h b/kmail/interfaces/urlhandler.h
index b19b7e199..fba673d65 100644
--- a/kmail/interfaces/urlhandler.h
+++ b/kmail/interfaces/urlhandler.h
@@ -34,8 +34,8 @@
 
 class KURL;
 
-class QString;
-class QPoint;
+class TQString;
+class TQPoint;
 class KMReaderWin;
 
 namespace KMail {
diff --git a/kmail/keyresolver.h b/kmail/keyresolver.h
index 1232d560c..f39a0f96e 100644
--- a/kmail/keyresolver.h
+++ b/kmail/keyresolver.h
@@ -46,7 +46,7 @@
 
 #include <vector>
 
-class QStringList;
+class TQStringList;
 
 namespace Kleo {
 
diff --git a/kmail/khtmlparthtmlwriter.h b/kmail/khtmlparthtmlwriter.h
index 82679d1e6..482d9b2c8 100644
--- a/kmail/khtmlparthtmlwriter.h
+++ b/kmail/khtmlparthtmlwriter.h
@@ -38,7 +38,7 @@
 #include <tqstringlist.h>
 #include <tqtimer.h>
 
-class QString;
+class TQString;
 class KHTMLPart;
 
 namespace KMail {
diff --git a/kmail/klistboxdialog.h b/kmail/klistboxdialog.h
index d0f98ebb6..e245d1df7 100644
--- a/kmail/klistboxdialog.h
+++ b/kmail/klistboxdialog.h
@@ -3,8 +3,8 @@
 
 #include <kdialogbase.h>
 
-class QLabel;
-class QListBox;
+class TQLabel;
+class TQListBox;
 
 class KListBoxDialog : public KDialogBase
 {
diff --git a/kmail/klistviewindexedsearchline.h b/kmail/klistviewindexedsearchline.h
index 17b991d43..5bd67e4bf 100644
--- a/kmail/klistviewindexedsearchline.h
+++ b/kmail/klistviewindexedsearchline.h
@@ -38,8 +38,8 @@
 #include <vector>
 
 class KListView;
-class QListViewItem;
-class QToolButton;
+class TQListViewItem;
+class TQToolButton;
 class KListViewSearchLine;
 
 /**
diff --git a/kmail/kmaccount.h b/kmail/kmaccount.h
index c54611cbd..44cd67b0d 100644
--- a/kmail/kmaccount.h
+++ b/kmail/kmaccount.h
@@ -29,7 +29,7 @@
 #include <tqmap.h>
 
 #include "kmmessage.h"
-class QTimer;
+class TQTimer;
 
 class KMFolder;
 class KMAcctFolder;
diff --git a/kmail/kmaddrbook.h b/kmail/kmaddrbook.h
index 119943f0f..ea767d421 100644
--- a/kmail/kmaddrbook.h
+++ b/kmail/kmaddrbook.h
@@ -25,7 +25,7 @@
 #include <kdeversion.h>
 #include <kabc/addressee.h>
 
-class QWidget;
+class TQWidget;
 
 class KabcBridge {
 public:
diff --git a/kmail/kmatmlistview.h b/kmail/kmatmlistview.h
index e42f2628e..35a65859c 100644
--- a/kmail/kmatmlistview.h
+++ b/kmail/kmatmlistview.h
@@ -10,7 +10,7 @@
 
 class KMComposeWin;
 class MessageComposer;
-class QCheckBox;
+class TQCheckBox;
 
 class KMAtmListViewItem : public TQObject, public QListViewItem
 {
diff --git a/kmail/kmcommands.h b/kmail/kmcommands.h
index d9c0e8392..7d1385a66 100644
--- a/kmail/kmcommands.h
+++ b/kmail/kmcommands.h
@@ -17,7 +17,7 @@
 #include <kservice.h>
 #include <ktempfile.h>
 
-class QPopupMenu;
+class TQPopupMenu;
 class KMainWindow;
 class KAction;
 class KProgressDialog;
diff --git a/kmail/kmcomposewin.h b/kmail/kmcomposewin.h
index ba4c94f3b..7f003d44a 100644
--- a/kmail/kmcomposewin.h
+++ b/kmail/kmcomposewin.h
@@ -42,14 +42,14 @@
 
 #include <kleo/enum.h>
 
-class QCloseEvent;
-class QComboBox;
-class QFrame;
-class QGridLayout;
-class QListView;
-class QPopupMenu;
-class QPushButton;
-class QCString;
+class TQCloseEvent;
+class TQComboBox;
+class TQFrame;
+class TQGridLayout;
+class TQListView;
+class TQPopupMenu;
+class TQPushButton;
+class TQCString;
 class KCompletion;
 class KMEdit;
 class KMComposeWin;
diff --git a/kmail/kmedit.h b/kmail/kmedit.h
index a44642baa..b8419cda8 100644
--- a/kmail/kmedit.h
+++ b/kmail/kmedit.h
@@ -19,7 +19,7 @@ class KTempFile;
 class KDictSpellingHighlighter;
 class KDirWatch;
 class KProcess;
-class QPopupMenu;
+class TQPopupMenu;
 
 
 class KMEdit : public KEdit {
diff --git a/kmail/kmfawidgets.h b/kmail/kmfawidgets.h
index 05b763df2..716cd2aae 100644
--- a/kmail/kmfawidgets.h
+++ b/kmail/kmfawidgets.h
@@ -12,7 +12,7 @@
     @author Marc Mutz <mutz@kde.org>
 */
 
-class QPushButton;
+class TQPushButton;
 class KURLRequester;
 
 class KMFilterActionWithAddressWidget : public QWidget
diff --git a/kmail/kmfilter.h b/kmail/kmfilter.h
index 87820777d..4414f59d8 100644
--- a/kmail/kmfilter.h
+++ b/kmail/kmfilter.h
@@ -27,7 +27,7 @@
 
 #include <tqptrlist.h>
 
-class QString;
+class TQString;
 class KConfig;
 class KMMessage;
 class KMFilterAction;
diff --git a/kmail/kmfilteraction.h b/kmail/kmfilteraction.h
index c47a4a6d5..35f7008e4 100644
--- a/kmail/kmfilteraction.h
+++ b/kmail/kmfilteraction.h
@@ -32,7 +32,7 @@
 
 class KMMsgBase;
 class KMMessage;
-class QWidget;
+class TQWidget;
 class KMFolder;
 class KTempFile;
 
diff --git a/kmail/kmfilterdlg.h b/kmail/kmfilterdlg.h
index ab71bc5f5..1ab185cab 100644
--- a/kmail/kmfilterdlg.h
+++ b/kmail/kmfilterdlg.h
@@ -23,11 +23,11 @@
 #include <tqmap.h>
 
 class KMSearchPatternEdit;
-class QListBox;
-class QPushButton;
-class QComboBox;
-class QWidgetStack;
-class QCheckBox;
+class TQListBox;
+class TQPushButton;
+class TQComboBox;
+class TQWidgetStack;
+class TQCheckBox;
 class KIconButton;
 class KKeyButton;
 class KListView;
diff --git a/kmail/kmfiltermgr.h b/kmail/kmfiltermgr.h
index 9822c96d3..609238661 100644
--- a/kmail/kmfiltermgr.h
+++ b/kmail/kmfiltermgr.h
@@ -28,8 +28,8 @@
 
 class KMFilter;
 class KMFilterDlg;
-template <typename T> class QValueVector;
-template <typename T> class QValueList;
+template <typename T> class TQValueVector;
+template <typename T> class TQValueList;
 
 class KMFilterMgr: public QObject
 {
diff --git a/kmail/kmfolder.h b/kmail/kmfolder.h
index 4c7a2133b..32518cd75 100644
--- a/kmail/kmfolder.h
+++ b/kmail/kmfolder.h
@@ -43,7 +43,7 @@ using KMail::MailingList;
 
 class KMMessage;
 class KMFolderDir;
-class QTimer;
+class TQTimer;
 class FolderStorage;
 class KMFolderTreeItem;
 class KMFolderJob;
diff --git a/kmail/kmfoldercachedimap.h b/kmail/kmfoldercachedimap.h
index 726a7e06d..5ead77b25 100644
--- a/kmail/kmfoldercachedimap.h
+++ b/kmail/kmfoldercachedimap.h
@@ -51,8 +51,8 @@ using KMail::FolderJob;
 using KMail::QuotaInfo;
 class KMCommand;
 
-class QComboBox;
-class QRadioButton;
+class TQComboBox;
+class TQRadioButton;
 
 namespace KMail {
   class AttachmentStrategy;
diff --git a/kmail/kmfolderdia.h b/kmail/kmfolderdia.h
index f516e8bac..913685d85 100644
--- a/kmail/kmfolderdia.h
+++ b/kmail/kmfolderdia.h
@@ -36,11 +36,11 @@
 #include "configuredialog_p.h"
 #include <tqvaluevector.h>
 
-class QCheckBox;
-class QPushButton;
-class QLineEdit;
-class QListBox;
-class QComboBox;
+class TQCheckBox;
+class TQPushButton;
+class TQLineEdit;
+class TQListBox;
+class TQComboBox;
 class KMFolder;
 class KMFolderTreeItem;
 class KMFolderDir;
@@ -50,7 +50,7 @@ class KEditListBox;
 namespace KPIM { class IdentityCombo; }
 class KMFolderDialog;
 class KMFolderTree;
-template <typename T> class QGuardedPtr;
+template <typename T> class TQGuardedPtr;
 class TemplatesConfiguration;
 class KPushButton;
 
diff --git a/kmail/kmfolderimap.h b/kmail/kmfolderimap.h
index da026728c..7b25520f1 100644
--- a/kmail/kmfolderimap.h
+++ b/kmail/kmfolderimap.h
@@ -35,8 +35,8 @@
 
 #include <tqintdict.h>
 #include <tqdict.h>
-template< typename T> class QPtrList;
-template< typename T> class QValueList;
+template< typename T> class TQPtrList;
+template< typename T> class TQValueList;
 
 class KMFolderTreeItem;
 class KMFolderImap;
diff --git a/kmail/kmfoldersearch.h b/kmail/kmfoldersearch.h
index ef3c87d0f..180995dac 100644
--- a/kmail/kmfoldersearch.h
+++ b/kmail/kmfoldersearch.h
@@ -42,7 +42,7 @@ class KMSearchPattern;
 class KMFolderImap;
 class KMFolderSearchJob;
 class KMIndexSearchTarget;
-class QTimer;
+class TQTimer;
 
 namespace KMail {
    class AttachmentStrategy;
diff --git a/kmail/kmfoldertree.h b/kmail/kmfoldertree.h
index 3db70d3bf..df23116ab 100644
--- a/kmail/kmfoldertree.h
+++ b/kmail/kmfoldertree.h
@@ -28,10 +28,10 @@
 #include <tqtimer.h>
 #include <tqheader.h>
 
-class QDropEvent;
-class QPixmap;
-class QPainter;
-class QPopupMenu;
+class TQDropEvent;
+class TQPixmap;
+class TQPainter;
+class TQPopupMenu;
 class KPopupMenu;
 class KMFolder;
 class KMFolderDir;
@@ -40,7 +40,7 @@ class KMFolderTree;
 class KMAccount;
 // duplication from kmcommands.h, to avoid the include
 typedef TQMap<int,KMFolder*> KMMenuToFolder;
-template <typename T> class QGuardedPtr;
+template <typename T> class TQGuardedPtr;
 
 class KDE_EXPORT KMFolderTreeItem : public TQObject, public KFolderTreeItem
 {
diff --git a/kmail/kmheaders.h b/kmail/kmheaders.h
index bb49a1440..f0f973d65 100644
--- a/kmail/kmheaders.h
+++ b/kmail/kmheaders.h
@@ -26,10 +26,10 @@ class KMMsgBase;
 class KMCommand;
 class KMMainWidget;
 class KPopupMenu;
-class QPalette;
-class QPixmap;
-class QIconSet;
-class QDateTime;
+class TQPalette;
+class TQPixmap;
+class TQIconSet;
+class TQDateTime;
 
 typedef TQPtrList<KMMsgBase> KMMessageList;
 typedef TQValueList<Q_UINT32> SerNumList;
diff --git a/kmail/kmkernel.h b/kmail/kmkernel.h
index cd536e825..02f3e437b 100644
--- a/kmail/kmkernel.h
+++ b/kmail/kmkernel.h
@@ -46,7 +46,7 @@ using KMail::UndoStack;
 using KMail::JobScheduler;
 using KPIM::ProgressDialog;
 class KMMsgIndex;
-class QLabel;
+class TQLabel;
 class KMFolder;
 class KMFolderMgr;
 class KMFilterMgr;
@@ -60,7 +60,7 @@ class KMKernel;
 class KProcess;
 class KProgressDialog;
 class KInstance;
-class QTimer;
+class TQTimer;
 class KProgress;
 class KPassivePopup;
 class KMMainWin;
diff --git a/kmail/kmlineeditspell.h b/kmail/kmlineeditspell.h
index 1355cd0ec..46d4d0dbc 100644
--- a/kmail/kmlineeditspell.h
+++ b/kmail/kmlineeditspell.h
@@ -7,7 +7,7 @@
 
 #include <libkdepim/addresseelineedit.h>
 
-class QPopupMenu;
+class TQPopupMenu;
 
 class KMLineEdit : public KPIM::AddresseeLineEdit
 {
diff --git a/kmail/kmmainwidget.h b/kmail/kmmainwidget.h
index dd32fd7e3..74baaf2a3 100644
--- a/kmail/kmmainwidget.h
+++ b/kmail/kmmainwidget.h
@@ -33,9 +33,9 @@
 #include "messageactions.h"
 #include <kaction.h>
 
-class QVBoxLayout;
-class QSplitter;
-class QSignalMapper;
+class TQVBoxLayout;
+class TQSplitter;
+class TQSignalMapper;
 
 class KActionMenu;
 class KActionCollection;
@@ -58,9 +58,9 @@ class KMAccount;
 class KMSystemTray;
 class KMHeaders;
 
-template <typename T> class QValueList;
-template <typename T, typename S> class QMap;
-template <typename T> class QGuardedPtr;
+template <typename T> class TQValueList;
+template <typename T, typename S> class TQMap;
+template <typename T> class TQGuardedPtr;
 
 namespace KIO {
   class Job;
diff --git a/kmail/kmmessage.h b/kmail/kmmessage.h
index f4353b836..53c1e4089 100644
--- a/kmail/kmmessage.h
+++ b/kmail/kmmessage.h
@@ -20,12 +20,12 @@
 #include<libemailfunctions/email.h>
 
 template <typename T>
-class QValueList;
+class TQValueList;
 
-class QStringList;
-class QString;
-class QTextCodec;
-class QStrList;
+class TQStringList;
+class TQString;
+class TQTextCodec;
+class TQStrList;
 
 class KMFolder;
 class KMFolderIndex;
diff --git a/kmail/kmmimeparttree.cpp b/kmail/kmmimeparttree.cpp
index 1d32a56e8..cafef94ec 100644
--- a/kmail/kmmimeparttree.cpp
+++ b/kmail/kmmimeparttree.cpp
@@ -131,7 +131,7 @@ void KMMimePartTree::itemRightClicked( TQListViewItem* item,
     else {
         kdDebug(5006) << "\n**\n** KMMimePartTree::itemRightClicked() **\n**" << endl;
 
-        TQPopupMenu* popup = new QPopupMenu;
+        TQPopupMenu* popup = new TQPopupMenu;
         if ( mCurrentContextMenuItem->node()->nodeId() > 2 &&
              mCurrentContextMenuItem->node()->typeString() != "Multipart" ) {
           popup->insertItem( SmallIcon("fileopen"), i18n("to open", "Open"), this, TQT_SLOT(slotOpen()) );
diff --git a/kmail/kmmsgbase.h b/kmail/kmmsgbase.h
index 9e7d70cb0..b2d867839 100644
--- a/kmail/kmmsgbase.h
+++ b/kmail/kmmsgbase.h
@@ -26,9 +26,9 @@
 #include <tqstring.h>
 #include <time.h>
 
-class QCString;
-class QStringList;
-class QTextCodec;
+class TQCString;
+class TQStringList;
+class TQTextCodec;
 class KMFolder;
 class KMFolderIndex;
 
diff --git a/kmail/kmmsgdict.h b/kmail/kmmsgdict.h
index 99332dd20..60fabf6c8 100644
--- a/kmail/kmmsgdict.h
+++ b/kmail/kmmsgdict.h
@@ -29,7 +29,7 @@ class KMMessage;
 class KMMsgDictEntry;
 class KMMsgDictREntry;
 class KMDict;
-class QString;
+class TQString;
 class FolderStorage;
 
 /**
diff --git a/kmail/kmmsgpart.h b/kmail/kmmsgpart.h
index ce3245c89..000837c75 100644
--- a/kmail/kmmsgpart.h
+++ b/kmail/kmmsgpart.h
@@ -27,8 +27,8 @@
 #include <tqdict.h>
 
 template <typename T>
-class QValueList;
-class QTextCodec;
+class TQValueList;
+class TQTextCodec;
 class DwString;
 
 class KMMessagePart
diff --git a/kmail/kmmsgpartdlg.h b/kmail/kmmsgpartdlg.h
index 601d2ca3b..d53b7d565 100644
--- a/kmail/kmmsgpartdlg.h
+++ b/kmail/kmmsgpartdlg.h
@@ -24,12 +24,12 @@
 #include <kio/global.h>
 
 class KMMessagePart;
-class QPushButton;
+class TQPushButton;
 class KComboBox;
-class QComboBox;
-class QCheckBox;
-class QLabel;
-class QLineEdit;
+class TQComboBox;
+class TQCheckBox;
+class TQLabel;
+class TQLineEdit;
 
 #undef None
 
diff --git a/kmail/kmpopfiltercnfrmdlg.h b/kmail/kmpopfiltercnfrmdlg.h
index 35548c27b..76744d7ce 100644
--- a/kmail/kmpopfiltercnfrmdlg.h
+++ b/kmail/kmpopfiltercnfrmdlg.h
@@ -26,8 +26,8 @@
 #include <tqptrlist.h>
 #include <tqmap.h>
 
-class QWidget;
-class QString;
+class TQWidget;
+class TQString;
 
 class KMPopFilterCnfrmDlg;
 /**
diff --git a/kmail/kmreadermainwin.h b/kmail/kmreadermainwin.h
index 2d19324b6..ba458eb0a 100644
--- a/kmail/kmreadermainwin.h
+++ b/kmail/kmreadermainwin.h
@@ -16,7 +16,7 @@ class KMFolderIndex;
 class KMFolder;
 class KFontAction;
 class KFontSizeAction;
-template <typename T, typename S> class QMap;
+template <typename T, typename S> class TQMap;
 
 namespace KMail {
 class MessageActions;
diff --git a/kmail/kmreaderwin.h b/kmail/kmreaderwin.h
index 40c4f3a82..da7029366 100644
--- a/kmail/kmreaderwin.h
+++ b/kmail/kmreaderwin.h
@@ -14,14 +14,14 @@
 #include "kmmimeparttree.h" // Needed for friend declaration.
 #include "interfaces/observer.h"
 
-class QFrame;
-class QSplitter;
-class QHBox;
-class QListViewItem;
-class QScrollBar;
-class QString;
-class QTabDialog;
-class QTextCodec;
+class TQFrame;
+class TQSplitter;
+class TQHBox;
+class TQListViewItem;
+class TQScrollBar;
+class TQString;
+class TQTabDialog;
+class TQTextCodec;
 
 class DwHeaders;
 class DwMediaType;
diff --git a/kmail/kmsearchpatternedit.h b/kmail/kmsearchpatternedit.h
index c8ef9a2f5..a6ffd641f 100644
--- a/kmail/kmsearchpatternedit.h
+++ b/kmail/kmsearchpatternedit.h
@@ -14,13 +14,13 @@
 class KMSearchRule;
 class KMSearchPattern;
 
-template <typename T> class QPtrList;
-class QString;
-class QComboBox;
-class QLineEdit;
-class QRadioButton;
-class QWidgetStack;
-class QLabel;
+template <typename T> class TQPtrList;
+class TQString;
+class TQComboBox;
+class TQLineEdit;
+class TQRadioButton;
+class TQWidgetStack;
+class TQLabel;
 class KMSearchPatternEdit;
 
 /** A widget to edit a single KMSearchRule.
diff --git a/kmail/kmsender.h b/kmail/kmsender.h
index f97edfe80..9771e9924 100644
--- a/kmail/kmsender.h
+++ b/kmail/kmsender.h
@@ -42,7 +42,7 @@ class KProcess;
 class KMSendProc;
 class KMSendSendmail;
 class KMSendSMTP;
-class QStrList;
+class TQStrList;
 class KMTransportInfo;
 class KMPrecommand;
 
diff --git a/kmail/kmsystemtray.h b/kmail/kmsystemtray.h
index 4314ccfe1..21f631814 100644
--- a/kmail/kmsystemtray.h
+++ b/kmail/kmsystemtray.h
@@ -30,9 +30,9 @@
 
 class KMFolder;
 class KMMainWidget;
-class QMouseEvent;
+class TQMouseEvent;
 class KPopupMenu;
-class QPoint;
+class TQPoint;
 
 /**
  * KMSystemTray extends KSystemTray and handles system
diff --git a/kmail/kmtransport.h b/kmail/kmtransport.h
index a71541fe1..bbddedf50 100644
--- a/kmail/kmtransport.h
+++ b/kmail/kmtransport.h
@@ -22,12 +22,12 @@
 
 #include <kdialogbase.h>
 
-class QCheckBox;
-class QLabel;
-class QLineEdit;
-class QRadioButton;
+class TQCheckBox;
+class TQLabel;
+class TQLineEdit;
+class TQRadioButton;
 class KMServerTest;
-class QButtonGroup;
+class TQButtonGroup;
 
 class KMTransportInfo : public QObject
 {
diff --git a/kmail/mailinglistpropertiesdialog.h b/kmail/mailinglistpropertiesdialog.h
index 71c049e11..2a09dab74 100644
--- a/kmail/mailinglistpropertiesdialog.h
+++ b/kmail/mailinglistpropertiesdialog.h
@@ -33,10 +33,10 @@
 #include <kdialogbase.h> // include for the base class
 
 class KMFolder;
-class QCheckBox;
-class QComboBox;
-class QPushButton;
-class QLabel;
+class TQCheckBox;
+class TQComboBox;
+class TQPushButton;
+class TQLabel;
 class KEditListBox;
 
 namespace KMail
diff --git a/kmail/mailserviceimpl.h b/kmail/mailserviceimpl.h
index a31950663..093d0f83f 100644
--- a/kmail/mailserviceimpl.h
+++ b/kmail/mailserviceimpl.h
@@ -32,10 +32,10 @@
 
 #include "interfaces/MailTransportServiceIface.h"
 
-class QString;
+class TQString;
 class KURL;
-template <typename T> class QMemArray;
-typedef TQMemArray<char> QByteArray;
+template <typename T> class TQMemArray;
+typedef TQMemArray<char> TQByteArray;
 
 
 namespace KMail {
diff --git a/kmail/managesievescriptsdialog.h b/kmail/managesievescriptsdialog.h
index f4167a0d7..2195e911e 100644
--- a/kmail/managesievescriptsdialog.h
+++ b/kmail/managesievescriptsdialog.h
@@ -5,8 +5,8 @@
 #include <kurl.h>
 #include <tqmap.h>
 
-class QListView;
-class QCheckListItem;
+class TQListView;
+class TQCheckListItem;
 
 namespace KMail {
 
diff --git a/kmail/messageactions.h b/kmail/messageactions.h
index 3307f15fb..39e9f937e 100644
--- a/kmail/messageactions.h
+++ b/kmail/messageactions.h
@@ -25,7 +25,7 @@
 #include <tqobject.h>
 #include <tqvaluelist.h>
 
-class QWidget;
+class TQWidget;
 class KAction;
 class KActionMenu;
 class KActionCollection;
diff --git a/kmail/newfolderdialog.h b/kmail/newfolderdialog.h
index 3f3c88265..96f4421eb 100644
--- a/kmail/newfolderdialog.h
+++ b/kmail/newfolderdialog.h
@@ -33,13 +33,13 @@
 #include <tqdialog.h>
 #include <kdialogbase.h>
 
-class QVBoxLayout;
-class QHBoxLayout;
-class QGridLayout;
-class QSpacerItem;
-class QLabel;
-class QLineEdit;
-class QComboBox;
+class TQVBoxLayout;
+class TQHBoxLayout;
+class TQGridLayout;
+class TQSpacerItem;
+class TQLabel;
+class TQLineEdit;
+class TQComboBox;
 class KMFolder;
 
 namespace KMail {
diff --git a/kmail/objecttreeparser.h b/kmail/objecttreeparser.h
index 6a55462b6..2edc406f9 100644
--- a/kmail/objecttreeparser.h
+++ b/kmail/objecttreeparser.h
@@ -42,8 +42,8 @@
 
 class KMReaderWin;
 class KMMessagePart;
-class QString;
-class QWidget;
+class TQString;
+class TQWidget;
 class partNode;
 
 namespace KMail {
diff --git a/kmail/partnodebodypart.h b/kmail/partnodebodypart.h
index 0694b3ca8..919d43a23 100644
--- a/kmail/partnodebodypart.h
+++ b/kmail/partnodebodypart.h
@@ -38,7 +38,7 @@
 
 class partNode;
 
-class QTextCodec;
+class TQTextCodec;
 
 namespace KMail {
 
diff --git a/kmail/popaccount.h b/kmail/popaccount.h
index 840629a47..81fb153e5 100644
--- a/kmail/popaccount.h
+++ b/kmail/popaccount.h
@@ -12,7 +12,7 @@
 
 class KMPopHeaders;
 class KMMessage;
-class QDataStream;
+class TQDataStream;
 namespace KIO {
   class MetaData;
   class Slave;
diff --git a/kmail/recipientseditor.h b/kmail/recipientseditor.h
index 92b5165f2..6f5ffb8eb 100644
--- a/kmail/recipientseditor.h
+++ b/kmail/recipientseditor.h
@@ -37,8 +37,8 @@ class RecipientsPicker;
 
 class KWindowPositioner;
 
-class QLabel;
-class QPushButton;
+class TQLabel;
+class TQPushButton;
 class SideWidget;
 
 class Recipient
diff --git a/kmail/recipientspicker.h b/kmail/recipientspicker.h
index 82e1d0bf7..74df3b13b 100644
--- a/kmail/recipientspicker.h
+++ b/kmail/recipientspicker.h
@@ -34,7 +34,7 @@
 #include <tqdialog.h>
 #include <tqtooltip.h>
 
-class QComboBox;
+class TQComboBox;
 
 #ifdef KDEPIM_NEW_DISTRLISTS
 #include <libkdepim/distributionlist.h>
diff --git a/kmail/redirectdialog.h b/kmail/redirectdialog.h
index 4b0b7b347..a89714a04 100644
--- a/kmail/redirectdialog.h
+++ b/kmail/redirectdialog.h
@@ -32,8 +32,8 @@
 #include <kdialogbase.h>
 
 class KMLineEdit;
-class QPushButton;
-class QLabel;
+class TQPushButton;
+class TQLabel;
 
 namespace KMail {
 
diff --git a/kmail/regexplineedit.h b/kmail/regexplineedit.h
index 0eeebb315..c0314e8a2 100644
--- a/kmail/regexplineedit.h
+++ b/kmail/regexplineedit.h
@@ -38,9 +38,9 @@
 
 class KLineEdit;
 
-class QString;
-class QPushButton;
-class QDialog;
+class TQString;
+class TQPushButton;
+class TQDialog;
 
 namespace KMail {
 
diff --git a/kmail/rulewidgethandlermanager.h b/kmail/rulewidgethandlermanager.h
index 0e419411a..2e4043ebe 100644
--- a/kmail/rulewidgethandlermanager.h
+++ b/kmail/rulewidgethandlermanager.h
@@ -37,10 +37,10 @@
 
 #include <tqvaluevector.h>
 
-class QObject;
-class QCString;
-class QString;
-class QWidgetStack;
+class TQObject;
+class TQCString;
+class TQString;
+class TQWidgetStack;
 
 namespace KMail {
 
diff --git a/kmail/searchwindow.h b/kmail/searchwindow.h
index ac0b203c4..c94b263e5 100644
--- a/kmail/searchwindow.h
+++ b/kmail/searchwindow.h
@@ -30,15 +30,15 @@
 #include <kdialogbase.h>
 #include <kxmlguiclient.h>
 
-class QCheckBox;
-class QComboBox;
-class QGridLayout;
-class QLabel;
-class QLineEdit;
+class TQCheckBox;
+class TQComboBox;
+class TQGridLayout;
+class TQLabel;
+class TQLineEdit;
 class KListView;
-class QListViewItem;
-class QPushButton;
-class QRadioButton;
+class TQListViewItem;
+class TQPushButton;
+class TQRadioButton;
 class KAction;
 class KActionMenu;
 class KMFolder;
diff --git a/kmail/secondarywindow.h b/kmail/secondarywindow.h
index dbe787178..0502f0538 100644
--- a/kmail/secondarywindow.h
+++ b/kmail/secondarywindow.h
@@ -33,7 +33,7 @@
 
 #include <kmainwindow.h>
 
-class QCloseEvent;
+class TQCloseEvent;
 
 namespace KMail {
 
diff --git a/kmail/sieveconfig.h b/kmail/sieveconfig.h
index 39bbe4ae7..17380eb0f 100644
--- a/kmail/sieveconfig.h
+++ b/kmail/sieveconfig.h
@@ -19,8 +19,8 @@
 
 #include <kurl.h>
 
-class QCheckBox;
-class QLineEdit;
+class TQCheckBox;
+class TQLineEdit;
 class KIntSpinBox;
 class KConfigBase;
 
diff --git a/kmail/sievedebugdialog.h b/kmail/sievedebugdialog.h
index 384c003d1..f8b0803b8 100644
--- a/kmail/sievedebugdialog.h
+++ b/kmail/sievedebugdialog.h
@@ -22,10 +22,10 @@
 #include <kdialogbase.h>
 #include <kurl.h>
 
-class QString;
-class QStringList;
-class QTextEdit;
-template <typename T> class QValueList;
+class TQString;
+class TQStringList;
+class TQTextEdit;
+template <typename T> class TQValueList;
 
 class KMAccount;
 
diff --git a/kmail/sievejob.h b/kmail/sievejob.h
index 67f3d231e..ef9f4a504 100644
--- a/kmail/sievejob.h
+++ b/kmail/sievejob.h
@@ -24,7 +24,7 @@
 #include <kurl.h>
 #include <kio/global.h>
 
-class QTextDecoder;
+class TQTextDecoder;
 namespace KIO {
   class Job;
 }
diff --git a/kmail/signatureconfigurator.h b/kmail/signatureconfigurator.h
index 2599961ae..afd33f760 100644
--- a/kmail/signatureconfigurator.h
+++ b/kmail/signatureconfigurator.h
@@ -21,13 +21,13 @@
 #include <libkpimidentities/identity.h> // for Signature::Type
 using KPIM::Signature;
 
-class QComboBox;
-class QCheckBox;
+class TQComboBox;
+class TQCheckBox;
 class KURLRequester;
 class KLineEdit;
-class QString;
-class QPushButton;
-class QTextEdit;
+class TQString;
+class TQPushButton;
+class TQTextEdit;
 
 namespace KMail {
 
diff --git a/kmail/simplestringlisteditor.h b/kmail/simplestringlisteditor.h
index 9a45e7417..47c6f6c9a 100644
--- a/kmail/simplestringlisteditor.h
+++ b/kmail/simplestringlisteditor.h
@@ -36,8 +36,8 @@
 #include <tqstringlist.h>
 #include <tqstring.h>
 
-class QListBox;
-class QPushButton;
+class TQListBox;
+class TQPushButton;
 
 //
 //
diff --git a/kmail/snippetitem.h b/kmail/snippetitem.h
index 3c20661d5..b61a553ad 100644
--- a/kmail/snippetitem.h
+++ b/kmail/snippetitem.h
@@ -19,7 +19,7 @@
 
 #include <tqobject.h>
 
-class QString;
+class TQString;
 class KAction;
 class SnippetGroup;
 
diff --git a/kmail/snippetwidget.h b/kmail/snippetwidget.h
index b60c3ea6e..79dd258dd 100644
--- a/kmail/snippetwidget.h
+++ b/kmail/snippetwidget.h
@@ -25,10 +25,10 @@
 
 class KDevProject;
 class SnippetPart;
-class QPushButton;
+class TQPushButton;
 class KListView;
-class QListViewItem;
-class QPoint;
+class TQListViewItem;
+class TQPoint;
 class SnippetDlg;
 class SnippetItem;
 class KTextEdit;
diff --git a/kmail/spamheaderanalyzer.h b/kmail/spamheaderanalyzer.h
index 5cf433b77..76ac50de1 100644
--- a/kmail/spamheaderanalyzer.h
+++ b/kmail/spamheaderanalyzer.h
@@ -36,7 +36,7 @@
 
 #include <tqvaluelist.h>
 
-class QString;
+class TQString;
 class KMMessage;
 
 namespace KMail {
diff --git a/kmail/teehtmlwriter.h b/kmail/teehtmlwriter.h
index 26efc1ded..411c1a960 100644
--- a/kmail/teehtmlwriter.h
+++ b/kmail/teehtmlwriter.h
@@ -36,7 +36,7 @@
 
 #include <tqvaluelist.h>
 
-class QString;
+class TQString;
 
 namespace KMail {
 
diff --git a/kmail/templateparser.h b/kmail/templateparser.h
index 77db0e76f..7e432ac31 100644
--- a/kmail/templateparser.h
+++ b/kmail/templateparser.h
@@ -24,9 +24,9 @@
 #include <tqobject.h>
 
 class KMMessage;
-class QString;
+class TQString;
 class KMFolder;
-class QObject;
+class TQObject;
 class KProcess;
 
 class TemplateParser : public QObject
diff --git a/kmail/transportmanager.h b/kmail/transportmanager.h
index 0799bce58..a4200ce46 100644
--- a/kmail/transportmanager.h
+++ b/kmail/transportmanager.h
@@ -16,7 +16,7 @@
 #ifndef _KMAIL_TRANSPORTMANAGER_H_
 #define _KMAIL_TRANSPORTMANAGER_H_
 
-class QStringList;
+class TQStringList;
 
 namespace KMail {
 
diff --git a/kmail/urlhandlermanager.h b/kmail/urlhandlermanager.h
index 734dfcabc..acd9f2844 100644
--- a/kmail/urlhandlermanager.h
+++ b/kmail/urlhandlermanager.h
@@ -36,8 +36,8 @@
 
 class KURL;
 
-class QString;
-class QPoint;
+class TQString;
+class TQPoint;
 class KMReaderWin;
 
 namespace KMail {
diff --git a/kmail/util.h b/kmail/util.h
index e961bb526..d0e378219 100644
--- a/kmail/util.h
+++ b/kmail/util.h
@@ -49,7 +49,7 @@
 
 class DwString;
 class KURL;
-class QWidget;
+class TQWidget;
 
 namespace KMail
 {
diff --git a/kmail/vacation.h b/kmail/vacation.h
index 18f791337..cf6f5a8c5 100644
--- a/kmail/vacation.h
+++ b/kmail/vacation.h
@@ -19,9 +19,9 @@
 
 #include <kurl.h>
 
-class QString;
-class QStringList;
-template <typename T> class QValueList;
+class TQString;
+class TQStringList;
+template <typename T> class TQValueList;
 namespace KMail {
   class SieveJob;
   class VacationDialog;
diff --git a/kmail/vacationdialog.h b/kmail/vacationdialog.h
index 7f98de74b..2ce076ff6 100644
--- a/kmail/vacationdialog.h
+++ b/kmail/vacationdialog.h
@@ -17,13 +17,13 @@
 
 #include "kdialogbase.h"
 
-class QString;
-class QCheckBox;
-class QLineEdit;
-class QTextEdit;
+class TQString;
+class TQCheckBox;
+class TQLineEdit;
+class TQTextEdit;
 class KDateWidget;
 class KIntSpinBox;
-template <typename T> class QValueList;
+template <typename T> class TQValueList;
 
 namespace KMime {
   namespace Types {
diff --git a/kmail/vcardviewer.h b/kmail/vcardviewer.h
index 69423ca65..2fdcd090a 100644
--- a/kmail/vcardviewer.h
+++ b/kmail/vcardviewer.h
@@ -25,7 +25,7 @@
 
 #include <tqvaluelist.h>
 
-class QString;
+class TQString;
 
 namespace KPIM {
   class AddresseeView;
diff --git a/kmail/xfaceconfigurator.h b/kmail/xfaceconfigurator.h
index 2e243ddfb..9d0d6332f 100644
--- a/kmail/xfaceconfigurator.h
+++ b/kmail/xfaceconfigurator.h
@@ -22,10 +22,10 @@
 
 class KURL;
 
-class QCheckBox;
-class QString;
-class QLabel;
-class QComboBox;
+class TQCheckBox;
+class TQString;
+class TQLabel;
+class TQComboBox;
 
 namespace KMail {
 
diff --git a/kmailcvt/kselfilterpage.h b/kmailcvt/kselfilterpage.h
index 17e5958e7..1c5908e1a 100644
--- a/kmailcvt/kselfilterpage.h
+++ b/kmailcvt/kselfilterpage.h
@@ -21,7 +21,7 @@
 #include "kselfilterpagedlg.h"
 class Filter;
 
-template <class T> class QPtrList;
+template <class T> class TQPtrList;
 
 class KSelFilterPage : public KSelFilterPageDlg  {
 	Q_OBJECT
diff --git a/kmobile/kmobileiface.h b/kmobile/kmobileiface.h
index 926c8a6bb..60974b268 100644
--- a/kmobile/kmobileiface.h
+++ b/kmobile/kmobileiface.h
@@ -8,7 +8,7 @@
 #include <dcopobject.h>
 #include <tqstringlist.h>
 
-class QStringList;
+class TQStringList;
 
 class kmobileIface : virtual public DCOPObject
 {
diff --git a/knode/articlewidget.h b/knode/articlewidget.h
index 66e4106ec..2571642d0 100644
--- a/knode/articlewidget.h
+++ b/knode/articlewidget.h
@@ -24,8 +24,8 @@
 
 #include "knjobdata.h"
 
-class QStringList;
-class QTimer;
+class TQStringList;
+class TQTimer;
 
 class KAction;
 class KActionCollection;
diff --git a/knode/knarticlefactory.h b/knode/knarticlefactory.h
index 995fcdc0d..c37c781ab 100644
--- a/knode/knarticlefactory.h
+++ b/knode/knarticlefactory.h
@@ -22,7 +22,7 @@
 #include "knarticle.h"
 #include "knwidgets.h"
 
-class QLabel;
+class TQLabel;
 
 class KNGroup;
 class KNFolder;
diff --git a/knode/knarticlemanager.h b/knode/knarticlemanager.h
index f82cddd5c..25d43179f 100644
--- a/knode/knarticlemanager.h
+++ b/knode/knarticlemanager.h
@@ -20,7 +20,7 @@
 #include "knjobdata.h"
 #include "knarticle.h"
 
-class QListViewItem;
+class TQListViewItem;
 
 class KTempFile;
 
diff --git a/knode/kncleanup.h b/knode/kncleanup.h
index f6cd53151..60a815163 100644
--- a/knode/kncleanup.h
+++ b/knode/kncleanup.h
@@ -17,8 +17,8 @@
 
 #include <tqsemimodal.h>
 
-class QProgressBar;
-class QLabel;
+class TQProgressBar;
+class TQLabel;
 
 class KNArticleCollection;
 class KNGroup;
diff --git a/knode/kncollectionviewitem.h b/knode/kncollectionviewitem.h
index 6899dc9ae..4f343147c 100644
--- a/knode/kncollectionviewitem.h
+++ b/knode/kncollectionviewitem.h
@@ -19,8 +19,8 @@
 
 #include <kfoldertree.h>
 
-class QPainter;
-class QColorGroup;
+class TQPainter;
+class TQColorGroup;
 
 class KNCollection;
 
diff --git a/knode/kncomposer.h b/knode/kncomposer.h
index a44397b81..b1c1c12ad 100644
--- a/knode/kncomposer.h
+++ b/knode/kncomposer.h
@@ -29,7 +29,7 @@
 #include <kabc/addresslineedit.h>
 #include <knodecomposeriface.h>
 
-class QGroupBox;
+class TQGroupBox;
 
 class KProcess;
 class KSpell;
diff --git a/knode/knconfigwidgets.h b/knode/knconfigwidgets.h
index 0bd604e8c..da6af2ddf 100644
--- a/knode/knconfigwidgets.h
+++ b/knode/knconfigwidgets.h
@@ -21,11 +21,11 @@
 #include "knwidgets.h"
 #include "smtpaccountwidget_base.h"
 
-class QButtonGroup;
-class QCheckBox;
-class QGroupBox;
-class QRadioButton;
-class QTextEdit;
+class TQButtonGroup;
+class TQCheckBox;
+class TQGroupBox;
+class TQRadioButton;
+class TQTextEdit;
 
 class KScoringEditorWidget;
 class KConfigBase;
diff --git a/knode/knconvert.h b/knode/knconvert.h
index e81e048a5..49d3d7c5c 100644
--- a/knode/knconvert.h
+++ b/knode/knconvert.h
@@ -23,10 +23,10 @@
 #include <tqvaluelist.h>
 #include <kdepimmacros.h>
 
-class QListBox;
-class QLabel;
-class QWidgetStack;
-class QCheckBox;
+class TQListBox;
+class TQLabel;
+class TQWidgetStack;
+class TQCheckBox;
 
 class KLineEdit;
 class KProcess;
diff --git a/knode/knfilterdialog.h b/knode/knfilterdialog.h
index ca7dc493e..3dc7ee640 100644
--- a/knode/knfilterdialog.h
+++ b/knode/knfilterdialog.h
@@ -22,8 +22,8 @@
 class KNFilterConfigWidget;
 class KNArticleFilter;
 class KLineEdit;
-class QComboBox;
-class QCheckBox;
+class TQComboBox;
+class TQCheckBox;
 
 
 class KNFilterDialog : public KDialogBase {
diff --git a/knode/knglobals.h b/knode/knglobals.h
index 4f4c84c31..3a6aa10a1 100644
--- a/knode/knglobals.h
+++ b/knode/knglobals.h
@@ -31,7 +31,7 @@ class KNGroupManager;
 class KNArticleManager;
 class KNArticleFactory;
 class KNFolderManager;
-class QWidget;
+class TQWidget;
 class KNFilterManager;
 class KNMainWidget;
 class KNScoringManager;
diff --git a/knode/kngroup.h b/knode/kngroup.h
index dc28b9121..fef5c6d62 100644
--- a/knode/kngroup.h
+++ b/knode/kngroup.h
@@ -21,7 +21,7 @@
 #include "knjobdata.h"
 #include "knarticle.h"
 
-class QStrList;
+class TQStrList;
 
 class KNProtocolClient;
 class KNNntpAccount;
diff --git a/knode/kngroupbrowser.h b/knode/kngroupbrowser.h
index 15e639281..5178fc575 100644
--- a/knode/kngroupbrowser.h
+++ b/knode/kngroupbrowser.h
@@ -24,10 +24,10 @@
 #include "kngroupmanager.h"
 
 class KLineEdit;
-class QCheckBox;
-class QLayout;
-class QLabel;
-class QGridLayout;
+class TQCheckBox;
+class TQLayout;
+class TQLabel;
+class TQGridLayout;
 
 class KNNntpAccount;
 
diff --git a/knode/kngrouppropdlg.h b/knode/kngrouppropdlg.h
index c5a17a702..0c640bea6 100644
--- a/knode/kngrouppropdlg.h
+++ b/knode/kngrouppropdlg.h
@@ -19,8 +19,8 @@
 
 #include <kdialogbase.h>
 
-class QCheckBox;
-class QComboBox;
+class TQCheckBox;
+class TQComboBox;
 
 class KLineEdit;
 
diff --git a/knode/knmainwidget.h b/knode/knmainwidget.h
index 19f2b4aaf..5a02790c7 100644
--- a/knode/knmainwidget.h
+++ b/knode/knmainwidget.h
@@ -23,7 +23,7 @@
 #include <tqglobal.h>
 #include <kdepimmacros.h>
 
-class QListViewItem;
+class TQListViewItem;
 
 class KURL;
 class KAccel;
diff --git a/knode/knnetaccess.h b/knode/knnetaccess.h
index e86f4a9cb..0ad9498ff 100644
--- a/knode/knnetaccess.h
+++ b/knode/knnetaccess.h
@@ -19,7 +19,7 @@
 #include <tqmutex.h>
 #include <tqvaluelist.h>
 
-class QSocketNotifier;
+class TQSocketNotifier;
 
 namespace KIO {
   class Job;
diff --git a/knode/knprotocolclient.h b/knode/knprotocolclient.h
index a17b68782..fa4d28d5b 100644
--- a/knode/knprotocolclient.h
+++ b/knode/knprotocolclient.h
@@ -23,7 +23,7 @@
 
 #include <knserverinfo.h>
 
-class QStrList;
+class TQStrList;
 class KNJobData;
 struct in_addr;
 
diff --git a/knode/knrangefilter.h b/knode/knrangefilter.h
index 297a21344..346257f2c 100644
--- a/knode/knrangefilter.h
+++ b/knode/knrangefilter.h
@@ -19,10 +19,10 @@
 
 #include <tqgroupbox.h>
 
-class QLabel;
+class TQLabel;
 class KIntSpinBox;
-class QComboBox;
-class QCheckBox;
+class TQComboBox;
+class TQCheckBox;
 
 class KSimpleConfig;
 
diff --git a/knode/knsearchdialog.h b/knode/knsearchdialog.h
index 8923bd813..b056735bd 100644
--- a/knode/knsearchdialog.h
+++ b/knode/knsearchdialog.h
@@ -19,7 +19,7 @@
 
 #include <tqdialog.h>
 
-class QPushButton;
+class TQPushButton;
 
 class KNFilterConfigWidget;
 class KNArticleFilter;
diff --git a/knode/knstatusfilter.h b/knode/knstatusfilter.h
index 6497b3021..a408a96c7 100644
--- a/knode/knstatusfilter.h
+++ b/knode/knstatusfilter.h
@@ -21,7 +21,7 @@
 #include <tqcombobox.h>
 #include <tqbitarray.h>
 
-class QCheckBox;
+class TQCheckBox;
 class KSimpleConfig;
 class KNRemoteArticle;
 
diff --git a/knode/knstringfilter.h b/knode/knstringfilter.h
index e70e7e307..ac33c1d65 100644
--- a/knode/knstringfilter.h
+++ b/knode/knstringfilter.h
@@ -19,8 +19,8 @@
 
 #include <tqgroupbox.h>
 
-class QCheckBox;
-class QComboBox;
+class TQCheckBox;
+class TQComboBox;
 
 class KLineEdit;
 class KSimpleConfig;
diff --git a/knode/knwidgets.h b/knode/knwidgets.h
index 7e8dd7d3b..bb01ba22a 100644
--- a/knode/knwidgets.h
+++ b/knode/knwidgets.h
@@ -23,8 +23,8 @@
 #include <kdockwidget.h>
 #include <kprogress.h>
 
-class QPainter;
-class QPixmap;
+class TQPainter;
+class TQPixmap;
 
 //====================================================================================
 
diff --git a/knode/utilities.h b/knode/utilities.h
index 9d0180961..58dda6d89 100644
--- a/knode/utilities.h
+++ b/knode/utilities.h
@@ -23,11 +23,11 @@
 #include <tqptrvector.h>
 #include <tqptrlist.h>
 
-class QWidget;
-class QString;
-class QChar;
-class QStringList;
-class QSize;
+class TQWidget;
+class TQString;
+class TQChar;
+class TQStringList;
+class TQSize;
 
 class KTempFile;
 
diff --git a/knotes/knote.h b/knotes/knote.h
index 0f15bf4ba..a3bfd7b3e 100644
--- a/knotes/knote.h
+++ b/knotes/knote.h
@@ -30,7 +30,7 @@
 #include <kconfig.h>
 #include <kxmlguiclient.h>
 
-class QLabel;
+class TQLabel;
 
 class KXMLGUIBuilder;
 
diff --git a/knotes/knotealarmdlg.h b/knotes/knotealarmdlg.h
index ba001af7d..9e97ee766 100644
--- a/knotes/knotealarmdlg.h
+++ b/knotes/knotealarmdlg.h
@@ -34,7 +34,7 @@
 
 #include <kdialogbase.h>
 
-class QButtonGroup;
+class TQButtonGroup;
 class KDateEdit;
 class KTimeEdit;
 
diff --git a/knotes/knotebutton.h b/knotes/knotebutton.h
index 19ffe9b84..1825ce948 100644
--- a/knotes/knotebutton.h
+++ b/knotes/knotebutton.h
@@ -23,9 +23,9 @@
 
 #include <tqpushbutton.h>
 
-class QPainter;
-class QEvent;
-class QResizeEvent;
+class TQPainter;
+class TQEvent;
+class TQResizeEvent;
 
 
 class KNoteButton: public QPushButton
diff --git a/knotes/knoteconfigdlg.h b/knotes/knoteconfigdlg.h
index 9a44a12a9..c2220a566 100644
--- a/knotes/knoteconfigdlg.h
+++ b/knotes/knoteconfigdlg.h
@@ -23,7 +23,7 @@
 
 #include <kconfigdialog.h>
 
-class QString;
+class TQString;
 class KNoteConfig;
 
 
diff --git a/knotes/knoteedit.h b/knotes/knoteedit.h
index 00442ae5a..862aa38ba 100644
--- a/knotes/knoteedit.h
+++ b/knotes/knoteedit.h
@@ -25,9 +25,9 @@
 
 #include <ktextedit.h>
 
-class QFont;
-class QColor;
-class QPushButton;
+class TQFont;
+class TQColor;
+class TQPushButton;
 class KAction;
 class KActionCollection;
 class KToggleAction;
diff --git a/knotes/knoteprinter.h b/knotes/knoteprinter.h
index d9b006961..632dd85a4 100644
--- a/knotes/knoteprinter.h
+++ b/knotes/knoteprinter.h
@@ -5,9 +5,9 @@
 #include <tqpalette.h>
 #include <tqstring.h>
 
-class QMimeSourceFactory;
-class QStyleSheet;
-template <class T> class QValueList;
+class TQMimeSourceFactory;
+class TQStyleSheet;
+template <class T> class TQValueList;
 class KPrinter;
 
 namespace KCal {
diff --git a/knotes/knotesnetrecv.h b/knotes/knotesnetrecv.h
index b0e1f4b44..fdb843534 100644
--- a/knotes/knotesnetrecv.h
+++ b/knotes/knotesnetrecv.h
@@ -34,7 +34,7 @@
 
 #include <tqobject.h>
 
-class QTimer;
+class TQTimer;
 
 namespace KNetwork {
     class KBufferedSocket;
diff --git a/kode/kwsdl/kung/binaryinputfield.h b/kode/kwsdl/kung/binaryinputfield.h
index 479828f52..e38938016 100644
--- a/kode/kwsdl/kung/binaryinputfield.h
+++ b/kode/kwsdl/kung/binaryinputfield.h
@@ -27,8 +27,8 @@
 #include "inputfield.h"
 
 class BinaryWidget;
-class QGridLayout;
-class QPushButton;
+class TQGridLayout;
+class TQPushButton;
 
 class BinaryInputField : public SimpleInputField
 {
diff --git a/kode/kwsdl/kung/boolinputfield.h b/kode/kwsdl/kung/boolinputfield.h
index f5cd9cf22..6ec98c86a 100644
--- a/kode/kwsdl/kung/boolinputfield.h
+++ b/kode/kwsdl/kung/boolinputfield.h
@@ -26,7 +26,7 @@
 
 #include "inputfield.h"
 
-class QCheckBox;
+class TQCheckBox;
 
 class BoolInputField : public SimpleInputField
 {
diff --git a/kode/kwsdl/kung/inputfield.h b/kode/kwsdl/kung/inputfield.h
index 1f6242d34..58b2d23bd 100644
--- a/kode/kwsdl/kung/inputfield.h
+++ b/kode/kwsdl/kung/inputfield.h
@@ -27,7 +27,7 @@
 #include <tqstring.h>
 #include <tqvaluelist.h>
 
-class QWidget;
+class TQWidget;
 
 namespace Schema {
 class SimpleType;
diff --git a/kode/kwsdl/kung/listinputfield.h b/kode/kwsdl/kung/listinputfield.h
index 57430d2e4..acf1e1c38 100644
--- a/kode/kwsdl/kung/listinputfield.h
+++ b/kode/kwsdl/kung/listinputfield.h
@@ -27,8 +27,8 @@
 #include "inputfield.h"
 
 class ListWidget;
-class QListBox;
-class QPushButton;
+class TQListBox;
+class TQPushButton;
 
 class ListInputField : public SimpleInputField
 {
diff --git a/kode/kwsdl/kung/stringinputfield.h b/kode/kwsdl/kung/stringinputfield.h
index 0ef30164d..f8e8d5468 100644
--- a/kode/kwsdl/kung/stringinputfield.h
+++ b/kode/kwsdl/kung/stringinputfield.h
@@ -26,7 +26,7 @@
 
 #include "inputfield.h"
 
-class QLineEdit;
+class TQLineEdit;
 
 class StringInputField : public SimpleInputField
 {
diff --git a/kode/kwsdl/tests/google/directorycategory.h b/kode/kwsdl/tests/google/directorycategory.h
index 82dadedc0..d7805e500 100644
--- a/kode/kwsdl/tests/google/directorycategory.h
+++ b/kode/kwsdl/tests/google/directorycategory.h
@@ -24,7 +24,7 @@
 #ifndef DIRECTORYCATEGORY_H
 #define DIRECTORYCATEGORY_H
 
-class QString;
+class TQString;
 
 class DirectoryCategory
 {
diff --git a/kode/kwsdl/tests/google/googlesearchresult.h b/kode/kwsdl/tests/google/googlesearchresult.h
index c2cfa16dc..537bb1bc1 100644
--- a/kode/kwsdl/tests/google/googlesearchresult.h
+++ b/kode/kwsdl/tests/google/googlesearchresult.h
@@ -24,7 +24,7 @@
 #ifndef GOOGLESEARCHRESULT_H
 #define GOOGLESEARCHRESULT_H
 
-class QString;
+class TQString;
 class ResultElementArray;
 class DirectoryCategoryArray;
 
diff --git a/kode/kwsdl/tests/google/googlesearchservice.cpp b/kode/kwsdl/tests/google/googlesearchservice.cpp
index 3ccdb4935..a45aec9e4 100644
--- a/kode/kwsdl/tests/google/googlesearchservice.cpp
+++ b/kode/kwsdl/tests/google/googlesearchservice.cpp
@@ -63,7 +63,7 @@ void GoogleSearchService::doGetCachedPageResponseSlot( const TQString &xml )
     return;
   }
   
-  TQByteArray* value = new QByteArray;
+  TQByteArray* value = new TQByteArray;
   TQDomElement envelope = doc.documentElement();
   TQDomElement body = envelope.firstChild().toElement();
   TQDomElement method = body.firstChild().toElement();
@@ -109,7 +109,7 @@ void GoogleSearchService::doSpellingSuggestionResponseSlot( const TQString &xml
     return;
   }
   
-  TQString* value = new QString;
+  TQString* value = new TQString;
   TQDomElement envelope = doc.documentElement();
   TQDomElement body = envelope.firstChild().toElement();
   TQDomElement method = body.firstChild().toElement();
diff --git a/kode/kwsdl/tests/google/resultelement.h b/kode/kwsdl/tests/google/resultelement.h
index e83ff3713..bf13486c8 100644
--- a/kode/kwsdl/tests/google/resultelement.h
+++ b/kode/kwsdl/tests/google/resultelement.h
@@ -24,7 +24,7 @@
 #ifndef RESULTELEMENT_H
 #define RESULTELEMENT_H
 
-class QString;
+class TQString;
 class DirectoryCategory;
 
 class ResultElement
diff --git a/kode/kwsdl/tests/google/serializer.cpp b/kode/kwsdl/tests/google/serializer.cpp
index 273ce5929..4b0ea8ba3 100644
--- a/kode/kwsdl/tests/google/serializer.cpp
+++ b/kode/kwsdl/tests/google/serializer.cpp
@@ -443,7 +443,7 @@ void Serializer::demarshal( const TQDomElement &parent, GoogleSearchResult* valu
         value->setDocumentFiltering( item );
       }
       if ( element.tagName() == "searchComments" ) {
-        TQString* item = new QString;
+        TQString* item = new TQString;
         Serializer::demarshal( element, item );
         value->setSearchComments( item );
       }
@@ -463,7 +463,7 @@ void Serializer::demarshal( const TQDomElement &parent, GoogleSearchResult* valu
         value->setResultElements( item );
       }
       if ( element.tagName() == "searchQuery" ) {
-        TQString* item = new QString;
+        TQString* item = new TQString;
         Serializer::demarshal( element, item );
         value->setSearchQuery( item );
       }
@@ -478,7 +478,7 @@ void Serializer::demarshal( const TQDomElement &parent, GoogleSearchResult* valu
         value->setEndIndex( item );
       }
       if ( element.tagName() == "searchTips" ) {
-        TQString* item = new QString;
+        TQString* item = new TQString;
         Serializer::demarshal( element, item );
         value->setSearchTips( item );
       }
@@ -518,12 +518,12 @@ void Serializer::demarshal( const TQDomElement &parent, DirectoryCategory* value
     TQDomElement element = node.toElement();
     if ( !element.isNull() ) {
       if ( element.tagName() == "fullViewableName" ) {
-        TQString* item = new QString;
+        TQString* item = new TQString;
         Serializer::demarshal( element, item );
         value->setFullViewableName( item );
       }
       if ( element.tagName() == "specialEncoding" ) {
-        TQString* item = new QString;
+        TQString* item = new TQString;
         Serializer::demarshal( element, item );
         value->setSpecialEncoding( item );
       }
@@ -574,27 +574,27 @@ void Serializer::demarshal( const TQDomElement &parent, ResultElement* value )
     TQDomElement element = node.toElement();
     if ( !element.isNull() ) {
       if ( element.tagName() == "summary" ) {
-        TQString* item = new QString;
+        TQString* item = new TQString;
         Serializer::demarshal( element, item );
         value->setSummary( item );
       }
       if ( element.tagName() == "URL" ) {
-        TQString* item = new QString;
+        TQString* item = new TQString;
         Serializer::demarshal( element, item );
         value->setURL( item );
       }
       if ( element.tagName() == "snippet" ) {
-        TQString* item = new QString;
+        TQString* item = new TQString;
         Serializer::demarshal( element, item );
         value->setSnippet( item );
       }
       if ( element.tagName() == "title" ) {
-        TQString* item = new QString;
+        TQString* item = new TQString;
         Serializer::demarshal( element, item );
         value->setTitle( item );
       }
       if ( element.tagName() == "cachedSize" ) {
-        TQString* item = new QString;
+        TQString* item = new TQString;
         Serializer::demarshal( element, item );
         value->setCachedSize( item );
       }
@@ -604,7 +604,7 @@ void Serializer::demarshal( const TQDomElement &parent, ResultElement* value )
         value->setRelatedInformationPresent( item );
       }
       if ( element.tagName() == "hostName" ) {
-        TQString* item = new QString;
+        TQString* item = new TQString;
         Serializer::demarshal( element, item );
         value->setHostName( item );
       }
@@ -614,7 +614,7 @@ void Serializer::demarshal( const TQDomElement &parent, ResultElement* value )
         value->setDirectoryCategory( item );
       }
       if ( element.tagName() == "directoryTitle" ) {
-        TQString* item = new QString;
+        TQString* item = new TQString;
         Serializer::demarshal( element, item );
         value->setDirectoryTitle( item );
       }
diff --git a/kontact/interfaces/plugin.h b/kontact/interfaces/plugin.h
index f3b44431d..e94c0315e 100644
--- a/kontact/interfaces/plugin.h
+++ b/kontact/interfaces/plugin.h
@@ -29,13 +29,13 @@
 #include <kdepimmacros.h>
 #include <tqptrlist.h>
 
-class QStringList;
+class TQStringList;
 class DCOPClient;
 class DCOPObject;
 class KAboutData;
 class KAction;
 class KConfig;
-class QWidget;
+class TQWidget;
 namespace KParts { class ReadOnlyPart; }
 
 /**
diff --git a/kontact/plugins/kmail/kcmkmailsummary.h b/kontact/plugins/kmail/kcmkmailsummary.h
index da43a0b26..4ef16a96d 100644
--- a/kontact/plugins/kmail/kcmkmailsummary.h
+++ b/kontact/plugins/kmail/kcmkmailsummary.h
@@ -30,8 +30,8 @@
 
 class KListView;
 
-class QCheckBox;
-class QCheckListItem;
+class TQCheckBox;
+class TQCheckListItem;
 
 class KCMKMailSummary : public KCModule
 {
diff --git a/kontact/plugins/kmail/kmail_plugin.h b/kontact/plugins/kmail/kmail_plugin.h
index 73bb361b1..0077182bf 100644
--- a/kontact/plugins/kmail/kmail_plugin.h
+++ b/kontact/plugins/kmail/kmail_plugin.h
@@ -32,8 +32,8 @@
 #include <summary.h>
 #include <uniqueapphandler.h>
 
-class QMimeSource;
-class QDropEvent;
+class TQMimeSource;
+class TQDropEvent;
 
 class KMailUniqueAppHandler : public Kontact::UniqueAppHandler
 {
diff --git a/kontact/plugins/kmail/summarywidget.h b/kontact/plugins/kmail/summarywidget.h
index dc058e452..bd875565b 100644
--- a/kontact/plugins/kmail/summarywidget.h
+++ b/kontact/plugins/kmail/summarywidget.h
@@ -35,8 +35,8 @@
 #include "plugin.h"
 #include "summary.h"
 
-class QGridLayout;
-class QString;
+class TQGridLayout;
+class TQString;
 
 class SummaryWidget : public Kontact::Summary, public DCOPObject
 {
diff --git a/kontact/plugins/knotes/knotes_part.h b/kontact/plugins/knotes/knotes_part.h
index b737ddf83..de41f9aae 100644
--- a/kontact/plugins/knotes/knotes_part.h
+++ b/kontact/plugins/knotes/knotes_part.h
@@ -34,7 +34,7 @@
 #include "knotes/KNotesIface.h"
 
 class KIconView;
-class QIconViewItem;
+class TQIconViewItem;
 class KNotesIconViewItem;
 class KNoteTip;
 class KNoteEditDlg;
diff --git a/kontact/plugins/knotes/knotetip.h b/kontact/plugins/knotes/knotetip.h
index a97391962..c19244fa8 100644
--- a/kontact/plugins/knotes/knotetip.h
+++ b/kontact/plugins/knotes/knotetip.h
@@ -34,7 +34,7 @@
 
 #include <tqframe.h>
 
-class QTextEdit;
+class TQTextEdit;
 class KIconView;
 class KNotesIconViewItem;
 
diff --git a/kontact/plugins/knotes/summarywidget.h b/kontact/plugins/knotes/summarywidget.h
index dff4319ac..cc71f4727 100644
--- a/kontact/plugins/knotes/summarywidget.h
+++ b/kontact/plugins/knotes/summarywidget.h
@@ -33,8 +33,8 @@
 #include <libkcal/resourcelocal.h>
 #include <libkcal/calendarresources.h>
 
-class QGridLayout;
-class QLabel;
+class TQGridLayout;
+class TQLabel;
 
 namespace Kontact {
     class Plugin;
diff --git a/kontact/plugins/korganizer/kcmkorgsummary.h b/kontact/plugins/korganizer/kcmkorgsummary.h
index 9ae0ac58e..60a876d1d 100644
--- a/kontact/plugins/korganizer/kcmkorgsummary.h
+++ b/kontact/plugins/korganizer/kcmkorgsummary.h
@@ -27,7 +27,7 @@
 #include <kcmodule.h>
 
 class QSpinxBox;
-class QButtonGroup;
+class TQButtonGroup;
 
 class KCMKOrgSummary : public KCModule
 {
diff --git a/kontact/plugins/korganizer/summarywidget.h b/kontact/plugins/korganizer/summarywidget.h
index a88d50dd9..2f018a507 100644
--- a/kontact/plugins/korganizer/summarywidget.h
+++ b/kontact/plugins/korganizer/summarywidget.h
@@ -31,8 +31,8 @@
 
 #include "summary.h"
 
-class QGridLayout;
-class QLabel;
+class TQGridLayout;
+class TQLabel;
 
 class KOrganizerPlugin;
 
diff --git a/kontact/plugins/korganizer/todosummarywidget.h b/kontact/plugins/korganizer/todosummarywidget.h
index 029dec9a7..c5286e190 100644
--- a/kontact/plugins/korganizer/todosummarywidget.h
+++ b/kontact/plugins/korganizer/todosummarywidget.h
@@ -31,8 +31,8 @@
 
 #include "summary.h"
 
-class QGridLayout;
-class QLabel;
+class TQGridLayout;
+class TQLabel;
 
 class TodoPlugin;
 
diff --git a/kontact/plugins/kpilot/summarywidget.h b/kontact/plugins/kpilot/summarywidget.h
index ab221b4c2..09b3e77d9 100644
--- a/kontact/plugins/kpilot/summarywidget.h
+++ b/kontact/plugins/kpilot/summarywidget.h
@@ -38,8 +38,8 @@
 #include <tqwidget.h>
 #include <tqdatetime.h>
 
-class QGridLayout;
-class QLabel;
+class TQGridLayout;
+class TQLabel;
 class KURLLabel;
 
 class SummaryWidget : public Kontact::Summary, public DCOPObject
diff --git a/kontact/plugins/newsticker/kcmkontactknt.h b/kontact/plugins/newsticker/kcmkontactknt.h
index c88c94e27..a8572b8eb 100644
--- a/kontact/plugins/newsticker/kcmkontactknt.h
+++ b/kontact/plugins/newsticker/kcmkontactknt.h
@@ -26,7 +26,7 @@
 
 #include <kcmodule.h>
 
-class QListViewItem;
+class TQListViewItem;
 class QSpinxBox;
 
 class KAboutData;
diff --git a/kontact/plugins/newsticker/summarywidget.h b/kontact/plugins/newsticker/summarywidget.h
index d6cdefa0e..bfea340e1 100644
--- a/kontact/plugins/newsticker/summarywidget.h
+++ b/kontact/plugins/newsticker/summarywidget.h
@@ -35,8 +35,8 @@
 #include "summary.h"
 #include <kurl.h>
 
-class QVBoxLayout;
-class QLabel;
+class TQVBoxLayout;
+class TQLabel;
 
 class DCOPRef;
 class KURLLabel;
diff --git a/kontact/plugins/specialdates/kcmsdsummary.h b/kontact/plugins/specialdates/kcmsdsummary.h
index 589c1d91e..6fbb8aee8 100644
--- a/kontact/plugins/specialdates/kcmsdsummary.h
+++ b/kontact/plugins/specialdates/kcmsdsummary.h
@@ -27,9 +27,9 @@
 
 #include <kcmodule.h>
 
-class QButtonGroup;
-class QCheckBox;
-class QSpinBox;
+class TQButtonGroup;
+class TQCheckBox;
+class TQSpinBox;
 
 class KAboutData;
 
diff --git a/kontact/plugins/specialdates/sdsummarywidget.h b/kontact/plugins/specialdates/sdsummarywidget.h
index 00e4da223..6ef29eff3 100644
--- a/kontact/plugins/specialdates/sdsummarywidget.h
+++ b/kontact/plugins/specialdates/sdsummarywidget.h
@@ -37,8 +37,8 @@ namespace Kontact {
   class Plugin;
 }
 
-class QGridLayout;
-class QLabel;
+class TQGridLayout;
+class TQLabel;
 
 class SDSummaryWidget : public Kontact::Summary
 {
diff --git a/kontact/plugins/summary/summaryview_part.h b/kontact/plugins/summary/summaryview_part.h
index 0868b13c9..1e99f7369 100644
--- a/kontact/plugins/summary/summaryview_part.h
+++ b/kontact/plugins/summary/summaryview_part.h
@@ -43,9 +43,9 @@ namespace KParts
   class PartActivateEvent;
 }
 
-class QFrame;
-class QLabel;
-class QGridLayout;
+class TQFrame;
+class TQLabel;
+class TQGridLayout;
 class KAction;
 class KCMultiDialog;
 
diff --git a/kontact/plugins/test/test_part.cpp b/kontact/plugins/test/test_part.cpp
index a32e734f5..c58f8f57b 100644
--- a/kontact/plugins/test/test_part.cpp
+++ b/kontact/plugins/test/test_part.cpp
@@ -45,7 +45,7 @@ TestPart::TestPart(TQObject *parent, const char *name) // ## parentWidget
   : KParts::ReadOnlyPart(parent, name)
 {
   setInstance( new KInstance("testpart") ); // ## memleak
-  m_edit = new QTextEdit;
+  m_edit = new TQTextEdit;
   setWidget(m_edit);
   setXMLFile("testpartui.rc");
   new KAction( "new contact (test)", 0, this, TQT_SLOT( newContact() ), actionCollection(), "test_deleteevent" );
diff --git a/kontact/plugins/test/test_part.h b/kontact/plugins/test/test_part.h
index 8d9c0ba7f..8a80dcb42 100644
--- a/kontact/plugins/test/test_part.h
+++ b/kontact/plugins/test/test_part.h
@@ -28,7 +28,7 @@
 
 #include <kparts/part.h>
 
-class QTextEdit;
+class TQTextEdit;
 class KAddressBookIface_stub;
 
 class TestPart : public KParts::ReadOnlyPart
diff --git a/kontact/plugins/weather/summarywidget.h b/kontact/plugins/weather/summarywidget.h
index 9af476903..0baeefc0a 100644
--- a/kontact/plugins/weather/summarywidget.h
+++ b/kontact/plugins/weather/summarywidget.h
@@ -37,9 +37,9 @@
 
 class KProcess;
 
-class QGridLayout;
-class QLabel;
-class QVBoxLayout;
+class TQGridLayout;
+class TQLabel;
+class TQVBoxLayout;
 
 class WeatherData
 {
diff --git a/kontact/src/iconsidepane.h b/kontact/src/iconsidepane.h
index 89fb002a8..03f838c97 100644
--- a/kontact/src/iconsidepane.h
+++ b/kontact/src/iconsidepane.h
@@ -29,7 +29,7 @@
 #include "prefs.h"
 
 
-class QSignalMapper;
+class TQSignalMapper;
 
 namespace KParts { class Part; }
 
diff --git a/kontact/src/kcmkontact.h b/kontact/src/kcmkontact.h
index d914bd351..ed926db4e 100644
--- a/kontact/src/kcmkontact.h
+++ b/kontact/src/kcmkontact.h
@@ -29,9 +29,9 @@
 #include <kservice.h>
 #include "plugin.h"
 
-class QGroupBox;
-class QComboBox;
-class QListViewItem;
+class TQGroupBox;
+class TQComboBox;
+class TQListViewItem;
 
 class KAboutData;
 class KListView;
diff --git a/kontact/src/mainwindow.h b/kontact/src/mainwindow.h
index 5fe50a22f..892fce64e 100644
--- a/kontact/src/mainwindow.h
+++ b/kontact/src/mainwindow.h
@@ -36,10 +36,10 @@
 #include "core.h"
 #include "kontactiface.h"
 
-class QHBox;
-class QSplitter;
-class QVBox;
-class QFrame;
+class TQHBox;
+class TQSplitter;
+class TQVBox;
+class TQFrame;
 
 class KAction;
 class KConfig;
diff --git a/kontact/src/profiledialog.h b/kontact/src/profiledialog.h
index 730b044f3..b20a86985 100644
--- a/kontact/src/profiledialog.h
+++ b/kontact/src/profiledialog.h
@@ -30,10 +30,10 @@
 #include <tqmap.h>
 #include <tqstring.h>
 
-class QListViewItem;
+class TQListViewItem;
 
 class KListView;
-class QPushButton;
+class TQPushButton;
 
 namespace Kontact {
 
diff --git a/kontact/src/profilemanager.h b/kontact/src/profilemanager.h
index ff6d6e1bf..0b335b950 100644
--- a/kontact/src/profilemanager.h
+++ b/kontact/src/profilemanager.h
@@ -29,7 +29,7 @@
 #include <tqobject.h>
 #include <tqstring.h>
 
-template <class T> class QValueList;
+template <class T> class TQValueList;
 
 namespace KIO {
     class Job;
diff --git a/korganizer/archivedialog.h b/korganizer/archivedialog.h
index 39a625cbf..011e213f3 100644
--- a/korganizer/archivedialog.h
+++ b/korganizer/archivedialog.h
@@ -26,12 +26,12 @@
 
 #include <kdialogbase.h>
 
-class QRadioButton;
-class QComboBox;
+class TQRadioButton;
+class TQComboBox;
 class KIntNumInput;
 class KURLRequester;
 class KDateEdit;
-class QCheckBox;
+class TQCheckBox;
 
 namespace KCal {
 class Calendar;
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h
index a3e9a9ab3..dfcc75ef3 100644
--- a/korganizer/calendarview.h
+++ b/korganizer/calendarview.h
@@ -35,8 +35,8 @@
 
 #include <korganizer/calendarviewbase.h>
 
-class QWidgetStack;
-class QSplitter;
+class TQWidgetStack;
+class TQSplitter;
 
 class KOViewManager;
 class KODialogManager;
diff --git a/korganizer/datechecker.h b/korganizer/datechecker.h
index 4866faf8a..28ae29548 100644
--- a/korganizer/datechecker.h
+++ b/korganizer/datechecker.h
@@ -28,7 +28,7 @@
 #include <tqobject.h>
 #include <tqdatetime.h>
 
-class QTimer;
+class TQTimer;
 
 class KCalendarSystem;
 
diff --git a/korganizer/filtereditdialog.h b/korganizer/filtereditdialog.h
index b726e169f..8527fd0b9 100644
--- a/korganizer/filtereditdialog.h
+++ b/korganizer/filtereditdialog.h
@@ -29,7 +29,7 @@
 #include "filteredit_base.h"
 
 class FilterEdit;
-template<class type> class QPtrList;
+template<class type> class TQPtrList;
 
 namespace KPIM { class CategorySelectDialog; }
 namespace KCal { class CalFilter; }
diff --git a/korganizer/importdialog.h b/korganizer/importdialog.h
index f2cf436a4..ae92ae0b6 100644
--- a/korganizer/importdialog.h
+++ b/korganizer/importdialog.h
@@ -30,7 +30,7 @@
 #include <kurl.h>
 
 
-class QRadioButton;
+class TQRadioButton;
 
 class ImportDialog : public KDialogBase
 {
diff --git a/korganizer/interfaces/korganizer/incidencechangerbase.h b/korganizer/interfaces/korganizer/incidencechangerbase.h
index 9deb87642..f482388c5 100644
--- a/korganizer/interfaces/korganizer/incidencechangerbase.h
+++ b/korganizer/interfaces/korganizer/incidencechangerbase.h
@@ -24,7 +24,7 @@
 #include <libkcal/scheduler.h>
 #include <tqobject.h>
 
-class QWidget;
+class TQWidget;
 namespace KCal {
 class Calendar;
 class Incidence;
diff --git a/korganizer/journalentry.h b/korganizer/journalentry.h
index 02e85e1e5..090909f39 100644
--- a/korganizer/journalentry.h
+++ b/korganizer/journalentry.h
@@ -28,14 +28,14 @@
 
 #include <tqvbox.h>
 
-class QLabel;
+class TQLabel;
 class KActiveLabel;
-class QCheckBox;
-class QGridLayout;
+class TQCheckBox;
+class TQGridLayout;
 class KLineEdit;
 class KTextEdit;
 class KTimeEdit;
-class QButton;
+class TQButton;
 namespace KOrg {
 class IncidenceChangerBase;
 }
diff --git a/korganizer/kdatenavigator.h b/korganizer/kdatenavigator.h
index 07e85c2d5..047925895 100644
--- a/korganizer/kdatenavigator.h
+++ b/korganizer/kdatenavigator.h
@@ -30,8 +30,8 @@
 
 #include <libkcal/incidencebase.h>
 
-class QPushButton;
-class QLabel;
+class TQPushButton;
+class TQLabel;
 
 namespace KCal {
 class Calendar;
diff --git a/korganizer/koagenda.h b/korganizer/koagenda.h
index 0b0d06986..a6d06d006 100644
--- a/korganizer/koagenda.h
+++ b/korganizer/koagenda.h
@@ -30,9 +30,9 @@
 #include <libkcal/incidencebase.h>
 
 
-class QPopupMenu;
-class QTime;
-class QLabel;
+class TQPopupMenu;
+class TQTime;
+class TQLabel;
 class KConfig;
 class KOAgenda;
 class KOAgendaItem;
diff --git a/korganizer/koagendaitem.h b/korganizer/koagendaitem.h
index 39a71e7ee..fc774dd1f 100644
--- a/korganizer/koagendaitem.h
+++ b/korganizer/koagendaitem.h
@@ -29,9 +29,9 @@
 
 #include <tqdatetime.h>
 
-class QToolTipGroup;
-class QDragEnterEvent;
-class QDropEvent;
+class TQToolTipGroup;
+class TQDragEnterEvent;
+class TQDropEvent;
 
 namespace KCal {
 class Incidence;
diff --git a/korganizer/koagendaview.h b/korganizer/koagendaview.h
index c1434dc1d..1a16b2bb7 100644
--- a/korganizer/koagendaview.h
+++ b/korganizer/koagendaview.h
@@ -34,9 +34,9 @@
 
 #include "agendaview.h"
 
-class QHBox;
-class QPushButton;
-class QBoxLayout;
+class TQHBox;
+class TQPushButton;
+class TQBoxLayout;
 
 class KOAgenda;
 class KOAgendaItem;
diff --git a/korganizer/koattendeeeditor.h b/korganizer/koattendeeeditor.h
index 0641748f6..5f1dfb977 100644
--- a/korganizer/koattendeeeditor.h
+++ b/korganizer/koattendeeeditor.h
@@ -24,12 +24,12 @@
 #include <tqwidget.h>
 #include <libkcal/attendee.h>
 
-class QBoxLayout;
-class QComboBox;
-class QCheckBox;
-class QLabel;
-class QPushButton;
-class QHBox;
+class TQBoxLayout;
+class TQComboBox;
+class TQCheckBox;
+class TQLabel;
+class TQPushButton;
+class TQHBox;
 
 namespace KPIM {
   class AddresseeLineEdit;
diff --git a/korganizer/kodaymatrix.h b/korganizer/kodaymatrix.h
index 60c2e3ced..7dcf830e1 100644
--- a/korganizer/kodaymatrix.h
+++ b/korganizer/kodaymatrix.h
@@ -34,10 +34,10 @@
 #include <tqtooltip.h>
 #include <tqmap.h>
 
-class QDragEnterEvent;
-class QDragMoveEvent;
-class QDragLeaveEvent;
-class QDropEvent;
+class TQDragEnterEvent;
+class TQDragMoveEvent;
+class TQDragLeaveEvent;
+class TQDropEvent;
 
 class KODayMatrix;
 
diff --git a/korganizer/koeditorattachments.h b/korganizer/koeditorattachments.h
index 11dd7e8d4..09b2c48ea 100644
--- a/korganizer/koeditorattachments.h
+++ b/korganizer/koeditorattachments.h
@@ -33,11 +33,11 @@ class Incidence;
 class Attachment;
 }
 
-class QIconViewItem;
+class TQIconViewItem;
 class AttachmentIconView;
-class QMimeSource;
-class QPushButton;
-class QPopupMenu;
+class TQMimeSource;
+class TQPushButton;
+class TQPopupMenu;
 class KAction;
 
 class KOEditorAttachments : public QWidget
diff --git a/korganizer/koeditordetails.h b/korganizer/koeditordetails.h
index 7d122244b..92a271644 100644
--- a/korganizer/koeditordetails.h
+++ b/korganizer/koeditordetails.h
@@ -30,12 +30,12 @@
 
 #include <libkcal/attendee.h>
 
-class QPushButton;
-class QCheckBox;
-class QLineEdit;
-class QLabel;
-class QComboBox;
-class QHBox;
+class TQPushButton;
+class TQCheckBox;
+class TQLineEdit;
+class TQLabel;
+class TQComboBox;
+class TQHBox;
 class KDateEdit;
 class KOEditorFreeBusy;
 
diff --git a/korganizer/koeditorfreebusy.h b/korganizer/koeditorfreebusy.h
index 854bc1126..4e561cfa2 100644
--- a/korganizer/koeditorfreebusy.h
+++ b/korganizer/koeditorfreebusy.h
@@ -31,7 +31,7 @@
 #include <tqtimer.h>
 
 class KDIntervalColorRectangle;
-class QLabel;
+class TQLabel;
 class KDGanttView;
 class KDGanttViewItem;
 class FreeBusyItem;
diff --git a/korganizer/koeditorgeneral.h b/korganizer/koeditorgeneral.h
index c2d1867b9..b1fffc26c 100644
--- a/korganizer/koeditorgeneral.h
+++ b/korganizer/koeditorgeneral.h
@@ -26,15 +26,15 @@
 #include <libkcal/alarm.h>
 #include <tqlineedit.h>
 
-class QWidget;
-class QBoxLayout;
-class QLineEdit;
-class QLabel;
-class QCheckBox;
-class QWidgetStack;
-class QSpinBox;
-class QPushButton;
-class QComboBox;
+class TQWidget;
+class TQBoxLayout;
+class TQLineEdit;
+class TQLabel;
+class TQCheckBox;
+class TQWidgetStack;
+class TQSpinBox;
+class TQPushButton;
+class TQComboBox;
 class KTextEdit;
 class KSqueezedTextLabel;
 class KURL;
diff --git a/korganizer/koeditorgeneralevent.h b/korganizer/koeditorgeneralevent.h
index 21a7dfc4d..a13fa47c6 100644
--- a/korganizer/koeditorgeneralevent.h
+++ b/korganizer/koeditorgeneralevent.h
@@ -27,12 +27,12 @@
 #include "koeditorgeneral.h"
 #include <tqdatetime.h>
 
-class QLabel;
+class TQLabel;
 class KDateEdit;
 class KTimeEdit;
-class QCheckBox;
-class QComboBox;
-class QBoxLayout;
+class TQCheckBox;
+class TQComboBox;
+class TQBoxLayout;
 
 namespace KCal {
 class Event;
diff --git a/korganizer/koeditorgeneraljournal.h b/korganizer/koeditorgeneraljournal.h
index a2645c221..28827c8c8 100644
--- a/korganizer/koeditorgeneraljournal.h
+++ b/korganizer/koeditorgeneraljournal.h
@@ -31,11 +31,11 @@
 class KDateEdit;
 class KTimeEdit;
 class KTextEdit;
-class QLineEdit;
-class QLabel;
-class QBoxLayout;
-class QCheckBox;
-class QWidget;
+class TQLineEdit;
+class TQLabel;
+class TQBoxLayout;
+class TQCheckBox;
+class TQWidget;
 
 namespace KCal {
 class Incidence;
diff --git a/korganizer/koeditorrecurrence.h b/korganizer/koeditorrecurrence.h
index 5b900330d..0ce9c6dda 100644
--- a/korganizer/koeditorrecurrence.h
+++ b/korganizer/koeditorrecurrence.h
@@ -32,11 +32,11 @@
 
 #include <libkcal/incidencebase.h>
 
-class QWidgetStack;
-class QSpinBox;
-class QRadioButton;
-class QGroupBox;
-class QCheckBox;
+class TQWidgetStack;
+class TQSpinBox;
+class TQRadioButton;
+class TQGroupBox;
+class TQCheckBox;
 
 class KDateEdit;
 namespace KCal {
diff --git a/korganizer/koeventview.h b/korganizer/koeventview.h
index 23d1bc441..c33348813 100644
--- a/korganizer/koeventview.h
+++ b/korganizer/koeventview.h
@@ -36,7 +36,7 @@ class Incidence;
 using namespace KCal;
 
 class KOEventPopupMenu;
-class QPopupMenu;
+class TQPopupMenu;
 
 /**
   KOEventView is the abstract base class from which all other
diff --git a/korganizer/koglobals.h b/korganizer/koglobals.h
index 88435d4cd..771588101 100644
--- a/korganizer/koglobals.h
+++ b/korganizer/koglobals.h
@@ -25,8 +25,8 @@
 
 #include <kdepimmacros.h>
 
-class QPixmap;
-class QIconSet;
+class TQPixmap;
+class TQIconSet;
 class KCalendarSystem;
 class AlarmClient;
 
diff --git a/korganizer/koincidenceeditor.h b/korganizer/koincidenceeditor.h
index 3440a35b2..35c4c45ba 100644
--- a/korganizer/koincidenceeditor.h
+++ b/korganizer/koincidenceeditor.h
@@ -28,7 +28,7 @@
 #include <kdialogbase.h>
 #include <kurl.h>
 
-class QDateTime;
+class TQDateTime;
 
 namespace KPIM {
 class CategorySelectDialog;
diff --git a/korganizer/kojournaleditor.h b/korganizer/kojournaleditor.h
index 7d102769e..75edb1829 100644
--- a/korganizer/kojournaleditor.h
+++ b/korganizer/kojournaleditor.h
@@ -30,7 +30,7 @@
 
 #include <tqdatetime.h>
 
-class QDateTime;
+class TQDateTime;
 namespace KCal {
 class Calendar;
 class Journal;
diff --git a/korganizer/kojournalview.h b/korganizer/kojournalview.h
index 3e48dd710..9af95537e 100644
--- a/korganizer/kojournalview.h
+++ b/korganizer/kojournalview.h
@@ -28,8 +28,8 @@
 #include "journalentry.h"
 
 class JournalEntry;
-class QScrollView;
-class QVBox;
+class TQScrollView;
+class TQVBox;
 
 /**
  * This class provides a journal view.
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h
index c65382f5d..48a42cbd5 100644
--- a/korganizer/koprefs.h
+++ b/korganizer/koprefs.h
@@ -31,9 +31,9 @@
 #include "koprefs_base.h"
 
 class KConfig;
-class QFont;
-class QColor;
-class QStringList;
+class TQFont;
+class TQColor;
+class TQStringList;
 
 TQColor getTextColor(const TQColor &c);
 
diff --git a/korganizer/koprefsdialog.h b/korganizer/koprefsdialog.h
index b412fff7e..8be91a821 100644
--- a/korganizer/koprefsdialog.h
+++ b/korganizer/koprefsdialog.h
@@ -29,14 +29,14 @@
 
 #include <tqdict.h>
 
-class QLineEdit;
-class QLabel;
-class QSpinBox;
-class QComboBox;
+class TQLineEdit;
+class TQLabel;
+class TQSpinBox;
+class TQComboBox;
 class KColorButton;
 class KPushButton;
-class QColor;
-class QListView;
+class TQColor;
+class TQListView;
 
 class KDE_EXPORT KOPrefsDialogMain : public KPrefsModule
 {
diff --git a/korganizer/korgac/alarmdialog.h b/korganizer/korgac/alarmdialog.h
index 711a47bd6..4c2162a54 100644
--- a/korganizer/korgac/alarmdialog.h
+++ b/korganizer/korgac/alarmdialog.h
@@ -36,7 +36,7 @@
 using namespace KCal;
 
 class KOEventViewer;
-class QSpinBox;
+class TQSpinBox;
 class KComboBox;
 class KListView;
 class AlarmListItem;
diff --git a/korganizer/kotodoeditor.h b/korganizer/kotodoeditor.h
index 2abaa9e51..3b6df5b38 100644
--- a/korganizer/kotodoeditor.h
+++ b/korganizer/kotodoeditor.h
@@ -28,7 +28,7 @@
 
 #include "koincidenceeditor.h"
 
-class QDateTime;
+class TQDateTime;
 class KOEditorGeneralTodo;
 class KOEditorRecurrence;
 /**
diff --git a/korganizer/kotodoview.h b/korganizer/kotodoview.h
index 881d92358..7deaafded 100644
--- a/korganizer/kotodoview.h
+++ b/korganizer/kotodoview.h
@@ -33,11 +33,11 @@
 #include <libkcal/todo.h>
 #include <korganizer/baseview.h>
 
-class QDragEnterEvent;
-class QDragMoveEvent;
-class QDragLeaveEvent;
-class QDropEvent;
-class QPopupMenu;
+class TQDragEnterEvent;
+class TQDragMoveEvent;
+class TQDragLeaveEvent;
+class TQDropEvent;
+class TQPopupMenu;
 
 class KOTodoListView;
 class KOTodoViewItem;
diff --git a/korganizer/koviewmanager.h b/korganizer/koviewmanager.h
index 58faf6369..32c55c3d4 100644
--- a/korganizer/koviewmanager.h
+++ b/korganizer/koviewmanager.h
@@ -26,8 +26,8 @@
 #define KOVIEWMANAGER_H
 
 #include <tqobject.h>
-class QWidget;
-class QTabWidget;
+class TQWidget;
+class TQTabWidget;
 
 class CalendarView;
 
diff --git a/korganizer/kowhatsnextview.h b/korganizer/kowhatsnextview.h
index 54daf616c..6f49ab2b1 100644
--- a/korganizer/kowhatsnextview.h
+++ b/korganizer/kowhatsnextview.h
@@ -28,7 +28,7 @@
 
 #include <korganizer/baseview.h>
 
-class QListView;
+class TQListView;
 
 class KOEventViewerDialog;
 
diff --git a/korganizer/multiagendaview.h b/korganizer/multiagendaview.h
index 01b74ce74..d7316698d 100644
--- a/korganizer/multiagendaview.h
+++ b/korganizer/multiagendaview.h
@@ -21,12 +21,12 @@
 
 #include "agendaview.h"
 
-class QScrollView;
-class QHBox;
-class QSplitter;
+class TQScrollView;
+class TQHBox;
+class TQSplitter;
 class KOAgendaView;
 class TimeLabels;
-class QScrollBar;
+class TQScrollBar;
 
 namespace KCal {
   class ResourceCalendar;
diff --git a/korganizer/navigatorbar.h b/korganizer/navigatorbar.h
index 88dfeeff5..c6bc41768 100644
--- a/korganizer/navigatorbar.h
+++ b/korganizer/navigatorbar.h
@@ -28,8 +28,8 @@
 
 #include <tqlabel.h>
 
-class QPushButton;
-class QFrame;
+class TQPushButton;
+class TQFrame;
 
 class ActiveLabel : public QLabel
 {
diff --git a/korganizer/plugins/datenums/configdialog.h b/korganizer/plugins/datenums/configdialog.h
index cef3e013b..992eeccce 100644
--- a/korganizer/plugins/datenums/configdialog.h
+++ b/korganizer/plugins/datenums/configdialog.h
@@ -21,7 +21,7 @@
 
 #include <kdialogbase.h>
 
-class QButtonGroup;
+class TQButtonGroup;
 
 class ConfigDialog : public KDialogBase
 {
diff --git a/korganizer/plugins/exchange/exchangedialog.h b/korganizer/plugins/exchange/exchangedialog.h
index bd0e2f26a..b2635f7ab 100644
--- a/korganizer/plugins/exchange/exchangedialog.h
+++ b/korganizer/plugins/exchange/exchangedialog.h
@@ -22,7 +22,7 @@
 #include <kdialogbase.h>
 #include <kdatewidget.h>
 
-class QComboBox;
+class TQComboBox;
 
 class ExchangeDialog : public KDialogBase
 {
diff --git a/korganizer/plugins/projectview/koprojectview.cpp b/korganizer/plugins/projectview/koprojectview.cpp
index 6c448b371..6c45ff424 100644
--- a/korganizer/plugins/projectview/koprojectview.cpp
+++ b/korganizer/plugins/projectview/koprojectview.cpp
@@ -70,7 +70,7 @@ KOProjectView::KOProjectView(Calendar *calendar,TQWidget* parent,
 {
   TQBoxLayout *topLayout = new TQVBoxLayout(this);
 
-  TQBoxLayout *topBar = new QHBoxLayout;
+  TQBoxLayout *topBar = new TQHBoxLayout;
   topLayout->addLayout(topBar);
 
   TQLabel *title = new TQLabel(i18n("Project View"),this);
diff --git a/korganizer/plugins/projectview/koprojectview.h b/korganizer/plugins/projectview/koprojectview.h
index 4d2d8226c..aa856621a 100644
--- a/korganizer/plugins/projectview/koprojectview.h
+++ b/korganizer/plugins/projectview/koprojectview.h
@@ -32,13 +32,13 @@
 #include "KGanttItem.h"
 
 class KGantt;
-class QLineEdit;
-class QFont;
-class QLabel;
-class QPopupMenu;
-class QListBox;
-class QStrList;
-class QListView;
+class TQLineEdit;
+class TQFont;
+class TQLabel;
+class TQPopupMenu;
+class TQListBox;
+class TQStrList;
+class TQListView;
 
 /**
   This class provides an item of the project view. It is a xQTask with
diff --git a/korganizer/plugins/timespanview/timespanwidget.h b/korganizer/plugins/timespanview/timespanwidget.h
index 38cdea6c8..fa0378721 100644
--- a/korganizer/plugins/timespanview/timespanwidget.h
+++ b/korganizer/plugins/timespanview/timespanwidget.h
@@ -30,8 +30,8 @@ namespace KCal {
 class Event;
 }
 
-class QSplitter;
-class QListView;
+class TQSplitter;
+class TQListView;
 class LineView;
 class TimeLine;
 
diff --git a/korganizer/printing/calprinter.h b/korganizer/printing/calprinter.h
index a1cea6a24..a75d3fc69 100644
--- a/korganizer/printing/calprinter.h
+++ b/korganizer/printing/calprinter.h
@@ -38,12 +38,12 @@ class CoreHelper;
 }
 using namespace KCal;
 
-class QVButtonGroup;
-class QWidgetStack;
+class TQVButtonGroup;
+class TQWidgetStack;
 class CalPrintDialog;
 class KConfig;
-class QComboBox;
-class QLabel;
+class TQComboBox;
+class TQLabel;
 
 /**
   CalPrinter is a class for printing Calendars.  It can print in several
diff --git a/korganizer/printing/calprintpluginbase.h b/korganizer/printing/calprintpluginbase.h
index 226998f85..16a3374d2 100644
--- a/korganizer/printing/calprintpluginbase.h
+++ b/korganizer/printing/calprintpluginbase.h
@@ -40,7 +40,7 @@
 
 class PrintCellItem;
 
-class QWidget;
+class TQWidget;
 
 using namespace KCal;
 
diff --git a/korganizer/resourceview.h b/korganizer/resourceview.h
index 932c81885..f34d0cf22 100644
--- a/korganizer/resourceview.h
+++ b/korganizer/resourceview.h
@@ -36,7 +36,7 @@ class CalendarResources;
 using namespace KCal;
 class KListView;
 class ResourceView;
-class QPushButton;
+class TQPushButton;
 
 class ResourceViewFactory : public CalendarViewExtension::Factory
 {
diff --git a/korganizer/searchdialog.h b/korganizer/searchdialog.h
index c8ba4dea8..cd535bd10 100644
--- a/korganizer/searchdialog.h
+++ b/korganizer/searchdialog.h
@@ -36,9 +36,9 @@ namespace KCal {
 class Calendar;
 }
 class KDateEdit;
-class QCheckBox;
-class QLineEdit;
-class QLabel;
+class TQCheckBox;
+class TQLineEdit;
+class TQLabel;
 class KOListView;
 
 using namespace KCal;
diff --git a/korganizer/statusdialog.h b/korganizer/statusdialog.h
index e0bcb4478..d97c1ac20 100644
--- a/korganizer/statusdialog.h
+++ b/korganizer/statusdialog.h
@@ -24,7 +24,7 @@
 #include <libkcal/attendee.h>
 using namespace KCal;
 
-class QComboBox;
+class TQComboBox;
 
 class StatusDialog : public KDialog
 {
diff --git a/korganizer/timelabels.h b/korganizer/timelabels.h
index 84ea5473b..63881c4e1 100644
--- a/korganizer/timelabels.h
+++ b/korganizer/timelabels.h
@@ -28,9 +28,9 @@
 #include <tqscrollview.h>
 #include <tqlabel.h>
 
-class QHBox;
-class QPushButton;
-class QBoxLayout;
+class TQHBox;
+class TQPushButton;
+class TQBoxLayout;
 
 class KOAgenda;
 class KOAgendaItem;
diff --git a/korn/account_input.h b/korn/account_input.h
index 0f7f2e232..548db498b 100644
--- a/korn/account_input.h
+++ b/korn/account_input.h
@@ -20,15 +20,15 @@
 #ifndef MK_ACCOUNT_INPUT
 #define MK_ACCOUNT_INPUT
 
-class QWidget;
-class QString;
-class QStringList;
+class TQWidget;
+class TQString;
+class TQStringList;
 
-class QLabel;
+class TQLabel;
 class KLineEdit;
 class KURLRequester;
-class QComboBox;
-class QCheckBox;
+class TQComboBox;
+class TQCheckBox;
 
 #include <tqmap.h>
 
diff --git a/korn/accountmanager.h b/korn/accountmanager.h
index 037887d4e..5d0f32936 100644
--- a/korn/accountmanager.h
+++ b/korn/accountmanager.h
@@ -28,8 +28,8 @@ class KMailDrop;
 
 class KConfig;
 
-template< class T > class QPtrList;
-template< class T, class W > class QMap;
+template< class T > class TQPtrList;
+template< class T, class W > class TQMap;
 
 
 /**
diff --git a/korn/boxcontainer.h b/korn/boxcontainer.h
index d650657e8..ec0543188 100644
--- a/korn/boxcontainer.h
+++ b/korn/boxcontainer.h
@@ -23,7 +23,7 @@
 
 class BoxContainerItem;
 
-template< class T > class QPtrList;
+template< class T > class TQPtrList;
 
 class KConfig;
 
diff --git a/korn/boxcontaineritem.h b/korn/boxcontaineritem.h
index 0112f9acf..86a4efc93 100644
--- a/korn/boxcontaineritem.h
+++ b/korn/boxcontaineritem.h
@@ -29,10 +29,10 @@ class KConfig;
 class KPopupMenu;
 class KProcess;
 
-class QColor;
-class QLabel;
-//template< class T > class QPtrList;
-class QString;
+class TQColor;
+class TQLabel;
+//template< class T > class TQPtrList;
+class TQString;
 
 /**
  * This class provide a base for an item. This item should be
diff --git a/korn/dcop_proto.h b/korn/dcop_proto.h
index 38a5404dd..a485e08d8 100644
--- a/korn/dcop_proto.h
+++ b/korn/dcop_proto.h
@@ -28,14 +28,14 @@ class KIO_Protocol;
 class KMailDrop;
 class Protocol;
 
-class QGroupBox;
-class QObject;
-class QStringList;
-class QWidget;
+class TQGroupBox;
+class TQObject;
+class TQStringList;
+class TQWidget;
 
-template< class T> class QPtrList;
-template< class T> class QPtrVector;
-template< class T, class S> class QMap;
+template< class T> class TQPtrList;
+template< class T> class TQPtrVector;
+template< class T, class S> class TQMap;
 
 #include <tqstring.h>
 
diff --git a/korn/dcopdrop.h b/korn/dcopdrop.h
index 32e85066d..124d197e6 100644
--- a/korn/dcopdrop.h
+++ b/korn/dcopdrop.h
@@ -30,8 +30,8 @@ class KornMailSubject;
 
 class KConfigBase;
 
-template<class A, class B> class QMap;
-class QString;
+template<class A, class B> class TQMap;
+class TQString;
 
 /**
  * This class implements a KMailDrop for DCOP-objects.
diff --git a/korn/dockeditem.h b/korn/dockeditem.h
index d9a85004d..ae6689f80 100644
--- a/korn/dockeditem.h
+++ b/korn/dockeditem.h
@@ -25,7 +25,7 @@ class SystemTray;
 
 class KConfig;
 
-class QPixmap;
+class TQPixmap;
 
 /**
  * This class is an implementation of a BoxContainerItem for the
diff --git a/korn/hvcontainer.h b/korn/hvcontainer.h
index 54a96cd81..d00551d57 100644
--- a/korn/hvcontainer.h
+++ b/korn/hvcontainer.h
@@ -23,7 +23,7 @@
 
 class BoxContainerItem;
 
-class QHBox;
+class TQHBox;
 
 /**
  * This is a BoxContainer for both Horizontal and Vertical displays.
diff --git a/korn/keditlistboxman.h b/korn/keditlistboxman.h
index ffc2920e7..b683a364c 100644
--- a/korn/keditlistboxman.h
+++ b/korn/keditlistboxman.h
@@ -23,8 +23,8 @@
 
 class KConfig;
 
-class QString;
-class QWidget;
+class TQString;
+class TQWidget;
 
 /**
  * This class is a extention on KEditListBox.
diff --git a/korn/kio.h b/korn/kio.h
index a2d396e32..d54846c83 100644
--- a/korn/kio.h
+++ b/korn/kio.h
@@ -25,7 +25,7 @@
 
 #include "polldrop.h"
 
-class QWidget;
+class TQWidget;
 class KDropDialog;
 class KornMailSubject;
 class KProcess;
@@ -36,8 +36,8 @@ class KIO_Read;
 class KIO_Delete;
 class KConfigGroup;
 class KURL;
-template<class> class QPtrList;
-template<class> class QValueList;
+template<class> class TQPtrList;
+template<class> class TQValueList;
 namespace KIO { class Job; class MetaData; class Slave; class TransferJob; }
 
 /**
diff --git a/korn/kio_count.h b/korn/kio_count.h
index ed5ef584d..d8df7dc0e 100644
--- a/korn/kio_count.h
+++ b/korn/kio_count.h
@@ -34,12 +34,12 @@ class KKioDrop;
 class KornMailSubject;
 class SortedMailSubject;
 
-template<class T> class QValueList;
+template<class T> class TQValueList;
 namespace KIO { class Job; class ListJob; class MetaData; class Slave; }
 
 class KURL;
 
-class QString;
+class TQString;
 
 class KIO_Count : public QObject
 { Q_OBJECT
diff --git a/korn/kio_delete.h b/korn/kio_delete.h
index 469ff29a2..24a1eef7c 100644
--- a/korn/kio_delete.h
+++ b/korn/kio_delete.h
@@ -32,7 +32,7 @@ class KornMailId;
 class KURL;
 namespace KIO { class MetaData; class Job; class Slave; }
 
-template<class T> class QPtrList;
+template<class T> class TQPtrList;
 
 class KIO_Delete : public QObject
 { Q_OBJECT
diff --git a/korn/kio_proto.h b/korn/kio_proto.h
index 216b58263..77a108940 100644
--- a/korn/kio_proto.h
+++ b/korn/kio_proto.h
@@ -26,7 +26,7 @@
  * by a protocol.
  */
 
-class QString;
+class TQString;
 #include <kio/global.h>
 #include <klocale.h>
 #include <tqstringlist.h>
diff --git a/korn/kio_read.cpp b/korn/kio_read.cpp
index 54466990c..b92da304c 100644
--- a/korn/kio_read.cpp
+++ b/korn/kio_read.cpp
@@ -38,7 +38,7 @@ KIO_Read::KIO_Read( TQObject * parent, const char * name )
 	_job( 0 ),
 	_message( 0 )
 {
-	_message = new QString;
+	_message = new TQString;
 }
 
 KIO_Read::~KIO_Read()
diff --git a/korn/kio_read.h b/korn/kio_read.h
index 970e3c8cc..a3e30c882 100644
--- a/korn/kio_read.h
+++ b/korn/kio_read.h
@@ -30,7 +30,7 @@ class KURL;
 namespace KIO { class MetaData; class Job; }
 class KIO_Protocol;
 
-class QString;
+class TQString;
 
 class KIO_Read : public QObject
 { Q_OBJECT
diff --git a/korn/kio_single_subject.cpp b/korn/kio_single_subject.cpp
index 6d797efd8..02a6a103d 100644
--- a/korn/kio_single_subject.cpp
+++ b/korn/kio_single_subject.cpp
@@ -45,7 +45,7 @@ KIO_Single_Subject::KIO_Single_Subject( TQObject * parent, const char * name,
 	_protocol = protocol;
 	_name = new TQString( url );
 	_size = size;
-	_message = new QString;
+	_message = new TQString;
 	
 	init( slave );
 }
diff --git a/korn/kio_single_subject.h b/korn/kio_single_subject.h
index 662d2e538..ee021a33c 100644
--- a/korn/kio_single_subject.h
+++ b/korn/kio_single_subject.h
@@ -29,9 +29,9 @@ class KURL;
 namespace KIO { class MetaData; class Job; class TransferJob; class Slave; }
 class KIO_Protocol;
 
-class QString;
-template<class T> class QMemArray;
-typedef TQMemArray<char> QByteArray;
+class TQString;
+template<class T> class TQMemArray;
+typedef TQMemArray<char> TQByteArray;
 
 class KIO_Single_Subject : public QObject
 { Q_OBJECT
diff --git a/korn/kio_subjects.h b/korn/kio_subjects.h
index d51e1ec5f..6ed1798a9 100644
--- a/korn/kio_subjects.h
+++ b/korn/kio_subjects.h
@@ -30,9 +30,9 @@ class KornMailSubject;
 namespace KIO { class MetaData; class Slave; }
 class KURL;
 
-template<class T> class QPtrList;
-class QString;
-template<class T> class QValueList;
+template<class T> class TQPtrList;
+class TQString;
+template<class T> class TQValueList;
 
 class KIO_Subjects : public QObject
 { Q_OBJECT
diff --git a/korn/kornaccountcfgimpl.cpp b/korn/kornaccountcfgimpl.cpp
index 43493d998..4a8af84e9 100644
--- a/korn/kornaccountcfgimpl.cpp
+++ b/korn/kornaccountcfgimpl.cpp
@@ -165,7 +165,7 @@ void KornAccountCfgImpl::slotCancel()
 void KornAccountCfgImpl::slotProtocolChanged( const TQString& proto )
 {
 	const Protocol *protocol = Protocols::getProto( proto );
-	TQStringList *groupBoxes = new QStringList;
+	TQStringList *groupBoxes = new TQStringList;
 	int counter = 1;
 
 	protocol->configFillGroupBoxes( groupBoxes );
diff --git a/korn/kornaccountcfgimpl.h b/korn/kornaccountcfgimpl.h
index bfaf5c517..27464f8b1 100644
--- a/korn/kornaccountcfgimpl.h
+++ b/korn/kornaccountcfgimpl.h
@@ -24,16 +24,16 @@
 class KConfigGroup;
 class KURLRequester;
 
-class QVBoxLayout;
-class QHBoxLayout;
-class QLabel;
-class QString;
-class QWidget;
+class TQVBoxLayout;
+class TQHBoxLayout;
+class TQLabel;
+class TQString;
+class TQWidget;
 
 class AccountInput;
 
-template< class T > class QPtrList;
-template< class T > class QPtrVector;
+template< class T > class TQPtrList;
+template< class T > class TQPtrVector;
 
 class KornAccountCfgImpl : public KornAccountCfg
 { Q_OBJECT
diff --git a/korn/kornboxcfgimpl.cpp b/korn/kornboxcfgimpl.cpp
index 5667a5f28..f7c1845f7 100644
--- a/korn/kornboxcfgimpl.cpp
+++ b/korn/kornboxcfgimpl.cpp
@@ -44,10 +44,10 @@ KornBoxCfgImpl::KornBoxCfgImpl( TQWidget * parent, const char * name )
 	_base( 0 ),
 	_index( -1 )
 {
-	_fonts[ 0 ] = new QFont;
-	_fonts[ 1 ] = new QFont;
-	_anims[ 0 ] = new QString;
-	_anims[ 1 ] = new QString;
+	_fonts[ 0 ] = new TQFont;
+	_fonts[ 1 ] = new TQFont;
+	_anims[ 0 ] = new TQString;
+	_anims[ 1 ] = new TQString;
 
 	lbLeft->setText( i18n( "Left mousebutton", "Left" ) );
 	if( lbLeft->text() == "Left" )
diff --git a/korn/kornboxcfgimpl.h b/korn/kornboxcfgimpl.h
index 23b6bf53c..47bbbfd10 100644
--- a/korn/kornboxcfgimpl.h
+++ b/korn/kornboxcfgimpl.h
@@ -25,9 +25,9 @@ class KConfig;
 class KConfigGroup;
 class KDialogBase;
 
-class QFont;
-class QString;
-class QWidget;
+class TQFont;
+class TQString;
+class TQWidget;
 
 class KornBoxCfgImpl : public KornBoxCfg
 { Q_OBJECT
diff --git a/korn/korncfgimpl.h b/korn/korncfgimpl.h
index 322ba3d54..5ce4ef4a1 100644
--- a/korn/korncfgimpl.h
+++ b/korn/korncfgimpl.h
@@ -24,8 +24,8 @@ class KConfig;
 
 class KDialogBase;
 
-class QObject;
-class QString;
+class TQObject;
+class TQString;
 
 class KornCfgImpl : public KornCfgWidget
 { Q_OBJECT
diff --git a/korn/maildlg.h b/korn/maildlg.h
index 93bfe0988..c8ba216aa 100644
--- a/korn/maildlg.h
+++ b/korn/maildlg.h
@@ -7,8 +7,8 @@
 class KornMailSubject;
 class KMailDrop;
 
-class QProgressDialog;
-class QString;
+class TQProgressDialog;
+class TQString;
 
 /**
  * KornMailDlg shows the header and (if available) the body of a mail. 
diff --git a/korn/maildrop.h b/korn/maildrop.h
index 0c937c626..4052c8c3b 100644
--- a/korn/maildrop.h
+++ b/korn/maildrop.h
@@ -16,11 +16,11 @@ class Protocol;
 class KConfigBase;
 class KConfigGroup;
 class KDropCfgDialog;
-class QColor;
+class TQColor;
 class KornMailSubject;
 class KornMailId;
 
-template< class T, class R > class QMap;
+template< class T, class R > class TQMap;
 
 /**
 * Abstract base class for all mailbox monitors.
diff --git a/korn/mailsubject.h b/korn/mailsubject.h
index aecd19f5c..75f0571f0 100644
--- a/korn/mailsubject.h
+++ b/korn/mailsubject.h
@@ -1,7 +1,7 @@
 #ifndef MailSubject_h
 #define MailSubject_h
 
-class QTextCodec;
+class TQTextCodec;
 
 class KMailDrop;
 
diff --git a/korn/password.h b/korn/password.h
index c8ecdd1d2..05450ae5c 100644
--- a/korn/password.h
+++ b/korn/password.h
@@ -23,7 +23,7 @@
 class KConfigBase;
 namespace KWallet { class Wallet; }
 
-class QString;
+class TQString;
 
 /**
  * This class can be used to store and retrieve passwords.
diff --git a/korn/polldrop.h b/korn/polldrop.h
index 49e400b20..94444d4d3 100644
--- a/korn/polldrop.h
+++ b/korn/polldrop.h
@@ -7,7 +7,7 @@
 
 #include"maildrop.h"
 
-class QTimerEvent;
+class TQTimerEvent;
 
 /**
 * Superclass for all pollable maildrop monitors.
diff --git a/korn/protocol.h b/korn/protocol.h
index 148e9e7f7..c5caca28a 100644
--- a/korn/protocol.h
+++ b/korn/protocol.h
@@ -25,14 +25,14 @@ class KConfigGroup;
 class KIO_Protocol;
 class KMailDrop;
 
-class QGroupBox;
-class QObject;
-class QStringList;
-class QWidget;
-
-template< class T> class QPtrList;
-template< class T> class QPtrVector;
-template< class T, class S> class QMap;
+class TQGroupBox;
+class TQObject;
+class TQStringList;
+class TQWidget;
+
+template< class T> class TQPtrList;
+template< class T> class TQPtrVector;
+template< class T, class S> class TQMap;
 
 #include <tqstring.h>
 
diff --git a/korn/protocols.h b/korn/protocols.h
index d77a61754..942321ee1 100644
--- a/korn/protocols.h
+++ b/korn/protocols.h
@@ -21,9 +21,9 @@
 
 class Protocol;
 
-template< class T > class QDict;
-class QString;
-class QStringList;
+template< class T > class TQDict;
+class TQString;
+class TQStringList;
 
 class Protocols
 {
diff --git a/korn/subjectsdlg.h b/korn/subjectsdlg.h
index 02a3e0396..e7c032c2a 100644
--- a/korn/subjectsdlg.h
+++ b/korn/subjectsdlg.h
@@ -11,10 +11,10 @@ class KornMailSubject;
 class KornMailId;
 class KListView;
 class KornMailDlg;
-class QProgressDialog;
+class TQProgressDialog;
 class DoubleProgressDialog;
 
-template< class T > class QPtrList;
+template< class T > class TQPtrList;
 
 /**
  * KornSubjectsDlg loads all mail subjects and shows them in a list control.
diff --git a/korn/systemtray.h b/korn/systemtray.h
index 4f9f70eda..2387ea7c2 100644
--- a/korn/systemtray.h
+++ b/korn/systemtray.h
@@ -21,7 +21,7 @@
 
 #include <ksystemtray.h>
 
-class QWidget;
+class TQWidget;
 
 /**
  * This class is an implementation of a KSystemTray class.
diff --git a/kpilot/conduits/abbrowserconduit/resolutionDialog.h b/kpilot/conduits/abbrowserconduit/resolutionDialog.h
index d0b8fd527..2c7a8b0dd 100644
--- a/kpilot/conduits/abbrowserconduit/resolutionDialog.h
+++ b/kpilot/conduits/abbrowserconduit/resolutionDialog.h
@@ -30,8 +30,8 @@
 
 #include <kdialogbase.h>
 class KPilotLink;
-class QTimer;
-class QListView;
+class TQTimer;
+class TQListView;
 class ResolutionDialogBase;
 
 
diff --git a/kpilot/conduits/docconduit/doc-conflictdialog.h b/kpilot/conduits/docconduit/doc-conflictdialog.h
index 00a3ef1a5..f0c8b2163 100644
--- a/kpilot/conduits/docconduit/doc-conflictdialog.h
+++ b/kpilot/conduits/docconduit/doc-conflictdialog.h
@@ -32,13 +32,13 @@
 #include "doc-conduit.h"
 
 
-class QComboBox;
-class QGridLayout;
-class QGroupBox;
+class TQComboBox;
+class TQGridLayout;
+class TQGroupBox;
 
-class QLabel;
-class QPushButton;
-class QTimer;
+class TQLabel;
+class TQPushButton;
+class TQTimer;
 class KPilotLink;
 
 
diff --git a/kpilot/kpilot/addressEditor.h b/kpilot/kpilot/addressEditor.h
index 5e676c4c9..6c4d12234 100644
--- a/kpilot/kpilot/addressEditor.h
+++ b/kpilot/kpilot/addressEditor.h
@@ -34,7 +34,7 @@
 
 #include "pilotAddress.h"
 
-class QLineEdit;
+class TQLineEdit;
 
 class AddressEditor : public KDialogBase
 {
diff --git a/kpilot/kpilot/addressWidget.h b/kpilot/kpilot/addressWidget.h
index 1fa172b88..9a7b2a8cb 100644
--- a/kpilot/kpilot/addressWidget.h
+++ b/kpilot/kpilot/addressWidget.h
@@ -30,10 +30,10 @@
 #ifndef _KPILOT_ADDRESSWIDGET_H
 #define _KPILOT_ADDRESSWIDGET_H
 
-class QMultiLineEdit;
-class QListBox;
-class QComboBox;
-class QTextView;
+class TQMultiLineEdit;
+class TQListBox;
+class TQComboBox;
+class TQTextView;
 
 class PilotDatabase;
 
diff --git a/kpilot/kpilot/conduitConfigDialog.h b/kpilot/kpilot/conduitConfigDialog.h
index 549f49831..9873e057d 100644
--- a/kpilot/kpilot/conduitConfigDialog.h
+++ b/kpilot/kpilot/conduitConfigDialog.h
@@ -33,11 +33,11 @@
 // #include "conduitConfigDialog_base.h"
 #include "kcmodule.h"
 
-class QListView;
-class QListViewItem;
-class QPushButton;
-class QLabel;
-class QWidgetStack;
+class TQListView;
+class TQListViewItem;
+class TQPushButton;
+class TQLabel;
+class TQWidgetStack;
 class KProcess;
 class ConduitConfigBase;
 class ConduitConfig;
diff --git a/kpilot/kpilot/datebookWidget.h b/kpilot/kpilot/datebookWidget.h
index 9a144cc3c..3b44a2049 100644
--- a/kpilot/kpilot/datebookWidget.h
+++ b/kpilot/kpilot/datebookWidget.h
@@ -33,7 +33,7 @@
 #include "pilotComponent.h"
 
 class KDatePicker;
-class QPushButton;
+class TQPushButton;
 class KListView;
 
 class DatebookWidget : public PilotComponent
diff --git a/kpilot/kpilot/dbAppInfoEditor.h b/kpilot/kpilot/dbAppInfoEditor.h
index 692cd251a..cee9336ae 100644
--- a/kpilot/kpilot/dbAppInfoEditor.h
+++ b/kpilot/kpilot/dbAppInfoEditor.h
@@ -30,7 +30,7 @@
 #include "options.h"
 #include <kdialogbase.h>
 
-class QWidget;
+class TQWidget;
 
 class DBAppInfoEditor : public KDialogBase
 {
diff --git a/kpilot/kpilot/dbRecordEditor.h b/kpilot/kpilot/dbRecordEditor.h
index a6c3ff555..627af55f6 100644
--- a/kpilot/kpilot/dbRecordEditor.h
+++ b/kpilot/kpilot/dbRecordEditor.h
@@ -30,19 +30,19 @@
 #include "options.h"
 #include <kdialogbase.h>
 
-class QVBoxLayout;
-class QHBoxLayout;
-class QGridLayout;
+class TQVBoxLayout;
+class TQHBoxLayout;
+class TQGridLayout;
 
 namespace KHE {
 class BytesEditInterface;
 }
 using namespace KHE;
 
-class QButtonGroup;
-class QCheckBox;
-class QLabel;
-class QLineEdit;
+class TQButtonGroup;
+class TQCheckBox;
+class TQLabel;
+class TQLineEdit;
 
 class DBRecordEditorBase;
 class PilotRecord;
diff --git a/kpilot/kpilot/fileInstallWidget.h b/kpilot/kpilot/fileInstallWidget.h
index 6fff2c02b..4bc594689 100644
--- a/kpilot/kpilot/fileInstallWidget.h
+++ b/kpilot/kpilot/fileInstallWidget.h
@@ -34,9 +34,9 @@
 
 #include "pilotComponent.h"
 
-class QMultiLineEdit;
-class QPushButton;
-class QIconDragItem;
+class TQMultiLineEdit;
+class TQPushButton;
+class TQIconDragItem;
 
 class KIconView;
 class KPilotInstaller;
diff --git a/kpilot/kpilot/fileInstaller.h b/kpilot/kpilot/fileInstaller.h
index 367a6a2b9..3009de771 100644
--- a/kpilot/kpilot/fileInstaller.h
+++ b/kpilot/kpilot/fileInstaller.h
@@ -36,8 +36,8 @@
 #include <tqobject.h>
 
 
-class QStringList;
-class QString;
+class TQStringList;
+class TQString;
 
 class FileInstaller : public QObject
 {
diff --git a/kpilot/kpilot/hotSync.h b/kpilot/kpilot/hotSync.h
index 33ef55315..f100e639d 100644
--- a/kpilot/kpilot/hotSync.h
+++ b/kpilot/kpilot/hotSync.h
@@ -34,7 +34,7 @@
 */
 
 
-class QTimer;
+class TQTimer;
 
 #include "syncAction.h"
 
diff --git a/kpilot/kpilot/kpilot.h b/kpilot/kpilot/kpilot.h
index 998e087de..c0a0dca6c 100644
--- a/kpilot/kpilot/kpilot.h
+++ b/kpilot/kpilot/kpilot.h
@@ -32,8 +32,8 @@
 #include <kmainwindow.h>
 
 
-class QPopupMenu;
-class QComboBox;
+class TQPopupMenu;
+class TQComboBox;
 class KAction;
 class KProgress;
 class KJanusWidget;
diff --git a/kpilot/kpilot/kpilotProbeDialog.h b/kpilot/kpilot/kpilotProbeDialog.h
index ccfa7fee3..d6fb1cbe6 100644
--- a/kpilot/kpilot/kpilotProbeDialog.h
+++ b/kpilot/kpilot/kpilotProbeDialog.h
@@ -31,13 +31,13 @@
 #include "kdialogbase.h"
 
 class KPilotDeviceLink;
-class QLabel;
-class QGroupBox;
+class TQLabel;
+class TQGroupBox;
 class KProgress;
-class QTimer;
-class QGridLayout;
-template <class T> class QValueList;
-template<class Key, class T> class QMap;
+class TQTimer;
+class TQGridLayout;
+template <class T> class TQValueList;
+template<class Key, class T> class TQMap;
 
 typedef TQValueList<KPilotDeviceLink*> PilotLinkList;
 
diff --git a/kpilot/kpilot/kroupware.h b/kpilot/kpilot/kroupware.h
index f7be71802..1bec93abc 100644
--- a/kpilot/kpilot/kroupware.h
+++ b/kpilot/kpilot/kroupware.h
@@ -32,7 +32,7 @@
 
 #include "syncAction.h"
 
-class QString;
+class TQString;
 
 class KroupwareSync : public SyncAction
 {
diff --git a/kpilot/kpilot/listCat.h b/kpilot/kpilot/listCat.h
index e2063303f..8ccaf0d44 100644
--- a/kpilot/kpilot/listCat.h
+++ b/kpilot/kpilot/listCat.h
@@ -35,7 +35,7 @@
 */
 
 #include <klistview.h>
-class QStringList;
+class TQStringList;
 
 /**
  * This Widget extends KListView for a particular purpose:
diff --git a/kpilot/kpilot/logFile.h b/kpilot/kpilot/logFile.h
index d710d7795..93614c5b2 100644
--- a/kpilot/kpilot/logFile.h
+++ b/kpilot/kpilot/logFile.h
@@ -33,8 +33,8 @@
 #include "loggerDCOP.h"
 #include "tqobject.h"
 
-class QFile;
-class QTextStream;
+class TQFile;
+class TQTextStream;
 
 class LogFile : public TQObject, public LoggerDCOP
 {
diff --git a/kpilot/kpilot/logWidget.h b/kpilot/kpilot/logWidget.h
index 9d99ab53c..2f6be95bc 100644
--- a/kpilot/kpilot/logWidget.h
+++ b/kpilot/kpilot/logWidget.h
@@ -32,9 +32,9 @@
 #include "loggerDCOP.h"
 #include "pilotComponent.h"
 
-class QLabel;
-class QTextEdit;
-class QHBox;
+class TQLabel;
+class TQTextEdit;
+class TQHBox;
 class KProgress;
 
 class LogWidget : public PilotComponent , public LoggerDCOP
diff --git a/kpilot/kpilot/memoWidget.h b/kpilot/kpilot/memoWidget.h
index 99657df8c..870383475 100644
--- a/kpilot/kpilot/memoWidget.h
+++ b/kpilot/kpilot/memoWidget.h
@@ -31,9 +31,9 @@
 #include "pilotComponent.h"
 
 class KPilotInstaller;
-class QListBox;
-class QComboBox;
-class QPushButton;
+class TQListBox;
+class TQComboBox;
+class TQPushButton;
 class KTextEdit;
 
 class PilotMemo;
diff --git a/kpilot/kpilot/pilotComponent.h b/kpilot/kpilot/pilotComponent.h
index 01c5a3f37..4517acc7e 100644
--- a/kpilot/kpilot/pilotComponent.h
+++ b/kpilot/kpilot/pilotComponent.h
@@ -35,8 +35,8 @@
 #include <tqwidget.h>
 
 struct CategoryAppInfo;
-class QComboBox;
-class QString;
+class TQComboBox;
+class TQString;
 
 class PilotComponent : public QWidget
 {
diff --git a/kpilot/kpilot/pilotDaemon.h b/kpilot/kpilot/pilotDaemon.h
index d50fa04cf..8b386ee44 100644
--- a/kpilot/kpilot/pilotDaemon.h
+++ b/kpilot/kpilot/pilotDaemon.h
@@ -36,10 +36,10 @@
 #include "syncAction.h"
 #include "pilotDaemonDCOP.h"
 
-class QPixmap;
-class QTimer;
+class TQPixmap;
+class TQTimer;
 class KAboutApplication;
-class QPopupMenu;
+class TQPopupMenu;
 
 class PilotDaemon;
 class ActionQueue;
diff --git a/kpilot/kpilot/todoEditor.h b/kpilot/kpilot/todoEditor.h
index 4036ac9b1..53dbb33c1 100644
--- a/kpilot/kpilot/todoEditor.h
+++ b/kpilot/kpilot/todoEditor.h
@@ -35,9 +35,9 @@
 class PilotTodoEntry;
 struct ToDoAppInfo;
 
-class QComboBox;
-class QTextEdit;
-class QCheckBox;
+class TQComboBox;
+class TQTextEdit;
+class TQCheckBox;
 class KDateWidget;
 class TodoEditorBase;
 
diff --git a/kpilot/kpilot/todoWidget.h b/kpilot/kpilot/todoWidget.h
index 18ea1f6d2..63ee3e86c 100644
--- a/kpilot/kpilot/todoWidget.h
+++ b/kpilot/kpilot/todoWidget.h
@@ -30,9 +30,9 @@
 #ifndef _KPILOT_TODOWIDGET_H
 #define _KPILOT_TODOWIDGET_H
 
-class QComboBox;
-class QPushButton;
-class QTextView;
+class TQComboBox;
+class TQPushButton;
+class TQTextView;
 
 #include "pilotComponent.h"
 #include "pilotTodoEntry.h"
diff --git a/kpilot/lib/kpilotdevicelink.h b/kpilot/lib/kpilotdevicelink.h
index 2f29a5877..a648b23c7 100644
--- a/kpilot/lib/kpilotdevicelink.h
+++ b/kpilot/lib/kpilotdevicelink.h
@@ -31,7 +31,7 @@
 
 #include "kpilotlink.h"
 
-class QThread;
+class TQThread;
 
 class DeviceMap; ///< Globally tracks all devices that have a link assigned
 class Messages; ///< Tracks which messages have been printed
diff --git a/kpilot/lib/kpilotdevicelinkPrivate.h b/kpilot/lib/kpilotdevicelinkPrivate.h
index d451e75c5..823d93726 100644
--- a/kpilot/lib/kpilotdevicelinkPrivate.h
+++ b/kpilot/lib/kpilotdevicelinkPrivate.h
@@ -35,8 +35,8 @@
 #include "kpilotdevicelink.h"
 #include "options.h"
 
-class QTimer;
-class QSocketNotifier;
+class TQTimer;
+class TQSocketNotifier;
 
 // singleton helper class
 class DeviceMap
diff --git a/kpilot/lib/kpilotlink.h b/kpilot/lib/kpilotlink.h
index b0c97de0f..4389cb8bd 100644
--- a/kpilot/lib/kpilotlink.h
+++ b/kpilot/lib/kpilotlink.h
@@ -40,7 +40,7 @@
 * changes are signalled.
 */
 
-class QThread;
+class TQThread;
 class KPilotUser;
 class KPilotSysInfo;
 class KPilotCard;
diff --git a/kpilot/lib/plugin.h b/kpilot/lib/plugin.h
index d768b6015..168cd2fd8 100644
--- a/kpilot/lib/plugin.h
+++ b/kpilot/lib/plugin.h
@@ -42,7 +42,7 @@
 */
 
 
-class QTabWidget;
+class TQTabWidget;
 class KAboutData;
 class KLibrary;
 
diff --git a/kpilot/lib/syncAction.h b/kpilot/lib/syncAction.h
index 4643e7c6e..d17993fbb 100644
--- a/kpilot/lib/syncAction.h
+++ b/kpilot/lib/syncAction.h
@@ -43,7 +43,7 @@
 * SyncAction
 */
 
-class QTimer;
+class TQTimer;
 class KPilotUser;
 class SyncAction;
 
diff --git a/kresources/caldav/config.h b/kresources/caldav/config.h
index bd748db91..5e9d2e760 100644
--- a/kresources/caldav/config.h
+++ b/kresources/caldav/config.h
@@ -22,8 +22,8 @@
 #include <kdemacros.h>
 #include <kresources/configwidget.h>
 
-class QLineEdit;
-class QCheckBox;
+class TQLineEdit;
+class TQCheckBox;
 
 namespace KCal {
 
diff --git a/kresources/caldav/preferences.h b/kresources/caldav/preferences.h
index 3e1bc0f9c..3a9400ae8 100644
--- a/kresources/caldav/preferences.h
+++ b/kresources/caldav/preferences.h
@@ -22,7 +22,7 @@
 #include <kwallet.h>
 #include <kdebug.h>
 
-class QString;
+class TQString;
 
 namespace KCal {
 
diff --git a/kresources/carddav/config.h b/kresources/carddav/config.h
index 05b190f4f..7ea95aa96 100644
--- a/kresources/carddav/config.h
+++ b/kresources/carddav/config.h
@@ -21,8 +21,8 @@
 #include <kdemacros.h>
 #include <kresources/configwidget.h>
 
-class QLineEdit;
-class QCheckBox;
+class TQLineEdit;
+class TQCheckBox;
 
 namespace KABC {
 
diff --git a/kresources/carddav/preferences.h b/kresources/carddav/preferences.h
index a01ee041b..eab9274c2 100644
--- a/kresources/carddav/preferences.h
+++ b/kresources/carddav/preferences.h
@@ -21,7 +21,7 @@
 #include <kwallet.h>
 #include <kdebug.h>
 
-class QString;
+class TQString;
 
 namespace KABC {
 
diff --git a/kresources/egroupware/kcal_resourcexmlrpc.h b/kresources/egroupware/kcal_resourcexmlrpc.h
index a28202ed5..763164117 100644
--- a/kresources/egroupware/kcal_resourcexmlrpc.h
+++ b/kresources/egroupware/kcal_resourcexmlrpc.h
@@ -41,7 +41,7 @@ class Server;
 }
 
 class Synchronizer;
-class QTimer;
+class TQTimer;
 
 namespace KCal {
 
diff --git a/kresources/featureplan/kcal_resourcefeatureplanconfig.h b/kresources/featureplan/kcal_resourcefeatureplanconfig.h
index 21dcf8f8d..ee210ad93 100644
--- a/kresources/featureplan/kcal_resourcefeatureplanconfig.h
+++ b/kresources/featureplan/kcal_resourcefeatureplanconfig.h
@@ -27,7 +27,7 @@
 
 class KLineEdit;
 class KURLRequester;
-class QCheckBox;
+class TQCheckBox;
 
 namespace KCal {
 
diff --git a/kresources/groupware/kcal_resourcegroupwareconfig.h b/kresources/groupware/kcal_resourcegroupwareconfig.h
index 10115f7e7..c30854715 100644
--- a/kresources/groupware/kcal_resourcegroupwareconfig.h
+++ b/kresources/groupware/kcal_resourcegroupwareconfig.h
@@ -25,7 +25,7 @@
 #include <kresources/resource.h>
 #include <kresources/configwidget.h>
 
-class QCheckBox;
+class TQCheckBox;
 class KLineEdit;
 
 namespace KCal {
diff --git a/kresources/groupwise/groupwisesettingswidget.h b/kresources/groupwise/groupwisesettingswidget.h
index aa2d3df57..68adee24a 100644
--- a/kresources/groupwise/groupwisesettingswidget.h
+++ b/kresources/groupwise/groupwisesettingswidget.h
@@ -24,7 +24,7 @@
 
 #include <tqmap.h>
 
-class QListViewItem;
+class TQListViewItem;
 
 #include "groupwisesettingswidgetbase.h"
 
diff --git a/kresources/groupwise/kcal_resourcegroupwiseconfig.h b/kresources/groupwise/kcal_resourcegroupwiseconfig.h
index bc6f81c74..c2ae218bf 100644
--- a/kresources/groupwise/kcal_resourcegroupwiseconfig.h
+++ b/kresources/groupwise/kcal_resourcegroupwiseconfig.h
@@ -26,7 +26,7 @@
 #include <kresources/resource.h>
 #include <kresources/configwidget.h>
 
-class QCheckBox;
+class TQCheckBox;
 class KLineEdit;
 
 namespace KCal {
diff --git a/kresources/kolab/kcal/event.h b/kresources/kolab/kcal/event.h
index 879bda2da..c45018adc 100644
--- a/kresources/kolab/kcal/event.h
+++ b/kresources/kolab/kcal/event.h
@@ -38,7 +38,7 @@
 
 #include <libkcal/event.h>
 
-class QDomElement;
+class TQDomElement;
 
 
 namespace Kolab {
diff --git a/kresources/kolab/kcal/incidence.h b/kresources/kolab/kcal/incidence.h
index e8f8b9fa8..32b112aaf 100644
--- a/kresources/kolab/kcal/incidence.h
+++ b/kresources/kolab/kcal/incidence.h
@@ -36,7 +36,7 @@
 
 #include <kolabbase.h>
 
-class QDomElement;
+class TQDomElement;
 
 namespace KCal {
   class Incidence;
diff --git a/kresources/kolab/kcal/journal.h b/kresources/kolab/kcal/journal.h
index 7505e0703..57d614cc1 100644
--- a/kresources/kolab/kcal/journal.h
+++ b/kresources/kolab/kcal/journal.h
@@ -36,7 +36,7 @@
 
 #include <kolabbase.h>
 
-class QDomElement;
+class TQDomElement;
 
 namespace KCal {
   class Journal;
diff --git a/kresources/kolab/kcal/task.h b/kresources/kolab/kcal/task.h
index 32095bcab..5dfb55854 100644
--- a/kresources/kolab/kcal/task.h
+++ b/kresources/kolab/kcal/task.h
@@ -38,7 +38,7 @@
 
 #include <libkcal/incidence.h>
 
-class QDomElement;
+class TQDomElement;
 
 namespace KCal {
   class Todo;
diff --git a/kresources/kolab/knotes/note.h b/kresources/kolab/knotes/note.h
index 7a1c42407..11f4749e1 100644
--- a/kresources/kolab/knotes/note.h
+++ b/kresources/kolab/knotes/note.h
@@ -36,7 +36,7 @@
 
 #include <kolabbase.h>
 
-class QDomElement;
+class TQDomElement;
 
 namespace KCal {
   class Journal;
diff --git a/kresources/kolab/shared/kolabbase.h b/kresources/kolab/shared/kolabbase.h
index ac34eb884..ba6a1c85a 100644
--- a/kresources/kolab/shared/kolabbase.h
+++ b/kresources/kolab/shared/kolabbase.h
@@ -38,7 +38,7 @@
 #include <tqdatetime.h>
 #include <tqcolor.h>
 
-class QFile;
+class TQFile;
 
 namespace KCal {
   class Incidence;
diff --git a/kresources/kolab/shared/resourcekolabbase.h b/kresources/kolab/shared/resourcekolabbase.h
index eca5cc80b..b2ce0501f 100644
--- a/kresources/kolab/shared/resourcekolabbase.h
+++ b/kresources/kolab/shared/resourcekolabbase.h
@@ -41,7 +41,7 @@
 #include "subresource.h"
 #include <kmail/kmailicalIface.h>
 
-class QCString;
+class TQCString;
 class KURL;
 
 namespace Kolab {
diff --git a/kresources/lib/folderconfig.h b/kresources/lib/folderconfig.h
index c27d8fdf6..4a6959a1d 100644
--- a/kresources/lib/folderconfig.h
+++ b/kresources/lib/folderconfig.h
@@ -28,7 +28,7 @@
 #include <tqwidget.h>
 
 // class KListView;
-class QComboBox;
+class TQComboBox;
 class FolderListView;
 
 namespace KPIM {
diff --git a/kresources/scalix/scalixadmin/delegatedialog.h b/kresources/scalix/scalixadmin/delegatedialog.h
index 3d712d8e2..1cadb5929 100644
--- a/kresources/scalix/scalixadmin/delegatedialog.h
+++ b/kresources/scalix/scalixadmin/delegatedialog.h
@@ -25,8 +25,8 @@
 
 #include <kdialogbase.h>
 
-class QCheckBox;
-class QLineEdit;
+class TQCheckBox;
+class TQLineEdit;
 
 namespace Scalix {
 class Delegate;
diff --git a/kresources/scalix/scalixadmin/delegatepage.h b/kresources/scalix/scalixadmin/delegatepage.h
index edaad8e78..e62c89eed 100644
--- a/kresources/scalix/scalixadmin/delegatepage.h
+++ b/kresources/scalix/scalixadmin/delegatepage.h
@@ -25,7 +25,7 @@
 
 #include "delegatemanager.h"
 
-class QPushButton;
+class TQPushButton;
 class DelegateView;
 
 class DelegatePage : public QWidget
diff --git a/kresources/scalix/scalixadmin/otheruserpage.h b/kresources/scalix/scalixadmin/otheruserpage.h
index 50e9292ca..e77536ec4 100644
--- a/kresources/scalix/scalixadmin/otheruserpage.h
+++ b/kresources/scalix/scalixadmin/otheruserpage.h
@@ -25,7 +25,7 @@
 
 #include "otherusermanager.h"
 
-class QPushButton;
+class TQPushButton;
 class OtherUserView;
 
 class OtherUserPage : public QWidget
diff --git a/kresources/scalix/scalixadmin/outofofficepage.h b/kresources/scalix/scalixadmin/outofofficepage.h
index cd5f04915..148379d75 100644
--- a/kresources/scalix/scalixadmin/outofofficepage.h
+++ b/kresources/scalix/scalixadmin/outofofficepage.h
@@ -23,10 +23,10 @@
 
 #include <tqwidget.h>
 
-class QLabel;
-class QPushButton;
-class QRadioButton;
-class QTextEdit;
+class TQLabel;
+class TQPushButton;
+class TQRadioButton;
+class TQTextEdit;
 
 class OutOfOfficePage : public QWidget
 {
diff --git a/kresources/scalix/scalixadmin/passwordpage.h b/kresources/scalix/scalixadmin/passwordpage.h
index b4cf3da00..99f912f11 100644
--- a/kresources/scalix/scalixadmin/passwordpage.h
+++ b/kresources/scalix/scalixadmin/passwordpage.h
@@ -23,8 +23,8 @@
 
 #include <tqwidget.h>
 
-class QLineEdit;
-class QPushButton;
+class TQLineEdit;
+class TQPushButton;
 
 namespace KIO {
 class Job;
diff --git a/kresources/scalix/shared/resourcescalixbase.h b/kresources/scalix/shared/resourcescalixbase.h
index f1aefc19e..803ac47b3 100644
--- a/kresources/scalix/shared/resourcescalixbase.h
+++ b/kresources/scalix/shared/resourcescalixbase.h
@@ -40,7 +40,7 @@
 #include "subresource.h"
 #include <kmail/kmailicalIface.h>
 
-class QCString;
+class TQCString;
 class KURL;
 
 namespace Scalix {
diff --git a/kresources/scalix/shared/scalixbase.h b/kresources/scalix/shared/scalixbase.h
index 739a2615c..2db064f79 100644
--- a/kresources/scalix/shared/scalixbase.h
+++ b/kresources/scalix/shared/scalixbase.h
@@ -37,7 +37,7 @@
 #include <tqdatetime.h>
 #include <tqcolor.h>
 
-class QFile;
+class TQFile;
 
 namespace KCal {
   class Incidence;
diff --git a/kresources/slox/kabcresourcesloxconfig.h b/kresources/slox/kabcresourcesloxconfig.h
index 6aedf83b3..63031045c 100644
--- a/kresources/slox/kabcresourcesloxconfig.h
+++ b/kresources/slox/kabcresourcesloxconfig.h
@@ -23,7 +23,7 @@
 #include <kresources/configwidget.h>
 #include <kdepimmacros.h>
 
-class QCheckBox;
+class TQCheckBox;
 class KLineEdit;
 class KURLRequester;
 class KPushButton;
diff --git a/kresources/slox/kcalresourcesloxconfig.h b/kresources/slox/kcalresourcesloxconfig.h
index 370948c08..7e7422b6f 100644
--- a/kresources/slox/kcalresourcesloxconfig.h
+++ b/kresources/slox/kcalresourcesloxconfig.h
@@ -26,7 +26,7 @@
 #include <kresources/resource.h>
 #include <kresources/configwidget.h>
 
-class QCheckBox;
+class TQCheckBox;
 class KLineEdit;
 class KPushButton;
 
diff --git a/kresources/tvanytime/kcal_resourcetvanytime.h b/kresources/tvanytime/kcal_resourcetvanytime.h
index bad3f2206..be46a1161 100644
--- a/kresources/tvanytime/kcal_resourcetvanytime.h
+++ b/kresources/tvanytime/kcal_resourcetvanytime.h
@@ -34,7 +34,7 @@
 
 #include "service.h"
 
-class QDomDocument; 
+class TQDomDocument; 
 class KTar;
 class KTempFile;
 
diff --git a/kresources/tvanytime/kcal_resourcetvanytimeconfig.h b/kresources/tvanytime/kcal_resourcetvanytimeconfig.h
index cd3701858..57331a44c 100644
--- a/kresources/tvanytime/kcal_resourcetvanytimeconfig.h
+++ b/kresources/tvanytime/kcal_resourcetvanytimeconfig.h
@@ -26,7 +26,7 @@
 #include <kresources/resource.h>
 #include <kresources/configwidget.h>
 
-class QSpinBox;
+class TQSpinBox;
 class KLineEdit;
 
 namespace KCal {
diff --git a/ktnef/gui/attachpropertydialog.h b/ktnef/gui/attachpropertydialog.h
index b7a78bbc1..aa5e2bf3a 100644
--- a/ktnef/gui/attachpropertydialog.h
+++ b/ktnef/gui/attachpropertydialog.h
@@ -25,8 +25,8 @@
 class KTNEFAttach;
 class KTNEFProperty;
 class KTNEFPropertySet;
-class QListView;
-class QListViewItem;
+class TQListView;
+class TQListViewItem;
 
 class AttachPropertyDialog : public AttachPropertyDialogBase
 {
diff --git a/ktnef/gui/qwmf.h b/ktnef/gui/qwmf.h
index 051979df3..2a39b7b9e 100644
--- a/ktnef/gui/qwmf.h
+++ b/ktnef/gui/qwmf.h
@@ -28,8 +28,8 @@
 #include <tqimage.h>
 #include <tqrect.h>
 
-class QBuffer;
-class QString;
+class TQBuffer;
+class TQString;
 class WmfCmd;
 class WinObjHandle;
 class WinObjPenHandle;
diff --git a/ktnef/ktnef/ktnefwriter.h b/ktnef/ktnef/ktnefwriter.h
index 29828c1f9..9d853475d 100644
--- a/ktnef/ktnef/ktnefwriter.h
+++ b/ktnef/ktnef/ktnefwriter.h
@@ -18,12 +18,12 @@
 #ifndef KTNEFWRITER_H
 #define KTNEFWRITER_H
 
-class QString;
-class QVariant;
-class QIODevice;
-class QDataStream;
-class QDateTime;
-class QStringList;
+class TQString;
+class TQVariant;
+class TQIODevice;
+class TQDataStream;
+class TQDateTime;
+class TQStringList;
 
 class KTNEFWriter {
 public:
diff --git a/ktnef/lib/lzfu.h b/ktnef/lib/lzfu.h
index 25aa65d3c..8047e9286 100644
--- a/ktnef/lib/lzfu.h
+++ b/ktnef/lib/lzfu.h
@@ -18,7 +18,7 @@
 #ifndef LZFU_H
 #define LZFU_H
 
-class QIODevice;
+class TQIODevice;
 
 int lzfu_decompress( TQIODevice *input, TQIODevice *output );
 
diff --git a/libkcal/calendarresources.h b/libkcal/calendarresources.h
index ad6ace739..1858a85b2 100644
--- a/libkcal/calendarresources.h
+++ b/libkcal/calendarresources.h
@@ -39,7 +39,7 @@
 
 #include <kresources/manager.h>
 
-class QWidget;
+class TQWidget;
 
 /**
    @namespace KCal
diff --git a/libkcal/htmlexport.h b/libkcal/htmlexport.h
index b411778df..1a209e17a 100644
--- a/libkcal/htmlexport.h
+++ b/libkcal/htmlexport.h
@@ -31,8 +31,8 @@
 
 #include "libkcal_export.h"
 
-class QFile;
-class QTextStream;
+class TQFile;
+class TQTextStream;
 
 namespace KCal {
 
diff --git a/libkcal/resourcecachedconfig.h b/libkcal/resourcecachedconfig.h
index 5a227fe5e..fae77c33c 100644
--- a/libkcal/resourcecachedconfig.h
+++ b/libkcal/resourcecachedconfig.h
@@ -24,8 +24,8 @@
 #include <tqwidget.h>
 #include <kdepimmacros.h>
 
-class QButtonGroup;
-class QSpinBox;
+class TQButtonGroup;
+class TQSpinBox;
 
 namespace KCal {
 
diff --git a/libkcal/resourcelocaldir.h b/libkcal/resourcelocaldir.h
index 4b9014bbb..e6c5526a9 100644
--- a/libkcal/resourcelocaldir.h
+++ b/libkcal/resourcelocaldir.h
@@ -29,7 +29,7 @@
 
 #include "libkcal_export.h"
 
-class QString;
+class TQString;
 class KConfig;
 
 namespace KCal {
diff --git a/libkdepim/addresseeselector.h b/libkdepim/addresseeselector.h
index 769447fff..e566d4e5e 100644
--- a/libkdepim/addresseeselector.h
+++ b/libkdepim/addresseeselector.h
@@ -35,7 +35,7 @@
 class KComboBox;
 class KLineEdit;
 class KListView;
-class QSignalMapper;
+class TQSignalMapper;
 
 namespace KPIM {
 
diff --git a/libkdepim/addresseeview.h b/libkdepim/addresseeview.h
index 97c6eebbb..ae7281b5b 100644
--- a/libkdepim/addresseeview.h
+++ b/libkdepim/addresseeview.h
@@ -34,7 +34,7 @@ class Job;
 }
 class KToggleAction;
 
-class QPopupMenu;
+class TQPopupMenu;
 
 
 namespace KPIM {
diff --git a/libkdepim/csshelper.h b/libkdepim/csshelper.h
index 87455cd13..5d668713c 100644
--- a/libkdepim/csshelper.h
+++ b/libkdepim/csshelper.h
@@ -36,7 +36,7 @@
 #include <tqfont.h>
 #include <tqpaintdevicemetrics.h>
 
-class QString;
+class TQString;
 
 namespace KPIM {
 
diff --git a/libkdepim/infoextension.h b/libkdepim/infoextension.h
index 752ad9913..0a992a154 100644
--- a/libkdepim/infoextension.h
+++ b/libkdepim/infoextension.h
@@ -25,7 +25,7 @@
 #include <tqobject.h>
 #include <kdepimmacros.h>
 
-class QWidget;
+class TQWidget;
 
 namespace KParts
 {
diff --git a/libkdepim/kaddrbook.h b/libkdepim/kaddrbook.h
index 32adac1b5..dfa65823f 100644
--- a/libkdepim/kaddrbook.h
+++ b/libkdepim/kaddrbook.h
@@ -11,7 +11,7 @@
 #include <kabc/addressee.h>
 #include <kdepimmacros.h>
 
-class QWidget;
+class TQWidget;
 
 class KDE_EXPORT KAddrBookExternal {
 public:
diff --git a/libkdepim/kcmdesignerfields.h b/libkdepim/kcmdesignerfields.h
index 98c54b5c3..453730f94 100644
--- a/libkdepim/kcmdesignerfields.h
+++ b/libkdepim/kcmdesignerfields.h
@@ -27,9 +27,9 @@
 
 class KListView;
 
-class QLabel;
-class QListViewItem;
-class QPushButton;
+class TQLabel;
+class TQListViewItem;
+class TQPushButton;
 
 namespace KPIM {
 
diff --git a/libkdepim/kconfigwizard.h b/libkdepim/kconfigwizard.h
index 23dfb9ee8..e5e6337e2 100644
--- a/libkdepim/kconfigwizard.h
+++ b/libkdepim/kconfigwizard.h
@@ -25,7 +25,7 @@
 #include <kdepimmacros.h>
 #include <kdialogbase.h>
 
-class QListView;
+class TQListView;
 
 /**
   @short Configuration wizard base class
diff --git a/libkdepim/kdateedit.h b/libkdepim/kdateedit.h
index 6fc04bd58..819ce9338 100644
--- a/libkdepim/kdateedit.h
+++ b/libkdepim/kdateedit.h
@@ -32,7 +32,7 @@
 
 #include "kdatepickerpopup.h"
 
-class QEvent;
+class TQEvent;
 
 /**
   A date editing widget that consists of an editable combo box.
diff --git a/libkdepim/kfileio.h b/libkdepim/kfileio.h
index e3dcc976a..915528888 100644
--- a/libkdepim/kfileio.h
+++ b/libkdepim/kfileio.h
@@ -13,7 +13,7 @@
 
 #include <kdepimmacros.h>
 
-class QString;
+class TQString;
 
 namespace KPIM {
 
diff --git a/libkdepim/kimportdialog.h b/libkdepim/kimportdialog.h
index 153da0347..d7dd634eb 100644
--- a/libkdepim/kimportdialog.h
+++ b/libkdepim/kimportdialog.h
@@ -30,8 +30,8 @@
 
 #include <kdialogbase.h>
 
-class QTable;
-class QListView;
+class TQTable;
+class TQListView;
 
 class KImportDialog;
 class KComboBox;
diff --git a/libkdepim/kincidencechooser.h b/libkdepim/kincidencechooser.h
index 9ecf4cc58..8c569e33e 100644
--- a/libkdepim/kincidencechooser.h
+++ b/libkdepim/kincidencechooser.h
@@ -35,11 +35,11 @@
 #include "calendardiffalgo.h"
 
 
-class QRadioButton;
-class QButtonGroup;
-class QVBox;
-class QStringList;
-class QTextBrowser;
+class TQRadioButton;
+class TQButtonGroup;
+class TQVBox;
+class TQStringList;
+class TQTextBrowser;
 class KDialogBase;
 
 /** Dialog to change the korganizer configuration.
diff --git a/libkdepim/komposer/core/core.h b/libkdepim/komposer/core/core.h
index 3719b912c..7d004c962 100644
--- a/libkdepim/komposer/core/core.h
+++ b/libkdepim/komposer/core/core.h
@@ -30,7 +30,7 @@
 namespace KSettings {
   class Dialog;
 }
-class QWidgetStack;
+class TQWidgetStack;
 
 namespace Komposer
 {
diff --git a/libkdepim/komposer/core/prefsmodule.h b/libkdepim/komposer/core/prefsmodule.h
index 640bb0f10..b213258ba 100644
--- a/libkdepim/komposer/core/prefsmodule.h
+++ b/libkdepim/komposer/core/prefsmodule.h
@@ -24,8 +24,8 @@
 #include <kprefsdialog.h>
 #include <kservice.h>
 #include <tqmap.h>
-class QGroupBox;
-class QListViewItem;
+class TQGroupBox;
+class TQListViewItem;
 
 class KAboutData;
 class KComboBox;
diff --git a/libkdepim/komposer/plugins/default/defaulteditor.h b/libkdepim/komposer/plugins/default/defaulteditor.h
index 158109e1e..a877b762a 100644
--- a/libkdepim/komposer/plugins/default/defaulteditor.h
+++ b/libkdepim/komposer/plugins/default/defaulteditor.h
@@ -24,7 +24,7 @@
 
 #include "editor.h"
 
-class QTextEdit;
+class TQTextEdit;
 class KFontAction;
 class KFontSizeAction;
 class KToggleAction;
diff --git a/libkdepim/kpimprefs.h b/libkdepim/kpimprefs.h
index 7fcfbd0f8..90d5be866 100644
--- a/libkdepim/kpimprefs.h
+++ b/libkdepim/kpimprefs.h
@@ -26,7 +26,7 @@
 #include <kconfigskeleton.h>
 #include <kdepimmacros.h>
 
-class QString;
+class TQString;
 
 class KDE_EXPORT KPimPrefs : public KConfigSkeleton
 {
diff --git a/libkdepim/kpimurlrequesterdlg.h b/libkdepim/kpimurlrequesterdlg.h
index c770fd24d..2d606aa87 100644
--- a/libkdepim/kpimurlrequesterdlg.h
+++ b/libkdepim/kpimurlrequesterdlg.h
@@ -24,7 +24,7 @@
 #include <kurl.h>
 #include <tqstring.h>
 
-class QWidget;
+class TQWidget;
 
 class KDE_EXPORT KPimURLRequesterDlg
 {
diff --git a/libkdepim/kprefsdialog.h b/libkdepim/kprefsdialog.h
index 2b3d06c22..3c9f85cc5 100644
--- a/libkdepim/kprefsdialog.h
+++ b/libkdepim/kprefsdialog.h
@@ -36,11 +36,11 @@
 
 
 class KColorButton;
-class QCheckBox;
-class QComboBox;
-class QLabel;
-class QSpinBox;
-class QButtonGroup;
+class TQCheckBox;
+class TQComboBox;
+class TQLabel;
+class TQSpinBox;
+class TQButtonGroup;
 class QTimeEdit;
 class KTimeEdit;
 class KDateEdit;
diff --git a/libkdepim/kresourceprefs.h b/libkdepim/kresourceprefs.h
index d87a55aad..e36dc608c 100644
--- a/libkdepim/kresourceprefs.h
+++ b/libkdepim/kresourceprefs.h
@@ -25,7 +25,7 @@
 #include <kconfigskeleton.h>
 #include <kdepimmacros.h>
 
-class QString;
+class TQString;
 
 /**
   This is a base class for all KPrefs objects, where multiple instances want
diff --git a/libkdepim/kscoring.h b/libkdepim/kscoring.h
index a0cdcf0b3..9623c2285 100644
--- a/libkdepim/kscoring.h
+++ b/libkdepim/kscoring.h
@@ -40,11 +40,11 @@
 
 #include <kdepimmacros.h>
 
-class QDomNode;
-class QDomDocument;
-class QDomElement;
-class QTextStream;
-class QLabel;
+class TQDomNode;
+class TQDomDocument;
+class TQDomElement;
+class TQTextStream;
+class TQLabel;
 
 
 /**
diff --git a/libkdepim/kscoringeditor.h b/libkdepim/kscoringeditor.h
index 1f201be95..92421ccee 100644
--- a/libkdepim/kscoringeditor.h
+++ b/libkdepim/kscoringeditor.h
@@ -31,12 +31,12 @@ class KComboBox;
 class KLineEdit;
 class KIntSpinBox;
 class KListBox;
-class QFrame;
-class QLabel;
-class QListBoxItem;
-class QPushButton;
-class QCheckBox;
-class QRadioButton;
+class TQFrame;
+class TQLabel;
+class TQListBoxItem;
+class TQPushButton;
+class TQCheckBox;
+class TQRadioButton;
 
 class KScoringRule;
 class KScoringExpression;
diff --git a/libkdepim/ksubscription.h b/libkdepim/ksubscription.h
index f72455b3f..cb177d20c 100644
--- a/libkdepim/ksubscription.h
+++ b/libkdepim/ksubscription.h
@@ -35,9 +35,9 @@
 class KSubscription;
 
 class KLineEdit;
-class QLayout;
-class QLabel;
-class QGridLayout;
+class TQLayout;
+class TQLabel;
+class TQGridLayout;
 class KAccount;
 
 //==========================================================================
diff --git a/libkdepim/kwidgetlister.h b/libkdepim/kwidgetlister.h
index 472dfc8df..cd1ed6254 100644
--- a/libkdepim/kwidgetlister.h
+++ b/libkdepim/kwidgetlister.h
@@ -36,9 +36,9 @@
 #include <tqptrlist.h>
 #include <kdepimmacros.h>
 
-class QPushButton;
-class QVBoxLayout;
-class QHBox;
+class TQPushButton;
+class TQVBoxLayout;
+class TQHBox;
 
 /** 
     @short Widget that manages a list of other widgets (incl. 'more', 'fewer' and 'clear' buttons).
diff --git a/libkdepim/kxface.h b/libkdepim/kxface.h
index 51e76fd89..ca3fb8e0a 100644
--- a/libkdepim/kxface.h
+++ b/libkdepim/kxface.h
@@ -514,8 +514,8 @@ static const Prob freqs[16] = {
 static const char HexDigits[] = "0123456789ABCDEF";
 
 
-class QImage;
-class QString;
+class TQImage;
+class TQString;
 
 namespace KPIM {
 
diff --git a/libkdepim/ldapsearchdialog.h b/libkdepim/ldapsearchdialog.h
index fc6a6c8e4..1b3a7cc0e 100644
--- a/libkdepim/ldapsearchdialog.h
+++ b/libkdepim/ldapsearchdialog.h
@@ -29,9 +29,9 @@
 
 class KComboBox;
 
-class QCheckBox;
-class QListView;
-class QPushButton;
+class TQCheckBox;
+class TQListView;
+class TQPushButton;
 
 namespace KPIM {
 
diff --git a/libkdepim/maillistdrag.h b/libkdepim/maillistdrag.h
index 86280826a..929821898 100644
--- a/libkdepim/maillistdrag.h
+++ b/libkdepim/maillistdrag.h
@@ -111,7 +111,7 @@ public:
     /* The format for this drag - "x-kmail-drag/message-list" */
     static const char* format();
     
-    /* Returns TRUE if the information in e can be decoded into a QString;
+    /* Returns TRUE if the information in e can be decoded into a TQString;
        otherwsie returns FALSE */
     static bool canDecode( TQMimeSource* e );
 
diff --git a/libkdepim/pluginloaderbase.h b/libkdepim/pluginloaderbase.h
index ba7e12fd3..0c51eb403 100644
--- a/libkdepim/pluginloaderbase.h
+++ b/libkdepim/pluginloaderbase.h
@@ -28,7 +28,7 @@
 #include <kdepimmacros.h>
 
 class KLibrary;
-class QStringList;
+class TQStringList;
 
 namespace KPIM {
 
diff --git a/libkdepim/progressdialog.h b/libkdepim/progressdialog.h
index 3daadd365..dc0e67949 100644
--- a/libkdepim/progressdialog.h
+++ b/libkdepim/progressdialog.h
@@ -40,9 +40,9 @@
 #include "overlaywidget.h"
 #include <kdepimmacros.h>
 
-class QProgressBar;
-class QScrollView;
-class QFrame;
+class TQProgressBar;
+class TQScrollView;
+class TQFrame;
 
 namespace KPIM {
 class ProgressItem;
diff --git a/libkdepim/qutf7codecplugin.cpp b/libkdepim/qutf7codecplugin.cpp
index 0564b4142..e6dcf7c66 100644
--- a/libkdepim/qutf7codecplugin.cpp
+++ b/libkdepim/qutf7codecplugin.cpp
@@ -29,7 +29,7 @@
 #include <tqstringlist.h>
 #include <tqvaluelist.h>
 
-class QTextCodec;
+class TQTextCodec;
 
 // ######### This file isn't compiled currently
 
diff --git a/libkdepim/sendsmsdialog.h b/libkdepim/sendsmsdialog.h
index a7ebe3a70..bd5b0ea92 100644
--- a/libkdepim/sendsmsdialog.h
+++ b/libkdepim/sendsmsdialog.h
@@ -24,8 +24,8 @@
 
 #include <kdialogbase.h>
 
-class QLabel;
-class QTextEdit;
+class TQLabel;
+class TQTextEdit;
 
 class SendSMSDialog : public KDialogBase
 {
diff --git a/libkdepim/sidebarextension.h b/libkdepim/sidebarextension.h
index e65d3c94a..3a7ffbe5d 100644
--- a/libkdepim/sidebarextension.h
+++ b/libkdepim/sidebarextension.h
@@ -24,7 +24,7 @@
 #include <tqobject.h>
 #include <kdepimmacros.h>
 
-class QWidget;
+class TQWidget;
 
 namespace KParts
 {
diff --git a/libkdepim/statusbarprogresswidget.h b/libkdepim/statusbarprogresswidget.h
index ed06b2b85..d32a37b84 100644
--- a/libkdepim/statusbarprogresswidget.h
+++ b/libkdepim/statusbarprogresswidget.h
@@ -40,11 +40,11 @@
 
 class KMMainWidget;
 class KProgress;
-class QPushButton;
-class QWidgetStack;
-class QBoxLayout;
-class QLabel;
-class QTimer;
+class TQPushButton;
+class TQWidgetStack;
+class TQBoxLayout;
+class TQLabel;
+class TQTimer;
 
 namespace KPIM {
 class SSLLabel;
diff --git a/libkdepim/weaver.cpp b/libkdepim/weaver.cpp
index 20e44df42..36bb8fe00 100644
--- a/libkdepim/weaver.cpp
+++ b/libkdepim/weaver.cpp
@@ -108,7 +108,7 @@ namespace ThreadWeaver {
     void Job::triggerSPR ()
     {
         m_mutex->lock ();
-        m_wc = new QWaitCondition;
+        m_wc = new TQWaitCondition;
         m_mutex->unlock ();
 
         thread()->post (KPIM::ThreadWeaver::Event::JobSPR, this);
@@ -123,7 +123,7 @@ namespace ThreadWeaver {
     void Job::triggerAPR ()
     {
         m_mutex->lock ();
-        m_wc = new QWaitCondition;
+        m_wc = new TQWaitCondition;
         m_mutex->unlock ();
 
         thread()->post (KPIM::ThreadWeaver::Event::JobAPR, this);
diff --git a/libkmime/kmime_header_parsing.h b/libkmime/kmime_header_parsing.h
index c595a4214..699b56e10 100644
--- a/libkmime/kmime_header_parsing.h
+++ b/libkmime/kmime_header_parsing.h
@@ -40,8 +40,8 @@
 
 #include <kdepimmacros.h>
 
-template <typename K, typename V> class QMap;
-class QStringList;
+template <typename K, typename V> class TQMap;
+class TQStringList;
 
 namespace KMime {
 
diff --git a/libkmime/kmime_mdn.h b/libkmime/kmime_mdn.h
index 1149619fd..3f207e312 100644
--- a/libkmime/kmime_mdn.h
+++ b/libkmime/kmime_mdn.h
@@ -37,7 +37,7 @@
 
 #include <kdepimmacros.h>
 
-class QCString;
+class TQCString;
 
 namespace KMime {
 
diff --git a/libkpgp/kpgp.h b/libkpgp/kpgp.h
index b96bb62dc..e36f07fdf 100644
--- a/libkpgp/kpgp.h
+++ b/libkpgp/kpgp.h
@@ -38,10 +38,10 @@
 #include "kpgpkey.h"
 #include <kdepimmacros.h>
 
-class QLineEdit;
-class QCursor;
-class QCheckBox;
-class QGridLayout;
+class TQLineEdit;
+class TQCursor;
+class TQCheckBox;
+class TQGridLayout;
 
 class KConfig;
 
diff --git a/libkpgp/kpgpblock.h b/libkpgp/kpgpblock.h
index 2bce9c74c..a85dcea65 100644
--- a/libkpgp/kpgpblock.h
+++ b/libkpgp/kpgpblock.h
@@ -26,7 +26,7 @@
 #include <kdepimmacros.h>
 
 //#include <tqstringlist.h>
-class QStringList;
+class TQStringList;
 
 #include "kpgp.h"
 
diff --git a/libkpgp/kpgpui.h b/libkpgp/kpgpui.h
index 48e6fecde..8cb41953f 100644
--- a/libkpgp/kpgpui.h
+++ b/libkpgp/kpgpui.h
@@ -31,15 +31,15 @@
 
 #include <kdepimmacros.h>
 
-class QString;
-class QRegExp;
-class QCString;
-class QCheckBox;            // needed by Config, KeySelectionDialog
-class QMultiLineEdit;       // needed by CipherTextDialog
-class QComboBox;            // needed by Config
-class QPixmap;              // needed by KeySelectionDialog
-class QPushButton;          // needed by KeyRequester
-class QTimer;               // needed by KeySelectionDialog
+class TQString;
+class TQRegExp;
+class TQCString;
+class TQCheckBox;            // needed by Config, KeySelectionDialog
+class TQMultiLineEdit;       // needed by CipherTextDialog
+class TQComboBox;            // needed by Config
+class TQPixmap;              // needed by KeySelectionDialog
+class TQPushButton;          // needed by KeyRequester
+class TQTimer;               // needed by KeySelectionDialog
 
 class KListView;            // needed by KeySelectionDialog
 class KPasswordEdit;        // needed by PassphraseDialog
diff --git a/libkpimexchange/core/exchangemonitor.h b/libkpimexchange/core/exchangemonitor.h
index 216c53f5a..e70053bf5 100644
--- a/libkpimexchange/core/exchangemonitor.h
+++ b/libkpimexchange/core/exchangemonitor.h
@@ -31,9 +31,9 @@
 #include <libkcal/calendar.h>
 #include <libkcal/event.h>
 
-class QSocketDevice;
-class QSocketNotifier;
-class QTextStream;
+class TQSocketDevice;
+class TQSocketNotifier;
+class TQTextStream;
 
 namespace KPIM {
 
diff --git a/libkpimexchange/core/exchangeprogress.h b/libkpimexchange/core/exchangeprogress.h
index d6b3341ff..a2fd05a4b 100644
--- a/libkpimexchange/core/exchangeprogress.h
+++ b/libkpimexchange/core/exchangeprogress.h
@@ -22,7 +22,7 @@
 
 #include <kprogress.h>
 
-class QComboBox;
+class TQComboBox;
 
 namespace KPIM {
 
diff --git a/libkpimidentities/identity.h b/libkpimidentities/identity.h
index 0493a3864..236a2dc68 100644
--- a/libkpimidentities/identity.h
+++ b/libkpimidentities/identity.h
@@ -22,7 +22,7 @@ namespace KPIM {
 }
 class KConfigBase;
 class IdentityList;
-class QDataStream;
+class TQDataStream;
 
 namespace KPIM {
 
diff --git a/libkpimidentities/identitycombo.h b/libkpimidentities/identitycombo.h
index ab7382f5a..0d1985211 100644
--- a/libkpimidentities/identitycombo.h
+++ b/libkpimidentities/identitycombo.h
@@ -36,7 +36,7 @@
 #include <tqvaluelist.h>
 #include <kdepimmacros.h>
 
-class QString;
+class TQString;
 
 namespace KPIM {
 
diff --git a/libkpimidentities/identitymanager.h b/libkpimidentities/identitymanager.h
index 59b2d1c74..dfb8e8ab5 100644
--- a/libkpimidentities/identitymanager.h
+++ b/libkpimidentities/identitymanager.h
@@ -40,7 +40,7 @@
 class KConfigBase;
 class KConfig;
 class KMKernel;
-class QStringList;
+class TQStringList;
 class KMIdentity;
 
 namespace KPIM {
diff --git a/libksieve/ksieve/lexer.h b/libksieve/ksieve/lexer.h
index befcb0242..8acb908d9 100644
--- a/libksieve/ksieve/lexer.h
+++ b/libksieve/ksieve/lexer.h
@@ -33,7 +33,7 @@
 #ifndef __KSIEVE_LEXER_H__
 #define __KSIEVE_LEXER_H__
 
-class QString;
+class TQString;
 
 namespace KSieve {
 
diff --git a/libksieve/ksieve/parser.h b/libksieve/ksieve/parser.h
index e70e1db4d..eadd00ff9 100644
--- a/libksieve/ksieve/parser.h
+++ b/libksieve/ksieve/parser.h
@@ -35,7 +35,7 @@
 
 #include <kdepimmacros.h>
 
-class QString;
+class TQString;
 
 namespace KSieve {
 
diff --git a/libksieve/ksieve/scriptbuilder.h b/libksieve/ksieve/scriptbuilder.h
index 28fd60879..71100d520 100644
--- a/libksieve/ksieve/scriptbuilder.h
+++ b/libksieve/ksieve/scriptbuilder.h
@@ -33,7 +33,7 @@
 #ifndef __KSIEVE_INTERFACES_SCRIPTBUILDER_H__
 #define __KSIEVE_INTERFACES_SCRIPTBUILDER_H__
 
-class QString;
+class TQString;
 
 namespace KSieve {
 
diff --git a/plugins/kmail/bodypartformatter/delegateselector.h b/plugins/kmail/bodypartformatter/delegateselector.h
index e951497b3..8f1d87d13 100644
--- a/plugins/kmail/bodypartformatter/delegateselector.h
+++ b/plugins/kmail/bodypartformatter/delegateselector.h
@@ -26,7 +26,7 @@ namespace KPIM {
   class AddresseeLineEdit;
 }
 
-class QCheckBox;
+class TQCheckBox;
 
 /**
   Selection dialog for a delegate.
diff --git a/wizards/egroupwarewizard.h b/wizards/egroupwarewizard.h
index c6df0073d..08d7cffa0 100644
--- a/wizards/egroupwarewizard.h
+++ b/wizards/egroupwarewizard.h
@@ -25,7 +25,7 @@
 #include <kdepimmacros.h>
 
 class KLineEdit;
-class QCheckBox;
+class TQCheckBox;
 
 class KDE_EXPORT EGroupwareWizard : public KConfigWizard
 {
diff --git a/wizards/exchangewizard.h b/wizards/exchangewizard.h
index 7336b9e97..c951c4be2 100644
--- a/wizards/exchangewizard.h
+++ b/wizards/exchangewizard.h
@@ -24,8 +24,8 @@
 #include <kdepimmacros.h>
 
 class KLineEdit;
-class QCheckBox;
-class QSpinBox;
+class TQCheckBox;
+class TQSpinBox;
 
 class KDE_EXPORT ExchangeWizard : public KConfigWizard
 {
diff --git a/wizards/groupwisewizard.h b/wizards/groupwisewizard.h
index 3e6b03dd6..d186e9cec 100644
--- a/wizards/groupwisewizard.h
+++ b/wizards/groupwisewizard.h
@@ -24,9 +24,9 @@
 #include <kdepimmacros.h>
 
 class KLineEdit;
-class QCheckBox;
-class QSpinBox;
-class QGroupBox;
+class TQCheckBox;
+class TQSpinBox;
+class TQGroupBox;
 
 class KDE_EXPORT GroupwiseWizard : public KConfigWizard
 {
diff --git a/wizards/kolabwizard.h b/wizards/kolabwizard.h
index 60a0168dd..b1b074674 100644
--- a/wizards/kolabwizard.h
+++ b/wizards/kolabwizard.h
@@ -26,8 +26,8 @@
 #include <kdepimmacros.h>
 
 class KLineEdit;
-class QCheckBox;
-class QRadioButton;
+class TQCheckBox;
+class TQRadioButton;
 
 class KDE_EXPORT KolabWizard : public KConfigWizard
 {
diff --git a/wizards/scalixwizard.h b/wizards/scalixwizard.h
index 000801fc4..71de08a06 100644
--- a/wizards/scalixwizard.h
+++ b/wizards/scalixwizard.h
@@ -27,7 +27,7 @@
 
 class KComboBox;
 class KLineEdit;
-class QCheckBox;
+class TQCheckBox;
 
 class KDE_EXPORT ScalixWizard : public KConfigWizard
 {
diff --git a/wizards/sloxwizard.h b/wizards/sloxwizard.h
index 971650556..e744c7691 100644
--- a/wizards/sloxwizard.h
+++ b/wizards/sloxwizard.h
@@ -24,7 +24,7 @@
 #include <kdepimmacros.h>
 
 class KLineEdit;
-class QCheckBox;
+class TQCheckBox;
 
 class KDE_EXPORT SloxWizard : public KConfigWizard
 {