summaryrefslogtreecommitdiffstats
path: root/tdecore/knotifyclient.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:21:02 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:21:02 -0600
commit8e7816b2f9f62a2df094c5b2a7aa5abb6bc1226a (patch)
tree19ff5ecf5e6b5168e5503677f18b85f3dfa91f95 /tdecore/knotifyclient.cpp
parent5bca2e3e42d02f8fed9ffc399ea14f8a05694cb0 (diff)
downloadtdelibs-8e7816b2f9f62a2df094c5b2a7aa5abb6bc1226a.tar.gz
tdelibs-8e7816b2f9f62a2df094c5b2a7aa5abb6bc1226a.zip
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'tdecore/knotifyclient.cpp')
-rw-r--r--tdecore/knotifyclient.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tdecore/knotifyclient.cpp b/tdecore/knotifyclient.cpp
index bfde017af..e4ae533ef 100644
--- a/tdecore/knotifyclient.cpp
+++ b/tdecore/knotifyclient.cpp
@@ -241,7 +241,7 @@ bool KNotifyClient::startDaemon()
if (!kapp->dcopClient()->isApplicationRegistered(daemonName)) {
if( firstTry ) {
firstTry = false;
- return KApplication::startServiceByDesktopName(daemonName) == 0;
+ return TDEApplication::startServiceByDesktopName(daemonName) == 0;
}
return false;
}
@@ -296,7 +296,7 @@ public:
else if (!m_instances.isEmpty())
{
kdWarning(160) << "Tried to remove an Instance that is not the current," << endl;
- kdWarning(160) << "Resetting to the main KApplication." << endl;
+ kdWarning(160) << "Resetting to the main TDEApplication." << endl;
m_instances.clear();
}
else