From d6d75dc9ff326e0bd6fc673adae71d53277fb8e4 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 20 Jan 2013 00:23:08 -0600 Subject: Rename KApplication to TDEApplication to avoid conflicts with KDE4 --- kalarm/functions.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'kalarm/functions.cpp') 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(); -- cgit v1.2.1