From e4e0479220e9e9616b68b2a11e42cff7a8af7b3d Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 20 Jan 2013 00:17:06 -0600
Subject: Rename KApplication to TDEApplication to avoid conflicts with KDE4

---
 kdesktop/krootwm.cc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'kdesktop/krootwm.cc')

diff --git a/kdesktop/krootwm.cc b/kdesktop/krootwm.cc
index 90b4ebd66..283d46cb3 100644
--- a/kdesktop/krootwm.cc
+++ b/kdesktop/krootwm.cc
@@ -523,7 +523,7 @@ void KRootWm::slotToggleAutoAlign( bool b )
     KDesktopSettings::writeConfig();
 
     // Also save it globally...
-    int desktop = KApplication::desktop()->primaryScreen();
+    int desktop = TDEApplication::desktop()->primaryScreen();
     TQCString cfilename;
     if (desktop == 0)
         cfilename = "kdesktoprc";
@@ -627,7 +627,7 @@ void KRootWm::mousePressed( const TQPoint& _global, int _button )
 void KRootWm::slotWindowList() {
 //  kdDebug() << "KRootWm::slotWindowList" << endl;
 // Popup at the center of the screen, this is from keyboard shortcut.
-  TQDesktopWidget* desktop = KApplication::desktop();
+  TQDesktopWidget* desktop = TDEApplication::desktop();
   TQRect r;
   if (desktop->numScreens() < 2)
       r = desktop->geometry();
@@ -647,7 +647,7 @@ void KRootWm::slotSwitchUser() {
 //  kdDebug() << "KRootWm::slotSwitchUser" << endl;
   if (!sessionsMenu)
     return;
-  TQDesktopWidget* desktop = KApplication::desktop();
+  TQDesktopWidget* desktop = TDEApplication::desktop();
   TQRect r;
   if (desktop->numScreens() < 2)
       r = desktop->geometry();
@@ -830,7 +830,7 @@ void KRootWm::slotSave() {
 
 
 void KRootWm::slotLogout() {
-    m_pDesktop->logout(KApplication::ShutdownConfirmDefault, KApplication::ShutdownTypeDefault);
+    m_pDesktop->logout(TDEApplication::ShutdownConfirmDefault, TDEApplication::ShutdownTypeDefault);
 }
 
 void KRootWm::slotPopulateSessions()
-- 
cgit v1.2.3