Rename old tq methods that no longer need a unique name

19 files changed, 135 insertions, 135 deletions

diff --git a/karm/csvexportdialog_base.ui b/karm/csvexportdialog_base.ui
index 906ba139b..1b06db1dd 100644
--- a/karm/csvexportdialog_base.ui
+++ b/karm/csvexportdialog_base.ui
@@ -29,7 +29,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>29</height>
@@ -46,7 +46,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>160</width>
                     <height>20</height>
@@ -317,7 +317,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqmaximumSize">
+                    <property name="maximumSize">
                         <size>
                             <width>30</width>
                             <height>32767</height>
diff --git a/karm/edittaskdialog.cpp b/karm/edittaskdialog.cpp
index 9b404d0af..bc2234867 100644
--- a/karm/edittaskdialog.cpp
+++ b/karm/edittaskdialog.cpp
@@ -87,7 +87,7 @@ EditTaskDialog::EditTaskDialog( TQString caption, bool editDlg,
   // Time
   _timeLA = new TQLabel( i18n("&Time:"), page, "time" );
   lay3->addWidget( _timeLA, 0, 0 );
-  _timeLA->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, 
+  _timeLA->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, 
                                          (TQSizePolicy::SizeType)0, 
                                          0, 
                                          0, 
@@ -110,7 +110,7 @@ EditTaskDialog::EditTaskDialog( TQString caption, bool editDlg,
   _sessionTW = new KArmTimeWidget( page, "_sessionTW" );
   lay3->addWidget( _sessionTW, 1, 1 );
   _sessionLA->setBuddy( _sessionTW );
-  _sessionLA->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, 
+  _sessionLA->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, 
                                          (TQSizePolicy::SizeType)0, 
                                          0, 
                                          0, 
@@ -132,9 +132,9 @@ EditTaskDialog::EditTaskDialog( TQString caption, bool editDlg,
   lay4->addSpacing(20);
   
   _operator = new TQComboBox(page);
-  _operator->insertItem( TQString::tqfromLatin1( "+" ) );
-  _operator->insertItem( TQString::tqfromLatin1( "-" ) );
-  _operator->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, 
+  _operator->insertItem( TQString::fromLatin1( "+" ) );
+  _operator->insertItem( TQString::fromLatin1( "-" ) );
+  _operator->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, 
                                          (TQSizePolicy::SizeType)0, 
                                          0, 
                                          0, 
diff --git a/karm/idletimedetector.cpp b/karm/idletimedetector.cpp
index 38ae04d7a..c969bf149 100644
--- a/karm/idletimedetector.cpp
+++ b/karm/idletimedetector.cpp
@@ -67,7 +67,7 @@ void IdleTimeDetector::informOverrun(int idleSeconds)
 
   _timer->stop();
 
-  TQDateTime idleStart = TQDateTime::tqcurrentDateTime().addSecs(-idleSeconds);
+  TQDateTime idleStart = TQDateTime::currentDateTime().addSecs(-idleSeconds);
   TQString idleStartTQString = KGlobal::locale()->formatTime(idleStart.time());
 
   int id =  TQMessageBox::warning( 0, i18n("Idle Detection"),
@@ -76,13 +76,13 @@ void IdleTimeDetector::informOverrun(int idleSeconds)
                                      i18n("Revert && Stop"),
                                      i18n("Revert && Continue"),
                                      i18n("Continue Timing"),0,2);
-  TQDateTime end = TQDateTime::tqcurrentDateTime();
+  TQDateTime end = TQDateTime::currentDateTime();
   int diff = idleStart.secsTo(end)/secsPerMinute;
 
   if (id == 0) 
   {
     // Revert And Stop
-    kdDebug(5970) << "Now it is " << TQDateTime::tqcurrentDateTime() << endl;
+    kdDebug(5970) << "Now it is " << TQDateTime::currentDateTime() << endl;
     kdDebug(5970) << "Reverting timer to " << KGlobal::locale()->formatTime(idleStart.time()).ascii() << endl;
     emit(extractTime(idleSeconds/60+diff)); // we need to subtract the time that has been added during idleness.
     emit(stopAllTimersAt(idleStart));
diff --git a/karm/karm_part.cpp b/karm/karm_part.cpp
index db6204491..7a392ab41 100644
--- a/karm/karm_part.cpp
+++ b/karm/karm_part.cpp
@@ -134,12 +134,12 @@ void karmPart::makeMenus()
       actionCollection(),
       "reset_all_times");
   actionStart = new KAction( i18n("&Start"),
-      TQString::tqfromLatin1("1rightarrow"), Key_S,
+      TQString::fromLatin1("1rightarrow"), Key_S,
       TQT_TQOBJECT(_taskView),
       TQT_SLOT( startCurrentTimer() ), actionCollection(),
       "start");
   actionStop = new KAction( i18n("S&top"),
-      TQString::tqfromLatin1("stop"), 0,
+      TQString::fromLatin1("stop"), 0,
       TQT_TQOBJECT(_taskView),
       TQT_SLOT( stopCurrentTimer() ), actionCollection(),
       "stop");
@@ -151,55 +151,55 @@ void karmPart::makeMenus()
   actionStopAll->setEnabled(false);
 
   actionNew = new KAction( i18n("&New..."),
-      TQString::tqfromLatin1("filenew"), CTRL+Key_N,
+      TQString::fromLatin1("filenew"), CTRL+Key_N,
       TQT_TQOBJECT(_taskView),
       TQT_SLOT( newTask() ), actionCollection(),
       "new_task");
   actionNewSub = new KAction( i18n("New &Subtask..."),
-      TQString::tqfromLatin1("kmultiple"), CTRL+ALT+Key_N,
+      TQString::fromLatin1("kmultiple"), CTRL+ALT+Key_N,
       TQT_TQOBJECT(_taskView),
       TQT_SLOT( newSubTask() ), actionCollection(),
       "new_sub_task");
   actionDelete = new KAction( i18n("&Delete"),
-      TQString::tqfromLatin1("editdelete"), Key_Delete,
+      TQString::fromLatin1("editdelete"), Key_Delete,
       TQT_TQOBJECT(_taskView),
       TQT_SLOT( deleteTask() ), actionCollection(),
       "delete_task");
   actionEdit = new KAction( i18n("&Edit..."),
-      TQString::tqfromLatin1("edit"), CTRL + Key_E,
+      TQString::fromLatin1("edit"), CTRL + Key_E,
       TQT_TQOBJECT(_taskView),
       TQT_SLOT( editTask() ), actionCollection(),
       "edit_task");
 //  actionAddComment = new KAction( i18n("&Add Comment..."),
-//      TQString::tqfromLatin1("document"),
+//      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"),
-      TQString::tqfromLatin1("document"),
+      TQString::fromLatin1("document"),
       CTRL+Key_M,
       TQT_TQOBJECT(_taskView),
       TQT_SLOT( markTaskAsComplete() ),
       actionCollection(),
       "mark_as_complete");
   actionMarkAsIncomplete = new KAction( i18n("&Mark as Incomplete"),
-      TQString::tqfromLatin1("document"),
+      TQString::fromLatin1("document"),
       CTRL+Key_M,
       TQT_TQOBJECT(_taskView),
       TQT_SLOT( markTaskAsIncomplete() ),
       actionCollection(),
       "mark_as_incomplete");
   actionClipTotals = new KAction( i18n("&Copy Totals to Clipboard"),
-      TQString::tqfromLatin1("klipper"),
+      TQString::fromLatin1("klipper"),
       CTRL+Key_C,
       TQT_TQOBJECT(_taskView),
       TQT_SLOT( clipTotals() ),
       actionCollection(),
       "clip_totals");
   actionClipHistory = new KAction( i18n("Copy &History to Clipboard"),
-      TQString::tqfromLatin1("klipper"),
+      TQString::fromLatin1("klipper"),
       CTRL+ALT+Key_C,
       TQT_TQOBJECT(_taskView),
       TQT_SLOT( clipHistory() ),
diff --git a/karm/karmstorage.cpp b/karm/karmstorage.cpp
index 1e4f92a1f..aecee470d 100644
--- a/karm/karmstorage.cpp
+++ b/karm/karmstorage.cpp
@@ -135,7 +135,7 @@ TQString KarmStorage::load (TaskView* view, const Preferences* preferences, TQSt
   TQObject::connect (_calendar, TQT_SIGNAL(resourceChanged(ResourceCalendar *)),
   	            view, TQT_SLOT(iCalFileModified(ResourceCalendar *)));
   _calendar->setTimeZoneId( KPimPrefs::timezone() );
-  _calendar->setResourceName( TQString::tqfromLatin1("KArm") );
+  _calendar->setResourceName( TQString::fromLatin1("KArm") );
   _calendar->open();
   _calendar->load();
 
@@ -680,13 +680,13 @@ TQString KarmStorage::exportcsvFile( TaskView *taskview,
   else // use remote file
   {
     KTempFile tmpFile;
-    if ( tmpFile.status() != 0 ) err = TQString::tqfromLatin1( "Unable to get temporary file" );
+    if ( tmpFile.status() != 0 ) err = TQString::fromLatin1( "Unable to get temporary file" );
     else
     {
       TQTextStream *stream=tmpFile.textStream();
       *stream << retval;
       tmpFile.close();
-      if (!KIO::NetAccess::upload( tmpFile.name(), rc.url, 0 )) err=TQString::tqfromLatin1("Could not upload");
+      if (!KIO::NetAccess::upload( tmpFile.name(), rc.url, 0 )) err=TQString::fromLatin1("Could not upload");
     }
   }
 
@@ -794,7 +794,7 @@ long KarmStorage::printTaskHistory (
   TQString double_dquote = dquote + dquote;
   bool to_quote = true;
 
-  const TQString cr = TQString::tqfromLatin1("\n");
+  const TQString cr = TQString::fromLatin1("\n");
   TQString buf;
   TQString daytaskkey, daykey;
   TQDate day;
@@ -807,14 +807,14 @@ long KarmStorage::printTaskHistory (
   while (day <= to)
   {
     // write the time in seconds for the given task for the given day to s
-    daykey = day.toString(TQString::tqfromLatin1("yyyyMMdd"));
-    daytaskkey = TQString::tqfromLatin1("%1_%2")
+    daykey = day.toString(TQString::fromLatin1("yyyyMMdd"));
+    daytaskkey = TQString::fromLatin1("%1_%2")
       .tqarg(daykey)
       .tqarg(task->uid());
 
     if (taskdaytotals.contains(daytaskkey))
     {
-      cell.push_back(TQString::tqfromLatin1("%1")
+      cell.push_back(TQString::fromLatin1("%1")
         .tqarg(formatTime(taskdaytotals[daytaskkey]/60, rc.decimalMinutes)));
       sum += taskdaytotals[daytaskkey];  // in seconds
 
@@ -829,7 +829,7 @@ long KarmStorage::printTaskHistory (
   }
 
   // Total for task
-  cell.push_back(TQString::tqfromLatin1("%1").tqarg(formatTime(sum/60, rc.decimalMinutes)));
+  cell.push_back(TQString::fromLatin1("%1").tqarg(formatTime(sum/60, rc.decimalMinutes)));
 
   // room for the recursive total time (that cannot be calculated now)
   cell.push_back(delim);
@@ -865,7 +865,7 @@ long KarmStorage::printTaskHistory (
     add += printTaskHistory( subTask, taskdaytotals, daytotals, from, to , level+1, matrix,
                       rc );
   }
-  cell[colrectot]=(TQString::tqfromLatin1("%1").tqarg(formatTime((add+sum)/60, rc.decimalMinutes )));
+  cell[colrectot]=(TQString::fromLatin1("%1").tqarg(formatTime((add+sum)/60, rc.decimalMinutes )));
   for (unsigned int i=0; i < cell.size(); i++) matrix[ownline]+=cell[i];
   return add+sum;
 }
@@ -890,7 +890,7 @@ TQString KarmStorage::exportcsvHistory ( TaskView      *taskview,
                                             const ReportCriteria &rc)
 {
   TQString delim = rc.delimiter;
-  const TQString cr = TQString::tqfromLatin1("\n");
+  const TQString cr = TQString::fromLatin1("\n");
   TQString err;
 
   // below taken from timekard.cpp
@@ -910,7 +910,7 @@ TQString KarmStorage::exportcsvHistory ( TaskView      *taskview,
   // parameter-plausi
   if ( from > to )
   {
-    err = TQString::tqfromLatin1 (
+    err = TQString::fromLatin1 (
             "'to' has to be a date later than or equal to 'from'.");
   }
 
@@ -921,7 +921,7 @@ TQString KarmStorage::exportcsvHistory ( TaskView      *taskview,
     .tqarg(KGlobal::locale()->formatDate(to));
   retval += cr;
   retval += i18n("Printed on: %1")
-    .tqarg(KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime()));
+    .tqarg(KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime()));
   retval += cr;
 
   day=from;
@@ -936,8 +936,8 @@ TQString KarmStorage::exportcsvHistory ( TaskView      *taskview,
   // so times are accumulated for each task.
   for (event = events.begin(); event != events.end(); ++event)
   {
-    daykey = (*event).start().date().toString(TQString::tqfromLatin1("yyyyMMdd"));
-    daytaskkey = TQString(TQString::tqfromLatin1("%1_%2"))
+    daykey = (*event).start().date().toString(TQString::fromLatin1("yyyyMMdd"));
+    daytaskkey = TQString(TQString::fromLatin1("%1_%2"))
         .tqarg(daykey)
         .tqarg((*event).todoUid());
 
@@ -953,7 +953,7 @@ TQString KarmStorage::exportcsvHistory ( TaskView      *taskview,
   while ( dayheading <= to )
   {
     // Use ISO 8601 format for date.
-    retval += dayheading.toString(TQString::tqfromLatin1("yyyy-MM-dd"));
+    retval += dayheading.toString(TQString::fromLatin1("yyyy-MM-dd"));
     retval += delim;
     dayheading=dayheading.addDays(1);
   }
@@ -993,11 +993,11 @@ TQString KarmStorage::exportcsvHistory ( TaskView      *taskview,
     day = from;
     while (day<=to)
     {
-      daykey = day.toString(TQString::tqfromLatin1("yyyyMMdd"));
+      daykey = day.toString(TQString::fromLatin1("yyyyMMdd"));
 
       if (daytotals.contains(daykey))
       {
-        retval += TQString::tqfromLatin1("%1")
+        retval += TQString::fromLatin1("%1")
             .tqarg(formatTime(daytotals[daykey]/60, rc.decimalMinutes));
         sum += daytotals[daykey];  // in seconds
       }
@@ -1005,7 +1005,7 @@ TQString KarmStorage::exportcsvHistory ( TaskView      *taskview,
       day = day.addDays(1);
     }
 
-    retval += TQString::tqfromLatin1("%1%2%3%4")
+    retval += TQString::fromLatin1("%1%2%3%4")
         .tqarg( formatTime( sum/60, rc.decimalMinutes ) )
         .tqarg( delim ).tqarg( delim )
         .tqarg( i18n( "Total" ) );
@@ -1036,14 +1036,14 @@ TQString KarmStorage::exportcsvHistory ( TaskView      *taskview,
     KTempFile tmpFile;
     if ( tmpFile.status() != 0 )
     {
-      err = TQString::tqfromLatin1( "Unable to get temporary file" );
+      err = TQString::fromLatin1( "Unable to get temporary file" );
     }
     else
     {
       TQTextStream *stream=tmpFile.textStream();
       *stream << retval;
       tmpFile.close();
-      if (!KIO::NetAccess::upload( tmpFile.name(), rc.url, 0 )) err=TQString::tqfromLatin1("Could not upload");
+      if (!KIO::NetAccess::upload( tmpFile.name(), rc.url, 0 )) err=TQString::fromLatin1("Could not upload");
     }
   }
   return err;
diff --git a/karm/karmstorage.h b/karm/karmstorage.h
index 573c55239..3f03ddffa 100644
--- a/karm/karmstorage.h
+++ b/karm/karmstorage.h
@@ -238,7 +238,7 @@ class KarmStorage
      *
      * @param task   The task the timer was stopped for.
      */
-    void stopTimer(const Task* task, TQDateTime when=TQDateTime::tqcurrentDateTime());
+    void stopTimer(const Task* task, TQDateTime when=TQDateTime::currentDateTime());
 
     /**
      * Log a new comment for this task.
diff --git a/karm/ktimewidget.cpp b/karm/ktimewidget.cpp
index 2eaf32b20..01d384168 100644
--- a/karm/ktimewidget.cpp
+++ b/karm/ktimewidget.cpp
@@ -74,7 +74,7 @@ KArmTimeWidget::KArmTimeWidget( TQWidget* parent, const char* name )
   TimeValidator *validator = new TimeValidator( HOUR, _hourLE,
                                                 "Validator for _hourLE");
   _hourLE->setValidator( validator );
-  _hourLE->tqsetAlignment( TQt::AlignRight );
+  _hourLE->setAlignment( TQt::AlignRight );
 
 
   TQLabel *hr = new TQLabel( i18n( "abbreviation for hours", " hr. " ), this );
@@ -89,7 +89,7 @@ KArmTimeWidget::KArmTimeWidget( TQWidget* parent, const char* name )
   validator = new TimeValidator( MINUTE, _minuteLE, "Validator for _minuteLE");
   _minuteLE->setValidator( validator );
   _minuteLE->setMaxLength(2);
-  _minuteLE->tqsetAlignment( TQt::AlignRight );
+  _minuteLE->setAlignment( TQt::AlignRight );
 
   TQLabel *min = new TQLabel( i18n( "abbreviation for minutes", " min. " ), this );
   tqlayout->addWidget( min );
@@ -111,7 +111,7 @@ void KArmTimeWidget::setTime( long minutes )
 
   dummy.setNum( minutepart );
   if (minutepart < 10 ) {
-    dummy = TQString::tqfromLatin1( "0" ) + dummy;
+    dummy = TQString::fromLatin1( "0" ) + dummy;
   }
   _minuteLE->setText( dummy );
 }
diff --git a/karm/mainwindow.cpp b/karm/mainwindow.cpp
index 6d1ce29ea..8307dd1f7 100644
--- a/karm/mainwindow.cpp
+++ b/karm/mainwindow.cpp
@@ -272,12 +272,12 @@ void MainWindow::makeMenus()
       actionCollection(),
       "reset_all_times");
   actionStart = new KAction( i18n("&Start"),
-      TQString::tqfromLatin1("1rightarrow"), Key_S,
+      TQString::fromLatin1("1rightarrow"), Key_S,
       TQT_TQOBJECT(_taskView),
       TQT_SLOT( startCurrentTimer() ), actionCollection(),
       "start");
   actionStop = new KAction( i18n("S&top"),
-      TQString::tqfromLatin1("stop"), Key_S,
+      TQString::fromLatin1("stop"), Key_S,
       TQT_TQOBJECT(_taskView),
       TQT_SLOT( stopCurrentTimer() ), actionCollection(),
       "stop");
@@ -289,48 +289,48 @@ void MainWindow::makeMenus()
   actionStopAll->setEnabled(false);
 
   actionNew = new KAction( i18n("&New..."),
-      TQString::tqfromLatin1("filenew"), CTRL+Key_N,
+      TQString::fromLatin1("filenew"), CTRL+Key_N,
       TQT_TQOBJECT(_taskView),
       TQT_SLOT( newTask() ), actionCollection(),
       "new_task");
   actionNewSub = new KAction( i18n("New &Subtask..."),
-      TQString::tqfromLatin1("kmultiple"), CTRL+ALT+Key_N,
+      TQString::fromLatin1("kmultiple"), CTRL+ALT+Key_N,
       TQT_TQOBJECT(_taskView),
       TQT_SLOT( newSubTask() ), actionCollection(),
       "new_sub_task");
   actionDelete = new KAction( i18n("&Delete"),
-      TQString::tqfromLatin1("editdelete"), Key_Delete,
+      TQString::fromLatin1("editdelete"), Key_Delete,
       TQT_TQOBJECT(_taskView),
       TQT_SLOT( deleteTask() ), actionCollection(),
       "delete_task");
   actionEdit = new KAction( i18n("&Edit..."),
-      TQString::tqfromLatin1("edit"), CTRL + Key_E,
+      TQString::fromLatin1("edit"), CTRL + Key_E,
       TQT_TQOBJECT(_taskView),
       TQT_SLOT( editTask() ), actionCollection(),
       "edit_task");
 //  actionAddComment = new KAction( i18n("&Add Comment..."),
-//      TQString::tqfromLatin1("document"),
+//      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"),
-      TQString::tqfromLatin1("document"),
+      TQString::fromLatin1("document"),
       CTRL+Key_M,
       TQT_TQOBJECT(_taskView),
       TQT_SLOT( markTaskAsComplete() ),
       actionCollection(),
       "mark_as_complete");
   actionMarkAsIncomplete = new KAction( i18n("&Mark as Incomplete"),
-      TQString::tqfromLatin1("document"),
+      TQString::fromLatin1("document"),
       CTRL+Key_M,
       TQT_TQOBJECT(_taskView),
       TQT_SLOT( markTaskAsIncomplete() ),
       actionCollection(),
       "mark_as_incomplete");
   actionClipTotals = new KAction( i18n("&Copy Totals to Clipboard"),
-      TQString::tqfromLatin1("klipper"),
+      TQString::fromLatin1("klipper"),
       CTRL+Key_C,
       TQT_TQOBJECT(_taskView),
       TQT_SLOT( clipTotals() ),
@@ -338,14 +338,14 @@ void MainWindow::makeMenus()
       "clip_totals");
   // actionClipTotals will never be used again, overwrite it
   actionClipTotals = new KAction( i18n("&Copy Session Time to Clipboard"),
-      TQString::tqfromLatin1("klipper"),
+      TQString::fromLatin1("klipper"),
       0,
       TQT_TQOBJECT(_taskView),
       TQT_SLOT( clipSession() ),
       actionCollection(),
       "clip_session");
   actionClipHistory = new KAction( i18n("Copy &History to Clipboard"),
-      TQString::tqfromLatin1("klipper"),
+      TQString::fromLatin1("klipper"),
       CTRL+ALT+Key_C,
       TQT_TQOBJECT(_taskView),
       TQT_SLOT( clipHistory() ),
@@ -372,7 +372,7 @@ void MainWindow::makeMenus()
                             "import_korg_events");
   */
 
-  setXMLFile( TQString::tqfromLatin1("karmui.rc") );
+  setXMLFile( TQString::fromLatin1("karmui.rc") );
   createGUI( 0 );
 
   // Tool tips must be set after the createGUI.
@@ -442,11 +442,11 @@ void MainWindow::loadGeometry()
   {
     KConfig &config = *kapp->config();
 
-    config.setGroup( TQString::tqfromLatin1("Main Window Geometry") );
-    int w = config.readNumEntry( TQString::tqfromLatin1("Width"), 100 );
-    int h = config.readNumEntry( TQString::tqfromLatin1("Height"), 100 );
-    w = TQMAX( w, tqsizeHint().width() );
-    h = TQMAX( h, tqsizeHint().height() );
+    config.setGroup( TQString::fromLatin1("Main Window Geometry") );
+    int w = config.readNumEntry( TQString::fromLatin1("Width"), 100 );
+    int h = config.readNumEntry( TQString::fromLatin1("Height"), 100 );
+    w = TQMAX( w, sizeHint().width() );
+    h = TQMAX( h, sizeHint().height() );
     resize(w, h);
   }
 }
@@ -455,9 +455,9 @@ void MainWindow::loadGeometry()
 void MainWindow::saveGeometry()
 {
   KConfig &config = *KGlobal::config();
-  config.setGroup( TQString::tqfromLatin1("Main Window Geometry"));
-  config.writeEntry( TQString::tqfromLatin1("Width"), width());
-  config.writeEntry( TQString::tqfromLatin1("Height"), height());
+  config.setGroup( TQString::fromLatin1("Main Window Geometry"));
+  config.writeEntry( TQString::fromLatin1("Width"), width());
+  config.writeEntry( TQString::fromLatin1("Height"), height());
   config.sync();
 }
 
diff --git a/karm/plannerparser.cpp b/karm/plannerparser.cpp
index 7ac13a5e3..67f7bd53f 100644
--- a/karm/plannerparser.cpp
+++ b/karm/plannerparser.cpp
@@ -55,15 +55,15 @@ test cases:
     int     taskComplete=0;
     
     // only <task>s within <tasks> are processed
-    if (qName == TQString::tqfromLatin1("tasks")) withInTasks=true;
-    if ((qName == TQString::tqfromLatin1("task")) && (withInTasks))
+    if (qName == TQString::fromLatin1("tasks")) withInTasks=true;
+    if ((qName == TQString::fromLatin1("task")) && (withInTasks))
     {
 	
       // find out name and percent-complete
       for (int i=0; i<att.length(); i++)
       {
-        if (att.qName(i) == TQString::tqfromLatin1("name")) taskName=att.value(i);
-        if (att.qName(i)==TQString::tqfromLatin1("percent-complete")) taskComplete=att.value(i).toInt();
+        if (att.qName(i) == TQString::fromLatin1("name")) taskName=att.value(i);
+        if (att.qName(i)==TQString::fromLatin1("percent-complete")) taskComplete=att.value(i).toInt();
       }
     
       // at the moment, task is still the old task or the old father task (if an endElement occurred) or not existing (if the
diff --git a/karm/preferences.cpp b/karm/preferences.cpp
index 24a5e8c41..e187599fa 100644
--- a/karm/preferences.cpp
+++ b/karm/preferences.cpp
@@ -121,7 +121,7 @@ void Preferences::makeStoragePage()
   // iCalendar
   TQLabel* _iCalFileLabel = new TQLabel( i18n("iCalendar file:"), storagePage);
   _iCalFileW = new KURLRequester(storagePage, "_iCalFileW");
-  _iCalFileW->setFilter(TQString::tqfromLatin1("*.ics"));
+  _iCalFileW->setFilter(TQString::fromLatin1("*.ics"));
   _iCalFileW->setMode(KFile::File);
 
   // Log time?
@@ -253,32 +253,32 @@ void Preferences::load()
 {
   KConfig &config = *kapp->config();
 
-  config.setGroup( TQString::tqfromLatin1("Idle detection") );
-  _doIdleDetectionV = config.readBoolEntry( TQString::tqfromLatin1("enabled"),
+  config.setGroup( TQString::fromLatin1("Idle detection") );
+  _doIdleDetectionV = config.readBoolEntry( TQString::fromLatin1("enabled"),
      true );
-  _idleDetectValueV = config.readNumEntry(TQString::tqfromLatin1("period"), 15);
+  _idleDetectValueV = config.readNumEntry(TQString::fromLatin1("period"), 15);
 
-  config.setGroup( TQString::tqfromLatin1("Saving") );
+  config.setGroup( TQString::fromLatin1("Saving") );
   _iCalFileV = config.readPathEntry
-    ( TQString::tqfromLatin1("ical file"), 
-      locateLocal( "appdata", TQString::tqfromLatin1( "karm.ics")));
+    ( TQString::fromLatin1("ical file"), 
+      locateLocal( "appdata", TQString::fromLatin1( "karm.ics")));
   _doAutoSaveV = config.readBoolEntry
-    ( TQString::tqfromLatin1("auto save"), true);
+    ( TQString::fromLatin1("auto save"), true);
   _autoSaveValueV = config.readNumEntry
-    ( TQString::tqfromLatin1("auto save period"), 5);
+    ( TQString::fromLatin1("auto save period"), 5);
   _promptDeleteV = config.readBoolEntry
-    ( TQString::tqfromLatin1("prompt delete"), true);
+    ( TQString::fromLatin1("prompt delete"), true);
   _loggingV = config.readBoolEntry
-    ( TQString::tqfromLatin1("logging"), true);
+    ( TQString::fromLatin1("logging"), true);
 
   _displayColumnV[0] = config.readBoolEntry
-    ( TQString::tqfromLatin1("display session time"), true);
+    ( TQString::fromLatin1("display session time"), true);
   _displayColumnV[1] = config.readBoolEntry
-    ( TQString::tqfromLatin1("display time"), true);
+    ( TQString::fromLatin1("display time"), true);
   _displayColumnV[2] = config.readBoolEntry
-    ( TQString::tqfromLatin1("display total session time"), true);
+    ( TQString::fromLatin1("display total session time"), true);
   _displayColumnV[3] = config.readBoolEntry
-    ( TQString::tqfromLatin1("display total time"), true);
+    ( TQString::fromLatin1("display total time"), true);
 
   KEMailSettings settings;
   _userRealName = settings.getSetting( KEMailSettings::RealName );
@@ -288,24 +288,24 @@ void Preferences::save()
 {
   KConfig &config = *KGlobal::config();
 
-  config.setGroup( TQString::tqfromLatin1("Idle detection"));
-  config.writeEntry( TQString::tqfromLatin1("enabled"), _doIdleDetectionV);
-  config.writeEntry( TQString::tqfromLatin1("period"), _idleDetectValueV);
+  config.setGroup( TQString::fromLatin1("Idle detection"));
+  config.writeEntry( TQString::fromLatin1("enabled"), _doIdleDetectionV);
+  config.writeEntry( TQString::fromLatin1("period"), _idleDetectValueV);
 
-  config.setGroup( TQString::tqfromLatin1("Saving"));
-  config.writePathEntry( TQString::tqfromLatin1("ical file"), _iCalFileV);
-  config.writeEntry( TQString::tqfromLatin1("auto save"), _doAutoSaveV);
-  config.writeEntry( TQString::tqfromLatin1("logging"), _loggingV);
-  config.writeEntry( TQString::tqfromLatin1("auto save period"), _autoSaveValueV);
-  config.writeEntry( TQString::tqfromLatin1("prompt delete"), _promptDeleteV);
+  config.setGroup( TQString::fromLatin1("Saving"));
+  config.writePathEntry( TQString::fromLatin1("ical file"), _iCalFileV);
+  config.writeEntry( TQString::fromLatin1("auto save"), _doAutoSaveV);
+  config.writeEntry( TQString::fromLatin1("logging"), _loggingV);
+  config.writeEntry( TQString::fromLatin1("auto save period"), _autoSaveValueV);
+  config.writeEntry( TQString::fromLatin1("prompt delete"), _promptDeleteV);
 
-  config.writeEntry( TQString::tqfromLatin1("display session time"),
+  config.writeEntry( TQString::fromLatin1("display session time"),
       _displayColumnV[0]);
-  config.writeEntry( TQString::tqfromLatin1("display time"),
+  config.writeEntry( TQString::fromLatin1("display time"),
       _displayColumnV[1]);
-  config.writeEntry( TQString::tqfromLatin1("display total session time"),
+  config.writeEntry( TQString::fromLatin1("display total session time"),
       _displayColumnV[2]);
-  config.writeEntry( TQString::tqfromLatin1("display total time"),
+  config.writeEntry( TQString::fromLatin1("display total time"),
       _displayColumnV[3]);
 
   config.sync();
diff --git a/karm/print.cpp b/karm/print.cpp
index d045a6658..df8aabf54 100644
--- a/karm/print.cpp
+++ b/karm/print.cpp
@@ -75,7 +75,7 @@ void MyPrinter::print()
     painter.setFont(newFont);
     
     int height = metrics.height();
-    TQString now = KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime());
+    TQString now = KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime());
     
     painter.drawText(xMargin, yoff, pageWidth, height,
          TQPainter::AlignCenter, 
diff --git a/karm/printdialog.cpp b/karm/printdialog.cpp
index 197875491..0813ca345 100644
--- a/karm/printdialog.cpp
+++ b/karm/printdialog.cpp
@@ -64,8 +64,8 @@ PrintDialog::PrintDialog()
   _from = new KDateEdit(rangeWidget);
 
   // Default from date to beginning of the month
-  year = TQDate::tqcurrentDate().year();
-  month = TQDate::tqcurrentDate().month();
+  year = TQDate::currentDate().year();
+  month = TQDate::currentDate().month();
   _from->setDate(TQDate(year, month, 1));
   rangeLayout->addWidget(_from);
   rangeLayout->addWidget(new TQLabel(i18n("To:"), rangeWidget));
diff --git a/karm/task.cpp b/karm/task.cpp
index 03eb1d3b2..0750c7200 100644
--- a/karm/task.cpp
+++ b/karm/task.cpp
@@ -75,13 +75,13 @@ void Task::init( const TQString& taskName, long minutes, long sessionTime,
 
   _removing = false;
   _name = taskName.stripWhiteSpace();
-  _lastStart = TQDateTime::tqcurrentDateTime();
+  _lastStart = TQDateTime::currentDateTime();
   _totalTime = _time = minutes;
   _totalSessionTime = _sessionTime = sessionTime;
   _timer = new TQTimer(this);
   _desktops = desktops;
   connect(_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateActiveIcon()));
-  setPixmap(1, UserIcon(TQString::tqfromLatin1("empty-watch.xpm")));
+  setPixmap(1, UserIcon(TQString::fromLatin1("empty-watch.xpm")));
   _currentPic = 0;
   _percentcomplete = percent_complete;
 
@@ -119,7 +119,7 @@ void Task::setRunning( bool on, KarmStorage* storage, TQDateTime whenStarted, TQ
       if ( ! _removing ) 
       {
         storage->stopTimer(this, whenStopped);
-        setPixmap(1, UserIcon(TQString::tqfromLatin1("empty-watch.xpm")));
+        setPixmap(1, UserIcon(TQString::fromLatin1("empty-watch.xpm")));
       }
     }
   }
@@ -290,7 +290,7 @@ TQString Task::fullName() const
   if (isRoot())
     return name();
   else
-    return parent()->fullName() + TQString::tqfromLatin1("/") + name();
+    return parent()->fullName() + TQString::fromLatin1("/") + name();
 }
 
 KCal::Todo* Task::asTodo(KCal::Todo* todo) const
@@ -349,7 +349,7 @@ bool Task::parseIncidence( KCal::Incidence* incident, long& minutes,
 
   TQString desktopList = incident->customProperty( kapp->instanceName(),
       TQCString( "desktopList" ) );
-  TQStringList desktopStrList = TQStringList::split( TQString::tqfromLatin1(","),
+  TQStringList desktopStrList = TQStringList::split( TQString::fromLatin1(","),
       desktopList );
   desktops.clear();
 
@@ -380,7 +380,7 @@ TQString Task::getDesktopStr() const
   for ( DesktopList::const_iterator iter = _desktops.begin();
         iter != _desktops.end();
         ++iter ) {
-    desktopstr += TQString::number( *iter ) + TQString::tqfromLatin1( "," );
+    desktopstr += TQString::number( *iter ) + TQString::fromLatin1( "," );
   }
   desktopstr.remove( desktopstr.length() - 1, 1 );
   return desktopstr;
@@ -419,7 +419,7 @@ void Task::update()
 
 void Task::addComment( TQString comment, KarmStorage* storage )
 {
-  _comment = _comment + TQString::tqfromLatin1("\n") + comment;
+  _comment = _comment + TQString::fromLatin1("\n") + comment;
   storage->addComment(this, comment);
 }
 
diff --git a/karm/task.h b/karm/task.h
index 53c7abcc9..165d60a8c 100644
--- a/karm/task.h
+++ b/karm/task.h
@@ -178,11 +178,11 @@ class Task : public TQObject, public TQListViewItem
        *  @param on       true or false for starting or stopping a task
        *  @param storage a pointer to a KarmStorage object.
        *  @param whenStarted time when the task was started. Normally
-				    TQDateTime::tqcurrentDateTime, but if calendar has 
+				    TQDateTime::currentDateTime, but if calendar has 
 				    been changed by another program and being reloaded
  				    the task is set to running with another start date
        */
-      void setRunning( bool on, KarmStorage* storage, TQDateTime whenStarted=TQDateTime::tqcurrentDateTime(), TQDateTime whenStopped=TQDateTime::tqcurrentDateTime());
+      void setRunning( bool on, KarmStorage* storage, TQDateTime whenStarted=TQDateTime::currentDateTime(), TQDateTime whenStopped=TQDateTime::currentDateTime());
 
       /** return the state of a task - if it's running or not
        *  @return         true or false depending on whether the task is running
diff --git a/karm/taskview.h b/karm/taskview.h
index f1b22048f..988ad154d 100644
--- a/karm/taskview.h
+++ b/karm/taskview.h
@@ -173,7 +173,7 @@ class TaskView : public KListView
      * @param task      task to start timer of
      * @param startTime if taskview has been modified by another program, we 
 			     have to set the starting time to not-now. */
-    void startTimerFor( Task* task, TQDateTime startTime = TQDateTime::tqcurrentDateTime() );
+    void startTimerFor( Task* task, TQDateTime startTime = TQDateTime::currentDateTime() );
     void stopTimerFor( Task* task );
 
     /** clears all active tasks. Needed e.g. if iCal file was modified by
diff --git a/karm/test/lockerthread.cpp b/karm/test/lockerthread.cpp
index aeff6cc76..914682210 100644
--- a/karm/test/lockerthread.cpp
+++ b/karm/test/lockerthread.cpp
@@ -26,7 +26,7 @@ void LockerThread::run()
   KCal::ResourceCalendar          *calendar  = 0;
   KCal::CalendarResources::Ticket *lock      = 0;
 
-  calendars = new KCal::CalendarResources( TQString::tqfromLatin1( "UTC" ) );
+  calendars = new KCal::CalendarResources( TQString::fromLatin1( "UTC" ) );
   calendar  = new KCal::ResourceLocal( m_icsfile );
   lock      = calendars->requestSaveTicket( calendar );
   if ( lock )
diff --git a/karm/test/locking.cpp b/karm/test/locking.cpp
index cdf5e41a5..71113f79b 100644
--- a/karm/test/locking.cpp
+++ b/karm/test/locking.cpp
@@ -23,7 +23,7 @@ short test1()
   KCal::ResourceCalendar          *calendar  = 0;
   KCal::CalendarResources::Ticket *lock      = 0;
 
-  calendars = new KCal::CalendarResources( TQString::tqfromLatin1( "UTC" ) );
+  calendars = new KCal::CalendarResources( TQString::fromLatin1( "UTC" ) );
   calendar  = new KCal::ResourceLocal( icalfilename );
   lock      = calendars->requestSaveTicket( calendar );
 
@@ -62,7 +62,7 @@ short test2()
   KCal::ResourceCalendar          *calendar  = 0;
   KCal::CalendarResources::Ticket *lock      = 0;
 
-  calendars = new KCal::CalendarResources( TQString::tqfromLatin1( "UTC" ) );
+  calendars = new KCal::CalendarResources( TQString::fromLatin1( "UTC" ) );
   calendar  = new KCal::ResourceLocal( icalfilename );
 
   LockerThread thread( icalfilename );
@@ -88,7 +88,7 @@ short test3()
   KCal::ResourceCalendar          *calendar  = 0;
   KCal::CalendarResources::Ticket *lock      = 0;
 
-  calendars = new KCal::CalendarResources( TQString::tqfromLatin1( "UTC" ) );
+  calendars = new KCal::CalendarResources( TQString::fromLatin1( "UTC" ) );
   calendar  = new KCal::ResourceLocal( icalfilename );
 
   // lock then unlock
diff --git a/karm/test/script.cpp b/karm/test/script.cpp
index 58e5af3bc..816314368 100644
--- a/karm/test/script.cpp
+++ b/karm/test/script.cpp
@@ -94,7 +94,7 @@ void Script::terminate()
 
 void Script::exit()
 {
-  m_status = m_proc->exitqStatus();
+  m_status = m_proc->exiStatus();
   delete m_proc;
   m_proc = 0;
 }
diff --git a/karm/timekard.cpp b/karm/timekard.cpp
index d9b8d4a76..6ac410a26 100644
--- a/karm/timekard.cpp
+++ b/karm/timekard.cpp
@@ -43,7 +43,7 @@ const int timeWidth = 6;
 const int totalTimeWidth = 7;
 const int reportWidth = taskWidth + timeWidth;
 
-const TQString cr = TQString::tqfromLatin1("\n");
+const TQString cr = TQString::fromLatin1("\n");
 
 TQString TimeKard::totalsAsText(TaskView* taskview, bool justThisTask, WhichTime which)
 // Print the total Times as text. If justThisTask, use activeTask, else, all tasks
@@ -59,9 +59,9 @@ TQString TimeKard::totalsAsText(TaskView* taskview, bool justThisTask, WhichTime
 
   // header
   retval += i18n("Task Totals") + cr;
-  retval += KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime());
+  retval += KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime());
   retval += cr + cr;
-  retval += TQString(TQString::tqfromLatin1("%1    %2"))
+  retval += TQString(TQString::fromLatin1("%1    %2"))
     .tqarg(i18n("Time"), timeWidth)
     .tqarg(i18n("Task"));
   retval += cr;
@@ -92,8 +92,8 @@ TQString TimeKard::totalsAsText(TaskView* taskview, bool justThisTask, WhichTime
 
     // total
     buf.fill('-', reportWidth);
-    retval += TQString(TQString::tqfromLatin1("%1")).tqarg(buf, timeWidth) + cr;
-    retval += TQString(TQString::tqfromLatin1("%1 %2"))
+    retval += TQString(TQString::fromLatin1("%1")).tqarg(buf, timeWidth) + cr;
+    retval += TQString(TQString::fromLatin1("%1 %2"))
       .tqarg(formatTime(sum),timeWidth)
       .tqarg(i18n("Total"));
   }
@@ -109,7 +109,7 @@ void TimeKard::printTask(Task *task, TQString &s, int level, WhichTime which)
   TQString buf;
 
   s += buf.fill(' ', level);
-  s += TQString(TQString::tqfromLatin1("%1    %2"))
+  s += TQString(TQString::fromLatin1("%1    %2"))
     .tqarg(formatTime(which == TotalTime?task->totalTime():task->totalSessionTime()), timeWidth)
     .tqarg(task->name());
   s += cr;
@@ -134,8 +134,8 @@ void TimeKard::printTaskHistory(const Task *task,
   long sectionsum = 0;
   for ( TQDate day = from; day <= to; day = day.addDays(1) )
   {
-    TQString daykey = day.toString(TQString::tqfromLatin1("yyyyMMdd"));
-    TQString daytaskkey = TQString::tqfromLatin1("%1_%2")
+    TQString daykey = day.toString(TQString::fromLatin1("yyyyMMdd"));
+    TQString daytaskkey = TQString::fromLatin1("%1_%2")
                          .tqarg(daykey)
                          .tqarg(task->uid());
 
@@ -143,7 +143,7 @@ void TimeKard::printTaskHistory(const Task *task,
     {
       if ( !totalsOnly )
       {
-        s += TQString::tqfromLatin1("%1")
+        s += TQString::fromLatin1("%1")
              .tqarg(formatTime(taskdaytotals[daytaskkey]/60), timeWidth);
       }
       sectionsum += taskdaytotals[daytaskkey];  // in seconds
@@ -162,12 +162,12 @@ void TimeKard::printTaskHistory(const Task *task,
   }
 
   // Total for task this section (e.g. week)
-  s += TQString::tqfromLatin1("%1").tqarg(formatTime(sectionsum/60), totalTimeWidth);
+  s += TQString::fromLatin1("%1").tqarg(formatTime(sectionsum/60), totalTimeWidth);
 
   // Task name
   TQString buf;
   s += buf.fill(' ', level + 1);
-  s += TQString::tqfromLatin1("%1").tqarg(task->name());
+  s += TQString::fromLatin1("%1").tqarg(task->name());
   s += cr;
 
   for (Task* subTask = task->firstChild();
@@ -221,8 +221,8 @@ TQString TimeKard::sectionHistoryAsText(
   // so times are accumulated for each task.
   for (TQValueList<HistoryEvent>::iterator event = events.begin(); event != events.end(); ++event)
   {
-    TQString daykey = (*event).start().date().toString(TQString::tqfromLatin1("yyyyMMdd"));
-    TQString daytaskkey = TQString::tqfromLatin1("%1_%2")
+    TQString daykey = (*event).start().date().toString(TQString::fromLatin1("yyyyMMdd"));
+    TQString daytaskkey = TQString::fromLatin1("%1_%2")
                          .tqarg(daykey)
                          .tqarg((*event).todoUid());
 
@@ -246,7 +246,7 @@ TQString TimeKard::sectionHistoryAsText(
     // day headings
     for (TQDate day = sectionFrom; day <= sectionTo; day = day.addDays(1))
     {
-      retval += TQString::tqfromLatin1("%1").tqarg(day.day(), timeWidth);
+      retval += TQString::fromLatin1("%1").tqarg(day.day(), timeWidth);
     }
     retval += cr;
     retval += line;
@@ -280,13 +280,13 @@ TQString TimeKard::sectionHistoryAsText(
     long sum = 0;
     for (TQDate day = sectionFrom; day <= sectionTo; day = day.addDays(1))
     {
-      TQString daykey = day.toString(TQString::tqfromLatin1("yyyyMMdd"));
+      TQString daykey = day.toString(TQString::fromLatin1("yyyyMMdd"));
 
       if (daytotals.contains(daykey))
       {
         if ( !totalsOnly )
         {
-          retval += TQString::tqfromLatin1("%1")
+          retval += TQString::fromLatin1("%1")
                     .tqarg(formatTime(daytotals[daykey]/60), timeWidth);
         }
         sum += daytotals[daykey];  // in seconds
@@ -298,7 +298,7 @@ TQString TimeKard::sectionHistoryAsText(
       }
     }
 
-    retval += TQString::tqfromLatin1("%1 %2")
+    retval += TQString::fromLatin1("%1 %2")
               .tqarg(formatTime(sum/60), totalTimeWidth)
               .tqarg(i18n("Total"));
   }
@@ -317,7 +317,7 @@ TQString TimeKard::historyAsText(TaskView* taskview, const TQDate& from,
     .tqarg(KGlobal::locale()->formatDate(to));
   retval += cr;
   retval += i18n("Printed on: %1")
-    .tqarg(KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime()));
+    .tqarg(KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime()));
 
   if ( perWeek )
   {