Rename KInstance and KAboutData to avoid conflicts with KDE4

16 files changed, 35 insertions, 35 deletions

diff --git a/kradio3/convert-presets/convert-presets.cpp b/kradio3/convert-presets/convert-presets.cpp
index 5d9e96f..7ad2dca 100644
--- a/kradio3/convert-presets/convert-presets.cpp
+++ b/kradio3/convert-presets/convert-presets.cpp
@@ -159,8 +159,8 @@ static KCmdLineOptions options[] =
 
 int main(int argc, char *argv[])
 {
-    KAboutData aboutData("convert-presets", I18N_NOOP("convert-presets"),
-                         VERSION, description, KAboutData::License_GPL,
+    TDEAboutData aboutData("convert-presets", I18N_NOOP("convert-presets"),
+                         VERSION, description, TDEAboutData::License_GPL,
                          "(c) 2003-2005 Martin Witte",
                          0,
                          "http://sourceforge.net/projects/kradio",
diff --git a/kradio3/plugins/alsa-sound/alsa-sound.cpp b/kradio3/plugins/alsa-sound/alsa-sound.cpp
index 06ebc80..4ba8c2c 100644
--- a/kradio3/plugins/alsa-sound/alsa-sound.cpp
+++ b/kradio3/plugins/alsa-sound/alsa-sound.cpp
@@ -201,11 +201,11 @@ ConfigPageInfo  AlsaSoundDevice::createConfigurationPage()
 
 AboutPageInfo AlsaSoundDevice::createAboutPage()
 {
-/*    KAboutData aboutData("kradio",
+/*    TDEAboutData aboutData("kradio",
                          NULL,
                          NULL,
                          I18N_NOOP("ALSA Sound Plugin for KRadio"),
-                         KAboutData::License_GPL,
+                         TDEAboutData::License_GPL,
                          "(c) 2005 Martin Witte",
                          0,
                          "http://sourceforge.net/projects/kradio",
diff --git a/kradio3/plugins/gui-docking-menu/docking.cpp b/kradio3/plugins/gui-docking-menu/docking.cpp
index 24511f1..af89db0 100644
--- a/kradio3/plugins/gui-docking-menu/docking.cpp
+++ b/kradio3/plugins/gui-docking-menu/docking.cpp
@@ -185,11 +185,11 @@ ConfigPageInfo RadioDocking::createConfigurationPage()
 
 AboutPageInfo RadioDocking::createAboutPage()
 {
-/*    KAboutData aboutData("kradio",
+/*    TDEAboutData aboutData("kradio",
                          NULL,
                          NULL,
                          I18N_NOOP("Docking Menu for KRadio"),
-                         KAboutData::License_GPL,
+                         TDEAboutData::License_GPL,
                          "(c) 2002-2005 Martin Witte, Klas Kalass",
                          0,
                          "http://sourceforge.net/projects/kradio",
diff --git a/kradio3/plugins/gui-quickbar/quickbar.cpp b/kradio3/plugins/gui-quickbar/quickbar.cpp
index eee163e..ba5e922 100644
--- a/kradio3/plugins/gui-quickbar/quickbar.cpp
+++ b/kradio3/plugins/gui-quickbar/quickbar.cpp
@@ -145,11 +145,11 @@ ConfigPageInfo QuickBar::createConfigurationPage()
 
 AboutPageInfo QuickBar::createAboutPage()
 {
-/*    KAboutData aboutData("kradio",
+/*    TDEAboutData aboutData("kradio",
                          NULL,
                          NULL,
                          I18N_NOOP("Quickback for KRadio"),
-                         KAboutData::License_GPL,
+                         TDEAboutData::License_GPL,
                          "(c) 2002-2005 Martin Witte, Klas Kalass",
                          0,
                          "http://sourceforge.net/projects/kradio",
diff --git a/kradio3/plugins/gui-standard-display/radioview.cpp b/kradio3/plugins/gui-standard-display/radioview.cpp
index 2859e3f..aaf630c 100644
--- a/kradio3/plugins/gui-standard-display/radioview.cpp
+++ b/kradio3/plugins/gui-standard-display/radioview.cpp
@@ -600,11 +600,11 @@ void RadioView::addCommonConfigurationTab(TQTabWidget *c)
 
 AboutPageInfo RadioView::createAboutPage()
 {
-/*    KAboutData aboutData("kradio",
+/*    TDEAboutData aboutData("kradio",
                          NULL,
                          NULL,
                          I18N_NOOP("Standard Radio Display for KRadio"),
-                         KAboutData::License_GPL,
+                         TDEAboutData::License_GPL,
                          "(c) 2002-2005 Martin Witte, Klas Kalass",
                          0,
                          "http://sourceforge.net/projects/kradio",
diff --git a/kradio3/plugins/lirc/lircsupport.cpp b/kradio3/plugins/lirc/lircsupport.cpp
index 676fc7d..071ad6c 100644
--- a/kradio3/plugins/lirc/lircsupport.cpp
+++ b/kradio3/plugins/lirc/lircsupport.cpp
@@ -336,11 +336,11 @@ ConfigPageInfo LircSupport::createConfigurationPage()
 
 AboutPageInfo LircSupport::createAboutPage()
 {
-/*    KAboutData aboutData("kradio",
+/*    TDEAboutData aboutData("kradio",
                          NULL,
                          NULL,
                          I18N_NOOP("Linux Infrared Remote Control Support for KRadio"),
-                         KAboutData::License_GPL,
+                         TDEAboutData::License_GPL,
                          "(c) 2002-2005 Martin Witte",
                          0,
                          "http://sourceforge.net/projects/kradio",
diff --git a/kradio3/plugins/oss-sound/oss-sound.cpp b/kradio3/plugins/oss-sound/oss-sound.cpp
index c1a9160..61054f2 100644
--- a/kradio3/plugins/oss-sound/oss-sound.cpp
+++ b/kradio3/plugins/oss-sound/oss-sound.cpp
@@ -177,11 +177,11 @@ ConfigPageInfo  OSSSoundDevice::createConfigurationPage()
 
 AboutPageInfo OSSSoundDevice::createAboutPage()
 {
-/*    KAboutData aboutData("kradio",
+/*    TDEAboutData aboutData("kradio",
                          NULL,
                          NULL,
                          I18N_NOOP("OSS Sound Plugin for KRadio"),
-                         KAboutData::License_GPL,
+                         TDEAboutData::License_GPL,
                          "(c) 2004 Martin Witte",
                          0,
                          "http://sourceforge.net/projects/kradio",
diff --git a/kradio3/plugins/radio/radio.cpp b/kradio3/plugins/radio/radio.cpp
index 1f2ac45..b7046e7 100644
--- a/kradio3/plugins/radio/radio.cpp
+++ b/kradio3/plugins/radio/radio.cpp
@@ -122,11 +122,11 @@ ConfigPageInfo Radio::createConfigurationPage()
 
 AboutPageInfo Radio::createAboutPage()
 {
-/*    KAboutData aboutData("kradio",
+/*    TDEAboutData aboutData("kradio",
                          NULL,
                          NULL,
                          I18N_NOOP("Radio Device Multiplexer and Station Management for KRadio"),
-                         KAboutData::License_GPL,
+                         TDEAboutData::License_GPL,
                          "(c) 2002-2005 Martin Witte, Klas Kalass",
                          0,
                          "http://sourceforge.net/projects/kradio",
diff --git a/kradio3/plugins/recording/recording-monitor.cpp b/kradio3/plugins/recording/recording-monitor.cpp
index b33e8bd..a249579 100644
--- a/kradio3/plugins/recording/recording-monitor.cpp
+++ b/kradio3/plugins/recording/recording-monitor.cpp
@@ -156,11 +156,11 @@ ConfigPageInfo  RecordingMonitor::createConfigurationPage()
 
 AboutPageInfo   RecordingMonitor::createAboutPage()
 {
-/*    KAboutData aboutData("kradio",
+/*    TDEAboutData aboutData("kradio",
                          NULL,
                          NULL,
                          I18N_NOOP("Recording Monitor Plugin for KRadio"),
-                         KAboutData::License_GPL,
+                         TDEAboutData::License_GPL,
                          "(c) 2002-2005 Martin Witte",
                          0,
                          "http://sourceforge.net/projects/kradio",
diff --git a/kradio3/plugins/recording/recording.cpp b/kradio3/plugins/recording/recording.cpp
index 46dc502..1131fed 100644
--- a/kradio3/plugins/recording/recording.cpp
+++ b/kradio3/plugins/recording/recording.cpp
@@ -136,11 +136,11 @@ ConfigPageInfo  Recording::createConfigurationPage()
 
 AboutPageInfo Recording::createAboutPage()
 {
-/*    KAboutData aboutData("kradio",
+/*    TDEAboutData aboutData("kradio",
                          NULL,
                          NULL,
                          I18N_NOOP("Recording Monitor for KRadio"),
-                         KAboutData::License_GPL,
+                         TDEAboutData::License_GPL,
                          "(c) 2002-2005 Martin Witte",
                          0,
                          "http://sourceforge.net/projects/kradio",
diff --git a/kradio3/plugins/timecontrol/timecontrol.cpp b/kradio3/plugins/timecontrol/timecontrol.cpp
index e5f99cf..bf612e1 100644
--- a/kradio3/plugins/timecontrol/timecontrol.cpp
+++ b/kradio3/plugins/timecontrol/timecontrol.cpp
@@ -273,14 +273,14 @@ ConfigPageInfo TimeControl::createConfigurationPage()
 
 AboutPageInfo TimeControl::createAboutPage()
 {
-/*    KAboutData aboutData("kradio",
+/*    TDEAboutData aboutData("kradio",
                          NULL,
                          NULL,
                          I18N_NOOP("Time Control Plugin for KRadio."
                                    "<P>"
                                    "Provides Alarms and Sleep Countdown"
                                    "<P>"),
-                         KAboutData::License_GPL,
+                         TDEAboutData::License_GPL,
                          "(c) 2002-2005 Martin Witte, Klas Kalass",
                          0,
                          "http://sourceforge.net/projects/kradio",
diff --git a/kradio3/plugins/v4lradio/v4lradio.cpp b/kradio3/plugins/v4lradio/v4lradio.cpp
index a02dcfe..0f37fe3 100644
--- a/kradio3/plugins/v4lradio/v4lradio.cpp
+++ b/kradio3/plugins/v4lradio/v4lradio.cpp
@@ -1082,7 +1082,7 @@ ConfigPageInfo V4LRadio::createConfigurationPage()
 
 AboutPageInfo V4LRadio::createAboutPage()
 {
-    KAboutData aboutData("kradio",
+    TDEAboutData aboutData("kradio",
                          NULL,
                          NULL,
                          I18N_NOOP("V4L/V4L2 Plugin for KRadio."
@@ -1090,7 +1090,7 @@ AboutPageInfo V4LRadio::createAboutPage()
                                    "Provides Support for V4L/V4L2 based Radio Cards"
                                    "<P>"),
                          0,
-                         //KAboutData::License_GPL,
+                         //TDEAboutData::License_GPL,
                          "(c) 2002-2005 Martin Witte, Klas Kalass",
                          0,
                          "http://sourceforge.net/projects/kradio",
diff --git a/kradio3/src/aboutwidget.cpp b/kradio3/src/aboutwidget.cpp
index 5835ecd..c5548da 100644
--- a/kradio3/src/aboutwidget.cpp
+++ b/kradio3/src/aboutwidget.cpp
@@ -54,7 +54,7 @@ public:
 // copied (renamed and extended) from kaboutdialog.cpp
 // original: KAboutContainerBase
 
-KRadioAboutWidget::KRadioAboutWidget(const KAboutData &aboutData, int layoutType, TQWidget *_parent,
+KRadioAboutWidget::KRadioAboutWidget(const TDEAboutData &aboutData, int layoutType, TQWidget *_parent,
                       char *_name )
   : TQWidget( _parent, _name ),
     mImageLabel(0), mTitleLabel(0), mIconLabel(0),mVersionLabel(0),
@@ -489,9 +489,9 @@ void KRadioAboutWidget::slotMailClick( const TQString &/*_name*/,
 // copied (and renamed) from kaboutapplication.cpp
 // original: KAboutApplication::buildDialog
 
-void KRadioAboutWidget::setAboutData(const KAboutData &_aboutData)
+void KRadioAboutWidget::setAboutData(const TDEAboutData &_aboutData)
 {
-    const KAboutData *aboutData = &_aboutData;
+    const TDEAboutData *aboutData = &_aboutData;
     if (aboutData->programName().length()) {
         setProduct( aboutData->programName(), aboutData->version(),
                     TQString(), TQString() );
@@ -560,7 +560,7 @@ void KRadioAboutWidget::setAboutData(const KAboutData &_aboutData)
                                       0,0);
         }
 
-        TQLabel *label = new TQLabel(KAboutData::aboutTranslationTeam(),
+        TQLabel *label = new TQLabel(TDEAboutData::aboutTranslationTeam(),
                                    translatorPage);
         label->adjustSize();
         label->setMinimumSize(label->sizeHint());
diff --git a/kradio3/src/include/aboutwidget.h b/kradio3/src/include/aboutwidget.h
index 7cc0f76..43ee97f 100644
--- a/kradio3/src/include/aboutwidget.h
+++ b/kradio3/src/include/aboutwidget.h
@@ -34,7 +34,7 @@ class TQFrame;
 class KAboutContainer;
 class TQTabWidget;
 class TQVBoxLayout;
-class KAboutData;
+class TDEAboutData;
 
 #include <tqlabel.h>
 
@@ -92,11 +92,11 @@ class KRadioAboutWidget : public TQWidget
     };
 
   public:
-    KRadioAboutWidget(const KAboutData &abtData, int layoutType, TQWidget *parent = 0, char *name = 0);
+    KRadioAboutWidget(const TDEAboutData &abtData, int layoutType, TQWidget *parent = 0, char *name = 0);
     virtual void show( void );
     virtual TQSize sizeHint( void ) const;
 
-    void setAboutData(const KAboutData &abtData);
+    void setAboutData(const TDEAboutData &abtData);
 
     void setTitle( const TQString &title );
     void setImage( const TQString &fileName );
diff --git a/kradio3/src/kradioapp.cpp b/kradio3/src/kradioapp.cpp
index 78ee7e0..b7a9c5b 100644
--- a/kradio3/src/kradioapp.cpp
+++ b/kradio3/src/kradioapp.cpp
@@ -55,10 +55,10 @@ AboutPageInfo  KRadioAbout::createAboutPage ()
         "<P>"
     );
 
-    KAboutData aboutData("kradio", "KRadio",
+    TDEAboutData aboutData("kradio", "KRadio",
                          VERSION,
                          description,
-                         KAboutData::License_GPL,
+                         TDEAboutData::License_GPL,
                          "(c) 2002-2006 Martin Witte, Klas Kalass",
                          0,
                          "http://sourceforge.net/projects/kradio",
diff --git a/kradio3/src/main.cpp b/kradio3/src/main.cpp
index df83842..5378495 100644
--- a/kradio3/src/main.cpp
+++ b/kradio3/src/main.cpp
@@ -33,8 +33,8 @@ int main(int argc, char *argv[])
 {
     BlockProfiler  profiler_about("main::aboutdata");
 
-    KAboutData aboutData("kradio", I18N_NOOP("KRadio"),
-                         KRADIO_VERSION, "KRadio", KAboutData::License_GPL,
+    TDEAboutData aboutData("kradio", I18N_NOOP("KRadio"),
+                         KRADIO_VERSION, "KRadio", TDEAboutData::License_GPL,
                          "(c) 2002-2005 Martin Witte, Klas Kalass, Frank Schwanz",
                          0,
                          "http://sourceforge.net/projects/kradio",