summaryrefslogtreecommitdiffstats
path: root/kalarm/functions.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:23:08 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:23:08 -0600
commitd6d75dc9ff326e0bd6fc673adae71d53277fb8e4 (patch)
tree56a87e6a48bdf5e310958f1943a834e59eddbba1 /kalarm/functions.cpp
parent32b66c9ae78f439199a6d281cc33218e57c5106d (diff)
downloadtdepim-d6d75dc9ff326e0bd6fc673adae71d53277fb8e4.tar.gz
tdepim-d6d75dc9ff326e0bd6fc673adae71d53277fb8e4.zip
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'kalarm/functions.cpp')
-rw-r--r--kalarm/functions.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/kalarm/functions.cpp b/kalarm/functions.cpp
index e1e897e37..e5dc5fa38 100644
--- a/kalarm/functions.cpp
+++ b/kalarm/functions.cpp
@@ -721,7 +721,7 @@ bool runProgram(const TQCString& program, const TQCString& windowName, TQCString
if (!kapp->dcopClient()->isApplicationRegistered(program))
{
// KOrganizer is not already running, so start it
- if (KApplication::startServiceByDesktopName(TQString::fromLatin1(program), TQString(), &errorMessage, &dcopName))
+ if (TDEApplication::startServiceByDesktopName(TQString::fromLatin1(program), TQString(), &errorMessage, &dcopName))
{
kdError(5950) << "runProgram(): couldn't start " << program << " (" << errorMessage << ")\n";
return false;
@@ -747,7 +747,7 @@ bool readConfigWindowSize(const char* window, TQSize& result)
{
KConfig* config = KGlobal::config();
config->setGroup(TQString::fromLatin1(window));
- TQWidget* desktop = TQT_TQWIDGET(KApplication::desktop());
+ TQWidget* desktop = TQT_TQWIDGET(TDEApplication::desktop());
TQSize s = TQSize(config->readNumEntry(TQString::fromLatin1("Width %1").arg(desktop->width()), 0),
config->readNumEntry(TQString::fromLatin1("Height %1").arg(desktop->height()), 0));
if (s.isEmpty())
@@ -764,7 +764,7 @@ void writeConfigWindowSize(const char* window, const TQSize& size)
{
KConfig* config = KGlobal::config();
config->setGroup(TQString::fromLatin1(window));
- TQWidget* desktop = TQT_TQWIDGET(KApplication::desktop());
+ TQWidget* desktop = TQT_TQWIDGET(TDEApplication::desktop());
config->writeEntry(TQString::fromLatin1("Width %1").arg(desktop->width()), size.width());
config->writeEntry(TQString::fromLatin1("Height %1").arg(desktop->height()), size.height());
config->sync();