Rename many classes and header files to avoid conflicts with KDE4

6 files changed, 12 insertions, 12 deletions

diff --git a/tderadio3/plugins/oss-sound/Makefile.am b/tderadio3/plugins/oss-sound/Makefile.am
index ffdd5be..84d2fd1 100644
--- a/tderadio3/plugins/oss-sound/Makefile.am
+++ b/tderadio3/plugins/oss-sound/Makefile.am
@@ -3,7 +3,7 @@ SUBDIRS = po icons .
 INCLUDES = $(all_includes)
 METASOURCES = AUTO
 
-libkradio_LTLIBRARIES = liboss-sound.la
+libtderadio_LTLIBRARIES = liboss-sound.la
 liboss_sound_la_SOURCES = oss-sound.cpp oss-sound-configuration-ui.ui \
                           oss-sound-configuration.cpp
 liboss_sound_la_LDFLAGS = -module -avoid-version $(KDE_RPATH) $(all_libraries)
@@ -11,8 +11,8 @@ liboss_sound_la_LDFLAGS = -module -avoid-version $(KDE_RPATH) $(all_libraries)
 noinst_HEADERS = oss-sound.h oss-sound-configuration.h
 
 #messages: rc.cpp
-#	$(XGETTEXT) *.cpp *.h -o po/kradio-oss-sound.pot
+#	$(XGETTEXT) *.cpp *.h -o po/tderadio-oss-sound.pot
 
 messages: rc.cpp
 	$(EXTRACTRC) *.rc *.ui >> rc.cpp
-	$(XGETTEXT) rc.cpp *.h *.cpp -o po/kradio-oss-sound.pot
+	$(XGETTEXT) rc.cpp *.h *.cpp -o po/tderadio-oss-sound.pot
diff --git a/tderadio3/plugins/oss-sound/icons/Makefile.am b/tderadio3/plugins/oss-sound/icons/Makefile.am
index b3f2583..354090a 100644
--- a/tderadio3/plugins/oss-sound/icons/Makefile.am
+++ b/tderadio3/plugins/oss-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/oss-sound/oss-sound.cpp b/tderadio3/plugins/oss-sound/oss-sound.cpp
index 0c06f33..ac1aac4 100644
--- a/tderadio3/plugins/oss-sound/oss-sound.cpp
+++ b/tderadio3/plugins/oss-sound/oss-sound.cpp
@@ -35,7 +35,7 @@
 ///////////////////////////////////////////////////////////////////////
 //// plugin library functions
 
-PLUGIN_LIBRARY_FUNCTIONS(OSSSoundDevice, "kradio-oss-sound", i18n("Open Sound System (OSS) Support"));
+PLUGIN_LIBRARY_FUNCTIONS(OSSSoundDevice, "tderadio-oss-sound", i18n("Open Sound System (OSS) Support"));
 
 /////////////////////////////////////////////////////////////////////////////
 
@@ -171,20 +171,20 @@ ConfigPageInfo  OSSSoundDevice::createConfigurationPage()
     return ConfigPageInfo (conf,
                            i18n("OSS Sound"),
                            i18n("OSS Sound Device Options"),
-                           "kradio_oss");
+                           "tderadio_oss");
 }
 
 
 AboutPageInfo OSSSoundDevice::createAboutPage()
 {
-/*    TDEAboutData aboutData("kradio",
+/*    TDEAboutData aboutData("tderadio",
                          NULL,
                          NULL,
                          I18N_NOOP("OSS Sound Plugin for TDERadio"),
                          TDEAboutData::License_GPL,
                          "(c) 2004 Martin Witte",
                          0,
-                         "http://sourceforge.net/projects/kradio",
+                         "http://sourceforge.net/projects/tderadio",
                          0);
     aboutData.addAuthor("Martin Witte",  "", "witte@kawo1.rwth-aachen.de");
 
@@ -192,7 +192,7 @@ AboutPageInfo OSSSoundDevice::createAboutPage()
               new TDERadioAboutWidget(aboutData, TDERadioAboutWidget::AbtTabbed),
               i18n("OSS Sound"),
               i18n("OSS Sound"),
-              "kradio_oss_sound"
+              "tderadio_oss_sound"
            );
 */
     return AboutPageInfo();
diff --git a/tderadio3/plugins/oss-sound/po/Makefile.am b/tderadio3/plugins/oss-sound/po/Makefile.am
index d6cceda..daec2a5 100644
--- a/tderadio3/plugins/oss-sound/po/Makefile.am
+++ b/tderadio3/plugins/oss-sound/po/Makefile.am
@@ -1,2 +1,2 @@
-PACKAGE = kradio-oss-sound
+PACKAGE = tderadio-oss-sound
 POFILES = AUTO
diff --git a/tderadio3/plugins/oss-sound/po/de.po b/tderadio3/plugins/oss-sound/po/de.po
index 5d3ab49..a0ee831 100644
--- a/tderadio3/plugins/oss-sound/po/de.po
+++ b/tderadio3/plugins/oss-sound/po/de.po
@@ -1,5 +1,5 @@
 # translation of de.po to
-# translation of kradio-oss-sound.po to
+# translation of tderadio-oss-sound.po to
 # This file is put in the public domain.
 #
 # Ernst Martin Witte <emw@nocabal.de>, 2006.
diff --git a/tderadio3/plugins/oss-sound/po/ru.po b/tderadio3/plugins/oss-sound/po/ru.po
index a42e5ec..98472ba 100644
--- a/tderadio3/plugins/oss-sound/po/ru.po
+++ b/tderadio3/plugins/oss-sound/po/ru.po
@@ -1,5 +1,5 @@
 # translation of ru.po to
-# translation of kradio-oss-sound.po to
+# translation of tderadio-oss-sound.po to
 # This file is put in the public domain.
 # Алексей Кузнецов <Alexey.Kouznetsov@GMail.com>, 2006.
 #