From f4fae92b6768541e2952173c3d4b09040f95bf7e Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 16 Feb 2011 20:17:18 +0000 Subject: Moved kpilot from kdepim to applications, as the core Trinity libraries should not contain hardware-dependent software git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1221127 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- korganizer/korgac/alarmdialog.cpp | 16 ++++++++-------- korganizer/korgac/alarmdockwindow.cpp | 4 ++-- korganizer/korgac/koalarmclient.cpp | 4 ++-- korganizer/korgac/testalarmdlg.cpp | 16 ++++++++-------- 4 files changed, 20 insertions(+), 20 deletions(-) (limited to 'korganizer/korgac') diff --git a/korganizer/korgac/alarmdialog.cpp b/korganizer/korgac/alarmdialog.cpp index 839d463a9..6b12f76c2 100644 --- a/korganizer/korgac/alarmdialog.cpp +++ b/korganizer/korgac/alarmdialog.cpp @@ -192,7 +192,7 @@ static TQString cleanSummary( const TQString &summary ) { uint maxLen = 45; TQString retStr = summary; - retStr.replace( '\n', ' ' ); + retStr.tqreplace( '\n', ' ' ); if ( retStr.length() > maxLen ) { maxLen -= etc.length(); retStr = retStr.left( maxLen ); @@ -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( 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 : QMIN( 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 ); @@ -650,7 +650,7 @@ bool AlarmDialog::ensureKorganizerRunning() const TQString error; TQCString dcopService; - int result = KDCOPServiceStarter::self()->findServiceFor( + int result = KDCOPServiceStarter::self()->tqfindServiceFor( "DCOP/Organizer", TQString::null, TQString::null, &error, &dcopService ); if ( result == 0 ) { @@ -659,12 +659,12 @@ bool AlarmDialog::ensureKorganizerRunning() const // but korganizer not loaded into it...] static const char* const dcopObjectId = "KOrganizerIface"; TQCString dummy; - if ( !kapp->dcopClient()->findObject( + if ( !kapp->dcopClient()->tqfindObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ) { DCOPRef ref( dcopService, dcopService ); // talk to KUniqueApplication or its kontact wrapper DCOPReply reply = ref.call( "load()" ); if ( reply.isValid() && (bool)reply ) { - Q_ASSERT( kapp->dcopClient()->findObject( + Q_ASSERT( kapp->dcopClient()->tqfindObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ); } else { kdWarning() << "Error loading " << dcopService << endl; diff --git a/korganizer/korgac/alarmdockwindow.cpp b/korganizer/korgac/alarmdockwindow.cpp index bef9b1bda..90360dc6a 100644 --- a/korganizer/korgac/alarmdockwindow.cpp +++ b/korganizer/korgac/alarmdockwindow.cpp @@ -91,7 +91,7 @@ AlarmDockWindow::AlarmDockWindow( const char *name ) connect( quit, TQT_SIGNAL( activated() ), TQT_SLOT( slotQuit() ) ); } #else //FIXME: remove for KDE 4.0 - quit->disconnect( TQT_SIGNAL( activated() ), qApp, + quit->disconnect( TQT_SIGNAL( activated() ), tqApp, TQT_SLOT( closeAllWindows() ) ); } connect( this, TQT_SIGNAL( quitSelected() ), TQT_SLOT( slotQuit() ) ); @@ -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 ec19ce9aa..7ed25518a 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::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 5a3ba5a18..7cf090e29 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(); -- cgit v1.2.1