From 77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 21:55:37 -0600
Subject: Rename additional header files to avoid conflicts with KDE4

---
 kicker/applets/launcher/CMakeLists.txt       | 2 +-
 kicker/applets/launcher/configdlg.cpp        | 2 +-
 kicker/applets/launcher/quickaddappsmenu.cpp | 2 +-
 kicker/applets/launcher/quickbutton.cpp      | 4 ++--
 kicker/applets/launcher/quicklauncher.cpp    | 6 +++---
 5 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'kicker/applets/launcher')

diff --git a/kicker/applets/launcher/CMakeLists.txt b/kicker/applets/launcher/CMakeLists.txt
index bf5111658..0cb4c36e6 100644
--- a/kicker/applets/launcher/CMakeLists.txt
+++ b/kicker/applets/launcher/CMakeLists.txt
@@ -44,7 +44,7 @@ tde_add_kpart( launcher_panelapplet AUTOMOC
     -Wl,--start-group
       kicker_core-static kicker_buttons-static kicker_ui-static
     -Wl,--end-group
-    kickermain-shared tdeutils-shared kabc-shared
+    kickermain-shared tdeutils-shared tdeabc-shared
   DEPENDENCIES libkicker-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kicker/applets/launcher/configdlg.cpp b/kicker/applets/launcher/configdlg.cpp
index 94bb9c899..d542d2593 100644
--- a/kicker/applets/launcher/configdlg.cpp
+++ b/kicker/applets/launcher/configdlg.cpp
@@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
 #include <tqcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "prefs.h"
diff --git a/kicker/applets/launcher/quickaddappsmenu.cpp b/kicker/applets/launcher/quickaddappsmenu.cpp
index 5b1ff44ca..cdbc94dd5 100644
--- a/kicker/applets/launcher/quickaddappsmenu.cpp
+++ b/kicker/applets/launcher/quickaddappsmenu.cpp
@@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <kstandarddirs.h>
 #include <kdesktopfile.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdesycocaentry.h>
 #include <kservice.h>
 #include <kservicegroup.h>
diff --git a/kicker/applets/launcher/quickbutton.cpp b/kicker/applets/launcher/quickbutton.cpp
index d44dc0537..19377c1b4 100644
--- a/kicker/applets/launcher/quickbutton.cpp
+++ b/kicker/applets/launcher/quickbutton.cpp
@@ -31,11 +31,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <tdeactionclasses.h>
 #include <kickertip.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdesktopfile.h>
 #include <krun.h>
 #include <kiconeffect.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kcursor.h>
 #include <tdeapplication.h>
 #include <kipc.h>
diff --git a/kicker/applets/launcher/quicklauncher.cpp b/kicker/applets/launcher/quicklauncher.cpp
index 3d623962c..1ee251b36 100644
--- a/kicker/applets/launcher/quicklauncher.cpp
+++ b/kicker/applets/launcher/quicklauncher.cpp
@@ -34,9 +34,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tdeaboutapplication.h>
 #include <tdeaboutdata.h>
 #include <kdialogbase.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <knuminput.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
-- 
cgit v1.2.1