From de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 27 Jan 2013 01:02:02 -0600
Subject: Rename a number of libraries and executables to avoid conflicts with
 KDE4

---
 kicker/extensions/kasbar/kasbarapp.cpp       | 2 +-
 kicker/extensions/kasbar/kasbarextension.cpp | 2 +-
 kicker/extensions/kasbar/kasprefsdlg.cpp     | 2 +-
 kicker/extensions/kasbar/kastasker.cpp       | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'kicker/extensions/kasbar')

diff --git a/kicker/extensions/kasbar/kasbarapp.cpp b/kicker/extensions/kasbar/kasbarapp.cpp
index abd6337df..f35fc997b 100644
--- a/kicker/extensions/kasbar/kasbarapp.cpp
+++ b/kicker/extensions/kasbar/kasbarapp.cpp
@@ -53,7 +53,7 @@
 */
 #include <kapplication.h>
 #include <kcmdlineargs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <dcopclient.h>
 #include <twin.h>
diff --git a/kicker/extensions/kasbar/kasbarextension.cpp b/kicker/extensions/kasbar/kasbarextension.cpp
index 6e011cc71..ff2a7c60d 100644
--- a/kicker/extensions/kasbar/kasbarextension.cpp
+++ b/kicker/extensions/kasbar/kasbarextension.cpp
@@ -59,7 +59,7 @@
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <kmessagebox.h>
 
diff --git a/kicker/extensions/kasbar/kasprefsdlg.cpp b/kicker/extensions/kasbar/kasprefsdlg.cpp
index 31f5c5a33..c3f34c0ac 100644
--- a/kicker/extensions/kasbar/kasprefsdlg.cpp
+++ b/kicker/extensions/kasbar/kasprefsdlg.cpp
@@ -63,7 +63,7 @@
 #include <tqwhatsthis.h>
 
 #include <kcolorbutton.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <kglobal.h>
 #include <kiconloader.h>
diff --git a/kicker/extensions/kasbar/kastasker.cpp b/kicker/extensions/kasbar/kastasker.cpp
index a11c18547..86d688b27 100644
--- a/kicker/extensions/kasbar/kastasker.cpp
+++ b/kicker/extensions/kasbar/kastasker.cpp
@@ -55,13 +55,13 @@
 #include <tqtimer.h>
 
 #include <kactionclasses.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kpopupmenu.h>
 #include <kiconloader.h>
 
-//#include <kconfiggroupsaver.h>
+//#include <tdeconfiggroupsaver.h>
 
 #include <taskmanager.h>
 
-- 
cgit v1.2.3