summaryrefslogtreecommitdiffstats
path: root/kalarm/kalarmd
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-02-16 20:17:18 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-02-16 20:17:18 +0000
commitf4fae92b6768541e2952173c3d4b09040f95bf7e (patch)
treed8c5d93232235cd635f3310b4d95490df181ba2d /kalarm/kalarmd
parent125c0a08265b75a133644d3b55f47e37c919f45d (diff)
downloadtdepim-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/kalarmd')
-rw-r--r--kalarm/kalarmd/adcalendar.cpp2
-rw-r--r--kalarm/kalarmd/adconfigdata.cpp14
-rw-r--r--kalarm/kalarmd/alarmdaemon.cpp18
3 files changed, 17 insertions, 17 deletions
diff --git a/kalarm/kalarmd/adcalendar.cpp b/kalarm/kalarmd/adcalendar.cpp
index 1f325be48..1b738b043 100644
--- a/kalarm/kalarmd/adcalendar.cpp
+++ b/kalarm/kalarmd/adcalendar.cpp
@@ -37,7 +37,7 @@ TQStringList ADCalendar::mCalendarUrls; // never delete or reorde
ADCalendar::ADCalendar(const TQString& url, const TQCString& appname)
- : KCal::CalendarLocal(TQString::fromLatin1("UTC")),
+ : KCal::CalendarLocal(TQString::tqfromLatin1("UTC")),
mUrlString(url),
mAppName(appname),
mLoaded(false),
diff --git a/kalarm/kalarmd/adconfigdata.cpp b/kalarm/kalarmd/adconfigdata.cpp
index c8c5dd355..68344fa28 100644
--- a/kalarm/kalarmd/adconfigdata.cpp
+++ b/kalarm/kalarmd/adconfigdata.cpp
@@ -31,13 +31,13 @@
#include "adconfigdata.h"
// Config file key strings
-const TQString CLIENT_GROUP(TQString::fromLatin1("Client "));
+const TQString CLIENT_GROUP(TQString::tqfromLatin1("Client "));
const TQRegExp CLIENT_GROUP_SEARCH("^Client ");
// Client data file key strings
-const TQString CALENDAR_KEY(TQString::fromLatin1("Calendar"));
-const TQString TITLE_KEY(TQString::fromLatin1("Title"));
-const TQString DCOP_OBJECT_KEY(TQString::fromLatin1("DCOP object"));
-const TQString START_CLIENT_KEY(TQString::fromLatin1("Start"));
+const TQString CALENDAR_KEY(TQString::tqfromLatin1("Calendar"));
+const TQString TITLE_KEY(TQString::tqfromLatin1("Title"));
+const TQString DCOP_OBJECT_KEY(TQString::tqfromLatin1("DCOP object"));
+const TQString START_CLIENT_KEY(TQString::tqfromLatin1("Start"));
/******************************************************************************
@@ -139,8 +139,8 @@ void ADConfigData::enableAutoStart(bool on)
kdDebug(5900) << "ADConfigData::enableAutoStart(" << on << ")\n";
KConfig* config = KGlobal::config();
config->reparseConfiguration();
- config->setGroup(TQString::fromLatin1(DAEMON_AUTOSTART_SECTION));
- config->writeEntry(TQString::fromLatin1(DAEMON_AUTOSTART_KEY), on);
+ config->setGroup(TQString::tqfromLatin1(DAEMON_AUTOSTART_SECTION));
+ config->writeEntry(TQString::tqfromLatin1(DAEMON_AUTOSTART_KEY), on);
config->sync();
}
diff --git a/kalarm/kalarmd/alarmdaemon.cpp b/kalarm/kalarmd/alarmdaemon.cpp
index d8bcf83a2..4b6495728 100644
--- a/kalarm/kalarmd/alarmdaemon.cpp
+++ b/kalarm/kalarmd/alarmdaemon.cpp
@@ -54,8 +54,8 @@ static const int KALARM_AUTOSTART_TIMEOUT = 30;
static const int SECS_PER_DAY = 3600 * 24;
// KAlarm config file keys
-static const TQString START_OF_DAY(TQString::fromLatin1("StartOfDay"));
-static const TQString AUTOSTART_TRAY(TQString::fromLatin1("AutostartTray"));
+static const TQString START_OF_DAY(TQString::tqfromLatin1("StartOfDay"));
+static const TQString AUTOSTART_TRAY(TQString::tqfromLatin1("AutostartTray"));
AlarmDaemon::AlarmDaemon(bool autostart, TQObject *parent, const char *name)
@@ -84,7 +84,7 @@ AlarmDaemon::AlarmDaemon(bool autostart, TQObject *parent, const char *name)
* itself and instead will simply open a new window.
*/
KConfig kaconfig(locate("config", "kalarmrc"));
- kaconfig.setGroup(TQString::fromLatin1("General"));
+ kaconfig.setGroup(TQString::tqfromLatin1("General"));
autostart = kaconfig.readBoolEntry(AUTOSTART_TRAY, false);
if (autostart)
{
@@ -119,8 +119,8 @@ void AlarmDaemon::autostartKAlarm()
}
kdDebug(5900) << "AlarmDaemon::autostartKAlarm(): starting KAlarm\n";
TQStringList args;
- args << TQString::fromLatin1("--tray");
- int ret = KApplication::kdeinitExec(TQString::fromLatin1("kalarm"), args);
+ args << TQString::tqfromLatin1("--tray");
+ int ret = KApplication::kdeinitExec(TQString::tqfromLatin1("kalarm"), args);
if (ret)
kdError(5900) << "AlarmDaemon::autostartKAlarm(): error=" << ret << endl;
else
@@ -365,7 +365,7 @@ void AlarmDaemon::checkAlarms(ADCalendar* cal)
if (!cal->loaded() || !cal->enabled())
return;
- TQDateTime now = TQDateTime::currentDateTime();
+ TQDateTime now = TQDateTime::tqcurrentDateTime();
kdDebug(5901) << " To: " << now.toString() << endl;
TQValueList<KCal::Alarm*> alarms = cal->alarmsTo(now);
if (!alarms.count())
@@ -385,7 +385,7 @@ void AlarmDaemon::checkAlarms(ADCalendar* cal)
// The times for non-due alarms are set invalid in 'alarmtimes'.
bool recurs = event->doesRecur();
const TQStringList cats = event->categories();
- bool floats = (cats.find(TQString::fromLatin1("DATE")) != cats.end());
+ bool floats = (cats.find(TQString::tqfromLatin1("DATE")) != cats.end());
TQDateTime nextDateTime = event->dtStart();
if (recurs)
{
@@ -478,7 +478,7 @@ bool AlarmDaemon::notifyEvent(ADCalendar* calendar, const TQString& eventID)
return false;
}
kdDebug(5900) << "AlarmDaemon::notifyEvent(" << appname << ", " << eventID << "): notification type=" << client->startClient() << endl;
- TQString id = TQString::fromLatin1("ad:") + eventID; // prefix to indicate that the notification if from the daemon
+ TQString id = TQString::tqfromLatin1("ad:") + eventID; // prefix to indicate that the notification if from the daemon
// Check if the client application is running and ready to receive notification
bool registered = kapp->dcopClient()->isApplicationRegistered(static_cast<const char*>(appname));
@@ -595,7 +595,7 @@ void AlarmDaemon::notifyCalStatus(const ADCalendar* cal)
void AlarmDaemon::readKAlarmConfig()
{
KConfig config(locate("config", "kalarmrc"));
- config.setGroup(TQString::fromLatin1("General"));
+ config.setGroup(TQString::tqfromLatin1("General"));
TQDateTime defTime(TQDate(1900,1,1), TQTime());
mStartOfDay = config.readDateTimeEntry(START_OF_DAY, &defTime).time();
kdDebug(5900) << "AlarmDaemon::readKAlarmConfig()" << endl;