Rename many classes and header files to avoid conflicts with KDE4

11 files changed, 59 insertions, 59 deletions

diff --git a/tderadio3/presets/russia/Makefile.am b/tderadio3/presets/russia/Makefile.am
index a757345..c827b7d 100644
--- a/tderadio3/presets/russia/Makefile.am
+++ b/tderadio3/presets/russia/Makefile.am
@@ -2,26 +2,26 @@ SUBDIRS =
 EXTRA_DIST = "khabarovsk.krp" "moscow.2.krp" "moscow.3.krp" "moscow.4.krp" "moscow.5.krp" "moscow.krp" "saint-petersburg-antenna2.krp" "saint-petersburg-antenna.krp" "samara.krp" "vladivostok-antenna.krp"
 
 install-data-local:
-	$(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/"
-	$(INSTALL_DATA) "$(srcdir)/khabarovsk.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/khabarovsk.krp"
-	$(INSTALL_DATA) "$(srcdir)/moscow.2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/moscow.2.krp"
-	$(INSTALL_DATA) "$(srcdir)/moscow.3.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/moscow.3.krp"
-	$(INSTALL_DATA) "$(srcdir)/moscow.4.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/moscow.4.krp"
-	$(INSTALL_DATA) "$(srcdir)/moscow.5.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/moscow.5.krp"
-	$(INSTALL_DATA) "$(srcdir)/moscow.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/moscow.krp"
-	$(INSTALL_DATA) "$(srcdir)/saint-petersburg-antenna2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/saint-petersburg-antenna2.krp"
-	$(INSTALL_DATA) "$(srcdir)/saint-petersburg-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/saint-petersburg-antenna.krp"
-	$(INSTALL_DATA) "$(srcdir)/samara.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/samara.krp"
-	$(INSTALL_DATA) "$(srcdir)/vladivostok-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/vladivostok-antenna.krp"
+	$(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/tderadio/presets/russia/"
+	$(INSTALL_DATA) "$(srcdir)/khabarovsk.krp" "$(DESTDIR)$(kde_datadir)/tderadio/presets/russia/khabarovsk.krp"
+	$(INSTALL_DATA) "$(srcdir)/moscow.2.krp" "$(DESTDIR)$(kde_datadir)/tderadio/presets/russia/moscow.2.krp"
+	$(INSTALL_DATA) "$(srcdir)/moscow.3.krp" "$(DESTDIR)$(kde_datadir)/tderadio/presets/russia/moscow.3.krp"
+	$(INSTALL_DATA) "$(srcdir)/moscow.4.krp" "$(DESTDIR)$(kde_datadir)/tderadio/presets/russia/moscow.4.krp"
+	$(INSTALL_DATA) "$(srcdir)/moscow.5.krp" "$(DESTDIR)$(kde_datadir)/tderadio/presets/russia/moscow.5.krp"
+	$(INSTALL_DATA) "$(srcdir)/moscow.krp" "$(DESTDIR)$(kde_datadir)/tderadio/presets/russia/moscow.krp"
+	$(INSTALL_DATA) "$(srcdir)/saint-petersburg-antenna2.krp" "$(DESTDIR)$(kde_datadir)/tderadio/presets/russia/saint-petersburg-antenna2.krp"
+	$(INSTALL_DATA) "$(srcdir)/saint-petersburg-antenna.krp" "$(DESTDIR)$(kde_datadir)/tderadio/presets/russia/saint-petersburg-antenna.krp"
+	$(INSTALL_DATA) "$(srcdir)/samara.krp" "$(DESTDIR)$(kde_datadir)/tderadio/presets/russia/samara.krp"
+	$(INSTALL_DATA) "$(srcdir)/vladivostok-antenna.krp" "$(DESTDIR)$(kde_datadir)/tderadio/presets/russia/vladivostok-antenna.krp"
 
 uninstall-local:
-	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/khabarovsk.krp"
-	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/moscow.2.krp"
-	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/moscow.3.krp"
-	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/moscow.4.krp"
-	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/moscow.5.krp"
-	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/moscow.krp"
-	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/saint-petersburg-antenna2.krp"
-	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/saint-petersburg-antenna.krp"
-	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/samara.krp"
-	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/vladivostok-antenna.krp"
+	-rm -f "$(DESTDIR)$(kde_datadir)/tderadio/presets/russia/khabarovsk.krp"
+	-rm -f "$(DESTDIR)$(kde_datadir)/tderadio/presets/russia/moscow.2.krp"
+	-rm -f "$(DESTDIR)$(kde_datadir)/tderadio/presets/russia/moscow.3.krp"
+	-rm -f "$(DESTDIR)$(kde_datadir)/tderadio/presets/russia/moscow.4.krp"
+	-rm -f "$(DESTDIR)$(kde_datadir)/tderadio/presets/russia/moscow.5.krp"
+	-rm -f "$(DESTDIR)$(kde_datadir)/tderadio/presets/russia/moscow.krp"
+	-rm -f "$(DESTDIR)$(kde_datadir)/tderadio/presets/russia/saint-petersburg-antenna2.krp"
+	-rm -f "$(DESTDIR)$(kde_datadir)/tderadio/presets/russia/saint-petersburg-antenna.krp"
+	-rm -f "$(DESTDIR)$(kde_datadir)/tderadio/presets/russia/samara.krp"
+	-rm -f "$(DESTDIR)$(kde_datadir)/tderadio/presets/russia/vladivostok-antenna.krp"
diff --git a/tderadio3/presets/russia/khabarovsk.krp b/tderadio3/presets/russia/khabarovsk.krp
index 53484d7..f12c3cd 100644
--- a/tderadio3/presets/russia/khabarovsk.krp
+++ b/tderadio3/presets/russia/khabarovsk.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-4.0.2</creator>
+			<creator>tderadio-4.0.2</creator>
 			<maintainer>Andrey Tomilenko (aka Thom) thom82@mail.ru</maintainer>
 			<changed>2012-06-22T20:57:29</changed>
 			<country>Russia</country>
@@ -156,4 +156,4 @@
 			<frequency>106.8</frequency>
 		</FrequencyRadioStation>
 	</stationlist>
-</kradiorc>
+</tderadiorc>
diff --git a/tderadio3/presets/russia/moscow.2.krp b/tderadio3/presets/russia/moscow.2.krp
index 89d777f..2e4d191 100644
--- a/tderadio3/presets/russia/moscow.2.krp
+++ b/tderadio3/presets/russia/moscow.2.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-2006-11-12-r497</creator>
+			<creator>tderadio-snapshot-2006-11-12-r497</creator>
 			<maintainer>Wasiliy Cheremisinov &lt;wasiliy.ch@gmaill.com&gt;</maintainer>
 			<changed>2007-12-08T10:59:46</changed>
 			<country>Russia</country>
@@ -138,5 +138,5 @@
 			<frequency>90.8</frequency>
 		</FrequencyRadioStation>
 	</stationlist>
-</kradiorc>
+</tderadiorc>
 
diff --git a/tderadio3/presets/russia/moscow.3.krp b/tderadio3/presets/russia/moscow.3.krp
index 9f389fa..7e243d2 100644
--- a/tderadio3/presets/russia/moscow.3.krp
+++ b/tderadio3/presets/russia/moscow.3.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-2006-11-12-r497</creator>
+			<creator>tderadio-snapshot-2006-11-12-r497</creator>
 			<maintainer>Ser Moro</maintainer>
 			<changed>2008-11-09T07:40:00</changed>
 			<country>Russia</country>
@@ -462,5 +462,5 @@
 			<frequency>107.8</frequency>
 		</FrequencyRadioStation>
 	</stationlist>
-</kradiorc>
+</tderadiorc>
 
diff --git a/tderadio3/presets/russia/moscow.4.krp b/tderadio3/presets/russia/moscow.4.krp
index f82a3d5..af7db5f 100644
--- a/tderadio3/presets/russia/moscow.4.krp
+++ b/tderadio3/presets/russia/moscow.4.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-2006-09-20</creator>
+			<creator>tderadio-snapshot-2006-09-20</creator>
 			<maintainer>Basil &lt;614@mail.ru&gt;</maintainer>
 			<changed>2006-12-24T14:00:31</changed>
 			<country>Russia</country>
@@ -480,7 +480,7 @@
 			<frequency>107.8</frequency>
 		</FrequencyRadioStation>
 	</stationlist>
-</kradiorc>
+</tderadiorc>
 
 
 
diff --git a/tderadio3/presets/russia/moscow.5.krp b/tderadio3/presets/russia/moscow.5.krp
index 0811904..9acad9f 100644
--- a/tderadio3/presets/russia/moscow.5.krp
+++ b/tderadio3/presets/russia/moscow.5.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-2006-11-12-r497</creator>
+			<creator>tderadio-snapshot-2006-11-12-r497</creator>
 			<maintainer>Дмитрий Смелков &lt;das@sidero.ru&gt;</maintainer>
 			<changed>2009-09-29T12:52:24</changed>
 			<country>Russia</country>
@@ -452,5 +452,5 @@
 			<frequency>107.8</frequency>
 		</FrequencyRadioStation>
 	</stationlist>
-</kradiorc>
+</tderadiorc>
 
diff --git a/tderadio3/presets/russia/moscow.krp b/tderadio3/presets/russia/moscow.krp
index c1a479c..6fbfcbe 100644
--- a/tderadio3/presets/russia/moscow.krp
+++ b/tderadio3/presets/russia/moscow.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>Alex Tompson &lt;arbuz310@mail.ru&gt;</maintainer>
 			<changed>2003-08-30T22:05:36</changed>
@@ -137,5 +137,5 @@
 			<frequency>0</frequency>
 		</FrequencyRadioStation>
 	</stationlist>
-</kradiorc>
+</tderadiorc>
 
diff --git a/tderadio3/presets/russia/saint-petersburg-antenna.krp b/tderadio3/presets/russia/saint-petersburg-antenna.krp
index e52073d..bceefa9 100644
--- a/tderadio3/presets/russia/saint-petersburg-antenna.krp
+++ b/tderadio3/presets/russia/saint-petersburg-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>Alexey Kouznetsov, &lt;AlexeyKouznetsov@Rambler.ru&gt;</maintainer>
 			<changed>2005-03-30T13:23:16</changed>
@@ -283,4 +283,4 @@
 			<frequency>107.812</frequency>
 		</FrequencyRadioStation>
 	</stationlist>
-</kradiorc>
+</tderadiorc>
diff --git a/tderadio3/presets/russia/saint-petersburg-antenna2.krp b/tderadio3/presets/russia/saint-petersburg-antenna2.krp
index a8dd30f..2d37e67 100644
--- a/tderadio3/presets/russia/saint-petersburg-antenna2.krp
+++ b/tderadio3/presets/russia/saint-petersburg-antenna2.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-4.0.0</creator>
+			<creator>tderadio-4.0.0</creator>
 			<maintainer>Hanataro (Александр Николаевич &lt;hanataro25@gmail.com&gt;)</maintainer>
 			<changed>2011-03-04T16:29:42</changed>
 			<country>Russia</country>
@@ -174,4 +174,4 @@
 			<frequency>107.8</frequency>
 		</FrequencyRadioStation>
 	</stationlist>
-</kradiorc>
+</tderadiorc>
diff --git a/tderadio3/presets/russia/samara.krp b/tderadio3/presets/russia/samara.krp
index a8fb8ef..382cb59 100644
--- a/tderadio3/presets/russia/samara.krp
+++ b/tderadio3/presets/russia/samara.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-4.0.0</creator>
+            <creator>tderadio-4.0.0</creator>
             <maintainer>slider</maintainer>
             <changed>2010-11-25T11:06:47</changed>
             <country>Russia</country>
@@ -236,4 +236,4 @@
             <frequency>107.2</frequency>
         </FrequencyRadioStation>
     </stationlist>
-</kradiorc>
+</tderadiorc>
diff --git a/tderadio3/presets/russia/vladivostok-antenna.krp b/tderadio3/presets/russia/vladivostok-antenna.krp
index 109db22..304ddd3 100644
--- a/tderadio3/presets/russia/vladivostok-antenna.krp
+++ b/tderadio3/presets/russia/vladivostok-antenna.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-4.0.2</creator>
+			<creator>tderadio-4.0.2</creator>
 			<maintainer>Andrey Tomilenko (aka Thom) thom82@mail.ru</maintainer>
 			<changed>2012-06-22T20:47:29</changed>
 			<country>Russia</country>
@@ -138,4 +138,4 @@
 			<frequency>107</frequency>
 		</FrequencyRadioStation>
 	</stationlist>
-</kradiorc>
+</tderadiorc>