Replace various '#define' strings - part 6

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 762dc98fa6b143629c75b3bbe277228fb04e8324)

3 files changed, 47 insertions, 47 deletions

diff --git a/karm/karm_part.cpp b/karm/karm_part.cpp
index 157222d21..8be87ef64 100644
--- a/karm/karm_part.cpp
+++ b/karm/karm_part.cpp
@@ -25,7 +25,7 @@ karmPart::karmPart( TQWidget *parentWidget, const char *widgetName,
                                   TQObject *parent, const char *name )
     : DCOPObject ( "KarmDCOPIface" ), KParts::ReadWritePart(parent, name), 
     _accel     ( new TDEAccel( parentWidget ) ),
-    _watcher   ( new TDEAccelMenuWatch( _accel, TQT_TQOBJECT(parentWidget) ) )
+    _watcher   ( new TDEAccelMenuWatch( _accel, parentWidget ) )
 {
     // we need an instance
     setInstance( karmPartFactory::instance() );
@@ -117,109 +117,109 @@ void karmPart::makeMenus()
   (void) KStdAction::print( this, TQT_SLOT( print() ), actionCollection());
   actionKeyBindings = KStdAction::keyBindings( this, TQT_SLOT( keyBindings() ),
       actionCollection() );
-  actionPreferences = KStdAction::preferences(TQT_TQOBJECT(_preferences),
+  actionPreferences = KStdAction::preferences(_preferences,
       TQT_SLOT(showDialog()),
       actionCollection() );
   (void) KStdAction::save( this, TQT_SLOT( save() ), actionCollection() );
   TDEAction* actionStartNewSession = new TDEAction( i18n("Start &New Session"),
       0,
-      TQT_TQOBJECT(this),
+      this,
       TQT_SLOT( startNewSession() ),
       actionCollection(),
       "start_new_session");
   TDEAction* actionResetAll = new TDEAction( i18n("&Reset All Times"),
       0,
-      TQT_TQOBJECT(this),
+      this,
       TQT_SLOT( resetAllTimes() ),
       actionCollection(),
       "reset_all_times");
   actionStart = new TDEAction( i18n("&Start"),
       TQString::fromLatin1("1rightarrow"), Key_S,
-      TQT_TQOBJECT(_taskView),
+      _taskView,
       TQT_SLOT( startCurrentTimer() ), actionCollection(),
       "start");
   actionStop = new TDEAction( i18n("S&top"),
       TQString::fromLatin1("process-stop"), 0,
-      TQT_TQOBJECT(_taskView),
+      _taskView,
       TQT_SLOT( stopCurrentTimer() ), actionCollection(),
       "stop");
   actionStopAll = new TDEAction( i18n("Stop &All Timers"),
       Key_Escape,
-      TQT_TQOBJECT(_taskView),
+      _taskView,
       TQT_SLOT( stopAllTimers() ), actionCollection(),
       "stopAll");
   actionStopAll->setEnabled(false);
 
   actionNew = new TDEAction( i18n("&New..."),
       TQString::fromLatin1("document-new"), CTRL+Key_N,
-      TQT_TQOBJECT(_taskView),
+      _taskView,
       TQT_SLOT( newTask() ), actionCollection(),
       "new_task");
   actionNewSub = new TDEAction( i18n("New &Subtask..."),
       TQString::fromLatin1("application-vnd.tde.tdemultiple"), CTRL+ALT+Key_N,
-      TQT_TQOBJECT(_taskView),
+      _taskView,
       TQT_SLOT( newSubTask() ), actionCollection(),
       "new_sub_task");
   actionDelete = new TDEAction( i18n("&Delete"),
       TQString::fromLatin1("edit-delete"), Key_Delete,
-      TQT_TQOBJECT(_taskView),
+      _taskView,
       TQT_SLOT( deleteTask() ), actionCollection(),
       "delete_task");
   actionEdit = new TDEAction( i18n("&Edit..."),
       TQString::fromLatin1("edit"), CTRL + Key_E,
-      TQT_TQOBJECT(_taskView),
+      _taskView,
       TQT_SLOT( editTask() ), actionCollection(),
       "edit_task");
 //  actionAddComment = new TDEAction( i18n("&Add Comment..."),
 //      TQString::fromLatin1("text-x-generic"),
 //      CTRL+ALT+Key_E,
-//      TQT_TQOBJECT(_taskView),
+//      _taskView,
 //      TQT_SLOT( addCommentToTask() ),
 //      actionCollection(),
 //      "add_comment_to_task");
   actionMarkAsComplete = new TDEAction( i18n("&Mark as Complete"),
       TQString::fromLatin1("text-x-generic"),
       CTRL+Key_M,
-      TQT_TQOBJECT(_taskView),
+      _taskView,
       TQT_SLOT( markTaskAsComplete() ),
       actionCollection(),
       "mark_as_complete");
   actionMarkAsIncomplete = new TDEAction( i18n("&Mark as Incomplete"),
       TQString::fromLatin1("text-x-generic"),
       CTRL+Key_M,
-      TQT_TQOBJECT(_taskView),
+      _taskView,
       TQT_SLOT( markTaskAsIncomplete() ),
       actionCollection(),
       "mark_as_incomplete");
   actionClipTotals = new TDEAction( i18n("&Copy Totals to Clipboard"),
       TQString::fromLatin1("klipper"),
       CTRL+Key_C,
-      TQT_TQOBJECT(_taskView),
+      _taskView,
       TQT_SLOT( clipTotals() ),
       actionCollection(),
       "clip_totals");
   actionClipHistory = new TDEAction( i18n("Copy &History to Clipboard"),
       TQString::fromLatin1("klipper"),
       CTRL+ALT+Key_C,
-      TQT_TQOBJECT(_taskView),
+      _taskView,
       TQT_SLOT( clipHistory() ),
       actionCollection(),
       "clip_history");
 
   new TDEAction( i18n("Import &Legacy Flat File..."), 0,
-      TQT_TQOBJECT(_taskView), TQT_SLOT(loadFromFlatFile()), actionCollection(),
+      _taskView, TQT_SLOT(loadFromFlatFile()), actionCollection(),
       "import_flatfile");
   new TDEAction( i18n("&Export to CSV File..."), 0,
-      TQT_TQOBJECT(_taskView), TQT_SLOT(exportcsvFile()), actionCollection(),
+      _taskView, TQT_SLOT(exportcsvFile()), actionCollection(),
       "export_csvfile");
   new TDEAction( i18n("Export &History to CSV File..."), 0,
-      TQT_TQOBJECT(this), TQT_SLOT(exportcsvHistory()), actionCollection(),
+      this, TQT_SLOT(exportcsvHistory()), actionCollection(),
       "export_csvhistory");
   new TDEAction( i18n("Import Tasks From &Planner..."), 0,
-      TQT_TQOBJECT(_taskView), TQT_SLOT(importPlanner()), actionCollection(),
+      _taskView, TQT_SLOT(importPlanner()), actionCollection(),
       "import_planner");  
   new TDEAction( i18n("Configure KArm..."), 0,
-      TQT_TQOBJECT(_preferences), TQT_SLOT(showDialog()), actionCollection(),
+      _preferences, TQT_SLOT(showDialog()), actionCollection(),
       "configure_karm");  
 
 /*
diff --git a/karm/ktimewidget.cpp b/karm/ktimewidget.cpp
index fb18e8bee..ecf632a77 100644
--- a/karm/ktimewidget.cpp
+++ b/karm/ktimewidget.cpp
@@ -17,7 +17,7 @@ class TimeValidator : public TQValidator
 {
   public:
     TimeValidator( ValidatorType tp, TQWidget *parent=0, const char *name=0)
-      : TQValidator(TQT_TQOBJECT(parent), name)
+      : TQValidator(parent, name)
     {
       _tp = tp;
     }
diff --git a/karm/mainwindow.cpp b/karm/mainwindow.cpp
index 8265db055..ff9b85159 100644
--- a/karm/mainwindow.cpp
+++ b/karm/mainwindow.cpp
@@ -38,7 +38,7 @@ MainWindow::MainWindow( const TQString &icsfile )
   : DCOPObject ( "KarmDCOPIface" ),
     KParts::MainWindow(0,TQt::WStyle_ContextHelp), 
     _accel     ( new TDEAccel( this ) ),
-    _watcher   ( new TDEAccelMenuWatch( _accel, TQT_TQOBJECT(this) ) ),
+    _watcher   ( new TDEAccelMenuWatch( _accel, this ) ),
     _totalSum  ( 0 ),
     _sessionSum( 0 )
 {
@@ -251,88 +251,88 @@ void MainWindow::makeMenus()
     *actionNew,
     *actionNewSub;
 
-  (void) KStdAction::quit(  TQT_TQOBJECT(this), TQT_SLOT( quit() ),  actionCollection());
-  (void) KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT( print() ), actionCollection());
-  actionKeyBindings = KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT( keyBindings() ),
+  (void) KStdAction::quit(  this, TQT_SLOT( quit() ),  actionCollection());
+  (void) KStdAction::print( this, TQT_SLOT( print() ), actionCollection());
+  actionKeyBindings = KStdAction::keyBindings( this, TQT_SLOT( keyBindings() ),
       actionCollection() );
-  actionPreferences = KStdAction::preferences(TQT_TQOBJECT(_preferences),
+  actionPreferences = KStdAction::preferences(_preferences,
       TQT_SLOT(showDialog()),
       actionCollection() );
-  (void) KStdAction::save( TQT_TQOBJECT(this), TQT_SLOT( save() ), actionCollection() );
+  (void) KStdAction::save( this, TQT_SLOT( save() ), actionCollection() );
   TDEAction* actionStartNewSession = new TDEAction( i18n("Start &New Session"),
       0,
-      TQT_TQOBJECT(this),
+      this,
       TQT_SLOT( startNewSession() ),
       actionCollection(),
       "start_new_session");
   TDEAction* actionResetAll = new TDEAction( i18n("&Reset All Times"),
       0,
-      TQT_TQOBJECT(this),
+      this,
       TQT_SLOT( resetAllTimes() ),
       actionCollection(),
       "reset_all_times");
   actionStart = new TDEAction( i18n("&Start"),
       TQString::fromLatin1("1rightarrow"), Key_S,
-      TQT_TQOBJECT(_taskView),
+      _taskView,
       TQT_SLOT( startCurrentTimer() ), actionCollection(),
       "start");
   actionStop = new TDEAction( i18n("S&top"),
       TQString::fromLatin1("process-stop"), Key_S,
-      TQT_TQOBJECT(_taskView),
+      _taskView,
       TQT_SLOT( stopCurrentTimer() ), actionCollection(),
       "stop");
   actionStopAll = new TDEAction( i18n("Stop &All Timers"),
       Key_Escape,
-      TQT_TQOBJECT(_taskView),
+      _taskView,
       TQT_SLOT( stopAllTimers() ), actionCollection(),
       "stopAll");
   actionStopAll->setEnabled(false);
 
   actionNew = new TDEAction( i18n("&New..."),
       TQString::fromLatin1("document-new"), CTRL+Key_N,
-      TQT_TQOBJECT(_taskView),
+      _taskView,
       TQT_SLOT( newTask() ), actionCollection(),
       "new_task");
   actionNewSub = new TDEAction( i18n("New &Subtask..."),
       TQString::fromLatin1("application-vnd.tde.tdemultiple"), CTRL+ALT+Key_N,
-      TQT_TQOBJECT(_taskView),
+      _taskView,
       TQT_SLOT( newSubTask() ), actionCollection(),
       "new_sub_task");
   actionDelete = new TDEAction( i18n("&Delete"),
       TQString::fromLatin1("edit-delete"), Key_Delete,
-      TQT_TQOBJECT(_taskView),
+      _taskView,
       TQT_SLOT( deleteTask() ), actionCollection(),
       "delete_task");
   actionEdit = new TDEAction( i18n("&Edit..."),
       TQString::fromLatin1("edit"), CTRL + Key_E,
-      TQT_TQOBJECT(_taskView),
+      _taskView,
       TQT_SLOT( editTask() ), actionCollection(),
       "edit_task");
 //  actionAddComment = new TDEAction( i18n("&Add Comment..."),
 //      TQString::fromLatin1("text-x-generic"),
 //      CTRL+ALT+Key_E,
-//      TQT_TQOBJECT(_taskView),
+//      _taskView,
 //      TQT_SLOT( addCommentToTask() ),
 //      actionCollection(),
 //      "add_comment_to_task");
   actionMarkAsComplete = new TDEAction( i18n("&Mark as Complete"),
       TQString::fromLatin1("text-x-generic"),
       CTRL+Key_M,
-      TQT_TQOBJECT(_taskView),
+      _taskView,
       TQT_SLOT( markTaskAsComplete() ),
       actionCollection(),
       "mark_as_complete");
   actionMarkAsIncomplete = new TDEAction( i18n("&Mark as Incomplete"),
       TQString::fromLatin1("text-x-generic"),
       CTRL+Key_M,
-      TQT_TQOBJECT(_taskView),
+      _taskView,
       TQT_SLOT( markTaskAsIncomplete() ),
       actionCollection(),
       "mark_as_incomplete");
   actionClipTotals = new TDEAction( i18n("&Copy Totals to Clipboard"),
       TQString::fromLatin1("klipper"),
       CTRL+Key_C,
-      TQT_TQOBJECT(_taskView),
+      _taskView,
       TQT_SLOT( clipTotals() ),
       actionCollection(),
       "clip_totals");
@@ -340,29 +340,29 @@ void MainWindow::makeMenus()
   actionClipTotals = new TDEAction( i18n("&Copy Session Time to Clipboard"),
       TQString::fromLatin1("klipper"),
       0,
-      TQT_TQOBJECT(_taskView),
+      _taskView,
       TQT_SLOT( clipSession() ),
       actionCollection(),
       "clip_session");
   actionClipHistory = new TDEAction( i18n("Copy &History to Clipboard"),
       TQString::fromLatin1("klipper"),
       CTRL+ALT+Key_C,
-      TQT_TQOBJECT(_taskView),
+      _taskView,
       TQT_SLOT( clipHistory() ),
       actionCollection(),
       "clip_history");
 
   new TDEAction( i18n("Import &Legacy Flat File..."), 0,
-      TQT_TQOBJECT(_taskView), TQT_SLOT(loadFromFlatFile()), actionCollection(),
+      _taskView, TQT_SLOT(loadFromFlatFile()), actionCollection(),
       "import_flatfile");
   new TDEAction( i18n("&Export to CSV File..."), 0,
-      TQT_TQOBJECT(_taskView), TQT_SLOT(exportcsvFile()), actionCollection(),
+      _taskView, TQT_SLOT(exportcsvFile()), actionCollection(),
       "export_csvfile");
   new TDEAction( i18n("Export &History to CSV File..."), 0,
-      TQT_TQOBJECT(this), TQT_SLOT(exportcsvHistory()), actionCollection(),
+      this, TQT_SLOT(exportcsvHistory()), actionCollection(),
       "export_csvhistory");
   new TDEAction( i18n("Import Tasks From &Planner..."), 0,
-      TQT_TQOBJECT(_taskView), TQT_SLOT(importPlanner()), actionCollection(),
+      _taskView, TQT_SLOT(importPlanner()), actionCollection(),
       "import_planner");  
 
 /*