Rename a number of classes to enhance compatibility with KDE4

7 files changed, 27 insertions, 27 deletions

diff --git a/kradio3/src/include/aboutwidget.h b/kradio3/src/include/aboutwidget.h
index 43ee97f..4636868 100644
--- a/kradio3/src/include/aboutwidget.h
+++ b/kradio3/src/include/aboutwidget.h
@@ -41,7 +41,7 @@ class TDEAboutData;
 // copied (and renamed) from kaboutdialog_private.h
 // original: KImageTrackLabel
 
-class KRadioImageTrackLabel : public TQLabel
+class TDERadioImageTrackLabel : public TQLabel
 {
   Q_OBJECT
   
@@ -56,7 +56,7 @@ class KRadioImageTrackLabel : public TQLabel
     };
 
   public:
-    KRadioImageTrackLabel( TQWidget * parent, const char * name=0, WFlags f=0 );
+    TDERadioImageTrackLabel( TQWidget * parent, const char * name=0, WFlags f=0 );
 
   signals:
     void mouseTrack( int mode, const TQMouseEvent *e );
@@ -71,7 +71,7 @@ class KRadioImageTrackLabel : public TQLabel
 // copied (and renamed) from kaboutdialog_private.h
 // original: KAboutContainerBase
 
-class KRadioAboutWidget : public TQWidget
+class TDERadioAboutWidget : public TQWidget
 {
   Q_OBJECT
   
@@ -92,7 +92,7 @@ class KRadioAboutWidget : public TQWidget
     };
 
   public:
-    KRadioAboutWidget(const TDEAboutData &abtData, int layoutType, TQWidget *parent = 0, char *name = 0);
+    TDERadioAboutWidget(const TDEAboutData &abtData, int layoutType, TQWidget *parent = 0, char *name = 0);
     virtual void show( void );
     virtual TQSize sizeHint( void ) const;
 
@@ -135,7 +135,7 @@ class KRadioAboutWidget : public TQWidget
     TQMemArray<TQWidget*>  mContainerList;
 
     TQVBoxLayout *mTopLayout;
-    KRadioImageTrackLabel *mImageLabel;
+    TDERadioImageTrackLabel *mImageLabel;
     TQLabel  *mTitleLabel;
     TQLabel  *mIconLabel;
     TQLabel  *mVersionLabel;
diff --git a/kradio3/src/include/kradioapp.h b/kradio3/src/include/kradioapp.h
index fabe04f..adc40c2 100644
--- a/kradio3/src/include/kradioapp.h
+++ b/kradio3/src/include/kradioapp.h
@@ -31,12 +31,12 @@
 
 class KLibrary;
 
-class KRadioAbout : public PluginBase
+class TDERadioAbout : public PluginBase
 {
 public:
-    KRadioAbout(const TQString &name) : PluginBase(name, "KRadio Application") {}
+    TDERadioAbout(const TQString &name) : PluginBase(name, "TDERadio Application") {}
 
-    virtual TQString pluginClassName() const { return "KRadioAbout"; }
+    virtual TQString pluginClassName() const { return "TDERadioAbout"; }
 
     virtual ConfigPageInfo createConfigurationPage () { return ConfigPageInfo(); }
     virtual AboutPageInfo  createAboutPage ();
@@ -80,13 +80,13 @@ struct PluginClassInfo {
 };
 
 
-class KRadioApp : public TDEApplication
+class TDERadioApp : public TDEApplication
 {
 Q_OBJECT
   
 public:
-    KRadioApp();
-    virtual ~KRadioApp();
+    TDERadioApp();
+    virtual ~TDERadioApp();
 
     virtual void             saveState    (TDEConfig *c);
     virtual void             restoreState (TDEConfig *c);
diff --git a/kradio3/src/include/pluginmanager-configuration.h b/kradio3/src/include/pluginmanager-configuration.h
index 9a67846..970aca2 100644
--- a/kradio3/src/include/pluginmanager-configuration.h
+++ b/kradio3/src/include/pluginmanager-configuration.h
@@ -25,7 +25,7 @@
 #include <pluginmanager-configuration-ui.h>
 
 class TQWidget;
-class KRadioApp;
+class TDERadioApp;
 class PluginManager;
 
 class PluginManagerConfiguration : public PluginManagerConfigurationUI
@@ -33,7 +33,7 @@ class PluginManagerConfiguration : public PluginManagerConfigurationUI
 Q_OBJECT
   
 public :
-    PluginManagerConfiguration (TQWidget *parent, KRadioApp *app, PluginManager *pm);
+    PluginManagerConfiguration (TQWidget *parent, TDERadioApp *app, PluginManager *pm);
     ~PluginManagerConfiguration ();
 
     void noticePluginLibrariesChanged();
@@ -52,7 +52,7 @@ protected slots:
 
 protected:
 
-    KRadioApp     *m_Application;
+    TDERadioApp     *m_Application;
     PluginManager *m_PluginManager;
     bool           m_dirty;
 
diff --git a/kradio3/src/include/pluginmanager.h b/kradio3/src/include/pluginmanager.h
index e450284..106b884 100644
--- a/kradio3/src/include/pluginmanager.h
+++ b/kradio3/src/include/pluginmanager.h
@@ -39,7 +39,7 @@ class KDialogBase;
 
 struct ConfigPageInfo;
 class TQMenuData;
-class KRadioApp;
+class TDERadioApp;
 
 
 class PluginManager : public TQObject
@@ -48,7 +48,7 @@ Q_OBJECT
   
 public :
              PluginManager(const TQString &name,
-                           KRadioApp *app,
+                           TDERadioApp *app,
                            const TQString &configDialogTitle,
                            const TQString &aboutTitle);
     virtual ~PluginManager();
@@ -124,7 +124,7 @@ protected:
     typedef TQPtrDictIterator<TQWidget>      TQWidgetDictIterator;
 
     TQString      m_Name;
-    KRadioApp   *m_Application;
+    TDERadioApp   *m_Application;
 
     PluginList   m_plugins;
     bool         m_showProgressBar;
diff --git a/kradio3/src/include/plugins.h b/kradio3/src/include/plugins.h
index 808d0bb..426ff99 100644
--- a/kradio3/src/include/plugins.h
+++ b/kradio3/src/include/plugins.h
@@ -135,22 +135,22 @@ protected :
 
 
 #define PLUGIN_LIBRARY_FUNCTIONS(class_name, i18nName, description) \
-extern "C" void KRadioPlugin_LoadLibrary() \
+extern "C" void TDERadioPlugin_LoadLibrary() \
 {                                                                 \
     TDEGlobal::locale()->insertCatalogue(i18nName);                 \
 }                                                                 \
                                                                   \
-extern "C" void KRadioPlugin_UnloadLibrary() \
+extern "C" void TDERadioPlugin_UnloadLibrary() \
 {                                                                 \
     TDEGlobal::locale()->removeCatalogue(i18nName);                 \
 }                                                                 \
                                                                   \
-extern "C" void KRadioPlugin_GetAvailablePlugins(TQMap<TQString, TQString> &info) \
+extern "C" void TDERadioPlugin_GetAvailablePlugins(TQMap<TQString, TQString> &info) \
 {                                                                 \
     info.insert(#class_name, (description));                      \
 }                                                                 \
                                                                   \
-extern "C" PluginBase *KRadioPlugin_CreatePlugin(const TQString &type, const TQString &object_name) \
+extern "C" PluginBase *TDERadioPlugin_CreatePlugin(const TQString &type, const TQString &object_name) \
 {                                                                                    \
     if (type == #class_name) {                                                       \
         return new class_name(object_name);                                          \
@@ -161,23 +161,23 @@ extern "C" PluginBase *KRadioPlugin_CreatePlugin(const TQString &type, const TQS
 
 
 #define PLUGIN_LIBRARY_FUNCTIONS2(class_name1, i18nName, description1, class_name2, description2) \
-extern "C" void KRadioPlugin_LoadLibrary() \
+extern "C" void TDERadioPlugin_LoadLibrary() \
 {                                                                 \
     TDEGlobal::locale()->insertCatalogue(i18nName);                 \
 }                                                                 \
                                                                   \
-extern "C" void KRadioPlugin_UnloadLibrary() \
+extern "C" void TDERadioPlugin_UnloadLibrary() \
 {                                                                 \
     TDEGlobal::locale()->removeCatalogue(i18nName);                 \
 }                                                                 \
                                                                   \
-extern "C" void KRadioPlugin_GetAvailablePlugins(TQMap<TQString, TQString> &info) \
+extern "C" void TDERadioPlugin_GetAvailablePlugins(TQMap<TQString, TQString> &info) \
 {                                                                 \
     info.insert(#class_name1, (description1));                    \
     info.insert(#class_name2, (description2));                    \
 }                                                                 \
                                                                   \
-extern "C" PluginBase *KRadioPlugin_CreatePlugin(const TQString &type, const TQString &object_name) \
+extern "C" PluginBase *TDERadioPlugin_CreatePlugin(const TQString &type, const TQString &object_name) \
 {                                                                                       \
     if (type == #class_name1) {                                                         \
         return new class_name1(object_name);                                            \
diff --git a/kradio3/src/include/radiostation-listview.h b/kradio3/src/include/radiostation-listview.h
index d6210b9..aed41fd 100644
--- a/kradio3/src/include/radiostation-listview.h
+++ b/kradio3/src/include/radiostation-listview.h
@@ -28,7 +28,7 @@
 class RadioStation;
 class StationList;
 
-class RadioStationListView : public KListView
+class RadioStationListView : public TDEListView
 {
 Q_OBJECT
   
diff --git a/kradio3/src/include/stationlistxmlhandler.h b/kradio3/src/include/stationlistxmlhandler.h
index dccd697..177ec21 100644
--- a/kradio3/src/include/stationlistxmlhandler.h
+++ b/kradio3/src/include/stationlistxmlhandler.h
@@ -63,7 +63,7 @@ protected:
 
 
 
-extern const char *KRadioConfigElement;
+extern const char *TDERadioConfigElement;
 extern const char *StationListElement;
 
 extern const char *StationListInfo;