Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.

4 files changed, 18 insertions, 18 deletions

diff --git a/korganizer/korgac/alarmdialog.cpp b/korganizer/korgac/alarmdialog.cpp
index 3f8be65b3..a1b436850 100644
--- a/korganizer/korgac/alarmdialog.cpp
+++ b/korganizer/korgac/alarmdialog.cpp
@@ -28,7 +28,7 @@
 #include <tqlabel.h>
 #include <tqfile.h>
 #include <tqspinbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpushbutton.h>
 #include <tqcstring.h>
 #include <tqdatastream.h>
@@ -402,7 +402,7 @@ void AlarmDialog::suspend()
     if ( item->isSelected() && item->isVisible() ) {
       item->setVisible( false );
       item->setSelected( false );
-      item->mRemindAt = TQDateTime::currentDateTime().addSecs( unit * mSuspendSpin->value() );
+      item->mRemindAt = TQDateTime::tqcurrentDateTime().addSecs( unit * mSuspendSpin->value() );
       item->mNotified = false;
       selitem = item;
     }
@@ -435,8 +435,8 @@ void AlarmDialog::setTimer()
   int nextReminderAt = -1;
   for ( TQListViewItemIterator it( mIncidenceListView ) ; it.current() ; ++it ) {
     AlarmListItem * item = static_cast<AlarmListItem*>( it.current() );
-    if ( item->mRemindAt > TQDateTime::currentDateTime() ) {
-      int secs = TQDateTime::currentDateTime().secsTo( item->mRemindAt );
+    if ( item->mRemindAt > TQDateTime::tqcurrentDateTime() ) {
+      int secs = TQDateTime::tqcurrentDateTime().secsTo( item->mRemindAt );
       nextReminderAt = nextReminderAt <= 0 ? secs : TQMIN( nextReminderAt, secs );
     }
   }
@@ -532,7 +532,7 @@ void AlarmDialog::wakeUp()
       continue;
     }
 
-    if ( item->mRemindAt <= TQDateTime::currentDateTime() ) {
+    if ( item->mRemindAt <= TQDateTime::tqcurrentDateTime() ) {
       if ( !item->isVisible() ) {
         item->setVisible( true );
         item->setSelected( false );
@@ -566,7 +566,7 @@ void AlarmDialog::slotSave()
     if ( !incidence ) {
       continue;
     }
-    config->setGroup( TQString("Incidence-%1").arg(numReminders + 1) );
+    config->setGroup( TQString("Incidence-%1").tqarg(numReminders + 1) );
     config->writeEntry( "UID", incidence->uid() );
     config->writeEntry( "RemindAt", item->mRemindAt );
     ++numReminders;
diff --git a/korganizer/korgac/alarmdockwindow.cpp b/korganizer/korgac/alarmdockwindow.cpp
index aaeedd7fe..9e4e9c238 100644
--- a/korganizer/korgac/alarmdockwindow.cpp
+++ b/korganizer/korgac/alarmdockwindow.cpp
@@ -192,7 +192,7 @@ void AlarmDockWindow::slotQuit()
            "(note that you will not get reminders whilst the daemon is not running)?"),
       i18n("Close KOrganizer Reminder Daemon"),
       i18n("Start"), i18n("Do Not Start"),
-      TQString::fromLatin1("AskForStartAtLogin")
+      TQString::tqfromLatin1("AskForStartAtLogin")
       );
 
   bool autostart = true;
diff --git a/korganizer/korgac/koalarmclient.cpp b/korganizer/korgac/koalarmclient.cpp
index 5b3ee4e9a..045dd9923 100644
--- a/korganizer/korgac/koalarmclient.cpp
+++ b/korganizer/korgac/koalarmclient.cpp
@@ -71,7 +71,7 @@ KOAlarmClient::KOAlarmClient( TQObject *parent, const char *name )
   config->setGroup( "General" );
   int numReminders = config->readNumEntry( "Reminders", 0 );
   for ( int i = 1; i <= numReminders; ++i ) {
-    TQString group( TQString( "Incidence-%1" ).arg( i ) );
+    TQString group( TQString( "Incidence-%1" ).tqarg( i ) );
     config->setGroup( group );
     TQString uid = config->readEntry( "UID" );
     TQDateTime dt = config->readDateTimeEntry( "RemindAt" );
@@ -108,7 +108,7 @@ void KOAlarmClient::checkAlarms()
   if ( !cfg->readBoolEntry( "Enabled", true ) ) return;
 
   TQDateTime from = mLastChecked.addSecs( 1 );
-  mLastChecked = TQDateTime::currentDateTime();
+  mLastChecked = TQDateTime::tqcurrentDateTime();
 
   kdDebug(5891) << "Check: " << from.toString() << " - " << mLastChecked.toString() << endl;
 
@@ -188,7 +188,7 @@ void KOAlarmClient::dumpDebug()
 
 TQStringList KOAlarmClient::dumpAlarms()
 {
-  TQDateTime start = TQDateTime( TQDateTime::currentDateTime().date(),
+  TQDateTime start = TQDateTime( TQDateTime::tqcurrentDateTime().date(),
                                TQTime( 0, 0 ) );
   TQDateTime end = start.addDays( 1 ).addSecs( -1 );
 
diff --git a/korganizer/korgac/testalarmdlg.cpp b/korganizer/korgac/testalarmdlg.cpp
index cd3f434f4..1d9159ae7 100644
--- a/korganizer/korgac/testalarmdlg.cpp
+++ b/korganizer/korgac/testalarmdlg.cpp
@@ -48,7 +48,7 @@ int main(int argc,char **argv)
 
   Event *e1 = new Event;
   e1->setSummary( "This is a summary." );
-  TQDateTime now = TQDateTime::currentDateTime();
+  TQDateTime now = TQDateTime::tqcurrentDateTime();
   e1->setDtStart( now );
   e1->setDtEnd( now.addDays( 1 ) );
   Alarm *a = e1->newAlarm();
@@ -97,19 +97,19 @@ int main(int argc,char **argv)
 
   AlarmDialog dlg( mCalendar, 0 );
   app.setMainWidget( &dlg );
-  dlg.addIncidence( e2, TQDateTime::currentDateTime().addSecs( 60 ),
+  dlg.addIncidence( e2, TQDateTime::tqcurrentDateTime().addSecs( 60 ),
                     TQString() );
-  dlg.addIncidence( t1, TQDateTime::currentDateTime().addSecs( 300 ),
+  dlg.addIncidence( t1, TQDateTime::tqcurrentDateTime().addSecs( 300 ),
                     TQString( "THIS IS DISPLAY TEXT" ) );
-  dlg.addIncidence( e4, TQDateTime::currentDateTime().addSecs( 120 ),
+  dlg.addIncidence( e4, TQDateTime::tqcurrentDateTime().addSecs( 120 ),
                     TQString( "Fred and Barney get cloned" ) );
-  dlg.addIncidence( e3, TQDateTime::currentDateTime().addSecs( 240 ),
+  dlg.addIncidence( e3, TQDateTime::tqcurrentDateTime().addSecs( 240 ),
                     TQString() );
-  dlg.addIncidence( e1, TQDateTime::currentDateTime().addSecs( 180 ),
+  dlg.addIncidence( e1, TQDateTime::tqcurrentDateTime().addSecs( 180 ),
                     TQString() );
-  dlg.addIncidence( t2, TQDateTime::currentDateTime().addSecs( 600 ),
+  dlg.addIncidence( t2, TQDateTime::tqcurrentDateTime().addSecs( 600 ),
                     TQString( "THIS IS DISPLAY TEXT" ) );
-  dlg.addIncidence( t3, TQDateTime::currentDateTime().addSecs( 360 ),
+  dlg.addIncidence( t3, TQDateTime::tqcurrentDateTime().addSecs( 360 ),
                     TQString() );
   dlg.show();
   dlg.eventNotification();