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

---
 kandy/src/kandy.cpp        | 6 +++---
 kandy/src/kandyprefs.kcfgc | 2 +-
 kandy/src/kandyview.cpp    | 2 +-
 kandy/src/mobilegui.cpp    | 2 +-
 kandy/src/mobilemain.cpp   | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'kandy')

diff --git a/kandy/src/kandy.cpp b/kandy/src/kandy.cpp
index f7c29d0c4..eeae6f2da 100644
--- a/kandy/src/kandy.cpp
+++ b/kandy/src/kandy.cpp
@@ -34,9 +34,9 @@
 #include <kmenubar.h>
 #include <kkeydialog.h>
 #include <kaccel.h>
-#include <kio/netaccess.h>
-#include <kfiledialog.h>
-#include <kconfig.h>
+#include <tdeio/netaccess.h>
+#include <tdefiledialog.h>
+#include <tdeconfig.h>
 #include <kurl.h>
 #include <kurlrequesterdlg.h>
 #include <kdebug.h>
diff --git a/kandy/src/kandyprefs.kcfgc b/kandy/src/kandyprefs.kcfgc
index c615f6fce..55a2574b9 100644
--- a/kandy/src/kandyprefs.kcfgc
+++ b/kandy/src/kandyprefs.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=kandy.kcfg
 ClassName=KandyPrefs
 Singleton=true
diff --git a/kandy/src/kandyview.cpp b/kandy/src/kandyview.cpp
index 99336c921..fbf5deaa2 100644
--- a/kandy/src/kandyview.cpp
+++ b/kandy/src/kandyview.cpp
@@ -43,7 +43,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kinputdialog.h>
 #include <kdialog.h>
 
diff --git a/kandy/src/mobilegui.cpp b/kandy/src/mobilegui.cpp
index 00cfea89c..a4217be07 100644
--- a/kandy/src/mobilegui.cpp
+++ b/kandy/src/mobilegui.cpp
@@ -35,7 +35,7 @@
 #include <tqpushbutton.h>
 
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 #include <klocale.h>
 #include <kapplication.h>
diff --git a/kandy/src/mobilemain.cpp b/kandy/src/mobilemain.cpp
index 318b3eaa6..43210ba8f 100644
--- a/kandy/src/mobilemain.cpp
+++ b/kandy/src/mobilemain.cpp
@@ -28,7 +28,7 @@
 #include <kmenubar.h>
 #include <kkeydialog.h>
 #include <kaccel.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
-- 
cgit v1.2.1