Rename a number of libraries and executables to avoid conflicts with KDE4

9 files changed, 9 insertions, 9 deletions

diff --git a/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp b/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp
index eff5b01c..e8e25332 100644
--- a/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp
+++ b/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp
@@ -30,7 +30,7 @@
 #include <kmessagebox.h>
 #include <kpushbutton.h>
 #include <kdebug.h>
-#include <kconfigskeleton.h>
+#include <tdeconfigskeleton.h>
 #include <kcolorbutton.h>
 #include <kfontrequester.h>
 #include <kcombobox.h>
diff --git a/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.h b/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.h
index 6d096c41..ff4ac9e7 100644
--- a/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.h
+++ b/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.h
@@ -19,7 +19,7 @@
 #ifndef KVOCTRAINPREFS_H
 #define KVOCTRAINPREFS_H
 
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
 
 /**
   *@author Peter Hedlund
diff --git a/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp
index ffdf44d4..8ec23d7c 100644
--- a/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp
+++ b/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp
@@ -35,7 +35,7 @@
 #include <kcombobox.h>
 #include <dcopclient.h>
 #include <kstandarddirs.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 
 #include "languageoptions.h"
diff --git a/kvoctrain/kvoctrain/common-dialogs/prefs.kcfgc b/kvoctrain/kvoctrain/common-dialogs/prefs.kcfgc
index bb9ed639..6aeff9c7 100644
--- a/kvoctrain/kvoctrain/common-dialogs/prefs.kcfgc
+++ b/kvoctrain/kvoctrain/common-dialogs/prefs.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 IncludeFiles=../kv_resource.h,../kvt-core/kvoctrainexpr.h
 File=kvoctrain.kcfg
 ClassName=Prefs
diff --git a/kvoctrain/kvoctrain/kva_io.cpp b/kvoctrain/kvoctrain/kva_io.cpp
index 7d4c338c..9cf65272 100644
--- a/kvoctrain/kvoctrain/kva_io.cpp
+++ b/kvoctrain/kvoctrain/kva_io.cpp
@@ -27,7 +27,7 @@
 
 #include <tqtimer.h>
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kcombobox.h>
 #include <kprogress.h>
 #include <krecentdocument.h>
diff --git a/kvoctrain/kvoctrain/kvoctrain.cpp b/kvoctrain/kvoctrain/kvoctrain.cpp
index 31be75df..bc2ff5ba 100644
--- a/kvoctrain/kvoctrain/kvoctrain.cpp
+++ b/kvoctrain/kvoctrain/kvoctrain.cpp
@@ -27,7 +27,7 @@
 #include <klineedit.h>
 #include <kcombobox.h>
 #include <kprogress.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
 #include <kdebug.h>
diff --git a/kvoctrain/kvoctrain/kvoctrainview.cpp b/kvoctrain/kvoctrain/kvoctrainview.cpp
index f3e9e76a..b3353ded 100644
--- a/kvoctrain/kvoctrain/kvoctrainview.cpp
+++ b/kvoctrain/kvoctrain/kvoctrainview.cpp
@@ -31,7 +31,7 @@
 #include "langset.h"
 
 #include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <dcopclient.h>
diff --git a/kvoctrain/kvoctrain/kvt-core/QueryManager.cpp b/kvoctrain/kvoctrain/kvt-core/QueryManager.cpp
index f1b74ae4..7abb9b80 100644
--- a/kvoctrain/kvoctrain/kvt-core/QueryManager.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/QueryManager.cpp
@@ -24,7 +24,7 @@
  ***************************************************************************/
 
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <iostream>
 #include <vector>
diff --git a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp
index e1a1efcc..b2f0f038 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp
@@ -32,7 +32,7 @@
 #include <klocale.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include <tqfileinfo.h>
 #include <tqregexp.h>