summaryrefslogtreecommitdiffstats
path: root/tderadio3/plugins
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:14:26 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:14:26 -0600
commitdd0cfce2e915f718a45dc9f772ce3bff42c0f7ca (patch)
tree03af58be7ebea0d920f89576cef55fa207886ec9 /tderadio3/plugins
parent48906a623383ab5222541ae048e99dd039b62a9a (diff)
downloadtderadio-dd0cfce2e915f718a45dc9f772ce3bff42c0f7ca.tar.gz
tderadio-dd0cfce2e915f718a45dc9f772ce3bff42c0f7ca.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'tderadio3/plugins')
-rw-r--r--tderadio3/plugins/alsa-sound/Makefile.am6
-rw-r--r--tderadio3/plugins/alsa-sound/alsa-sound.cpp10
-rw-r--r--tderadio3/plugins/alsa-sound/icons/Makefile.am2
-rw-r--r--tderadio3/plugins/alsa-sound/po/Makefile.am2
-rw-r--r--tderadio3/plugins/alsa-sound/po/de.po2
-rw-r--r--tderadio3/plugins/alsa-sound/po/ru.po2
-rw-r--r--tderadio3/plugins/gui-docking-menu/Makefile.am8
-rw-r--r--tderadio3/plugins/gui-docking-menu/docking.cpp44
-rw-r--r--tderadio3/plugins/gui-docking-menu/po/Makefile.am2
-rw-r--r--tderadio3/plugins/gui-docking-menu/po/de.po2
-rw-r--r--tderadio3/plugins/gui-docking-menu/po/ru.po2
-rw-r--r--tderadio3/plugins/gui-error-log/Makefile.am6
-rw-r--r--tderadio3/plugins/gui-error-log/errorlog.cpp2
-rw-r--r--tderadio3/plugins/gui-error-log/po/Makefile.am2
-rw-r--r--tderadio3/plugins/gui-error-log/po/de.po2
-rw-r--r--tderadio3/plugins/gui-error-log/po/ru.po2
-rw-r--r--tderadio3/plugins/gui-quickbar/Makefile.am8
-rw-r--r--tderadio3/plugins/gui-quickbar/buttonflowlayout.cpp2
-rw-r--r--tderadio3/plugins/gui-quickbar/buttonflowlayout.h2
-rw-r--r--tderadio3/plugins/gui-quickbar/po/Makefile.am2
-rw-r--r--tderadio3/plugins/gui-quickbar/po/de.po2
-rw-r--r--tderadio3/plugins/gui-quickbar/po/ru.po2
-rw-r--r--tderadio3/plugins/gui-quickbar/quickbar.cpp8
-rw-r--r--tderadio3/plugins/gui-standard-display/Makefile.am6
-rw-r--r--tderadio3/plugins/gui-standard-display/displaycfg.cpp2
-rw-r--r--tderadio3/plugins/gui-standard-display/po/Makefile.am2
-rw-r--r--tderadio3/plugins/gui-standard-display/po/de.po4
-rw-r--r--tderadio3/plugins/gui-standard-display/po/ru.po2
-rw-r--r--tderadio3/plugins/gui-standard-display/radioview.cpp26
-rw-r--r--tderadio3/plugins/gui-standard-display/radioview_frequencyradio.cpp2
-rw-r--r--tderadio3/plugins/gui-standard-display/radioview_frequencyradio.h2
-rw-r--r--tderadio3/plugins/lirc/Makefile.am12
-rw-r--r--tderadio3/plugins/lirc/default-dot-lircrc2
-rw-r--r--tderadio3/plugins/lirc/lirc-configuration-ui.ui2
-rw-r--r--tderadio3/plugins/lirc/lirc-configuration.cpp2
-rw-r--r--tderadio3/plugins/lirc/lircsupport.cpp26
-rw-r--r--tderadio3/plugins/lirc/listviewitem_lirc.h2
-rw-r--r--tderadio3/plugins/lirc/po/Makefile.am2
-rw-r--r--tderadio3/plugins/lirc/po/de.po12
-rw-r--r--tderadio3/plugins/lirc/po/ru.po12
-rw-r--r--tderadio3/plugins/oss-sound/Makefile.am6
-rw-r--r--tderadio3/plugins/oss-sound/icons/Makefile.am2
-rw-r--r--tderadio3/plugins/oss-sound/oss-sound.cpp10
-rw-r--r--tderadio3/plugins/oss-sound/po/Makefile.am2
-rw-r--r--tderadio3/plugins/oss-sound/po/de.po2
-rw-r--r--tderadio3/plugins/oss-sound/po/ru.po2
-rw-r--r--tderadio3/plugins/radio/Makefile.am8
-rw-r--r--tderadio3/plugins/radio/po/Makefile.am2
-rw-r--r--tderadio3/plugins/radio/po/de.po4
-rw-r--r--tderadio3/plugins/radio/po/ru.po4
-rw-r--r--tderadio3/plugins/radio/radio-configuration-ui.ui2
-rw-r--r--tderadio3/plugins/radio/radio-configuration.cpp4
-rw-r--r--tderadio3/plugins/radio/radio.cpp14
-rw-r--r--tderadio3/plugins/recording/Makefile.am6
-rw-r--r--tderadio3/plugins/recording/icons/Makefile.am2
-rw-r--r--tderadio3/plugins/recording/po/Makefile.am2
-rw-r--r--tderadio3/plugins/recording/po/de.po2
-rw-r--r--tderadio3/plugins/recording/po/ru.po2
-rw-r--r--tderadio3/plugins/recording/recording-datamonitor.h2
-rw-r--r--tderadio3/plugins/recording/recording-monitor.cpp4
-rw-r--r--tderadio3/plugins/recording/recording-monitor.h2
-rw-r--r--tderadio3/plugins/recording/recording.cpp18
-rw-r--r--tderadio3/plugins/soundserver/Makefile.am6
-rw-r--r--tderadio3/plugins/soundserver/po/Makefile.am2
-rw-r--r--tderadio3/plugins/soundserver/po/de.po4
-rw-r--r--tderadio3/plugins/soundserver/po/ru.po4
-rw-r--r--tderadio3/plugins/soundserver/soundserver.cpp4
-rw-r--r--tderadio3/plugins/streaming/Makefile.am6
-rw-r--r--tderadio3/plugins/streaming/icons/Makefile.am2
-rw-r--r--tderadio3/plugins/streaming/po/Makefile.am2
-rw-r--r--tderadio3/plugins/streaming/po/de.po2
-rw-r--r--tderadio3/plugins/streaming/po/ru.po2
-rw-r--r--tderadio3/plugins/streaming/streaming-configuration-ui.ui4
-rw-r--r--tderadio3/plugins/streaming/streaming-configuration.cpp2
-rw-r--r--tderadio3/plugins/streaming/streaming.cpp4
-rw-r--r--tderadio3/plugins/timecontrol/Makefile.am6
-rw-r--r--tderadio3/plugins/timecontrol/icons/Makefile.am2
-rw-r--r--tderadio3/plugins/timecontrol/po/Makefile.am2
-rw-r--r--tderadio3/plugins/timecontrol/po/de.po2
-rw-r--r--tderadio3/plugins/timecontrol/po/ru.po2
-rw-r--r--tderadio3/plugins/timecontrol/timecontrol-configuration-ui.ui10
-rw-r--r--tderadio3/plugins/timecontrol/timecontrol-configuration.cpp2
-rw-r--r--tderadio3/plugins/timecontrol/timecontrol.cpp10
-rw-r--r--tderadio3/plugins/timeshifter/Makefile.am6
-rw-r--r--tderadio3/plugins/timeshifter/icons/Makefile.am2
-rw-r--r--tderadio3/plugins/timeshifter/po/Makefile.am2
-rw-r--r--tderadio3/plugins/timeshifter/po/de.po2
-rw-r--r--tderadio3/plugins/timeshifter/po/ru.po2
-rw-r--r--tderadio3/plugins/timeshifter/timeshifter.cpp8
-rw-r--r--tderadio3/plugins/v4lradio/Makefile.am6
-rw-r--r--tderadio3/plugins/v4lradio/po/Makefile.am2
-rw-r--r--tderadio3/plugins/v4lradio/po/de.po2
-rw-r--r--tderadio3/plugins/v4lradio/po/ru.po2
-rw-r--r--tderadio3/plugins/v4lradio/v4lradio.cpp6
94 files changed, 231 insertions, 231 deletions
diff --git a/tderadio3/plugins/alsa-sound/Makefile.am b/tderadio3/plugins/alsa-sound/Makefile.am
index a00e32c..dfc2b0b 100644
--- a/tderadio3/plugins/alsa-sound/Makefile.am
+++ b/tderadio3/plugins/alsa-sound/Makefile.am
@@ -3,7 +3,7 @@ SUBDIRS = po icons .
INCLUDES = $(all_includes)
METASOURCES = AUTO
-libkradio_LTLIBRARIES = libalsa-sound.la
+libtderadio_LTLIBRARIES = libalsa-sound.la
libalsa_sound_la_LDFLAGS = -module -avoid-version $(KDE_RPATH) $(all_libraries)
noinst_HEADERS = alsa-sound.h alsa-sound-configuration.h alsa-mixer-element.h \
alsa-config-mixer-setting.h
@@ -13,8 +13,8 @@ libalsa_sound_la_SOURCES = alsa-sound.cpp alsa-sound-configuration-ui.ui \
libalsa_sound_la_LIBADD = $(LIB_ALSA)
#messages: rc.cpp
-# $(XGETTEXT) *.cpp *.h -o po/kradio-alsa-sound.pot
+# $(XGETTEXT) *.cpp *.h -o po/tderadio-alsa-sound.pot
messages: rc.cpp
$(EXTRACTRC) *.rc *.ui >> rc.cpp
- $(XGETTEXT) rc.cpp *.h *.cpp -o po/kradio-alsa-sound.pot
+ $(XGETTEXT) rc.cpp *.h *.cpp -o po/tderadio-alsa-sound.pot
diff --git a/tderadio3/plugins/alsa-sound/alsa-sound.cpp b/tderadio3/plugins/alsa-sound/alsa-sound.cpp
index 34061a8..4133983 100644
--- a/tderadio3/plugins/alsa-sound/alsa-sound.cpp
+++ b/tderadio3/plugins/alsa-sound/alsa-sound.cpp
@@ -37,7 +37,7 @@
///////////////////////////////////////////////////////////////////////
//// plugin library functions
-PLUGIN_LIBRARY_FUNCTIONS(AlsaSoundDevice, "kradio-alsa-sound", i18n("Advanced Linux Sound Architecture (ALSA) Support"));
+PLUGIN_LIBRARY_FUNCTIONS(AlsaSoundDevice, "tderadio-alsa-sound", i18n("Advanced Linux Sound Architecture (ALSA) Support"));
/////////////////////////////////////////////////////////////////////////////
@@ -195,20 +195,20 @@ ConfigPageInfo AlsaSoundDevice::createConfigurationPage()
return ConfigPageInfo (conf,
i18n("ALSA Sound"),
i18n("ALSA Sound Device Options"),
- "kradio_alsa2");
+ "tderadio_alsa2");
}
AboutPageInfo AlsaSoundDevice::createAboutPage()
{
-/* TDEAboutData aboutData("kradio",
+/* TDEAboutData aboutData("tderadio",
NULL,
NULL,
I18N_NOOP("ALSA Sound Plugin for TDERadio"),
TDEAboutData::License_GPL,
"(c) 2005 Martin Witte",
0,
- "http://sourceforge.net/projects/kradio",
+ "http://sourceforge.net/projects/tderadio",
0);
aboutData.addAuthor("Martin Witte", "", "witte@kawo1.rwth-aachen.de");
@@ -216,7 +216,7 @@ AboutPageInfo AlsaSoundDevice::createAboutPage()
new TDERadioAboutWidget(aboutData, TDERadioAboutWidget::AbtTabbed),
i18n("ALSA Sound"),
i18n("ALSA Sound"),
- "kradio_alsa_sound"
+ "tderadio_alsa_sound"
);
*/
return AboutPageInfo();
diff --git a/tderadio3/plugins/alsa-sound/icons/Makefile.am b/tderadio3/plugins/alsa-sound/icons/Makefile.am
index b3f2583..354090a 100644
--- a/tderadio3/plugins/alsa-sound/icons/Makefile.am
+++ b/tderadio3/plugins/alsa-sound/icons/Makefile.am
@@ -1,2 +1,2 @@
icons_ICON = AUTO
-iconsdir = $(kde_datadir)/kradio/icons
+iconsdir = $(kde_datadir)/tderadio/icons
diff --git a/tderadio3/plugins/alsa-sound/po/Makefile.am b/tderadio3/plugins/alsa-sound/po/Makefile.am
index 9de3420..ca0f4d9 100644
--- a/tderadio3/plugins/alsa-sound/po/Makefile.am
+++ b/tderadio3/plugins/alsa-sound/po/Makefile.am
@@ -1,3 +1,3 @@
-PACKAGE = kradio-alsa-sound
+PACKAGE = tderadio-alsa-sound
POFILES = AUTO
diff --git a/tderadio3/plugins/alsa-sound/po/de.po b/tderadio3/plugins/alsa-sound/po/de.po
index 194474a..d0c23d4 100644
--- a/tderadio3/plugins/alsa-sound/po/de.po
+++ b/tderadio3/plugins/alsa-sound/po/de.po
@@ -1,5 +1,5 @@
# translation of de.po to
-# translation of kradio-alsa-sound.po to
+# translation of tderadio-alsa-sound.po to
# This file is put in the public domain.
#
# Ernst Martin Witte <emw@nocabal.de>, 2006.
diff --git a/tderadio3/plugins/alsa-sound/po/ru.po b/tderadio3/plugins/alsa-sound/po/ru.po
index ff488ce..ebb192d 100644
--- a/tderadio3/plugins/alsa-sound/po/ru.po
+++ b/tderadio3/plugins/alsa-sound/po/ru.po
@@ -1,5 +1,5 @@
# translation of ru.po to
-# translation of kradio-alsa-sound.po to
+# translation of tderadio-alsa-sound.po to
# This file is put in the public domain.
# Алексей Кузнецов <Alexey.Kouznetsov@GMail.com>, 2006.
#
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.
#
diff --git a/tderadio3/plugins/gui-error-log/Makefile.am b/tderadio3/plugins/gui-error-log/Makefile.am
index 1ac0e60..0e19ea4 100644
--- a/tderadio3/plugins/gui-error-log/Makefile.am
+++ b/tderadio3/plugins/gui-error-log/Makefile.am
@@ -3,15 +3,15 @@ SUBDIRS = po .
INCLUDES = $(all_includes)
METASOURCES = AUTO
-libkradio_LTLIBRARIES = liberror-log.la
+libtderadio_LTLIBRARIES = liberror-log.la
liberror_log_la_SOURCES = errorlog.cpp
liberror_log_la_LDFLAGS = -module -avoid-version $(KDE_RPATH) $(all_libraries)
noinst_HEADERS = errorlog.h
#messages: rc.cpp
-# $(XGETTEXT) *.cpp *.h -o po/kradio-gui-error-log.pot
+# $(XGETTEXT) *.cpp *.h -o po/tderadio-gui-error-log.pot
messages: rc.cpp
$(EXTRACTRC) *.rc *.ui >> rc.cpp
- $(XGETTEXT) rc.cpp *.h *.cpp -o po/kradio-gui-error-log.pot
+ $(XGETTEXT) rc.cpp *.h *.cpp -o po/tderadio-gui-error-log.pot
diff --git a/tderadio3/plugins/gui-error-log/errorlog.cpp b/tderadio3/plugins/gui-error-log/errorlog.cpp
index 1b6c1a6..1330669 100644
--- a/tderadio3/plugins/gui-error-log/errorlog.cpp
+++ b/tderadio3/plugins/gui-error-log/errorlog.cpp
@@ -36,7 +36,7 @@
///////////////////////////////////////////////////////////////////////
-PLUGIN_LIBRARY_FUNCTIONS(ErrorLog, "kradio-gui-error-log", i18n("Error Logging Window for TDERadio"));
+PLUGIN_LIBRARY_FUNCTIONS(ErrorLog, "tderadio-gui-error-log", i18n("Error Logging Window for TDERadio"));
/////////////////////////////////////////////////////////////////////////////
diff --git a/tderadio3/plugins/gui-error-log/po/Makefile.am b/tderadio3/plugins/gui-error-log/po/Makefile.am
index c3b26b7..cab56dc 100644
--- a/tderadio3/plugins/gui-error-log/po/Makefile.am
+++ b/tderadio3/plugins/gui-error-log/po/Makefile.am
@@ -1,2 +1,2 @@
-PACKAGE = kradio-gui-error-log
+PACKAGE = tderadio-gui-error-log
POFILES = AUTO
diff --git a/tderadio3/plugins/gui-error-log/po/de.po b/tderadio3/plugins/gui-error-log/po/de.po
index c0ea57d..64109d5 100644
--- a/tderadio3/plugins/gui-error-log/po/de.po
+++ b/tderadio3/plugins/gui-error-log/po/de.po
@@ -1,5 +1,5 @@
# translation of de.po to
-# translation of kradio-gui-error-log.po to
+# translation of tderadio-gui-error-log.po to
# This file is put in the public domain.
#
# Ernst Martin Witte <emw@nocabal.de>, 2006.
diff --git a/tderadio3/plugins/gui-error-log/po/ru.po b/tderadio3/plugins/gui-error-log/po/ru.po
index de20387..9f8113d 100644
--- a/tderadio3/plugins/gui-error-log/po/ru.po
+++ b/tderadio3/plugins/gui-error-log/po/ru.po
@@ -1,5 +1,5 @@
# translation of ru.po to
-# translation of kradio-gui-error-log.po to
+# translation of tderadio-gui-error-log.po to
# This file is put in the public domain.
# Алексей Кузнецов <Alexey.Kouznetsov@GMail.com>, 2006.
#
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 (klas.kalass@gmx.de) for kradio
+ Modified 2002 by Klas Kalass (klas.kalass@gmx.de) 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 (klas.kalass@gmx.de) for kradio
+ Modified 2002 by Klas Kalass (klas.kalass@gmx.de) 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 <emw@nocabal.de>, 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.
# Алексей Кузнецов <Alexey.Kouznetsov@GMail.com>, 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", "", "witte@kawo1.rwth-aachen.de");
aboutData.addAuthor("Klas Kalass", "", "klas.kalass@gmx.de");
diff --git a/tderadio3/plugins/gui-standard-display/Makefile.am b/tderadio3/plugins/gui-standard-display/Makefile.am
index a7e7544..c9b719b 100644
--- a/tderadio3/plugins/gui-standard-display/Makefile.am
+++ b/tderadio3/plugins/gui-standard-display/Makefile.am
@@ -3,7 +3,7 @@ SUBDIRS = po .
INCLUDES = $(all_includes)
METASOURCES = AUTO
-libkradio_LTLIBRARIES = libstandard-display.la
+libtderadio_LTLIBRARIES = libstandard-display.la
libstandard_display_la_SOURCES = displaycfg.cpp displaycfg_interfaces.cpp \
radioview-configuration.cpp radioview.cpp \
radioview_element.cpp \
@@ -15,8 +15,8 @@ libstandard_display_la_LDFLAGS = -module -avoid-version $(KDE_RPATH) $(all_libra
noinst_HEADERS = displaycfg.h displaycfg_interfaces.h radioview-configuration.h radioview_element.h radioview_frequencyradio.h radioview_frequencyseeker.h radioview.h radioview_volume.h
#messages: rc.cpp
-# $(XGETTEXT) *.cpp *.h -o po/kradio-gui-standard-display.pot
+# $(XGETTEXT) *.cpp *.h -o po/tderadio-gui-standard-display.pot
messages: rc.cpp
$(EXTRACTRC) *.rc *.ui >> rc.cpp
- $(XGETTEXT) rc.cpp *.h *.cpp -o po/kradio-gui-standard-display.pot
+ $(XGETTEXT) rc.cpp *.h *.cpp -o po/tderadio-gui-standard-display.pot
diff --git a/tderadio3/plugins/gui-standard-display/displaycfg.cpp b/tderadio3/plugins/gui-standard-display/displaycfg.cpp
index 40f5f6c..d08dde4 100644
--- a/tderadio3/plugins/gui-standard-display/displaycfg.cpp
+++ b/tderadio3/plugins/gui-standard-display/displaycfg.cpp
@@ -18,7 +18,7 @@
#include "displaycfg.h"
#include <kcolorbutton.h>
#include <kcolordialog.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
#include <tqlayout.h>
#include <klocale.h>
diff --git a/tderadio3/plugins/gui-standard-display/po/Makefile.am b/tderadio3/plugins/gui-standard-display/po/Makefile.am
index 956ae72..a9b5c92 100644
--- a/tderadio3/plugins/gui-standard-display/po/Makefile.am
+++ b/tderadio3/plugins/gui-standard-display/po/Makefile.am
@@ -1,2 +1,2 @@
-PACKAGE = kradio-gui-standard-display
+PACKAGE = tderadio-gui-standard-display
POFILES = AUTO
diff --git a/tderadio3/plugins/gui-standard-display/po/de.po b/tderadio3/plugins/gui-standard-display/po/de.po
index 732628e..29968cd 100644
--- a/tderadio3/plugins/gui-standard-display/po/de.po
+++ b/tderadio3/plugins/gui-standard-display/po/de.po
@@ -1,10 +1,10 @@
-# translation of kradio-gui-standard-display.po to
+# translation of tderadio-gui-standard-display.po to
# This file is put in the public domain.
#
# Ernst Martin Witte <emw@nocabal.de>, 2006.
msgid ""
msgstr ""
-"Project-Id-Version: kradio-gui-standard-display\n"
+"Project-Id-Version: tderadio-gui-standard-display\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2006-11-06 01:24+0100\n"
"PO-Revision-Date: 2006-11-06 01:23+0100\n"
diff --git a/tderadio3/plugins/gui-standard-display/po/ru.po b/tderadio3/plugins/gui-standard-display/po/ru.po
index 1dcbf99..62874d1 100644
--- a/tderadio3/plugins/gui-standard-display/po/ru.po
+++ b/tderadio3/plugins/gui-standard-display/po/ru.po
@@ -1,5 +1,5 @@
# translation of ru.po to
-# translation of kradio-gui-standard-display.po to
+# translation of tderadio-gui-standard-display.po to
# This file is put in the public domain.
# Алексей Кузнецов <Alexey.Kouznetsov@GMail.com>, 2006.
#
diff --git a/tderadio3/plugins/gui-standard-display/radioview.cpp b/tderadio3/plugins/gui-standard-display/radioview.cpp
index 73735d2..a79a8d8 100644
--- a/tderadio3/plugins/gui-standard-display/radioview.cpp
+++ b/tderadio3/plugins/gui-standard-display/radioview.cpp
@@ -30,7 +30,7 @@
#include <kapplication.h>
#include <twin.h>
#include <tdeconfig.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include "../../src/include/radiodevice_interfaces.h"
#include "../../src/include/radiostation.h"
@@ -52,7 +52,7 @@
///////////////////////////////////////////////////////////////////////
-PLUGIN_LIBRARY_FUNCTIONS(RadioView, "kradio-gui-standard-display", i18n("Standard Display for TDERadio"));
+PLUGIN_LIBRARY_FUNCTIONS(RadioView, "tderadio-gui-standard-display", i18n("Standard Display for TDERadio"));
///////////////////////////////////////////////////////////////////////
@@ -123,13 +123,13 @@ RadioView::RadioView(const TQString &name)
l04->addWidget (btnPlugins, 2, 1);
m_pauseMenu = new TDEPopupMenu(btnPower);
- m_pauseMenu->insertItem(SmallIcon("kradio_pause"),
+ m_pauseMenu->insertItem(SmallIcon("tderadio_pause"),
i18n("Pause TDERadio"),
this, TQT_SLOT(slotPause()));
btnPower->setPopupDelay(200);
m_RecordingMenu = new TDEPopupMenu(btnRecording);
- m_RecordingMenu->insertItem(SmallIcon("kradio_record"),
+ m_RecordingMenu->insertItem(SmallIcon("tderadio_record"),
i18n("Start Recording"),
POPUP_ID_START_RECORDING_DEFAULT);
TQObject::connect(m_RecordingMenu, TQT_SIGNAL(activated(int)),
@@ -155,12 +155,12 @@ RadioView::RadioView(const TQString &name)
// ICONS
- btnPower->setIconSet(SmallIconSet("kradio_muteon"));
- btnRecording->setIconSet(SmallIconSet("kradio_record"));
+ btnPower->setIconSet(SmallIconSet("tderadio_muteon"));
+ btnRecording->setIconSet(SmallIconSet("tderadio_record"));
btnConfigure->setIconSet(SmallIconSet("configure"));
btnQuit->setIconSet(SmallIconSet("exit"));
- btnSnooze->setIconSet(SmallIconSet("kradio_zzz"));
- btnPlugins->setIconSet(SmallIconSet("kradio_plugins"));
+ btnSnooze->setIconSet(SmallIconSet("tderadio_zzz"));
+ btnPlugins->setIconSet(SmallIconSet("tderadio_plugins"));
widgetStacks[clsRadioSound] ->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Preferred));
widgetStacks[clsRadioDisplay]->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Preferred));
@@ -299,7 +299,7 @@ void RadioView::selectTopWidgets()
bool RadioView::noticePowerChanged(bool on)
{
- btnPower->setIconSet(SmallIconSet( on ? "kradio_muteoff" : "kradio_muteon"));
+ btnPower->setIconSet(SmallIconSet( on ? "tderadio_muteoff" : "tderadio_muteon"));
btnPower->setOn(on);
if (on) {
btnPower->setPopup(m_pauseMenu);
@@ -438,7 +438,7 @@ bool RadioView::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);
@@ -476,7 +476,7 @@ bool RadioView::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;
}
@@ -600,14 +600,14 @@ void RadioView::addCommonConfigurationTab(TQTabWidget *c)
AboutPageInfo RadioView::createAboutPage()
{
-/* TDEAboutData aboutData("kradio",
+/* TDEAboutData aboutData("tderadio",
NULL,
NULL,
I18N_NOOP("Standard Radio Display 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");
diff --git a/tderadio3/plugins/gui-standard-display/radioview_frequencyradio.cpp b/tderadio3/plugins/gui-standard-display/radioview_frequencyradio.cpp
index e320102..5ea255e 100644
--- a/tderadio3/plugins/gui-standard-display/radioview_frequencyradio.cpp
+++ b/tderadio3/plugins/gui-standard-display/radioview_frequencyradio.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- kradiodisplay.cpp - description
+ tderadiodisplay.cpp - description
-------------------
begin : Mit Jan 29 2003
copyright : (C) 2003 by Martin Witte
diff --git a/tderadio3/plugins/gui-standard-display/radioview_frequencyradio.h b/tderadio3/plugins/gui-standard-display/radioview_frequencyradio.h
index b13db67..fb3bd59 100644
--- a/tderadio3/plugins/gui-standard-display/radioview_frequencyradio.h
+++ b/tderadio3/plugins/gui-standard-display/radioview_frequencyradio.h
@@ -1,5 +1,5 @@
/***************************************************************************
- kradiodisplay.h - description
+ tderadiodisplay.h - description
-------------------
begin : Mit Jan 29 2003
copyright : (C) 2003 by Martin Witte
diff --git a/tderadio3/plugins/lirc/Makefile.am b/tderadio3/plugins/lirc/Makefile.am
index 383fe28..1ede5f5 100644
--- a/tderadio3/plugins/lirc/Makefile.am
+++ b/tderadio3/plugins/lirc/Makefile.am
@@ -4,7 +4,7 @@ SUBDIRS = po .
INCLUDES = $(all_includes)
METASOURCES = AUTO
-libkradio_LTLIBRARIES = liblirc.la
+libtderadio_LTLIBRARIES = liblirc.la
liblirc_la_SOURCES = lircsupport.cpp lirc-configuration-ui.ui \
lirc-configuration.cpp listviewitem_lirc.cpp
liblirc_la_LDFLAGS = -module -avoid-version $(KDE_RPATH) $(all_libraries)
@@ -14,15 +14,15 @@ noinst_HEADERS = lircsupport.h lirc-configuration.h listviewitem_lirc.h
install-data-local:
- $(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/"
- $(INSTALL_DATA) "$(srcdir)/default-dot-lircrc" "$(DESTDIR)$(kde_datadir)/kradio/default-dot-lircrc"
+ $(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/tderadio/"
+ $(INSTALL_DATA) "$(srcdir)/default-dot-lircrc" "$(DESTDIR)$(kde_datadir)/tderadio/default-dot-lircrc"
uninstall-local:
- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/default-dot-lircrc"
+ -rm -f "$(DESTDIR)$(kde_datadir)/tderadio/default-dot-lircrc"
#messages: rc.cpp
-# $(XGETTEXT) *.cpp *.h -o po/kradio-lirc.pot
+# $(XGETTEXT) *.cpp *.h -o po/tderadio-lirc.pot
messages: rc.cpp
$(EXTRACTRC) *.rc *.ui >> rc.cpp
- $(XGETTEXT) rc.cpp *.h *.cpp -o po/kradio-lirc.pot
+ $(XGETTEXT) rc.cpp *.h *.cpp -o po/tderadio-lirc.pot
diff --git a/tderadio3/plugins/lirc/default-dot-lircrc b/tderadio3/plugins/lirc/default-dot-lircrc
index 02ac704..0462104 100644
--- a/tderadio3/plugins/lirc/default-dot-lircrc
+++ b/tderadio3/plugins/lirc/default-dot-lircrc
@@ -1,6 +1,6 @@
begin
- prog = kradio
+ prog = tderadio
config = eventmap
repeat = 1
end
diff --git a/tderadio3/plugins/lirc/lirc-configuration-ui.ui b/tderadio3/plugins/lirc/lirc-configuration-ui.ui
index b648265..a0beb27 100644
--- a/tderadio3/plugins/lirc/lirc-configuration-ui.ui
+++ b/tderadio3/plugins/lirc/lirc-configuration-ui.ui
@@ -105,6 +105,6 @@
<pixmapfunction>SmallIconSet</pixmapfunction>
<layoutdefaults spacing="6" margin="0"/>
<includehints>
- <includehint>klistview.h</includehint>
+ <includehint>tdelistview.h</includehint>
</includehints>
</UI>
diff --git a/tderadio3/plugins/lirc/lirc-configuration.cpp b/tderadio3/plugins/lirc/lirc-configuration.cpp
index 8e39846..6fd87af 100644
--- a/tderadio3/plugins/lirc/lirc-configuration.cpp
+++ b/tderadio3/plugins/lirc/lirc-configuration.cpp
@@ -15,7 +15,7 @@
* *
***************************************************************************/
-#include <klistview.h>
+#include <tdelistview.h>
#include <klocale.h>
#include <tqlistview.h>
diff --git a/tderadio3/plugins/lirc/lircsupport.cpp b/tderadio3/plugins/lirc/lircsupport.cpp
index dcafb7f..f6264c6 100644
--- a/tderadio3/plugins/lirc/lircsupport.cpp
+++ b/tderadio3/plugins/lirc/lircsupport.cpp
@@ -44,7 +44,7 @@
//// plugin library functions
//#ifdef HAVE_LIRC
-PLUGIN_LIBRARY_FUNCTIONS(LircSupport, "kradio-lirc", i18n("Linux Infrared Control (LIRC) Support"));
+PLUGIN_LIBRARY_FUNCTIONS(LircSupport, "tderadio-lirc", i18n("Linux Infrared Control (LIRC) Support"));
//#endif
/////////////////////////////////////////////////////////////////////////////
@@ -55,9 +55,9 @@ LircSupport::LircSupport(const TQString &name)
{
#ifdef HAVE_LIRC
- logDebug(i18n("initializing kradio lirc plugin"));
- fprintf (stderr, "%s\n", (const char*)i18n("initializing kradio lirc plugin").utf8());
- char *prg = (char*)"kradio";
+ logDebug(i18n("initializing tderadio lirc plugin"));
+ fprintf (stderr, "%s\n", (const char*)i18n("initializing tderadio lirc plugin").utf8());
+ char *prg = (char*)"tderadio";
TQString slircrc = getenv("HOME");
slircrc += "/" LIRCRC;
@@ -65,7 +65,7 @@ LircSupport::LircSupport(const TQString &name)
TQFile lircrc(slircrc);
if (!lircrc.exists()) {
logWarning(i18n("%1 does not exist. File was created with TDERadio's default .lircrc proposal").arg(LIRCRC));
- TQFile default_lircrc(locate("data", "kradio/default-dot-lircrc"));
+ TQFile default_lircrc(locate("data", "tderadio/default-dot-lircrc"));
lircrc.open(IO_WriteOnly);
default_lircrc.open(IO_ReadOnly);
char *buf = new char [default_lircrc.size() + 1];
@@ -93,7 +93,7 @@ LircSupport::LircSupport(const TQString &name)
found = e;
}
if (!found) {
- logWarning(i18n("There is no entry for kradio in any of your .lircrc files."));
+ logWarning(i18n("There is no entry for tderadio in any of your .lircrc files."));
logWarning(i18n("Please setup your .lircrc files correctly."));
m_TakeRawLIRC = true;
}
@@ -105,11 +105,11 @@ LircSupport::LircSupport(const TQString &name)
}
if (m_fd_lirc == -1) {
- logWarning(i18n("Initializing kradio lirc plugin failed"));
- fprintf (stderr, "%s\n", (const char*)i18n("Initializing kradio lirc plugin failed").utf8());
+ logWarning(i18n("Initializing tderadio lirc plugin failed"));
+ fprintf (stderr, "%s\n", (const char*)i18n("Initializing tderadio lirc plugin failed").utf8());
} else {
- logDebug(i18n("Initializing kradio lirc plugin successful"));
- fprintf (stderr, "%s\n", (const char*)i18n("Initializing kradio lirc plugin successful").utf8());
+ logDebug(i18n("Initializing tderadio lirc plugin successful"));
+ fprintf (stderr, "%s\n", (const char*)i18n("Initializing tderadio lirc plugin successful").utf8());
}
#endif
@@ -166,7 +166,7 @@ void LircSupport::slotLIRC(int /*socket*/ )
}
else {
// some error has occurred on the socket => close lirc plugin
- logWarning(i18n("Reading from LIRC socket failed. Disabling LIRC Functions till next start of kradio"));
+ logWarning(i18n("Reading from LIRC socket failed. Disabling LIRC Functions till next start of tderadio"));
delete m_lirc_notify;
m_lirc_notify = NULL;
}
@@ -336,14 +336,14 @@ ConfigPageInfo LircSupport::createConfigurationPage()
AboutPageInfo LircSupport::createAboutPage()
{
-/* TDEAboutData aboutData("kradio",
+/* TDEAboutData aboutData("tderadio",
NULL,
NULL,
I18N_NOOP("Linux Infrared Remote Control Support for TDERadio"),
TDEAboutData::License_GPL,
"(c) 2002-2005 Martin Witte",
0,
- "http://sourceforge.net/projects/kradio",
+ "http://sourceforge.net/projects/tderadio",
0);
aboutData.addAuthor("Martin Witte", "", "witte@kawo1.rwth-aachen.de");
diff --git a/tderadio3/plugins/lirc/listviewitem_lirc.h b/tderadio3/plugins/lirc/listviewitem_lirc.h
index 945ce5f..d0d7444 100644
--- a/tderadio3/plugins/lirc/listviewitem_lirc.h
+++ b/tderadio3/plugins/lirc/listviewitem_lirc.h
@@ -22,7 +22,7 @@
#include <config.h>
#endif
-#include <klistview.h>
+#include <tdelistview.h>
class ListViewItemLirc : public TQObject, public TDEListViewItem
{
diff --git a/tderadio3/plugins/lirc/po/Makefile.am b/tderadio3/plugins/lirc/po/Makefile.am
index 22fce99..eada139 100644
--- a/tderadio3/plugins/lirc/po/Makefile.am
+++ b/tderadio3/plugins/lirc/po/Makefile.am
@@ -1,2 +1,2 @@
-PACKAGE = kradio-lirc
+PACKAGE = tderadio-lirc
POFILES = AUTO
diff --git a/tderadio3/plugins/lirc/po/de.po b/tderadio3/plugins/lirc/po/de.po
index d2d5f9a..8873d65 100644
--- a/tderadio3/plugins/lirc/po/de.po
+++ b/tderadio3/plugins/lirc/po/de.po
@@ -1,5 +1,5 @@
# translation of de.po to
-# translation of kradio-lirc.po to
+# translation of tderadio-lirc.po to
# This file is put in the public domain.
#
# Ernst Martin Witte <emw@nocabal.de>, 2006.
@@ -174,7 +174,7 @@ msgid "LIRC Plugin"
msgstr "Plugin für die Fernsteuerung (LIRC)"
#: lircsupport.cpp:56 lircsupport.cpp:57
-msgid "initializing kradio lirc plugin"
+msgid "initializing tderadio lirc plugin"
msgstr "initialisiere das Plugin für die Fernsteuerung (LIRC)"
#: lircsupport.cpp:65
@@ -185,7 +185,7 @@ msgstr ""
"für TDERadio erzeugt."
#: lircsupport.cpp:94
-msgid "There is no entry for kradio in any of your .lircrc files."
+msgid "There is no entry for tderadio in any of your .lircrc files."
msgstr "Es gibt keinen Eintrag für TDERadio in jeglichen .lirc-Dateien"
#: lircsupport.cpp:95
@@ -193,17 +193,17 @@ msgid "Please setup your .lircrc files correctly."
msgstr "Bitte konfigurieren Sie Ihre .lirc-Dateien richtig."
#: lircsupport.cpp:106 lircsupport.cpp:107
-msgid "Initializing kradio lirc plugin failed"
+msgid "Initializing tderadio lirc plugin failed"
msgstr "Die Initialisierung des TDERadio LIRC Plugins schlug fehl"
#: lircsupport.cpp:109 lircsupport.cpp:110
-msgid "Initializing kradio lirc plugin successful"
+msgid "Initializing tderadio lirc plugin successful"
msgstr "Die Initialisierung des LIRC Plugins war erfolgreich"
#: lircsupport.cpp:167
msgid ""
"Reading from LIRC socket failed. Disabling LIRC Functions till next start of "
-"kradio"
+"tderadio"
msgstr ""
"Das Lesen vom LIRC-Socket ist fehlgeschlagen. Die LIRC-Funktion wird bis zum "
"nächsten Start von TDERadio temporär abgeschaltet."
diff --git a/tderadio3/plugins/lirc/po/ru.po b/tderadio3/plugins/lirc/po/ru.po
index 3ac8f5b..65817d6 100644
--- a/tderadio3/plugins/lirc/po/ru.po
+++ b/tderadio3/plugins/lirc/po/ru.po
@@ -1,5 +1,5 @@
# translation of ru.po to
-# translation of kradio-lirc.po to
+# translation of tderadio-lirc.po to
# This file is put in the public domain.
# Алексей Кузнецов <Alexey.Kouznetsov@GMail.com>, 2006.
#
@@ -172,7 +172,7 @@ msgid "LIRC Plugin"
msgstr "Модуль ДУ (LIRC)"
#: lircsupport.cpp:56 lircsupport.cpp:57
-msgid "initializing kradio lirc plugin"
+msgid "initializing tderadio lirc plugin"
msgstr "Инициализация модуля LIRC"
#: lircsupport.cpp:65
@@ -181,7 +181,7 @@ msgid ""
msgstr "%1 не существует. Был создан файл .lircrc для TDERadio по умолчанию"
#: lircsupport.cpp:94
-msgid "There is no entry for kradio in any of your .lircrc files."
+msgid "There is no entry for tderadio in any of your .lircrc files."
msgstr "Ни в одном из ваших файлов .lircrc нет упоминания о TDERadio."
#: lircsupport.cpp:95
@@ -189,17 +189,17 @@ msgid "Please setup your .lircrc files correctly."
msgstr "Настройте файлы .lircrc"
#: lircsupport.cpp:106 lircsupport.cpp:107
-msgid "Initializing kradio lirc plugin failed"
+msgid "Initializing tderadio lirc plugin failed"
msgstr "Инициализация модуля LIRC не удалась"
#: lircsupport.cpp:109 lircsupport.cpp:110
-msgid "Initializing kradio lirc plugin successful"
+msgid "Initializing tderadio lirc plugin successful"
msgstr "Модуль LIRC инициализирован"
#: lircsupport.cpp:167
msgid ""
"Reading from LIRC socket failed. Disabling LIRC Functions till next start of "
-"kradio"
+"tderadio"
msgstr ""
"Чтение из сокета LIRC не удалось. Отключаю функции LIRC до следующего "
"запуска TDERadio."
diff --git a/tderadio3/plugins/oss-sound/Makefile.am b/tderadio3/plugins/oss-sound/Makefile.am
index ffdd5be..84d2fd1 100644
--- a/tderadio3/plugins/oss-sound/Makefile.am
+++ b/tderadio3/plugins/oss-sound/Makefile.am
@@ -3,7 +3,7 @@ SUBDIRS = po icons .
INCLUDES = $(all_includes)
METASOURCES = AUTO
-libkradio_LTLIBRARIES = liboss-sound.la
+libtderadio_LTLIBRARIES = liboss-sound.la
liboss_sound_la_SOURCES = oss-sound.cpp oss-sound-configuration-ui.ui \
oss-sound-configuration.cpp
liboss_sound_la_LDFLAGS = -module -avoid-version $(KDE_RPATH) $(all_libraries)
@@ -11,8 +11,8 @@ liboss_sound_la_LDFLAGS = -module -avoid-version $(KDE_RPATH) $(all_libraries)
noinst_HEADERS = oss-sound.h oss-sound-configuration.h
#messages: rc.cpp
-# $(XGETTEXT) *.cpp *.h -o po/kradio-oss-sound.pot
+# $(XGETTEXT) *.cpp *.h -o po/tderadio-oss-sound.pot
messages: rc.cpp
$(EXTRACTRC) *.rc *.ui >> rc.cpp
- $(XGETTEXT) rc.cpp *.h *.cpp -o po/kradio-oss-sound.pot
+ $(XGETTEXT) rc.cpp *.h *.cpp -o po/tderadio-oss-sound.pot
diff --git a/tderadio3/plugins/oss-sound/icons/Makefile.am b/tderadio3/plugins/oss-sound/icons/Makefile.am
index b3f2583..354090a 100644
--- a/tderadio3/plugins/oss-sound/icons/Makefile.am
+++ b/tderadio3/plugins/oss-sound/icons/Makefile.am
@@ -1,2 +1,2 @@
icons_ICON = AUTO
-iconsdir = $(kde_datadir)/kradio/icons
+iconsdir = $(kde_datadir)/tderadio/icons
diff --git a/tderadio3/plugins/oss-sound/oss-sound.cpp b/tderadio3/plugins/oss-sound/oss-sound.cpp
index 0c06f33..ac1aac4 100644
--- a/tderadio3/plugins/oss-sound/oss-sound.cpp
+++ b/tderadio3/plugins/oss-sound/oss-sound.cpp
@@ -35,7 +35,7 @@
///////////////////////////////////////////////////////////////////////
//// plugin library functions
-PLUGIN_LIBRARY_FUNCTIONS(OSSSoundDevice, "kradio-oss-sound", i18n("Open Sound System (OSS) Support"));
+PLUGIN_LIBRARY_FUNCTIONS(OSSSoundDevice, "tderadio-oss-sound", i18n("Open Sound System (OSS) Support"));
/////////////////////////////////////////////////////////////////////////////
@@ -171,20 +171,20 @@ ConfigPageInfo OSSSoundDevice::createConfigurationPage()
return ConfigPageInfo (conf,
i18n("OSS Sound"),
i18n("OSS Sound Device Options"),
- "kradio_oss");
+ "tderadio_oss");
}
AboutPageInfo OSSSoundDevice::createAboutPage()
{
-/* TDEAboutData aboutData("kradio",
+/* TDEAboutData aboutData("tderadio",
NULL,
NULL,
I18N_NOOP("OSS Sound Plugin for TDERadio"),
TDEAboutData::License_GPL,
"(c) 2004 Martin Witte",
0,
- "http://sourceforge.net/projects/kradio",
+ "http://sourceforge.net/projects/tderadio",
0);
aboutData.addAuthor("Martin Witte", "", "witte@kawo1.rwth-aachen.de");
@@ -192,7 +192,7 @@ AboutPageInfo OSSSoundDevice::createAboutPage()
new TDERadioAboutWidget(aboutData, TDERadioAboutWidget::AbtTabbed),
i18n("OSS Sound"),
i18n("OSS Sound"),
- "kradio_oss_sound"
+ "tderadio_oss_sound"
);
*/
return AboutPageInfo();
diff --git a/tderadio3/plugins/oss-sound/po/Makefile.am b/tderadio3/plugins/oss-sound/po/Makefile.am
index d6cceda..daec2a5 100644
--- a/tderadio3/plugins/oss-sound/po/Makefile.am
+++ b/tderadio3/plugins/oss-sound/po/Makefile.am
@@ -1,2 +1,2 @@
-PACKAGE = kradio-oss-sound
+PACKAGE = tderadio-oss-sound
POFILES = AUTO
diff --git a/tderadio3/plugins/oss-sound/po/de.po b/tderadio3/plugins/oss-sound/po/de.po
index 5d3ab49..a0ee831 100644
--- a/tderadio3/plugins/oss-sound/po/de.po
+++ b/tderadio3/plugins/oss-sound/po/de.po
@@ -1,5 +1,5 @@
# translation of de.po to
-# translation of kradio-oss-sound.po to
+# translation of tderadio-oss-sound.po to
# This file is put in the public domain.
#
# Ernst Martin Witte <emw@nocabal.de>, 2006.
diff --git a/tderadio3/plugins/oss-sound/po/ru.po b/tderadio3/plugins/oss-sound/po/ru.po
index a42e5ec..98472ba 100644
--- a/tderadio3/plugins/oss-sound/po/ru.po
+++ b/tderadio3/plugins/oss-sound/po/ru.po
@@ -1,5 +1,5 @@
# translation of ru.po to
-# translation of kradio-oss-sound.po to
+# translation of tderadio-oss-sound.po to
# This file is put in the public domain.
# Алексей Кузнецов <Alexey.Kouznetsov@GMail.com>, 2006.
#
diff --git a/tderadio3/plugins/radio/Makefile.am b/tderadio3/plugins/radio/Makefile.am
index 2481b58..ffa9a6d 100644
--- a/tderadio3/plugins/radio/Makefile.am
+++ b/tderadio3/plugins/radio/Makefile.am
@@ -1,9 +1,9 @@
SUBDIRS = po .
-INCLUDES = -I$(top_builddir)/kradio3/src -I$(top_srcdir)/kradio3 $(all_includes)
+INCLUDES = -I$(top_builddir)/tderadio3/src -I$(top_srcdir)/tderadio3 $(all_includes)
METASOURCES = AUTO
-libkradio_LTLIBRARIES = libradio.la
+libtderadio_LTLIBRARIES = libradio.la
libradio_la_SOURCES = radio-configuration.cpp radio-configuration-ui.ui \
radio.cpp
libradio_la_LDFLAGS = -module -avoid-version $(KDE_RPATH) $(all_libraries)
@@ -11,8 +11,8 @@ libradio_la_LDFLAGS = -module -avoid-version $(KDE_RPATH) $(all_libraries)
noinst_HEADERS = radio-configuration.h radio.h
#messages: rc.cpp
-# $(XGETTEXT) *.cpp *.h -o po/kradio-radio.pot
+# $(XGETTEXT) *.cpp *.h -o po/tderadio-radio.pot
messages: rc.cpp
$(EXTRACTRC) *.rc *.ui >> rc.cpp
- $(XGETTEXT) rc.cpp *.h *.cpp -o po/kradio-radio.pot
+ $(XGETTEXT) rc.cpp *.h *.cpp -o po/tderadio-radio.pot
diff --git a/tderadio3/plugins/radio/po/Makefile.am b/tderadio3/plugins/radio/po/Makefile.am
index 9fedd9c..b5baba9 100644
--- a/tderadio3/plugins/radio/po/Makefile.am
+++ b/tderadio3/plugins/radio/po/Makefile.am
@@ -1,2 +1,2 @@
-PACKAGE = kradio-radio
+PACKAGE = tderadio-radio
POFILES = AUTO
diff --git a/tderadio3/plugins/radio/po/de.po b/tderadio3/plugins/radio/po/de.po
index 73c7a6e..cdc0a86 100644
--- a/tderadio3/plugins/radio/po/de.po
+++ b/tderadio3/plugins/radio/po/de.po
@@ -1,5 +1,5 @@
# translation of de.po to
-# translation of kradio-radio.po to
+# translation of tderadio-radio.po to
# This file is put in the public domain.
#
# Ernst Martin Witte <emw@nocabal.de>, 2006.
@@ -123,7 +123,7 @@ msgstr "Letzte Änderung"
#, no-c-format
msgid ""
"<p align=\"center\">Click on the link below to contribute this station "
-"preset file to the kradio project.</p>"
+"preset file to the tderadio project.</p>"
msgstr ""
"<p align=\"center\">Klicke auf den folgenden Link um mit deinen "
"Senderinformationen zum TDERadio-Projekt beizutragen.</p>"
diff --git a/tderadio3/plugins/radio/po/ru.po b/tderadio3/plugins/radio/po/ru.po
index 2174203..3a4f7a0 100644
--- a/tderadio3/plugins/radio/po/ru.po
+++ b/tderadio3/plugins/radio/po/ru.po
@@ -1,5 +1,5 @@
# translation of ru.po to
-# translation of kradio-radio.po to
+# translation of tderadio-radio.po to
# This file is put in the public domain.
# Алексей Кузнецов <Alexey.Kouznetsov@GMail.com>, 2006.
#
@@ -123,7 +123,7 @@ msgstr "Последнее изменение"
#, no-c-format
msgid ""
"<p align=\"center\">Click on the link below to contribute this station "
-"preset file to the kradio project.</p>"
+"preset file to the tderadio project.</p>"
msgstr ""
"<p align=\"center\"> Чтобы добавить этот файл в проект TDERadio, щёлкните по "
"ссылке ниже</p>"
diff --git a/tderadio3/plugins/radio/radio-configuration-ui.ui b/tderadio3/plugins/radio/radio-configuration-ui.ui
index 2ea4d33..5c6f060 100644
--- a/tderadio3/plugins/radio/radio-configuration-ui.ui
+++ b/tderadio3/plugins/radio/radio-configuration-ui.ui
@@ -695,7 +695,7 @@
<cstring>textLabel1</cstring>
</property>
<property name="text">
- <string>&lt;p align="center"&gt;Click on the link below to contribute this station preset file to the kradio project.&lt;/p&gt;</string>
+ <string>&lt;p align="center"&gt;Click on the link below to contribute this station preset file to the tderadio project.&lt;/p&gt;</string>
</property>
<property name="alignment">
<set>WordBreak|AlignCenter</set>
diff --git a/tderadio3/plugins/radio/radio-configuration.cpp b/tderadio3/plugins/radio/radio-configuration.cpp
index eda1083..9f23413 100644
--- a/tderadio3/plugins/radio/radio-configuration.cpp
+++ b/tderadio3/plugins/radio/radio-configuration.cpp
@@ -29,7 +29,7 @@
#include <math.h>
#include <tqlistbox.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
#include <tqdatetimeedit.h>
#include <tqlineedit.h>
#include <tqlabel.h>
@@ -446,7 +446,7 @@ void RadioConfiguration::slotActivateStation(int idx)
void RadioConfiguration::slotLoadPresets()
{
- KFileDialog fd(locate("data", "kradio/presets/"),
+ KFileDialog fd(locate("data", "tderadio/presets/"),
("*.krp|" + i18n("TDERadio Preset Files")).ascii(),
this,
i18n("Preset File Selection").ascii(),
diff --git a/tderadio3/plugins/radio/radio.cpp b/tderadio3/plugins/radio/radio.cpp
index 56280e3..ab1a553 100644
--- a/tderadio3/plugins/radio/radio.cpp
+++ b/tderadio3/plugins/radio/radio.cpp
@@ -31,14 +31,14 @@
///////////////////////////////////////////////////////////////////////
//// plugin library functions
-PLUGIN_LIBRARY_FUNCTIONS(Radio, "kradio-radio", i18n("Central Radio Device Multiplexer"));
+PLUGIN_LIBRARY_FUNCTIONS(Radio, "tderadio-radio", i18n("Central Radio Device Multiplexer"));
/////////////////////////////////////////////////////////////////////////////
Radio::Radio(const TQString &name)
: PluginBase(name, i18n("Radio Multiplexer Plugin")),
IRadioDeviceClient(-1),
- m_presetFile(locateLocal("data", "kradio/stations.krp")),
+ m_presetFile(locateLocal("data", "tderadio/stations.krp")),
m_activeDevice (NULL)
{
}
@@ -95,7 +95,7 @@ void Radio::restoreState (TDEConfig *config)
TQString());
bool first_restore = false;
if (m_presetFile.isNull() || m_presetFile.length() == 0) {
- m_presetFile = locateLocal("data", "kradio/stations.krp");
+ m_presetFile = locateLocal("data", "tderadio/stations.krp");
first_restore = true;
}
@@ -115,21 +115,21 @@ ConfigPageInfo Radio::createConfigurationPage()
conf,
i18n("Radio Stations"),
i18n("Setup Radio Stations"),
- "kradio"
+ "tderadio"
);
}
AboutPageInfo Radio::createAboutPage()
{
-/* TDEAboutData aboutData("kradio",
+/* TDEAboutData aboutData("tderadio",
NULL,
NULL,
I18N_NOOP("Radio Device Multiplexer and Station Management 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");
@@ -138,7 +138,7 @@ AboutPageInfo Radio::createAboutPage()
new TDERadioAboutWidget(aboutData, TDERadioAboutWidget::AbtTabbed),
i18n("Device and Station Management"),
i18n("Radio Device Multiplexer and Station Management"),
- "kradio"
+ "tderadio"
);
*/
return AboutPageInfo();
diff --git a/tderadio3/plugins/recording/Makefile.am b/tderadio3/plugins/recording/Makefile.am
index 1cbd6aa..f45f5fb 100644
--- a/tderadio3/plugins/recording/Makefile.am
+++ b/tderadio3/plugins/recording/Makefile.am
@@ -3,7 +3,7 @@ SUBDIRS = po icons .
INCLUDES = $(all_includes)
METASOURCES = AUTO
-libkradio_LTLIBRARIES = librecording.la
+libtderadio_LTLIBRARIES = librecording.la
librecording_la_SOURCES = recording-configuration.cpp \
recording-configuration-ui.ui recording.cpp recording-config.cpp reccfg_interfaces.cpp encoder.cpp \
recording-datamonitor.cpp recording-monitor.cpp encoder_mp3.cpp encoder_ogg.cpp encoder_pcm.cpp
@@ -15,8 +15,8 @@ noinst_HEADERS = recording-configuration.h recording.h recording-config.h \
recording-monitor.h encoder_mp3.h encoder_ogg.h encoder_pcm.h
#messages: rc.cpp
-# $(XGETTEXT) *.cpp *.h -o po/kradio-recording.pot
+# $(XGETTEXT) *.cpp *.h -o po/tderadio-recording.pot
messages: rc.cpp
$(EXTRACTRC) *.rc *.ui >> rc.cpp
- $(XGETTEXT) rc.cpp *.h *.cpp -o po/kradio-recording.pot
+ $(XGETTEXT) rc.cpp *.h *.cpp -o po/tderadio-recording.pot
diff --git a/tderadio3/plugins/recording/icons/Makefile.am b/tderadio3/plugins/recording/icons/Makefile.am
index b3f2583..354090a 100644
--- a/tderadio3/plugins/recording/icons/Makefile.am
+++ b/tderadio3/plugins/recording/icons/Makefile.am
@@ -1,2 +1,2 @@
icons_ICON = AUTO
-iconsdir = $(kde_datadir)/kradio/icons
+iconsdir = $(kde_datadir)/tderadio/icons
diff --git a/tderadio3/plugins/recording/po/Makefile.am b/tderadio3/plugins/recording/po/Makefile.am
index 80443c3..b2533fe 100644
--- a/tderadio3/plugins/recording/po/Makefile.am
+++ b/tderadio3/plugins/recording/po/Makefile.am
@@ -1,2 +1,2 @@
-PACKAGE = kradio-recording
+PACKAGE = tderadio-recording
POFILES = AUTO
diff --git a/tderadio3/plugins/recording/po/de.po b/tderadio3/plugins/recording/po/de.po
index f222057..3b529a2 100644
--- a/tderadio3/plugins/recording/po/de.po
+++ b/tderadio3/plugins/recording/po/de.po
@@ -1,5 +1,5 @@
# translation of de.po to
-# translation of kradio-recording.po to
+# translation of tderadio-recording.po to
# This file is put in the public domain.
#
# Ernst Martin Witte <emw@nocabal.de>, 2006.
diff --git a/tderadio3/plugins/recording/po/ru.po b/tderadio3/plugins/recording/po/ru.po
index 9713428..34fcfca 100644
--- a/tderadio3/plugins/recording/po/ru.po
+++ b/tderadio3/plugins/recording/po/ru.po
@@ -1,5 +1,5 @@
# translation of ru.po to
-# translation of kradio-recording.po to
+# translation of tderadio-recording.po to
# This file is put in the public domain.
# Алексей Кузнецов <Alexey.Kouznetsov@GMail.com>, 2006.
#
diff --git a/tderadio3/plugins/recording/recording-datamonitor.h b/tderadio3/plugins/recording/recording-datamonitor.h
index bcb7935..2ac493e 100644
--- a/tderadio3/plugins/recording/recording-datamonitor.h
+++ b/tderadio3/plugins/recording/recording-datamonitor.h
@@ -21,7 +21,7 @@
#include <tqframe.h>
#include <tqcolor.h>
-//#include <kradio/interfaces/recording-interfaces.h>
+//#include <tderadio/interfaces/recording-interfaces.h>
#include "../../src/include/soundstreamclient_interfaces.h"
class RecordingDataMonitor : public TQFrame//,
diff --git a/tderadio3/plugins/recording/recording-monitor.cpp b/tderadio3/plugins/recording/recording-monitor.cpp
index 37edfe9..c83f543 100644
--- a/tderadio3/plugins/recording/recording-monitor.cpp
+++ b/tderadio3/plugins/recording/recording-monitor.cpp
@@ -156,14 +156,14 @@ ConfigPageInfo RecordingMonitor::createConfigurationPage()
AboutPageInfo RecordingMonitor::createAboutPage()
{
-/* TDEAboutData aboutData("kradio",
+/* TDEAboutData aboutData("tderadio",
NULL,
NULL,
I18N_NOOP("Recording Monitor Plugin for TDERadio"),
TDEAboutData::License_GPL,
"(c) 2002-2005 Martin Witte",
0,
- "http://sourceforge.net/projects/kradio",
+ "http://sourceforge.net/projects/tderadio",
0);
aboutData.addAuthor("Martin Witte", "", "witte@kawo1.rwth-aachen.de");
diff --git a/tderadio3/plugins/recording/recording-monitor.h b/tderadio3/plugins/recording/recording-monitor.h
index ecc38f2..b2a8890 100644
--- a/tderadio3/plugins/recording/recording-monitor.h
+++ b/tderadio3/plugins/recording/recording-monitor.h
@@ -26,7 +26,7 @@
#include "../../src/include/widgetplugins.h"
#include "../../src/include/soundstreamclient_interfaces.h"
-//#include <kradio/interfaces/recording-interfaces.h>
+//#include <tderadio/interfaces/recording-interfaces.h>
class TQLabel;
diff --git a/tderadio3/plugins/recording/recording.cpp b/tderadio3/plugins/recording/recording.cpp
index 7b685f4..0b17d30 100644
--- a/tderadio3/plugins/recording/recording.cpp
+++ b/tderadio3/plugins/recording/recording.cpp
@@ -43,7 +43,7 @@
//// plugin library functions
PLUGIN_LIBRARY_FUNCTIONS2(
- Recording, "kradio-recording", i18n("TDERadio Recording Plugin"),
+ Recording, "tderadio-recording", i18n("TDERadio Recording Plugin"),
RecordingMonitor, i18n("TDERadio Recording Monitor")
);
@@ -130,20 +130,20 @@ ConfigPageInfo Recording::createConfigurationPage()
return ConfigPageInfo(c,
i18n("Recording"),
i18n("Recording"),
- "kradio_record");
+ "tderadio_record");
}
AboutPageInfo Recording::createAboutPage()
{
-/* TDEAboutData aboutData("kradio",
+/* TDEAboutData aboutData("tderadio",
NULL,
NULL,
I18N_NOOP("Recording Monitor for TDERadio"),
TDEAboutData::License_GPL,
"(c) 2002-2005 Martin Witte",
0,
- "http://sourceforge.net/projects/kradio",
+ "http://sourceforge.net/projects/tderadio",
0);
aboutData.addAuthor("Martin Witte", "", "witte@kawo1.rwth-aachen.de");
@@ -151,7 +151,7 @@ AboutPageInfo Recording::createAboutPage()
new TDERadioAboutWidget(aboutData, TDERadioAboutWidget::AbtTabbed),
i18n("Recording"),
i18n("Recording Plugin"),
- "kradio_record"
+ "tderadio_record"
);*/
return AboutPageInfo();
}
@@ -227,7 +227,7 @@ bool Recording::setPreRecording (bool enable, int seconds)
if (*it != NULL) {
delete *it;
}
- *it = new FileRingBuffer(m_config.m_Directory + "/kradio-prerecord-"+TQString::number(it.key().getID()), m_config.m_PreRecordingSeconds * m_config.m_SoundFormat.m_SampleRate * m_config.m_SoundFormat.frameSize());
+ *it = new FileRingBuffer(m_config.m_Directory + "/tderadio-prerecord-"+TQString::number(it.key().getID()), m_config.m_PreRecordingSeconds * m_config.m_SoundFormat.m_SampleRate * m_config.m_SoundFormat.frameSize());
SoundFormat sf = m_config.m_SoundFormat;
sendStartCaptureWithFormat(it.key(), sf, sf, false);
}
@@ -314,7 +314,7 @@ bool Recording::startPlayback(SoundStreamID id)
delete m_PreRecordingBuffers[id];
m_PreRecordingBuffers[id] = NULL;
if (m_config.m_PreRecordingEnable) {
- m_PreRecordingBuffers[id] = new FileRingBuffer(m_config.m_Directory + "/kradio-prerecord-"+TQString::number(id.getID()), m_config.m_PreRecordingSeconds * m_config.m_SoundFormat.m_SampleRate * m_config.m_SoundFormat.frameSize());
+ m_PreRecordingBuffers[id] = new FileRingBuffer(m_config.m_Directory + "/tderadio-prerecord-"+TQString::number(id.getID()), m_config.m_PreRecordingSeconds * m_config.m_SoundFormat.m_SampleRate * m_config.m_SoundFormat.frameSize());
SoundFormat sf = m_config.m_SoundFormat;
sendStartCaptureWithFormat(id, sf, sf, false);
}
@@ -387,7 +387,7 @@ bool Recording::stopRecording(SoundStreamID id)
bool b = false;
queryIsPlaybackRunning(id, b);
if (b) {
- m_PreRecordingBuffers[id] = new FileRingBuffer(m_config.m_Directory + "/kradio-prerecord-"+TQString::number(id.getID()), m_config.m_PreRecordingSeconds * m_config.m_SoundFormat.m_SampleRate * m_config.m_SoundFormat.frameSize());
+ m_PreRecordingBuffers[id] = new FileRingBuffer(m_config.m_Directory + "/tderadio-prerecord-"+TQString::number(id.getID()), m_config.m_PreRecordingSeconds * m_config.m_SoundFormat.m_SampleRate * m_config.m_SoundFormat.frameSize());
} else {
m_PreRecordingBuffers[id] = NULL;
}
@@ -536,7 +536,7 @@ bool Recording::startEncoder(SoundStreamID ssid, const RecordingConfig &cfg)
sdate.sprintf("%d.%d.%d.%d.%d",date.year(),date.month(),date.day(),time.hour(),time.minute());
TQString output = m_config.m_Directory
- + "/kradio-recording-"
+ + "/tderadio-recording-"
+ station
+ sdate
+ ext;
diff --git a/tderadio3/plugins/soundserver/Makefile.am b/tderadio3/plugins/soundserver/Makefile.am
index 17c5946..bac5fe3 100644
--- a/tderadio3/plugins/soundserver/Makefile.am
+++ b/tderadio3/plugins/soundserver/Makefile.am
@@ -3,7 +3,7 @@ SUBDIRS = po .
INCLUDES = $(all_includes)
METASOURCES = AUTO
-libkradio_LTLIBRARIES = libsoundserver.la
+libtderadio_LTLIBRARIES = libsoundserver.la
libsoundserver_la_SOURCES = soundserver.cpp
libsoundserver_la_LDFLAGS = -module -avoid-version $(KDE_RPATH) $(all_libraries)
@@ -11,8 +11,8 @@ libsoundserver_la_LDFLAGS = -module -avoid-version $(KDE_RPATH) $(all_libraries)
noinst_HEADERS = soundserver.h
#messages: rc.cpp
-# $(XGETTEXT) *.cpp *.h -o po/kradio-sound-server.pot
+# $(XGETTEXT) *.cpp *.h -o po/tderadio-sound-server.pot
messages: rc.cpp
$(EXTRACTRC) *.rc *.ui >> rc.cpp
- $(XGETTEXT) rc.cpp *.h *.cpp -o po/kradio-soundserver.pot
+ $(XGETTEXT) rc.cpp *.h *.cpp -o po/tderadio-soundserver.pot
diff --git a/tderadio3/plugins/soundserver/po/Makefile.am b/tderadio3/plugins/soundserver/po/Makefile.am
index 22b977e..f469927 100644
--- a/tderadio3/plugins/soundserver/po/Makefile.am
+++ b/tderadio3/plugins/soundserver/po/Makefile.am
@@ -1,2 +1,2 @@
-PACKAGE = kradio-soundserver
+PACKAGE = tderadio-soundserver
POFILES = AUTO
diff --git a/tderadio3/plugins/soundserver/po/de.po b/tderadio3/plugins/soundserver/po/de.po
index a3273b5..2d6622c 100644
--- a/tderadio3/plugins/soundserver/po/de.po
+++ b/tderadio3/plugins/soundserver/po/de.po
@@ -1,5 +1,5 @@
# translation of de.po to
-# translation of kradio-sound-server.po to
+# translation of tderadio-sound-server.po to
# This file is put in the public domain.
#
# Ernst Martin Witte <emw@nocabal.de>, 2006.
@@ -25,5 +25,5 @@ msgid "SoundServer Plugin"
msgstr "SoundServer Plugin"
#: soundserver.cpp:34
-msgid "initializing kradio soundserver"
+msgid "initializing tderadio soundserver"
msgstr "Initialisierung des TDERadio-Soundservers"
diff --git a/tderadio3/plugins/soundserver/po/ru.po b/tderadio3/plugins/soundserver/po/ru.po
index 794279f..9feb710 100644
--- a/tderadio3/plugins/soundserver/po/ru.po
+++ b/tderadio3/plugins/soundserver/po/ru.po
@@ -1,5 +1,5 @@
# translation of ru.po to
-# translation of kradio-soundserver.po to
+# translation of tderadio-soundserver.po to
# This file is put in the public domain.
# Алексей Кузнецов <Alexey.Kouznetsov@GMail.com>, 2006.
#
@@ -25,5 +25,5 @@ msgid "SoundServer Plugin"
msgstr "Модуль звукового сервера"
#: soundserver.cpp:34
-msgid "initializing kradio soundserver"
+msgid "initializing tderadio soundserver"
msgstr "Включение звукового сервера TDERadio"
diff --git a/tderadio3/plugins/soundserver/soundserver.cpp b/tderadio3/plugins/soundserver/soundserver.cpp
index 809cc02..ac61f80 100644
--- a/tderadio3/plugins/soundserver/soundserver.cpp
+++ b/tderadio3/plugins/soundserver/soundserver.cpp
@@ -24,14 +24,14 @@
///////////////////////////////////////////////////////////////////////
//// plugin library functions
-PLUGIN_LIBRARY_FUNCTIONS(SoundServer, "kradio-soundserver", i18n("SoundServer"));
+PLUGIN_LIBRARY_FUNCTIONS(SoundServer, "tderadio-soundserver", i18n("SoundServer"));
/////////////////////////////////////////////////////////////////////////////
SoundServer::SoundServer(const TQString &name)
: PluginBase(name, i18n("SoundServer Plugin"))
{
- logDebug(i18n("initializing kradio soundserver"));
+ logDebug(i18n("initializing tderadio soundserver"));
}
SoundServer::~SoundServer()
diff --git a/tderadio3/plugins/streaming/Makefile.am b/tderadio3/plugins/streaming/Makefile.am
index 0e5ed11..783a6e2 100644
--- a/tderadio3/plugins/streaming/Makefile.am
+++ b/tderadio3/plugins/streaming/Makefile.am
@@ -3,7 +3,7 @@ SUBDIRS = po icons .
INCLUDES = $(all_includes)
METASOURCES = AUTO
-libkradio_LTLIBRARIES = libstreaming.la
+libtderadio_LTLIBRARIES = libstreaming.la
libstreaming_la_SOURCES = streaming.cpp streaming-configuration-ui.ui \
streaming-configuration.cpp streaming-job.cpp
libstreaming_la_LDFLAGS = -module -avoid-version $(KDE_RPATH) $(all_libraries)
@@ -11,8 +11,8 @@ libstreaming_la_LDFLAGS = -module -avoid-version $(KDE_RPATH) $(all_libraries)
noinst_HEADERS = streaming.h streaming-configuration.h streaming-job.h
#messages: rc.cpp
-# $(XGETTEXT) *.cpp *.h -o po/kradio-streaming.pot
+# $(XGETTEXT) *.cpp *.h -o po/tderadio-streaming.pot
messages: rc.cpp
$(EXTRACTRC) *.rc *.ui >> rc.cpp
- $(XGETTEXT) rc.cpp *.h *.cpp -o po/kradio-streaming.pot
+ $(XGETTEXT) rc.cpp *.h *.cpp -o po/tderadio-streaming.pot
diff --git a/tderadio3/plugins/streaming/icons/Makefile.am b/tderadio3/plugins/streaming/icons/Makefile.am
index b3f2583..354090a 100644
--- a/tderadio3/plugins/streaming/icons/Makefile.am
+++ b/tderadio3/plugins/streaming/icons/Makefile.am
@@ -1,2 +1,2 @@
icons_ICON = AUTO
-iconsdir = $(kde_datadir)/kradio/icons
+iconsdir = $(kde_datadir)/tderadio/icons
diff --git a/tderadio3/plugins/streaming/po/Makefile.am b/tderadio3/plugins/streaming/po/Makefile.am
index e1b5685..ce811b6 100644
--- a/tderadio3/plugins/streaming/po/Makefile.am
+++ b/tderadio3/plugins/streaming/po/Makefile.am
@@ -1,2 +1,2 @@
-PACKAGE = kradio-streaming
+PACKAGE = tderadio-streaming
POFILES = AUTO
diff --git a/tderadio3/plugins/streaming/po/de.po b/tderadio3/plugins/streaming/po/de.po
index 84459b0..fdefa5a 100644
--- a/tderadio3/plugins/streaming/po/de.po
+++ b/tderadio3/plugins/streaming/po/de.po
@@ -1,5 +1,5 @@
# translation of de.po to
-# translation of kradio-streaming.po to
+# translation of tderadio-streaming.po to
# This file is put in the public domain.
#
# Ernst Martin Witte <emw@nocabal.de>, 2006.
diff --git a/tderadio3/plugins/streaming/po/ru.po b/tderadio3/plugins/streaming/po/ru.po
index c5025f6..0a48d46 100644
--- a/tderadio3/plugins/streaming/po/ru.po
+++ b/tderadio3/plugins/streaming/po/ru.po
@@ -1,5 +1,5 @@
# translation of ru.po to
-# translation of kradio-streaming.po to
+# translation of tderadio-streaming.po to
# This file is put in the public domain.
# Алексей Кузнецов <Alexey.Kouznetsov@GMail.com>, 2006.
#
diff --git a/tderadio3/plugins/streaming/streaming-configuration-ui.ui b/tderadio3/plugins/streaming/streaming-configuration-ui.ui
index 28f0d98..5e06f73 100644
--- a/tderadio3/plugins/streaming/streaming-configuration-ui.ui
+++ b/tderadio3/plugins/streaming/streaming-configuration-ui.ui
@@ -764,8 +764,8 @@
<pixmapfunction>SmallIconSet</pixmapfunction>
<layoutdefaults spacing="6" margin="0"/>
<includehints>
- <includehint>klistview.h</includehint>
- <includehint>klistview.h</includehint>
+ <includehint>tdelistview.h</includehint>
+ <includehint>tdelistview.h</includehint>
<includehint>kcombobox.h</includehint>
<includehint>kcombobox.h</includehint>
<includehint>kcombobox.h</includehint>
diff --git a/tderadio3/plugins/streaming/streaming-configuration.cpp b/tderadio3/plugins/streaming/streaming-configuration.cpp
index 2c519db..fbfdbd8 100644
--- a/tderadio3/plugins/streaming/streaming-configuration.cpp
+++ b/tderadio3/plugins/streaming/streaming-configuration.cpp
@@ -19,7 +19,7 @@
#include <kurlrequester.h>
#include <knuminput.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <kcombobox.h>
#include <knuminput.h>
diff --git a/tderadio3/plugins/streaming/streaming.cpp b/tderadio3/plugins/streaming/streaming.cpp
index 1d49f65..1e34a93 100644
--- a/tderadio3/plugins/streaming/streaming.cpp
+++ b/tderadio3/plugins/streaming/streaming.cpp
@@ -30,7 +30,7 @@
///////////////////////////////////////////////////////////////////////
//// plugin library functions
-PLUGIN_LIBRARY_FUNCTIONS(StreamingDevice, "kradio-streaming", i18n("Streaming Support"));
+PLUGIN_LIBRARY_FUNCTIONS(StreamingDevice, "tderadio-streaming", i18n("Streaming Support"));
/////////////////////////////////////////////////////////////////////////////
@@ -171,7 +171,7 @@ ConfigPageInfo StreamingDevice::createConfigurationPage()
return ConfigPageInfo (conf,
i18n("Streaming"),
i18n("Streaming Device Options"),
- "kradio_streaming");
+ "tderadio_streaming");
}
diff --git a/tderadio3/plugins/timecontrol/Makefile.am b/tderadio3/plugins/timecontrol/Makefile.am
index 0ac954f..edcda42 100644
--- a/tderadio3/plugins/timecontrol/Makefile.am
+++ b/tderadio3/plugins/timecontrol/Makefile.am
@@ -3,15 +3,15 @@ SUBDIRS = po icons .
INCLUDES = $(all_includes)
METASOURCES = AUTO
-libkradio_LTLIBRARIES = libtimecontrol.la
+libtderadio_LTLIBRARIES = libtimecontrol.la
libtimecontrol_la_SOURCES = timecontrol-configuration.cpp \
timecontrol-configuration-ui.ui timecontrol.cpp
libtimecontrol_la_LDFLAGS = -module -avoid-version $(KDE_RPATH) $(all_libraries)
noinst_HEADERS = timecontrol-configuration.h timecontrol.h
#messages: rc.cpp
-# $(XGETTEXT) *.cpp *.h -o po/kradio-timecontrol.pot
+# $(XGETTEXT) *.cpp *.h -o po/tderadio-timecontrol.pot
messages: rc.cpp
$(EXTRACTRC) *.rc *.ui >> rc.cpp
- $(XGETTEXT) rc.cpp *.h *.cpp -o po/kradio-timecontrol.pot
+ $(XGETTEXT) rc.cpp *.h *.cpp -o po/tderadio-timecontrol.pot
diff --git a/tderadio3/plugins/timecontrol/icons/Makefile.am b/tderadio3/plugins/timecontrol/icons/Makefile.am
index b3f2583..354090a 100644
--- a/tderadio3/plugins/timecontrol/icons/Makefile.am
+++ b/tderadio3/plugins/timecontrol/icons/Makefile.am
@@ -1,2 +1,2 @@
icons_ICON = AUTO
-iconsdir = $(kde_datadir)/kradio/icons
+iconsdir = $(kde_datadir)/tderadio/icons
diff --git a/tderadio3/plugins/timecontrol/po/Makefile.am b/tderadio3/plugins/timecontrol/po/Makefile.am
index 35fe6fd..26d490c 100644
--- a/tderadio3/plugins/timecontrol/po/Makefile.am
+++ b/tderadio3/plugins/timecontrol/po/Makefile.am
@@ -1,2 +1,2 @@
-PACKAGE = kradio-timecontrol
+PACKAGE = tderadio-timecontrol
POFILES = AUTO
diff --git a/tderadio3/plugins/timecontrol/po/de.po b/tderadio3/plugins/timecontrol/po/de.po
index 71a84f6..cd4659b 100644
--- a/tderadio3/plugins/timecontrol/po/de.po
+++ b/tderadio3/plugins/timecontrol/po/de.po
@@ -1,5 +1,5 @@
# translation of de.po to
-# translation of kradio-timecontrol.po to
+# translation of tderadio-timecontrol.po to
# This file is put in the public domain.
#
# Ernst Martin Witte <emw@nocabal.de>, 2006.
diff --git a/tderadio3/plugins/timecontrol/po/ru.po b/tderadio3/plugins/timecontrol/po/ru.po
index 6f95f37..f3608ad 100644
--- a/tderadio3/plugins/timecontrol/po/ru.po
+++ b/tderadio3/plugins/timecontrol/po/ru.po
@@ -1,5 +1,5 @@
# translation of ru.po to
-# translation of kradio-timecontrol.po to
+# translation of tderadio-timecontrol.po to
# This file is put in the public domain.
# Алексей Кузнецов <Alexey.Kouznetsov@GMail.com>, 2006.
#
diff --git a/tderadio3/plugins/timecontrol/timecontrol-configuration-ui.ui b/tderadio3/plugins/timecontrol/timecontrol-configuration-ui.ui
index b240218..4d77f9f 100644
--- a/tderadio3/plugins/timecontrol/timecontrol-configuration-ui.ui
+++ b/tderadio3/plugins/timecontrol/timecontrol-configuration-ui.ui
@@ -393,7 +393,7 @@
<string>Start Playing</string>
</property>
<property name="pixmap">
- <pixmap>"kradio_muteoff"</pixmap>
+ <pixmap>"tderadio_muteoff"</pixmap>
</property>
</item>
<item>
@@ -401,7 +401,7 @@
<string>Stop Playing</string>
</property>
<property name="pixmap">
- <pixmap>"kradio_muteon"</pixmap>
+ <pixmap>"tderadio_muteon"</pixmap>
</property>
</item>
<item>
@@ -409,7 +409,7 @@
<string>Start Recording</string>
</property>
<property name="pixmap">
- <pixmap>"kradio_record"</pixmap>
+ <pixmap>"tderadio_record"</pixmap>
</property>
</item>
<item>
@@ -417,7 +417,7 @@
<string>Stop Recording</string>
</property>
<property name="pixmap">
- <pixmap>"kradio_muteon"</pixmap>
+ <pixmap>"tderadio_muteon"</pixmap>
</property>
</item>
<property name="name">
@@ -447,6 +447,6 @@
<pixmapfunction>SmallIcon</pixmapfunction>
<layoutdefaults spacing="6" margin="0"/>
<includehints>
- <includehint>klistbox.h</includehint>
+ <includehint>tdelistbox.h</includehint>
</includehints>
</UI>
diff --git a/tderadio3/plugins/timecontrol/timecontrol-configuration.cpp b/tderadio3/plugins/timecontrol/timecontrol-configuration.cpp
index c72aa5e..24c3a04 100644
--- a/tderadio3/plugins/timecontrol/timecontrol-configuration.cpp
+++ b/tderadio3/plugins/timecontrol/timecontrol-configuration.cpp
@@ -28,7 +28,7 @@ using std::sort;
#include <tqcheckbox.h>
#include <tqpushbutton.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
#include <klocale.h>
#include "../../src/include/stationlist.h"
diff --git a/tderadio3/plugins/timecontrol/timecontrol.cpp b/tderadio3/plugins/timecontrol/timecontrol.cpp
index 15f0bde..fee7c28 100644
--- a/tderadio3/plugins/timecontrol/timecontrol.cpp
+++ b/tderadio3/plugins/timecontrol/timecontrol.cpp
@@ -39,7 +39,7 @@ const char *AlarmTypeElement = "type";
///////////////////////////////////////////////////////////////////////
//// plugin library functions
-PLUGIN_LIBRARY_FUNCTIONS(TimeControl, "kradio-timecontrol", i18n("Time Control and Alarm Functions"));
+PLUGIN_LIBRARY_FUNCTIONS(TimeControl, "tderadio-timecontrol", i18n("Time Control and Alarm Functions"));
///////////////////////////////////////////////////////////////////////
@@ -267,13 +267,13 @@ ConfigPageInfo TimeControl::createConfigurationPage()
{
TimeControlConfiguration *conf = new TimeControlConfiguration(NULL);
connectI(conf);
- return ConfigPageInfo (conf, i18n("Alarms"), i18n("Setup Alarms"), "kradio_kalarm");
+ return ConfigPageInfo (conf, i18n("Alarms"), i18n("Setup Alarms"), "tderadio_kalarm");
}
AboutPageInfo TimeControl::createAboutPage()
{
-/* TDEAboutData aboutData("kradio",
+/* TDEAboutData aboutData("tderadio",
NULL,
NULL,
I18N_NOOP("Time Control Plugin for TDERadio."
@@ -283,7 +283,7 @@ AboutPageInfo TimeControl::createAboutPage()
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");
@@ -292,7 +292,7 @@ AboutPageInfo TimeControl::createAboutPage()
new TDERadioAboutWidget(aboutData, TDERadioAboutWidget::AbtTabbed),
i18n("Alarms"),
i18n("Time Control Plugin"),
- "kradio_kalarm"
+ "tderadio_kalarm"
);*/
return AboutPageInfo();
}
diff --git a/tderadio3/plugins/timeshifter/Makefile.am b/tderadio3/plugins/timeshifter/Makefile.am
index 23da794..38d99cb 100644
--- a/tderadio3/plugins/timeshifter/Makefile.am
+++ b/tderadio3/plugins/timeshifter/Makefile.am
@@ -3,7 +3,7 @@ SUBDIRS = po icons .
INCLUDES = $(all_includes)
METASOURCES = AUTO
-libkradio_LTLIBRARIES = libtimeshifter.la
+libtderadio_LTLIBRARIES = libtimeshifter.la
libtimeshifter_la_SOURCES = timeshifter.cpp timeshifter-configuration-ui.ui \
timeshifter-configuration.cpp
libtimeshifter_la_LDFLAGS = -module -avoid-version $(KDE_RPATH) $(all_libraries)
@@ -11,8 +11,8 @@ libtimeshifter_la_LDFLAGS = -module -avoid-version $(KDE_RPATH) $(all_libraries)
noinst_HEADERS = timeshifter.h timeshifter-configuration.h
#messages: rc.cpp
-# $(XGETTEXT) *.cpp *.h -o po/kradio-timeshifter.pot
+# $(XGETTEXT) *.cpp *.h -o po/tderadio-timeshifter.pot
messages: rc.cpp
$(EXTRACTRC) *.rc *.ui >> rc.cpp
- $(XGETTEXT) rc.cpp *.h *.cpp -o po/kradio-timeshifter.pot
+ $(XGETTEXT) rc.cpp *.h *.cpp -o po/tderadio-timeshifter.pot
diff --git a/tderadio3/plugins/timeshifter/icons/Makefile.am b/tderadio3/plugins/timeshifter/icons/Makefile.am
index b3f2583..354090a 100644
--- a/tderadio3/plugins/timeshifter/icons/Makefile.am
+++ b/tderadio3/plugins/timeshifter/icons/Makefile.am
@@ -1,2 +1,2 @@
icons_ICON = AUTO
-iconsdir = $(kde_datadir)/kradio/icons
+iconsdir = $(kde_datadir)/tderadio/icons
diff --git a/tderadio3/plugins/timeshifter/po/Makefile.am b/tderadio3/plugins/timeshifter/po/Makefile.am
index 276fe4b..0df80ff 100644
--- a/tderadio3/plugins/timeshifter/po/Makefile.am
+++ b/tderadio3/plugins/timeshifter/po/Makefile.am
@@ -1,3 +1,3 @@
-PACKAGE = kradio-timeshifter
+PACKAGE = tderadio-timeshifter
POFILES = AUTO
diff --git a/tderadio3/plugins/timeshifter/po/de.po b/tderadio3/plugins/timeshifter/po/de.po
index 66806f9..3908a61 100644
--- a/tderadio3/plugins/timeshifter/po/de.po
+++ b/tderadio3/plugins/timeshifter/po/de.po
@@ -1,5 +1,5 @@
# translation of de.po to
-# translation of kradio-timeshifter.po to
+# translation of tderadio-timeshifter.po to
# This file is put in the public domain.
#
# Ernst Martin Witte <emw@nocabal.de>, 2006.
diff --git a/tderadio3/plugins/timeshifter/po/ru.po b/tderadio3/plugins/timeshifter/po/ru.po
index 1f692e3..7af2c89 100644
--- a/tderadio3/plugins/timeshifter/po/ru.po
+++ b/tderadio3/plugins/timeshifter/po/ru.po
@@ -1,5 +1,5 @@
# translation of ru.po to
-# translation of kradio-timeshifter.po to
+# translation of tderadio-timeshifter.po to
# This file is put in the public domain.
# Алексей Кузнецов <Alexey.Kouznetsov@GMail.com>, 2006.
#
diff --git a/tderadio3/plugins/timeshifter/timeshifter.cpp b/tderadio3/plugins/timeshifter/timeshifter.cpp
index f5b3d65..a46175c 100644
--- a/tderadio3/plugins/timeshifter/timeshifter.cpp
+++ b/tderadio3/plugins/timeshifter/timeshifter.cpp
@@ -28,13 +28,13 @@
///////////////////////////////////////////////////////////////////////
-PLUGIN_LIBRARY_FUNCTIONS(TimeShifter, "kradio-timeshifter", i18n("TimeShift Support"));
+PLUGIN_LIBRARY_FUNCTIONS(TimeShifter, "tderadio-timeshifter", i18n("TimeShift Support"));
///////////////////////////////////////////////////////////////////////
TimeShifter::TimeShifter (const TQString &name)
: PluginBase(name, i18n("TimeShifter Plugin")),
- m_TempFileName("/tmp/kradio-timeshifter-tempfile"),
+ m_TempFileName("/tmp/tderadio-timeshifter-tempfile"),
m_TempFileMaxSize(256*1024*1024),
m_PlaybackMixerID(TQString()),
m_PlaybackMixerChannel("PCM"),
@@ -100,7 +100,7 @@ void TimeShifter::restoreState (TDEConfig *config)
{
config->setGroup(TQString("timeshifter-") + name());
- TQString fname = config->readEntry("temp-file-name", "/tmp/kradio-timeshifter-tempfile");
+ TQString fname = config->readEntry("temp-file-name", "/tmp/tderadio-timeshifter-tempfile");
TQ_UINT64 fsize = 1024 * 1024 * config->readNumEntry("max-file-size", 256);
TQString mixerID = config->readEntry ("PlaybackMixerID", TQString());
@@ -120,7 +120,7 @@ ConfigPageInfo TimeShifter::createConfigurationPage()
return ConfigPageInfo (conf,
i18n("Timeshifter"),
i18n("Timeshifter Options"),
- "kradio_pause");
+ "tderadio_pause");
}
AboutPageInfo TimeShifter::createAboutPage()
diff --git a/tderadio3/plugins/v4lradio/Makefile.am b/tderadio3/plugins/v4lradio/Makefile.am
index 093d346..1a991d6 100644
--- a/tderadio3/plugins/v4lradio/Makefile.am
+++ b/tderadio3/plugins/v4lradio/Makefile.am
@@ -3,7 +3,7 @@ SUBDIRS = po .
INCLUDES = $(all_includes)
METASOURCES = AUTO
-libkradio_LTLIBRARIES = libv4lradio.la
+libtderadio_LTLIBRARIES = libv4lradio.la
libv4lradio_la_SOURCES = v4lcfg_interfaces.cpp v4lradio-configuration.cpp \
v4lradio-configuration-ui.ui v4lradio.cpp
libv4lradio_la_LDFLAGS = -module -avoid-version $(KDE_RPATH) $(all_libraries)
@@ -11,8 +11,8 @@ libv4lradio_la_LDFLAGS = -module -avoid-version $(KDE_RPATH) $(all_libraries)
noinst_HEADERS = v4lcfg_interfaces.h v4lradio-configuration.h v4lradio.h
#messages: rc.cpp
-# $(XGETTEXT) *.cpp *.h -o po/kradio-v4lradio.pot
+# $(XGETTEXT) *.cpp *.h -o po/tderadio-v4lradio.pot
messages: rc.cpp
$(EXTRACTRC) *.rc *.ui >> rc.cpp
- $(XGETTEXT) rc.cpp *.h *.cpp -o po/kradio-v4lradio.pot
+ $(XGETTEXT) rc.cpp *.h *.cpp -o po/tderadio-v4lradio.pot
diff --git a/tderadio3/plugins/v4lradio/po/Makefile.am b/tderadio3/plugins/v4lradio/po/Makefile.am
index 6f04af2..7169487 100644
--- a/tderadio3/plugins/v4lradio/po/Makefile.am
+++ b/tderadio3/plugins/v4lradio/po/Makefile.am
@@ -1,3 +1,3 @@
-PACKAGE = kradio-v4lradio
+PACKAGE = tderadio-v4lradio
POFILES = AUTO
diff --git a/tderadio3/plugins/v4lradio/po/de.po b/tderadio3/plugins/v4lradio/po/de.po
index 9684ca2..52f8520 100644
--- a/tderadio3/plugins/v4lradio/po/de.po
+++ b/tderadio3/plugins/v4lradio/po/de.po
@@ -1,5 +1,5 @@
# translation of de.po to
-# translation of kradio-v4lradio.po to
+# translation of tderadio-v4lradio.po to
# This file is put in the public domain.
#
# Ernst Martin Witte <emw@nocabal.de>, 2006.
diff --git a/tderadio3/plugins/v4lradio/po/ru.po b/tderadio3/plugins/v4lradio/po/ru.po
index a82c2b8..b6152de 100644
--- a/tderadio3/plugins/v4lradio/po/ru.po
+++ b/tderadio3/plugins/v4lradio/po/ru.po
@@ -1,5 +1,5 @@
# translation of ru.po to
-# translation of kradio-v4lradio.po to
+# translation of tderadio-v4lradio.po to
# This file is put in the public domain.
# Алексей Кузнецов <Alexey.Kouznetsov@GMail.com>, 2006.
#
diff --git a/tderadio3/plugins/v4lradio/v4lradio.cpp b/tderadio3/plugins/v4lradio/v4lradio.cpp
index 82ed12e..f0a8766 100644
--- a/tderadio3/plugins/v4lradio/v4lradio.cpp
+++ b/tderadio3/plugins/v4lradio/v4lradio.cpp
@@ -53,7 +53,7 @@ struct _lrvol { unsigned char l, r; short dummy; };
///////////////////////////////////////////////////////////////////////
-PLUGIN_LIBRARY_FUNCTIONS(V4LRadio, "kradio-v4lradio", i18n("Support for V4L(2) Radio Devices"));
+PLUGIN_LIBRARY_FUNCTIONS(V4LRadio, "tderadio-v4lradio", i18n("Support for V4L(2) Radio Devices"));
///////////////////////////////////////////////////////////////////////
@@ -1082,7 +1082,7 @@ ConfigPageInfo V4LRadio::createConfigurationPage()
AboutPageInfo V4LRadio::createAboutPage()
{
- TDEAboutData aboutData("kradio",
+ TDEAboutData aboutData("tderadio",
NULL,
NULL,
I18N_NOOP("V4L/V4L2 Plugin for TDERadio."
@@ -1093,7 +1093,7 @@ AboutPageInfo V4LRadio::createAboutPage()
//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");