summaryrefslogtreecommitdiffstats
path: root/kalarm/kalarmd/alarmdaemon.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:37:21 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:37:21 -0600
commit86d8364ac704bdc8ad2dfcf52307d9626cfac567 (patch)
tree97d3ac2c2f60780d9a1de4f82caac7cb27534501 /kalarm/kalarmd/alarmdaemon.cpp
parenta9bde819f2b421dcc44741156e75eca4bb5fb4f4 (diff)
downloadtdepim-86d8364ac704bdc8ad2dfcf52307d9626cfac567.tar.gz
tdepim-86d8364ac704bdc8ad2dfcf52307d9626cfac567.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kalarm/kalarmd/alarmdaemon.cpp')
-rw-r--r--kalarm/kalarmd/alarmdaemon.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/kalarm/kalarmd/alarmdaemon.cpp b/kalarm/kalarmd/alarmdaemon.cpp
index 8fd34b114..75bb4d2df 100644
--- a/kalarm/kalarmd/alarmdaemon.cpp
+++ b/kalarm/kalarmd/alarmdaemon.cpp
@@ -83,7 +83,7 @@ AlarmDaemon::AlarmDaemon(bool autostart, TQObject *parent, const char *name)
* come in the wrong order, KAlarm won't know that it is supposed to restore
* itself and instead will simply open a new window.
*/
- KConfig kaconfig(locate("config", "kalarmrc"));
+ TDEConfig kaconfig(locate("config", "kalarmrc"));
kaconfig.setGroup(TQString::fromLatin1("General"));
autostart = kaconfig.readBoolEntry(AUTOSTART_TRAY, false);
if (autostart)
@@ -594,7 +594,7 @@ void AlarmDaemon::notifyCalStatus(const ADCalendar* cal)
*/
void AlarmDaemon::readKAlarmConfig()
{
- KConfig config(locate("config", "kalarmrc"));
+ TDEConfig config(locate("config", "kalarmrc"));
config.setGroup(TQString::fromLatin1("General"));
TQDateTime defTime(TQDate(1900,1,1), TQTime());
mStartOfDay = config.readDateTimeEntry(START_OF_DAY, &defTime).time();