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

---
 kaboodle/Makefile.am       | 2 +-
 kaboodle/conf.cpp          | 2 +-
 kaboodle/engine.cpp        | 2 +-
 kaboodle/kaboodleapp.cpp   | 2 +-
 kaboodle/userinterface.cpp | 4 ++--
 kaboodle/view.cpp          | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'kaboodle')

diff --git a/kaboodle/Makefile.am b/kaboodle/Makefile.am
index 1f39c8f4..88177b35 100644
--- a/kaboodle/Makefile.am
+++ b/kaboodle/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(kde_includes)/kio -I$(kde_includes)/arts $(all_includes)
+INCLUDES = -I$(kde_includes)/tdeio -I$(kde_includes)/arts $(all_includes)
 
 SUBDIRS = pics actions
 
diff --git a/kaboodle/conf.cpp b/kaboodle/conf.cpp
index 3bab0768..2c66f5a8 100644
--- a/kaboodle/conf.cpp
+++ b/kaboodle/conf.cpp
@@ -23,7 +23,7 @@
 // used in advertising or otherwise to promote the sale, use or other dealings
 // in this Software without prior written authorization from the author(s).
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <tqcheckbox.h>
 #include <tqvbox.h>
diff --git a/kaboodle/engine.cpp b/kaboodle/engine.cpp
index 5909dbcd..0b3c42f4 100644
--- a/kaboodle/engine.cpp
+++ b/kaboodle/engine.cpp
@@ -26,7 +26,7 @@ extern "C"
 #include <sys/wait.h>
 }
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/kaboodle/kaboodleapp.cpp b/kaboodle/kaboodleapp.cpp
index 6aced727..e153c725 100644
--- a/kaboodle/kaboodleapp.cpp
+++ b/kaboodle/kaboodleapp.cpp
@@ -22,7 +22,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ******************************************************************/
 
 #include <kcmdlineargs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "kaboodleapp.h"
 #include "userinterface.h"
diff --git a/kaboodle/userinterface.cpp b/kaboodle/userinterface.cpp
index 5deaad05..ffc04c48 100644
--- a/kaboodle/userinterface.cpp
+++ b/kaboodle/userinterface.cpp
@@ -23,9 +23,9 @@
 // in this Software without prior written authorization from the author(s).
 
 #include <arts/kplayobjectfactory.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialog.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <klocale.h>
diff --git a/kaboodle/view.cpp b/kaboodle/view.cpp
index bde6e9f4..509fb7b0 100644
--- a/kaboodle/view.cpp
+++ b/kaboodle/view.cpp
@@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <kapplication.h>
 #include <kcmdlineargs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kiconloader.h>
-- 
cgit v1.2.1