From 7a0002d9ec58b343555f0909c9343de310b287ac Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 27 Jan 2013 00:55:33 -0600
Subject: [PATCH] Rename a number of libraries and executables to avoid
 conflicts with KDE4

---
 kradio3/convert-presets/po/Makefile                       | 2 +-
 kradio3/plugins/alsa-sound/alsa-config-mixer-setting.cpp  | 2 +-
 kradio3/plugins/gui-docking-menu/docking.cpp              | 2 +-
 kradio3/plugins/gui-error-log/errorlog.cpp                | 4 ++--
 kradio3/plugins/gui-quickbar/quickbar.cpp                 | 2 +-
 kradio3/plugins/gui-standard-display/radioview.cpp        | 2 +-
 kradio3/plugins/radio/radio-configuration.cpp             | 2 +-
 kradio3/plugins/radio/radio.cpp                           | 2 +-
 kradio3/plugins/recording/encoder.cpp                     | 2 +-
 kradio3/plugins/recording/recording-monitor.cpp           | 2 +-
 kradio3/plugins/recording/recording.cpp                   | 2 +-
 kradio3/plugins/streaming/streaming-job.cpp               | 2 +-
 kradio3/plugins/streaming/streaming-job.h                 | 2 +-
 kradio3/plugins/timecontrol/timecontrol.cpp               | 2 +-
 kradio3/plugins/timeshifter/timeshifter-configuration.cpp | 2 +-
 kradio3/plugins/v4lradio/v4lradio-configuration.cpp       | 2 +-
 kradio3/plugins/v4lradio/v4lradio.cpp                     | 2 +-
 kradio3/src/include/sound_metadata.h                      | 2 +-
 kradio3/src/include/soundformat.h                         | 2 +-
 kradio3/src/include/soundstreamclient_interfaces.h        | 2 +-
 kradio3/src/include/utils.h                               | 2 +-
 kradio3/src/kradioapp.cpp                                 | 2 +-
 kradio3/src/plugin_configuration_dialog.cpp               | 2 +-
 kradio3/src/pluginmanager.cpp                             | 2 +-
 kradio3/src/radiostation-listview.cpp                     | 2 +-
 kradio3/src/stationlist.cpp                               | 2 +-
 kradio3/src/widgetplugins.cpp                             | 2 +-
 27 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/kradio3/convert-presets/po/Makefile b/kradio3/convert-presets/po/Makefile
index b6c8d0e..a002f99 100644
--- a/kradio3/convert-presets/po/Makefile
+++ b/kradio3/convert-presets/po/Makefile
@@ -101,7 +101,7 @@ INSTALL_PROGRAM = ${INSTALL} $(INSTALL_STRIP_FLAG)
 INSTALL_SCRIPT = ${INSTALL}
 INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
 KCFG_DEPENDENCIES = $(KCONFIG_COMPILER)
-KCONFIG_COMPILER = /usr/bin/kconfig_compiler
+KCONFIG_COMPILER = /usr/bin/tdeconfig_compiler
 KDECONFIG = /usr/bin/tde-config
 KDE_CHECK_PLUGIN = $(KDE_PLUGIN) -rpath $(libdir)
 KDE_EXTRA_RPATH = 
diff --git a/kradio3/plugins/alsa-sound/alsa-config-mixer-setting.cpp b/kradio3/plugins/alsa-sound/alsa-config-mixer-setting.cpp
index 26f30fa..4c39ff9 100644
--- a/kradio3/plugins/alsa-sound/alsa-config-mixer-setting.cpp
+++ b/kradio3/plugins/alsa-sound/alsa-config-mixer-setting.cpp
@@ -17,7 +17,7 @@
 
 #include "alsa-config-mixer-setting.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 AlsaConfigMixerSetting::AlsaConfigMixerSetting()
  : m_card(-1),
diff --git a/kradio3/plugins/gui-docking-menu/docking.cpp b/kradio3/plugins/gui-docking-menu/docking.cpp
index 8710fdf..df92141 100644
--- a/kradio3/plugins/gui-docking-menu/docking.cpp
+++ b/kradio3/plugins/gui-docking-menu/docking.cpp
@@ -22,7 +22,7 @@
 #include <kaction.h>
 #include <kdialogbase.h>
 #include <kaboutdata.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <twin.h>
 
 #include "../../src/include/radiodevice_interfaces.h"
diff --git a/kradio3/plugins/gui-error-log/errorlog.cpp b/kradio3/plugins/gui-error-log/errorlog.cpp
index ff8c5ea..31510de 100644
--- a/kradio3/plugins/gui-error-log/errorlog.cpp
+++ b/kradio3/plugins/gui-error-log/errorlog.cpp
@@ -24,10 +24,10 @@
 #include <klocale.h>
 #include <kiconloader.h>
 #include <tqtextedit.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kurl.h>
 #include <ktempfile.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #define PAGE_ID_INFO  0
 #define PAGE_ID_WARN  1
diff --git a/kradio3/plugins/gui-quickbar/quickbar.cpp b/kradio3/plugins/gui-quickbar/quickbar.cpp
index 3bff5dc..847be5f 100644
--- a/kradio3/plugins/gui-quickbar/quickbar.cpp
+++ b/kradio3/plugins/gui-quickbar/quickbar.cpp
@@ -24,7 +24,7 @@
 #include <twin.h>
 #include <klocale.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kaboutdata.h>
 
 #include "../../src/include/aboutwidget.h"
diff --git a/kradio3/plugins/gui-standard-display/radioview.cpp b/kradio3/plugins/gui-standard-display/radioview.cpp
index da54c23..78d8710 100644
--- a/kradio3/plugins/gui-standard-display/radioview.cpp
+++ b/kradio3/plugins/gui-standard-display/radioview.cpp
@@ -29,7 +29,7 @@
 #include <klocale.h>
 #include <kapplication.h>
 #include <twin.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kpopupmenu.h>
 
 #include "../../src/include/radiodevice_interfaces.h"
diff --git a/kradio3/plugins/radio/radio-configuration.cpp b/kradio3/plugins/radio/radio-configuration.cpp
index b4136b6..0e536c4 100644
--- a/kradio3/plugins/radio/radio-configuration.cpp
+++ b/kradio3/plugins/radio/radio-configuration.cpp
@@ -40,7 +40,7 @@
 #include <tqwidgetstack.h>
 #include <tqimage.h>
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kstandarddirs.h>
 #include <kurllabel.h>
 #include <tqregexp.h>
diff --git a/kradio3/plugins/radio/radio.cpp b/kradio3/plugins/radio/radio.cpp
index e485121..5785a39 100644
--- a/kradio3/plugins/radio/radio.cpp
+++ b/kradio3/plugins/radio/radio.cpp
@@ -24,7 +24,7 @@
 #include <kstandarddirs.h>
 #include <kurl.h>
 #include <kaboutdata.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "../../src/include/debug-profiler.h"
 
diff --git a/kradio3/plugins/recording/encoder.cpp b/kradio3/plugins/recording/encoder.cpp
index 23f9ceb..c1e27c3 100644
--- a/kradio3/plugins/recording/encoder.cpp
+++ b/kradio3/plugins/recording/encoder.cpp
@@ -28,7 +28,7 @@
 #include <tqapplication.h>
 #include <tqregexp.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tdeversion.h>
 #include <klocale.h>
 
diff --git a/kradio3/plugins/recording/recording-monitor.cpp b/kradio3/plugins/recording/recording-monitor.cpp
index dac41f9..0e2f00b 100644
--- a/kradio3/plugins/recording/recording-monitor.cpp
+++ b/kradio3/plugins/recording/recording-monitor.cpp
@@ -26,7 +26,7 @@
 #include <kcombobox.h>
 
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kaboutdata.h>
 
 RecordingMonitor::RecordingMonitor(const TQString &name)
diff --git a/kradio3/plugins/recording/recording.cpp b/kradio3/plugins/recording/recording.cpp
index 60899e6..485ef0b 100644
--- a/kradio3/plugins/recording/recording.cpp
+++ b/kradio3/plugins/recording/recording.cpp
@@ -33,7 +33,7 @@
 #include <tqapplication.h>
 #include <tqregexp.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tdeversion.h>
 
 #include <kaboutdata.h>
diff --git a/kradio3/plugins/streaming/streaming-job.cpp b/kradio3/plugins/streaming/streaming-job.cpp
index 77e5a55..0d0a5f5 100644
--- a/kradio3/plugins/streaming/streaming-job.cpp
+++ b/kradio3/plugins/streaming/streaming-job.cpp
@@ -20,7 +20,7 @@
 #include "../../src/include/utils.h"
 #include <kurl.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 
 StreamingJob::StreamingJob()
diff --git a/kradio3/plugins/streaming/streaming-job.h b/kradio3/plugins/streaming/streaming-job.h
index 190b146..715d71c 100644
--- a/kradio3/plugins/streaming/streaming-job.h
+++ b/kradio3/plugins/streaming/streaming-job.h
@@ -28,7 +28,7 @@
 
 #include <tqobject.h>
 
-#include <kio/jobclasses.h>
+#include <tdeio/jobclasses.h>
 
 class StreamingJob : public TQObject
 {
diff --git a/kradio3/plugins/timecontrol/timecontrol.cpp b/kradio3/plugins/timecontrol/timecontrol.cpp
index e7229e8..04eb6b2 100644
--- a/kradio3/plugins/timecontrol/timecontrol.cpp
+++ b/kradio3/plugins/timecontrol/timecontrol.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 #include <kaboutdata.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "timecontrol.h"
 #include "timecontrol-configuration.h"
diff --git a/kradio3/plugins/timeshifter/timeshifter-configuration.cpp b/kradio3/plugins/timeshifter/timeshifter-configuration.cpp
index 45fbb90..559c1ae 100644
--- a/kradio3/plugins/timeshifter/timeshifter-configuration.cpp
+++ b/kradio3/plugins/timeshifter/timeshifter-configuration.cpp
@@ -27,7 +27,7 @@
 #include <tqfile.h>
 #include <tqpushbutton.h>
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <knuminput.h>
 #include <klocale.h>
 
diff --git a/kradio3/plugins/v4lradio/v4lradio-configuration.cpp b/kradio3/plugins/v4lradio/v4lradio-configuration.cpp
index ecb05fa..a6adfb6 100644
--- a/kradio3/plugins/v4lradio/v4lradio-configuration.cpp
+++ b/kradio3/plugins/v4lradio/v4lradio-configuration.cpp
@@ -29,7 +29,7 @@
 #include <tqslider.h>
 #include <tqcheckbox.h>
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <knuminput.h>
 #include <klocale.h>
 #include <ktabwidget.h>
diff --git a/kradio3/plugins/v4lradio/v4lradio.cpp b/kradio3/plugins/v4lradio/v4lradio.cpp
index 8cdeaa4..67521da 100644
--- a/kradio3/plugins/v4lradio/v4lradio.cpp
+++ b/kradio3/plugins/v4lradio/v4lradio.cpp
@@ -36,7 +36,7 @@
 #include <tqfileinfo.h>
 #include <tqvaluelist.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 #include <kdialogbase.h>
 #include <kaboutdata.h>
diff --git a/kradio3/src/include/sound_metadata.h b/kradio3/src/include/sound_metadata.h
index a8d2fb2..723ae3b 100644
--- a/kradio3/src/include/sound_metadata.h
+++ b/kradio3/src/include/sound_metadata.h
@@ -25,7 +25,7 @@
 #include <time.h>
 #include <endian.h>
 #include <tqstring.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kurl.h>
 
 class SoundMetaData
diff --git a/kradio3/src/include/soundformat.h b/kradio3/src/include/soundformat.h
index 0fcca24..0f07d9a 100644
--- a/kradio3/src/include/soundformat.h
+++ b/kradio3/src/include/soundformat.h
@@ -24,7 +24,7 @@
 
 #include <endian.h>
 #include <tqstring.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 struct SoundFormat {
     unsigned     m_SampleRate;
diff --git a/kradio3/src/include/soundstreamclient_interfaces.h b/kradio3/src/include/soundstreamclient_interfaces.h
index d4e4fe5..57fd2f3 100644
--- a/kradio3/src/include/soundstreamclient_interfaces.h
+++ b/kradio3/src/include/soundstreamclient_interfaces.h
@@ -30,7 +30,7 @@
 #include <config.h>
 #endif
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqmap.h>
 
 #include "interfaces.h"
diff --git a/kradio3/src/include/utils.h b/kradio3/src/include/utils.h
index 037a2e3..a50304e 100644
--- a/kradio3/src/include/utils.h
+++ b/kradio3/src/include/utils.h
@@ -24,7 +24,7 @@
 
 using namespace std;
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <tqstring.h>
diff --git a/kradio3/src/kradioapp.cpp b/kradio3/src/kradioapp.cpp
index d281285..f5320b1 100644
--- a/kradio3/src/kradioapp.cpp
+++ b/kradio3/src/kradioapp.cpp
@@ -23,7 +23,7 @@
 #include <kaboutdata.h>
 #include <klocale.h>
 #include <klibloader.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
 
diff --git a/kradio3/src/plugin_configuration_dialog.cpp b/kradio3/src/plugin_configuration_dialog.cpp
index e2e4013..b02fc81 100644
--- a/kradio3/src/plugin_configuration_dialog.cpp
+++ b/kradio3/src/plugin_configuration_dialog.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 #include "include/plugin_configuration_dialog.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 
 PluginConfigurationDialog::PluginConfigurationDialog(
diff --git a/kradio3/src/pluginmanager.cpp b/kradio3/src/pluginmanager.cpp
index 2ba5715..9d64221 100644
--- a/kradio3/src/pluginmanager.cpp
+++ b/kradio3/src/pluginmanager.cpp
@@ -24,7 +24,7 @@
 #include <kiconloader.h>
 #include <kdialogbase.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kprogress.h>
 
 #include <tqlayout.h>
diff --git a/kradio3/src/radiostation-listview.cpp b/kradio3/src/radiostation-listview.cpp
index 0a4148d..8178b63 100644
--- a/kradio3/src/radiostation-listview.cpp
+++ b/kradio3/src/radiostation-listview.cpp
@@ -25,7 +25,7 @@
 #include <tqimage.h>
 #include <tqpixmap.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 RadioStationListView::RadioStationListView(TQWidget *parent, const char *name)
   : KListView(parent, name)
diff --git a/kradio3/src/stationlist.cpp b/kradio3/src/stationlist.cpp
index 6de71fb..a5b0f5b 100644
--- a/kradio3/src/stationlist.cpp
+++ b/kradio3/src/stationlist.cpp
@@ -26,7 +26,7 @@
 #include <tqfile.h>
 #include <tqiodevice.h>
 #include <tqmessagebox.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <ktempfile.h>
 #include <klocale.h>
 
diff --git a/kradio3/src/widgetplugins.cpp b/kradio3/src/widgetplugins.cpp
index 21ddce1..4df2c67 100644
--- a/kradio3/src/widgetplugins.cpp
+++ b/kradio3/src/widgetplugins.cpp
@@ -24,7 +24,7 @@
 
 #include <twin.h>
 #include <tqwidget.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 
 WidgetPluginBase::WidgetPluginBase(const TQString &name, const TQString &description)