Browse Source

Use KXMLGUIClient::action and QAction::trigger to trigger actions, as the direct methods have been removed.
Replace CURRENT_VIEW->document()->removeSelectedText() with CURRENT_VIEW->removeSelectionText() to match new API.


git-svn-id: file:///var/svn/tigccpp/trunk@973 9552661e-59e3-4036-b4f2-dbe53926924f

kevinkofler 17 years ago
parent
commit
968104bfa6
2 changed files with 24 additions and 22 deletions
  1. 11 11
      ktigcc/mainform.cpp
  2. 13 11
      ktigcc/srcfilewin.cpp

+ 11 - 11
ktigcc/mainform.cpp

@@ -2463,13 +2463,13 @@ bool MainForm::fileSaveAs()
 
 void MainForm::filePrint()
 {
-  if (CURRENT_VIEW) CURRENT_VIEW->document()->printDialog();
+  if (CURRENT_VIEW) CURRENT_VIEW->action(KStandardAction::name(KStandardAction::Print))->trigger();
 }
 
 
 void MainForm::filePrintQuickly()
 {
-  if (CURRENT_VIEW) CURRENT_VIEW->document()->print();
+  if (CURRENT_VIEW) CURRENT_VIEW->action(KStandardAction::name(KStandardAction::Print))->trigger();
 }
 
 void MainForm::filePreferences()
@@ -2678,55 +2678,55 @@ void MainForm::filePreferences()
 void MainForm::editUndo()
 {
   if (CURRENT_VIEW)
-    CURRENT_VIEW->document()->undo();
+    CURRENT_VIEW->action(KStandardAction::name(KStandardAction::Undo))->trigger();
 }
 
 void MainForm::editRedo()
 {
   if (CURRENT_VIEW)
-    CURRENT_VIEW->document()->redo();
+    CURRENT_VIEW->action(KStandardAction::name(KStandardAction::Redo))->trigger();
 }
 
 void MainForm::editClear()
 {
   if (CURRENT_VIEW)
-    CURRENT_VIEW->document()->removeSelectedText();
+    CURRENT_VIEW->removeSelectionText();
 }
 
 void MainForm::editCut()
 {
   if (CURRENT_VIEW)
-    CURRENT_VIEW->cut();
+    CURRENT_VIEW->action(KStandardAction::name(KStandardAction::Cut))->trigger();
 }
 
 void MainForm::editCopy()
 {
   if (CURRENT_VIEW)
-    CURRENT_VIEW->copy();
+    CURRENT_VIEW->action(KStandardAction::name(KStandardAction::Copy))->trigger();
 }
 
 void MainForm::editPaste()
 {
   if (CURRENT_VIEW)
-    CURRENT_VIEW->paste();
+    CURRENT_VIEW->action(KStandardAction::name(KStandardAction::PasteText))->trigger();
 }
 
 void MainForm::editSelectAll()
 {
   if (CURRENT_VIEW)
-    CURRENT_VIEW->document()->selectAll();
+    CURRENT_VIEW->action(KStandardAction::name(KStandardAction::SelectAll))->trigger();
 }
 
 void MainForm::editIncreaseIndent()
 {
   if (CURRENT_VIEW)
-    CURRENT_VIEW->indent();
+    CURRENT_VIEW->action("tools_indent")->trigger();
 }
 
 void MainForm::editDecreaseIndent()
 {
   if (CURRENT_VIEW)
-    CURRENT_VIEW->unIndent();
+    CURRENT_VIEW->action("tools_unindent")->trigger();
 }
 
 void MainForm::findFind()

+ 13 - 11
ktigcc/srcfilewin.cpp

@@ -559,13 +559,15 @@ void SourceFileWindow::fileCompile()
 
 void SourceFileWindow::filePrint()
 {
-  if (CURRENT_VIEW) CURRENT_VIEW->document()->printDialog();
+  if (CURRENT_VIEW) CURRENT_VIEW->action(KStandardAction::name(KStandardAction::Print))->trigger();
 }
 
 
 void SourceFileWindow::filePrintQuickly()
 {
-  if (CURRENT_VIEW) CURRENT_VIEW->document()->print();
+  // This still shows the print dialog, but then KDE 3.5 Kate did that too
+  // despite having 2 nominally different APIs (print and printDialog).
+  if (CURRENT_VIEW) CURRENT_VIEW->action(KStandardAction::name(KStandardAction::Print))->trigger();
 }
 
 void SourceFileWindow::applyPreferences()
@@ -651,55 +653,55 @@ void SourceFileWindow::applyPreferences()
 void SourceFileWindow::editUndo()
 {
   if (CURRENT_VIEW)
-    CURRENT_VIEW->document()->undo();
+    CURRENT_VIEW->action(KStandardAction::name(KStandardAction::Undo))->trigger();
 }
 
 void SourceFileWindow::editRedo()
 {
   if (CURRENT_VIEW)
-    CURRENT_VIEW->document()->redo();
+    CURRENT_VIEW->action(KStandardAction::name(KStandardAction::Redo))->trigger();
 }
 
 void SourceFileWindow::editClear()
 {
   if (CURRENT_VIEW)
-    CURRENT_VIEW->document()->removeSelectedText();
+    CURRENT_VIEW->removeSelectionText();
 }
 
 void SourceFileWindow::editCut()
 {
   if (CURRENT_VIEW)
-    CURRENT_VIEW->cut();
+    CURRENT_VIEW->action(KStandardAction::name(KStandardAction::Cut))->trigger();
 }
 
 void SourceFileWindow::editCopy()
 {
   if (CURRENT_VIEW)
-    CURRENT_VIEW->copy();
+    CURRENT_VIEW->action(KStandardAction::name(KStandardAction::Copy))->trigger();
 }
 
 void SourceFileWindow::editPaste()
 {
   if (CURRENT_VIEW)
-    CURRENT_VIEW->paste();
+    CURRENT_VIEW->action(KStandardAction::name(KStandardAction::PasteText))->trigger();
 }
 
 void SourceFileWindow::editSelectAll()
 {
   if (CURRENT_VIEW)
-    CURRENT_VIEW->document()->selectAll();
+    CURRENT_VIEW->action(KStandardAction::name(KStandardAction::SelectAll))->trigger();
 }
 
 void SourceFileWindow::editIncreaseIndent()
 {
   if (CURRENT_VIEW)
-    CURRENT_VIEW->indent();
+    CURRENT_VIEW->action("tools_indent")->trigger();
 }
 
 void SourceFileWindow::editDecreaseIndent()
 {
   if (CURRENT_VIEW)
-    CURRENT_VIEW->unIndent();
+    CURRENT_VIEW->action("tools_unindent")->trigger();
 }
 
 void SourceFileWindow::findFind()