1 files changed, 10 insertions, 9 deletions
diff --git a/kmail/kmmainwidget.h b/kmail/kmmainwidget.h
index 824f2aaa..1bb3ee06 100644
--- a/kmail/kmmainwidget.h
+++ b/kmail/kmmainwidget.h
@@ -79,12 +79,13 @@ namespace KMail {
 typedef TQMap<int,KMFolder*> KMMenuToFolder;
 
 
-class KDE_EXPORT KMMainWidget : public QWidget
+class KDE_EXPORT KMMainWidget : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  KMMainWidget(TQWidget *parent, const char *name,
+  KMMainWidget(TQWidget *tqparent, const char *name,
                KXMLGUIClient *aGUIClient,
                KActionCollection *actionCollection,
          KConfig*config = KMKernel::config() );
@@ -178,7 +179,7 @@ public:
   void setupForwardingActionsList();
 
   KStatusBarLabel* vacationScriptIndicator() const { return mVacationScriptIndicator; }
-  void updateVactionScripStatus() { updateVactionScripStatus( mVacationIndicatorActive ); }
+  void updateVactionScriptqStatus() { updateVactionScriptqStatus( mVacationIndicatorActive ); }
 
 public slots:
   void slotMoveMsgToFolder( KMFolder *dest);
@@ -261,7 +262,7 @@ protected:
 
   KActionCollection * actionCollection() const { return mActionCollection; }
 
-  /** @return the correct config dialog depending on whether the parent of the mainWidget
+  /** @return the correct config dialog depending on whether the tqparent of the mainWidget
    *          is a KPart or a KMMainWindow. When dealing with geometries, use this pointer
    */
   KConfig * config();
@@ -338,8 +339,8 @@ protected slots:
   void slotToggleSizeColumn();
   void slotSendQueued();
   void slotSendQueuedVia( int item );
-  void slotOnlineStatus();
-  void slotUpdateOnlineStatus( GlobalSettings::EnumNetworkState::type );
+  void slotOnlinetqStatus();
+  void slotUpdateOnlinetqStatus( GlobalSettings::EnumNetworkState::type );
   void slotMsgPopup(KMMessage &msg, const KURL &aUrl, const TQPoint&);
   void slotMarkAll();
   void slotMemInfo();
@@ -446,7 +447,7 @@ private:
 
 private slots:
   void slotRequestFullSearchFromQuickSearch();
-  void updateVactionScripStatus( bool active );
+  void updateVactionScriptqStatus( bool active );
 
 private:
   // Message actions
@@ -516,9 +517,9 @@ private:
   int		mMessageStatusId;
   TQValueList<int> mPanner1Sep, mPanner2Sep;
   KURL          mUrlCurrent;
-  QPopupMenu	*mActMenu;
+  TQPopupMenu	*mActMenu;
   TQPopupMenu    *mSendMenu;
-  QPopupMenu	*mFileMenu;
+  TQPopupMenu	*mFileMenu;
 
   bool mLongFolderList;