Rename a number of classes to enhance compatibility with KDE4

1 files changed, 69 insertions, 69 deletions

diff --git a/kmail/kmmainwidget.h b/kmail/kmmainwidget.h
index 959d581dc..67290cf36 100644
--- a/kmail/kmmainwidget.h
+++ b/kmail/kmmainwidget.h
@@ -37,11 +37,11 @@ class TQVBoxLayout;
 class TQSplitter;
 class TQSignalMapper;
 
-class KActionMenu;
-class KActionCollection;
+class TDEActionMenu;
+class TDEActionCollection;
 class TDEConfig;
-class KRadioAction;
-class KToggleAction;
+class TDERadioAction;
+class TDEToggleAction;
 class KMenuBar;
 class KStatusBarLabel;
 
@@ -87,7 +87,7 @@ class KDE_EXPORT KMMainWidget : public TQWidget
 public:
   KMMainWidget(TQWidget *parent, const char *name,
                KXMLGUIClient *aGUIClient,
-               KActionCollection *actionCollection,
+               TDEActionCollection *actionCollection,
          TDEConfig*config = KMKernel::config() );
   virtual ~KMMainWidget();
   void destruct();
@@ -114,40 +114,40 @@ public:
 
   static void cleanup();
 
-  KAction *action( const char *name ) { return mActionCollection->action( name ); }
-  KActionMenu *customReplyAction() const { return mCustomReplyActionMenu; }
-  KActionMenu *customReplyAllAction() const { return mCustomReplyAllActionMenu; }
-  KActionMenu *forwardMenu() const { return mForwardActionMenu; }
-  KAction *forwardInlineAction() const { return mForwardInlineAction; }
-  KAction *forwardAttachedAction() const { return mForwardAttachedAction; }
-  KAction *forwardDigestAction() const { return mForwardDigestAction; }
-  KAction *redirectAction() const { return mRedirectAction; }
-  KActionMenu *customForwardAction() const { return mCustomForwardActionMenu; }
-  KActionMenu *filterMenu() const { return mFilterMenu; }
-  KAction *printAction() const { return mPrintAction; }
-  KAction *trashAction() const { return mTrashAction; }
-  KAction *deleteAction() const { return mDeleteAction; }
-  KAction *trashThreadAction() const { return mTrashThreadAction; }
-  KAction *deleteThreadAction() const { return mDeleteThreadAction; }
-  KAction *saveAsAction() const { return mSaveAsAction; }
-  KAction *editAction() const { return mMsgActions->editAction(); }
-  KAction *useAction() const { return mUseAction; }
-  KAction *sendAgainAction() const { return mSendAgainAction; }
-  KAction *applyAllFiltersAction() const { return mApplyAllFiltersAction; }
-  KAction *findInMessageAction() const { return mFindInMessageAction; }
-  KAction *saveAttachmentsAction() const { return mSaveAttachmentsAction; }
-  KAction *openAction() const { return mOpenAction; }
-  KAction *viewSourceAction() const { return mViewSourceAction; }
+  TDEAction *action( const char *name ) { return mActionCollection->action( name ); }
+  TDEActionMenu *customReplyAction() const { return mCustomReplyActionMenu; }
+  TDEActionMenu *customReplyAllAction() const { return mCustomReplyAllActionMenu; }
+  TDEActionMenu *forwardMenu() const { return mForwardActionMenu; }
+  TDEAction *forwardInlineAction() const { return mForwardInlineAction; }
+  TDEAction *forwardAttachedAction() const { return mForwardAttachedAction; }
+  TDEAction *forwardDigestAction() const { return mForwardDigestAction; }
+  TDEAction *redirectAction() const { return mRedirectAction; }
+  TDEActionMenu *customForwardAction() const { return mCustomForwardActionMenu; }
+  TDEActionMenu *filterMenu() const { return mFilterMenu; }
+  TDEAction *printAction() const { return mPrintAction; }
+  TDEAction *trashAction() const { return mTrashAction; }
+  TDEAction *deleteAction() const { return mDeleteAction; }
+  TDEAction *trashThreadAction() const { return mTrashThreadAction; }
+  TDEAction *deleteThreadAction() const { return mDeleteThreadAction; }
+  TDEAction *saveAsAction() const { return mSaveAsAction; }
+  TDEAction *editAction() const { return mMsgActions->editAction(); }
+  TDEAction *useAction() const { return mUseAction; }
+  TDEAction *sendAgainAction() const { return mSendAgainAction; }
+  TDEAction *applyAllFiltersAction() const { return mApplyAllFiltersAction; }
+  TDEAction *findInMessageAction() const { return mFindInMessageAction; }
+  TDEAction *saveAttachmentsAction() const { return mSaveAttachmentsAction; }
+  TDEAction *openAction() const { return mOpenAction; }
+  TDEAction *viewSourceAction() const { return mViewSourceAction; }
   KMail::MessageActions *messageActions() const { return mMsgActions; }
 
-  KActionMenu *statusMenu()  const{ return mMsgActions->messageStatusMenu(); }
-  KActionMenu *threadStatusMenu() const { return mThreadStatusMenu; }
-  KActionMenu *moveActionMenu() const{ return mMoveActionMenu; }
-  KActionMenu *mopyActionMenu() const { return mCopyActionMenu; }
-  KActionMenu *applyFilterActionsMenu() const { return mApplyFilterActionsMenu; }
+  TDEActionMenu *statusMenu()  const{ return mMsgActions->messageStatusMenu(); }
+  TDEActionMenu *threadStatusMenu() const { return mThreadStatusMenu; }
+  TDEActionMenu *moveActionMenu() const{ return mMoveActionMenu; }
+  TDEActionMenu *mopyActionMenu() const { return mCopyActionMenu; }
+  TDEActionMenu *applyFilterActionsMenu() const { return mApplyFilterActionsMenu; }
 
-  KToggleAction *watchThreadAction() const { return mWatchThreadAction; }
-  KToggleAction *ignoreThreadAction() const { return mIgnoreThreadAction; }
+  TDEToggleAction *watchThreadAction() const { return mWatchThreadAction; }
+  TDEToggleAction *ignoreThreadAction() const { return mIgnoreThreadAction; }
 
   KMHeaders *headers() const { return mHeaders; }
   void toggleSystemTray();
@@ -162,7 +162,7 @@ public:
 
   /** Checks a shortcut against the actioncollection and returns whether it
    * is already used and therefor not valid or not. */
-  bool shortcutIsValid( const KShortcut& ) const;
+  bool shortcutIsValid( const TDEShortcut& ) const;
 
 
   void modifyFolder( KMFolderTreeItem* folderItem );
@@ -260,7 +260,7 @@ protected:
   void updateFileMenu();
   void newFromTemplate( KMMessage *msg );
 
-  KActionCollection * actionCollection() const { return mActionCollection; }
+  TDEActionCollection * actionCollection() const { return mActionCollection; }
 
   /** @return the correct config dialog depending on whether the parent of the mainWidget
    *          is a KPart or a KMMainWindow. When dealing with geometries, use this pointer
@@ -451,25 +451,25 @@ private slots:
 
 private:
   // Message actions
-  KAction *mTrashAction, *mDeleteAction, *mTrashThreadAction,
+  TDEAction *mTrashAction, *mDeleteAction, *mTrashThreadAction,
     *mDeleteThreadAction, *mSaveAsAction, *mUseAction,
     *mSendAgainAction, *mApplyAllFiltersAction, *mFindInMessageAction,
     *mSaveAttachmentsAction, *mOpenAction, *mViewSourceAction,
     *mFavoritesCheckMailAction,
     *mMoveMsgToFolderAction;
   // Composition actions
-  KAction *mPrintAction,
+  TDEAction *mPrintAction,
     *mForwardInlineAction, *mForwardAttachedAction, *mForwardDigestAction,
     *mRedirectAction;
-  KActionMenu *mForwardActionMenu;
+  TDEActionMenu *mForwardActionMenu;
   // Filter actions
-  KActionMenu *mFilterMenu;
-  KAction *mSubjectFilterAction, *mFromFilterAction, *mToFilterAction,
+  TDEActionMenu *mFilterMenu;
+  TDEAction *mSubjectFilterAction, *mFromFilterAction, *mToFilterAction,
       *mListFilterAction;
-  KActionMenu *mTemplateMenu;
+  TDEActionMenu *mTemplateMenu;
 
   // Custom template actions menu
-  KActionMenu *mCustomReplyActionMenu,
+  TDEActionMenu *mCustomReplyActionMenu,
               *mCustomReplyAllActionMenu,
               *mCustomForwardActionMenu;
   // Signal mappers for custom template actions
@@ -477,23 +477,23 @@ private:
                 *mCustomReplyAllMapper,
                 *mCustomForwardMapper;
 
-  KActionMenu *mThreadStatusMenu,
+  TDEActionMenu *mThreadStatusMenu,
     *mMoveActionMenu, *mCopyActionMenu, *mApplyFilterActionsMenu;
-  KAction *mMarkThreadAsNewAction;
-  KAction *mMarkThreadAsReadAction;
-  KAction *mMarkThreadAsUnreadAction;
-  KToggleAction *mToggleThreadTodoAction;
-  KToggleAction *mToggleThreadFlagAction;
+  TDEAction *mMarkThreadAsNewAction;
+  TDEAction *mMarkThreadAsReadAction;
+  TDEAction *mMarkThreadAsUnreadAction;
+  TDEToggleAction *mToggleThreadTodoAction;
+  TDEToggleAction *mToggleThreadFlagAction;
 
-  KToggleAction *mWatchThreadAction, *mIgnoreThreadAction;
+  TDEToggleAction *mWatchThreadAction, *mIgnoreThreadAction;
 
-  /** we need to access those KToggleActions from the foldertree-popup */
-  KRadioAction* mUnreadColumnToggle;
-  KRadioAction* mUnreadTextToggle;
-  KToggleAction* mTotalColumnToggle;
-  KToggleAction* mSizeColumnToggle;
+  /** we need to access those TDEToggleActions from the foldertree-popup */
+  TDERadioAction* mUnreadColumnToggle;
+  TDERadioAction* mUnreadTextToggle;
+  TDEToggleAction* mTotalColumnToggle;
+  TDEToggleAction* mSizeColumnToggle;
 
-  KToggleAction *mToggleShowQuickSearchAction;
+  TDEToggleAction *mToggleShowQuickSearchAction;
 
   KMFolderTree *mFolderTree;
   KMail::FavoriteFolderView *mFavoriteFolderView;
@@ -504,12 +504,12 @@ private:
   TQSplitter    *mFolderViewSplitter;
   KMHeaders    *mHeaders;
   TQVBox        *mSearchAndHeaders;
-  KToolBar     *mSearchToolBar;
+  TDEToolBar     *mSearchToolBar;
   KMail::HeaderListQuickSearch *mQuickSearchLine;
   TQGuardedPtr<KMFolder> mFolder;
   KMFolder     *mTemplateFolder;
   TQPopupMenu   *mViewMenu, *mBodyPartsMenu;
-  KAction       *mlistFilterAction;
+  TDEAction       *mlistFilterAction;
   bool		mIntegrated;
   bool          mBeepOnNew;
   bool          mConfirmEmpty;
@@ -534,14 +534,14 @@ private:
 //  TQPopupMenu *mMessageMenu;
   KMail::SearchWindow *mSearchWin;
 
-  KAction *mNewFolderAction, *mModifyFolderAction, *mRemoveFolderAction, *mExpireFolderAction,
+  TDEAction *mNewFolderAction, *mModifyFolderAction, *mRemoveFolderAction, *mExpireFolderAction,
       *mCompactFolderAction, *mRefreshFolderAction, *mEmptyFolderAction,
       *mMarkAllAsReadAction, *mFolderMailingListPropertiesAction,
       *mFolderShortCutCommandAction, *mTroubleshootFolderAction,
       *mRemoveDuplicatesAction, *mArchiveFolderAction;
-  KToggleAction *mPreferHtmlAction, *mPreferHtmlLoadExtAction, *mThreadMessagesAction;
-  KToggleAction *mThreadBySubjectAction;
-  KToggleAction *mFolderAction, *mHeaderAction, *mMimeAction;
+  TDEToggleAction *mPreferHtmlAction, *mPreferHtmlLoadExtAction, *mThreadMessagesAction;
+  TDEToggleAction *mThreadBySubjectAction;
+  TDEToggleAction *mFolderAction, *mHeaderAction, *mMimeAction;
 
   TQTimer *menutimer;
   TQTimer *mShowBusySplashTimer;
@@ -550,18 +550,18 @@ private:
 #if !defined(NDEBUG)
   TQGuardedPtr<KMail::SieveDebugDialog> mSieveDebugDialog;
 #endif
-  KActionCollection *mActionCollection;
-  KActionSeparator  *mToolbarActionSeparator;
+  TDEActionCollection *mActionCollection;
+  TDEActionSeparator  *mToolbarActionSeparator;
   TQVBoxLayout *mTopLayout;
   bool mDestructed, mForceJumpToUnread, mShowingOfflineScreen;
-  TQPtrList<KAction> mFilterMenuActions;
-  TQPtrList<KAction> mFilterTBarActions;
+  TQPtrList<TDEAction> mFilterMenuActions;
+  TQPtrList<TDEAction> mFilterTBarActions;
   TQPtrList<KMMetaFilterActionCommand> mFilterCommands;
   TQDict<FolderShortcutCommand> mFolderShortcutCommands;
   TQGuardedPtr <KMail::FolderJob> mJob;
 
   TQValueVector<TQString> mCustomTemplates;
-  TQPtrList<KAction> mCustomTemplateActions;
+  TQPtrList<TDEAction> mCustomTemplateActions;
 
   KMSystemTray  *mSystemTray;
   TDEConfig *mConfig;