diff options
Diffstat (limited to 'korganizer/korgac')
-rw-r--r-- | korganizer/korgac/alarmdialog.cpp | 36 | ||||
-rw-r--r-- | korganizer/korgac/alarmdialog.h | 2 | ||||
-rw-r--r-- | korganizer/korgac/alarmdockwindow.cpp | 34 | ||||
-rw-r--r-- | korganizer/korgac/alarmdockwindow.h | 2 | ||||
-rw-r--r-- | korganizer/korgac/koalarmclient.cpp | 24 | ||||
-rw-r--r-- | korganizer/korgac/koalarmclient.h | 2 | ||||
-rw-r--r-- | korganizer/korgac/korgacmain.cpp | 6 | ||||
-rw-r--r-- | korganizer/korgac/testalarmdlg.cpp | 2 |
8 files changed, 54 insertions, 54 deletions
diff --git a/korganizer/korgac/alarmdialog.cpp b/korganizer/korgac/alarmdialog.cpp index b38e6a79..91fb5d59 100644 --- a/korganizer/korgac/alarmdialog.cpp +++ b/korganizer/korgac/alarmdialog.cpp @@ -41,7 +41,7 @@ #include <kdcopservicestarter.h> #include <kiconloader.h> #include <tdelocale.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kaudioplayer.h> #include <kdebug.h> #include <tdemessagebox.h> @@ -109,8 +109,8 @@ AlarmDialog::AlarmDialog( KCal::CalendarResources *calendar, TQWidget *parent, c // User3 => Dismiss Selected // Ok => Suspend - connect( calendar, TQT_SIGNAL(calendarChanged()), - this, TQT_SLOT(slotCalendarChanged()) ); + connect( calendar, TQ_SIGNAL(calendarChanged()), + this, TQ_SLOT(slotCalendarChanged()) ); TDEGlobal::iconLoader()->addAppDir( "tdepim" ); setButtonOK( i18n( "Suspend" ) ); @@ -122,7 +122,7 @@ AlarmDialog::AlarmDialog( KCal::CalendarResources *calendar, TQWidget *parent, c TQLabel *label = new TQLabel( i18n("The following items triggered reminders:"), topBox ); topLayout->addWidget( label ); - mSplitter = new TQSplitter( Qt::Vertical, topBox ); + mSplitter = new TQSplitter( TQt::Vertical, topBox ); mSplitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() ); topLayout->addWidget( mSplitter ); @@ -135,10 +135,10 @@ AlarmDialog::AlarmDialog( KCal::CalendarResources *calendar, TQWidget *parent, c mIncidenceListView->setShowSortIndicator( true ); mIncidenceListView->setAllColumnsShowFocus( true ); mIncidenceListView->setSelectionMode( TQListView::Extended ); - connect( mIncidenceListView, TQT_SIGNAL(selectionChanged()), TQT_SLOT(updateButtons()) ); - connect( mIncidenceListView, TQT_SIGNAL(doubleClicked(TQListViewItem*)), TQT_SLOT(edit()) ); - connect( mIncidenceListView, TQT_SIGNAL(currentChanged(TQListViewItem*)), TQT_SLOT(showDetails()) ); - connect( mIncidenceListView, TQT_SIGNAL(selectionChanged()), TQT_SLOT(showDetails()) ); + connect( mIncidenceListView, TQ_SIGNAL(selectionChanged()), TQ_SLOT(updateButtons()) ); + connect( mIncidenceListView, TQ_SIGNAL(doubleClicked(TQListViewItem*)), TQ_SLOT(edit()) ); + connect( mIncidenceListView, TQ_SIGNAL(currentChanged(TQListViewItem*)), TQ_SLOT(showDetails()) ); + connect( mIncidenceListView, TQ_SIGNAL(selectionChanged()), TQ_SLOT(showDetails()) ); mDetailView = new KOEventViewer( mCalendar, mSplitter ); mDetailView->setFocus(); // set focus here to start with to make it harder @@ -160,7 +160,7 @@ AlarmDialog::AlarmDialog( KCal::CalendarResources *calendar, TQWidget *parent, c mSuspendUnit->insertItem( i18n("week(s)") ); mSuspendUnit->setCurrentItem( defSuspendUnit ); - connect( &mSuspendTimer, TQT_SIGNAL(timeout()), TQT_SLOT(wakeUp()) ); + connect( &mSuspendTimer, TQ_SIGNAL(timeout()), TQ_SLOT(wakeUp()) ); setMainWidget( mIncidenceListView ); mIncidenceListView->setMinimumSize( 500, 50 ); @@ -203,7 +203,7 @@ static TQString cleanSummary( const TQString &summary ) void AlarmDialog::readLayout() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup( "Layout" ); TQValueList<int> sizes = config->readIntListEntry( "SplitterSizes" ); if ( sizes.count() == 2 ) { @@ -215,7 +215,7 @@ void AlarmDialog::readLayout() void AlarmDialog::writeLayout() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup( "Layout" ); TQValueList<int> list = mSplitter->sizes(); config->writeEntry( "SplitterSizes", list ); @@ -344,7 +344,7 @@ void AlarmDialog::edit() arg << incidence->uid(); arg << dt; //kdDebug(5890) << "editing incidence " << incidence->summary() << endl; - if ( !kapp->dcopClient()->send( "korganizer", "KOrganizerIface", + if ( !tdeApp->dcopClient()->send( "korganizer", "KOrganizerIface", "editIncidence(TQString,TQDate)", data ) ) { KMessageBox::error( @@ -356,9 +356,9 @@ void AlarmDialog::edit() // get desktop # where korganizer (or kontact) runs TQByteArray replyData; TQCString object, replyType; - object = kapp->dcopClient()->isApplicationRegistered( "kontact" ) ? + object = tdeApp->dcopClient()->isApplicationRegistered( "kontact" ) ? "kontact-mainwindow#1" : "KOrganizer MainWindow"; - if (!kapp->dcopClient()->call( "korganizer", object, + if (!tdeApp->dcopClient()->call( "korganizer", object, "getWinID()", 0, replyType, replyData, true, -1 ) ) { } @@ -566,7 +566,7 @@ void AlarmDialog::wakeUp() void AlarmDialog::slotSave() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); TDELockFile::Ptr lock = config->lockFile(); if ( lock.data()->lock() != TDELockFile::LockOK ) return; @@ -673,12 +673,12 @@ bool AlarmDialog::ensureKorganizerRunning() const // but korganizer not loaded into it...] static const char* const dcopObjectId = "KOrganizerIface"; TQCString dummy; - if ( !kapp->dcopClient()->findObject( + if ( !tdeApp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ) { - DCOPRef ref( dcopService, dcopService ); // talk to KUniqueApplication or its kontact wrapper + DCOPRef ref( dcopService, dcopService ); // talk to TDEUniqueApplication or its kontact wrapper DCOPReply reply = ref.call( "load()" ); if ( reply.isValid() && (bool)reply ) { - Q_ASSERT( kapp->dcopClient()->findObject( + Q_ASSERT( tdeApp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ); } else { kdWarning() << "Error loading " << dcopService << endl; diff --git a/korganizer/korgac/alarmdialog.h b/korganizer/korgac/alarmdialog.h index 949c17f7..d11dc591 100644 --- a/korganizer/korgac/alarmdialog.h +++ b/korganizer/korgac/alarmdialog.h @@ -43,7 +43,7 @@ class TQSpinBox; class TQSplitter; class AlarmDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: explicit AlarmDialog( CalendarResources *calendar, TQWidget *parent = 0, const char *name = 0 ); diff --git a/korganizer/korgac/alarmdockwindow.cpp b/korganizer/korgac/alarmdockwindow.cpp index 081d91ca..c5960b76 100644 --- a/korganizer/korgac/alarmdockwindow.cpp +++ b/korganizer/korgac/alarmdockwindow.cpp @@ -32,7 +32,7 @@ #include <kiconloader.h> #include <tdeconfig.h> #include <kurl.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <dcopclient.h> #include <tdepopupmenu.h> #include <tdemessagebox.h> @@ -48,7 +48,7 @@ AlarmDockWindow::AlarmDockWindow( const char *name ) : KSystemTray( 0, name ) { // Read the autostart status from the config file - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("General"); bool autostart = config->readBoolEntry( "Autostart", true ); bool alarmsEnabled = config->readBoolEntry( "Enabled", true ); @@ -64,16 +64,16 @@ AlarmDockWindow::AlarmDockWindow( const char *name ) setPixmap( alarmsEnabled ? mPixmapEnabled : mPixmapDisabled ); // Set up the context menu - mSuspendAll = contextMenu()->insertItem( i18n("Suspend All"), this, TQT_SLOT( slotSuspendAll() ) ); - mDismissAll = contextMenu()->insertItem( i18n("Dismiss All"), this, TQT_SLOT( slotDismissAll() ) ); + mSuspendAll = contextMenu()->insertItem( i18n("Suspend All"), this, TQ_SLOT( slotSuspendAll() ) ); + mDismissAll = contextMenu()->insertItem( i18n("Dismiss All"), this, TQ_SLOT( slotDismissAll() ) ); contextMenu()->setItemEnabled( mSuspendAll, false ); contextMenu()->setItemEnabled( mDismissAll, false ); contextMenu()->insertSeparator(); mAlarmsEnabledId = contextMenu()->insertItem( i18n("Reminders Enabled"), this, - TQT_SLOT( toggleAlarmsEnabled() ) ); + TQ_SLOT( toggleAlarmsEnabled() ) ); mAutostartId = contextMenu()->insertItem( i18n("Start Reminder Daemon at Login"), this, - TQT_SLOT( toggleAutostart() ) ); + TQ_SLOT( toggleAutostart() ) ); contextMenu()->setItemChecked( mAutostartId, autostart ); contextMenu()->setItemChecked( mAlarmsEnabledId, alarmsEnabled ); @@ -86,15 +86,15 @@ AlarmDockWindow::AlarmDockWindow( const char *name ) kdDebug(5890) << "No Quit standard action." << endl; } else { #if KDE_IS_VERSION(3,3,90) - quit->disconnect( TQT_SIGNAL( activated() ), this, - TQT_SLOT( maybeQuit() ) ); - connect( quit, TQT_SIGNAL( activated() ), TQT_SLOT( slotQuit() ) ); + quit->disconnect( TQ_SIGNAL( activated() ), this, + TQ_SLOT( maybeQuit() ) ); + connect( quit, TQ_SIGNAL( activated() ), TQ_SLOT( slotQuit() ) ); } #else //FIXME: remove for KDE 4.0 - quit->disconnect( TQT_SIGNAL( activated() ), tqApp, - TQT_SLOT( closeAllWindows() ) ); + quit->disconnect( TQ_SIGNAL( activated() ), tqApp, + TQ_SLOT( closeAllWindows() ) ); } - connect( this, TQT_SIGNAL( quitSelected() ), TQT_SLOT( slotQuit() ) ); + connect( this, TQ_SIGNAL( quitSelected() ), TQ_SLOT( slotQuit() ) ); #endif TQToolTip::add(this, mName ); @@ -110,7 +110,7 @@ void AlarmDockWindow::resizeTrayIcon () mPixmapEnabled = loadSizedIcon( "korgac", width() ); mPixmapDisabled = loadSizedIcon( "korgac_disabled", width() ); - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); bool alarmsEnabled = config->readBoolEntry( "Enabled", true ); setPixmap( alarmsEnabled ? mPixmapEnabled : mPixmapDisabled ); } @@ -148,7 +148,7 @@ void AlarmDockWindow::toggleAlarmsEnabled() { kdDebug(5890) << "AlarmDockWindow::toggleAlarmsEnabled()" << endl; - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup( "General" ); bool enabled = !contextMenu()->isItemChecked( mAlarmsEnabledId ); @@ -178,7 +178,7 @@ void AlarmDockWindow::slotDismissAll() void AlarmDockWindow::enableAutostart( bool enable ) { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup( "General" ); config->writeEntry( "Autostart", enable ); config->sync(); @@ -188,8 +188,8 @@ void AlarmDockWindow::enableAutostart( bool enable ) void AlarmDockWindow::mousePressEvent( TQMouseEvent *e ) { - if ( e->button() == Qt::LeftButton ) { - kapp->startServiceByDesktopName( "korganizer", TQString() ); + if ( e->button() == TQt::LeftButton ) { + tdeApp->startServiceByDesktopName( "korganizer", TQString() ); } else { KSystemTray::mousePressEvent( e ); } diff --git a/korganizer/korgac/alarmdockwindow.h b/korganizer/korgac/alarmdockwindow.h index 6f6cd7bd..81c00a8c 100644 --- a/korganizer/korgac/alarmdockwindow.h +++ b/korganizer/korgac/alarmdockwindow.h @@ -30,7 +30,7 @@ class AlarmDockWindow : public KSystemTray { - Q_OBJECT + TQ_OBJECT public: AlarmDockWindow( const char *name = 0 ); diff --git a/korganizer/korgac/koalarmclient.cpp b/korganizer/korgac/koalarmclient.cpp index 2a87c7fd..e102c1dc 100644 --- a/korganizer/korgac/koalarmclient.cpp +++ b/korganizer/korgac/koalarmclient.cpp @@ -31,7 +31,7 @@ #include <libkcal/calendarresources.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include <tdelocale.h> #include <tdeapplication.h> @@ -46,8 +46,8 @@ KOAlarmClient::KOAlarmClient( TQObject *parent, const char *name ) mDocker = new AlarmDockWindow; mDocker->show(); - connect( this, TQT_SIGNAL( reminderCount( int ) ), mDocker, TQT_SLOT( slotUpdate( int ) ) ); - connect( mDocker, TQT_SIGNAL( quitSignal() ), TQT_SLOT( slotQuit() ) ); + connect( this, TQ_SIGNAL( reminderCount( int ) ), mDocker, TQ_SLOT( slotUpdate( int ) ) ); + connect( mDocker, TQ_SIGNAL( quitSignal() ), TQ_SLOT( slotQuit() ) ); TDEConfig c( locate( "config", "korganizerrc" ) ); c.setGroup( "Time & Date" ); @@ -58,9 +58,9 @@ KOAlarmClient::KOAlarmClient( TQObject *parent, const char *name ) mCalendar->readConfig(); mCalendar->load(); - connect( &mCheckTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( checkAlarms() ) ); + connect( &mCheckTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( checkAlarms() ) ); - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup( "Alarms" ); int interval = config->readNumEntry( "Interval", 60 ); kdDebug(5890) << "KOAlarmClient check interval: " << interval << " seconds." @@ -102,7 +102,7 @@ KOAlarmClient::~KOAlarmClient() void KOAlarmClient::checkAlarms() { - TDEConfig *cfg = kapp->config(); + TDEConfig *cfg = tdeApp->config(); cfg->setGroup( "General" ); if ( !cfg->readBoolEntry( "Enabled", true ) ) return; @@ -132,10 +132,10 @@ void KOAlarmClient::createReminder( KCal::CalendarResources *calendar, if ( !mDialog ) { mDialog = new AlarmDialog( calendar ); - connect( mDialog, TQT_SIGNAL(reminderCount(int)), mDocker, TQT_SLOT(slotUpdate(int)) ); - connect( mDocker, TQT_SIGNAL(suspendAllSignal()), mDialog, TQT_SLOT(suspendAll()) ); - connect( mDocker, TQT_SIGNAL(dismissAllSignal()), mDialog, TQT_SLOT(dismissAll()) ); - connect( this, TQT_SIGNAL( saveAllSignal() ), mDialog, TQT_SLOT( slotSave() ) ); + connect( mDialog, TQ_SIGNAL(reminderCount(int)), mDocker, TQ_SLOT(slotUpdate(int)) ); + connect( mDocker, TQ_SIGNAL(suspendAllSignal()), mDialog, TQ_SLOT(suspendAll()) ); + connect( mDocker, TQ_SIGNAL(dismissAllSignal()), mDialog, TQ_SLOT(dismissAll()) ); + connect( this, TQ_SIGNAL( saveAllSignal() ), mDialog, TQ_SLOT( slotSave() ) ); } mDialog->addIncidence( incidence, dt, displayText ); @@ -160,7 +160,7 @@ void KOAlarmClient::saveLastCheckTime() void KOAlarmClient::quit() { kdDebug(5890) << "KOAlarmClient::quit()" << endl; - kapp->quit(); + tdeApp->quit(); } bool KOAlarmClient::commitData( TQSessionManager& ) @@ -178,7 +178,7 @@ void KOAlarmClient::forceAlarmCheck() void KOAlarmClient::dumpDebug() { - TDEConfig *cfg = kapp->config(); + TDEConfig *cfg = tdeApp->config(); cfg->setGroup( "Alarms" ); TQDateTime lastChecked = cfg->readDateTimeEntry( "CalendarsLastChecked" ); diff --git a/korganizer/korgac/koalarmclient.h b/korganizer/korgac/koalarmclient.h index a8628848..ef6e5d27 100644 --- a/korganizer/korgac/koalarmclient.h +++ b/korganizer/korgac/koalarmclient.h @@ -43,7 +43,7 @@ class Incidence; class KOAlarmClient : public TQObject, virtual public AlarmClientIface, public KSessionManaged { - Q_OBJECT + TQ_OBJECT public: KOAlarmClient( TQObject *parent = 0, const char *name = 0 ); diff --git a/korganizer/korgac/korgacmain.cpp b/korganizer/korgac/korgacmain.cpp index d44ac4a2..c278f3c8 100644 --- a/korganizer/korgac/korgacmain.cpp +++ b/korganizer/korgac/korgacmain.cpp @@ -29,11 +29,11 @@ #include <tdelocale.h> #include <tdecmdlineargs.h> #include <tdeaboutdata.h> -#include <kuniqueapplication.h> +#include <tdeuniqueapplication.h> #include "koalarmclient.h" -class MyApp : public KUniqueApplication +class MyApp : public TDEUniqueApplication { public: MyApp() : mClient( 0 ) {} @@ -74,7 +74,7 @@ int main( int argc, char **argv ) TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::addCmdLineOptions( options ); - KUniqueApplication::addCmdLineOptions(); + TDEUniqueApplication::addCmdLineOptions(); if ( !MyApp::start() ) exit( 0 ); diff --git a/korganizer/korgac/testalarmdlg.cpp b/korganizer/korgac/testalarmdlg.cpp index de4f839e..1f4fcfb2 100644 --- a/korganizer/korgac/testalarmdlg.cpp +++ b/korganizer/korgac/testalarmdlg.cpp @@ -30,7 +30,7 @@ #include <tdelocale.h> #include <tdecmdlineargs.h> #include <tdeconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "alarmdialog.h" |