Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

12 files changed, 144 insertions, 144 deletions

diff --git a/karm/desktoptracker.cpp b/karm/desktoptracker.cpp
index 06216570..cf41d5b3 100644
--- a/karm/desktoptracker.cpp
+++ b/karm/desktoptracker.cpp
@@ -11,8 +11,8 @@ const int minimumInterval = 5;  // seconds
 DesktopTracker::DesktopTracker ()
 {
   // Setup desktop change handling
-  connect( &kWinModule, TQT_SIGNAL( currentDesktopChanged(int) ),
-           this, TQT_SLOT( handleDesktopChange(int) ));
+  connect( &kWinModule, TQ_SIGNAL( currentDesktopChanged(int) ),
+           this, TQ_SLOT( handleDesktopChange(int) ));
 
   _desktopCount = kWinModule.numberOfDesktops();
   _previousDesktop = kWinModule.currentDesktop()-1;
@@ -21,7 +21,7 @@ DesktopTracker::DesktopTracker ()
   if( _previousDesktop < 0 ) _previousDesktop = 0;
 
   _timer = new TQTimer(this);
-  connect( _timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( changeTimers() ) );
+  connect( _timer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( changeTimers() ) );
 }
 
 void DesktopTracker::handleDesktopChange( int desktop )
diff --git a/karm/edittaskdialog.cpp b/karm/edittaskdialog.cpp
index d63a339a..37d215d5 100644
--- a/karm/edittaskdialog.cpp
+++ b/karm/edittaskdialog.cpp
@@ -72,7 +72,7 @@ EditTaskDialog::EditTaskDialog( TQString caption, bool editDlg,
   _absoluteRB = new TQRadioButton( i18n( "Edit &absolute" ), page,
                                   "_absoluteRB" );
   lay1->addWidget( _absoluteRB );
-  connect( _absoluteRB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAbsolutePressed() ) );
+  connect( _absoluteRB, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAbsolutePressed() ) );
   
 
   // Absolute times
@@ -124,7 +124,7 @@ EditTaskDialog::EditTaskDialog( TQString caption, bool editDlg,
   _relativeRB = new TQRadioButton( i18n( "Edit &relative (apply to both time and"
                                         " session time)" ), page, "_relativeRB" );
   lay1->addWidget( _relativeRB );
-  connect( _relativeRB, TQT_SIGNAL( clicked() ), this, TQT_SLOT(slotRelativePressed()) );
+  connect( _relativeRB, TQ_SIGNAL( clicked() ), this, TQ_SLOT(slotRelativePressed()) );
   
   // The relative times
   TQHBoxLayout *lay4 = new TQHBoxLayout();
@@ -207,7 +207,7 @@ EditTaskDialog::EditTaskDialog( TQString caption, bool editDlg,
   for (int i=0; i<desktopCount; i++)
     _deskBox[i]->setEnabled(enableDesktops);
   
-  connect(_desktopCB, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAutoTrackingPressed()));
+  connect(_desktopCB, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAutoTrackingPressed()));
 
   lay1->addStretch(1);
 
diff --git a/karm/idletimedetector.cpp b/karm/idletimedetector.cpp
index 110eacd0..bf4092f5 100644
--- a/karm/idletimedetector.cpp
+++ b/karm/idletimedetector.cpp
@@ -27,7 +27,7 @@ IdleTimeDetector::IdleTimeDetector(int maxIdle)
   }
 
   _timer = new TQTimer(this);
-  connect(_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(check()));
+  connect(_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(check()));
 #else
   _idleDetectionPossible = false;
 #endif // HAVE_LIBXSS
diff --git a/karm/karm_part.cpp b/karm/karm_part.cpp
index 8be87ef6..25531967 100644
--- a/karm/karm_part.cpp
+++ b/karm/karm_part.cpp
@@ -40,9 +40,9 @@ karmPart::karmPart( TQWidget *parentWidget, const char *widgetName,
     setWidget(_taskView);
 
     // create our actions
-    KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection());
-    KStdAction::saveAs(this, TQT_SLOT(fileSaveAs()), actionCollection());
-    KStdAction::save(this, TQT_SLOT(save()), actionCollection());
+    KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection());
+    KStdAction::saveAs(this, TQ_SLOT(fileSaveAs()), actionCollection());
+    KStdAction::save(this, TQ_SLOT(save()), actionCollection());
 
     makeMenus();
 
@@ -50,29 +50,29 @@ karmPart::karmPart( TQWidget *parentWidget, const char *widgetName,
 
   // connections
 
-  connect( _taskView, TQT_SIGNAL( totalTimesChanged( long, long ) ),
-           this, TQT_SLOT( updateTime( long, long ) ) );
-  connect( _taskView, TQT_SIGNAL( selectionChanged ( TQListViewItem * )),
-           this, TQT_SLOT(slotSelectionChanged()));
-  connect( _taskView, TQT_SIGNAL( updateButtons() ),
-           this, TQT_SLOT(slotSelectionChanged()));
+  connect( _taskView, TQ_SIGNAL( totalTimesChanged( long, long ) ),
+           this, TQ_SLOT( updateTime( long, long ) ) );
+  connect( _taskView, TQ_SIGNAL( selectionChanged ( TQListViewItem * )),
+           this, TQ_SLOT(slotSelectionChanged()));
+  connect( _taskView, TQ_SIGNAL( updateButtons() ),
+           this, TQ_SLOT(slotSelectionChanged()));
 
   // Setup context menu request handling
   connect( _taskView,
-           TQT_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint&, int )),
+           TQ_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint&, int )),
            this,
-           TQT_SLOT( contextMenuRequest( TQListViewItem*, const TQPoint&, int )));
+           TQ_SLOT( contextMenuRequest( TQListViewItem*, const TQPoint&, int )));
 
   _tray = new KarmTray( this );
 
-  connect( _tray, TQT_SIGNAL( quitSelected() ), TQT_SLOT( quit() ) );
+  connect( _tray, TQ_SIGNAL( quitSelected() ), TQ_SLOT( quit() ) );
 
-  connect( _taskView, TQT_SIGNAL( timersActive() ), _tray, TQT_SLOT( startClock() ) );
-  connect( _taskView, TQT_SIGNAL( timersActive() ), this,  TQT_SLOT( enableStopAll() ));
-  connect( _taskView, TQT_SIGNAL( timersInactive() ), _tray, TQT_SLOT( stopClock() ) );
-  connect( _taskView, TQT_SIGNAL( timersInactive() ),  this,  TQT_SLOT( disableStopAll()));
-  connect( _taskView, TQT_SIGNAL( tasksChanged( TQPtrList<Task> ) ),
-                      _tray, TQT_SLOT( updateToolTip( TQPtrList<Task> ) ));
+  connect( _taskView, TQ_SIGNAL( timersActive() ), _tray, TQ_SLOT( startClock() ) );
+  connect( _taskView, TQ_SIGNAL( timersActive() ), this,  TQ_SLOT( enableStopAll() ));
+  connect( _taskView, TQ_SIGNAL( timersInactive() ), _tray, TQ_SLOT( stopClock() ) );
+  connect( _taskView, TQ_SIGNAL( timersInactive() ),  this,  TQ_SLOT( disableStopAll()));
+  connect( _taskView, TQ_SIGNAL( tasksChanged( TQPtrList<Task> ) ),
+                      _tray, TQ_SLOT( updateToolTip( TQPtrList<Task> ) ));
 
   _taskView->load();
 
@@ -113,119 +113,119 @@ void karmPart::makeMenus()
     *actionNew,
     *actionNewSub;
 
-  (void) KStdAction::quit(  this, TQT_SLOT( quit() ),  actionCollection());
-  (void) KStdAction::print( this, TQT_SLOT( print() ), actionCollection());
-  actionKeyBindings = KStdAction::keyBindings( this, TQT_SLOT( keyBindings() ),
+  (void) KStdAction::quit(  this, TQ_SLOT( quit() ),  actionCollection());
+  (void) KStdAction::print( this, TQ_SLOT( print() ), actionCollection());
+  actionKeyBindings = KStdAction::keyBindings( this, TQ_SLOT( keyBindings() ),
       actionCollection() );
   actionPreferences = KStdAction::preferences(_preferences,
-      TQT_SLOT(showDialog()),
+      TQ_SLOT(showDialog()),
       actionCollection() );
-  (void) KStdAction::save( this, TQT_SLOT( save() ), actionCollection() );
+  (void) KStdAction::save( this, TQ_SLOT( save() ), actionCollection() );
   TDEAction* actionStartNewSession = new TDEAction( i18n("Start &New Session"),
       0,
       this,
-      TQT_SLOT( startNewSession() ),
+      TQ_SLOT( startNewSession() ),
       actionCollection(),
       "start_new_session");
   TDEAction* actionResetAll = new TDEAction( i18n("&Reset All Times"),
       0,
       this,
-      TQT_SLOT( resetAllTimes() ),
+      TQ_SLOT( resetAllTimes() ),
       actionCollection(),
       "reset_all_times");
   actionStart = new TDEAction( i18n("&Start"),
       TQString::fromLatin1("1rightarrow"), Key_S,
       _taskView,
-      TQT_SLOT( startCurrentTimer() ), actionCollection(),
+      TQ_SLOT( startCurrentTimer() ), actionCollection(),
       "start");
   actionStop = new TDEAction( i18n("S&top"),
       TQString::fromLatin1("process-stop"), 0,
       _taskView,
-      TQT_SLOT( stopCurrentTimer() ), actionCollection(),
+      TQ_SLOT( stopCurrentTimer() ), actionCollection(),
       "stop");
   actionStopAll = new TDEAction( i18n("Stop &All Timers"),
       Key_Escape,
       _taskView,
-      TQT_SLOT( stopAllTimers() ), actionCollection(),
+      TQ_SLOT( stopAllTimers() ), actionCollection(),
       "stopAll");
   actionStopAll->setEnabled(false);
 
   actionNew = new TDEAction( i18n("&New..."),
       TQString::fromLatin1("document-new"), CTRL+Key_N,
       _taskView,
-      TQT_SLOT( newTask() ), actionCollection(),
+      TQ_SLOT( newTask() ), actionCollection(),
       "new_task");
   actionNewSub = new TDEAction( i18n("New &Subtask..."),
       TQString::fromLatin1("application-vnd.tde.tdemultiple"), CTRL+ALT+Key_N,
       _taskView,
-      TQT_SLOT( newSubTask() ), actionCollection(),
+      TQ_SLOT( newSubTask() ), actionCollection(),
       "new_sub_task");
   actionDelete = new TDEAction( i18n("&Delete"),
       TQString::fromLatin1("edit-delete"), Key_Delete,
       _taskView,
-      TQT_SLOT( deleteTask() ), actionCollection(),
+      TQ_SLOT( deleteTask() ), actionCollection(),
       "delete_task");
   actionEdit = new TDEAction( i18n("&Edit..."),
       TQString::fromLatin1("edit"), CTRL + Key_E,
       _taskView,
-      TQT_SLOT( editTask() ), actionCollection(),
+      TQ_SLOT( editTask() ), actionCollection(),
       "edit_task");
 //  actionAddComment = new TDEAction( i18n("&Add Comment..."),
 //      TQString::fromLatin1("text-x-generic"),
 //      CTRL+ALT+Key_E,
 //      _taskView,
-//      TQT_SLOT( addCommentToTask() ),
+//      TQ_SLOT( addCommentToTask() ),
 //      actionCollection(),
 //      "add_comment_to_task");
   actionMarkAsComplete = new TDEAction( i18n("&Mark as Complete"),
       TQString::fromLatin1("text-x-generic"),
       CTRL+Key_M,
       _taskView,
-      TQT_SLOT( markTaskAsComplete() ),
+      TQ_SLOT( markTaskAsComplete() ),
       actionCollection(),
       "mark_as_complete");
   actionMarkAsIncomplete = new TDEAction( i18n("&Mark as Incomplete"),
       TQString::fromLatin1("text-x-generic"),
       CTRL+Key_M,
       _taskView,
-      TQT_SLOT( markTaskAsIncomplete() ),
+      TQ_SLOT( markTaskAsIncomplete() ),
       actionCollection(),
       "mark_as_incomplete");
   actionClipTotals = new TDEAction( i18n("&Copy Totals to Clipboard"),
       TQString::fromLatin1("klipper"),
       CTRL+Key_C,
       _taskView,
-      TQT_SLOT( clipTotals() ),
+      TQ_SLOT( clipTotals() ),
       actionCollection(),
       "clip_totals");
   actionClipHistory = new TDEAction( i18n("Copy &History to Clipboard"),
       TQString::fromLatin1("klipper"),
       CTRL+ALT+Key_C,
       _taskView,
-      TQT_SLOT( clipHistory() ),
+      TQ_SLOT( clipHistory() ),
       actionCollection(),
       "clip_history");
 
   new TDEAction( i18n("Import &Legacy Flat File..."), 0,
-      _taskView, TQT_SLOT(loadFromFlatFile()), actionCollection(),
+      _taskView, TQ_SLOT(loadFromFlatFile()), actionCollection(),
       "import_flatfile");
   new TDEAction( i18n("&Export to CSV File..."), 0,
-      _taskView, TQT_SLOT(exportcsvFile()), actionCollection(),
+      _taskView, TQ_SLOT(exportcsvFile()), actionCollection(),
       "export_csvfile");
   new TDEAction( i18n("Export &History to CSV File..."), 0,
-      this, TQT_SLOT(exportcsvHistory()), actionCollection(),
+      this, TQ_SLOT(exportcsvHistory()), actionCollection(),
       "export_csvhistory");
   new TDEAction( i18n("Import Tasks From &Planner..."), 0,
-      _taskView, TQT_SLOT(importPlanner()), actionCollection(),
+      _taskView, TQ_SLOT(importPlanner()), actionCollection(),
       "import_planner");  
   new TDEAction( i18n("Configure KArm..."), 0,
-      _preferences, TQT_SLOT(showDialog()), actionCollection(),
+      _preferences, TQ_SLOT(showDialog()), actionCollection(),
       "configure_karm");  
 
 /*
   new TDEAction( i18n("Import E&vents"), 0,
                             _taskView,
-                            TQT_SLOT( loadFromKOrgEvents() ), actionCollection(),
+                            TQ_SLOT( loadFromKOrgEvents() ), actionCollection(),
                             "import_korg_events");
   */
 
@@ -287,12 +287,12 @@ void karmPart::setReadWrite(bool rw)
 {
     // notify your internal widget of the read-write state
     if (rw)
-        connect(_taskView, TQT_SIGNAL(textChanged()),
-                this,     TQT_SLOT(setModified()));
+        connect(_taskView, TQ_SIGNAL(textChanged()),
+                this,     TQ_SLOT(setModified()));
     else
     {
-        disconnect(_taskView, TQT_SIGNAL(textChanged()),
-                   this,     TQT_SLOT(setModified()));
+        disconnect(_taskView, TQ_SIGNAL(textChanged()),
+                   this,     TQ_SLOT(setModified()));
     }
 
     ReadWritePart::setReadWrite(rw);
diff --git a/karm/karmstorage.cpp b/karm/karmstorage.cpp
index 1992c0f8..92f69ff6 100644
--- a/karm/karmstorage.cpp
+++ b/karm/karmstorage.cpp
@@ -132,8 +132,8 @@ TQString KarmStorage::load (TaskView* view, const Preferences* preferences, TQSt
   }
   _calendar = resource;
 
-  TQObject::connect (_calendar, TQT_SIGNAL(resourceChanged(ResourceCalendar *)),
-  	            view, TQT_SLOT(iCalFileModified(ResourceCalendar *)));
+  TQObject::connect (_calendar, TQ_SIGNAL(resourceChanged(ResourceCalendar *)),
+  	            view, TQ_SLOT(iCalFileModified(ResourceCalendar *)));
   _calendar->setTimeZoneId( KPimPrefs::timezone() );
   _calendar->setResourceName( TQString::fromLatin1("KArm") );
   _calendar->open();
diff --git a/karm/mainwindow.cpp b/karm/mainwindow.cpp
index ff9b8515..6edc6b2d 100644
--- a/karm/mainwindow.cpp
+++ b/karm/mainwindow.cpp
@@ -57,33 +57,33 @@ MainWindow::MainWindow( const TQString &icsfile )
   _watcher->updateMenus();
 
   // connections
-  connect( _taskView, TQT_SIGNAL( totalTimesChanged( long, long ) ),
-           this, TQT_SLOT( updateTime( long, long ) ) );
-  connect( _taskView, TQT_SIGNAL( selectionChanged ( TQListViewItem * )),
-           this, TQT_SLOT(slotSelectionChanged()));
-  connect( _taskView, TQT_SIGNAL( updateButtons() ),
-           this, TQT_SLOT(slotSelectionChanged()));
-  connect( _taskView, TQT_SIGNAL( setStatusBar( TQString ) ),
-           this, TQT_SLOT(setStatusBar( TQString )));
+  connect( _taskView, TQ_SIGNAL( totalTimesChanged( long, long ) ),
+           this, TQ_SLOT( updateTime( long, long ) ) );
+  connect( _taskView, TQ_SIGNAL( selectionChanged ( TQListViewItem * )),
+           this, TQ_SLOT(slotSelectionChanged()));
+  connect( _taskView, TQ_SIGNAL( updateButtons() ),
+           this, TQ_SLOT(slotSelectionChanged()));
+  connect( _taskView, TQ_SIGNAL( setStatusBar( TQString ) ),
+           this, TQ_SLOT(setStatusBar( TQString )));
 
   loadGeometry();
 
   // Setup context menu request handling
   connect( _taskView,
-           TQT_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint&, int )),
+           TQ_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint&, int )),
            this,
-           TQT_SLOT( contextMenuRequest( TQListViewItem*, const TQPoint&, int )));
+           TQ_SLOT( contextMenuRequest( TQListViewItem*, const TQPoint&, int )));
 
   _tray = new KarmTray( this );
 
-  connect( _tray, TQT_SIGNAL( quitSelected() ), TQT_SLOT( quit() ) );
+  connect( _tray, TQ_SIGNAL( quitSelected() ), TQ_SLOT( quit() ) );
 
-  connect( _taskView, TQT_SIGNAL( timersActive() ), _tray, TQT_SLOT( startClock() ) );
-  connect( _taskView, TQT_SIGNAL( timersActive() ), this,  TQT_SLOT( enableStopAll() ));
-  connect( _taskView, TQT_SIGNAL( timersInactive() ), _tray, TQT_SLOT( stopClock() ) );
-  connect( _taskView, TQT_SIGNAL( timersInactive() ),  this,  TQT_SLOT( disableStopAll()));
-  connect( _taskView, TQT_SIGNAL( tasksChanged( TQPtrList<Task> ) ),
-                      _tray, TQT_SLOT( updateToolTip( TQPtrList<Task> ) ));
+  connect( _taskView, TQ_SIGNAL( timersActive() ), _tray, TQ_SLOT( startClock() ) );
+  connect( _taskView, TQ_SIGNAL( timersActive() ), this,  TQ_SLOT( enableStopAll() ));
+  connect( _taskView, TQ_SIGNAL( timersInactive() ), _tray, TQ_SLOT( stopClock() ) );
+  connect( _taskView, TQ_SIGNAL( timersInactive() ),  this,  TQ_SLOT( disableStopAll()));
+  connect( _taskView, TQ_SIGNAL( tasksChanged( TQPtrList<Task> ) ),
+                      _tray, TQ_SLOT( updateToolTip( TQPtrList<Task> ) ));
 
   _taskView->load();
 
@@ -251,89 +251,89 @@ void MainWindow::makeMenus()
     *actionNew,
     *actionNewSub;
 
-  (void) KStdAction::quit(  this, TQT_SLOT( quit() ),  actionCollection());
-  (void) KStdAction::print( this, TQT_SLOT( print() ), actionCollection());
-  actionKeyBindings = KStdAction::keyBindings( this, TQT_SLOT( keyBindings() ),
+  (void) KStdAction::quit(  this, TQ_SLOT( quit() ),  actionCollection());
+  (void) KStdAction::print( this, TQ_SLOT( print() ), actionCollection());
+  actionKeyBindings = KStdAction::keyBindings( this, TQ_SLOT( keyBindings() ),
       actionCollection() );
   actionPreferences = KStdAction::preferences(_preferences,
-      TQT_SLOT(showDialog()),
+      TQ_SLOT(showDialog()),
       actionCollection() );
-  (void) KStdAction::save( this, TQT_SLOT( save() ), actionCollection() );
+  (void) KStdAction::save( this, TQ_SLOT( save() ), actionCollection() );
   TDEAction* actionStartNewSession = new TDEAction( i18n("Start &New Session"),
       0,
       this,
-      TQT_SLOT( startNewSession() ),
+      TQ_SLOT( startNewSession() ),
       actionCollection(),
       "start_new_session");
   TDEAction* actionResetAll = new TDEAction( i18n("&Reset All Times"),
       0,
       this,
-      TQT_SLOT( resetAllTimes() ),
+      TQ_SLOT( resetAllTimes() ),
       actionCollection(),
       "reset_all_times");
   actionStart = new TDEAction( i18n("&Start"),
       TQString::fromLatin1("1rightarrow"), Key_S,
       _taskView,
-      TQT_SLOT( startCurrentTimer() ), actionCollection(),
+      TQ_SLOT( startCurrentTimer() ), actionCollection(),
       "start");
   actionStop = new TDEAction( i18n("S&top"),
       TQString::fromLatin1("process-stop"), Key_S,
       _taskView,
-      TQT_SLOT( stopCurrentTimer() ), actionCollection(),
+      TQ_SLOT( stopCurrentTimer() ), actionCollection(),
       "stop");
   actionStopAll = new TDEAction( i18n("Stop &All Timers"),
       Key_Escape,
       _taskView,
-      TQT_SLOT( stopAllTimers() ), actionCollection(),
+      TQ_SLOT( stopAllTimers() ), actionCollection(),
       "stopAll");
   actionStopAll->setEnabled(false);
 
   actionNew = new TDEAction( i18n("&New..."),
       TQString::fromLatin1("document-new"), CTRL+Key_N,
       _taskView,
-      TQT_SLOT( newTask() ), actionCollection(),
+      TQ_SLOT( newTask() ), actionCollection(),
       "new_task");
   actionNewSub = new TDEAction( i18n("New &Subtask..."),
       TQString::fromLatin1("application-vnd.tde.tdemultiple"), CTRL+ALT+Key_N,
       _taskView,
-      TQT_SLOT( newSubTask() ), actionCollection(),
+      TQ_SLOT( newSubTask() ), actionCollection(),
       "new_sub_task");
   actionDelete = new TDEAction( i18n("&Delete"),
       TQString::fromLatin1("edit-delete"), Key_Delete,
       _taskView,
-      TQT_SLOT( deleteTask() ), actionCollection(),
+      TQ_SLOT( deleteTask() ), actionCollection(),
       "delete_task");
   actionEdit = new TDEAction( i18n("&Edit..."),
       TQString::fromLatin1("edit"), CTRL + Key_E,
       _taskView,
-      TQT_SLOT( editTask() ), actionCollection(),
+      TQ_SLOT( editTask() ), actionCollection(),
       "edit_task");
 //  actionAddComment = new TDEAction( i18n("&Add Comment..."),
 //      TQString::fromLatin1("text-x-generic"),
 //      CTRL+ALT+Key_E,
 //      _taskView,
-//      TQT_SLOT( addCommentToTask() ),
+//      TQ_SLOT( addCommentToTask() ),
 //      actionCollection(),
 //      "add_comment_to_task");
   actionMarkAsComplete = new TDEAction( i18n("&Mark as Complete"),
       TQString::fromLatin1("text-x-generic"),
       CTRL+Key_M,
       _taskView,
-      TQT_SLOT( markTaskAsComplete() ),
+      TQ_SLOT( markTaskAsComplete() ),
       actionCollection(),
       "mark_as_complete");
   actionMarkAsIncomplete = new TDEAction( i18n("&Mark as Incomplete"),
       TQString::fromLatin1("text-x-generic"),
       CTRL+Key_M,
       _taskView,
-      TQT_SLOT( markTaskAsIncomplete() ),
+      TQ_SLOT( markTaskAsIncomplete() ),
       actionCollection(),
       "mark_as_incomplete");
   actionClipTotals = new TDEAction( i18n("&Copy Totals to Clipboard"),
       TQString::fromLatin1("klipper"),
       CTRL+Key_C,
       _taskView,
-      TQT_SLOT( clipTotals() ),
+      TQ_SLOT( clipTotals() ),
       actionCollection(),
       "clip_totals");
   // actionClipTotals will never be used again, overwrite it
@@ -341,34 +341,34 @@ void MainWindow::makeMenus()
       TQString::fromLatin1("klipper"),
       0,
       _taskView,
-      TQT_SLOT( clipSession() ),
+      TQ_SLOT( clipSession() ),
       actionCollection(),
       "clip_session");
   actionClipHistory = new TDEAction( i18n("Copy &History to Clipboard"),
       TQString::fromLatin1("klipper"),
       CTRL+ALT+Key_C,
       _taskView,
-      TQT_SLOT( clipHistory() ),
+      TQ_SLOT( clipHistory() ),
       actionCollection(),
       "clip_history");
 
   new TDEAction( i18n("Import &Legacy Flat File..."), 0,
-      _taskView, TQT_SLOT(loadFromFlatFile()), actionCollection(),
+      _taskView, TQ_SLOT(loadFromFlatFile()), actionCollection(),
       "import_flatfile");
   new TDEAction( i18n("&Export to CSV File..."), 0,
-      _taskView, TQT_SLOT(exportcsvFile()), actionCollection(),
+      _taskView, TQ_SLOT(exportcsvFile()), actionCollection(),
       "export_csvfile");
   new TDEAction( i18n("Export &History to CSV File..."), 0,
-      this, TQT_SLOT(exportcsvHistory()), actionCollection(),
+      this, TQ_SLOT(exportcsvHistory()), actionCollection(),
       "export_csvhistory");
   new TDEAction( i18n("Import Tasks From &Planner..."), 0,
-      _taskView, TQT_SLOT(importPlanner()), actionCollection(),
+      _taskView, TQ_SLOT(importPlanner()), actionCollection(),
       "import_planner");  
 
 /*
   new TDEAction( i18n("Import E&vents"), 0,
                             _taskView,
-                            TQT_SLOT( loadFromKOrgEvents() ), actionCollection(),
+                            TQ_SLOT( loadFromKOrgEvents() ), actionCollection(),
                             "import_korg_events");
   */
 
diff --git a/karm/preferences.cpp b/karm/preferences.cpp
index 29b242cf..e8a437ef 100644
--- a/karm/preferences.cpp
+++ b/karm/preferences.cpp
@@ -68,8 +68,8 @@ void Preferences::makeBehaviorPage()
 
   topLevel->addStretch();
 
-  connect( _doIdleDetectionW, TQT_SIGNAL( clicked() ), this,
-      TQT_SLOT( idleDetectCheckBoxChanged() ));
+  connect( _doIdleDetectionW, TQ_SIGNAL( clicked() ), this,
+      TQ_SLOT( idleDetectCheckBoxChanged() ));
 }
 
 void Preferences::makeDisplayPage()
@@ -138,8 +138,8 @@ void Preferences::makeStoragePage()
   topLevel->addStretch();
 
   // checkboxes disable file selection controls
-  connect( _doAutoSaveW, TQT_SIGNAL( clicked() ),
-      this, TQT_SLOT( autoSaveCheckBoxChanged() ));
+  connect( _doAutoSaveW, TQ_SIGNAL( clicked() ),
+      this, TQ_SLOT( autoSaveCheckBoxChanged() ));
 }
 
 void Preferences::disableIdleDetection()
diff --git a/karm/task.cpp b/karm/task.cpp
index 5b05407d..88c0e099 100644
--- a/karm/task.cpp
+++ b/karm/task.cpp
@@ -54,11 +54,11 @@ void Task::init( const TQString& taskName, long minutes, long sessionTime,
   // If our parent is the taskview then connect our totalTimesChanged
   // signal to its receiver
   if ( ! parent() )
-    connect( this, TQT_SIGNAL( totalTimesChanged ( long, long ) ),
-             listView(), TQT_SLOT( taskTotalTimesChanged( long, long) ));
+    connect( this, TQ_SIGNAL( totalTimesChanged ( long, long ) ),
+             listView(), TQ_SLOT( taskTotalTimesChanged( long, long) ));
 
-  connect( this, TQT_SIGNAL( deletingTask( Task* ) ),
-           listView(), TQT_SLOT( deletingTask( Task* ) ));
+  connect( this, TQ_SIGNAL( deletingTask( Task* ) ),
+           listView(), TQ_SLOT( deletingTask( Task* ) ));
 
   if (icons == 0) {
     icons = new TQPtrVector<TQPixmap>(8);
@@ -80,7 +80,7 @@ void Task::init( const TQString& taskName, long minutes, long sessionTime,
   _totalSessionTime = _sessionTime = sessionTime;
   _timer = new TQTimer(this);
   _desktops = desktops;
-  connect(_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateActiveIcon()));
+  connect(_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateActiveIcon()));
   setPixmap(1, UserIcon(TQString::fromLatin1("empty-watch.xpm")));
   _currentPic = 0;
   _percentcomplete = percent_complete;
diff --git a/karm/taskview.cpp b/karm/taskview.cpp
index d1b80bf8..ad0877f1 100644
--- a/karm/taskview.cpp
+++ b/karm/taskview.cpp
@@ -42,10 +42,10 @@ TaskView::TaskView(TQWidget *parent, const char *name, const TQString &icsfile )
   _preferences = Preferences::instance( icsfile );
   _storage = KarmStorage::instance();
 
-  connect( this, TQT_SIGNAL( expanded( TQListViewItem * ) ),
-           this, TQT_SLOT( itemStateChanged( TQListViewItem * ) ) );
-  connect( this, TQT_SIGNAL( collapsed( TQListViewItem * ) ),
-           this, TQT_SLOT( itemStateChanged( TQListViewItem * ) ) );
+  connect( this, TQ_SIGNAL( expanded( TQListViewItem * ) ),
+           this, TQ_SLOT( itemStateChanged( TQListViewItem * ) ) );
+  connect( this, TQ_SIGNAL( collapsed( TQListViewItem * ) ),
+           this, TQ_SLOT( itemStateChanged( TQListViewItem * ) ) );
 
   // setup default values
   previousColumnWidths[0] = previousColumnWidths[1]
@@ -65,49 +65,49 @@ TaskView::TaskView(TQWidget *parent, const char *name, const TQString &icsfile )
 
   // set up the minuteTimer
   _minuteTimer = new TQTimer(this);
-  connect( _minuteTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( minuteUpdate() ));
+  connect( _minuteTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( minuteUpdate() ));
   _minuteTimer->start(1000 * secsPerMinute);
 
   // React when user changes iCalFile
-  connect(_preferences, TQT_SIGNAL(iCalFile(TQString)),
-      this, TQT_SLOT(iCalFileChanged(TQString)));
+  connect(_preferences, TQ_SIGNAL(iCalFile(TQString)),
+      this, TQ_SLOT(iCalFileChanged(TQString)));
 
   // resize columns when config is changed
-  connect(_preferences, TQT_SIGNAL( setupChanged() ), this,TQT_SLOT( adaptColumns() ));
+  connect(_preferences, TQ_SIGNAL( setupChanged() ), this,TQ_SLOT( adaptColumns() ));
 
   _minuteTimer->start(1000 * secsPerMinute);
 
   // Set up the idle detection.
   _idleTimeDetector = new IdleTimeDetector( _preferences->idlenessTimeout() );
-  connect( _idleTimeDetector, TQT_SIGNAL( extractTime(int) ),
-           this, TQT_SLOT( extractTime(int) ));
-  connect( _idleTimeDetector, TQT_SIGNAL( stopAllTimersAt(TQDateTime) ),
-           this, TQT_SLOT( stopAllTimersAt(TQDateTime) ));
-  connect( _preferences, TQT_SIGNAL( idlenessTimeout(int) ),
-           _idleTimeDetector, TQT_SLOT( setMaxIdle(int) ));
-  connect( _preferences, TQT_SIGNAL( detectIdleness(bool) ),
-           _idleTimeDetector, TQT_SLOT( toggleOverAllIdleDetection(bool) ));
+  connect( _idleTimeDetector, TQ_SIGNAL( extractTime(int) ),
+           this, TQ_SLOT( extractTime(int) ));
+  connect( _idleTimeDetector, TQ_SIGNAL( stopAllTimersAt(TQDateTime) ),
+           this, TQ_SLOT( stopAllTimersAt(TQDateTime) ));
+  connect( _preferences, TQ_SIGNAL( idlenessTimeout(int) ),
+           _idleTimeDetector, TQ_SLOT( setMaxIdle(int) ));
+  connect( _preferences, TQ_SIGNAL( detectIdleness(bool) ),
+           _idleTimeDetector, TQ_SLOT( toggleOverAllIdleDetection(bool) ));
   if (!_idleTimeDetector->isIdleDetectionPossible())
     _preferences->disableIdleDetection();
 
   // Setup auto save timer
   _autoSaveTimer = new TQTimer(this);
-  connect( _preferences, TQT_SIGNAL( autoSave(bool) ),
-           this, TQT_SLOT( autoSaveChanged(bool) ));
-  connect( _preferences, TQT_SIGNAL( autoSavePeriod(int) ),
-           this, TQT_SLOT( autoSavePeriodChanged(int) ));
-  connect( _autoSaveTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( save() ));
+  connect( _preferences, TQ_SIGNAL( autoSave(bool) ),
+           this, TQ_SLOT( autoSaveChanged(bool) ));
+  connect( _preferences, TQ_SIGNAL( autoSavePeriod(int) ),
+           this, TQ_SLOT( autoSavePeriodChanged(int) ));
+  connect( _autoSaveTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( save() ));
 
   // Setup manual save timer (to save changes a little while after they happen)
   _manualSaveTimer = new TQTimer(this);
-  connect( _manualSaveTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( save() ));
+  connect( _manualSaveTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( save() ));
 
   // Connect desktop tracker events to task starting/stopping
   _desktopTracker = new DesktopTracker();
-  connect( _desktopTracker, TQT_SIGNAL( reachedtActiveDesktop( Task* ) ),
-           this, TQT_SLOT( startTimerFor(Task*) ));
-  connect( _desktopTracker, TQT_SIGNAL( leftActiveDesktop( Task* ) ),
-           this, TQT_SLOT( stopTimerFor(Task*) ));
+  connect( _desktopTracker, TQ_SIGNAL( reachedtActiveDesktop( Task* ) ),
+           this, TQ_SLOT( startTimerFor(Task*) ));
+  connect( _desktopTracker, TQ_SIGNAL( leftActiveDesktop( Task* ) ),
+           this, TQ_SLOT( stopTimerFor(Task*) ));
   new TaskViewWhatsThis( this );
 }
 
diff --git a/karm/tdeaccelmenuwatch.cpp b/karm/tdeaccelmenuwatch.cpp
index 5cb22366..3cc72ea8 100644
--- a/karm/tdeaccelmenuwatch.cpp
+++ b/karm/tdeaccelmenuwatch.cpp
@@ -27,7 +27,7 @@ void TDEAccelMenuWatch::setMenu( TQPopupMenu *menu )
 
   if ( !_menuList.findRef( menu ) ) {
     _menuList.append( menu );
-    connect( menu, TQT_SIGNAL(destroyed()), this, TQT_SLOT(removeDeadMenu()) );
+    connect( menu, TQ_SIGNAL(destroyed()), this, TQ_SLOT(removeDeadMenu()) );
   }
 
   _menu = menu;
diff --git a/karm/test/script.cpp b/karm/test/script.cpp
index f9fa9d9e..ab6f7579 100644
--- a/karm/test/script.cpp
+++ b/karm/test/script.cpp
@@ -47,14 +47,14 @@ Script::Script( const TQDir& workingDirectory )
   m_proc   = new TQProcess( this );
   m_proc->setWorkingDirectory( workingDirectory );
 
-  connect ( m_proc, TQT_SIGNAL( readyReadStdout() ), 
-            this  , TQT_SLOT  ( stdout() ) 
+  connect ( m_proc, TQ_SIGNAL( readyReadStdout() ), 
+            this  , TQ_SLOT  ( stdout() ) 
             );
-  connect ( m_proc, TQT_SIGNAL( readyReadStderr() ), 
-            this  , TQT_SLOT  ( stderr() ) 
+  connect ( m_proc, TQ_SIGNAL( readyReadStderr() ), 
+            this  , TQ_SLOT  ( stderr() ) 
             );
-  connect ( m_proc, TQT_SIGNAL( processExited() ), 
-            this  , TQT_SLOT  ( exit() ) 
+  connect ( m_proc, TQ_SIGNAL( processExited() ), 
+            this  , TQ_SLOT  ( exit() ) 
             );
 }
 
@@ -79,7 +79,7 @@ int Script::run()
 {
   m_proc->start();
   // This didn't work.  But Ctrl-C does.  :P
-  //TQTimer::singleShot( m_timeoutInSeconds * 1000, m_proc, TQT_SLOT( kill() ) );
+  //TQTimer::singleShot( m_timeoutInSeconds * 1000, m_proc, TQ_SLOT( kill() ) );
   //while ( ! m_proc->normalExit() );
   while ( m_proc->isRunning() );
   return m_status;
@@ -89,7 +89,7 @@ void Script::terminate()
 {
   // These both trigger processExited, so exit() will run.
   m_proc->tryTerminate();
-  TQTimer::singleShot( NICE_KILL_TIMEOUT_IN_SECS*1000, m_proc, TQT_SLOT( kill() ) );
+  TQTimer::singleShot( NICE_KILL_TIMEOUT_IN_SECS*1000, m_proc, TQ_SLOT( kill() ) );
 }
 
 void Script::exit()
diff --git a/karm/tray.cpp b/karm/tray.cpp
index 5187c7e4..9332d1e0 100644
--- a/karm/tray.cpp
+++ b/karm/tray.cpp
@@ -35,8 +35,8 @@ KarmTray::KarmTray(MainWindow* parent)
 {
   // the timer that updates the "running" icon in the tray
   _taskActiveTimer = new TQTimer(this);
-  connect( _taskActiveTimer, TQT_SIGNAL( timeout() ), this,
-                             TQT_SLOT( advanceClock()) );
+  connect( _taskActiveTimer, TQ_SIGNAL( timeout() ), this,
+                             TQ_SLOT( advanceClock()) );
 
   if (icons == 0) {
     icons = new TQPtrVector<TQPixmap>(8);