Rename many classes and header files to avoid conflicts with KDE4

7 files changed, 19 insertions, 19 deletions

diff --git a/tderadio3/plugins/radio/Makefile.am b/tderadio3/plugins/radio/Makefile.am
index 2481b58..ffa9a6d 100644
--- a/tderadio3/plugins/radio/Makefile.am
+++ b/tderadio3/plugins/radio/Makefile.am
@@ -1,9 +1,9 @@
 SUBDIRS = po .
 
-INCLUDES = -I$(top_builddir)/kradio3/src -I$(top_srcdir)/kradio3 $(all_includes)
+INCLUDES = -I$(top_builddir)/tderadio3/src -I$(top_srcdir)/tderadio3 $(all_includes)
 METASOURCES = AUTO
 
-libkradio_LTLIBRARIES = libradio.la
+libtderadio_LTLIBRARIES = libradio.la
 libradio_la_SOURCES = radio-configuration.cpp radio-configuration-ui.ui \
                       radio.cpp
 libradio_la_LDFLAGS = -module -avoid-version $(KDE_RPATH) $(all_libraries)
@@ -11,8 +11,8 @@ libradio_la_LDFLAGS = -module -avoid-version $(KDE_RPATH) $(all_libraries)
 noinst_HEADERS =  radio-configuration.h radio.h
 
 #messages: rc.cpp
-#	$(XGETTEXT) *.cpp *.h -o po/kradio-radio.pot
+#	$(XGETTEXT) *.cpp *.h -o po/tderadio-radio.pot
 
 messages: rc.cpp
 	$(EXTRACTRC) *.rc *.ui >> rc.cpp
-	$(XGETTEXT) rc.cpp *.h *.cpp -o po/kradio-radio.pot
+	$(XGETTEXT) rc.cpp *.h *.cpp -o po/tderadio-radio.pot
diff --git a/tderadio3/plugins/radio/po/Makefile.am b/tderadio3/plugins/radio/po/Makefile.am
index 9fedd9c..b5baba9 100644
--- a/tderadio3/plugins/radio/po/Makefile.am
+++ b/tderadio3/plugins/radio/po/Makefile.am
@@ -1,2 +1,2 @@
-PACKAGE = kradio-radio
+PACKAGE = tderadio-radio
 POFILES = AUTO
diff --git a/tderadio3/plugins/radio/po/de.po b/tderadio3/plugins/radio/po/de.po
index 73c7a6e..cdc0a86 100644
--- a/tderadio3/plugins/radio/po/de.po
+++ b/tderadio3/plugins/radio/po/de.po
@@ -1,5 +1,5 @@
 # translation of de.po to
-# translation of kradio-radio.po to
+# translation of tderadio-radio.po to
 # This file is put in the public domain.
 #
 # Ernst Martin Witte <[email protected]>, 2006.
@@ -123,7 +123,7 @@ msgstr "Letzte Änderung"
 #, no-c-format
 msgid ""
 "<p align=\"center\">Click on the link below to contribute this station "
-"preset file to the kradio project.</p>"
+"preset file to the tderadio project.</p>"
 msgstr ""
 "<p align=\"center\">Klicke auf den folgenden Link um mit deinen "
 "Senderinformationen zum TDERadio-Projekt beizutragen.</p>"
diff --git a/tderadio3/plugins/radio/po/ru.po b/tderadio3/plugins/radio/po/ru.po
index 2174203..3a4f7a0 100644
--- a/tderadio3/plugins/radio/po/ru.po
+++ b/tderadio3/plugins/radio/po/ru.po
@@ -1,5 +1,5 @@
 # translation of ru.po to
-# translation of kradio-radio.po to
+# translation of tderadio-radio.po to
 # This file is put in the public domain.
 # Алексей Кузнецов <[email protected]>, 2006.
 #
@@ -123,7 +123,7 @@ msgstr "Последнее изменение"
 #, no-c-format
 msgid ""
 "<p align=\"center\">Click on the link below to contribute this station "
-"preset file to the kradio project.</p>"
+"preset file to the tderadio project.</p>"
 msgstr ""
 "<p align=\"center\"> Чтобы добавить этот файл в проект TDERadio, щёлкните по "
 "ссылке ниже</p>"
diff --git a/tderadio3/plugins/radio/radio-configuration-ui.ui b/tderadio3/plugins/radio/radio-configuration-ui.ui
index 2ea4d33..5c6f060 100644
--- a/tderadio3/plugins/radio/radio-configuration-ui.ui
+++ b/tderadio3/plugins/radio/radio-configuration-ui.ui
@@ -695,7 +695,7 @@
                             <cstring>textLabel1</cstring>
                         </property>
                         <property name="text">
-                            <string>&lt;p align="center"&gt;Click on the link below to contribute this station preset file to the kradio project.&lt;/p&gt;</string>
+                            <string>&lt;p align="center"&gt;Click on the link below to contribute this station preset file to the tderadio project.&lt;/p&gt;</string>
                         </property>
                         <property name="alignment">
                             <set>WordBreak|AlignCenter</set>
diff --git a/tderadio3/plugins/radio/radio-configuration.cpp b/tderadio3/plugins/radio/radio-configuration.cpp
index eda1083..9f23413 100644
--- a/tderadio3/plugins/radio/radio-configuration.cpp
+++ b/tderadio3/plugins/radio/radio-configuration.cpp
@@ -29,7 +29,7 @@
 #include <math.h>
 
 #include <tqlistbox.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <tqdatetimeedit.h>
 #include <tqlineedit.h>
 #include <tqlabel.h>
@@ -446,7 +446,7 @@ void RadioConfiguration::slotActivateStation(int idx)
 
 void RadioConfiguration::slotLoadPresets()
 {
-    KFileDialog fd(locate("data", "kradio/presets/"),
+    KFileDialog fd(locate("data", "tderadio/presets/"),
                    ("*.krp|" + i18n("TDERadio Preset Files")).ascii(),
                    this,
                    i18n("Preset File Selection").ascii(),
diff --git a/tderadio3/plugins/radio/radio.cpp b/tderadio3/plugins/radio/radio.cpp
index 56280e3..ab1a553 100644
--- a/tderadio3/plugins/radio/radio.cpp
+++ b/tderadio3/plugins/radio/radio.cpp
@@ -31,14 +31,14 @@
 ///////////////////////////////////////////////////////////////////////
 //// plugin library functions
 
-PLUGIN_LIBRARY_FUNCTIONS(Radio, "kradio-radio", i18n("Central Radio Device Multiplexer"));
+PLUGIN_LIBRARY_FUNCTIONS(Radio, "tderadio-radio", i18n("Central Radio Device Multiplexer"));
 
 /////////////////////////////////////////////////////////////////////////////
 
 Radio::Radio(const TQString &name)
   : PluginBase(name, i18n("Radio Multiplexer Plugin")),
     IRadioDeviceClient(-1),
-    m_presetFile(locateLocal("data", "kradio/stations.krp")),
+    m_presetFile(locateLocal("data", "tderadio/stations.krp")),
     m_activeDevice (NULL)
 {
 }
@@ -95,7 +95,7 @@ void Radio::restoreState (TDEConfig *config)
                                      TQString());
     bool first_restore = false;
     if (m_presetFile.isNull() || m_presetFile.length() == 0) {
-        m_presetFile = locateLocal("data", "kradio/stations.krp");
+        m_presetFile = locateLocal("data", "tderadio/stations.krp");
         first_restore = true;
     }
 
@@ -115,21 +115,21 @@ ConfigPageInfo Radio::createConfigurationPage()
         conf,
         i18n("Radio Stations"),
         i18n("Setup Radio Stations"),
-        "kradio"
+        "tderadio"
     );
 }
 
 
 AboutPageInfo Radio::createAboutPage()
 {
-/*    TDEAboutData aboutData("kradio",
+/*    TDEAboutData aboutData("tderadio",
                          NULL,
                          NULL,
                          I18N_NOOP("Radio Device Multiplexer and Station Management for TDERadio"),
                          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",  "", "[email protected]");
     aboutData.addAuthor("Klas Kalass",   "", "[email protected]");
@@ -138,7 +138,7 @@ AboutPageInfo Radio::createAboutPage()
               new TDERadioAboutWidget(aboutData, TDERadioAboutWidget::AbtTabbed),
               i18n("Device and Station Management"),
               i18n("Radio Device Multiplexer and Station Management"),
-              "kradio"
+              "tderadio"
            );
 */
     return AboutPageInfo();