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

pull/1/head
Timothy Pearson 12 years ago
parent 4525efd70d
commit 7a0002d9ec

@ -101,7 +101,7 @@ INSTALL_PROGRAM = ${INSTALL} $(INSTALL_STRIP_FLAG)
INSTALL_SCRIPT = ${INSTALL} INSTALL_SCRIPT = ${INSTALL}
INSTALL_STRIP_PROGRAM = $(install_sh) -c -s INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
KCFG_DEPENDENCIES = $(KCONFIG_COMPILER) KCFG_DEPENDENCIES = $(KCONFIG_COMPILER)
KCONFIG_COMPILER = /usr/bin/kconfig_compiler KCONFIG_COMPILER = /usr/bin/tdeconfig_compiler
KDECONFIG = /usr/bin/tde-config KDECONFIG = /usr/bin/tde-config
KDE_CHECK_PLUGIN = $(KDE_PLUGIN) -rpath $(libdir) KDE_CHECK_PLUGIN = $(KDE_PLUGIN) -rpath $(libdir)
KDE_EXTRA_RPATH = KDE_EXTRA_RPATH =

@ -17,7 +17,7 @@
#include "alsa-config-mixer-setting.h" #include "alsa-config-mixer-setting.h"
#include <kconfig.h> #include <tdeconfig.h>
AlsaConfigMixerSetting::AlsaConfigMixerSetting() AlsaConfigMixerSetting::AlsaConfigMixerSetting()
: m_card(-1), : m_card(-1),

@ -22,7 +22,7 @@
#include <kaction.h> #include <kaction.h>
#include <kdialogbase.h> #include <kdialogbase.h>
#include <kaboutdata.h> #include <kaboutdata.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <twin.h> #include <twin.h>
#include "../../src/include/radiodevice_interfaces.h" #include "../../src/include/radiodevice_interfaces.h"

@ -24,10 +24,10 @@
#include <klocale.h> #include <klocale.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <tqtextedit.h> #include <tqtextedit.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <kurl.h> #include <kurl.h>
#include <ktempfile.h> #include <ktempfile.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#define PAGE_ID_INFO 0 #define PAGE_ID_INFO 0
#define PAGE_ID_WARN 1 #define PAGE_ID_WARN 1

@ -24,7 +24,7 @@
#include <twin.h> #include <twin.h>
#include <klocale.h> #include <klocale.h>
#include <kglobal.h> #include <kglobal.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kaboutdata.h> #include <kaboutdata.h>
#include "../../src/include/aboutwidget.h" #include "../../src/include/aboutwidget.h"

@ -29,7 +29,7 @@
#include <klocale.h> #include <klocale.h>
#include <kapplication.h> #include <kapplication.h>
#include <twin.h> #include <twin.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kpopupmenu.h> #include <kpopupmenu.h>
#include "../../src/include/radiodevice_interfaces.h" #include "../../src/include/radiodevice_interfaces.h"

@ -40,7 +40,7 @@
#include <tqwidgetstack.h> #include <tqwidgetstack.h>
#include <tqimage.h> #include <tqimage.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kurllabel.h> #include <kurllabel.h>
#include <tqregexp.h> #include <tqregexp.h>

@ -24,7 +24,7 @@
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kurl.h> #include <kurl.h>
#include <kaboutdata.h> #include <kaboutdata.h>
#include <kconfig.h> #include <tdeconfig.h>
#include "../../src/include/debug-profiler.h" #include "../../src/include/debug-profiler.h"

@ -28,7 +28,7 @@
#include <tqapplication.h> #include <tqapplication.h>
#include <tqregexp.h> #include <tqregexp.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <tdeversion.h> #include <tdeversion.h>
#include <klocale.h> #include <klocale.h>

@ -26,7 +26,7 @@
#include <kcombobox.h> #include <kcombobox.h>
#include <klocale.h> #include <klocale.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kaboutdata.h> #include <kaboutdata.h>
RecordingMonitor::RecordingMonitor(const TQString &name) RecordingMonitor::RecordingMonitor(const TQString &name)

@ -33,7 +33,7 @@
#include <tqapplication.h> #include <tqapplication.h>
#include <tqregexp.h> #include <tqregexp.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <tdeversion.h> #include <tdeversion.h>
#include <kaboutdata.h> #include <kaboutdata.h>

@ -20,7 +20,7 @@
#include "../../src/include/utils.h" #include "../../src/include/utils.h"
#include <kurl.h> #include <kurl.h>
#include <kio/job.h> #include <tdeio/job.h>
StreamingJob::StreamingJob() StreamingJob::StreamingJob()

@ -28,7 +28,7 @@
#include <tqobject.h> #include <tqobject.h>
#include <kio/jobclasses.h> #include <tdeio/jobclasses.h>
class StreamingJob : public TQObject class StreamingJob : public TQObject
{ {

@ -16,7 +16,7 @@
***************************************************************************/ ***************************************************************************/
#include <kaboutdata.h> #include <kaboutdata.h>
#include <kconfig.h> #include <tdeconfig.h>
#include "timecontrol.h" #include "timecontrol.h"
#include "timecontrol-configuration.h" #include "timecontrol-configuration.h"

@ -27,7 +27,7 @@
#include <tqfile.h> #include <tqfile.h>
#include <tqpushbutton.h> #include <tqpushbutton.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <knuminput.h> #include <knuminput.h>
#include <klocale.h> #include <klocale.h>

@ -29,7 +29,7 @@
#include <tqslider.h> #include <tqslider.h>
#include <tqcheckbox.h> #include <tqcheckbox.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <knuminput.h> #include <knuminput.h>
#include <klocale.h> #include <klocale.h>
#include <ktabwidget.h> #include <ktabwidget.h>

@ -36,7 +36,7 @@
#include <tqfileinfo.h> #include <tqfileinfo.h>
#include <tqvaluelist.h> #include <tqvaluelist.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kdialogbase.h> #include <kdialogbase.h>
#include <kaboutdata.h> #include <kaboutdata.h>

@ -25,7 +25,7 @@
#include <time.h> #include <time.h>
#include <endian.h> #include <endian.h>
#include <tqstring.h> #include <tqstring.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kurl.h> #include <kurl.h>
class SoundMetaData class SoundMetaData

@ -24,7 +24,7 @@
#include <endian.h> #include <endian.h>
#include <tqstring.h> #include <tqstring.h>
#include <kconfig.h> #include <tdeconfig.h>
struct SoundFormat { struct SoundFormat {
unsigned m_SampleRate; unsigned m_SampleRate;

@ -30,7 +30,7 @@
#include <config.h> #include <config.h>
#endif #endif
#include <kconfig.h> #include <tdeconfig.h>
#include <tqmap.h> #include <tqmap.h>
#include "interfaces.h" #include "interfaces.h"

@ -24,7 +24,7 @@
using namespace std; using namespace std;
#include <kconfig.h> #include <tdeconfig.h>
#include <klocale.h> #include <klocale.h>
#include <kdebug.h> #include <kdebug.h>
#include <tqstring.h> #include <tqstring.h>

@ -23,7 +23,7 @@
#include <kaboutdata.h> #include <kaboutdata.h>
#include <klocale.h> #include <klocale.h>
#include <klibloader.h> #include <klibloader.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>

@ -16,7 +16,7 @@
***************************************************************************/ ***************************************************************************/
#include "include/plugin_configuration_dialog.h" #include "include/plugin_configuration_dialog.h"
#include <kconfig.h> #include <tdeconfig.h>
#include <klocale.h> #include <klocale.h>
PluginConfigurationDialog::PluginConfigurationDialog( PluginConfigurationDialog::PluginConfigurationDialog(

@ -24,7 +24,7 @@
#include <kiconloader.h> #include <kiconloader.h>
#include <kdialogbase.h> #include <kdialogbase.h>
#include <klocale.h> #include <klocale.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kprogress.h> #include <kprogress.h>
#include <tqlayout.h> #include <tqlayout.h>

@ -25,7 +25,7 @@
#include <tqimage.h> #include <tqimage.h>
#include <tqpixmap.h> #include <tqpixmap.h>
#include <kconfig.h> #include <tdeconfig.h>
RadioStationListView::RadioStationListView(TQWidget *parent, const char *name) RadioStationListView::RadioStationListView(TQWidget *parent, const char *name)
: KListView(parent, name) : KListView(parent, name)

@ -26,7 +26,7 @@
#include <tqfile.h> #include <tqfile.h>
#include <tqiodevice.h> #include <tqiodevice.h>
#include <tqmessagebox.h> #include <tqmessagebox.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <ktempfile.h> #include <ktempfile.h>
#include <klocale.h> #include <klocale.h>

@ -24,7 +24,7 @@
#include <twin.h> #include <twin.h>
#include <tqwidget.h> #include <tqwidget.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <klocale.h> #include <klocale.h>
WidgetPluginBase::WidgetPluginBase(const TQString &name, const TQString &description) WidgetPluginBase::WidgetPluginBase(const TQString &name, const TQString &description)

Loading…
Cancel
Save