Rename many classes and header files to avoid conflicts with KDE4

5 files changed, 29 insertions, 29 deletions

diff --git a/tderadio3/plugins/gui-docking-menu/Makefile.am b/tderadio3/plugins/gui-docking-menu/Makefile.am
index be50ef5..ff1e0ad 100644
--- a/tderadio3/plugins/gui-docking-menu/Makefile.am
+++ b/tderadio3/plugins/gui-docking-menu/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 =  libdocking-menu.la
+libtderadio_LTLIBRARIES =  libdocking-menu.la
 libdocking_menu_la_SOURCES = docking-configuration.cpp docking.cpp
 libdocking_menu_la_LDFLAGS = -module -avoid-version $(KDE_RPATH) $(all_libraries)
 
@@ -11,8 +11,8 @@ noinst_HEADERS = docking-configuration.h docking.h
 
 
 #messages: rc.cpp
-#	$(XGETTEXT) *.cpp *.h -o po/kradio-gui-docking-menu.pot
+#	$(XGETTEXT) *.cpp *.h -o po/tderadio-gui-docking-menu.pot
 
 messages: rc.cpp
 	$(EXTRACTRC) *.rc *.ui >> rc.cpp
-	$(XGETTEXT) rc.cpp *.h *.cpp -o po/kradio-gui-docking-menu.pot
+	$(XGETTEXT) rc.cpp *.h *.cpp -o po/tderadio-gui-docking-menu.pot
diff --git a/tderadio3/plugins/gui-docking-menu/docking.cpp b/tderadio3/plugins/gui-docking-menu/docking.cpp
index 7c5d817..186a590 100644
--- a/tderadio3/plugins/gui-docking-menu/docking.cpp
+++ b/tderadio3/plugins/gui-docking-menu/docking.cpp
@@ -17,9 +17,9 @@
 
 #include <kiconloader.h>
 #include <tqtooltip.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kapplication.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdialogbase.h>
 #include <kaboutdata.h>
 #include <tdeconfig.h>
@@ -41,7 +41,7 @@
 
 ///////////////////////////////////////////////////////////////////////
 
-PLUGIN_LIBRARY_FUNCTIONS(RadioDocking, "kradio-gui-docking-menu", i18n("Tray Menu for TDERadio"));
+PLUGIN_LIBRARY_FUNCTIONS(RadioDocking, "tderadio-gui-docking-menu", i18n("Tray Menu for TDERadio"));
 
 /////////////////////////////////////////////////////////////////////////////
 
@@ -53,7 +53,7 @@ RadioDocking::RadioDocking(const TQString &name)
     m_NextRecordingMenuID(POPUP_ID_STOP_RECORDING_BASE),
     m_leftClickAction(lcaShowHide)
 {
-    setPixmap(BarIcon("kradio"));
+    setPixmap(BarIcon("tderadio"));
 
     m_menu = contextMenu();
     TQObject::connect(m_menu, TQT_SIGNAL(activated(int)),
@@ -185,14 +185,14 @@ ConfigPageInfo RadioDocking::createConfigurationPage()
 
 AboutPageInfo RadioDocking::createAboutPage()
 {
-/*    TDEAboutData aboutData("kradio",
+/*    TDEAboutData aboutData("tderadio",
                          NULL,
                          NULL,
                          I18N_NOOP("Docking Menu 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",  "", "witte@kawo1.rwth-aachen.de");
     aboutData.addAuthor("Klas Kalass",   "", "klas.kalass@gmx.de");
@@ -221,7 +221,7 @@ void RadioDocking::buildContextMenu()
     m_alarmID  = m_menu->insertTitle ("alarm-dummy");
     noticeNextAlarmChanged(queryNextAlarm());
 
-    m_sleepID  = m_menu->insertItem(SmallIcon("kradio_zzz"), "sleep-dummy",
+    m_sleepID  = m_menu->insertItem(SmallIcon("tderadio_zzz"), "sleep-dummy",
                                     this, TQT_SLOT(slotSleepCountdown()));
     noticeCountdownStarted(queryCountdownEnd());
 
@@ -235,21 +235,21 @@ void RadioDocking::buildContextMenu()
     m_menu->insertItem(i18n("Recording"), m_recordingMenu);
 
 
-    m_powerID = m_menu->insertItem(SmallIcon("kradio_muteoff"), "power-dummy",
+    m_powerID = m_menu->insertItem(SmallIcon("tderadio_muteoff"), "power-dummy",
                                    this, TQT_SLOT(slotPower()));
-    m_pauseID = m_menu->insertItem(SmallIcon("kradio_pause"), i18n("Pause Radio"),
+    m_pauseID = m_menu->insertItem(SmallIcon("tderadio_pause"), i18n("Pause Radio"),
                                    this, TQT_SLOT(slotPause()));
     noticePowerChanged(queryIsPowerOn());
 
     m_menu->insertSeparator();
 
-    m_menu->insertItem(SmallIcon("kradio"), i18n("&About"), this, TQT_SLOT(slotShowAbout()));
+    m_menu->insertItem(SmallIcon("tderadio"), i18n("&About"), this, TQT_SLOT(slotShowAbout()));
 
     // build list of widgets for hide/show items
     m_pluginMenu = new TDEPopupMenu(m_menu);
     if (m_manager) {
         m_manager->addWidgetPluginMenuItems(m_pluginMenu, m_widgetPluginIDs);
-        m_menu->insertItem(SmallIcon("kradio_plugins"), i18n("Show/Hide Plugins"), m_pluginMenu);
+        m_menu->insertItem(SmallIcon("tderadio_plugins"), i18n("Show/Hide Plugins"), m_pluginMenu);
     }
 
     m_menu->insertSeparator();
@@ -361,30 +361,30 @@ bool RadioDocking::noticeNextAlarmChanged(const Alarm *a)
 bool RadioDocking::noticeCountdownStarted(const TQDateTime &end)
 {
     if (end.isValid())
-        m_menu->changeItem (m_sleepID, SmallIcon("kradio_zzz"), i18n("Stop Sleep Countdown (running until %1)").arg(end.toString()));
+        m_menu->changeItem (m_sleepID, SmallIcon("tderadio_zzz"), i18n("Stop Sleep Countdown (running until %1)").arg(end.toString()));
     else
-        m_menu->changeItem (m_sleepID, SmallIcon("kradio_zzz"), i18n("Start Sleep Countdown"));
+        m_menu->changeItem (m_sleepID, SmallIcon("tderadio_zzz"), i18n("Start Sleep Countdown"));
     return true;
 }
 
 
 bool RadioDocking::noticeCountdownStopped()
 {
-    m_menu->changeItem (m_sleepID, SmallIcon("kradio_zzz"), i18n("Start Sleep Countdown"));
+    m_menu->changeItem (m_sleepID, SmallIcon("tderadio_zzz"), i18n("Start Sleep Countdown"));
     return true;
 }
 
 
 bool RadioDocking::noticeCountdownZero()
 {
-    m_menu->changeItem (m_sleepID, SmallIcon("kradio_zzz"), i18n("Start Sleep Countdown"));
+    m_menu->changeItem (m_sleepID, SmallIcon("tderadio_zzz"), i18n("Start Sleep Countdown"));
     return true;
 }
 
 
 bool RadioDocking::noticePowerChanged(bool on)
 {
-    m_menu->changeItem(m_powerID, SmallIcon(on ? "kradio_muteon" : "kradio_muteoff"),
+    m_menu->changeItem(m_powerID, SmallIcon(on ? "tderadio_muteon" : "tderadio_muteoff"),
                        on ? i18n("Power Off") : i18n("Power On"));
     m_menu->setItemEnabled(m_pauseID, on);
     return true;
@@ -539,7 +539,7 @@ bool RadioDocking::startRecordingWithFormat(
     TQString descr;
     querySoundStreamDescription(id, descr);
     int menu_id = m_NextRecordingMenuID++;
-    m_recordingMenu->insertItem(SmallIcon("kradio_record"),
+    m_recordingMenu->insertItem(SmallIcon("tderadio_record"),
                                 i18n("Stop Recording of %1").arg(descr),
                                 menu_id);
     m_MenuID2StreamID.insert(menu_id, id);
@@ -548,7 +548,7 @@ bool RadioDocking::startRecordingWithFormat(
     if (id == queryCurrentSoundStreamID())
         m_recordingMenu->setItemEnabled(m_recordingID, false);
 
-    setPixmap(BarIcon("kradio_plus_rec"));
+    setPixmap(BarIcon("tderadio_plus_rec"));
     return false; // this is only a "hook" that does not initiate the recording so don't say that we handled the event
 }
 
@@ -566,7 +566,7 @@ bool RadioDocking::stopRecording (SoundStreamID id)
     if (id == queryCurrentSoundStreamID())
         m_recordingMenu->setItemEnabled(m_recordingID, true);
 
-    setPixmap(BarIcon("kradio"));
+    setPixmap(BarIcon("tderadio"));
 
     return false;
 }
@@ -596,7 +596,7 @@ void RadioDocking::buildRecordingMenu()
 
     TDEPopupMenu *m = new TDEPopupMenu(m_menu);
 
-    m_recordingID = m->insertItem(SmallIcon("kradio_record"), i18n("Start Recording"),
+    m_recordingID = m->insertItem(SmallIcon("tderadio_record"), i18n("Start Recording"),
                                   POPUP_ID_START_RECORDING_DEFAULT);
     TQObject::connect(m, TQT_SIGNAL(activated(int)),
                      this, TQT_SLOT(slotRecordingMenu(int)));
@@ -612,7 +612,7 @@ void RadioDocking::buildRecordingMenu()
         queryIsRecordingRunning(id, r, sf);
         if (r) {
             int menu_id = m_NextRecordingMenuID++;
-            m->insertItem(SmallIcon("kradio_record"),
+            m->insertItem(SmallIcon("tderadio_record"),
                           i18n("Stop Recording of %1").arg(descr),
                           menu_id);
             m_MenuID2StreamID.insert(menu_id, id);
@@ -632,7 +632,7 @@ bool RadioDocking::noticeSoundStreamChanged(SoundStreamID id)
         TQString descr;
         querySoundStreamDescription(id, descr);
         m_recordingMenu->changeItem(m_StreamID2MenuID[id],
-                                    SmallIcon("kradio_record"),
+                                    SmallIcon("tderadio_record"),
                                     i18n("Stop Recording of %1").arg(descr));
         return true;
     }
diff --git a/tderadio3/plugins/gui-docking-menu/po/Makefile.am b/tderadio3/plugins/gui-docking-menu/po/Makefile.am
index e02511d..075b9c1 100644
--- a/tderadio3/plugins/gui-docking-menu/po/Makefile.am
+++ b/tderadio3/plugins/gui-docking-menu/po/Makefile.am
@@ -1,2 +1,2 @@
-PACKAGE = kradio-gui-docking-menu
+PACKAGE = tderadio-gui-docking-menu
 POFILES = AUTO
diff --git a/tderadio3/plugins/gui-docking-menu/po/de.po b/tderadio3/plugins/gui-docking-menu/po/de.po
index 717d5f9..518734d 100644
--- a/tderadio3/plugins/gui-docking-menu/po/de.po
+++ b/tderadio3/plugins/gui-docking-menu/po/de.po
@@ -1,5 +1,5 @@
 # translation of de.po to
-# translation of kradio-gui-docking-menu.po to
+# translation of tderadio-gui-docking-menu.po to
 # This file is put in the public domain.
 #
 # Ernst Martin Witte <emw@nocabal.de>, 2006.
diff --git a/tderadio3/plugins/gui-docking-menu/po/ru.po b/tderadio3/plugins/gui-docking-menu/po/ru.po
index 03050f6..cd9f362 100644
--- a/tderadio3/plugins/gui-docking-menu/po/ru.po
+++ b/tderadio3/plugins/gui-docking-menu/po/ru.po
@@ -1,5 +1,5 @@
 # translation of ru.po to
-# translation of kradio-gui-docking-menu.po to
+# translation of tderadio-gui-docking-menu.po to
 # This file is put in the public domain.
 # Алексей Кузнецов <Alexey.Kouznetsov@GMail.com>, 2006.
 #