summaryrefslogtreecommitdiffstats
path: root/kalarm/kalarmd
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:49:30 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:49:30 -0600
commita9bde819f2b421dcc44741156e75eca4bb5fb4f4 (patch)
treed087071b1e8fcf79698938efec19f8e48bab0799 /kalarm/kalarmd
parent5c4a80ead2b1fe57dc6a8c29d0368792344cd61e (diff)
downloadtdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.tar.gz
tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kalarm/kalarmd')
-rw-r--r--kalarm/kalarmd/adconfigdata.cpp10
-rw-r--r--kalarm/kalarmd/alarmdaemon.cpp4
2 files changed, 7 insertions, 7 deletions
diff --git a/kalarm/kalarmd/adconfigdata.cpp b/kalarm/kalarmd/adconfigdata.cpp
index 06ee4597e..e6211076e 100644
--- a/kalarm/kalarmd/adconfigdata.cpp
+++ b/kalarm/kalarmd/adconfigdata.cpp
@@ -48,7 +48,7 @@ void ADConfigData::readConfig()
{
kdDebug(5900) << "ADConfigData::readConfig()" << endl;
ClientInfo::clear();
- KConfig* config = KGlobal::config();
+ KConfig* config = TDEGlobal::config();
TQStringList clients = config->groupList().grep(CLIENT_GROUP_SEARCH);
for (TQStringList::Iterator cl = clients.begin(); cl != clients.end(); ++cl)
{
@@ -101,7 +101,7 @@ void ADConfigData::readConfig()
*/
void ADConfigData::writeClient(const TQCString& appName, const ClientInfo* cinfo)
{
- KConfig* config = KGlobal::config();
+ KConfig* config = TDEGlobal::config();
config->setGroup(CLIENT_GROUP + TQString::fromLocal8Bit(appName));
config->writeEntry(TITLE_KEY, cinfo->title());
config->writeEntry(DCOP_OBJECT_KEY, TQString(TQString::fromLocal8Bit(cinfo->dcopObject())));
@@ -115,7 +115,7 @@ void ADConfigData::writeClient(const TQCString& appName, const ClientInfo* cinfo
*/
void ADConfigData::removeClient(const TQCString& appName)
{
- KConfig* config = KGlobal::config();
+ KConfig* config = TDEGlobal::config();
config->deleteGroup(CLIENT_GROUP + TQString::fromLocal8Bit(appName));
config->sync();
}
@@ -125,7 +125,7 @@ void ADConfigData::removeClient(const TQCString& appName)
*/
void ADConfigData::setCalendar(const TQCString& appName, ADCalendar* cal)
{
- KConfig* config = KGlobal::config();
+ KConfig* config = TDEGlobal::config();
config->setGroup(CLIENT_GROUP + TQString::fromLocal8Bit(appName));
config->writePathEntry(CALENDAR_KEY, cal->urlString());
config->sync();
@@ -137,7 +137,7 @@ void ADConfigData::setCalendar(const TQCString& appName, ADCalendar* cal)
void ADConfigData::enableAutoStart(bool on)
{
kdDebug(5900) << "ADConfigData::enableAutoStart(" << on << ")\n";
- KConfig* config = KGlobal::config();
+ KConfig* config = TDEGlobal::config();
config->reparseConfiguration();
config->setGroup(TQString::fromLatin1(DAEMON_AUTOSTART_SECTION));
config->writeEntry(TQString::fromLatin1(DAEMON_AUTOSTART_KEY), on);
diff --git a/kalarm/kalarmd/alarmdaemon.cpp b/kalarm/kalarmd/alarmdaemon.cpp
index e1bbe0bb5..8fd34b114 100644
--- a/kalarm/kalarmd/alarmdaemon.cpp
+++ b/kalarm/kalarmd/alarmdaemon.cpp
@@ -503,7 +503,7 @@ bool AlarmDaemon::notifyEvent(ADCalendar* calendar, const TQString& eventID)
}
// Start KAlarm, using the command line to specify the alarm
- KProcess p;
+ TDEProcess p;
TQString cmd = locate("exe", appname);
if (cmd.isEmpty())
{
@@ -512,7 +512,7 @@ bool AlarmDaemon::notifyEvent(ADCalendar* calendar, const TQString& eventID)
}
p << cmd;
p << "--handleEvent" << id << "--calendarURL" << calendar->urlString();
- p.start(KProcess::DontCare);
+ p.start(TDEProcess::DontCare);
kdDebug(5900) << "AlarmDaemon::notifyEvent(): used command line" << endl;
return true;
}