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

12 files changed, 18 insertions, 18 deletions

diff --git a/kpresenter/KPrBackDia.cpp b/kpresenter/KPrBackDia.cpp
index d8eb9f208..a6985239a 100644
--- a/kpresenter/KPrBackDia.cpp
+++ b/kpresenter/KPrBackDia.cpp
@@ -36,7 +36,7 @@
 
 #include <kcolorbutton.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kimageio.h>
 #include <kbuttonbox.h>
 #include <kurlrequester.h>
diff --git a/kpresenter/KPrBgSpellCheck.cpp b/kpresenter/KPrBgSpellCheck.cpp
index b48d5b432..0bd3ce402 100644
--- a/kpresenter/KPrBgSpellCheck.cpp
+++ b/kpresenter/KPrBgSpellCheck.cpp
@@ -31,7 +31,7 @@
 using namespace KSpell2;
 
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 
 KPrBgSpellCheck::KPrBgSpellCheck(KPrDocument *_doc)
diff --git a/kpresenter/KPrCanvas.cpp b/kpresenter/KPrCanvas.cpp
index dff09c73b..8c1d244c0 100644
--- a/kpresenter/KPrCanvas.cpp
+++ b/kpresenter/KPrCanvas.cpp
@@ -50,10 +50,10 @@
 #include <kcursor.h>
 #include <kmessagebox.h>
 #include <tdemultipledrag.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kurl.h>
 #include <kurldrag.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include <KoParagCounter.h>
 #include <KoPoint.h>
diff --git a/kpresenter/KPrConfig.cpp b/kpresenter/KPrConfig.cpp
index 5ef69958a..e6e706cc1 100644
--- a/kpresenter/KPrConfig.cpp
+++ b/kpresenter/KPrConfig.cpp
@@ -26,7 +26,7 @@
 #include <kapplication.h>
 #include <KoUnitWidgets.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
 #include <knuminput.h>
@@ -71,7 +71,7 @@
 #include <tdeversion.h>
 #include <kurlrequesterdlg.h>
 #include <klistview.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <KoEditPath.h>
 
 #include <tdespell2/configwidget.h>
diff --git a/kpresenter/KPrDocument.cpp b/kpresenter/KPrDocument.cpp
index 4a8083a95..d4503064d 100644
--- a/kpresenter/KPrDocument.cpp
+++ b/kpresenter/KPrDocument.cpp
@@ -59,12 +59,12 @@
 #include <kurldrag.h>
 #include <ktempfile.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
 #include <kprocess.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include <KoTemplateChooseDia.h>
 #include <KoRuler.h>
diff --git a/kpresenter/KPrEffectDia.cpp b/kpresenter/KPrEffectDia.cpp
index c40059b5b..b65b724b5 100644
--- a/kpresenter/KPrEffectDia.cpp
+++ b/kpresenter/KPrEffectDia.cpp
@@ -46,7 +46,7 @@
 #include <kurlrequester.h>
 #include <kurl.h>
 #include <kstandarddirs.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList<KPrObject>& _objs,
                       KPrView *_view )
diff --git a/kpresenter/KPrImportStyleDia.cpp b/kpresenter/KPrImportStyleDia.cpp
index c2db00b42..1cd4d9ff7 100644
--- a/kpresenter/KPrImportStyleDia.cpp
+++ b/kpresenter/KPrImportStyleDia.cpp
@@ -29,7 +29,7 @@
 #include "KPrImportStyleDia.h"
 #include <KoStore.h>
 #include <tqfile.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kdebug.h>
 #include <tqlabel.h>
 #include "KPrTextObject.h"
diff --git a/kpresenter/KPrMSPresentationSetup.cpp b/kpresenter/KPrMSPresentationSetup.cpp
index 7386bceba..e4db5e915 100644
--- a/kpresenter/KPrMSPresentationSetup.cpp
+++ b/kpresenter/KPrMSPresentationSetup.cpp
@@ -30,7 +30,7 @@
 #include "KPrCanvas.h"
 #include "KPrPage.h"
 
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <ktempfile.h>
 
 #include <tqdir.h>
diff --git a/kpresenter/KPrSlideTransitionDia.cpp b/kpresenter/KPrSlideTransitionDia.cpp
index 553a1df16..88d1c9aca 100644
--- a/kpresenter/KPrSlideTransitionDia.cpp
+++ b/kpresenter/KPrSlideTransitionDia.cpp
@@ -21,7 +21,7 @@
 
 #include "KPrSlideTransitionDia.h"
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 #include <knuminput.h>
 #include <kstandarddirs.h>
diff --git a/kpresenter/KPrTransEffectDia.cpp b/kpresenter/KPrTransEffectDia.cpp
index 859c0c7b0..f13065947 100644
--- a/kpresenter/KPrTransEffectDia.cpp
+++ b/kpresenter/KPrTransEffectDia.cpp
@@ -52,7 +52,7 @@
 #include <kiconloader.h>
 #include <kurl.h>
 #include <kstandarddirs.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 
 KPrEffectPreview::KPrEffectPreview( TQWidget *parent, KPrDocument *_doc, KPrView *_view )
diff --git a/kpresenter/KPrView.cpp b/kpresenter/KPrView.cpp
index a59b7a1a5..e932bcdd4 100644
--- a/kpresenter/KPrView.cpp
+++ b/kpresenter/KPrView.cpp
@@ -64,11 +64,11 @@
 #include <KoCreateStyleDia.h>
 
 #include <dcopclient.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 #include <kstdaction.h>
 #include <kapplication.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include "KPrView.h"
 #include "KPrDocument.h"
@@ -78,7 +78,7 @@
 
 #include <klocale.h>
 #include <kcolordialog.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kfontdialog.h>
 #include <kglobal.h>
 #include <kimageio.h>
diff --git a/kpresenter/KPrWebPresentation.cpp b/kpresenter/KPrWebPresentation.cpp
index 2fbb73369..d87a82c4b 100644
--- a/kpresenter/KPrWebPresentation.cpp
+++ b/kpresenter/KPrWebPresentation.cpp
@@ -56,7 +56,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kcolorbutton.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 #include <kbuttonbox.h>
 #include <ksimpleconfig.h>
@@ -71,7 +71,7 @@
 #include <knuminput.h>
 #include <kcombobox.h>
 #include <kurl.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kdialog.h>
 
 #include "KoDocumentInfo.h"