Rename a number of libraries and executables to avoid conflicts with KDE4

11 years ago · 7a0002d9ec
parent 4525efd70d
commit 7a0002d9ec
27 changed files with 28 additions and 28 deletions
--- 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 = 
--- 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),
--- 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"
--- 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
--- 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"
--- 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"
--- 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>
--- 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"

--- 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>

--- 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)
--- 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>
--- 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()
--- 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
 {
--- 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"
--- 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>

--- 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>
--- 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>
--- 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
--- 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;
--- 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"
--- 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>
--- 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>

--- 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(
--- 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>
--- 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)
--- 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>

--- 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)