From 0e00c0a86a4c9d7e80c7b66d91940cc7dcb79f78 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Dec 2011 18:34:45 -0600 Subject: Rename old tq methods that no longer need a unique name --- korganizer/korgac/alarmdialog.cpp | 8 ++++---- korganizer/korgac/alarmdockwindow.cpp | 2 +- korganizer/korgac/koalarmclient.cpp | 4 ++-- korganizer/korgac/testalarmdlg.cpp | 16 ++++++++-------- 4 files changed, 15 insertions(+), 15 deletions(-) (limited to 'korganizer/korgac') diff --git a/korganizer/korgac/alarmdialog.cpp b/korganizer/korgac/alarmdialog.cpp index a1b436850..cd46bbe43 100644 --- a/korganizer/korgac/alarmdialog.cpp +++ b/korganizer/korgac/alarmdialog.cpp @@ -402,7 +402,7 @@ void AlarmDialog::suspend() if ( item->isSelected() && item->isVisible() ) { item->setVisible( false ); item->setSelected( false ); - item->mRemindAt = TQDateTime::tqcurrentDateTime().addSecs( unit * mSuspendSpin->value() ); + item->mRemindAt = TQDateTime::currentDateTime().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( it.current() ); - if ( item->mRemindAt > TQDateTime::tqcurrentDateTime() ) { - int secs = TQDateTime::tqcurrentDateTime().secsTo( item->mRemindAt ); + if ( item->mRemindAt > TQDateTime::currentDateTime() ) { + int secs = TQDateTime::currentDateTime().secsTo( item->mRemindAt ); nextReminderAt = nextReminderAt <= 0 ? secs : TQMIN( nextReminderAt, secs ); } } @@ -532,7 +532,7 @@ void AlarmDialog::wakeUp() continue; } - if ( item->mRemindAt <= TQDateTime::tqcurrentDateTime() ) { + if ( item->mRemindAt <= TQDateTime::currentDateTime() ) { if ( !item->isVisible() ) { item->setVisible( true ); item->setSelected( false ); diff --git a/korganizer/korgac/alarmdockwindow.cpp b/korganizer/korgac/alarmdockwindow.cpp index 9e4e9c238..aaeedd7fe 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::tqfromLatin1("AskForStartAtLogin") + TQString::fromLatin1("AskForStartAtLogin") ); bool autostart = true; diff --git a/korganizer/korgac/koalarmclient.cpp b/korganizer/korgac/koalarmclient.cpp index 045dd9923..93c0602aa 100644 --- a/korganizer/korgac/koalarmclient.cpp +++ b/korganizer/korgac/koalarmclient.cpp @@ -108,7 +108,7 @@ void KOAlarmClient::checkAlarms() if ( !cfg->readBoolEntry( "Enabled", true ) ) return; TQDateTime from = mLastChecked.addSecs( 1 ); - mLastChecked = TQDateTime::tqcurrentDateTime(); + mLastChecked = TQDateTime::currentDateTime(); kdDebug(5891) << "Check: " << from.toString() << " - " << mLastChecked.toString() << endl; @@ -188,7 +188,7 @@ void KOAlarmClient::dumpDebug() TQStringList KOAlarmClient::dumpAlarms() { - TQDateTime start = TQDateTime( TQDateTime::tqcurrentDateTime().date(), + TQDateTime start = TQDateTime( TQDateTime::currentDateTime().date(), TQTime( 0, 0 ) ); TQDateTime end = start.addDays( 1 ).addSecs( -1 ); diff --git a/korganizer/korgac/testalarmdlg.cpp b/korganizer/korgac/testalarmdlg.cpp index 1d9159ae7..cd3f434f4 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::tqcurrentDateTime(); + TQDateTime now = TQDateTime::currentDateTime(); 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::tqcurrentDateTime().addSecs( 60 ), + dlg.addIncidence( e2, TQDateTime::currentDateTime().addSecs( 60 ), TQString() ); - dlg.addIncidence( t1, TQDateTime::tqcurrentDateTime().addSecs( 300 ), + dlg.addIncidence( t1, TQDateTime::currentDateTime().addSecs( 300 ), TQString( "THIS IS DISPLAY TEXT" ) ); - dlg.addIncidence( e4, TQDateTime::tqcurrentDateTime().addSecs( 120 ), + dlg.addIncidence( e4, TQDateTime::currentDateTime().addSecs( 120 ), TQString( "Fred and Barney get cloned" ) ); - dlg.addIncidence( e3, TQDateTime::tqcurrentDateTime().addSecs( 240 ), + dlg.addIncidence( e3, TQDateTime::currentDateTime().addSecs( 240 ), TQString() ); - dlg.addIncidence( e1, TQDateTime::tqcurrentDateTime().addSecs( 180 ), + dlg.addIncidence( e1, TQDateTime::currentDateTime().addSecs( 180 ), TQString() ); - dlg.addIncidence( t2, TQDateTime::tqcurrentDateTime().addSecs( 600 ), + dlg.addIncidence( t2, TQDateTime::currentDateTime().addSecs( 600 ), TQString( "THIS IS DISPLAY TEXT" ) ); - dlg.addIncidence( t3, TQDateTime::tqcurrentDateTime().addSecs( 360 ), + dlg.addIncidence( t3, TQDateTime::currentDateTime().addSecs( 360 ), TQString() ); dlg.show(); dlg.eventNotification(); -- cgit v1.2.1