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

9 files changed, 12 insertions, 12 deletions

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>