Rename many classes and header files to avoid conflicts with KDE4

8 files changed, 18 insertions, 18 deletions

diff --git a/tderadio3/plugins/timecontrol/Makefile.am b/tderadio3/plugins/timecontrol/Makefile.am
index 0ac954f..edcda42 100644
--- a/tderadio3/plugins/timecontrol/Makefile.am
+++ b/tderadio3/plugins/timecontrol/Makefile.am
@@ -3,15 +3,15 @@ SUBDIRS = po icons .
 INCLUDES = $(all_includes)
 METASOURCES = AUTO
 
-libkradio_LTLIBRARIES = libtimecontrol.la
+libtderadio_LTLIBRARIES = libtimecontrol.la
 libtimecontrol_la_SOURCES = timecontrol-configuration.cpp \
                             timecontrol-configuration-ui.ui timecontrol.cpp
 libtimecontrol_la_LDFLAGS = -module -avoid-version $(KDE_RPATH) $(all_libraries)
 noinst_HEADERS =  timecontrol-configuration.h timecontrol.h
 
 #messages: rc.cpp
-#	$(XGETTEXT) *.cpp *.h -o po/kradio-timecontrol.pot
+#	$(XGETTEXT) *.cpp *.h -o po/tderadio-timecontrol.pot
 
 messages: rc.cpp
 	$(EXTRACTRC) *.rc *.ui >> rc.cpp
-	$(XGETTEXT) rc.cpp *.h *.cpp -o po/kradio-timecontrol.pot
+	$(XGETTEXT) rc.cpp *.h *.cpp -o po/tderadio-timecontrol.pot
diff --git a/tderadio3/plugins/timecontrol/icons/Makefile.am b/tderadio3/plugins/timecontrol/icons/Makefile.am
index b3f2583..354090a 100644
--- a/tderadio3/plugins/timecontrol/icons/Makefile.am
+++ b/tderadio3/plugins/timecontrol/icons/Makefile.am
@@ -1,2 +1,2 @@
 icons_ICON = AUTO
-iconsdir = $(kde_datadir)/kradio/icons
+iconsdir = $(kde_datadir)/tderadio/icons
diff --git a/tderadio3/plugins/timecontrol/po/Makefile.am b/tderadio3/plugins/timecontrol/po/Makefile.am
index 35fe6fd..26d490c 100644
--- a/tderadio3/plugins/timecontrol/po/Makefile.am
+++ b/tderadio3/plugins/timecontrol/po/Makefile.am
@@ -1,2 +1,2 @@
-PACKAGE = kradio-timecontrol
+PACKAGE = tderadio-timecontrol
 POFILES = AUTO
diff --git a/tderadio3/plugins/timecontrol/po/de.po b/tderadio3/plugins/timecontrol/po/de.po
index 71a84f6..cd4659b 100644
--- a/tderadio3/plugins/timecontrol/po/de.po
+++ b/tderadio3/plugins/timecontrol/po/de.po
@@ -1,5 +1,5 @@
 # translation of de.po to
-# translation of kradio-timecontrol.po to
+# translation of tderadio-timecontrol.po to
 # This file is put in the public domain.
 #
 # Ernst Martin Witte <emw@nocabal.de>, 2006.
diff --git a/tderadio3/plugins/timecontrol/po/ru.po b/tderadio3/plugins/timecontrol/po/ru.po
index 6f95f37..f3608ad 100644
--- a/tderadio3/plugins/timecontrol/po/ru.po
+++ b/tderadio3/plugins/timecontrol/po/ru.po
@@ -1,5 +1,5 @@
 # translation of ru.po to
-# translation of kradio-timecontrol.po to
+# translation of tderadio-timecontrol.po to
 # This file is put in the public domain.
 # Алексей Кузнецов <Alexey.Kouznetsov@GMail.com>, 2006.
 #
diff --git a/tderadio3/plugins/timecontrol/timecontrol-configuration-ui.ui b/tderadio3/plugins/timecontrol/timecontrol-configuration-ui.ui
index b240218..4d77f9f 100644
--- a/tderadio3/plugins/timecontrol/timecontrol-configuration-ui.ui
+++ b/tderadio3/plugins/timecontrol/timecontrol-configuration-ui.ui
@@ -393,7 +393,7 @@
                             <string>Start Playing</string>
                         </property>
                         <property name="pixmap">
-                            <pixmap>"kradio_muteoff"</pixmap>
+                            <pixmap>"tderadio_muteoff"</pixmap>
                         </property>
                     </item>
                     <item>
@@ -401,7 +401,7 @@
                             <string>Stop Playing</string>
                         </property>
                         <property name="pixmap">
-                            <pixmap>"kradio_muteon"</pixmap>
+                            <pixmap>"tderadio_muteon"</pixmap>
                         </property>
                     </item>
                     <item>
@@ -409,7 +409,7 @@
                             <string>Start Recording</string>
                         </property>
                         <property name="pixmap">
-                            <pixmap>"kradio_record"</pixmap>
+                            <pixmap>"tderadio_record"</pixmap>
                         </property>
                     </item>
                     <item>
@@ -417,7 +417,7 @@
                             <string>Stop Recording</string>
                         </property>
                         <property name="pixmap">
-                            <pixmap>"kradio_muteon"</pixmap>
+                            <pixmap>"tderadio_muteon"</pixmap>
                         </property>
                     </item>
                     <property name="name">
@@ -447,6 +447,6 @@
 <pixmapfunction>SmallIcon</pixmapfunction>
 <layoutdefaults spacing="6" margin="0"/>
 <includehints>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
 </includehints>
 </UI>
diff --git a/tderadio3/plugins/timecontrol/timecontrol-configuration.cpp b/tderadio3/plugins/timecontrol/timecontrol-configuration.cpp
index c72aa5e..24c3a04 100644
--- a/tderadio3/plugins/timecontrol/timecontrol-configuration.cpp
+++ b/tderadio3/plugins/timecontrol/timecontrol-configuration.cpp
@@ -28,7 +28,7 @@ using std::sort;
 #include <tqcheckbox.h>
 #include <tqpushbutton.h>
 
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <klocale.h>
 
 #include "../../src/include/stationlist.h"
diff --git a/tderadio3/plugins/timecontrol/timecontrol.cpp b/tderadio3/plugins/timecontrol/timecontrol.cpp
index 15f0bde..fee7c28 100644
--- a/tderadio3/plugins/timecontrol/timecontrol.cpp
+++ b/tderadio3/plugins/timecontrol/timecontrol.cpp
@@ -39,7 +39,7 @@ const char *AlarmTypeElement            = "type";
 ///////////////////////////////////////////////////////////////////////
 //// plugin library functions
 
-PLUGIN_LIBRARY_FUNCTIONS(TimeControl, "kradio-timecontrol", i18n("Time Control and Alarm Functions"));
+PLUGIN_LIBRARY_FUNCTIONS(TimeControl, "tderadio-timecontrol", i18n("Time Control and Alarm Functions"));
 
 ///////////////////////////////////////////////////////////////////////
 
@@ -267,13 +267,13 @@ ConfigPageInfo TimeControl::createConfigurationPage()
 {
     TimeControlConfiguration *conf = new TimeControlConfiguration(NULL);
     connectI(conf);
-    return ConfigPageInfo (conf, i18n("Alarms"), i18n("Setup Alarms"), "kradio_kalarm");
+    return ConfigPageInfo (conf, i18n("Alarms"), i18n("Setup Alarms"), "tderadio_kalarm");
 }
 
 
 AboutPageInfo TimeControl::createAboutPage()
 {
-/*    TDEAboutData aboutData("kradio",
+/*    TDEAboutData aboutData("tderadio",
                          NULL,
                          NULL,
                          I18N_NOOP("Time Control Plugin for TDERadio."
@@ -283,7 +283,7 @@ AboutPageInfo TimeControl::createAboutPage()
                          TDEAboutData::License_GPL,
                          "(c) 2002-2005 Martin Witte, Klas Kalass",
                          0,
-                         "http://sourceforge.net/projects/kradio",
+                         "http://sourceforge.net/projects/tderadio",
                          0);
     aboutData.addAuthor("Martin Witte",  "", "witte@kawo1.rwth-aachen.de");
     aboutData.addAuthor("Klas Kalass",   "", "klas.kalass@gmx.de");
@@ -292,7 +292,7 @@ AboutPageInfo TimeControl::createAboutPage()
               new TDERadioAboutWidget(aboutData, TDERadioAboutWidget::AbtTabbed),
               i18n("Alarms"),
               i18n("Time Control Plugin"),
-              "kradio_kalarm"
+              "tderadio_kalarm"
            );*/
     return AboutPageInfo();
 }