Rename many classes and header files to avoid conflicts with KDE4

6 files changed, 12 insertions, 12 deletions

diff --git a/tderadio3/plugins/alsa-sound/Makefile.am b/tderadio3/plugins/alsa-sound/Makefile.am
index a00e32c..dfc2b0b 100644
--- a/tderadio3/plugins/alsa-sound/Makefile.am
+++ b/tderadio3/plugins/alsa-sound/Makefile.am
@@ -3,7 +3,7 @@ SUBDIRS = po icons .
 INCLUDES = $(all_includes)
 METASOURCES = AUTO
 
-libkradio_LTLIBRARIES = libalsa-sound.la
+libtderadio_LTLIBRARIES = libalsa-sound.la
 libalsa_sound_la_LDFLAGS = -module -avoid-version $(KDE_RPATH) $(all_libraries)
 noinst_HEADERS = alsa-sound.h alsa-sound-configuration.h alsa-mixer-element.h \
 		alsa-config-mixer-setting.h
@@ -13,8 +13,8 @@ libalsa_sound_la_SOURCES = alsa-sound.cpp alsa-sound-configuration-ui.ui \
 libalsa_sound_la_LIBADD = $(LIB_ALSA)
 
 #messages: rc.cpp
-#	$(XGETTEXT) *.cpp *.h -o po/kradio-alsa-sound.pot
+#	$(XGETTEXT) *.cpp *.h -o po/tderadio-alsa-sound.pot
 
 messages: rc.cpp
 	$(EXTRACTRC) *.rc *.ui >> rc.cpp
-	$(XGETTEXT) rc.cpp *.h *.cpp -o po/kradio-alsa-sound.pot
+	$(XGETTEXT) rc.cpp *.h *.cpp -o po/tderadio-alsa-sound.pot
diff --git a/tderadio3/plugins/alsa-sound/alsa-sound.cpp b/tderadio3/plugins/alsa-sound/alsa-sound.cpp
index 34061a8..4133983 100644
--- a/tderadio3/plugins/alsa-sound/alsa-sound.cpp
+++ b/tderadio3/plugins/alsa-sound/alsa-sound.cpp
@@ -37,7 +37,7 @@
 ///////////////////////////////////////////////////////////////////////
 //// plugin library functions
 
-PLUGIN_LIBRARY_FUNCTIONS(AlsaSoundDevice, "kradio-alsa-sound", i18n("Advanced Linux Sound Architecture (ALSA) Support"));
+PLUGIN_LIBRARY_FUNCTIONS(AlsaSoundDevice, "tderadio-alsa-sound", i18n("Advanced Linux Sound Architecture (ALSA) Support"));
 
 /////////////////////////////////////////////////////////////////////////////
 
@@ -195,20 +195,20 @@ ConfigPageInfo  AlsaSoundDevice::createConfigurationPage()
     return ConfigPageInfo (conf,
                            i18n("ALSA Sound"),
                            i18n("ALSA Sound Device Options"),
-                           "kradio_alsa2");
+                           "tderadio_alsa2");
 }
 
 
 AboutPageInfo AlsaSoundDevice::createAboutPage()
 {
-/*    TDEAboutData aboutData("kradio",
+/*    TDEAboutData aboutData("tderadio",
                          NULL,
                          NULL,
                          I18N_NOOP("ALSA Sound Plugin for TDERadio"),
                          TDEAboutData::License_GPL,
                          "(c) 2005 Martin Witte",
                          0,
-                         "http://sourceforge.net/projects/kradio",
+                         "http://sourceforge.net/projects/tderadio",
                          0);
     aboutData.addAuthor("Martin Witte",  "", "witte@kawo1.rwth-aachen.de");
 
@@ -216,7 +216,7 @@ AboutPageInfo AlsaSoundDevice::createAboutPage()
               new TDERadioAboutWidget(aboutData, TDERadioAboutWidget::AbtTabbed),
               i18n("ALSA Sound"),
               i18n("ALSA Sound"),
-              "kradio_alsa_sound"
+              "tderadio_alsa_sound"
            );
 */
     return AboutPageInfo();
diff --git a/tderadio3/plugins/alsa-sound/icons/Makefile.am b/tderadio3/plugins/alsa-sound/icons/Makefile.am
index b3f2583..354090a 100644
--- a/tderadio3/plugins/alsa-sound/icons/Makefile.am
+++ b/tderadio3/plugins/alsa-sound/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/alsa-sound/po/Makefile.am b/tderadio3/plugins/alsa-sound/po/Makefile.am
index 9de3420..ca0f4d9 100644
--- a/tderadio3/plugins/alsa-sound/po/Makefile.am
+++ b/tderadio3/plugins/alsa-sound/po/Makefile.am
@@ -1,3 +1,3 @@
 
-PACKAGE = kradio-alsa-sound
+PACKAGE = tderadio-alsa-sound
 POFILES = AUTO
diff --git a/tderadio3/plugins/alsa-sound/po/de.po b/tderadio3/plugins/alsa-sound/po/de.po
index 194474a..d0c23d4 100644
--- a/tderadio3/plugins/alsa-sound/po/de.po
+++ b/tderadio3/plugins/alsa-sound/po/de.po
@@ -1,5 +1,5 @@
 # translation of de.po to
-# translation of kradio-alsa-sound.po to
+# translation of tderadio-alsa-sound.po to
 # This file is put in the public domain.
 #
 # Ernst Martin Witte <emw@nocabal.de>, 2006.
diff --git a/tderadio3/plugins/alsa-sound/po/ru.po b/tderadio3/plugins/alsa-sound/po/ru.po
index ff488ce..ebb192d 100644
--- a/tderadio3/plugins/alsa-sound/po/ru.po
+++ b/tderadio3/plugins/alsa-sound/po/ru.po
@@ -1,5 +1,5 @@
 # translation of ru.po to
-# translation of kradio-alsa-sound.po to
+# translation of tderadio-alsa-sound.po to
 # This file is put in the public domain.
 # Алексей Кузнецов <Alexey.Kouznetsov@GMail.com>, 2006.
 #