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

---
 kicker/menuext/find/findmenu.cpp       | 2 +-
 kicker/menuext/konsole/konsole_mnu.cpp | 6 +++---
 kicker/menuext/prefmenu/prefmenu.cpp   | 4 ++--
 kicker/menuext/tom/tom.cc              | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'kicker/menuext')

diff --git a/kicker/menuext/find/findmenu.cpp b/kicker/menuext/find/findmenu.cpp
index 24020e0c2..a3138102b 100644
--- a/kicker/menuext/find/findmenu.cpp
+++ b/kicker/menuext/find/findmenu.cpp
@@ -77,7 +77,7 @@ void FindMenu::slotExec( int pos )
   }
   else
   {
-    KApplication::startServiceByDesktopPath( app );
+    TDEApplication::startServiceByDesktopPath( app );
   }
 }
 
diff --git a/kicker/menuext/konsole/konsole_mnu.cpp b/kicker/menuext/konsole/konsole_mnu.cpp
index 7eab40c34..093b4fc5e 100644
--- a/kicker/menuext/konsole/konsole_mnu.cpp
+++ b/kicker/menuext/konsole/konsole_mnu.cpp
@@ -258,7 +258,7 @@ void KonsoleMenu::slotExec(int id)
         args << "-r";
         args << screenList[id - sessionList.count()];
     }
-    KApplication::tdeinitExec("konsole", args);
+    TDEApplication::tdeinitExec("konsole", args);
     return;
 }
 
@@ -292,7 +292,7 @@ void KonsoleMenu::newSession(const TQString& sURL, const TQString& title)
     {
         args << "-T" << title;
         args << "--workdir" << url.path();
-        KApplication::tdeinitExec("konsole", args);
+        TDEApplication::tdeinitExec("konsole", args);
         return;
     }
     else if ((!url.protocol().isEmpty()) && (url.hasHost()))
@@ -305,7 +305,7 @@ void KonsoleMenu::newSession(const TQString& sURL, const TQString& title)
             args << "-l" << url.user().latin1();
         }
         args << host.latin1();
-        KApplication::tdeinitExec("konsole", args);
+        TDEApplication::tdeinitExec("konsole", args);
         return;
     }
     /*
diff --git a/kicker/menuext/prefmenu/prefmenu.cpp b/kicker/menuext/prefmenu/prefmenu.cpp
index 93a948dee..ee2a5268d 100644
--- a/kicker/menuext/prefmenu/prefmenu.cpp
+++ b/kicker/menuext/prefmenu/prefmenu.cpp
@@ -331,7 +331,7 @@ void PrefMenu::slotExec(int id)
     kapp->propagateSessionManager();
     KSycocaEntry *e = m_entryMap[id];
     KService::Ptr service = static_cast<KService *>(e);
-    KApplication::startServiceByDesktopPath(service->desktopEntryPath(),
+    TDEApplication::startServiceByDesktopPath(service->desktopEntryPath(),
                                             TQStringList(), 0, 0, 0, "", true);
     m_dragStartPos = TQPoint(-1,-1);
 }
@@ -378,7 +378,7 @@ void PrefMenu::aboutToClose()
 
 void PrefMenu::launchControlCenter()
 {
-    KApplication::startServiceByDesktopName("kcontrol", TQStringList(),
+    TDEApplication::startServiceByDesktopName("kcontrol", TQStringList(),
                                             0, 0, 0, "", true);
 }
 
diff --git a/kicker/menuext/tom/tom.cc b/kicker/menuext/tom/tom.cc
index cdedfc73d..8e41497b6 100644
--- a/kicker/menuext/tom/tom.cc
+++ b/kicker/menuext/tom/tom.cc
@@ -827,7 +827,7 @@ void TOM::runTask(int id)
     if (!m_tasks.contains(id)) return;
 
     kapp->propagateSessionManager();
-    KApplication::startServiceByDesktopPath(m_tasks[id]->desktopEntryPath(),
+    TDEApplication::startServiceByDesktopPath(m_tasks[id]->desktopEntryPath(),
       TQStringList(), 0, 0, 0, "", true);
 }
 
-- 
cgit v1.2.3