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

21 files changed, 29 insertions, 29 deletions

diff --git a/juk/artsplayer.cpp b/juk/artsplayer.cpp
index 4022b0f1..d6905f0e 100644
--- a/juk/artsplayer.cpp
+++ b/juk/artsplayer.cpp
@@ -21,7 +21,7 @@
 #if HAVE_ARTS
 
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 
 #include <tqdir.h>
diff --git a/juk/cache.cpp b/juk/cache.cpp
index 0183c560..bb7c2956 100644
--- a/juk/cache.cpp
+++ b/juk/cache.cpp
@@ -15,7 +15,7 @@
 
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kactionclasses.h>
 #include <kdebug.h>
diff --git a/juk/collectionlist.cpp b/juk/collectionlist.cpp
index 13b6d6b4..7b22542e 100644
--- a/juk/collectionlist.cpp
+++ b/juk/collectionlist.cpp
@@ -19,7 +19,7 @@
 #include <kdebug.h>
 #include <kpopupmenu.h>
 #include <kiconloader.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kaction.h>
 #include <kurl.h>
 
diff --git a/juk/collectionlist.h b/juk/collectionlist.h
index 5df08023..c15dccc3 100644
--- a/juk/collectionlist.h
+++ b/juk/collectionlist.h
@@ -18,7 +18,7 @@
 
 #include <kapplication.h>
 #include <kdirwatch.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 
 #include <tqdict.h>
 #include <tqclipboard.h>
diff --git a/juk/deletedialog.cpp b/juk/deletedialog.cpp
index 67958116..5bb3c4d3 100644
--- a/juk/deletedialog.cpp
+++ b/juk/deletedialog.cpp
@@ -18,7 +18,7 @@
 #include <kstdguiitem.h>
 #include <klocale.h>
 #include <kiconloader.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqstringlist.h>
 #include <tqcheckbox.h>
diff --git a/juk/directorylist.cpp b/juk/directorylist.cpp
index 43df3dda..c368a6c3 100644
--- a/juk/directorylist.cpp
+++ b/juk/directorylist.cpp
@@ -13,7 +13,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 #include <klistview.h>
 #include <kpushbutton.h>
diff --git a/juk/filerenamer.cpp b/juk/filerenamer.cpp
index e21a484d..e9c997aa 100644
--- a/juk/filerenamer.cpp
+++ b/juk/filerenamer.cpp
@@ -23,9 +23,9 @@
 #include <kiconloader.h>
 #include <knuminput.h>
 #include <kstandarddirs.h>
-#include <kio/netaccess.h>
-#include <kconfigbase.h>
-#include <kconfig.h>
+#include <tdeio/netaccess.h>
+#include <tdeconfigbase.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <klineedit.h>
 #include <klocale.h>
diff --git a/juk/gstreamerplayer.cpp b/juk/gstreamerplayer.cpp
index a45678a3..4b893815 100644
--- a/juk/gstreamerplayer.cpp
+++ b/juk/gstreamerplayer.cpp
@@ -17,7 +17,7 @@
 #if HAVE_GSTREAMER
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kdebug.h>
 
diff --git a/juk/keydialog.cpp b/juk/keydialog.cpp
index 6b3d278a..ea73277f 100644
--- a/juk/keydialog.cpp
+++ b/juk/keydialog.cpp
@@ -15,7 +15,7 @@
 
 #include "keydialog.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 
 #include <tqradiobutton.h>
diff --git a/juk/main.cpp b/juk/main.cpp
index 6fbb0930..3db558df 100644
--- a/juk/main.cpp
+++ b/juk/main.cpp
@@ -19,8 +19,8 @@
 #include <kcmdlineargs.h>
 #include <kaboutdata.h>
 #include <dcopclient.h>
-#include <kconfigbase.h>
-#include <kconfig.h>
+#include <tdeconfigbase.h>
+#include <tdeconfig.h>
 
 #include "juk.h"
 
diff --git a/juk/mediafiles.cpp b/juk/mediafiles.cpp
index d105d1cd..94382b23 100644
--- a/juk/mediafiles.cpp
+++ b/juk/mediafiles.cpp
@@ -13,10 +13,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include "mediafiles.h"
 
diff --git a/juk/nowplaying.cpp b/juk/nowplaying.cpp
index 1125cdd6..03f679ae 100644
--- a/juk/nowplaying.cpp
+++ b/juk/nowplaying.cpp
@@ -17,7 +17,7 @@
 #include <klocale.h>
 #include <kdebug.h>
 #include <kurldrag.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include <tqimage.h>
 #include <tqlayout.h>
diff --git a/juk/playlist.cpp b/juk/playlist.cpp
index a60d0c05..1f33b4be 100644
--- a/juk/playlist.cpp
+++ b/juk/playlist.cpp
@@ -13,7 +13,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmessagebox.h>
 #include <kurldrag.h>
 #include <kiconloader.h>
@@ -23,11 +23,11 @@
 #include <klocale.h>
 #include <kdebug.h>
 #include <kinputdialog.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kglobalsettings.h>
 #include <kurl.h>
-#include <kio/netaccess.h>
-#include <kio/job.h>
+#include <tdeio/netaccess.h>
+#include <tdeio/job.h>
 #include <dcopclient.h>
 
 #include <tqheader.h>
diff --git a/juk/playlistcollection.cpp b/juk/playlistcollection.cpp
index 11c8a27a..bff1e7c9 100644
--- a/juk/playlistcollection.cpp
+++ b/juk/playlistcollection.cpp
@@ -39,7 +39,7 @@
 #include <kapplication.h>
 #include <kinputdialog.h>
 #include <kmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 #include <tqwidgetstack.h>
 #include <tqhbox.h>
diff --git a/juk/playlistsplitter.h b/juk/playlistsplitter.h
index c33621d3..8e9f0e0f 100644
--- a/juk/playlistsplitter.h
+++ b/juk/playlistsplitter.h
@@ -16,7 +16,7 @@
 #ifndef PLAYLISTSPLITTER_H
 #define PLAYLISTSPLITTER_H
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 #include <tqwidgetstack.h>
 
diff --git a/juk/tageditor.cpp b/juk/tageditor.cpp
index 0b4d041b..efff323d 100644
--- a/juk/tageditor.cpp
+++ b/juk/tageditor.cpp
@@ -25,7 +25,7 @@
 #include <knuminput.h>
 #include <keditcl.h>
 #include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kiconloader.h>
diff --git a/juk/tagguesser.cpp b/juk/tagguesser.cpp
index 57714842..ae165c6e 100644
--- a/juk/tagguesser.cpp
+++ b/juk/tagguesser.cpp
@@ -9,7 +9,7 @@
 #include "tagguesser.h"
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kmacroexpander.h>
diff --git a/juk/tagrenameroptions.cpp b/juk/tagrenameroptions.cpp
index b9b40fbb..50c3083b 100644
--- a/juk/tagrenameroptions.cpp
+++ b/juk/tagrenameroptions.cpp
@@ -16,8 +16,8 @@
 #include <kdebug.h>
 #include <kglobal.h>
 #include <klocale.h>
-#include <kconfig.h>
-#include <kconfigbase.h>
+#include <tdeconfig.h>
+#include <tdeconfigbase.h>
 
 #include "tagrenameroptions.h"
 
diff --git a/juk/tracksequencemanager.cpp b/juk/tracksequencemanager.cpp
index 828c61d5..4f7ae64f 100644
--- a/juk/tracksequencemanager.cpp
+++ b/juk/tracksequencemanager.cpp
@@ -13,7 +13,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kaction.h>
 #include <kpopupmenu.h>
diff --git a/juk/webimagefetcherdialog.cpp b/juk/webimagefetcherdialog.cpp
index 303d53ab..5a2de5b2 100644
--- a/juk/webimagefetcherdialog.cpp
+++ b/juk/webimagefetcherdialog.cpp
@@ -15,7 +15,7 @@
  ***************************************************************************/
 
 #include <kapplication.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
diff --git a/juk/webimagefetcherdialog.h b/juk/webimagefetcherdialog.h
index a3b60378..4af0cf41 100644
--- a/juk/webimagefetcherdialog.h
+++ b/juk/webimagefetcherdialog.h
@@ -18,7 +18,7 @@
 #define WEBIMAGEFETCHERDIALOG_H
 
 #include <kiconview.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #include "webimagefetcher.h"