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

19 files changed, 22 insertions, 22 deletions

diff --git a/filters/chalk/gmagick/kis_image_magick_converter.cc b/filters/chalk/gmagick/kis_image_magick_converter.cc
index 0fe8cf55..bb95c672 100644
--- a/filters/chalk/gmagick/kis_image_magick_converter.cc
+++ b/filters/chalk/gmagick/kis_image_magick_converter.cc
@@ -33,7 +33,7 @@
 #include <kapplication.h>
 #include <klocale.h>
 #include <kurl.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include <tqcolor.h>
 
diff --git a/filters/chalk/gmagick/kis_image_magick_converter.h b/filters/chalk/gmagick/kis_image_magick_converter.h
index 1c193e8c..28b4ce30 100644
--- a/filters/chalk/gmagick/kis_image_magick_converter.h
+++ b/filters/chalk/gmagick/kis_image_magick_converter.h
@@ -22,7 +22,7 @@
 #include <tqobject.h>
 #include <tqvaluevector.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #include "kis_types.h"
 #include "kis_global.h"
diff --git a/filters/chalk/jpeg/kis_jpeg_converter.cc b/filters/chalk/jpeg/kis_jpeg_converter.cc
index 87289fbf..b27f98e5 100644
--- a/filters/chalk/jpeg/kis_jpeg_converter.cc
+++ b/filters/chalk/jpeg/kis_jpeg_converter.cc
@@ -33,7 +33,7 @@ extern "C" {
 
 #include <KoDocumentInfo.h>
 
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include <kis_abstract_colorspace.h>
 #include <kis_colorspace_factory_registry.h>
diff --git a/filters/chalk/jpeg/kis_jpeg_converter.h b/filters/chalk/jpeg/kis_jpeg_converter.h
index 567204ee..da01be8b 100644
--- a/filters/chalk/jpeg/kis_jpeg_converter.h
+++ b/filters/chalk/jpeg/kis_jpeg_converter.h
@@ -28,7 +28,7 @@ extern "C" {
 
 #include <tqvaluevector.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #include <kis_progress_subject.h>
 
diff --git a/filters/chalk/magick/kis_image_magick_converter.cc b/filters/chalk/magick/kis_image_magick_converter.cc
index 52c662a9..64c3de36 100644
--- a/filters/chalk/magick/kis_image_magick_converter.cc
+++ b/filters/chalk/magick/kis_image_magick_converter.cc
@@ -32,7 +32,7 @@
 #include <kapplication.h>
 #include <klocale.h>
 #include <kurl.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include <tqcolor.h>
 
diff --git a/filters/chalk/magick/kis_image_magick_converter.h b/filters/chalk/magick/kis_image_magick_converter.h
index 1c193e8c..28b4ce30 100644
--- a/filters/chalk/magick/kis_image_magick_converter.h
+++ b/filters/chalk/magick/kis_image_magick_converter.h
@@ -22,7 +22,7 @@
 #include <tqobject.h>
 #include <tqvaluevector.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #include "kis_types.h"
 #include "kis_global.h"
diff --git a/filters/chalk/pdf/kis_pdf_import.cpp b/filters/chalk/pdf/kis_pdf_import.cpp
index 7eac5ef4..7ec09c97 100644
--- a/filters/chalk/pdf/kis_pdf_import.cpp
+++ b/filters/chalk/pdf/kis_pdf_import.cpp
@@ -35,7 +35,7 @@
 #include <knuminput.h>
 #include <kpassdlg.h>
 
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 // koffice's headers
 #include <KoFilterChain.h>
diff --git a/filters/chalk/png/kis_png_converter.cc b/filters/chalk/png/kis_png_converter.cc
index f8ccd92b..b1bdeb71 100644
--- a/filters/chalk/png/kis_png_converter.cc
+++ b/filters/chalk/png/kis_png_converter.cc
@@ -30,7 +30,7 @@
 
 #include <KoDocumentInfo.h>
 
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include <kis_abstract_colorspace.h>
 #include <kis_colorspace_factory_registry.h>
diff --git a/filters/chalk/png/kis_png_converter.h b/filters/chalk/png/kis_png_converter.h
index 3877b692..4324f979 100644
--- a/filters/chalk/png/kis_png_converter.h
+++ b/filters/chalk/png/kis_png_converter.h
@@ -24,7 +24,7 @@
 
 #include <tqvaluevector.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #include <kis_progress_subject.h>
 
diff --git a/filters/chalk/raw/kis_raw_import.cpp b/filters/chalk/raw/kis_raw_import.cpp
index d030085e..1af33fd7 100644
--- a/filters/chalk/raw/kis_raw_import.cpp
+++ b/filters/chalk/raw/kis_raw_import.cpp
@@ -41,7 +41,7 @@
 #include <tqtimer.h>
 
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <knuminput.h>
 #include <kgenericfactory.h>
 #include <kdialogbase.h>
diff --git a/filters/chalk/tiff/kis_tiff_converter.cc b/filters/chalk/tiff/kis_tiff_converter.cc
index 7a0f5c5e..62de9253 100644
--- a/filters/chalk/tiff/kis_tiff_converter.cc
+++ b/filters/chalk/tiff/kis_tiff_converter.cc
@@ -29,7 +29,7 @@
 #include <kapplication.h>
 #include <KoDocumentInfo.h>
 
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include <kis_abstract_colorspace.h>
 #include <kis_colorspace_factory_registry.h>
diff --git a/filters/chalk/tiff/kis_tiff_converter.h b/filters/chalk/tiff/kis_tiff_converter.h
index 86b070fb..010ee3b7 100644
--- a/filters/chalk/tiff/kis_tiff_converter.h
+++ b/filters/chalk/tiff/kis_tiff_converter.h
@@ -25,7 +25,7 @@
 
 #include <tqvaluevector.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #include <kis_progress_subject.h>
 
diff --git a/filters/chalk/tiff/kis_tiff_reader.h b/filters/chalk/tiff/kis_tiff_reader.h
index 2ab573dd..244978df 100644
--- a/filters/chalk/tiff/kis_tiff_reader.h
+++ b/filters/chalk/tiff/kis_tiff_reader.h
@@ -27,7 +27,7 @@
 #include <tiffio.h>
 
 // #include <tqvaluevector.h>
-// #include <kio/job.h>
+// #include <tdeio/job.h>
 // #include <kis_progress_subject.h>
 
 #include <kis_paint_device.h>
diff --git a/filters/kspread/csv/csvdialog.cpp b/filters/kspread/csv/csvdialog.cpp
index cf923207..28477dd3 100644
--- a/filters/kspread/csv/csvdialog.cpp
+++ b/filters/kspread/csv/csvdialog.cpp
@@ -34,7 +34,7 @@
 #include <tqtextcodec.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kcombobox.h>
diff --git a/filters/kspread/csv/csvexportdialog.cpp b/filters/kspread/csv/csvexportdialog.cpp
index e27aee7a..6e96b804 100644
--- a/filters/kspread/csv/csvexportdialog.cpp
+++ b/filters/kspread/csv/csvexportdialog.cpp
@@ -39,7 +39,7 @@
 #include <tqvalidator.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kcombobox.h>
diff --git a/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc b/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc
index 00b097d6..9c6e0432 100644
--- a/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc
+++ b/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc
@@ -29,12 +29,12 @@
 #include <kapplication.h>
 #include <kglobal.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <krecentdocument.h>
 #include <ktempfile.h>
 #include <kurlrequester.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kdebug.h>
 #include <KoFilterManager.h>
 #include <kcombobox.h>
diff --git a/filters/kword/latex/export/kwordlatexexportdia.cc b/filters/kword/latex/export/kwordlatexexportdia.cc
index 5f33dfc0..cbde5f5d 100644
--- a/filters/kword/latex/export/kwordlatexexportdia.cc
+++ b/filters/kword/latex/export/kwordlatexexportdia.cc
@@ -29,12 +29,12 @@
 #include <kapplication.h>
 #include <kglobal.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <krecentdocument.h>
 #include <ktempfile.h>
 #include <kurlrequester.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kdebug.h>
 #include <KoFilterManager.h>
 #include <kcombobox.h>
diff --git a/filters/xsltfilter/export/xsltexportdia.cc b/filters/xsltfilter/export/xsltexportdia.cc
index 76805f9b..aa16c723 100644
--- a/filters/xsltfilter/export/xsltexportdia.cc
+++ b/filters/xsltfilter/export/xsltexportdia.cc
@@ -27,12 +27,12 @@
 #include <kapplication.h>
 #include <kglobal.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tdeversion.h>
 #include <kstandarddirs.h>
 #include <krecentdocument.h>
 #include <ktempfile.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kdebug.h>
 #include <KoFilterManager.h>
 #include <KoStoreDevice.h>
diff --git a/filters/xsltfilter/import/xsltimportdia.h b/filters/xsltfilter/import/xsltimportdia.h
index 763f4104..1261f27f 100644
--- a/filters/xsltfilter/import/xsltimportdia.h
+++ b/filters/xsltfilter/import/xsltimportdia.h
@@ -21,7 +21,7 @@
 #define __XSLTIMPORTDIA_H__
 
 #include "kapplication.h"
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <KoStore.h>
 #include "xsltdialog.h"