Use tdeApp

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

1 files changed, 10 insertions, 10 deletions

diff --git a/kalarm/daemon.cpp b/kalarm/daemon.cpp
index 06206cc9..1614b861 100644
--- a/kalarm/daemon.cpp
+++ b/kalarm/daemon.cpp
@@ -188,12 +188,12 @@ bool Daemon::registerWith(bool reregister)
 
 	bool disabledIfStopped = theApp()->alarmsDisabledIfStopped();
 	kdDebug(5950) << (reregister ? "Daemon::reregisterWith(): " : "Daemon::registerWith(): ") << (disabledIfStopped ? "NO_START" : "COMMAND_LINE") << endl;
-	TQCString appname  = kapp->aboutData()->appName();
+	TQCString appname  = tdeApp->aboutData()->appName();
 	AlarmDaemonIface_stub s(DAEMON_APP_NAME, DAEMON_DCOP_OBJECT);
 	if (reregister)
 		s.registerChange(appname, !disabledIfStopped);
 	else
-		s.registerApp(appname, kapp->aboutData()->programName(), TQCString(NOTIFY_DCOP_OBJECT), AlarmCalendar::activeCalendar()->urlString(), !disabledIfStopped);
+		s.registerApp(appname, tdeApp->aboutData()->programName(), TQCString(NOTIFY_DCOP_OBJECT), AlarmCalendar::activeCalendar()->urlString(), !disabledIfStopped);
 	if (!s.ok())
 	{
 		kdError(5950) << "Daemon::registerWith(" << reregister << "): DCOP error" << endl;
@@ -233,11 +233,11 @@ void Daemon::registrationResult(bool reregister, int result, int version)
 				// We've successfully registered with the daemon, but the daemon can't
 				// find the KAlarm executable so won't be able to restart KAlarm if
 				// KAlarm exits.
-				kdError(5950) << "Daemon::registrationResult(" << reregister << "): registerApp dcop call: " << kapp->aboutData()->appName() << " not found\n";
+				kdError(5950) << "Daemon::registrationResult(" << reregister << "): registerApp dcop call: " << tdeApp->aboutData()->appName() << " not found\n";
 				KMessageBox::error(0, i18n("Alarms will be disabled if you stop KAlarm.\n"
 							   "(Installation or configuration error: %1 cannot locate %2 executable.)")
 							   .arg(TQString::fromLatin1(DAEMON_APP_NAME))
-							   .arg(kapp->aboutData()->appName()));
+							   .arg(tdeApp->aboutData()->appName()));
 				break;
 			case KAlarmd::FAILURE:
 			default:
@@ -314,7 +314,7 @@ void Daemon::checkIfStarted()
 */
 void Daemon::updateRegisteredStatus(bool timeout)
 {
-	if (!kapp->dcopClient()->isApplicationRegistered(DAEMON_APP_NAME))
+	if (!tdeApp->dcopClient()->isApplicationRegistered(DAEMON_APP_NAME))
 	{
 		mStatus = STOPPED;
 		mRegisterFailMsg = false;
@@ -350,7 +350,7 @@ void Daemon::updateRegisteredStatus(bool timeout)
 bool Daemon::stop()
 {
 	kdDebug(5950) << "Daemon::stop()" << endl;
-	if (kapp->dcopClient()->isApplicationRegistered(DAEMON_APP_NAME))
+	if (tdeApp->dcopClient()->isApplicationRegistered(DAEMON_APP_NAME))
 	{
 		AlarmDaemonIface_stub s(DAEMON_APP_NAME, DAEMON_DCOP_OBJECT);
 		s.quit();
@@ -371,10 +371,10 @@ bool Daemon::stop()
 bool Daemon::reset()
 {
 	kdDebug(5950) << "Daemon::reset()" << endl;
-	if (!kapp->dcopClient()->isApplicationRegistered(DAEMON_APP_NAME))
+	if (!tdeApp->dcopClient()->isApplicationRegistered(DAEMON_APP_NAME))
 		return false;
 	AlarmDaemonIface_stub s(DAEMON_APP_NAME, DAEMON_DCOP_OBJECT);
-	s.resetCalendar(TQCString(kapp->aboutData()->appName()), AlarmCalendar::activeCalendar()->urlString());
+	s.resetCalendar(TQCString(tdeApp->aboutData()->appName()), AlarmCalendar::activeCalendar()->urlString());
 	if (!s.ok())
 		kdError(5950) << "Daemon::reset(): resetCalendar dcop send failed" << endl;
 	return true;
@@ -387,7 +387,7 @@ void Daemon::reload()
 {
 	kdDebug(5950) << "Daemon::reload()\n";
 	AlarmDaemonIface_stub s(DAEMON_APP_NAME, DAEMON_DCOP_OBJECT);
-	s.reloadCalendar(TQCString(kapp->aboutData()->appName()), AlarmCalendar::activeCalendar()->urlString());
+	s.reloadCalendar(TQCString(tdeApp->aboutData()->appName()), AlarmCalendar::activeCalendar()->urlString());
 	if (!s.ok())
 		kdError(5950) << "Daemon::reload(): reloadCalendar dcop send failed" << endl;
 }
@@ -635,7 +635,7 @@ void Daemon::notifyEventHandled(const TQString& eventId, bool reloadCal)
 {
 	kdDebug(5950) << "Daemon::notifyEventHandled(" << eventId << (reloadCal ? "): reload" : ")") << endl;
 	AlarmDaemonIface_stub s(DAEMON_APP_NAME, DAEMON_DCOP_OBJECT);
-	s.eventHandled(TQCString(kapp->aboutData()->appName()), AlarmCalendar::activeCalendar()->urlString(), eventId, reloadCal);
+	s.eventHandled(TQCString(tdeApp->aboutData()->appName()), AlarmCalendar::activeCalendar()->urlString(), eventId, reloadCal);
 	if (!s.ok())
 		kdError(5950) << "Daemon::notifyEventHandled(): eventHandled dcop send failed" << endl;
 }