diff options
Diffstat (limited to 'kalarm/kalarmapp.cpp')
-rw-r--r-- | kalarm/kalarmapp.cpp | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/kalarm/kalarmapp.cpp b/kalarm/kalarmapp.cpp index 476a8c1f..c0eb6b55 100644 --- a/kalarm/kalarmapp.cpp +++ b/kalarm/kalarmapp.cpp @@ -31,11 +31,11 @@ #include <tdecmdlineargs.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeconfig.h> #include <tdeaboutdata.h> #include <dcopclient.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdetempfile.h> #include <tdefileitem.h> #include <kstdguiitem.h> @@ -94,7 +94,7 @@ TQString KAlarmApp::mFatalMessage; * Construct the application. */ KAlarmApp::KAlarmApp() - : KUniqueApplication(), + : TDEUniqueApplication(), mInitialised(false), mDcopHandler(new DcopHandler()), #ifdef OLD_DCOP @@ -109,7 +109,7 @@ KAlarmApp::KAlarmApp() mSpeechEnabled(false) { Preferences::initialise(); - Preferences::connect(TQT_SIGNAL(preferencesChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotPreferencesChanged())); + Preferences::connect(TQ_SIGNAL(preferencesChanged()), this, TQ_SLOT(slotPreferencesChanged())); KCal::CalFormat::setApplication(aboutData()->programName(), AlarmCalendar::icalProductId()); KARecurrence::setDefaultFeb29Type(Preferences::defaultFeb29Type()); @@ -118,9 +118,9 @@ KAlarmApp::KAlarmApp() if (AlarmCalendar::initialiseCalendars()) { - connect(AlarmCalendar::expiredCalendar(), TQT_SIGNAL(purged()), TQT_SLOT(slotExpiredPurged())); + connect(AlarmCalendar::expiredCalendar(), TQ_SIGNAL(purged()), TQ_SLOT(slotExpiredPurged())); - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup(TQString::fromLatin1("General")); mNoSystemTray = config->readBoolEntry(TQString::fromLatin1("NoSystemTray"), false); mSavedNoSystemTray = mNoSystemTray; @@ -244,7 +244,7 @@ bool KAlarmApp::restoreSession() } /****************************************************************************** -* Called for a KUniqueApplication when a new instance of the application is +* Called for a TDEUniqueApplication when a new instance of the application is * started. */ int KAlarmApp::newInstance() @@ -834,7 +834,7 @@ void KAlarmApp::doQuit(TQWidget* parent) void KAlarmApp::commitData(TQSessionManager& sm) { mSessionClosingDown = true; - KUniqueApplication::commitData(sm); + TDEUniqueApplication::commitData(sm); mSessionClosingDown = false; // reset in case shutdown is cancelled } @@ -849,7 +849,7 @@ void KAlarmApp::displayFatalError(const TQString& message) mFatalError = 1; mFatalMessage = message; if (theInstance) - TQTimer::singleShot(0, theInstance, TQT_SLOT(quitFatal())); + TQTimer::singleShot(0, theInstance, TQ_SLOT(quitFatal())); } } @@ -873,7 +873,7 @@ void KAlarmApp::quitFatal() theInstance->quitIf(1, true); break; } - TQTimer::singleShot(1000, this, TQT_SLOT(quitFatal())); + TQTimer::singleShot(1000, this, TQ_SLOT(quitFatal())); } /****************************************************************************** @@ -989,7 +989,7 @@ bool KAlarmApp::displayTrayIcon(bool show, MainWindow* parent) creating = false; } mTrayWindow = new TrayWindow(parent ? parent : MainWindow::firstWindow()); - connect(mTrayWindow, TQT_SIGNAL(deleted()), TQT_SIGNAL(trayIconToggled())); + connect(mTrayWindow, TQ_SIGNAL(deleted()), TQ_SIGNAL(trayIconToggled())); mTrayWindow->show(); emit trayIconToggled(); @@ -998,7 +998,7 @@ bool KAlarmApp::displayTrayIcon(bool show, MainWindow* parent) mCheckingSystemTray = true; mSavedNoSystemTray = mNoSystemTray; mNoSystemTray = false; - TQTimer::singleShot(0, this, TQT_SLOT(slotSystemTrayTimer())); + TQTimer::singleShot(0, this, TQ_SLOT(slotSystemTrayTimer())); } } else if (mTrayWindow) @@ -1042,7 +1042,7 @@ bool KAlarmApp::checkSystemTray() // daemon with the correct NOTIFY type. If that happened when there was no system // tray and alarms are disabled when KAlarm is not running, registering with // NO_START_NOTIFY could result in alarms never being seen. - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup(TQString::fromLatin1("General")); config->writeEntry(TQString::fromLatin1("NoSystemTray"), mNoSystemTray); config->sync(); @@ -1212,7 +1212,7 @@ bool KAlarmApp::scheduleEvent(KAEvent::Action action, const TQString& text, cons // Queue the alarm for insertion into the calendar file mDcopQueue.append(DcopTQEntry(event)); if (mInitialised) - TQTimer::singleShot(0, this, TQT_SLOT(processQueue())); + TQTimer::singleShot(0, this, TQ_SLOT(processQueue())); return true; } @@ -1234,7 +1234,7 @@ bool KAlarmApp::handleEvent(const TQString& urlString, const TQString& eventID, } mDcopQueue.append(DcopTQEntry(function, eventID)); if (mInitialised) - TQTimer::singleShot(0, this, TQT_SLOT(processQueue())); + TQTimer::singleShot(0, this, TQ_SLOT(processQueue())); return true; } @@ -1751,16 +1751,16 @@ ShellProcess* KAlarmApp::doShellCommand(const TQString& command, const KAEvent& comms = TDEProcess::AllOutput; } ShellProcess* proc = new ShellProcess(cmd); - connect(proc, TQT_SIGNAL(shellExited(ShellProcess*)), TQT_SLOT(slotCommandExited(ShellProcess*))); + connect(proc, TQ_SIGNAL(shellExited(ShellProcess*)), TQ_SLOT(slotCommandExited(ShellProcess*))); TQGuardedPtr<ShellProcess> logproc = 0; if (comms == TDEProcess::AllOutput && !event.logFile().isEmpty()) { // Output is to be appended to a log file. // Set up a logging process to write the command's output to. - connect(proc, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), TQT_SLOT(slotCommandOutput(TDEProcess*,char*,int))); - connect(proc, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), TQT_SLOT(slotCommandOutput(TDEProcess*,char*,int))); + connect(proc, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)), TQ_SLOT(slotCommandOutput(TDEProcess*,char*,int))); + connect(proc, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)), TQ_SLOT(slotCommandOutput(TDEProcess*,char*,int))); logproc = new ShellProcess(TQString::fromLatin1("cat >>%1").arg(event.logFile())); - connect(logproc, TQT_SIGNAL(shellExited(ShellProcess*)), TQT_SLOT(slotLogProcExited(ShellProcess*))); + connect(logproc, TQ_SIGNAL(shellExited(ShellProcess*)), TQ_SLOT(slotLogProcExited(ShellProcess*))); logproc->start(TDEProcess::Stdin); TQCString heading; if (alarm && alarm->dateTime().isValid()) @@ -1940,7 +1940,7 @@ void KAlarmApp::setUpDcop() { mInitialised = true; // we're now ready to handle DCOP calls Daemon::createDcopHandler(); - TQTimer::singleShot(0, this, TQT_SLOT(processQueue())); // process anything already queued + TQTimer::singleShot(0, this, TQ_SLOT(processQueue())); // process anything already queued } } |