Rename many classes and header files to avoid conflicts with KDE4

15 files changed, 27 insertions, 27 deletions

diff --git a/src/bookmarks.xml b/src/bookmarks.xml
index bf4c89a..70f2a31 100644
--- a/src/bookmarks.xml
+++ b/src/bookmarks.xml
@@ -512,13 +512,13 @@
    <bookmark icon="sound" href="http://www.flash.viapvt.sk/Zive_vysielanie.ram" >
     <title>flash</title>
    </bookmark>
-   <bookmark icon="sound" href="http://ra.slovakradio.sk:8000/RockFM_Live_32_kb" >
+   <bookmark icon="sound" href="http://ra.slovatderadio.sk:8000/RockFM_Live_32_kb" >
     <title>RockFM</title>
    </bookmark>
    <bookmark icon="sound" href="http://stream.radiozet.sk:8000/radiozet96kbit" >
     <title>zet</title>
    </bookmark>
-   <bookmark icon="sound" href="http://ra.slovakradio.sk:8000/SlovakRadio_Live_32_kb" >
+   <bookmark icon="sound" href="http://ra.slovatderadio.sk:8000/SlovakRadio_Live_32_kb" >
     <title>slovensko</title>
    </bookmark>
    <bookmark icon="sound" href="mmsh://195.98.128.202:80/twist" >
diff --git a/src/kmplayer.h b/src/kmplayer.h
index b2d8a91..9143933 100644
--- a/src/kmplayer.h
+++ b/src/kmplayer.h
@@ -24,9 +24,9 @@
 #endif
 
 #include <kapp.h>
-#include <kmainwindow.h>
-#include <kaccel.h>
-#include <kaction.h>
+#include <tdemainwindow.h>
+#include <tdeaccel.h>
+#include <tdeaction.h>
 #include <kurl.h>
 #include "kmplayerplaylist.h"
 
diff --git a/src/kmplayer_koffice_part.cpp b/src/kmplayer_koffice_part.cpp
index e37a7d8..45ef865 100644
--- a/src/kmplayer_koffice_part.cpp
+++ b/src/kmplayer_koffice_part.cpp
@@ -37,7 +37,7 @@
 #include <kaboutdata.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstandarddirs.h>
 #include <tdeparts/factory.h>
 
diff --git a/src/kmplayer_part.cpp b/src/kmplayer_part.cpp
index 67f40b3..c71aebd 100644
--- a/src/kmplayer_part.cpp
+++ b/src/kmplayer_part.cpp
@@ -28,12 +28,12 @@
 #include <tqpushbutton.h>
 #include <tqslider.h>
 
-class KXMLGUIClient; // workaround for trinity.3 on sarge with gcc4, kactioncollection.h does not forward declare KXMLGUIClient
+class KXMLGUIClient; // workaround for trinity.3 on sarge with gcc4, tdeactioncollection.h does not forward declare KXMLGUIClient
 #include <klibloader.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
 #include <ksimpleconfig.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <klocale.h>
 #include <kinstance.h>
diff --git a/src/kmplayer_xspf.cpp b/src/kmplayer_xspf.cpp
index c8c4470..240681c 100644
--- a/src/kmplayer_xspf.cpp
+++ b/src/kmplayer_xspf.cpp
@@ -27,8 +27,8 @@ using namespace KMPlayer;
 
 KDE_NO_EXPORT NodePtr XSPF::Playlist::childFromTag (const TQString & tag) {
     const char * name = tag.latin1 ();
-    if (!strcasecmp (name, "tracklist"))
-        return new Tracklist (m_doc);
+    if (!strcasecmp (name, "tractdelist"))
+        return new Tractdelist (m_doc);
     else if (!strcasecmp (name, "creator"))
         return new DarkNode (m_doc, name, id_node_creator);
     else if (!strcasecmp (name, "title"))
@@ -69,7 +69,7 @@ KDE_NO_EXPORT void XSPF::Playlist::closed () {
 
 //-----------------------------------------------------------------------------
 
-KDE_NO_EXPORT NodePtr XSPF::Tracklist::childFromTag (const TQString & tag) {
+KDE_NO_EXPORT NodePtr XSPF::Tractdelist::childFromTag (const TQString & tag) {
     const char * name = tag.latin1 ();
     if (!strcasecmp (name, "track"))
         return new XSPF::Track (m_doc);
diff --git a/src/kmplayer_xspf.h b/src/kmplayer_xspf.h
index 47cf745..f67b170 100644
--- a/src/kmplayer_xspf.h
+++ b/src/kmplayer_xspf.h
@@ -42,7 +42,7 @@ const short id_node_license = 509;
 const short id_node_attribution = 510;
 const short id_node_meta = 511;
 const short id_node_extension = 512;
-const short id_node_tracklist = 513;
+const short id_node_tractdelist = 513;
 const short id_node_track = 514;
 const short id_node_album = 515;
 const short id_node_tracknum = 516;
@@ -58,11 +58,11 @@ public:
     void closed ();
 };
 
-class KMPLAYER_NO_EXPORT Tracklist : public Element {
+class KMPLAYER_NO_EXPORT Tractdelist : public Element {
 public:
-    KDE_NO_CDTOR_EXPORT Tracklist (NodePtr & d) : Element (d, id_node_tracklist) {}
+    KDE_NO_CDTOR_EXPORT Tractdelist (NodePtr & d) : Element (d, id_node_tractdelist) {}
     NodePtr childFromTag (const TQString & tag);
-    KDE_NO_EXPORT const char * nodeName () const { return "tracklist"; }
+    KDE_NO_EXPORT const char * nodeName () const { return "tractdelist"; }
     bool expose () const { return false; }
 };
 
diff --git a/src/kmplayerapp.cpp b/src/kmplayerapp.cpp
index bfb05d1..44597bf 100644
--- a/src/kmplayerapp.cpp
+++ b/src/kmplayerapp.cpp
@@ -52,7 +52,7 @@
 #include <kstdaction.h>
 #include <kdebug.h>
 #include <dcopclient.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kurlrequester.h>
 #include <klineedit.h>
 #include <kkeydialog.h>
diff --git a/src/kmplayercontrolpanel.h b/src/kmplayercontrolpanel.h
index 56cce42..91fe927 100644
--- a/src/kmplayercontrolpanel.h
+++ b/src/kmplayercontrolpanel.h
@@ -26,7 +26,7 @@
 #include <tqwidget.h>
 #include <tqpushbutton.h>
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 class TQSlider;
 //class TQPushButton;
diff --git a/src/kmplayerpartbase.cpp b/src/kmplayerpartbase.cpp
index 80c8f11..8085b53 100644
--- a/src/kmplayerpartbase.cpp
+++ b/src/kmplayerpartbase.cpp
@@ -43,7 +43,7 @@
 #include <kbookmarkmanager.h>
 #include <tdeconfig.h>
 #include <ksimpleconfig.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
 #include <kmimetype.h>
diff --git a/src/kmplayervdr.cpp b/src/kmplayervdr.cpp
index 5100883..ea6a202 100644
--- a/src/kmplayervdr.cpp
+++ b/src/kmplayervdr.cpp
@@ -49,9 +49,9 @@
 #include <kstatusbar.h>
 #include <kprocess.h>
 #include <tdeconfig.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kiconloader.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tdeversion.h>
 #if KDE_IS_VERSION(3, 1, 90)
 #include <kinputdialog.h>
diff --git a/src/kmplayerview.cpp b/src/kmplayerview.cpp
index d52060e..95666cc 100644
--- a/src/kmplayerview.cpp
+++ b/src/kmplayerview.cpp
@@ -45,9 +45,9 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kapplication.h>
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
 #include <kstdaction.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 #include <kurldrag.h>
 #include <kfinddialog.h>
 #include <dcopclient.h>
diff --git a/src/playlistview.cpp b/src/playlistview.cpp
index ce664c3..a8b69e3 100644
--- a/src/playlistview.cpp
+++ b/src/playlistview.cpp
@@ -34,7 +34,7 @@
 #include <kiconloader.h>
 #include <kfinddialog.h>
 #include <kurldrag.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 #include <kdebug.h>
 
diff --git a/src/playlistview.h b/src/playlistview.h
index 4d93a3e..d3652ef 100644
--- a/src/playlistview.h
+++ b/src/playlistview.h
@@ -23,7 +23,7 @@
 #include <config.h>
 #endif
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include "kmplayerplaylist.h"
 
diff --git a/src/pref.cpp b/src/pref.cpp
index 3ff8956..9aa4e3a 100644
--- a/src/pref.cpp
+++ b/src/pref.cpp
@@ -52,7 +52,7 @@
 #include <kcombobox.h>
 #include <kcolorbutton.h>
 #include <kurlrequester.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
 
 #include "pref.h"
 #include "kmplayerpartbase.h"
diff --git a/src/viewarea.cpp b/src/viewarea.cpp
index 439a20e..cd1fc40 100644
--- a/src/viewarea.cpp
+++ b/src/viewarea.cpp
@@ -29,11 +29,11 @@
 #include <tqimage.h>
 #include <tqmap.h>
 
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
 #include <kstaticdeleter.h>
 #include <kstatusbar.h>
 #include <kstdaction.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 #include <klocale.h>
 #include <kdebug.h>