Rename a number of classes to enhance compatibility with KDE4

1 files changed, 22 insertions, 22 deletions

diff --git a/src/partcontroller.cpp b/src/partcontroller.cpp
index 083aeb2f..db615763 100644
--- a/src/partcontroller.cpp
+++ b/src/partcontroller.cpp
@@ -124,9 +124,9 @@ PartController *PartController::getInstance()
 
 void PartController::setupActions()
 {
-  KActionCollection *ac = TopLevel::getInstance()->main()->actionCollection();
+  TDEActionCollection *ac = TopLevel::getInstance()->main()->actionCollection();
 
-  KAction* newAction = KStdAction::open(this, TQT_SLOT(slotOpenFile()), ac, "file_open");
+  TDEAction* newAction = KStdAction::open(this, TQT_SLOT(slotOpenFile()), ac, "file_open");
   newAction->setToolTip( i18n("Open file") );
   newAction->setWhatsThis( i18n("<b>Open file</b><p>Opens an existing file without adding it to the project.</p>") );
 
@@ -134,12 +134,12 @@ void PartController::setupActions()
   m_openRecentAction->setWhatsThis(TQString("<b>%1</b><p>%2").arg(beautifyToolTip(m_openRecentAction->text())).arg(i18n("Opens recently opened file.")));
   m_openRecentAction->loadEntries( kapp->config(), "RecentFiles" );
 
-  m_saveAllFilesAction = new KAction(i18n("Save Al&l"), 0, this, TQT_SLOT(slotSaveAllFiles()), ac, "file_save_all");
+  m_saveAllFilesAction = new TDEAction(i18n("Save Al&l"), 0, this, TQT_SLOT(slotSaveAllFiles()), ac, "file_save_all");
   m_saveAllFilesAction->setToolTip( i18n("Save all modified files") );
   m_saveAllFilesAction->setWhatsThis(i18n("<b>Save all</b><p>Saves all modified files."));
   m_saveAllFilesAction->setEnabled(false);
 
-  m_revertAllFilesAction = new KAction(i18n("Rever&t All"), 0, this, TQT_SLOT(slotRevertAllFiles()), ac, "file_revert_all");
+  m_revertAllFilesAction = new TDEAction(i18n("Rever&t All"), 0, this, TQT_SLOT(slotRevertAllFiles()), ac, "file_revert_all");
   m_revertAllFilesAction->setToolTip(i18n("Revert all changes"));
   m_revertAllFilesAction->setWhatsThis(i18n("<b>Revert all</b><p>Reverts all changes in opened files. Prompts to save changes so the reversion can be canceled for each modified file."));
   m_revertAllFilesAction->setEnabled(false);
@@ -149,33 +149,33 @@ void PartController::setupActions()
   m_closeWindowAction->setWhatsThis(TQString("<b>%1</b><p>%2").arg(beautifyToolTip(m_closeWindowAction->text())).arg(i18n("Closes current file.")));
   m_closeWindowAction->setEnabled(false);
 
-  m_closeAllWindowsAction = new KAction(i18n("Close All"), 0, this, TQT_SLOT(slotCloseAllWindows()), ac, "file_close_all");
+  m_closeAllWindowsAction = new TDEAction(i18n("Close All"), 0, this, TQT_SLOT(slotCloseAllWindows()), ac, "file_close_all");
   m_closeAllWindowsAction->setToolTip( i18n("Close all files") );
   m_closeAllWindowsAction->setWhatsThis(i18n("<b>Close all</b><p>Close all opened files."));
   m_closeAllWindowsAction->setEnabled(false);
 
-  m_closeOtherWindowsAction = new KAction(i18n("Close All Others"), 0, this, TQT_SLOT(slotCloseOtherWindows()), ac, "file_closeother");
+  m_closeOtherWindowsAction = new TDEAction(i18n("Close All Others"), 0, this, TQT_SLOT(slotCloseOtherWindows()), ac, "file_closeother");
   m_closeOtherWindowsAction->setToolTip( i18n("Close other files") );
   m_closeOtherWindowsAction->setWhatsThis(i18n("<b>Close all others</b><p>Close all opened files except current."));
   m_closeOtherWindowsAction->setEnabled(false);
 
-  new KActionSeparator(ac, "dummy_separator");
+  new TDEActionSeparator(ac, "dummy_separator");
 
-  m_backAction = new KToolBarPopupAction(i18n("Back"), "back", 0, this, TQT_SLOT(slotBack()), ac, "history_back");
+  m_backAction = new TDEToolBarPopupAction(i18n("Back"), "back", 0, this, TQT_SLOT(slotBack()), ac, "history_back");
   m_backAction->setEnabled( false );
   m_backAction->setToolTip(i18n("Back"));
   m_backAction->setWhatsThis(i18n("<b>Back</b><p>Moves backwards one step in the navigation history."));
   connect(m_backAction->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotBackAboutToShow()));
   connect(m_backAction->popupMenu(), TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotBackPopupActivated(int)));
 
-  m_forwardAction = new KToolBarPopupAction(i18n("Forward"), "forward", 0, this, TQT_SLOT(slotForward()), ac, "history_forward");
+  m_forwardAction = new TDEToolBarPopupAction(i18n("Forward"), "forward", 0, this, TQT_SLOT(slotForward()), ac, "history_forward");
   m_forwardAction->setEnabled( false );
   m_forwardAction->setToolTip(i18n("Forward"));
   m_forwardAction->setWhatsThis(i18n("<b>Forward</b><p>Moves forward one step in the navigation history."));
   connect(m_forwardAction->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotForwardAboutToShow()));
   connect(m_forwardAction->popupMenu(), TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotForwardPopupActivated(int)));
 
-  m_gotoLastEditPosAction = new KAction( i18n("Goto Last Edit Position"), "bottom", 0, this, TQT_SLOT(gotoLastEditPos()), ac, "goto_last_edit_pos" );
+  m_gotoLastEditPosAction = new TDEAction( i18n("Goto Last Edit Position"), "bottom", 0, this, TQT_SLOT(gotoLastEditPos()), ac, "goto_last_edit_pos" );
   m_gotoLastEditPosAction->setEnabled( false );
   m_gotoLastEditPosAction->setToolTip( i18n("Goto Last Edit Position") );
   m_gotoLastEditPosAction->setWhatsThis( i18n("<b>Goto Last Edit Position</b><p>Open the last edited file and position cursor at the point of edit") );
@@ -752,26 +752,26 @@ void PartController::integrateTextEditorPart(KTextEditor::Document* doc)
 
   if ( KTextEditor::View * view = dynamic_cast<KTextEditor::View*>( doc->widget() ) )
   {
-    KActionCollection* c = view->actionCollection();
+    TDEActionCollection* c = view->actionCollection();
     // Be extra carefull, in case the part either don't provide those
     // action, or uses different shortcuts.
 
-    if (KAction* a = c->action("view_folding_markers"))
+    if (TDEAction* a = c->action("view_folding_markers"))
     {
-      if (a->shortcut() == KShortcut(Key_F9))
-        a->setShortcut(KShortcut());
+      if (a->shortcut() == TDEShortcut(Key_F9))
+        a->setShortcut(TDEShortcut());
     }
 
-    if (KAction* a = c->action("view_dynamic_word_wrap"))
+    if (TDEAction* a = c->action("view_dynamic_word_wrap"))
     {
-      if (a->shortcut() == KShortcut(Key_F10))
-        a->setShortcut(KShortcut());
+      if (a->shortcut() == TDEShortcut(Key_F10))
+        a->setShortcut(TDEShortcut());
     }
 
-    if (KAction* a = c->action("view_line_numbers"))
+    if (TDEAction* a = c->action("view_line_numbers"))
     {
-      if (a->shortcut() == KShortcut(Key_F11))
-        a->setShortcut(KShortcut());
+      if (a->shortcut() == TDEShortcut(Key_F11))
+        a->setShortcut(TDEShortcut());
     }
   }
 
@@ -1619,7 +1619,7 @@ void PartController::slotForward()
 
 void PartController::slotBackAboutToShow()
 {
-	KPopupMenu *popup = m_backAction->popupMenu();
+	TDEPopupMenu *popup = m_backAction->popupMenu();
 	popup->clear();
 
 	if ( m_backHistory.isEmpty()) return;
@@ -1636,7 +1636,7 @@ void PartController::slotBackAboutToShow()
 
 void PartController::slotForwardAboutToShow( )
 {
-	KPopupMenu * popup = m_forwardAction->popupMenu();
+	TDEPopupMenu * popup = m_forwardAction->popupMenu();
 	popup->clear();
 
 	if ( m_forwardHistory.isEmpty() ) return;