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

39 files changed, 60 insertions, 60 deletions

diff --git a/noatun/Makefile.am b/noatun/Makefile.am
index 91b80b87..032bdf3d 100644
--- a/noatun/Makefile.am
+++ b/noatun/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(kde_includes)/kio -I$(top_srcdir)/noatun/library -I$(kde_includes)/arts $(all_includes)
+INCLUDES = -I$(kde_includes)/tdeio -I$(top_srcdir)/noatun/library -I$(kde_includes)/arts $(all_includes)
 
 SUBDIRS = pics library app . modules
 
@@ -9,11 +9,11 @@ xdg_apps_DATA = noatun.desktop
 presetsdir = $(kde_datadir)/noatun/eq.preset
 presets_DATA = preset.dance preset.jazz preset.metal preset.trance preset.zero
 
-updatedir = $(kde_datadir)/kconf_update
+updatedir = $(kde_datadir)/tdeconf_update
 update_DATA = noatun.upd
 
-kconfdir = $(libdir)/kconf_update_bin
-kconf_PROGRAMS = noatun20update
+tdeconfdir = $(libdir)/tdeconf_update_bin
+tdeconf_PROGRAMS = noatun20update
 
 noatun20update_SOURCES  = noatun20update.cpp
 noatun20update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
diff --git a/noatun/library/app.cpp b/noatun/library/app.cpp
index 0e1ae639..29478e7b 100644
--- a/noatun/library/app.cpp
+++ b/noatun/library/app.cpp
@@ -20,9 +20,9 @@
 #include <dispatcher.h>
 #include <kaboutdata.h>
 #include <kcmdlineargs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kglobal.h>
 #include <klibloader.h>
 #include <klocale.h>
diff --git a/noatun/library/cmodule.cpp b/noatun/library/cmodule.cpp
index 27f4fa99..9c3d3232 100644
--- a/noatun/library/cmodule.cpp
+++ b/noatun/library/cmodule.cpp
@@ -15,7 +15,7 @@
 #include <tqlabel.h>
 #include <tqdragobject.h>
 #include <kurlrequester.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kdialog.h>
 #include <klineedit.h>
 
diff --git a/noatun/library/downloader.cpp b/noatun/library/downloader.cpp
index e1e210cb..75653940 100644
--- a/noatun/library/downloader.cpp
+++ b/noatun/library/downloader.cpp
@@ -3,7 +3,7 @@
 #include <assert.h>
 #include <tqfile.h>
 #include <tqtimer.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <klocale.h>
 
 DownloadItem::DownloadItem()
diff --git a/noatun/library/engine.cpp b/noatun/library/engine.cpp
index 86c10381..e7296191 100644
--- a/noatun/library/engine.cpp
+++ b/noatun/library/engine.cpp
@@ -12,7 +12,7 @@
 #include <kmessagebox.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <tqfile.h>
 #include <tqdir.h>
diff --git a/noatun/library/equalizer.cpp b/noatun/library/equalizer.cpp
index ae86d00f..1c50370c 100644
--- a/noatun/library/equalizer.cpp
+++ b/noatun/library/equalizer.cpp
@@ -9,11 +9,11 @@
 #include <noatunarts.h>
 #include <ktempfile.h>
 #include <tqdom.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kstandarddirs.h>
 #include <tqtextstream.h>
 #include <math.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include "ksaver.h"
 
diff --git a/noatun/library/ksaver.cpp b/noatun/library/ksaver.cpp
index f787c585..72b6218e 100644
--- a/noatun/library/ksaver.cpp
+++ b/noatun/library/ksaver.cpp
@@ -29,7 +29,7 @@
 
 #include <klocale.h>
 #include <ktempfile.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include "ksaver.h"
 
diff --git a/noatun/library/noatuntags/tags.cpp b/noatun/library/noatuntags/tags.cpp
index add75782..9125ff45 100644
--- a/noatun/library/noatuntags/tags.cpp
+++ b/noatun/library/noatuntags/tags.cpp
@@ -3,7 +3,7 @@
 #include <klocale.h>
 #include <tqslider.h>
 #include <tqspinbox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqlayout.h>
 #include <tqhbox.h>
 #include <tqlabel.h>
diff --git a/noatun/library/playlist.cpp b/noatun/library/playlist.cpp
index 1bc031d9..8f81c3e8 100644
--- a/noatun/library/playlist.cpp
+++ b/noatun/library/playlist.cpp
@@ -5,7 +5,7 @@
 #include <noatun/pluginloader.h>
 
 #include <kcmdlineargs.h>
-#include <kfile.h>
+#include <tdefile.h>
 #include <kmimetype.h>
 #include <tqregexp.h>
 #include <assert.h>
diff --git a/noatun/library/playlistsaver.cpp b/noatun/library/playlistsaver.cpp
index 49c6084b..a187b235 100644
--- a/noatun/library/playlistsaver.cpp
+++ b/noatun/library/playlistsaver.cpp
@@ -1,6 +1,6 @@
 #include <noatun/playlistsaver.h>
 #include <tqdom.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <tqfile.h>
 #include <tqtextstream.h>
 #include <noatun/app.h>
diff --git a/noatun/library/vequalizer.cpp b/noatun/library/vequalizer.cpp
index 08895643..7b88848a 100644
--- a/noatun/library/vequalizer.cpp
+++ b/noatun/library/vequalizer.cpp
@@ -51,9 +51,9 @@
 #include <soundserver.h>
 
 #include <ktempfile.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 
 #include <tqdom.h>
diff --git a/noatun/modules/excellent/userinterface.cpp b/noatun/modules/excellent/userinterface.cpp
index 42eaf19c..f1f64a22 100644
--- a/noatun/modules/excellent/userinterface.cpp
+++ b/noatun/modules/excellent/userinterface.cpp
@@ -37,8 +37,8 @@
 #include "userinterface.h"
 
 #include <kbuttonbox.h>
-#include <kconfig.h>
-#include <kfiledialog.h>
+#include <tdeconfig.h>
+#include <tdefiledialog.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <klocale.h>
diff --git a/noatun/modules/htmlexport/htmlexport.h b/noatun/modules/htmlexport/htmlexport.h
index 9e710547..304092fb 100644
--- a/noatun/modules/htmlexport/htmlexport.h
+++ b/noatun/modules/htmlexport/htmlexport.h
@@ -15,11 +15,11 @@
 
 #include <klocale.h>
 #include <kpopupmenu.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <ktempfile.h>
 #include <kcolorbutton.h>
-#include <kio/netaccess.h>
-#include <kconfig.h>
+#include <tdeio/netaccess.h>
+#include <tdeconfig.h>
 #include <kurlrequester.h>
 
 //#include <kdebug.h>
diff --git a/noatun/modules/infrared/irprefs.cpp b/noatun/modules/infrared/irprefs.cpp
index 77753cf4..36d6a8fb 100644
--- a/noatun/modules/infrared/irprefs.cpp
+++ b/noatun/modules/infrared/irprefs.cpp
@@ -6,7 +6,7 @@
 
 #include <kdialog.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klistview.h>
 #include <kcombobox.h>
 #include <knuminput.h>
diff --git a/noatun/modules/kaiman/pref.cpp b/noatun/modules/kaiman/pref.cpp
index a53ed72f..249a74e4 100644
--- a/noatun/modules/kaiman/pref.cpp
+++ b/noatun/modules/kaiman/pref.cpp
@@ -25,7 +25,7 @@
 #include <kglobal.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "pref.h"
 #include "userinterface.h"
diff --git a/noatun/modules/kaiman/userinterface.cpp b/noatun/modules/kaiman/userinterface.cpp
index 462f5718..56eb389e 100644
--- a/noatun/modules/kaiman/userinterface.cpp
+++ b/noatun/modules/kaiman/userinterface.cpp
@@ -38,17 +38,17 @@
 #include <tqdragobject.h>
 #include <tqtimer.h>
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kdebug.h>
 #include <kapplication.h>
 #include <twin.h>
 #include <kglobal.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kpopupmenu.h>
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kurldrag.h>
 
 #include <sys/types.h>
diff --git a/noatun/modules/kjofol-skin/Makefile.am b/noatun/modules/kjofol-skin/Makefile.am
index 17ff1162..f3e9504a 100644
--- a/noatun/modules/kjofol-skin/Makefile.am
+++ b/noatun/modules/kjofol-skin/Makefile.am
@@ -7,7 +7,7 @@ INCLUDES	=	-I$(top_srcdir)/noatun/library \
 				-I$(top_builddir)/arts/modules/effects \
 				-I$(top_builddir)/arts/modules/mixers \
 				-I$(top_builddir)/arts/gui/common \
-				-I$(kde_includes)/kio \
+				-I$(kde_includes)/tdeio \
 				-I$(kde_includes)/arts \
 				$(all_includes)
 
diff --git a/noatun/modules/kjofol-skin/kjbutton.cpp b/noatun/modules/kjofol-skin/kjbutton.cpp
index 795dedfb..7cdfc0e2 100644
--- a/noatun/modules/kjofol-skin/kjbutton.cpp
+++ b/noatun/modules/kjofol-skin/kjbutton.cpp
@@ -22,7 +22,7 @@
 #include <kpixmap.h>
 #include <kpixmapeffect.h>
 #include <kurl.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <khelpmenu.h>
 #include <kpopupmenu.h>
 
diff --git a/noatun/modules/kjofol-skin/kjloader.cpp b/noatun/modules/kjofol-skin/kjloader.cpp
index 4401ee01..ee8ca247 100644
--- a/noatun/modules/kjofol-skin/kjloader.cpp
+++ b/noatun/modules/kjofol-skin/kjloader.cpp
@@ -54,7 +54,7 @@
 
 #include <kaction.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <khelpmenu.h>
 #include <kstdaction.h>
 #include <kpopupmenu.h>
diff --git a/noatun/modules/kjofol-skin/kjprefs.cpp b/noatun/modules/kjofol-skin/kjprefs.cpp
index b6d8e6eb..d93cc5dc 100644
--- a/noatun/modules/kjofol-skin/kjprefs.cpp
+++ b/noatun/modules/kjofol-skin/kjprefs.cpp
@@ -29,10 +29,10 @@
 #include <tqregexp.h>
 
 #include <knuminput.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kmimemagic.h>
diff --git a/noatun/modules/kjofol-skin/kjprefs.h b/noatun/modules/kjofol-skin/kjprefs.h
index 0bb4540d..e5181963 100644
--- a/noatun/modules/kjofol-skin/kjprefs.h
+++ b/noatun/modules/kjofol-skin/kjprefs.h
@@ -9,7 +9,7 @@
 #include <tqwidget.h>
 #include <noatun/pref.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kurlrequester.h>
 
 class TQVBoxLayout; 
diff --git a/noatun/modules/kjofol-skin/kjvis.cpp b/noatun/modules/kjofol-skin/kjvis.cpp
index 7ae04d44..527fb673 100644
--- a/noatun/modules/kjofol-skin/kjvis.cpp
+++ b/noatun/modules/kjofol-skin/kjvis.cpp
@@ -19,7 +19,7 @@
 //kde includes
 #include <kdebug.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kpixmapeffect.h>
 #include <kpixmap.h>
 
diff --git a/noatun/modules/marquis/marquis.cpp b/noatun/modules/marquis/marquis.cpp
index 62c959ac..e3faf8b1 100644
--- a/noatun/modules/marquis/marquis.cpp
+++ b/noatun/modules/marquis/marquis.cpp
@@ -27,7 +27,7 @@
 #include <config.h>
 #endif
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
 #include <klocale.h>
diff --git a/noatun/modules/metatag/edit.cpp b/noatun/modules/metatag/edit.cpp
index 6e37347c..6f16a4b3 100644
--- a/noatun/modules/metatag/edit.cpp
+++ b/noatun/modules/metatag/edit.cpp
@@ -17,7 +17,7 @@
 #include <kdialogbase.h>
 #include <kdebug.h>
 #include <kseparator.h>
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 #include <tqvalidator.h>
 
 #include "metatag.h"
diff --git a/noatun/modules/metatag/metatag.cpp b/noatun/modules/metatag/metatag.cpp
index 1ec54cbf..5ffa1e6a 100644
--- a/noatun/modules/metatag/metatag.cpp
+++ b/noatun/modules/metatag/metatag.cpp
@@ -16,11 +16,11 @@
 #include <kaction.h>
 #include <kglobal.h>
 #include <klineedit.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kaction.h>
 #include <kiconloader.h>
 #include <kpopupmenu.h>
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 
 extern "C"
 {
diff --git a/noatun/modules/noatunui/userinterface.cpp b/noatun/modules/noatunui/userinterface.cpp
index d3c6de0f..9173867e 100644
--- a/noatun/modules/noatunui/userinterface.cpp
+++ b/noatun/modules/noatunui/userinterface.cpp
@@ -25,8 +25,8 @@
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kurldrag.h>
-#include <kfiledialog.h>
-#include <kconfig.h>
+#include <tdefiledialog.h>
+#include <tdeconfig.h>
 
 MilkChocolate::MilkChocolate() : TQWidget(0,"NoatunUI"), UserInterface()
 {
diff --git a/noatun/modules/simple/userinterface.cpp b/noatun/modules/simple/userinterface.cpp
index d76f3b54..4cda6fe0 100644
--- a/noatun/modules/simple/userinterface.cpp
+++ b/noatun/modules/simple/userinterface.cpp
@@ -17,7 +17,7 @@
 #include <noatun/player.h>
 #include <noatun/stdaction.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
 #include <kiconloader.h>
diff --git a/noatun/modules/splitplaylist/view.cpp b/noatun/modules/splitplaylist/view.cpp
index 50245140..cce64897 100644
--- a/noatun/modules/splitplaylist/view.cpp
+++ b/noatun/modules/splitplaylist/view.cpp
@@ -20,10 +20,10 @@
 
 #include <kaction.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
-#include <kfileitem.h>
-#include <kio/job.h>
-#include <kio/netaccess.h>
+#include <tdefiledialog.h>
+#include <tdefileitem.h>
+#include <tdeio/job.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
 #include <kmenubar.h>
 #include <ksimpleconfig.h>
diff --git a/noatun/modules/splitplaylist/view.h b/noatun/modules/splitplaylist/view.h
index 48a30df5..48a0be67 100644
--- a/noatun/modules/splitplaylist/view.h
+++ b/noatun/modules/splitplaylist/view.h
@@ -7,7 +7,7 @@
 #include <kmainwindow.h>
 #include <tqrect.h>
 #include <tqdict.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <noatun/downloader.h>
 
 class Finder;
diff --git a/noatun/modules/systray/systray.cpp b/noatun/modules/systray/systray.cpp
index 0788ceb3..27976429 100644
--- a/noatun/modules/systray/systray.cpp
+++ b/noatun/modules/systray/systray.cpp
@@ -39,7 +39,7 @@
 #include <noatun/stdaction.h>
 
 #include <kaction.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqfile.h>
 #include <kglobal.h>
 #include <kiconloader.h>
@@ -56,7 +56,7 @@
 
 #include <tqimage.h>
 #include <kurl.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
 
diff --git a/noatun/modules/systray/yhconfig.kcfgc b/noatun/modules/systray/yhconfig.kcfgc
index 5b4f99e4..8b35e4f7 100644
--- a/noatun/modules/systray/yhconfig.kcfgc
+++ b/noatun/modules/systray/yhconfig.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=yhconfig.kcfg
 ClassName=YHConfig
 Singleton=true
diff --git a/noatun/modules/voiceprint/prefs.cpp b/noatun/modules/voiceprint/prefs.cpp
index 882c05a4..e80de081 100644
--- a/noatun/modules/voiceprint/prefs.cpp
+++ b/noatun/modules/voiceprint/prefs.cpp
@@ -6,7 +6,7 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 #include <kcolorbutton.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 Prefs::Prefs(TQObject* parent)
 	: CModule(i18n("Voiceprint"), i18n("Options for the Voiceprint Visualization"), "xapp", parent)
diff --git a/noatun/modules/winskin/fileInfo.cpp b/noatun/modules/winskin/fileInfo.cpp
index 6e721cd9..5cd2779f 100644
--- a/noatun/modules/winskin/fileInfo.cpp
+++ b/noatun/modules/winskin/fileInfo.cpp
@@ -2,7 +2,7 @@
 #include <noatun/playlist.h>
 
 #include <tqstring.h>
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 
 #include "fileInfo.h"
 
diff --git a/noatun/modules/winskin/guiSpectrumAnalyser.cpp b/noatun/modules/winskin/guiSpectrumAnalyser.cpp
index d0447397..0d2978ee 100644
--- a/noatun/modules/winskin/guiSpectrumAnalyser.cpp
+++ b/noatun/modules/winskin/guiSpectrumAnalyser.cpp
@@ -15,7 +15,7 @@
 #include <tqcolor.h>
 #include <tqpopupmenu.h>
 #include <tqpainter.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "waColor.h"
 #include "waSkinModel.h"
diff --git a/noatun/modules/winskin/waDigit.cpp b/noatun/modules/winskin/waDigit.cpp
index d18d9ead..75a89b7e 100644
--- a/noatun/modules/winskin/waDigit.cpp
+++ b/noatun/modules/winskin/waDigit.cpp
@@ -15,7 +15,7 @@
 #include "waDigit.h"
 #include "waSkinModel.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 
 WaDigit::WaDigit() : WaWidget(_WA_MAPPING_DIGITS)
diff --git a/noatun/modules/winskin/waInfo.cpp b/noatun/modules/winskin/waInfo.cpp
index 80375a90..b17c308d 100644
--- a/noatun/modules/winskin/waInfo.cpp
+++ b/noatun/modules/winskin/waInfo.cpp
@@ -17,7 +17,7 @@
 
 #include <stdlib.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 
 #include "waInfo.h"
diff --git a/noatun/modules/winskin/waSkin.cpp b/noatun/modules/winskin/waSkin.cpp
index 4512d067..06b9c010 100644
--- a/noatun/modules/winskin/waSkin.cpp
+++ b/noatun/modules/winskin/waSkin.cpp
@@ -11,7 +11,7 @@
 
  */
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqstringlist.h>
 #include <kglobal.h>
 #include <klocale.h>
diff --git a/noatun/modules/winskin/waSkinManager.cpp b/noatun/modules/winskin/waSkinManager.cpp
index f7d9b777..8230feba 100644
--- a/noatun/modules/winskin/waSkinManager.cpp
+++ b/noatun/modules/winskin/waSkinManager.cpp
@@ -5,9 +5,9 @@
 #include <tqdir.h>
 #include <kdebug.h>
 #include <kmimetype.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kurl.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kzip.h>
 
 #include "waSkinManager.h"
diff --git a/noatun/modules/winskin/winSkinConfig.cpp b/noatun/modules/winskin/winSkinConfig.cpp
index 7d2c866d..667cf81f 100644
--- a/noatun/modules/winskin/winSkinConfig.cpp
+++ b/noatun/modules/winskin/winSkinConfig.cpp
@@ -6,12 +6,12 @@
 #include <tqlabel.h>
 #include <tqpixmap.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqslider.h>
 #include <tqframe.h>
 #include <tqstringlist.h>
-#include <kfile.h>
-#include <kfiledialog.h>
+#include <tdefile.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
 #include <kurlrequester.h>