1 files changed, 26 insertions, 26 deletions

diff --git a/kmail/kmfolderdia.h b/kmail/kmfolderdia.h
index c1df2b546..f516e8bac 100644
--- a/kmail/kmfolderdia.h
+++ b/kmail/kmfolderdia.h
@@ -34,7 +34,7 @@
 
 #include <kdialogbase.h>
 #include "configuredialog_p.h"
-#include <qvaluevector.h>
+#include <tqvaluevector.h>
 
 class QCheckBox;
 class QPushButton;
@@ -71,8 +71,8 @@ class FolderDiaTab : public QWidget
 {
   Q_OBJECT
 public:
-   FolderDiaTab( QWidget *parent=0, const char* name=0 )
-     : QWidget( parent, name ) {}
+   FolderDiaTab( TQWidget *parent=0, const char* name=0 )
+     : TQWidget( parent, name ) {}
 
   virtual void load() = 0;
 
@@ -114,37 +114,37 @@ class FolderDiaGeneralTab : public FolderDiaTab
 
 public:
   FolderDiaGeneralTab( KMFolderDialog* dlg,
-                       const QString& aName,
-                       QWidget* parent, const char* name = 0 );
+                       const TQString& aName,
+                       TQWidget* parent, const char* name = 0 );
 
   virtual void load();
   virtual bool save();
 
 private slots:
-  void slotChangeIcon( QString icon );
+  void slotChangeIcon( TQString icon );
   /*
    * is called if the folder dropdown changes
    * then we update the other items to reflect the capabilities
    */
-  void slotFolderNameChanged( const QString& );
+  void slotFolderNameChanged( const TQString& );
   void slotFolderContentsSelectionChanged( int );
 
 private:
   void initializeWithValuesFromFolder( KMFolder* folder );
 
 private:
-  QComboBox *mShowSenderReceiverComboBox;
-  QComboBox *mContentsComboBox;
-  QComboBox *mIncidencesForComboBox;
-  QCheckBox *mAlarmsBlockedCheckBox;
-  QLabel      *mNormalIconLabel;
+  TQComboBox *mShowSenderReceiverComboBox;
+  TQComboBox *mContentsComboBox;
+  TQComboBox *mIncidencesForComboBox;
+  TQCheckBox *mAlarmsBlockedCheckBox;
+  TQLabel      *mNormalIconLabel;
   KIconButton *mNormalIconButton;
-  QLabel      *mUnreadIconLabel;
+  TQLabel      *mUnreadIconLabel;
   KIconButton *mUnreadIconButton;
-  QCheckBox   *mIconsCheckBox;
-  QCheckBox   *mNewMailCheckBox;
-  QCheckBox   *mNotifyOnNewMailCheckBox;
-  QCheckBox   *mKeepRepliesInSameFolderCheckBox;
+  TQCheckBox   *mIconsCheckBox;
+  TQCheckBox   *mNewMailCheckBox;
+  TQCheckBox   *mNotifyOnNewMailCheckBox;
+  TQCheckBox   *mKeepRepliesInSameFolderCheckBox;
   KLineEdit   *mNameEdit;
 
   KPIM::IdentityCombo *mIdentityComboBox;
@@ -162,7 +162,7 @@ class FolderDiaTemplatesTab : public FolderDiaTab
   Q_OBJECT
 
 public:
-  FolderDiaTemplatesTab( KMFolderDialog *dlg, QWidget *parent );
+  FolderDiaTemplatesTab( KMFolderDialog *dlg, TQWidget *parent );
 
   virtual void load();
   virtual bool save();
@@ -176,7 +176,7 @@ private:
   void initializeWithValuesFromFolder( KMFolder* folder );
 
 private:
-  QCheckBox* mCustom;
+  TQCheckBox* mCustom;
   TemplatesConfiguration* mWidget;
   KPushButton* mCopyGlobal;
   KMFolder* mFolder;
@@ -197,8 +197,8 @@ class KMFolderDialog : public KDialogBase
 
 public:
   KMFolderDialog( KMFolder *folder, KMFolderDir *aFolderDir,
-		  KMFolderTree* parent, const QString& caption,
-                  const QString& name = QString::null );
+		  KMFolderTree* parent, const TQString& caption,
+                  const TQString& name = TQString::null );
 
   KMFolder* folder() const { return mFolder; }
   void setFolder( KMFolder* folder );
@@ -207,7 +207,7 @@ public:
   bool isNewFolder() const { return mIsNewFolder; }
 
   KMFolderDir* folderDir() const { return mFolderDir; }
-  typedef QValueList<QGuardedPtr<KMFolder> > FolderList;
+  typedef TQValueList<TQGuardedPtr<KMFolder> > FolderList;
 
   KMFolder* parentFolder() const { return mParentFolder; }
 
@@ -226,13 +226,13 @@ private:
 
 private:
   // Can be 0 initially when creating a folder, but will be set by save() in the first tab.
-  QGuardedPtr<KMFolder> mFolder;
-  QGuardedPtr<KMFolderDir> mFolderDir;
-  QGuardedPtr<KMFolder> mParentFolder;
+  TQGuardedPtr<KMFolder> mFolder;
+  TQGuardedPtr<KMFolderDir> mFolderDir;
+  TQGuardedPtr<KMFolder> mParentFolder;
 
   bool mIsNewFolder; // if true, save() did set mFolder.
 
-  QValueVector<KMail::FolderDiaTab*> mTabs;
+  TQValueVector<KMail::FolderDiaTab*> mTabs;
   int mDelayedSavingTabs; // this should go into a base class one day
   KMFolderTree* mFolderTree;
 };