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

14 files changed, 20 insertions, 20 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index fc625fa..3ac67d1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS= -I$(kde_includes)/kio $(CFLAGS_GST) $(all_includes) $(LIBCAIRO_CFLAGS) $(LIBNSPR_CFLAGS) $(LIBDBUS_CFLAGS)
+AM_CPPFLAGS= -I$(kde_includes)/tdeio $(CFLAGS_GST) $(all_includes) $(LIBCAIRO_CFLAGS) $(LIBNSPR_CFLAGS) $(LIBDBUS_CFLAGS)
 
 METASOURCES= AUTO
 
diff --git a/src/kmplayer_koffice_part.cpp b/src/kmplayer_koffice_part.cpp
index 4284c3b..e37a7d8 100644
--- a/src/kmplayer_koffice_part.cpp
+++ b/src/kmplayer_koffice_part.cpp
@@ -36,7 +36,7 @@
 #include <kmessagebox.h>
 #include <kaboutdata.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kaction.h>
 #include <kstandarddirs.h>
 #include <tdeparts/factory.h>
diff --git a/src/kmplayer_part.cpp b/src/kmplayer_part.cpp
index 1ba8dbe..5cffa49 100644
--- a/src/kmplayer_part.cpp
+++ b/src/kmplayer_part.cpp
@@ -31,7 +31,7 @@
 class KXMLGUIClient; // workaround for trinity.3 on sarge with gcc4, kactioncollection.h does not forward declare KXMLGUIClient
 #include <klibloader.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <ksimpleconfig.h>
 #include <kaction.h>
 #include <kapplication.h>
diff --git a/src/kmplayer_smil.cpp b/src/kmplayer_smil.cpp
index 3c2d196..f144f3a 100644
--- a/src/kmplayer_smil.cpp
+++ b/src/kmplayer_smil.cpp
@@ -34,8 +34,8 @@
 #include <kdebug.h>
 #include <kurl.h>
 #include <kmimetype.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
 
 #include "kmplayer_smil.h"
 #include "kmplayer_rp.h"
diff --git a/src/kmplayerapp.cpp b/src/kmplayerapp.cpp
index a4b2ccf..65a3d45 100644
--- a/src/kmplayerapp.cpp
+++ b/src/kmplayerapp.cpp
@@ -42,13 +42,13 @@
 #include <kstandarddirs.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klineeditdlg.h>
 #include <kmenubar.h>
 #include <kstatusbar.h>
 #include <kurldrag.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstdaction.h>
 #include <kdebug.h>
 #include <dcopclient.h>
@@ -1695,7 +1695,7 @@ KDE_NO_EXPORT void KMPlayerApp::startArtsControl () {
     TQCString replytype;
     TQDataStream stream (data, IO_WriteOnly);
     stream << TQString ("aRts Control Tool") << args;
-    if (kapp->dcopClient ()->call ("klauncher", "klauncher", "start_service_by_name(TQString,TQStringList)", data, replytype, replydata)) {
+    if (kapp->dcopClient ()->call ("tdelauncher", "tdelauncher", "start_service_by_name(TQString,TQStringList)", data, replytype, replydata)) {
         int result;
         TQDataStream replystream (replydata, IO_ReadOnly);
         replystream >> result >> m_dcopName;
diff --git a/src/kmplayerbroadcast.cpp b/src/kmplayerbroadcast.cpp
index 845a47c..0733eb3 100644
--- a/src/kmplayerbroadcast.cpp
+++ b/src/kmplayerbroadcast.cpp
@@ -36,7 +36,7 @@
 #include <klocale.h>
 #include <kdebug.h>
 #include <kled.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kprocess.h>
 #include <kprocctrl.h>
 #include <kmessagebox.h>
diff --git a/src/kmplayerconfig.cpp b/src/kmplayerconfig.cpp
index 5839b79..4f50f86 100644
--- a/src/kmplayerconfig.cpp
+++ b/src/kmplayerconfig.cpp
@@ -34,7 +34,7 @@
 #include <klineedit.h>
 #include <kstatusbar.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 #include <kurl.h>
 #include <kdebug.h>
diff --git a/src/kmplayerconfig.h b/src/kmplayerconfig.h
index 2dcb571..bb9d595 100644
--- a/src/kmplayerconfig.h
+++ b/src/kmplayerconfig.h
@@ -106,7 +106,7 @@ public:
     void applyColorSetting (bool only_changed_ones);
     Preferences *configDialog() const { return configdialog; }
     View * defaultView ();
-    TDEConfig * kconfig () { return m_config; }
+    TDEConfig * tdeconfig () { return m_config; }
 
     TQStringList urllist;
     TQStringList sub_urllist;
diff --git a/src/kmplayerpartbase.cpp b/src/kmplayerpartbase.cpp
index 8e171b6..d6c9409 100644
--- a/src/kmplayerpartbase.cpp
+++ b/src/kmplayerpartbase.cpp
@@ -41,7 +41,7 @@
 #include <kdebug.h>
 #include <kbookmarkmenu.h>
 #include <kbookmarkmanager.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <ksimpleconfig.h>
 #include <kaction.h>
 #include <kprocess.h>
@@ -50,8 +50,8 @@
 #include <kprotocolinfo.h>
 #include <kapplication.h>
 #include <kstaticdeleter.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
 
 #include "kmplayerpartbase.h"
 #include "kmplayerview.h"
diff --git a/src/kmplayerprocess.cpp b/src/kmplayerprocess.cpp
index 3f258d4..f0b8cff 100644
--- a/src/kmplayerprocess.cpp
+++ b/src/kmplayerprocess.cpp
@@ -40,12 +40,12 @@
 #include <kdebug.h>
 #include <kprocctrl.h>
 #include <kprotocolmanager.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 #include <klocale.h>
 #include <kapplication.h>
 #include <kstandarddirs.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #ifdef HAVE_DBUS
 # include <kstaticdeleter.h>
diff --git a/src/kmplayerprocess.h b/src/kmplayerprocess.h
index d1de37d..a8f46e8 100644
--- a/src/kmplayerprocess.h
+++ b/src/kmplayerprocess.h
@@ -29,7 +29,7 @@
 #include <tqregexp.h>
 
 #include <kurl.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 #include "kmplayerconfig.h"
 #include "kmplayersource.h"
diff --git a/src/kmplayertvsource.cpp b/src/kmplayertvsource.cpp
index b2b5714..fc432a7 100644
--- a/src/kmplayertvsource.cpp
+++ b/src/kmplayertvsource.cpp
@@ -39,7 +39,7 @@
 #include <klineedit.h>
 #include <kurlrequester.h>
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 
 #include "kmplayerpartbase.h"
diff --git a/src/kmplayervdr.cpp b/src/kmplayervdr.cpp
index 20dd120..3f126c1 100644
--- a/src/kmplayervdr.cpp
+++ b/src/kmplayervdr.cpp
@@ -48,7 +48,7 @@
 #include <kcombobox.h>
 #include <kstatusbar.h>
 #include <kprocess.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kaction.h>
 #include <kiconloader.h>
 #include <klistview.h>
diff --git a/src/pref.cpp b/src/pref.cpp
index a274a28..600fac1 100644
--- a/src/pref.cpp
+++ b/src/pref.cpp
@@ -44,7 +44,7 @@
 
 #include <klocale.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 #include <klineedit.h>
 #include <kiconloader.h>