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

14 files changed, 18 insertions, 18 deletions

diff --git a/lib/kofficecore/KoDetailsPane.cpp b/lib/kofficecore/KoDetailsPane.cpp
index 8fb845892..91cdb4ade 100644
--- a/lib/kofficecore/KoDetailsPane.cpp
+++ b/lib/kofficecore/KoDetailsPane.cpp
@@ -34,10 +34,10 @@
 #include <klocale.h>
 #include <klistview.h>
 #include <kpushbutton.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kurl.h>
-#include <kfileitem.h>
-#include <kio/previewjob.h>
+#include <tdefileitem.h>
+#include <tdeio/previewjob.h>
 #include <kdebug.h>
 #include <ktextbrowser.h>
 #include <kapplication.h>
diff --git a/lib/kofficecore/KoDocument.cpp b/lib/kofficecore/KoDocument.cpp
index b3e9a7b6a..c657ee327 100644
--- a/lib/kofficecore/KoDocument.cpp
+++ b/lib/kofficecore/KoDocument.cpp
@@ -38,10 +38,10 @@
 #include <kapplication.h>
 #include <kdebug.h>
 #include <tdeversion.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kiconloader.h>
-#include <kio/job.h>
-#include <kio/netaccess.h>
+#include <tdeio/job.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kmimetype.h>
diff --git a/lib/kofficecore/KoDocumentInfo.cpp b/lib/kofficecore/KoDocumentInfo.cpp
index eafda4b50..7bdc34e30 100644
--- a/lib/kofficecore/KoDocumentInfo.cpp
+++ b/lib/kofficecore/KoDocumentInfo.cpp
@@ -27,7 +27,7 @@
 #include <KoStoreDevice.h>
 #include <KoXmlWriter.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <klocale.h>
diff --git a/lib/kofficecore/KoDocumentInfo.h b/lib/kofficecore/KoDocumentInfo.h
index b113e75e6..f6467768c 100644
--- a/lib/kofficecore/KoDocumentInfo.h
+++ b/lib/kofficecore/KoDocumentInfo.h
@@ -23,7 +23,7 @@
 
 #include <tqobject.h>
 #include <tqmap.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <koffice_export.h>
 
 class TQString;
diff --git a/lib/kofficecore/KoFileDialog.cpp b/lib/kofficecore/KoFileDialog.cpp
index 9656aa840..1b1c98a88 100644
--- a/lib/kofficecore/KoFileDialog.cpp
+++ b/lib/kofficecore/KoFileDialog.cpp
@@ -20,7 +20,7 @@
 
 #include "KoFileDialog.h"
 #include "KoDocument.h"
-#include <kfilefiltercombo.h>
+#include <tdefilefiltercombo.h>
 #include <klocale.h>
 #include <kdiroperator.h>
 #include <kdebug.h>
diff --git a/lib/kofficecore/KoFileDialog.h b/lib/kofficecore/KoFileDialog.h
index f419320cc..c48169a38 100644
--- a/lib/kofficecore/KoFileDialog.h
+++ b/lib/kofficecore/KoFileDialog.h
@@ -21,7 +21,7 @@
 #ifndef KOFILEDIALOG_H
 #define KOFILEDIALOG_H
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <tqvaluevector.h>
 
 /**
diff --git a/lib/kofficecore/KoMainWindow.cpp b/lib/kofficecore/KoMainWindow.cpp
index ccb258284..483ff6835 100644
--- a/lib/kofficecore/KoMainWindow.cpp
+++ b/lib/kofficecore/KoMainWindow.cpp
@@ -39,7 +39,7 @@
 #include <kapplication.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kkeydialog.h>
 #include <kedittoolbar.h>
 #include <kprogress.h>
diff --git a/lib/kofficecore/KoMainWindow.h b/lib/kofficecore/KoMainWindow.h
index d7727025d..6310deda3 100644
--- a/lib/kofficecore/KoMainWindow.h
+++ b/lib/kofficecore/KoMainWindow.h
@@ -22,7 +22,7 @@
 #define __ko_main_window_h__
 
 #include <tdeparts/mainwindow.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <koffice_export.h>
 #include "KoDocument.h"
 
diff --git a/lib/kofficecore/KoOpenPane.cpp b/lib/kofficecore/KoOpenPane.cpp
index a8fa0f936..5d23b1131 100644
--- a/lib/kofficecore/KoOpenPane.cpp
+++ b/lib/kofficecore/KoOpenPane.cpp
@@ -30,7 +30,7 @@
 #include <tqpen.h>
 
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kinstance.h>
 #include <kpushbutton.h>
 #include <kiconloader.h>
diff --git a/lib/kofficecore/KoPicture.cpp b/lib/kofficecore/KoPicture.cpp
index 2dd6f730d..58ef2fbfa 100644
--- a/lib/kofficecore/KoPicture.cpp
+++ b/lib/kofficecore/KoPicture.cpp
@@ -23,7 +23,7 @@
 
 #include <kdebug.h>
 #include <kurl.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include "KoPictureKey.h"
 #include "KoPictureBase.h"
diff --git a/lib/kofficecore/KoPictureBase.cpp b/lib/kofficecore/KoPictureBase.cpp
index 1d476f74e..ff30802ea 100644
--- a/lib/kofficecore/KoPictureBase.cpp
+++ b/lib/kofficecore/KoPictureBase.cpp
@@ -23,7 +23,7 @@
 #include <KoXmlWriter.h>
 
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 
 #include <kmdcodec.h>
diff --git a/lib/kofficecore/KoPictureShared.cpp b/lib/kofficecore/KoPictureShared.cpp
index 6bc69345c..57d95f659 100644
--- a/lib/kofficecore/KoPictureShared.cpp
+++ b/lib/kofficecore/KoPictureShared.cpp
@@ -24,7 +24,7 @@
 #include <kdebug.h>
 #include <kurl.h>
 #include <kfilterdev.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include "KoPictureKey.h"
 #include "KoPictureBase.h"
diff --git a/lib/kofficecore/KoSpeaker.cpp b/lib/kofficecore/KoSpeaker.cpp
index d81cffeca..4599927b1 100644
--- a/lib/kofficecore/KoSpeaker.cpp
+++ b/lib/kofficecore/KoSpeaker.cpp
@@ -47,7 +47,7 @@
 #include <klocale.h>
 #include <kglobal.h>
 #include <dcopclient.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <ktrader.h>
 #include <kdebug.h>
 
diff --git a/lib/kofficecore/KoTemplates.cpp b/lib/kofficecore/KoTemplates.cpp
index 5acc72a71..2d65368ed 100644
--- a/lib/kofficecore/KoTemplates.cpp
+++ b/lib/kofficecore/KoTemplates.cpp
@@ -31,7 +31,7 @@
 #include <ksavefile.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
 
 #include <stdlib.h>