Rename many classes and header files to avoid conflicts with KDE4

7 files changed, 13 insertions, 13 deletions

diff --git a/tderadio3/plugins/gui-quickbar/Makefile.am b/tderadio3/plugins/gui-quickbar/Makefile.am
index 09c58ee..8491914 100644
--- a/tderadio3/plugins/gui-quickbar/Makefile.am
+++ b/tderadio3/plugins/gui-quickbar/Makefile.am
@@ -1,9 +1,9 @@
 SUBDIRS = po .
 
-INCLUDES = -I$(top_builddir)/kradio3/src $(all_includes)
+INCLUDES = -I$(top_builddir)/tderadio3/src $(all_includes)
 METASOURCES = AUTO
 
-libkradio_LTLIBRARIES = libquickbar.la
+libtderadio_LTLIBRARIES = libquickbar.la
 libquickbar_la_SOURCES = buttonflowlayout.cpp quickbar.cpp \
                          quickbar-configuration.cpp
 libquickbar_la_LDFLAGS = -module -avoid-version $(KDE_RPATH) $(all_libraries)
@@ -11,8 +11,8 @@ libquickbar_la_LDFLAGS = -module -avoid-version $(KDE_RPATH) $(all_libraries)
 noinst_HEADERS =  buttonflowlayout.h quickbar-configuration.h quickbar.h
 
 #messages: rc.cpp
-#	$(XGETTEXT) *.cpp *.h -o po/kradio-gui-quickbar.pot
+#	$(XGETTEXT) *.cpp *.h -o po/tderadio-gui-quickbar.pot
 
 messages: rc.cpp
 	$(EXTRACTRC) *.rc *.ui >> rc.cpp
-	$(XGETTEXT) rc.cpp *.h *.cpp -o po/kradio-gui-quickbar.pot
+	$(XGETTEXT) rc.cpp *.h *.cpp -o po/tderadio-gui-quickbar.pot
diff --git a/tderadio3/plugins/gui-quickbar/buttonflowlayout.cpp b/tderadio3/plugins/gui-quickbar/buttonflowlayout.cpp
index 5d4ec18..45c19d5 100644
--- a/tderadio3/plugins/gui-quickbar/buttonflowlayout.cpp
+++ b/tderadio3/plugins/gui-quickbar/buttonflowlayout.cpp
@@ -10,7 +10,7 @@
 **
 *****************************************************************************/
 /**
-   Modified 2002 by Klas Kalass ([email protected]) for kradio
+   Modified 2002 by Klas Kalass ([email protected]) for tderadio
  */
 
 #include <kdebug.h>
diff --git a/tderadio3/plugins/gui-quickbar/buttonflowlayout.h b/tderadio3/plugins/gui-quickbar/buttonflowlayout.h
index 2cb8444..f092a74 100644
--- a/tderadio3/plugins/gui-quickbar/buttonflowlayout.h
+++ b/tderadio3/plugins/gui-quickbar/buttonflowlayout.h
@@ -12,7 +12,7 @@
 **
 *****************************************************************************/
 /**
-   Modified 2002 by Klas Kalass ([email protected]) for kradio
+   Modified 2002 by Klas Kalass ([email protected]) for tderadio
  */
 #ifndef BUTTONFLOWLAYOUT_H
 #define BUTTONFLOWLAYOUT_H
diff --git a/tderadio3/plugins/gui-quickbar/po/Makefile.am b/tderadio3/plugins/gui-quickbar/po/Makefile.am
index fbee5b4..1d1d306 100644
--- a/tderadio3/plugins/gui-quickbar/po/Makefile.am
+++ b/tderadio3/plugins/gui-quickbar/po/Makefile.am
@@ -1,2 +1,2 @@
-PACKAGE = kradio-gui-quickbar
+PACKAGE = tderadio-gui-quickbar
 POFILES = AUTO
diff --git a/tderadio3/plugins/gui-quickbar/po/de.po b/tderadio3/plugins/gui-quickbar/po/de.po
index 9ac8533..5580537 100644
--- a/tderadio3/plugins/gui-quickbar/po/de.po
+++ b/tderadio3/plugins/gui-quickbar/po/de.po
@@ -1,5 +1,5 @@
 # translation of de.po to
-# translation of kradio-gui-quickbar.po to
+# translation of tderadio-gui-quickbar.po to
 # This file is put in the public domain.
 #
 # Ernst Martin Witte <[email protected]>, 2006.
diff --git a/tderadio3/plugins/gui-quickbar/po/ru.po b/tderadio3/plugins/gui-quickbar/po/ru.po
index 7742fde..fb462d0 100644
--- a/tderadio3/plugins/gui-quickbar/po/ru.po
+++ b/tderadio3/plugins/gui-quickbar/po/ru.po
@@ -1,5 +1,5 @@
 # translation of ru.po to
-# translation of kradio-gui-quickbar.po to
+# translation of tderadio-gui-quickbar.po to
 # This file is put in the public domain.
 # Алексей Кузнецов <[email protected]>, 2006.
 #
diff --git a/tderadio3/plugins/gui-quickbar/quickbar.cpp b/tderadio3/plugins/gui-quickbar/quickbar.cpp
index e5ee743..c2a070a 100644
--- a/tderadio3/plugins/gui-quickbar/quickbar.cpp
+++ b/tderadio3/plugins/gui-quickbar/quickbar.cpp
@@ -20,7 +20,7 @@
 #include <tqhbuttongroup.h>
 #include <tqvbuttongroup.h>
 
-#include <ktoolbarbutton.h>
+#include <tdetoolbarbutton.h>
 #include <twin.h>
 #include <klocale.h>
 #include <kglobal.h>
@@ -39,7 +39,7 @@
 ///////////////////////////////////////////////////////////////////////
 //// plugin library functions
 
-PLUGIN_LIBRARY_FUNCTIONS(QuickBar, "kradio-gui-quickbar", i18n("Radio Station Quick Selection Toolbar"));
+PLUGIN_LIBRARY_FUNCTIONS(QuickBar, "tderadio-gui-quickbar", i18n("Radio Station Quick Selection Toolbar"));
 
 /////////////////////////////////////////////////////////////////////////////
 
@@ -145,14 +145,14 @@ ConfigPageInfo QuickBar::createConfigurationPage()
 
 AboutPageInfo QuickBar::createAboutPage()
 {
-/*    TDEAboutData aboutData("kradio",
+/*    TDEAboutData aboutData("tderadio",
                          NULL,
                          NULL,
                          I18N_NOOP("Quickback 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]");