diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-02-16 20:17:18 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-02-16 20:17:18 +0000 |
commit | f4fae92b6768541e2952173c3d4b09040f95bf7e (patch) | |
tree | d8c5d93232235cd635f3310b4d95490df181ba2d /kalarm/daemon.cpp | |
parent | 125c0a08265b75a133644d3b55f47e37c919f45d (diff) | |
download | tdepim-f4fae92b6768541e2952173c3d4b09040f95bf7e.tar.gz tdepim-f4fae92b6768541e2952173c3d4b09040f95bf7e.zip |
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
Diffstat (limited to 'kalarm/daemon.cpp')
-rw-r--r-- | kalarm/daemon.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/kalarm/daemon.cpp b/kalarm/daemon.cpp index d2d2b2343..a129de8a3 100644 --- a/kalarm/daemon.cpp +++ b/kalarm/daemon.cpp @@ -134,7 +134,7 @@ bool Daemon::start() return true; // we're currently waiting for the daemon to start // Start the alarm daemon. It is a KUniqueApplication, which means that // there is automatically only one instance of the alarm daemon running. - TQString execStr = locate("exe", TQString::fromLatin1(DAEMON_APP_NAME)); + TQString execStr = locate("exe", TQString::tqfromLatin1(DAEMON_APP_NAME)); if (execStr.isEmpty()) { KMessageBox::error(0, i18n("Alarm daemon not found.")); @@ -221,7 +221,7 @@ void Daemon::registrationResult(bool reregister, int result, int version) failed = true; kdError(5950) << "Daemon::registrationResult(" << reregister << "): kalarmd reports incompatible version " << version << endl; errmsg = i18n("Cannot enable alarms.\nInstallation or configuration error: Alarm Daemon (%1) version is incompatible.") - .arg(TQString::fromLatin1(DAEMON_APP_NAME)); + .arg(TQString::tqfromLatin1(DAEMON_APP_NAME)); } else { @@ -236,7 +236,7 @@ void Daemon::registrationResult(bool reregister, int result, int version) kdError(5950) << "Daemon::registrationResult(" << reregister << "): registerApp dcop call: " << kapp->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(TQString::tqfromLatin1(DAEMON_APP_NAME)) .arg(kapp->aboutData()->appName())); break; case KAlarmd::FAILURE: @@ -248,7 +248,7 @@ void Daemon::registrationResult(bool reregister, int result, int version) if (!reregister) { errmsg = i18n("Cannot enable alarms:\nFailed to register with Alarm Daemon (%1)") - .arg(TQString::fromLatin1(DAEMON_APP_NAME)); + .arg(TQString::tqfromLatin1(DAEMON_APP_NAME)); } break; } @@ -304,7 +304,7 @@ void Daemon::checkIfStarted() if (err) { kdError(5950) << "Daemon::checkIfStarted(): failed to start daemon" << endl; - KMessageBox::error(0, i18n("Cannot enable alarms:\nFailed to start Alarm Daemon (%1)").arg(TQString::fromLatin1(DAEMON_APP_NAME))); + KMessageBox::error(0, i18n("Cannot enable alarms:\nFailed to start Alarm Daemon (%1)").arg(TQString::tqfromLatin1(DAEMON_APP_NAME))); } } @@ -414,8 +414,8 @@ void Daemon::enableAutoStart(bool enable) // The return status doesn't report failure even if the daemon isn't running, // so in case of failure, rewrite the config file in any case. KConfig adconfig(locate("config", DAEMON_APP_NAME"rc")); - adconfig.setGroup(TQString::fromLatin1(DAEMON_AUTOSTART_SECTION)); - adconfig.writeEntry(TQString::fromLatin1(DAEMON_AUTOSTART_KEY), enable); + adconfig.setGroup(TQString::tqfromLatin1(DAEMON_AUTOSTART_SECTION)); + adconfig.writeEntry(TQString::tqfromLatin1(DAEMON_AUTOSTART_KEY), enable); adconfig.sync(); } @@ -437,8 +437,8 @@ void Daemon::notifyTimeChanged() bool Daemon::autoStart() { KConfig adconfig(locate("config", DAEMON_APP_NAME"rc")); - adconfig.setGroup(TQString::fromLatin1(DAEMON_AUTOSTART_SECTION)); - return adconfig.readBoolEntry(TQString::fromLatin1(DAEMON_AUTOSTART_KEY), true); + adconfig.setGroup(TQString::tqfromLatin1(DAEMON_AUTOSTART_SECTION)); + return adconfig.readBoolEntry(TQString::tqfromLatin1(DAEMON_AUTOSTART_KEY), true); } /****************************************************************************** @@ -700,7 +700,7 @@ void NotificationHandler::alarmDaemonUpdate(int calendarStatus, const TQString& void NotificationHandler::handleEvent(const TQString& url, const TQString& eventId) { TQString id = eventId; - if (id.startsWith(TQString::fromLatin1("ad:"))) + if (id.startsWith(TQString::tqfromLatin1("ad:"))) { // It's a notification from the alarm deamon id = id.mid(3); |