From 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 13 Apr 2011 00:46:47 +0000 Subject: Initial conversion of kdepim to TQt This will probably require some tweaking before it will build under Qt4, however Qt3 builds are OK. Any alterations this commit makes to kdepim behaviour under Qt3 are unintentional and should be fixed. git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227832 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kmail/kmmainwidget.h | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'kmail/kmmainwidget.h') diff --git a/kmail/kmmainwidget.h b/kmail/kmmainwidget.h index 824f2aaab..1bb3ee067 100644 --- a/kmail/kmmainwidget.h +++ b/kmail/kmmainwidget.h @@ -79,12 +79,13 @@ namespace KMail { typedef TQMap 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 mPanner1Sep, mPanner2Sep; KURL mUrlCurrent; - QPopupMenu *mActMenu; + TQPopupMenu *mActMenu; TQPopupMenu *mSendMenu; - QPopupMenu *mFileMenu; + TQPopupMenu *mFileMenu; bool mLongFolderList; -- cgit v1.2.1