Rename KInstance and KAboutData to avoid conflicts with KDE4

11 files changed, 22 insertions, 22 deletions

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",