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

29 files changed, 36 insertions, 36 deletions

diff --git a/noatun-plugins/alarm/wakeup.cpp b/noatun-plugins/alarm/wakeup.cpp
index e62ddc8..55d5ac6 100644
--- a/noatun-plugins/alarm/wakeup.cpp
+++ b/noatun-plugins/alarm/wakeup.cpp
@@ -33,7 +33,7 @@
 #include <tqwhatsthis.h>
 #include <kiconloader.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include "wakeup.h"
 #include "kminutespinbox.h"
diff --git a/noatun-plugins/alsaplayer/configmodule.cpp b/noatun-plugins/alsaplayer/configmodule.cpp
index a619a0e..ec0b123 100644
--- a/noatun-plugins/alsaplayer/configmodule.cpp
+++ b/noatun-plugins/alsaplayer/configmodule.cpp
@@ -22,7 +22,7 @@
 
 #include <klocale.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqcheckbox.h>
 #include <tqlayout.h>
diff --git a/noatun-plugins/alsaplayer/userinterface.cpp b/noatun-plugins/alsaplayer/userinterface.cpp
index 9e13f12..5eadaf9 100644
--- a/noatun-plugins/alsaplayer/userinterface.cpp
+++ b/noatun-plugins/alsaplayer/userinterface.cpp
@@ -38,7 +38,7 @@
 #include <kpopupmenu.h>
 #include <kurldrag.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kurldrag.h>
diff --git a/noatun-plugins/charlatan/configmodule.cpp b/noatun-plugins/charlatan/configmodule.cpp
index b48f011..f3ba458 100644
--- a/noatun-plugins/charlatan/configmodule.cpp
+++ b/noatun-plugins/charlatan/configmodule.cpp
@@ -22,7 +22,7 @@
 
 #include <klocale.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqcheckbox.h>
 #include <tqlayout.h>
diff --git a/noatun-plugins/charlatan/userinterface.cpp b/noatun-plugins/charlatan/userinterface.cpp
index 91cff44..11c4988 100644
--- a/noatun-plugins/charlatan/userinterface.cpp
+++ b/noatun-plugins/charlatan/userinterface.cpp
@@ -36,7 +36,7 @@
 #include <kurldrag.h>
 #include <kstatusbar.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kurldrag.h>
 #include <kiconloader.h>
diff --git a/noatun-plugins/dub/dub.kdevprj b/noatun-plugins/dub/dub.kdevprj
index ef387e6..8bef2aa 100644
--- a/noatun-plugins/dub/dub.kdevprj
+++ b/noatun-plugins/dub/dub.kdevprj
@@ -28,7 +28,7 @@ bin_program=dub
 cflags=
 cppflags=
 cxxflags=\s-O0 -g3 -Wall
-ldadd=\s-lkfile -ltdeui -ltdecore -lqt
+ldadd=\s-ltdefile -ltdeui -ltdecore -lqt
 ldflags=\s  \s
 
 [General]
diff --git a/noatun-plugins/dub/dub/dub.cpp b/noatun-plugins/dub/dub/dub.cpp
index 5322ae6..55cfbb1 100644
--- a/noatun-plugins/dub/dub/dub.cpp
+++ b/noatun-plugins/dub/dub/dub.cpp
@@ -23,11 +23,11 @@
 // include files for KDE
 #include <kiconloader.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmenubar.h>
 #include <kstatusbar.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstdaction.h>
 #include <kurl.h>
 #include <kurlrequester.h>
diff --git a/noatun-plugins/dub/dub/dubapp.cpp b/noatun-plugins/dub/dub/dubapp.cpp
index 375fc4b..d5cfce0 100644
--- a/noatun-plugins/dub/dub/dubapp.cpp
+++ b/noatun-plugins/dub/dub/dubapp.cpp
@@ -19,11 +19,11 @@
 // include files for KDE
 #include <kiconloader.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmenubar.h>
 #include <kstatusbar.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstdaction.h>
 #include <noatun/playlist.h>
 
diff --git a/noatun-plugins/dub/dub/dubconfigmodule.cpp b/noatun-plugins/dub/dub/dubconfigmodule.cpp
index 9e81d45..9de7eee 100644
--- a/noatun-plugins/dub/dub/dubconfigmodule.cpp
+++ b/noatun-plugins/dub/dub/dubconfigmodule.cpp
@@ -11,7 +11,7 @@
 //
 //
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialog.h>
 #include <kglobal.h>
 #include <klocale.h>
diff --git a/noatun-plugins/dub/dub/dubplaylist.h b/noatun-plugins/dub/dub/dubplaylist.h
index d250926..831486a 100644
--- a/noatun-plugins/dub/dub/dubplaylist.h
+++ b/noatun-plugins/dub/dub/dubplaylist.h
@@ -17,7 +17,7 @@
 class Dub;
 class DubConfigModule;
 
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <noatun/playlist.h>
 #include <noatun/plugin.h>
 
diff --git a/noatun-plugins/dub/dub/dubplaylistitem.cpp b/noatun-plugins/dub/dub/dubplaylistitem.cpp
index 62d2e5c..065ebe9 100644
--- a/noatun-plugins/dub/dub/dubplaylistitem.cpp
+++ b/noatun-plugins/dub/dub/dubplaylistitem.cpp
@@ -15,8 +15,8 @@
 
 
 #include "dubplaylistitem.h"
-#include <kfile.h>
-#include <kfileitem.h>
+#include <tdefile.h>
+#include <tdefileitem.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
 #include <klocale.h>
diff --git a/noatun-plugins/dub/dub/dubplaylistitem.h b/noatun-plugins/dub/dub/dubplaylistitem.h
index f61daaf..211a0bc 100644
--- a/noatun-plugins/dub/dub/dubplaylistitem.h
+++ b/noatun-plugins/dub/dub/dubplaylistitem.h
@@ -15,7 +15,7 @@
 #ifndef DUBPLAYLISTITEM_H
 #define DUBPLAYLISTITEM_H
 
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <dubplaylistitem.h>
 
 #include <noatun/playlist.h>
diff --git a/noatun-plugins/dub/dub/fileselectorwidget.cpp b/noatun-plugins/dub/dub/fileselectorwidget.cpp
index ac1892e..437f943 100644
--- a/noatun-plugins/dub/dub/fileselectorwidget.cpp
+++ b/noatun-plugins/dub/dub/fileselectorwidget.cpp
@@ -26,7 +26,7 @@
 #include <kurlcompletion.h>
 #include <kprotocolinfo.h>
 #include <kdiroperator.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kcombobox.h>
 
diff --git a/noatun-plugins/dub/dub/fileselectorwidget.h b/noatun-plugins/dub/dub/fileselectorwidget.h
index d278aa9..9d38a86 100644
--- a/noatun-plugins/dub/dub/fileselectorwidget.h
+++ b/noatun-plugins/dub/dub/fileselectorwidget.h
@@ -22,7 +22,7 @@
 #include <klistview.h>
 #include <tqvbox.h>
 #include <tqwidget.h>
-#include <kfile.h>
+#include <tdefile.h>
 #include <kurlcombobox.h>
 #include <kurlcompletion.h>
 #include <kcombobox.h>
diff --git a/noatun-plugins/ffrs/ffrs.cpp b/noatun-plugins/ffrs/ffrs.cpp
index a562751..04ae3ef 100644
--- a/noatun-plugins/ffrs/ffrs.cpp
+++ b/noatun-plugins/ffrs/ffrs.cpp
@@ -6,7 +6,7 @@
 #include <tqpainter.h>
 #include <tqbitmap.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqcursor.h>
 #include <tqtooltip.h>
 #include <twin.h>
diff --git a/noatun-plugins/lyrics/cmodule.cpp b/noatun-plugins/lyrics/cmodule.cpp
index 3d5f677..8791f30 100644
--- a/noatun-plugins/lyrics/cmodule.cpp
+++ b/noatun-plugins/lyrics/cmodule.cpp
@@ -10,7 +10,7 @@
 #include <klineedit.h>
 #include <kbuttonbox.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 extern Lyrics *lyrics;
diff --git a/noatun-plugins/lyrics/lyrics.cpp b/noatun-plugins/lyrics/lyrics.cpp
index fdd73ee..ed8cfef 100644
--- a/noatun-plugins/lyrics/lyrics.cpp
+++ b/noatun-plugins/lyrics/lyrics.cpp
@@ -1,6 +1,6 @@
 #include <klocale.h>
 #include <klineeditdlg.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmessagebox.h>
 #include <tdehtmlview.h>
 #include <kstdaction.h>
diff --git a/noatun-plugins/nexscope/gui.cpp b/noatun-plugins/nexscope/gui.cpp
index 624eb48..803aba0 100644
--- a/noatun-plugins/nexscope/gui.cpp
+++ b/noatun-plugins/nexscope/gui.cpp
@@ -2,7 +2,7 @@
 #include <tqheader.h>
 #include <tqlayout.h>
 #include <tqdragobject.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kstdaction.h>
 #include <kaction.h>
 
diff --git a/noatun-plugins/oblique/cmodule.cpp b/noatun-plugins/oblique/cmodule.cpp
index dd0ebb7..bde3302 100644
--- a/noatun-plugins/oblique/cmodule.cpp
+++ b/noatun-plugins/oblique/cmodule.cpp
@@ -12,7 +12,7 @@
 #include <klineedit.h>
 #include <kiconloader.h>
 #include <kinputdialog.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqgroupbox.h>
 #include <tqcheckbox.h>
diff --git a/noatun-plugins/oblique/file.cpp b/noatun-plugins/oblique/file.cpp
index 2946f23..6b0fd01 100644
--- a/noatun-plugins/oblique/file.cpp
+++ b/noatun-plugins/oblique/file.cpp
@@ -8,7 +8,7 @@
 #include <iostream>
 
 #include <klocale.h>
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 #include <kmimetype.h>
 
 
diff --git a/noatun-plugins/oblique/kdatacollection.cpp b/noatun-plugins/oblique/kdatacollection.cpp
index 15e0520..4209d9b 100644
--- a/noatun-plugins/oblique/kdatacollection.cpp
+++ b/noatun-plugins/oblique/kdatacollection.cpp
@@ -19,7 +19,7 @@
 
 #include "kdatacollection.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
 
diff --git a/noatun-plugins/oblique/oblique.cpp b/noatun-plugins/oblique/oblique.cpp
index f25338a..2c12588 100644
--- a/noatun-plugins/oblique/oblique.cpp
+++ b/noatun-plugins/oblique/oblique.cpp
@@ -10,10 +10,10 @@
 
 #include <noatun/player.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
-#include <kio/job.h>
-#include <kfileitem.h>
+#include <tdeio/job.h>
+#include <tdefileitem.h>
 
 #include <tqtimer.h>
 
diff --git a/noatun-plugins/oblique/oblique.h b/noatun-plugins/oblique/oblique.h
index f5c1798..ed03d79 100644
--- a/noatun-plugins/oblique/oblique.h
+++ b/noatun-plugins/oblique/oblique.h
@@ -9,7 +9,7 @@
 #include "query.h"
 #include "kdatacollection.h"
 
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 class View;
 class Tree;
diff --git a/noatun-plugins/oblique/view.cpp b/noatun-plugins/oblique/view.cpp
index c769603..5714c99 100644
--- a/noatun-plugins/oblique/view.cpp
+++ b/noatun-plugins/oblique/view.cpp
@@ -10,7 +10,7 @@
 #include <kstdaction.h>
 #include <klocale.h>
 #include <kedittoolbar.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <tqlabel.h>
 #include <klineeditdlg.h>
 #include <kmessagebox.h>
diff --git a/noatun-plugins/synaescope/cmodule.cpp b/noatun-plugins/synaescope/cmodule.cpp
index ac8c701..a35de7c 100644
--- a/noatun-plugins/synaescope/cmodule.cpp
+++ b/noatun-plugins/synaescope/cmodule.cpp
@@ -17,7 +17,7 @@
 // AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
diff --git a/noatun-plugins/synaescope/main.cpp b/noatun-plugins/synaescope/main.cpp
index 02ad014..4ff7148 100644
--- a/noatun-plugins/synaescope/main.cpp
+++ b/noatun-plugins/synaescope/main.cpp
@@ -174,7 +174,7 @@ void warning(const char *str, bool)
 
 #include <kinstance.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 int main(void)
 {
diff --git a/noatun-plugins/synaescope/ui.cpp b/noatun-plugins/synaescope/ui.cpp
index cd16408..0c69c4a 100644
--- a/noatun-plugins/synaescope/ui.cpp
+++ b/noatun-plugins/synaescope/ui.cpp
@@ -3,7 +3,7 @@
 #include "syna.h"
 #include <math.h>
 #include <stdlib.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <dcopclient.h>
 #include <unistd.h>
 
diff --git a/noatun-plugins/tippercanoe/ui.cpp b/noatun-plugins/tippercanoe/ui.cpp
index b61bf51..7213e1f 100644
--- a/noatun-plugins/tippercanoe/ui.cpp
+++ b/noatun-plugins/tippercanoe/ui.cpp
@@ -3,7 +3,7 @@
 #include "syna.h"
 #include <math.h>
 #include <stdlib.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #define output core->output()
 
diff --git a/noatun-plugins/wavecapture/wavecapture.cpp b/noatun-plugins/wavecapture/wavecapture.cpp
index 2e0112e..cebc10e 100644
--- a/noatun-plugins/wavecapture/wavecapture.cpp
+++ b/noatun-plugins/wavecapture/wavecapture.cpp
@@ -28,11 +28,11 @@
 
 #include <klocale.h>
 #include <kpopupmenu.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kurl.h>
 #include <krecentdocument.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
 
 #include <tqfile.h>
 #include <tqstring.h>