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

15 files changed, 17 insertions, 17 deletions

diff --git a/knode/articlewidget.cpp b/knode/articlewidget.cpp
index b66b1a6f7..ae4ab2cbe 100644
--- a/knode/articlewidget.cpp
+++ b/knode/articlewidget.cpp
@@ -50,7 +50,7 @@
 #include <libkpgp/kpgp.h>
 #include <libkpgp/kpgpblock.h>
 
-#include <libtdepim/kfileio.h>
+#include <libtdepim/tdefileio.h>
 #include <libtdepim/kxface.h>
 #include <libtdepim/linklocator.h>
 
diff --git a/knode/knapplication.cpp b/knode/knapplication.cpp
index d6bf44c9b..b607da538 100644
--- a/knode/knapplication.cpp
+++ b/knode/knapplication.cpp
@@ -17,7 +17,7 @@
 #include <twin.h>
 #include <kdebug.h>
 #include <kcmdlineargs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "knode.h"
 #include "knapplication.h"
diff --git a/knode/knarticlewindow.cpp b/knode/knarticlewindow.cpp
index bf05ec11b..a45cf7735 100644
--- a/knode/knarticlewindow.cpp
+++ b/knode/knarticlewindow.cpp
@@ -16,7 +16,7 @@
 #include <twin.h>
 
 #include <kstdaction.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kaccel.h>
 #include <kaction.h>
 
diff --git a/knode/kncomposer.cpp b/knode/kncomposer.cpp
index fa92c045e..6a31f805c 100644
--- a/knode/kncomposer.cpp
+++ b/knode/kncomposer.cpp
@@ -31,7 +31,7 @@ using KRecentAddress::RecentAddresses;
 #include <kkeydialog.h>
 #include <kedittoolbar.h>
 #include <kpopupmenu.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kdebug.h>
 #include <klineedit.h>
 #include <kcombobox.h>
diff --git a/knode/knconfig.h b/knode/knconfig.h
index 17ee8a525..c86050494 100644
--- a/knode/knconfig.h
+++ b/knode/knconfig.h
@@ -22,7 +22,7 @@
 #include <tqobject.h>
 #include <tqpixmap.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <kmime_util.h>
 
diff --git a/knode/knconfigwidgets.cpp b/knode/knconfigwidgets.cpp
index 9e80e1b83..8a1c3fbcb 100644
--- a/knode/knconfigwidgets.cpp
+++ b/knode/knconfigwidgets.cpp
@@ -23,7 +23,7 @@
 #include <kmessagebox.h>
 #include <kcolordialog.h>
 #include <kfontdialog.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kuserprofile.h>
 #include <kopenwith.h>
 #include <kscoringeditor.h>
diff --git a/knode/knconvert.cpp b/knode/knconvert.cpp
index ba95e9a30..619833d77 100644
--- a/knode/knconvert.cpp
+++ b/knode/knconvert.cpp
@@ -18,7 +18,7 @@
 #include <tqcheckbox.h>
 
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kseparator.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
diff --git a/knode/knewsservice.protocol b/knode/knewsservice.protocol
index 6adc5e958..28a177fe4 100644
--- a/knode/knewsservice.protocol
+++ b/knode/knewsservice.protocol
@@ -9,5 +9,5 @@ reading=false
 writing=false
 makedir=false
 deleting=false
-DocPath=kioslave/news.html
+DocPath=tdeioslave/news.html
 Icon=knode
diff --git a/knode/knglobals.cpp b/knode/knglobals.cpp
index bfed08e1f..48a257168 100644
--- a/knode/knglobals.cpp
+++ b/knode/knglobals.cpp
@@ -17,7 +17,7 @@
 #include "knglobals.h"
 
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstaticdeleter.h>
 
 #include "knconfigmanager.h"
diff --git a/knode/knglobals.h b/knode/knglobals.h
index 2b535ac8b..a2bde078f 100644
--- a/knode/knglobals.h
+++ b/knode/knglobals.h
@@ -17,7 +17,7 @@
 #ifndef KNGLOBALS_H
 #define KNGLOBALS_H
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include "resource.h"
 
 #include <tdepimmacros.h>
diff --git a/knode/knjobdata.cpp b/knode/knjobdata.cpp
index b79b3199d..0d626983b 100644
--- a/knode/knjobdata.cpp
+++ b/knode/knjobdata.cpp
@@ -15,7 +15,7 @@
 
 #include <kdebug.h>
 #include <klocale.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #include <libtdepim/progressmanager.h>
 
diff --git a/knode/knmainwidget.cpp b/knode/knmainwidget.cpp
index f2728f8db..30edb5edb 100644
--- a/knode/knmainwidget.cpp
+++ b/knode/knmainwidget.cpp
@@ -20,7 +20,7 @@
 #include <kinputdialog.h>
 #include <kaccel.h>
 #include <kxmlguiclient.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmessagebox.h>
 #include <kedittoolbar.h>
 #include <kstdaction.h>
diff --git a/knode/knnetaccess.cpp b/knode/knnetaccess.cpp
index b81ccfa9f..59cc0455d 100644
--- a/knode/knnetaccess.cpp
+++ b/knode/knnetaccess.cpp
@@ -20,8 +20,8 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
-#include <kio/job.h>
-#include <kio/passdlg.h>
+#include <tdeio/job.h>
+#include <tdeio/passdlg.h>
 #include <ksocks.h>
 #include <kapplication.h>
 
diff --git a/knode/knserverinfo.cpp b/knode/knserverinfo.cpp
index 307c72fff..6af554ceb 100644
--- a/knode/knserverinfo.cpp
+++ b/knode/knserverinfo.cpp
@@ -14,7 +14,7 @@
 
 
 #include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <tdewallet.h>
diff --git a/knode/utilities.cpp b/knode/utilities.cpp
index 31d36369c..2274d2eff 100644
--- a/knode/utilities.cpp
+++ b/knode/utilities.cpp
@@ -21,9 +21,9 @@
 #include <kmessagebox.h>
 #include <kglobalsettings.h>
 #include <kdebug.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <ktempfile.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 #include "knwidgets.h"
 #include "knglobals.h"