Rename a number of classes to enhance compatibility with KDE4

1 files changed, 24 insertions, 24 deletions

diff --git a/karm/mainwindow.cpp b/karm/mainwindow.cpp
index dc9b3344a..6bfbcc32c 100644
--- a/karm/mainwindow.cpp
+++ b/karm/mainwindow.cpp
@@ -37,8 +37,8 @@
 MainWindow::MainWindow( const TQString &icsfile )
   : DCOPObject ( "KarmDCOPIface" ),
     KParts::MainWindow(0,TQt::WStyle_ContextHelp), 
-    _accel     ( new KAccel( this ) ),
-    _watcher   ( new KAccelMenuWatch( _accel, TQT_TQOBJECT(this) ) ),
+    _accel     ( new TDEAccel( this ) ),
+    _watcher   ( new TDEAccelMenuWatch( _accel, TQT_TQOBJECT(this) ) ),
     _totalSum  ( 0 ),
     _sessionSum( 0 )
 {
@@ -246,7 +246,7 @@ void MainWindow::resetAllTimes()
 
 void MainWindow::makeMenus()
 {
-  KAction
+  TDEAction
     *actionKeyBindings,
     *actionNew,
     *actionNewSub;
@@ -259,77 +259,77 @@ void MainWindow::makeMenus()
       TQT_SLOT(showDialog()),
       actionCollection() );
   (void) KStdAction::save( TQT_TQOBJECT(this), TQT_SLOT( save() ), actionCollection() );
-  KAction* actionStartNewSession = new KAction( i18n("Start &New Session"),
+  TDEAction* actionStartNewSession = new TDEAction( i18n("Start &New Session"),
       0,
       TQT_TQOBJECT(this),
       TQT_SLOT( startNewSession() ),
       actionCollection(),
       "start_new_session");
-  KAction* actionResetAll = new KAction( i18n("&Reset All Times"),
+  TDEAction* actionResetAll = new TDEAction( i18n("&Reset All Times"),
       0,
       TQT_TQOBJECT(this),
       TQT_SLOT( resetAllTimes() ),
       actionCollection(),
       "reset_all_times");
-  actionStart = new KAction( i18n("&Start"),
+  actionStart = new TDEAction( i18n("&Start"),
       TQString::fromLatin1("1rightarrow"), Key_S,
       TQT_TQOBJECT(_taskView),
       TQT_SLOT( startCurrentTimer() ), actionCollection(),
       "start");
-  actionStop = new KAction( i18n("S&top"),
+  actionStop = new TDEAction( i18n("S&top"),
       TQString::fromLatin1("stop"), Key_S,
       TQT_TQOBJECT(_taskView),
       TQT_SLOT( stopCurrentTimer() ), actionCollection(),
       "stop");
-  actionStopAll = new KAction( i18n("Stop &All Timers"),
+  actionStopAll = new TDEAction( i18n("Stop &All Timers"),
       Key_Escape,
       TQT_TQOBJECT(_taskView),
       TQT_SLOT( stopAllTimers() ), actionCollection(),
       "stopAll");
   actionStopAll->setEnabled(false);
 
-  actionNew = new KAction( i18n("&New..."),
+  actionNew = new TDEAction( i18n("&New..."),
       TQString::fromLatin1("filenew"), CTRL+Key_N,
       TQT_TQOBJECT(_taskView),
       TQT_SLOT( newTask() ), actionCollection(),
       "new_task");
-  actionNewSub = new KAction( i18n("New &Subtask..."),
+  actionNewSub = new TDEAction( i18n("New &Subtask..."),
       TQString::fromLatin1("tdemultiple"), CTRL+ALT+Key_N,
       TQT_TQOBJECT(_taskView),
       TQT_SLOT( newSubTask() ), actionCollection(),
       "new_sub_task");
-  actionDelete = new KAction( i18n("&Delete"),
+  actionDelete = new TDEAction( i18n("&Delete"),
       TQString::fromLatin1("editdelete"), Key_Delete,
       TQT_TQOBJECT(_taskView),
       TQT_SLOT( deleteTask() ), actionCollection(),
       "delete_task");
-  actionEdit = new KAction( i18n("&Edit..."),
+  actionEdit = new TDEAction( i18n("&Edit..."),
       TQString::fromLatin1("edit"), CTRL + Key_E,
       TQT_TQOBJECT(_taskView),
       TQT_SLOT( editTask() ), actionCollection(),
       "edit_task");
-//  actionAddComment = new KAction( i18n("&Add Comment..."),
+//  actionAddComment = new TDEAction( i18n("&Add Comment..."),
 //      TQString::fromLatin1("document"),
 //      CTRL+ALT+Key_E,
 //      TQT_TQOBJECT(_taskView),
 //      TQT_SLOT( addCommentToTask() ),
 //      actionCollection(),
 //      "add_comment_to_task");
-  actionMarkAsComplete = new KAction( i18n("&Mark as Complete"),
+  actionMarkAsComplete = new TDEAction( i18n("&Mark as Complete"),
       TQString::fromLatin1("document"),
       CTRL+Key_M,
       TQT_TQOBJECT(_taskView),
       TQT_SLOT( markTaskAsComplete() ),
       actionCollection(),
       "mark_as_complete");
-  actionMarkAsIncomplete = new KAction( i18n("&Mark as Incomplete"),
+  actionMarkAsIncomplete = new TDEAction( i18n("&Mark as Incomplete"),
       TQString::fromLatin1("document"),
       CTRL+Key_M,
       TQT_TQOBJECT(_taskView),
       TQT_SLOT( markTaskAsIncomplete() ),
       actionCollection(),
       "mark_as_incomplete");
-  actionClipTotals = new KAction( i18n("&Copy Totals to Clipboard"),
+  actionClipTotals = new TDEAction( i18n("&Copy Totals to Clipboard"),
       TQString::fromLatin1("klipper"),
       CTRL+Key_C,
       TQT_TQOBJECT(_taskView),
@@ -337,14 +337,14 @@ void MainWindow::makeMenus()
       actionCollection(),
       "clip_totals");
   // actionClipTotals will never be used again, overwrite it
-  actionClipTotals = new KAction( i18n("&Copy Session Time to Clipboard"),
+  actionClipTotals = new TDEAction( i18n("&Copy Session Time to Clipboard"),
       TQString::fromLatin1("klipper"),
       0,
       TQT_TQOBJECT(_taskView),
       TQT_SLOT( clipSession() ),
       actionCollection(),
       "clip_session");
-  actionClipHistory = new KAction( i18n("Copy &History to Clipboard"),
+  actionClipHistory = new TDEAction( i18n("Copy &History to Clipboard"),
       TQString::fromLatin1("klipper"),
       CTRL+ALT+Key_C,
       TQT_TQOBJECT(_taskView),
@@ -352,21 +352,21 @@ void MainWindow::makeMenus()
       actionCollection(),
       "clip_history");
 
-  new KAction( i18n("Import &Legacy Flat File..."), 0,
+  new TDEAction( i18n("Import &Legacy Flat File..."), 0,
       TQT_TQOBJECT(_taskView), TQT_SLOT(loadFromFlatFile()), actionCollection(),
       "import_flatfile");
-  new KAction( i18n("&Export to CSV File..."), 0,
+  new TDEAction( i18n("&Export to CSV File..."), 0,
       TQT_TQOBJECT(_taskView), TQT_SLOT(exportcsvFile()), actionCollection(),
       "export_csvfile");
-  new KAction( i18n("Export &History to CSV File..."), 0,
+  new TDEAction( i18n("Export &History to CSV File..."), 0,
       TQT_TQOBJECT(this), TQT_SLOT(exportcsvHistory()), actionCollection(),
       "export_csvhistory");
-  new KAction( i18n("Import Tasks From &Planner..."), 0,
+  new TDEAction( i18n("Import Tasks From &Planner..."), 0,
       TQT_TQOBJECT(_taskView), TQT_SLOT(importPlanner()), actionCollection(),
       "import_planner");  
 
 /*
-  new KAction( i18n("Import E&vents"), 0,
+  new TDEAction( i18n("Import E&vents"), 0,
                             _taskView,
                             TQT_SLOT( loadFromKOrgEvents() ), actionCollection(),
                             "import_korg_events");
@@ -467,7 +467,7 @@ bool MainWindow::queryClose()
     hide();
     return false;
   }
-  return KMainWindow::queryClose();
+  return TDEMainWindow::queryClose();
 }
 
 void MainWindow::contextMenuRequest( TQListViewItem*, const TQPoint& point, int )