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

26 files changed, 36 insertions, 36 deletions

diff --git a/src/projects/k3baudioburndialog.cpp b/src/projects/k3baudioburndialog.cpp
index 5c5634a..8274f3b 100644
--- a/src/projects/k3baudioburndialog.cpp
+++ b/src/projects/k3baudioburndialog.cpp
@@ -51,7 +51,7 @@
 
 #include <klocale.h>
 #include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmessagebox.h>
 
 
diff --git a/src/projects/k3baudiotrackdialog.cpp b/src/projects/k3baudiotrackdialog.cpp
index 14f3726..8e20636 100644
--- a/src/projects/k3baudiotrackdialog.cpp
+++ b/src/projects/k3baudiotrackdialog.cpp
@@ -29,7 +29,7 @@
 #include <knuminput.h>
 #include <kmimetype.h>
 #include <kurl.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <klineedit.h>
 
 #include "k3baudiotrackdialog.h"
diff --git a/src/projects/k3bbootimageview.cpp b/src/projects/k3bbootimageview.cpp
index 52c32e2..9b4dd27 100644
--- a/src/projects/k3bbootimageview.cpp
+++ b/src/projects/k3bbootimageview.cpp
@@ -21,7 +21,7 @@
 
 #include <klocale.h>
 #include <klistview.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
 
diff --git a/src/projects/k3bdataburndialog.cpp b/src/projects/k3bdataburndialog.cpp
index eee70f0..3df6c2a 100644
--- a/src/projects/k3bdataburndialog.cpp
+++ b/src/projects/k3bdataburndialog.cpp
@@ -54,11 +54,11 @@
 #include <kmessagebox.h>
 #include <klineedit.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kcombobox.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 
 #include "k3bfilecompilationsizehandler.h"
diff --git a/src/projects/k3bdatamultisessioncombobox.cpp b/src/projects/k3bdatamultisessioncombobox.cpp
index 5566ead..aa038eb 100644
--- a/src/projects/k3bdatamultisessioncombobox.cpp
+++ b/src/projects/k3bdatamultisessioncombobox.cpp
@@ -16,7 +16,7 @@
 #include "k3bdatamultisessioncombobox.h"
 
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqwhatsthis.h>
 #include <tqtooltip.h>
diff --git a/src/projects/k3bdatapropertiesdialog.cpp b/src/projects/k3bdatapropertiesdialog.cpp
index d6d5075..c3648ca 100644
--- a/src/projects/k3bdatapropertiesdialog.cpp
+++ b/src/projects/k3bdatapropertiesdialog.cpp
@@ -36,8 +36,8 @@
 #include <klocale.h>
 #include <kmimetype.h>
 #include <kurl.h>
-#include <kio/global.h>
-#include <kfileitem.h>
+#include <tdeio/global.h>
+#include <tdefileitem.h>
 
 
 
diff --git a/src/projects/k3bdataurladdingdialog.cpp b/src/projects/k3bdataurladdingdialog.cpp
index 842520e..9bf28db 100644
--- a/src/projects/k3bdataurladdingdialog.cpp
+++ b/src/projects/k3bdataurladdingdialog.cpp
@@ -48,7 +48,7 @@
 #include <kiconloader.h>
 #include <kglobal.h>
 #include <kstdguiitem.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <ksqueezedtextlabel.h>
 #include <kprogress.h>
 
diff --git a/src/projects/k3bdataview.cpp b/src/projects/k3bdataview.cpp
index 1ac59f8..d71d256 100644
--- a/src/projects/k3bdataview.cpp
+++ b/src/projects/k3bdataview.cpp
@@ -37,8 +37,8 @@
 #include <kpopupmenu.h>
 #include <kaction.h>
 #include <kmessagebox.h>
-#include <kio/global.h>
-#include <kio/job.h>
+#include <tdeio/global.h>
+#include <tdeio/job.h>
 #include <kdialogbase.h>
 
 #include <tqpixmap.h>
diff --git a/src/projects/k3bdataviewitem.cpp b/src/projects/k3bdataviewitem.cpp
index 7cfe576..f8dff4f 100644
--- a/src/projects/k3bdataviewitem.cpp
+++ b/src/projects/k3bdataviewitem.cpp
@@ -22,7 +22,7 @@
 #include "k3bdatadoc.h"
 #include <k3bvalidators.h>
 
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kmimetype.h>
diff --git a/src/projects/k3bdvdburndialog.cpp b/src/projects/k3bdvdburndialog.cpp
index a393360..decfca8 100644
--- a/src/projects/k3bdvdburndialog.cpp
+++ b/src/projects/k3bdvdburndialog.cpp
@@ -28,9 +28,9 @@
 #include <k3bstdguiitems.h>
 #include <k3bglobalsettings.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <kmessagebox.h>
 
 #include <tqlayout.h>
diff --git a/src/projects/k3bfillstatusdisplay.cpp b/src/projects/k3bfillstatusdisplay.cpp
index 555348b..88d5ba9 100644
--- a/src/projects/k3bfillstatusdisplay.cpp
+++ b/src/projects/k3bfillstatusdisplay.cpp
@@ -43,10 +43,10 @@
 #include <kpopupmenu.h>
 #include <klocale.h>
 #include <kinputdialog.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <kmessagebox.h>
 #include <kglobal.h>
 #include <kpixmapeffect.h>
diff --git a/src/projects/k3bmixedburndialog.cpp b/src/projects/k3bmixedburndialog.cpp
index 7d74a2f..3e4353b 100644
--- a/src/projects/k3bmixedburndialog.cpp
+++ b/src/projects/k3bmixedburndialog.cpp
@@ -53,7 +53,7 @@
 #include <tqradiobutton.h>
 
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
diff --git a/src/projects/k3bmovixburndialog.cpp b/src/projects/k3bmovixburndialog.cpp
index c09f930..86a80d7 100644
--- a/src/projects/k3bmovixburndialog.cpp
+++ b/src/projects/k3bmovixburndialog.cpp
@@ -33,9 +33,9 @@
 #include <klocale.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqcheckbox.h>
 #include <tqlayout.h>
diff --git a/src/projects/k3bmovixdvdburndialog.cpp b/src/projects/k3bmovixdvdburndialog.cpp
index 83d560b..6b6b706 100644
--- a/src/projects/k3bmovixdvdburndialog.cpp
+++ b/src/projects/k3bmovixdvdburndialog.cpp
@@ -34,9 +34,9 @@
 
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 #include <tqcheckbox.h>
diff --git a/src/projects/k3bmovixlistview.cpp b/src/projects/k3bmovixlistview.cpp
index b3b7fb2..2f3fc31 100644
--- a/src/projects/k3bmovixlistview.cpp
+++ b/src/projects/k3bmovixlistview.cpp
@@ -21,7 +21,7 @@
 
 #include <klocale.h>
 #include <kdebug.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <kurldrag.h>
 
 #include <tqdragobject.h>
diff --git a/src/projects/k3bmovixlistview.h b/src/projects/k3bmovixlistview.h
index e175a61..be5750f 100644
--- a/src/projects/k3bmovixlistview.h
+++ b/src/projects/k3bmovixlistview.h
@@ -19,7 +19,7 @@
 #define _K3B_MOVIX_LISTVIEW_H_
 
 #include <k3blistview.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 
 #include <tqmap.h>
 
diff --git a/src/projects/k3bmovixoptionswidget.cpp b/src/projects/k3bmovixoptionswidget.cpp
index 0a2432d..9ede404 100644
--- a/src/projects/k3bmovixoptionswidget.cpp
+++ b/src/projects/k3bmovixoptionswidget.cpp
@@ -20,7 +20,7 @@
 
 #include <kcombobox.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kdebug.h>
 
diff --git a/src/projects/k3bmovixview.cpp b/src/projects/k3bmovixview.cpp
index 58c6ba7..6e86212 100644
--- a/src/projects/k3bmovixview.cpp
+++ b/src/projects/k3bmovixview.cpp
@@ -29,7 +29,7 @@
 #include <kdebug.h>
 #include <kaction.h>
 #include <kpopupmenu.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 #include <kurl.h>
 
diff --git a/src/projects/k3bprojectburndialog.cpp b/src/projects/k3bprojectburndialog.cpp
index 04e829b..2547fef 100644
--- a/src/projects/k3bprojectburndialog.cpp
+++ b/src/projects/k3bprojectburndialog.cpp
@@ -40,7 +40,7 @@
 #include <tqlabel.h>
 
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmessagebox.h>
 #include <kguiitem.h>
 #include <kstdguiitem.h>
diff --git a/src/projects/k3bvcdburndialog.cpp b/src/projects/k3bvcdburndialog.cpp
index 0a36668..1dd97f0 100644
--- a/src/projects/k3bvcdburndialog.cpp
+++ b/src/projects/k3bvcdburndialog.cpp
@@ -28,10 +28,10 @@
 #include <tqfileinfo.h>
 
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <kapplication.h>
 
 #include "k3bvcdburndialog.h"
diff --git a/src/projects/k3bvcdlistviewitem.cpp b/src/projects/k3bvcdlistviewitem.cpp
index b18ec30..363068c 100644
--- a/src/projects/k3bvcdlistviewitem.cpp
+++ b/src/projects/k3bvcdlistviewitem.cpp
@@ -13,7 +13,7 @@
 * See the file "COPYING" for the exact licensing terms.
 */
 
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <kiconloader.h>
 
 
diff --git a/src/projects/k3bvcdtrackdialog.cpp b/src/projects/k3bvcdtrackdialog.cpp
index 99eeb6c..007d20f 100644
--- a/src/projects/k3bvcdtrackdialog.cpp
+++ b/src/projects/k3bvcdtrackdialog.cpp
@@ -32,7 +32,7 @@
 
 // Kde Includes
 #include <kiconloader.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <klocale.h>
 #include <kmimetype.h>
 #include <knuminput.h>
diff --git a/src/projects/k3bvideodvdburndialog.cpp b/src/projects/k3bvideodvdburndialog.cpp
index 8a02e2b..1479ffc 100644
--- a/src/projects/k3bvideodvdburndialog.cpp
+++ b/src/projects/k3bvideodvdburndialog.cpp
@@ -27,9 +27,9 @@
 #include <k3bstdguiitems.h>
 #include <k3bglobalsettings.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <kmessagebox.h>
 
 #include <tqlayout.h>
diff --git a/src/projects/kostore/SPEC b/src/projects/kostore/SPEC
index 4010e33..9cbec59 100644
--- a/src/projects/kostore/SPEC
+++ b/src/projects/kostore/SPEC
@@ -21,7 +21,7 @@
 The purpose of this document is to define a common KOffice Storage Structure.
 Torben, Reggie, and all the others agreed on storing embedded KOffice Parts
 and binary data (e.g. pictures, movies, sounds) via a simple tar.gz-structure.
-The support class for the tar format is tdelibs/kio/ktar.*, written by Torben
+The support class for the tar format is tdelibs/tdeio/ktar.*, written by Torben
 and finished by David.
 
 The obvious benefits of this type of storage are:
diff --git a/src/projects/kostore/koStore.cc b/src/projects/kostore/koStore.cc
index 4f645e0..dcaf5d0 100644
--- a/src/projects/kostore/koStore.cc
+++ b/src/projects/kostore/koStore.cc
@@ -37,7 +37,7 @@
 #include <tdeversion.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 //#define DefaultFormat KoStore::Tar
 #define DefaultFormat KoStore::Zip
diff --git a/src/projects/kostore/koZipStore.cc b/src/projects/kostore/koZipStore.cc
index cd393eb..0bbecdc 100644
--- a/src/projects/kostore/koZipStore.cc
+++ b/src/projects/kostore/koZipStore.cc
@@ -25,7 +25,7 @@
 #include <kdebug.h>
 #include <tdeversion.h>
 #include <kurl.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #if ! KDE_IS_VERSION( 3, 4, 1 )
 #include <tqdir.h>
 #include <tqfileinfo.h>