Rename many classes and header files to avoid conflicts with KDE4

7 files changed, 32 insertions, 32 deletions

diff --git a/tderadio3/presets/sweden/Makefile.am b/tderadio3/presets/sweden/Makefile.am
index 7942f73..4532929 100644
--- a/tderadio3/presets/sweden/Makefile.am
+++ b/tderadio3/presets/sweden/Makefile.am
@@ -2,18 +2,18 @@ SUBDIRS =
 EXTRA_DIST = "gothenburg.krp" "linkoeping.krp" "oestersunds-kommun.krp" "stockholm.2.krp" "stockholm.krp" "vaxholm.krp"
 
 install-data-local:
-	$(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/sweden/"
-	$(INSTALL_DATA) "$(srcdir)/gothenburg.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/sweden/gothenburg.krp"
-	$(INSTALL_DATA) "$(srcdir)/linkoeping.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/sweden/linkoeping.krp"
-	$(INSTALL_DATA) "$(srcdir)/oestersunds-kommun.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/sweden/oestersunds-kommun.krp"
-	$(INSTALL_DATA) "$(srcdir)/stockholm.2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/sweden/stockholm.2.krp"
-	$(INSTALL_DATA) "$(srcdir)/stockholm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/sweden/stockholm.krp"
-	$(INSTALL_DATA) "$(srcdir)/vaxholm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/sweden/vaxholm.krp"
+	$(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/tderadio/presets/sweden/"
+	$(INSTALL_DATA) "$(srcdir)/gothenburg.krp" "$(DESTDIR)$(kde_datadir)/tderadio/presets/sweden/gothenburg.krp"
+	$(INSTALL_DATA) "$(srcdir)/linkoeping.krp" "$(DESTDIR)$(kde_datadir)/tderadio/presets/sweden/linkoeping.krp"
+	$(INSTALL_DATA) "$(srcdir)/oestersunds-kommun.krp" "$(DESTDIR)$(kde_datadir)/tderadio/presets/sweden/oestersunds-kommun.krp"
+	$(INSTALL_DATA) "$(srcdir)/stockholm.2.krp" "$(DESTDIR)$(kde_datadir)/tderadio/presets/sweden/stockholm.2.krp"
+	$(INSTALL_DATA) "$(srcdir)/stockholm.krp" "$(DESTDIR)$(kde_datadir)/tderadio/presets/sweden/stockholm.krp"
+	$(INSTALL_DATA) "$(srcdir)/vaxholm.krp" "$(DESTDIR)$(kde_datadir)/tderadio/presets/sweden/vaxholm.krp"
 
 uninstall-local:
-	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/sweden/gothenburg.krp"
-	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/sweden/linkoeping"
-	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/sweden/oestersunds-kommun.krp"
-	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/sweden/stockholm.2.krp"
-	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/sweden/stockholm.krp"
-	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/sweden/vaxholm.krp"
+	-rm -f "$(DESTDIR)$(kde_datadir)/tderadio/presets/sweden/gothenburg.krp"
+	-rm -f "$(DESTDIR)$(kde_datadir)/tderadio/presets/sweden/linkoeping"
+	-rm -f "$(DESTDIR)$(kde_datadir)/tderadio/presets/sweden/oestersunds-kommun.krp"
+	-rm -f "$(DESTDIR)$(kde_datadir)/tderadio/presets/sweden/stockholm.2.krp"
+	-rm -f "$(DESTDIR)$(kde_datadir)/tderadio/presets/sweden/stockholm.krp"
+	-rm -f "$(DESTDIR)$(kde_datadir)/tderadio/presets/sweden/vaxholm.krp"
diff --git a/tderadio3/presets/sweden/gothenburg.krp b/tderadio3/presets/sweden/gothenburg.krp
index 5ee6e8d..18c27f0 100644
--- a/tderadio3/presets/sweden/gothenburg.krp
+++ b/tderadio3/presets/sweden/gothenburg.krp
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<kradiorc>
+<tderadiorc>
 	<stationlist>
-		<format>kradio-1.0</format>
+		<format>tderadio-1.0</format>
 		<info>
 			<maintainer>Fredrik Sörensson, &lt;sorn73@yahoo.com&gt;</maintainer>
 			<changed>2003-05-17T22:50:45</changed>
@@ -107,4 +107,4 @@
 			<volumepreset>-1</volumepreset>
 		</FrequencyRadioStation>
 	</stationlist>
-</kradiorc>
+</tderadiorc>
diff --git a/tderadio3/presets/sweden/linkoeping.krp b/tderadio3/presets/sweden/linkoeping.krp
index 842f1d4..c5759b1 100644
--- a/tderadio3/presets/sweden/linkoeping.krp
+++ b/tderadio3/presets/sweden/linkoeping.krp
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<kradiorc>
+<tderadiorc>
 	<stationlist>
-		<format>kradio-1.0</format>
+		<format>tderadio-1.0</format>
 		<info>
-			<creator>kradio-snapshot_2005_11_27</creator>
+			<creator>tderadio-snapshot_2005_11_27</creator>
 			<maintainer>Magnus Holmgren &lt;magnus@kibibyte.se&gt;</maintainer>
 			<changed>2006-10-19T16:57:24</changed>
 			<country>Sweden</country>
@@ -84,4 +84,4 @@
 			<frequency>103.2</frequency>
 		</FrequencyRadioStation>
 	</stationlist>
-</kradiorc>
+</tderadiorc>
diff --git a/tderadio3/presets/sweden/oestersunds-kommun.krp b/tderadio3/presets/sweden/oestersunds-kommun.krp
index 027fa78..2c143f4 100644
--- a/tderadio3/presets/sweden/oestersunds-kommun.krp
+++ b/tderadio3/presets/sweden/oestersunds-kommun.krp
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<kradiorc>
+<tderadiorc>
 	<stationlist>
-		<format>kradio-1.0</format>
+		<format>tderadio-1.0</format>
 		<info>
 			<maintainer>martin, maki@brunflo.info</maintainer>
 			<changed>2003-04-03T13:20:06</changed>
@@ -59,7 +59,7 @@
 			<volumepreset>-1</volumepreset>
 		</FrequencyRadioStation>
 	</stationlist>
-</kradiorc>
+</tderadiorc>
 -- 
 http://www.brunflo.info
 <><><>
diff --git a/tderadio3/presets/sweden/stockholm.2.krp b/tderadio3/presets/sweden/stockholm.2.krp
index 7efd39e..a5c24b9 100644
--- a/tderadio3/presets/sweden/stockholm.2.krp
+++ b/tderadio3/presets/sweden/stockholm.2.krp
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<kradiorc>
+<tderadiorc>
 	<stationlist>
-		<format>kradio-1.0</format>
+		<format>tderadio-1.0</format>
 		<info>
 			<maintainer>Dag Öhlin, &lt;d.ohlin@telia.com&gt;</maintainer>
 			<changed>2004-07-12T01:34:53</changed>
@@ -347,4 +347,4 @@
 			<volumepreset>-1</volumepreset>
 		</FrequencyRadioStation>
 	</stationlist>
-</kradiorc>
+</tderadiorc>
diff --git a/tderadio3/presets/sweden/stockholm.krp b/tderadio3/presets/sweden/stockholm.krp
index 2d236b4..5b7d1ce 100644
--- a/tderadio3/presets/sweden/stockholm.krp
+++ b/tderadio3/presets/sweden/stockholm.krp
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<kradiorc>
+<tderadiorc>
 	<stationlist>
-		<format>kradio-1.0</format>
+		<format>tderadio-1.0</format>
 		<info>
 			<maintainer>Erik Erlandsson &lt;erik.erlandsson@nilhe.se&gt;</maintainer>
 			<changed>2004-01-25T23:56:54</changed>
@@ -128,7 +128,7 @@
 			<frequency>101.926</frequency>
 		</FrequencyRadioStation>
 	</stationlist>
-</kradiorc>
+</tderadiorc>
 
 
 
diff --git a/tderadio3/presets/sweden/vaxholm.krp b/tderadio3/presets/sweden/vaxholm.krp
index e4a55ef..315dfc9 100644
--- a/tderadio3/presets/sweden/vaxholm.krp
+++ b/tderadio3/presets/sweden/vaxholm.krp
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<kradiorc>
+<tderadiorc>
 	<stationlist>
-		<format>kradio-1.0</format>
+		<format>tderadio-1.0</format>
 		<info>
 			<maintainer>Jostein Chr. Andersen, &lt;jostein@josander.net&gt;</maintainer>
 			<changed>2004-02-19T09:05:05</changed>
@@ -131,7 +131,7 @@
 			<frequency>107.5</frequency>
 		</FrequencyRadioStation>
 	</stationlist>
-</kradiorc>
+</tderadiorc>