summaryrefslogtreecommitdiffstats
path: root/klaptopdaemon
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:23:57 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:23:57 -0600
commit2877440fbda2e245d04f534ed51d7cb7c0a06482 (patch)
tree874d2d10bf56b0547de792b6b6d48c4e895be034 /klaptopdaemon
parent6fdacb9c2e3adb3b5da38cd8a22afc1668e1d36b (diff)
downloadtdeutils-2877440fbda2e245d04f534ed51d7cb7c0a06482.tar.gz
tdeutils-2877440fbda2e245d04f534ed51d7cb7c0a06482.zip
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'klaptopdaemon')
-rw-r--r--klaptopdaemon/laptop_check.cpp2
-rw-r--r--klaptopdaemon/laptop_daemon.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/klaptopdaemon/laptop_check.cpp b/klaptopdaemon/laptop_check.cpp
index 5877a65..5839720 100644
--- a/klaptopdaemon/laptop_check.cpp
+++ b/klaptopdaemon/laptop_check.cpp
@@ -44,7 +44,7 @@ main(int argc, char **argv)
aboutData.addAuthor("Paul Campbell",0, "paul@taniwha.com");
TDECmdLineArgs::init( argc, argv, &aboutData );
- KApplication a;
+ TDEApplication a;
daemon_state s;
s.load();
if (s.need_to_run())
diff --git a/klaptopdaemon/laptop_daemon.cpp b/klaptopdaemon/laptop_daemon.cpp
index 5b710c5..3d1caab 100644
--- a/klaptopdaemon/laptop_daemon.cpp
+++ b/klaptopdaemon/laptop_daemon.cpp
@@ -820,14 +820,14 @@ void laptop_daemon::invokeHibernate()
void laptop_daemon::invokeLogout()
{
- bool rc = kapp->requestShutDown(KApplication::ShutdownConfirmNo, KApplication::ShutdownTypeNone, KApplication::ShutdownModeForceNow);
+ bool rc = kapp->requestShutDown(TDEApplication::ShutdownConfirmNo, TDEApplication::ShutdownTypeNone, TDEApplication::ShutdownModeForceNow);
if (!rc)
KMessageBox::sorry(0, i18n("Logout failed."));
}
void laptop_daemon::invokeShutdown()
{
- bool rc = kapp->requestShutDown(KApplication::ShutdownConfirmNo, KApplication::ShutdownTypeHalt, KApplication::ShutdownModeForceNow);
+ bool rc = kapp->requestShutDown(TDEApplication::ShutdownConfirmNo, TDEApplication::ShutdownTypeHalt, TDEApplication::ShutdownModeForceNow);
if (!rc)
KMessageBox::sorry(0, i18n("Shutdown failed."));
}