Rename many classes and header files to avoid conflicts with KDE4

6 files changed, 11 insertions, 11 deletions

diff --git a/tderadio3/plugins/timeshifter/Makefile.am b/tderadio3/plugins/timeshifter/Makefile.am
index 23da794..38d99cb 100644
--- a/tderadio3/plugins/timeshifter/Makefile.am
+++ b/tderadio3/plugins/timeshifter/Makefile.am
@@ -3,7 +3,7 @@ SUBDIRS = po icons .
 INCLUDES = $(all_includes)
 METASOURCES = AUTO
 
-libkradio_LTLIBRARIES = libtimeshifter.la
+libtderadio_LTLIBRARIES = libtimeshifter.la
 libtimeshifter_la_SOURCES = timeshifter.cpp timeshifter-configuration-ui.ui \
                             timeshifter-configuration.cpp
 libtimeshifter_la_LDFLAGS = -module -avoid-version $(KDE_RPATH) $(all_libraries)
@@ -11,8 +11,8 @@ libtimeshifter_la_LDFLAGS = -module -avoid-version $(KDE_RPATH) $(all_libraries)
 noinst_HEADERS = timeshifter.h timeshifter-configuration.h
 
 #messages: rc.cpp
-#	$(XGETTEXT) *.cpp *.h -o po/kradio-timeshifter.pot
+#	$(XGETTEXT) *.cpp *.h -o po/tderadio-timeshifter.pot
 
 messages: rc.cpp
 	$(EXTRACTRC) *.rc *.ui >> rc.cpp
-	$(XGETTEXT) rc.cpp *.h *.cpp -o po/kradio-timeshifter.pot
+	$(XGETTEXT) rc.cpp *.h *.cpp -o po/tderadio-timeshifter.pot
diff --git a/tderadio3/plugins/timeshifter/icons/Makefile.am b/tderadio3/plugins/timeshifter/icons/Makefile.am
index b3f2583..354090a 100644
--- a/tderadio3/plugins/timeshifter/icons/Makefile.am
+++ b/tderadio3/plugins/timeshifter/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/timeshifter/po/Makefile.am b/tderadio3/plugins/timeshifter/po/Makefile.am
index 276fe4b..0df80ff 100644
--- a/tderadio3/plugins/timeshifter/po/Makefile.am
+++ b/tderadio3/plugins/timeshifter/po/Makefile.am
@@ -1,3 +1,3 @@
 
-PACKAGE = kradio-timeshifter
+PACKAGE = tderadio-timeshifter
 POFILES = AUTO
diff --git a/tderadio3/plugins/timeshifter/po/de.po b/tderadio3/plugins/timeshifter/po/de.po
index 66806f9..3908a61 100644
--- a/tderadio3/plugins/timeshifter/po/de.po
+++ b/tderadio3/plugins/timeshifter/po/de.po
@@ -1,5 +1,5 @@
 # translation of de.po to
-# translation of kradio-timeshifter.po to
+# translation of tderadio-timeshifter.po to
 # This file is put in the public domain.
 #
 # Ernst Martin Witte <[email protected]>, 2006.
diff --git a/tderadio3/plugins/timeshifter/po/ru.po b/tderadio3/plugins/timeshifter/po/ru.po
index 1f692e3..7af2c89 100644
--- a/tderadio3/plugins/timeshifter/po/ru.po
+++ b/tderadio3/plugins/timeshifter/po/ru.po
@@ -1,5 +1,5 @@
 # translation of ru.po to
-# translation of kradio-timeshifter.po to
+# translation of tderadio-timeshifter.po to
 # This file is put in the public domain.
 # Алексей Кузнецов <[email protected]>, 2006.
 #
diff --git a/tderadio3/plugins/timeshifter/timeshifter.cpp b/tderadio3/plugins/timeshifter/timeshifter.cpp
index f5b3d65..a46175c 100644
--- a/tderadio3/plugins/timeshifter/timeshifter.cpp
+++ b/tderadio3/plugins/timeshifter/timeshifter.cpp
@@ -28,13 +28,13 @@
 
 ///////////////////////////////////////////////////////////////////////
 
-PLUGIN_LIBRARY_FUNCTIONS(TimeShifter, "kradio-timeshifter", i18n("TimeShift Support"));
+PLUGIN_LIBRARY_FUNCTIONS(TimeShifter, "tderadio-timeshifter", i18n("TimeShift Support"));
 
 ///////////////////////////////////////////////////////////////////////
 
 TimeShifter::TimeShifter (const TQString &name)
     : PluginBase(name, i18n("TimeShifter Plugin")),
-      m_TempFileName("/tmp/kradio-timeshifter-tempfile"),
+      m_TempFileName("/tmp/tderadio-timeshifter-tempfile"),
       m_TempFileMaxSize(256*1024*1024),
       m_PlaybackMixerID(TQString()),
       m_PlaybackMixerChannel("PCM"),
@@ -100,7 +100,7 @@ void   TimeShifter::restoreState (TDEConfig *config)
 {
     config->setGroup(TQString("timeshifter-") + name());
 
-    TQString  fname =               config->readEntry("temp-file-name", "/tmp/kradio-timeshifter-tempfile");
+    TQString  fname =               config->readEntry("temp-file-name", "/tmp/tderadio-timeshifter-tempfile");
     TQ_UINT64 fsize = 1024 * 1024 * config->readNumEntry("max-file-size",  256);
 
     TQString mixerID = config->readEntry ("PlaybackMixerID", TQString());
@@ -120,7 +120,7 @@ ConfigPageInfo  TimeShifter::createConfigurationPage()
     return ConfigPageInfo (conf,
                            i18n("Timeshifter"),
                            i18n("Timeshifter Options"),
-                           "kradio_pause");
+                           "tderadio_pause");
 }
 
 AboutPageInfo   TimeShifter::createAboutPage()