From d796716f1dc9dd0b198863d974a03bf356f636e6 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 27 Jan 2013 00:52:05 -0600
Subject: Rename a number of libraries and executables to avoid conflicts with
 KDE4

---
 src/k3b.cpp                                   | 10 +++++-----
 src/k3bappdevicemanager.cpp                   |  4 ++--
 src/k3bapplication.cpp                        |  2 +-
 src/k3bdatamodewidget.cpp                     |  2 +-
 src/k3bdebuggingoutputdialog.cpp              |  2 +-
 src/k3bdiroperator.cpp                        |  2 +-
 src/k3bdirview.cpp                            | 12 ++++++------
 src/k3bdiskinfoview.cpp                       |  2 +-
 src/k3bemptydiscwaiter.cpp                    |  2 +-
 src/k3bfiletreeview.cpp                       |  4 ++--
 src/k3bfiletreeview.h                         |  2 +-
 src/k3bfileview.cpp                           |  6 +++---
 src/k3bfirstrun.cpp                           |  2 +-
 src/k3binteractiondialog.cpp                  |  2 +-
 src/k3bjobprogressdialog.cpp                  |  2 +-
 src/k3bjobprogressosd.cpp                     |  2 +-
 src/k3bmedium.cpp                             |  2 +-
 src/k3bprojectinterface.h                     |  2 +-
 src/k3bprojectmanager.cpp                     |  4 ++--
 src/k3bservicemenuinstaller.cpp               |  2 +-
 src/k3bstatusbarmanager.cpp                   |  4 ++--
 src/k3bsystemproblemdialog.cpp                |  4 ++--
 src/k3btempdirselectionwidget.cpp             |  8 ++++----
 src/k3btempdirselectionwidget.h               |  2 +-
 src/k3bwelcomewidget.cpp                      |  2 +-
 src/k3bwriterselectionwidget.cpp              |  2 +-
 src/k3bwritingmodewidget.cpp                  |  2 +-
 src/misc/k3bblankingdialog.cpp                |  2 +-
 src/misc/k3bcdcopydialog.cpp                  |  2 +-
 src/misc/k3bcdcopydialog.h                    |  2 +-
 src/misc/k3bcdimagewritingdialog.cpp          |  6 +++---
 src/misc/k3bdvdcopydialog.cpp                 |  2 +-
 src/misc/k3bdvdcopydialog.h                   |  2 +-
 src/misc/k3bdvdformattingdialog.cpp           |  2 +-
 src/misc/k3bisoimagewritingdialog.cpp         |  6 +++---
 src/option/k3bburningoptiontab.cpp            |  2 +-
 src/option/k3bcddboptiontab.cpp               |  2 +-
 src/option/k3bdeviceoptiontab.cpp             |  2 +-
 src/option/k3bdevicewidget.cpp                |  4 ++--
 src/option/k3bmiscoptiontab.cpp               |  2 +-
 src/option/k3boptiondialog.cpp                |  2 +-
 src/option/k3bpluginoptiontab.cpp             |  2 +-
 src/option/k3bthemeoptiontab.cpp              |  8 ++++----
 src/projects/k3baudioburndialog.cpp           |  2 +-
 src/projects/k3baudiotrackdialog.cpp          |  2 +-
 src/projects/k3bbootimageview.cpp             |  2 +-
 src/projects/k3bdataburndialog.cpp            |  6 +++---
 src/projects/k3bdatamultisessioncombobox.cpp  |  2 +-
 src/projects/k3bdatapropertiesdialog.cpp      |  4 ++--
 src/projects/k3bdataurladdingdialog.cpp       |  2 +-
 src/projects/k3bdataview.cpp                  |  4 ++--
 src/projects/k3bdataviewitem.cpp              |  2 +-
 src/projects/k3bdvdburndialog.cpp             |  4 ++--
 src/projects/k3bfillstatusdisplay.cpp         |  4 ++--
 src/projects/k3bmixedburndialog.cpp           |  2 +-
 src/projects/k3bmovixburndialog.cpp           |  4 ++--
 src/projects/k3bmovixdvdburndialog.cpp        |  4 ++--
 src/projects/k3bmovixlistview.cpp             |  2 +-
 src/projects/k3bmovixlistview.h               |  2 +-
 src/projects/k3bmovixoptionswidget.cpp        |  2 +-
 src/projects/k3bmovixview.cpp                 |  2 +-
 src/projects/k3bprojectburndialog.cpp         |  2 +-
 src/projects/k3bvcdburndialog.cpp             |  4 ++--
 src/projects/k3bvcdlistviewitem.cpp           |  2 +-
 src/projects/k3bvcdtrackdialog.cpp            |  2 +-
 src/projects/k3bvideodvdburndialog.cpp        |  4 ++--
 src/projects/kostore/SPEC                     |  2 +-
 src/projects/kostore/koStore.cc               |  2 +-
 src/projects/kostore/koZipStore.cc            |  2 +-
 src/rip/k3baudiocdview.cpp                    |  2 +-
 src/rip/k3baudioconvertingoptionwidget.cpp    |  4 ++--
 src/rip/k3baudioconvertingoptionwidget.h      |  2 +-
 src/rip/k3baudioprojectconvertingdialog.cpp   |  6 +++---
 src/rip/k3baudiorippingdialog.cpp             |  6 +++---
 src/rip/k3bcddbpatternwidget.cpp              |  2 +-
 src/rip/k3bvideocdinfo.cpp                    |  2 +-
 src/rip/k3bvideocdrip.cpp                     |  4 ++--
 src/rip/k3bvideocdrippingdialog.cpp           |  2 +-
 src/rip/videodvd/k3bvideodvdrippingdialog.cpp |  4 ++--
 src/rip/videodvd/k3bvideodvdrippingview.cpp   |  2 +-
 src/rip/videodvd/k3bvideodvdrippingwidget.cpp |  2 +-
 src/rip/videodvd/k3bvideodvdrippingwidget.h   |  2 +-
 82 files changed, 126 insertions(+), 126 deletions(-)

(limited to 'src')

diff --git a/src/k3b.cpp b/src/k3b.cpp
index 038586c..95695ed 100644
--- a/src/k3b.cpp
+++ b/src/k3b.cpp
@@ -38,10 +38,10 @@
 // include files for KDE
 #include <kiconloader.h>
 #include <kmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmenubar.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstdaction.h>
 #include <klineeditdlg.h>
 #include <kstandarddirs.h>
@@ -58,8 +58,8 @@
 #include <ktip.h>
 #include <kxmlguifactory.h>
 #include <kstdguiitem.h>
-#include <kio/global.h>
-#include <kio/netaccess.h>
+#include <tdeio/global.h>
+#include <tdeio/netaccess.h>
 #include <krecentdocument.h>
 
 #include <stdlib.h>
@@ -1291,7 +1291,7 @@ void K3bMainWindow::slotProjectAddFiles()
 void K3bMainWindow::slotK3bSetup()
 {
   TDEProcess p;
-  p << "tdesu" << "kcmshell k3bsetup2 --lang " + TDEGlobal::locale()->language();
+  p << "tdesu" << "tdecmshell k3bsetup2 --lang " + TDEGlobal::locale()->language();
   if( !p.start( TDEProcess::DontCare ) )
     KMessageBox::error( 0, i18n("Could not find tdesu to run K3bSetup with root privileges. "
 				"Please run it manually as root.") );
diff --git a/src/k3bappdevicemanager.cpp b/src/k3bappdevicemanager.cpp
index 50cde9c..4a9d346 100644
--- a/src/k3bappdevicemanager.cpp
+++ b/src/k3bappdevicemanager.cpp
@@ -25,9 +25,9 @@
 #include <kinputdialog.h>
 #include <kmessagebox.h>
 #include <kinputdialog.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <klocale.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <kpopupmenu.h>
 
 
diff --git a/src/k3bapplication.cpp b/src/k3bapplication.cpp
index 09fbb30..1055961 100644
--- a/src/k3bapplication.cpp
+++ b/src/k3bapplication.cpp
@@ -46,7 +46,7 @@
 
 #include <ktip.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kaboutdata.h>
 #include <kcmdlineargs.h>
 #include <dcopclient.h>
diff --git a/src/k3bdatamodewidget.cpp b/src/k3bdatamodewidget.cpp
index 96065a7..1cb4ab3 100644
--- a/src/k3bdatamodewidget.cpp
+++ b/src/k3bdatamodewidget.cpp
@@ -18,7 +18,7 @@
 #include <k3bglobals.h>
 
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqwhatsthis.h>
 #include <tqtooltip.h>
diff --git a/src/k3bdebuggingoutputdialog.cpp b/src/k3bdebuggingoutputdialog.cpp
index 426b652..86e4d20 100644
--- a/src/k3bdebuggingoutputdialog.cpp
+++ b/src/k3bdebuggingoutputdialog.cpp
@@ -31,7 +31,7 @@
 #include <kstdguiitem.h>
 #include <kglobalsettings.h>
 #include <kapplication.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 
 
diff --git a/src/k3bdiroperator.cpp b/src/k3bdiroperator.cpp
index 4504f7f..acf42dc 100644
--- a/src/k3bdiroperator.cpp
+++ b/src/k3bdiroperator.cpp
@@ -22,7 +22,7 @@
 #include <k3bcore.h>
 
 #include <kcombiview.h>
-#include <kfilepreview.h>
+#include <tdefilepreview.h>
 #include <kaction.h>
 #include <kbookmarkmenu.h>
 #include <kstandarddirs.h>
diff --git a/src/k3bdirview.cpp b/src/k3bdirview.cpp
index 2ad6a78..fe74f45 100644
--- a/src/k3bdirview.cpp
+++ b/src/k3bdirview.cpp
@@ -60,23 +60,23 @@
 // KDE-includes
 #include <kmimetype.h>
 #include <kcursor.h>
-#include <kfiledetailview.h>
+#include <tdefiledetailview.h>
 #include <ktoolbar.h>
 #include <kiconloader.h>
 #include <kurl.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
-#include <kio/file.h>
-#include <kio/global.h>
+#include <tdeio/file.h>
+#include <tdeio/global.h>
 #include <krun.h>
 #include <kprocess.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kcombobox.h>
-#include <kfiletreeview.h>
+#include <tdefiletreeview.h>
 #include <kdialog.h>
 #include <kmessagebox.h>
 #include <kstdaction.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kaction.h>
 #include <kinputdialog.h>
 
diff --git a/src/k3bdiskinfoview.cpp b/src/k3bdiskinfoview.cpp
index d586c39..fd37b08 100644
--- a/src/k3bdiskinfoview.cpp
+++ b/src/k3bdiskinfoview.cpp
@@ -44,7 +44,7 @@
 #include <kiconloader.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 
 // FIXME: use K3bListViewItem instead
diff --git a/src/k3bemptydiscwaiter.cpp b/src/k3bemptydiscwaiter.cpp
index 7ec0286..6c906d0 100644
--- a/src/k3bemptydiscwaiter.cpp
+++ b/src/k3bemptydiscwaiter.cpp
@@ -38,7 +38,7 @@
 #include <tqfont.h>
 
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
 #include <kactivelabel.h>
diff --git a/src/k3bfiletreeview.cpp b/src/k3bfiletreeview.cpp
index 6fb3d87..d6dfe91 100644
--- a/src/k3bfiletreeview.cpp
+++ b/src/k3bfiletreeview.cpp
@@ -30,8 +30,8 @@
 #include <kurl.h>
 #include <kstandarddirs.h>
 #include <kaction.h>
-#include <kio/global.h>
-#include <kfileitem.h>
+#include <tdeio/global.h>
+#include <tdefileitem.h>
 #include <kapplication.h>
 #include <kglobalsettings.h>
 
diff --git a/src/k3bfiletreeview.h b/src/k3bfiletreeview.h
index d40ca6e..a86a84e 100644
--- a/src/k3bfiletreeview.h
+++ b/src/k3bfiletreeview.h
@@ -18,7 +18,7 @@
 #define K3BFILETREEVIEW_H
 
 
-#include <kfiletreeview.h>
+#include <tdefiletreeview.h>
 
 class KFileTreeBranch;
 class KActionCollection;
diff --git a/src/k3bfileview.cpp b/src/k3bfileview.cpp
index 2a087e8..314294a 100644
--- a/src/k3bfileview.cpp
+++ b/src/k3bfileview.cpp
@@ -28,16 +28,16 @@
 #include <tqlabel.h>
 #include <tqtoolbutton.h>
 
-#include <kfiledetailview.h>
+#include <tdefiledetailview.h>
 #include <klistview.h>
 #include <kaction.h>
 #include <ktoolbar.h>
 #include <ktoolbarbutton.h>
 #include <kurl.h>
 #include <kurldrag.h>
-#include <kfilefiltercombo.h>
+#include <tdefilefiltercombo.h>
 #include <klocale.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kmessagebox.h>
 #include <kdirlister.h>
 #include <kprogress.h>
diff --git a/src/k3bfirstrun.cpp b/src/k3bfirstrun.cpp
index f27d927..818eb82 100644
--- a/src/k3bfirstrun.cpp
+++ b/src/k3bfirstrun.cpp
@@ -20,7 +20,7 @@
 
 #include <klocale.h>
 #include <kiconloader.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqlayout.h>
 #include <tqlabel.h>
diff --git a/src/k3binteractiondialog.cpp b/src/k3binteractiondialog.cpp
index 9f8327c..be88cef 100644
--- a/src/k3binteractiondialog.cpp
+++ b/src/k3binteractiondialog.cpp
@@ -43,7 +43,7 @@
 #include <kstandarddirs.h>
 #include <kstdguiitem.h>
 #include <kpushbutton.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 #include <kglobalsettings.h>
 #include <tdeversion.h>
diff --git a/src/k3bjobprogressdialog.cpp b/src/k3bjobprogressdialog.cpp
index 215bc88..7e2f77f 100644
--- a/src/k3bjobprogressdialog.cpp
+++ b/src/k3bjobprogressdialog.cpp
@@ -57,7 +57,7 @@
 #include <kmessagebox.h>
 #include <klistview.h>
 #include <kiconloader.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <knotifyclient.h>
diff --git a/src/k3bjobprogressosd.cpp b/src/k3bjobprogressosd.cpp
index a6b95d2..79dae3b 100644
--- a/src/k3bjobprogressosd.cpp
+++ b/src/k3bjobprogressosd.cpp
@@ -22,7 +22,7 @@
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <kcursor.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kpopupmenu.h>
 
diff --git a/src/k3bmedium.cpp b/src/k3bmedium.cpp
index 29ba46c..295ca2a 100644
--- a/src/k3bmedium.cpp
+++ b/src/k3bmedium.cpp
@@ -24,7 +24,7 @@
 #include <k3biso9660backend.h>
 
 #include <klocale.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 /**
  * Internal class used by K3bMedium
diff --git a/src/k3bprojectinterface.h b/src/k3bprojectinterface.h
index 1459fd0..7a87922 100644
--- a/src/k3bprojectinterface.h
+++ b/src/k3bprojectinterface.h
@@ -18,7 +18,7 @@
 #define _K3B_PROJECT_INTERFACE_H_
 
 #include <dcopobject.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <tqstringlist.h>
 
 class K3bDoc;
diff --git a/src/k3bprojectmanager.cpp b/src/k3bprojectmanager.cpp
index 965a160..b41820b 100644
--- a/src/k3bprojectmanager.cpp
+++ b/src/k3bprojectmanager.cpp
@@ -48,8 +48,8 @@
 
 #include <kurl.h>
 #include <kdebug.h>
-#include <kconfig.h>
-#include <kio/netaccess.h>
+#include <tdeconfig.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 
diff --git a/src/k3bservicemenuinstaller.cpp b/src/k3bservicemenuinstaller.cpp
index 13729c7..c2938bf 100644
--- a/src/k3bservicemenuinstaller.cpp
+++ b/src/k3bservicemenuinstaller.cpp
@@ -19,7 +19,7 @@
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kdebug.h>
 
 
diff --git a/src/k3bstatusbarmanager.cpp b/src/k3bstatusbarmanager.cpp
index 4a4fd89..f23f785 100644
--- a/src/k3bstatusbarmanager.cpp
+++ b/src/k3bstatusbarmanager.cpp
@@ -30,9 +30,9 @@
 
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <kstatusbar.h>
 #include <kaboutdata.h>
 #include <kaction.h>
diff --git a/src/k3bsystemproblemdialog.cpp b/src/k3bsystemproblemdialog.cpp
index de9d846..43c6d1c 100644
--- a/src/k3bsystemproblemdialog.cpp
+++ b/src/k3bsystemproblemdialog.cpp
@@ -43,7 +43,7 @@
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <ktextedit.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 #include <kmessagebox.h>
 #include <kprocess.h>
@@ -608,7 +608,7 @@ void K3bSystemProblemDialog::checkSystem( TQWidget* parent,
 void K3bSystemProblemDialog::slotK3bSetup()
 {
   TDEProcess p;
-  p << "tdesu" << "kcmshell k3bsetup2 --lang " + TDEGlobal::locale()->language();
+  p << "tdesu" << "tdecmshell k3bsetup2 --lang " + TDEGlobal::locale()->language();
   if( !p.start( TDEProcess::DontCare ) )
     KMessageBox::error( 0, i18n("Unable to start K3bSetup2.") );
 }
diff --git a/src/k3btempdirselectionwidget.cpp b/src/k3btempdirselectionwidget.cpp
index 5ba3879..22b2750 100644
--- a/src/k3btempdirselectionwidget.cpp
+++ b/src/k3btempdirselectionwidget.cpp
@@ -27,15 +27,15 @@
 #include <tqwhatsthis.h>
 #include <tqfileinfo.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kdialog.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>
 #include <kurlrequester.h>
-#include <kio/global.h>
-#include <kconfig.h>
+#include <tdeio/global.h>
+#include <tdeconfig.h>
 #include <klineedit.h>
 
 
diff --git a/src/k3btempdirselectionwidget.h b/src/k3btempdirselectionwidget.h
index 639e7b6..52308b0 100644
--- a/src/k3btempdirselectionwidget.h
+++ b/src/k3btempdirselectionwidget.h
@@ -18,7 +18,7 @@
 #define K3BTEMPDIRSELECTIONWIDGET_H
 
 #include <tqgroupbox.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 class TQTimer;
 class TQLabel;
diff --git a/src/k3bwelcomewidget.cpp b/src/k3bwelcomewidget.cpp
index a998687..9d717fc 100644
--- a/src/k3bwelcomewidget.cpp
+++ b/src/k3bwelcomewidget.cpp
@@ -39,7 +39,7 @@
 #include <kapplication.h>
 #include <kiconloader.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kpopupmenu.h>
 #include <kaboutdata.h>
diff --git a/src/k3bwriterselectionwidget.cpp b/src/k3bwriterselectionwidget.cpp
index 4c85c5a..6095ee3 100644
--- a/src/k3bwriterselectionwidget.cpp
+++ b/src/k3bwriterselectionwidget.cpp
@@ -26,7 +26,7 @@
 
 #include <klocale.h>
 #include <kdialog.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcombobox.h>
 #include <kmessagebox.h>
 #include <kiconloader.h>
diff --git a/src/k3bwritingmodewidget.cpp b/src/k3bwritingmodewidget.cpp
index 077c2e8..3097e92 100644
--- a/src/k3bwritingmodewidget.cpp
+++ b/src/k3bwritingmodewidget.cpp
@@ -20,7 +20,7 @@
 #include <k3bglobals.h>
 
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
diff --git a/src/misc/k3bblankingdialog.cpp b/src/misc/k3bblankingdialog.cpp
index b9dc2a9..79c32db 100644
--- a/src/misc/k3bblankingdialog.cpp
+++ b/src/misc/k3bblankingdialog.cpp
@@ -32,7 +32,7 @@
 #include <kiconloader.h>
 #include <kguiitem.h>
 #include <kstdguiitem.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqgroupbox.h>
 #include <tqpushbutton.h>
diff --git a/src/misc/k3bcdcopydialog.cpp b/src/misc/k3bcdcopydialog.cpp
index 3245906..8e9dd36 100644
--- a/src/misc/k3bcdcopydialog.cpp
+++ b/src/misc/k3bcdcopydialog.cpp
@@ -40,7 +40,7 @@
 #include <kstdguiitem.h>
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 #include <kiconloader.h>
 
diff --git a/src/misc/k3bcdcopydialog.h b/src/misc/k3bcdcopydialog.h
index 4b17fa8..898a1de 100644
--- a/src/misc/k3bcdcopydialog.h
+++ b/src/misc/k3bcdcopydialog.h
@@ -21,7 +21,7 @@
 
 #include <k3binteractiondialog.h>
 
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 namespace K3bDevice {
   class Device;
diff --git a/src/misc/k3bcdimagewritingdialog.cpp b/src/misc/k3bcdimagewritingdialog.cpp
index 5c73381..f134104 100644
--- a/src/misc/k3bcdimagewritingdialog.cpp
+++ b/src/misc/k3bcdimagewritingdialog.cpp
@@ -45,12 +45,12 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kurlrequester.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kstdguiitem.h>
 #include <kguiitem.h>
 #include <kiconloader.h>
-#include <kconfig.h>
-#include <kio/global.h>
+#include <tdeconfig.h>
+#include <tdeio/global.h>
 #include <kurl.h>
 #include <kinputdialog.h>
 #include <kurldrag.h>
diff --git a/src/misc/k3bdvdcopydialog.cpp b/src/misc/k3bdvdcopydialog.cpp
index 729c4c7..c80c1e3 100644
--- a/src/misc/k3bdvdcopydialog.cpp
+++ b/src/misc/k3bdvdcopydialog.cpp
@@ -46,7 +46,7 @@
 
 #include <kdebug.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>
diff --git a/src/misc/k3bdvdcopydialog.h b/src/misc/k3bdvdcopydialog.h
index 390ee2e..aad39a3 100644
--- a/src/misc/k3bdvdcopydialog.h
+++ b/src/misc/k3bdvdcopydialog.h
@@ -19,7 +19,7 @@
 
 #include <k3binteractiondialog.h>
 
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 
 namespace K3bDevice {
diff --git a/src/misc/k3bdvdformattingdialog.cpp b/src/misc/k3bdvdformattingdialog.cpp
index 6524d05..4f6d5ee 100644
--- a/src/misc/k3bdvdformattingdialog.cpp
+++ b/src/misc/k3bdvdformattingdialog.cpp
@@ -26,7 +26,7 @@
 
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 
 #include <tqgroupbox.h>
diff --git a/src/misc/k3bisoimagewritingdialog.cpp b/src/misc/k3bisoimagewritingdialog.cpp
index 32461df..e3eb2fc 100644
--- a/src/misc/k3bisoimagewritingdialog.cpp
+++ b/src/misc/k3bisoimagewritingdialog.cpp
@@ -36,12 +36,12 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kurlrequester.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kstdguiitem.h>
 #include <kguiitem.h>
 #include <kiconloader.h>
-#include <kconfig.h>
-#include <kio/global.h>
+#include <tdeconfig.h>
+#include <tdeio/global.h>
 #include <kurl.h>
 #include <kinputdialog.h>
 #include <kurldrag.h>
diff --git a/src/option/k3bburningoptiontab.cpp b/src/option/k3bburningoptiontab.cpp
index 97a5aaf..02d680c 100644
--- a/src/option/k3bburningoptiontab.cpp
+++ b/src/option/k3bburningoptiontab.cpp
@@ -33,7 +33,7 @@
 #include <tqwhatsthis.h>
 
 #include <knuminput.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialog.h>
 #include <klocale.h>
 #include <klineedit.h>
diff --git a/src/option/k3bcddboptiontab.cpp b/src/option/k3bcddboptiontab.cpp
index 1db1ba2..b0d845e 100644
--- a/src/option/k3bcddboptiontab.cpp
+++ b/src/option/k3bcddboptiontab.cpp
@@ -36,7 +36,7 @@
 #include <klineedit.h>
 #include <klocale.h>
 #include <knuminput.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 #include <tdeversion.h>
 
diff --git a/src/option/k3bdeviceoptiontab.cpp b/src/option/k3bdeviceoptiontab.cpp
index 1218c60..0b5784e 100644
--- a/src/option/k3bdeviceoptiontab.cpp
+++ b/src/option/k3bdeviceoptiontab.cpp
@@ -28,7 +28,7 @@
 #include <kapplication.h>
 #include <kdialog.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 
 
diff --git a/src/option/k3bdevicewidget.cpp b/src/option/k3bdevicewidget.cpp
index bcc890d..acaf3f2 100644
--- a/src/option/k3bdevicewidget.cpp
+++ b/src/option/k3bdevicewidget.cpp
@@ -25,11 +25,11 @@
 #include <knuminput.h>
 #include <kdialog.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <ksimpleconfig.h>
 #include <kiconloader.h>
 #include <kstandarddirs.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 #include <tqgroupbox.h>
 #include <tqpushbutton.h>
diff --git a/src/option/k3bmiscoptiontab.cpp b/src/option/k3bmiscoptiontab.cpp
index 884291f..1da6f17 100644
--- a/src/option/k3bmiscoptiontab.cpp
+++ b/src/option/k3bmiscoptiontab.cpp
@@ -30,7 +30,7 @@
 
 #include <kapplication.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialog.h>
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
diff --git a/src/option/k3boptiondialog.cpp b/src/option/k3boptiondialog.cpp
index d222134..d6f2df3 100644
--- a/src/option/k3boptiondialog.cpp
+++ b/src/option/k3boptiondialog.cpp
@@ -33,7 +33,7 @@
 
 #include <klocale.h>
 #include <kiconloader.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tdeversion.h>
 #include "k3bnotifyoptiontab.h"
 
diff --git a/src/option/k3bpluginoptiontab.cpp b/src/option/k3bpluginoptiontab.cpp
index 37a66c8..6a7e4ec 100644
--- a/src/option/k3bpluginoptiontab.cpp
+++ b/src/option/k3bpluginoptiontab.cpp
@@ -26,7 +26,7 @@
 #include <kmessagebox.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobalsettings.h>
 #include <tdeversion.h>
 
diff --git a/src/option/k3bthemeoptiontab.cpp b/src/option/k3bthemeoptiontab.cpp
index ebb92be..edf3f64 100644
--- a/src/option/k3bthemeoptiontab.cpp
+++ b/src/option/k3bthemeoptiontab.cpp
@@ -20,13 +20,13 @@
 
 #include <k3bapplication.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmessagebox.h>
 #include <kurlrequester.h>
 #include <klistview.h>
-#include <kio/global.h>
-#include <kio/netaccess.h>
-#include <kio/job.h>
+#include <tdeio/global.h>
+#include <tdeio/netaccess.h>
+#include <tdeio/job.h>
 #include <kstandarddirs.h>
 #include <ktar.h>
 #include <kurlrequesterdlg.h>
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>
diff --git a/src/rip/k3baudiocdview.cpp b/src/rip/k3baudiocdview.cpp
index 66b4820..7cdf686 100644
--- a/src/rip/k3baudiocdview.cpp
+++ b/src/rip/k3baudiocdview.cpp
@@ -40,7 +40,7 @@
 #include <kaction.h>
 #include <kstdaction.h>
 #include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klineedit.h>
 #include <kcombobox.h>
 #include <kstandarddirs.h>
diff --git a/src/rip/k3baudioconvertingoptionwidget.cpp b/src/rip/k3baudioconvertingoptionwidget.cpp
index 15fa9fd..34d1de7 100644
--- a/src/rip/k3baudioconvertingoptionwidget.cpp
+++ b/src/rip/k3baudioconvertingoptionwidget.cpp
@@ -22,8 +22,8 @@
 
 #include <kcombobox.h>
 #include <kurlrequester.h>
-#include <kio/global.h>
-#include <kconfig.h>
+#include <tdeio/global.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kiconloader.h>
 
diff --git a/src/rip/k3baudioconvertingoptionwidget.h b/src/rip/k3baudioconvertingoptionwidget.h
index 9352e3f..4c702aa 100644
--- a/src/rip/k3baudioconvertingoptionwidget.h
+++ b/src/rip/k3baudioconvertingoptionwidget.h
@@ -19,7 +19,7 @@
 #include "base_k3baudiorippingoptionwidget.h"
 
 #include <tqcheckbox.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 class K3bAudioEncoder;
 class TDEConfigBase;
diff --git a/src/rip/k3baudioprojectconvertingdialog.cpp b/src/rip/k3baudioprojectconvertingdialog.cpp
index 03c7db3..43fe621 100644
--- a/src/rip/k3baudioprojectconvertingdialog.cpp
+++ b/src/rip/k3baudioprojectconvertingdialog.cpp
@@ -33,11 +33,11 @@
 
 #include <kcombobox.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klistview.h>
 #include <kurlrequester.h>
-#include <kfiledialog.h>
-#include <kio/global.h>
+#include <tdefiledialog.h>
+#include <tdeio/global.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
 
diff --git a/src/rip/k3baudiorippingdialog.cpp b/src/rip/k3baudiorippingdialog.cpp
index 4298532..aace387 100644
--- a/src/rip/k3baudiorippingdialog.cpp
+++ b/src/rip/k3baudiorippingdialog.cpp
@@ -32,11 +32,11 @@
 #include <kcombobox.h>
 #include <klocale.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klistview.h>
 #include <kurlrequester.h>
-#include <kfiledialog.h>
-#include <kio/global.h>
+#include <tdefiledialog.h>
+#include <tdeio/global.h>
 #include <kiconloader.h>
 #include <kstdguiitem.h>
 #include <kdebug.h>
diff --git a/src/rip/k3bcddbpatternwidget.cpp b/src/rip/k3bcddbpatternwidget.cpp
index ae1191f..e8b533a 100644
--- a/src/rip/k3bcddbpatternwidget.cpp
+++ b/src/rip/k3bcddbpatternwidget.cpp
@@ -15,7 +15,7 @@
 
 #include "k3bcddbpatternwidget.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kcombobox.h>
 #include <klineedit.h>
diff --git a/src/rip/k3bvideocdinfo.cpp b/src/rip/k3bvideocdinfo.cpp
index af29a37..2dea3f7 100644
--- a/src/rip/k3bvideocdinfo.cpp
+++ b/src/rip/k3bvideocdinfo.cpp
@@ -22,7 +22,7 @@
 #include <tqdom.h>
 
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 #include "k3bvideocdinfo.h"
diff --git a/src/rip/k3bvideocdrip.cpp b/src/rip/k3bvideocdrip.cpp
index b987e96..b6c033d 100644
--- a/src/rip/k3bvideocdrip.cpp
+++ b/src/rip/k3bvideocdrip.cpp
@@ -13,9 +13,9 @@
 * See the file "COPYING" for the exact licensing terms.
 */
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <ktempfile.h>
diff --git a/src/rip/k3bvideocdrippingdialog.cpp b/src/rip/k3bvideocdrippingdialog.cpp
index eeec3d5..8fe85f5 100644
--- a/src/rip/k3bvideocdrippingdialog.cpp
+++ b/src/rip/k3bvideocdrippingdialog.cpp
@@ -17,7 +17,7 @@
 // kde include
 #include <klocale.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kurlrequester.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
diff --git a/src/rip/videodvd/k3bvideodvdrippingdialog.cpp b/src/rip/videodvd/k3bvideodvdrippingdialog.cpp
index 4aa571e..b5deed5 100644
--- a/src/rip/videodvd/k3bvideodvdrippingdialog.cpp
+++ b/src/rip/videodvd/k3bvideodvdrippingdialog.cpp
@@ -30,8 +30,8 @@
 #include <kurlrequester.h>
 #include <kcombobox.h>
 #include <klineedit.h>
-#include <kio/global.h>
-#include <kconfig.h>
+#include <tdeio/global.h>
+#include <tdeconfig.h>
 #include <kmessagebox.h>
 
 #include <tqlayout.h>
diff --git a/src/rip/videodvd/k3bvideodvdrippingview.cpp b/src/rip/videodvd/k3bvideodvdrippingview.cpp
index 763cbe0..ca9e467 100644
--- a/src/rip/videodvd/k3bvideodvdrippingview.cpp
+++ b/src/rip/videodvd/k3bvideodvdrippingview.cpp
@@ -34,7 +34,7 @@
 #include <kmessagebox.h>
 #include <klocale.h>
 #include <kaction.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 
 K3bVideoDVDRippingView::K3bVideoDVDRippingView( TQWidget* parent, const char * name )
diff --git a/src/rip/videodvd/k3bvideodvdrippingwidget.cpp b/src/rip/videodvd/k3bvideodvdrippingwidget.cpp
index 51b74a2..5a229bf 100644
--- a/src/rip/videodvd/k3bvideodvdrippingwidget.cpp
+++ b/src/rip/videodvd/k3bvideodvdrippingwidget.cpp
@@ -23,7 +23,7 @@
 #include <klistview.h>
 #include <klocale.h>
 #include <kurlrequester.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <kurllabel.h>
 #include <kdialogbase.h>
 #include <klineedit.h>
diff --git a/src/rip/videodvd/k3bvideodvdrippingwidget.h b/src/rip/videodvd/k3bvideodvdrippingwidget.h
index 1642bbc..812a5d8 100644
--- a/src/rip/videodvd/k3bvideodvdrippingwidget.h
+++ b/src/rip/videodvd/k3bvideodvdrippingwidget.h
@@ -23,7 +23,7 @@
 #include <tqvaluevector.h>
 #include <tqmap.h>
 
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 class TQTimer;
 
-- 
cgit v1.2.1