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

16 files changed, 18 insertions, 18 deletions

diff --git a/kbabel/kbabeldict/dictchooser.cpp b/kbabel/kbabeldict/dictchooser.cpp
index f5a3701f..a7803320 100644
--- a/kbabel/kbabeldict/dictchooser.cpp
+++ b/kbabel/kbabeldict/dictchooser.cpp
@@ -38,7 +38,7 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 #include <tqpushbutton.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klistbox.h>
 #include <klocale.h>
 #include <kdialog.h>
diff --git a/kbabel/kbabeldict/kbabeldict.cpp b/kbabel/kbabeldict/kbabeldict.cpp
index cb2ed323..7453bcaf 100644
--- a/kbabel/kbabeldict/kbabeldict.cpp
+++ b/kbabel/kbabeldict/kbabeldict.cpp
@@ -33,7 +33,7 @@
 
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include "kbabeldict.h"
diff --git a/kbabel/kbabeldict/kbabeldictbox.cpp b/kbabel/kbabeldict/kbabeldictbox.cpp
index 35abc555..4d0f4b2d 100644
--- a/kbabel/kbabeldict/kbabeldictbox.cpp
+++ b/kbabel/kbabeldict/kbabeldictbox.cpp
@@ -45,7 +45,7 @@
 #include <kaboutdata.h>
 #include <kaboutdialog.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcmenumngr.h>
 #include <kdialogbase.h>
 #include <klibloader.h>
diff --git a/kbabel/kbabeldict/kbabeldictview.cpp b/kbabel/kbabeldict/kbabeldictview.cpp
index 437de9e5..7ed294c9 100644
--- a/kbabel/kbabeldict/kbabeldictview.cpp
+++ b/kbabel/kbabeldict/kbabeldictview.cpp
@@ -50,7 +50,7 @@
 #include <tqvbox.h>
 
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialog.h>
 #include <kglobal.h>
 #include <klineedit.h>
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp
index 72042e16..126c8c10 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp
@@ -35,9 +35,9 @@
 #include <tdeversion.h>
 #include <klocale.h>
 #include <kdebug.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kurlrequester.h>
 #include <kstandarddirs.h>
 
@@ -55,7 +55,7 @@
 #include <tqprogressbar.h>
 #include <tqpushbutton.h>
 #include <klineedit.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqdir.h>
 #include <tqradiobutton.h>
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/database.cpp b/kbabel/kbabeldict/modules/dbsearchengine/database.cpp
index 4ee016cd..8d48df58 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/database.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine/database.cpp
@@ -39,7 +39,7 @@
 #include <tqfile.h>
 
 #include <ktempfile.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 WordItem::WordItem (char *data, TQString w)
 {
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp b/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp
index 41ae81f2..9958b409 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp
@@ -5,7 +5,7 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kurlrequester.h>
 #include <tqtoolbutton.h>
 #include <klineedit.h>
diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp
index 9ba90514..b5b20967 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp
@@ -17,7 +17,7 @@
 
 */
 #include "dbscan.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqdir.h>
 #include <tqfile.h>
 #include <kapplication.h>
diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp
index d8489400..5e49a996 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp
@@ -5,7 +5,7 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kurlrequester.h>
 #include <tqtoolbutton.h>
 #include <klineedit.h>
diff --git a/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.cpp b/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.cpp
index 51e5f6e6..116d3c69 100644
--- a/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.cpp
+++ b/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.cpp
@@ -34,7 +34,7 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <tqpushbutton.h>
 #include <klineedit.h>
 #include <klocale.h>
diff --git a/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp b/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp
index e7a82d9a..57be4624 100644
--- a/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp
+++ b/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp
@@ -39,7 +39,7 @@
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kinstance.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include <tqregexp.h>
 #include <tqtextstream.h>
diff --git a/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.cpp b/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.cpp
index 8af71c48..893a1f1b 100644
--- a/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.cpp
+++ b/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.cpp
@@ -34,7 +34,7 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <tqpushbutton.h>
 #include <tqwhatsthis.h>
 #include <klineedit.h>
diff --git a/kbabel/kbabeldict/modules/tmx/preferenceswidget.cpp b/kbabel/kbabeldict/modules/tmx/preferenceswidget.cpp
index 3e9f112d..eeeb53c0 100644
--- a/kbabel/kbabeldict/modules/tmx/preferenceswidget.cpp
+++ b/kbabel/kbabeldict/modules/tmx/preferenceswidget.cpp
@@ -36,7 +36,7 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <tqpushbutton.h>
 #include <tqwhatsthis.h>
 #include <klineedit.h>
diff --git a/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp b/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp
index 913402d8..e97d1430 100644
--- a/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp
+++ b/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp
@@ -39,7 +39,7 @@
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kinstance.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include <tqtextstream.h>
 #include <tqtimer.h>
diff --git a/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp b/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp
index 0f849e9c..bc4001fb 100644
--- a/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp
+++ b/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp
@@ -43,7 +43,7 @@
 #include <kapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 using namespace KBabel;
 
diff --git a/kbabel/kbabeldict/searchengine.h b/kbabel/kbabeldict/searchengine.h
index ca729469..5d823cc0 100644
--- a/kbabel/kbabeldict/searchengine.h
+++ b/kbabel/kbabeldict/searchengine.h
@@ -40,7 +40,7 @@
 #include <tqstring.h>
 #include <tqwidget.h>
 #include <kaboutdata.h>
-#include <kconfigbase.h>
+#include <tdeconfigbase.h>
 
  
 /*