1 files changed, 17 insertions, 13 deletions

diff --git a/kmail/kmfolderdia.h b/kmail/kmfolderdia.h
index 31fb26d9..a97d78b3 100644
--- a/kmail/kmfolderdia.h
+++ b/kmail/kmfolderdia.h
@@ -20,11 +20,11 @@
  *
  *  In addition, as a special exception, the copyright holders give
  *  permission to link the code of this program with any edition of
- *  the Qt library by Trolltech AS, Norway (or with modified versions
- *  of Qt that use the same license as Qt), and distribute linked
+ *  the TQt library by Trolltech AS, Norway (or with modified versions
+ *  of TQt that use the same license as TQt), and distribute linked
  *  combinations including the two.  You must obey the GNU General
  *  Public License in all respects for all of the code used other than
- *  Qt.  If you modify this file, you may extend this exception to
+ *  TQt.  If you modify this file, you may extend this exception to
  *  your version of the file, but you are not obligated to do so.  If
  *  you do not wish to do so, delete this exception statement from
  *  your version.
@@ -67,12 +67,13 @@ namespace KMail {
  * Feel free to rename and move this base class somewhere else if it
  * can be useful for other dialogs.
  */
-class FolderDiaTab : public QWidget
+class FolderDiaTab : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
-   FolderDiaTab( TQWidget *parent=0, const char* name=0 )
-     : TQWidget( parent, name ) {}
+   FolderDiaTab( TQWidget *tqparent=0, const char* name=0 )
+     : TQWidget( tqparent, name ) {}
 
   virtual void load() = 0;
 
@@ -82,12 +83,12 @@ public:
   /// @return whether save succeeded
   virtual bool save() = 0;
 
-  enum AccepStatus { Accepted, Canceled, Delayed };
+  enum AcceptqStatus { Accepted, Canceled, Delayed };
   /// Called when clicking OK.
   /// If a module returns Delayed, the closing is cancelled for now,
   /// and the module can close the dialog later on (i.e. after an async
   /// operation like a KIO job).
-  virtual AccepStatus accept() {
+  virtual AcceptqStatus accept() {
     return save() ? Accepted : Canceled;
   }
 
@@ -111,11 +112,12 @@ signals:
 class FolderDiaGeneralTab : public FolderDiaTab
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
   FolderDiaGeneralTab( KMFolderDialog* dlg,
                        const TQString& aName,
-                       TQWidget* parent, const char* name = 0 );
+                       TQWidget* tqparent, const char* name = 0 );
 
   virtual void load();
   virtual bool save();
@@ -162,9 +164,10 @@ private:
 class FolderDiaTemplatesTab : public FolderDiaTab
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  FolderDiaTemplatesTab( KMFolderDialog *dlg, TQWidget *parent );
+  FolderDiaTemplatesTab( KMFolderDialog *dlg, TQWidget *tqparent );
 
   virtual void load();
   virtual bool save();
@@ -196,11 +199,12 @@ private:
 class KMFolderDialog : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
   KMFolderDialog( KMFolder *folder, KMFolderDir *aFolderDir,
-		  KMFolderTree* parent, const TQString& caption,
-                  const TQString& name = TQString::null );
+		  KMFolderTree* tqparent, const TQString& caption,
+                  const TQString& name = TQString() );
 
   KMFolder* folder() const { return mFolder; }
   void setFolder( KMFolder* folder );
@@ -211,7 +215,7 @@ public:
   KMFolderDir* folderDir() const { return mFolderDir; }
   typedef TQValueList<TQGuardedPtr<KMFolder> > FolderList;
 
-  KMFolder* parentFolder() const { return mParentFolder; }
+  KMFolder* tqparentFolder() const { return mParentFolder; }
 
   KMFolderTree* folderTree() const { return mFolderTree; }