Rename many classes and header files to avoid conflicts with KDE4

5 files changed, 15 insertions, 15 deletions

diff --git a/tderadio3/src/include/radiostation-listview.h b/tderadio3/src/include/radiostation-listview.h
index aed41fd..2ecb86f 100644
--- a/tderadio3/src/include/radiostation-listview.h
+++ b/tderadio3/src/include/radiostation-listview.h
@@ -23,7 +23,7 @@
 #ifndef _KRADIO_RADIOSTATION_LISTVIEW_H_
 #define _KRADIO_RADIOSTATION_LISTVIEW_H_
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 class RadioStation;
 class StationList;
diff --git a/tderadio3/src/include/soundstreamclient_interfaces.h b/tderadio3/src/include/soundstreamclient_interfaces.h
index 57fd2f3..2d14de2 100644
--- a/tderadio3/src/include/soundstreamclient_interfaces.h
+++ b/tderadio3/src/include/soundstreamclient_interfaces.h
@@ -125,7 +125,7 @@ SENDERS:
     IF_SENDER_FINE  (  queryIsCaptureRunning, (SoundStreamID id, bool &running, SoundFormat &sf))
 
     // we need extra recording, in order to distinguish between plain capturing
-    // (making sound data available to kradio) and writing a stream to disk  or sth similar
+    // (making sound data available to tderadio) and writing a stream to disk  or sth similar
     IF_SENDER_FINE  (  sendStartRecording, (SoundStreamID id)                                  )
     IF_SENDER_FINE  (  sendStartRecordingWithFormat, (SoundStreamID id,
                                    const SoundFormat &proposed_format,
diff --git a/tderadio3/src/include/stationlistxmlhandler.h b/tderadio3/src/include/stationlistxmlhandler.h
index 177ec21..65c3cff 100644
--- a/tderadio3/src/include/stationlistxmlhandler.h
+++ b/tderadio3/src/include/stationlistxmlhandler.h
@@ -79,7 +79,7 @@ extern const char *StationQuickSelectElement;
 extern const char *StationDockingMenuElement;
 extern const char *StationListFormat;
 
-#define STATION_LIST_FORMAT   "kradio-1.0"
+#define STATION_LIST_FORMAT   "tderadio-1.0"
 
 
 #endif
diff --git a/tderadio3/src/include/tderadioapp.h b/tderadio3/src/include/tderadioapp.h
index adc40c2..f3f3592 100644
--- a/tderadio3/src/include/tderadioapp.h
+++ b/tderadio3/src/include/tderadioapp.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          kradioapp.h  -  description
+                          tderadioapp.h  -  description
                              -------------------
     begin                : Sa Feb  9 2002
     copyright            : (C) 2002 by Klas Kalass / Martin Witte / Frank Schwanz
@@ -48,19 +48,19 @@ public:
 
 
 
-typedef  PluginBase     *(*t_kradio_plugin_init_func)(const TQString & cls, const TQString &obj);
-typedef  void            (*t_kradio_plugin_info_func)(TQMap<TQString, TQString> &);
-typedef  void            (*t_kradio_plugin_libload_func)();
-typedef  void            (*t_kradio_plugin_libunload_func)();
+typedef  PluginBase     *(*t_tderadio_plugin_init_func)(const TQString & cls, const TQString &obj);
+typedef  void            (*t_tderadio_plugin_info_func)(TQMap<TQString, TQString> &);
+typedef  void            (*t_tderadio_plugin_libload_func)();
+typedef  void            (*t_tderadio_plugin_libunload_func)();
 
 
 struct PluginLibraryInfo {
     KLibrary                      *library;
     TQMap<TQString,TQString>          plugins;
-    t_kradio_plugin_init_func      init_func;
-    t_kradio_plugin_info_func      info_func;
-    t_kradio_plugin_libload_func   libload_func;
-    t_kradio_plugin_libunload_func libunload_func;
+    t_tderadio_plugin_init_func      init_func;
+    t_tderadio_plugin_info_func      info_func;
+    t_tderadio_plugin_libload_func   libload_func;
+    t_tderadio_plugin_libunload_func libunload_func;
 
     PluginLibraryInfo() : library(NULL), init_func(NULL), info_func(NULL), libload_func(NULL), libunload_func(NULL) {}
     PluginLibraryInfo(const TQString &libname);
@@ -71,10 +71,10 @@ struct PluginLibraryInfo {
 struct PluginClassInfo {
     TQString                    class_name;
     TQString                    description;
-    t_kradio_plugin_init_func  create_function;
+    t_tderadio_plugin_init_func  create_function;
 
     PluginClassInfo() : create_function(NULL) {}
-    PluginClassInfo(const TQString &_name, const TQString &descr, t_kradio_plugin_init_func init_func)
+    PluginClassInfo(const TQString &_name, const TQString &descr, t_tderadio_plugin_init_func init_func)
         : class_name(_name), description(descr), create_function(init_func) {}
     PluginBase *CreateInstance(const TQString &obj_name) { return create_function ? create_function(class_name, obj_name) : NULL; }
 };
diff --git a/tderadio3/src/include/tderadioversion.h b/tderadio3/src/include/tderadioversion.h
index cdde36f..e7c5b87 100644
--- a/tderadio3/src/include/tderadioversion.h
+++ b/tderadio3/src/include/tderadioversion.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-                        kradioversion.h  -  description
+                        tderadioversion.h  -  description
                              -------------------
     begin                : Su May 22 2005
     copyright            : (C) 2005 by Marcus Camen