1 files changed, 10 insertions, 8 deletions
diff --git a/kmail/kmfoldertree.h b/kmail/kmfoldertree.h
index 640da9507..73704df4a 100644
--- a/kmail/kmfoldertree.h
+++ b/kmail/kmfoldertree.h
@@ -45,17 +45,18 @@ template <typename T> class TQGuardedPtr;
 class KDE_EXPORT KMFolderTreeItem : public TQObject, public KFolderTreeItem
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
   /** Construct a root item _without_ folder */
-  KMFolderTreeItem( KFolderTree *parent, const TQString & name,
+  KMFolderTreeItem( KFolderTree *tqparent, const TQString & name,
                     KFolderTreeItem::Protocol protocol=KFolderTreeItem::NONE );
 
   /** Construct a root item _with_ folder */
-  KMFolderTreeItem( KFolderTree *parent, const TQString & name,
+  KMFolderTreeItem( KFolderTree *tqparent, const TQString & name,
                     KMFolder* folder );
 
   /** Construct a child item */
-  KMFolderTreeItem( KFolderTreeItem* parent, const TQString & name,
+  KMFolderTreeItem( KFolderTreeItem* tqparent, const TQString & name,
                     KMFolder* folder );
   virtual ~KMFolderTreeItem();
 
@@ -67,7 +68,7 @@ public:
 
   /** associated folder */
   KMFolder* folder() const { return mFolder; }
-  TQListViewItem* parent() const { return KFolderTreeItem::parent(); }
+  TQListViewItem* tqparent() const { return KFolderTreeItem::tqparent(); }
 
   /** Adjust the unread count from the folder and update the
    * pixmaps accordingly. */
@@ -108,16 +109,17 @@ private:
 class KMFolderTree : public KMail::FolderTreeBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  KMFolderTree( KMMainWidget *mainWidget, TQWidget *parent=0,
+  KMFolderTree( KMMainWidget *mainWidget, TQWidget *tqparent=0,
 		const char *name=0 );
 
   /** Save config options */
   void writeConfig();
 
   /** Recusively add folders in a folder directory to a listview item. */
-  virtual void addDirectory( KMFolderDir *fdir, KMFolderTreeItem* parent );
+  virtual void addDirectory( KMFolderDir *fdir, KMFolderTreeItem* tqparent );
 
   /** create a folderlist */
   void createFolderList( TQStringList *str,
@@ -165,7 +167,7 @@ public:
     MoveFolder
   };
 
-  /** Generate a popup menu that tqcontains all folders that can have content */
+  /** Generate a popup menu that contains all folders that can have content */
   void folderToPopupMenu( MenuAction action, TQObject *receiver, KMMenuToFolder *,
       TQPopupMenu *menu, TQListViewItem *start = 0 );
 
@@ -224,7 +226,7 @@ public slots:
   void slotResetFolderList( TQListViewItem* item = 0, bool startList = true );
 
   /** Create a child folder */
-  void addChildFolder( KMFolder *folder = 0, TQWidget * parent = 0 );
+  void addChildFolder( KMFolder *folder = 0, TQWidget * tqparent = 0 );
 
   /** Copies the currently selected folder. */
   void copyFolder();