Rename many classes and header files to avoid conflicts with KDE4

13 files changed, 64 insertions, 64 deletions

diff --git a/tderadio3/presets/netherlands/Makefile.am b/tderadio3/presets/netherlands/Makefile.am
index e304d50..be86795 100644
--- a/tderadio3/presets/netherlands/Makefile.am
+++ b/tderadio3/presets/netherlands/Makefile.am
@@ -2,30 +2,30 @@ SUBDIRS =
 EXTRA_DIST = "alphen-aan-den-rijn-cable.krp" "amersfoort-cable.krp" "amsterdam-cable-2.krp" "amsterdam-cable.krp" "arnhem-cable.krp" "ede.krp" "enschede-cable.krp" "groningen.krp" "ijhorst.krp" "rotterdam-cable.krp" "tegelen-cable.krp" "the-hague-antenna.krp"
 
 install-data-local:
-	$(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/"
-	$(INSTALL_DATA) "$(srcdir)/alphen-aan-den-rijn-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/alphen-aan-den-rijn-cable.krp"
-	$(INSTALL_DATA) "$(srcdir)/amersfoort-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/amersfoort-cable.krp"
-	$(INSTALL_DATA) "$(srcdir)/amsterdam-cable-2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/amsterdam-cable-2.krp"
-	$(INSTALL_DATA) "$(srcdir)/amsterdam-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/amsterdam-cable.krp"
-	$(INSTALL_DATA) "$(srcdir)/arnhem-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/arnhem-cable.krp"
-	$(INSTALL_DATA) "$(srcdir)/ede.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/ede.krp"
-	$(INSTALL_DATA) "$(srcdir)/enschede-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/enschede-cable.krp"
-	$(INSTALL_DATA) "$(srcdir)/groningen.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/groningen.krp"
-	$(INSTALL_DATA) "$(srcdir)/ijhorst.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/ijhorst.krp"
-	$(INSTALL_DATA) "$(srcdir)/rotterdam-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/rotterdam-cable.krp"
-	$(INSTALL_DATA) "$(srcdir)/tegelen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/tegelen-cable.krp"
-	$(INSTALL_DATA) "$(srcdir)/the-hague-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/the-hague-antenna.krp"
+	$(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/tderadio/presets/netherlands/"
+	$(INSTALL_DATA) "$(srcdir)/alphen-aan-den-rijn-cable.krp" "$(DESTDIR)$(kde_datadir)/tderadio/presets/netherlands/alphen-aan-den-rijn-cable.krp"
+	$(INSTALL_DATA) "$(srcdir)/amersfoort-cable.krp" "$(DESTDIR)$(kde_datadir)/tderadio/presets/netherlands/amersfoort-cable.krp"
+	$(INSTALL_DATA) "$(srcdir)/amsterdam-cable-2.krp" "$(DESTDIR)$(kde_datadir)/tderadio/presets/netherlands/amsterdam-cable-2.krp"
+	$(INSTALL_DATA) "$(srcdir)/amsterdam-cable.krp" "$(DESTDIR)$(kde_datadir)/tderadio/presets/netherlands/amsterdam-cable.krp"
+	$(INSTALL_DATA) "$(srcdir)/arnhem-cable.krp" "$(DESTDIR)$(kde_datadir)/tderadio/presets/netherlands/arnhem-cable.krp"
+	$(INSTALL_DATA) "$(srcdir)/ede.krp" "$(DESTDIR)$(kde_datadir)/tderadio/presets/netherlands/ede.krp"
+	$(INSTALL_DATA) "$(srcdir)/enschede-cable.krp" "$(DESTDIR)$(kde_datadir)/tderadio/presets/netherlands/enschede-cable.krp"
+	$(INSTALL_DATA) "$(srcdir)/groningen.krp" "$(DESTDIR)$(kde_datadir)/tderadio/presets/netherlands/groningen.krp"
+	$(INSTALL_DATA) "$(srcdir)/ijhorst.krp" "$(DESTDIR)$(kde_datadir)/tderadio/presets/netherlands/ijhorst.krp"
+	$(INSTALL_DATA) "$(srcdir)/rotterdam-cable.krp" "$(DESTDIR)$(kde_datadir)/tderadio/presets/netherlands/rotterdam-cable.krp"
+	$(INSTALL_DATA) "$(srcdir)/tegelen-cable.krp" "$(DESTDIR)$(kde_datadir)/tderadio/presets/netherlands/tegelen-cable.krp"
+	$(INSTALL_DATA) "$(srcdir)/the-hague-antenna.krp" "$(DESTDIR)$(kde_datadir)/tderadio/presets/netherlands/the-hague-antenna.krp"
 
 uninstall-local:
-	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/alphen-aan-den-rijn-cable.krp"
-	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/amersfoort-cable.krp"
-	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/amsterdam-cable-2.krp"
-	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/amsterdam-cable.krp"
-	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/arnhem-cable.krp"
-	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/ede.krp"
-	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/enschede-cable.krp"
-	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/groningen.krp"
-	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/ijhorst.krp"
-	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/rotterdam-cable.krp"
-	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/tegelen-cable.krp"
-	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/the-hague-antenna.krp"
+	-rm -f "$(DESTDIR)$(kde_datadir)/tderadio/presets/netherlands/alphen-aan-den-rijn-cable.krp"
+	-rm -f "$(DESTDIR)$(kde_datadir)/tderadio/presets/netherlands/amersfoort-cable.krp"
+	-rm -f "$(DESTDIR)$(kde_datadir)/tderadio/presets/netherlands/amsterdam-cable-2.krp"
+	-rm -f "$(DESTDIR)$(kde_datadir)/tderadio/presets/netherlands/amsterdam-cable.krp"
+	-rm -f "$(DESTDIR)$(kde_datadir)/tderadio/presets/netherlands/arnhem-cable.krp"
+	-rm -f "$(DESTDIR)$(kde_datadir)/tderadio/presets/netherlands/ede.krp"
+	-rm -f "$(DESTDIR)$(kde_datadir)/tderadio/presets/netherlands/enschede-cable.krp"
+	-rm -f "$(DESTDIR)$(kde_datadir)/tderadio/presets/netherlands/groningen.krp"
+	-rm -f "$(DESTDIR)$(kde_datadir)/tderadio/presets/netherlands/ijhorst.krp"
+	-rm -f "$(DESTDIR)$(kde_datadir)/tderadio/presets/netherlands/rotterdam-cable.krp"
+	-rm -f "$(DESTDIR)$(kde_datadir)/tderadio/presets/netherlands/tegelen-cable.krp"
+	-rm -f "$(DESTDIR)$(kde_datadir)/tderadio/presets/netherlands/the-hague-antenna.krp"
diff --git a/tderadio3/presets/netherlands/alphen-aan-den-rijn-cable.krp b/tderadio3/presets/netherlands/alphen-aan-den-rijn-cable.krp
index cccf4df..661f5c1 100644
--- a/tderadio3/presets/netherlands/alphen-aan-den-rijn-cable.krp
+++ b/tderadio3/presets/netherlands/alphen-aan-den-rijn-cable.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-1.0beta3</creator>
+			<creator>tderadio-1.0beta3</creator>
 			<maintainer>Arie de Ruyter &lt;arie.com&gt;</maintainer>
 			<changed>2005-08-27T14:00:00</changed>
 			<country>Netherlands</country>
@@ -300,7 +300,7 @@
 			<frequency>87.6</frequency>
 		</FrequencyRadioStation>
 	</stationlist>
-</kradiorc>
+</tderadiorc>
 
 
 
diff --git a/tderadio3/presets/netherlands/amersfoort-cable.krp b/tderadio3/presets/netherlands/amersfoort-cable.krp
index 6536762..001353b 100644
--- a/tderadio3/presets/netherlands/amersfoort-cable.krp
+++ b/tderadio3/presets/netherlands/amersfoort-cable.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>Julius Schwartzenberg 
 &lt;julius@zgod.cjb.net&gt;</maintainer>
@@ -309,7 +309,7 @@
 			<frequency>68.7752</frequency>
 		</FrequencyRadioStation>
 	</stationlist>
-</kradiorc>
+</tderadiorc>
 
 
 
diff --git a/tderadio3/presets/netherlands/amsterdam-cable-2.krp b/tderadio3/presets/netherlands/amsterdam-cable-2.krp
index b9bd973..4f381d9 100644
--- a/tderadio3/presets/netherlands/amsterdam-cable-2.krp
+++ b/tderadio3/presets/netherlands/amsterdam-cable-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>Bas Doeksen, &lt;bas.doeksen@river.nl&gt;</maintainer>
 			<changed>2005-04-02T14:29:32</changed>
@@ -362,6 +362,6 @@
 			<frequency>87.5</frequency>
 		</FrequencyRadioStation>
 	</stationlist>
-</kradiorc>
+</tderadiorc>
 
 
diff --git a/tderadio3/presets/netherlands/amsterdam-cable.krp b/tderadio3/presets/netherlands/amsterdam-cable.krp
index c9a8849..ccbc931 100644
--- a/tderadio3/presets/netherlands/amsterdam-cable.krp
+++ b/tderadio3/presets/netherlands/amsterdam-cable.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>Can Bican, &lt;unknown&gt;</maintainer>
 			<changed>2003-05-03T23:44:26</changed>
@@ -323,4 +323,4 @@
 			<volumepreset>-1</volumepreset>
 		</FrequencyRadioStation>
 	</stationlist>
-</kradiorc>
+</tderadiorc>
diff --git a/tderadio3/presets/netherlands/arnhem-cable.krp b/tderadio3/presets/netherlands/arnhem-cable.krp
index 47a2763..f9a262a 100644
--- a/tderadio3/presets/netherlands/arnhem-cable.krp
+++ b/tderadio3/presets/netherlands/arnhem-cable.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>Bert Roelse &lt;bert@roelse.com&gt;</maintainer>
             <changed>2003-05-03T10:30:00</changed>
@@ -315,4 +315,4 @@
             <volumepreset>-1</volumepreset>
         </FrequencyRadioStation>
     </stationlist>
-</kradiorc>
+</tderadiorc>
diff --git a/tderadio3/presets/netherlands/ede.krp b/tderadio3/presets/netherlands/ede.krp
index 194e97c..f230a11 100644
--- a/tderadio3/presets/netherlands/ede.krp
+++ b/tderadio3/presets/netherlands/ede.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>Wilfred van den Assem</maintainer>
 			<changed>2004-08-14T13:45:29</changed>
 			<country>Netherlands</country>
@@ -354,7 +354,7 @@
 			<frequency>107.6</frequency>
 		</FrequencyRadioStation>
 	</stationlist>
-</kradiorc>
+</tderadiorc>
 
 
 
diff --git a/tderadio3/presets/netherlands/enschede-cable.krp b/tderadio3/presets/netherlands/enschede-cable.krp
index 03fbac0..8e27ab2 100644
--- a/tderadio3/presets/netherlands/enschede-cable.krp
+++ b/tderadio3/presets/netherlands/enschede-cable.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-1.0beta3b</creator>
+			<creator>tderadio-1.0beta3b</creator>
 			<maintainer>Julius Schwartzenberg</maintainer>
 			<changed>2006-07-07T11:51:41</changed>
 			<country>Netherlands</country>
@@ -366,7 +366,7 @@ probably used by shops)</comments>
 			<frequency>86.5263</frequency>
 		</FrequencyRadioStation>
 	</stationlist>
-</kradiorc>
+</tderadiorc>
 
 
 
diff --git a/tderadio3/presets/netherlands/groningen.krp b/tderadio3/presets/netherlands/groningen.krp
index 2052754..8a036ff 100644
--- a/tderadio3/presets/netherlands/groningen.krp
+++ b/tderadio3/presets/netherlands/groningen.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>Dennis Grofsmid &lt;d.k.grofsmid@student.rug.nl&gt;</maintainer>
 			<changed>2004-10-09T14:32:50</changed>
@@ -179,4 +179,4 @@
 			<volumepreset>-1</volumepreset>
 		</FrequencyRadioStation>
 	</stationlist>
-</kradiorc>
+</tderadiorc>
diff --git a/tderadio3/presets/netherlands/ijhorst.krp b/tderadio3/presets/netherlands/ijhorst.krp
index d40cec2..06f9eb2 100644
--- a/tderadio3/presets/netherlands/ijhorst.krp
+++ b/tderadio3/presets/netherlands/ijhorst.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>Martijn Rowaan</maintainer>
 			<changed>2004-05-01T20:16:57</changed>
@@ -251,4 +251,4 @@
 			<volumepreset>0.01</volumepreset>
 		</FrequencyRadioStation>
 	</stationlist>
-</kradiorc>
+</tderadiorc>
diff --git a/tderadio3/presets/netherlands/rotterdam-cable.krp b/tderadio3/presets/netherlands/rotterdam-cable.krp
index cf71886..6e69690 100644
--- a/tderadio3/presets/netherlands/rotterdam-cable.krp
+++ b/tderadio3/presets/netherlands/rotterdam-cable.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>Marco Calf, &lt;kumbakara@planet.nl&gt;</maintainer>
 			<changed>2003-05-03T23:44:26</changed>
@@ -299,4 +299,4 @@
 			<frequency>105.4</frequency>
 		</FrequencyRadioStation>
 	</stationlist>
-</kradiorc>
+</tderadiorc>
diff --git a/tderadio3/presets/netherlands/tegelen-cable.krp b/tderadio3/presets/netherlands/tegelen-cable.krp
index ee0352f..07a0bfa 100644
--- a/tderadio3/presets/netherlands/tegelen-cable.krp
+++ b/tderadio3/presets/netherlands/tegelen-cable.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>Twan vdn Hombergh, &lt;unknown&gt;</maintainer>
 			<changed>2003-06-29T09:56:30</changed>
@@ -323,4 +323,4 @@
 			<volumepreset>-1</volumepreset>
 		</FrequencyRadioStation>
 	</stationlist>
-</kradiorc>
+</tderadiorc>
diff --git a/tderadio3/presets/netherlands/the-hague-antenna.krp b/tderadio3/presets/netherlands/the-hague-antenna.krp
index 8690f6e..ac76396 100644
--- a/tderadio3/presets/netherlands/the-hague-antenna.krp
+++ b/tderadio3/presets/netherlands/the-hague-antenna.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>Gerard Blank, &lt;blank878@planet.nl&gt;</maintainer>
 			<changed>2005-05-31T03:42:44</changed>
@@ -171,4 +171,4 @@
 			<volumepreset>-1</volumepreset>
 		</FrequencyRadioStation>
 	</stationlist>
-</kradiorc>
+</tderadiorc>