TQt conversion fixes

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

104 files changed, 280 insertions, 280 deletions

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 {