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

pull/1/head
Timothy Pearson 12 years ago
parent 062f8fc585
commit b2ead42a56

@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
fi
if test -n "$trinity2ornewer"; then
KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
fi
if test -n "$trinity3ornewer"; then
@ -1788,7 +1788,7 @@ if test "$kde_qtver" = 1; then
kde_check_lib="libtdecore.la"
else
kde_check_header="ksharedptr.h"
kde_check_lib="libkio.la"
kde_check_lib="libtdeio.la"
fi
if test -z "$1"; then
@ -2094,7 +2094,7 @@ elif test $kde_qtver = 2; then
AC_SUBST(LIB_KIO, "-lkio")
AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KFILE, "-lkfile")
AC_SUBST(LIB_KFILE, "-ltdefile")
AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell")
@ -2104,7 +2104,7 @@ else
AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_TDEUI)")
AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
fi
])

@ -14,7 +14,7 @@
#include <kcombobox.h>
#include <knuminput.h>
#include <ktextedit.h>
#include <kfiledialog.h>
#include <tdefiledialog.h>
#include <kmessagebox.h>
#include <tqlayout.h>

@ -14,8 +14,8 @@
#include <kstandarddirs.h>
#include <kmimetype.h>
#include <kapplication.h>
#include <kconfig.h>
#include <kio/netaccess.h>
#include <tdeconfig.h>
#include <tdeio/netaccess.h>
// NOTE currently only the possibilities of a file format are respected,
// the possibilities of the current encoder are ignored

@ -20,7 +20,7 @@
#include <tqlayout.h>
*/
//#include <kconfig.h>
//#include <tdeconfig.h>
#include <kiconloader.h>
#include <klocale.h>
#include <kpushbutton.h>

@ -9,7 +9,7 @@
#include <klistbox.h>
//#include <keditlistbox.h>
//#include <kurlrequester.h>
#include <kfiledialog.h>
#include <tdefiledialog.h>
#include <kstandarddirs.h>
#include <tqlayout.h>

@ -9,7 +9,7 @@
#include <kiconloader.h>
#include <klineedit.h>
#include <kpushbutton.h>
#include <kfiledialog.h>
#include <tdefiledialog.h>
#include <tqlayout.h>
#include <tqlabel.h>

@ -18,11 +18,11 @@
#include <klocale.h>
#include <kpushbutton.h>
#include <kio/job.h>
#include <tdeio/job.h>
#include <kstandarddirs.h>
#include <kmessagebox.h>
#include <kiconloader.h>
#include <kfiledialog.h>
#include <tdefiledialog.h>
#include <klistbox.h>
//#include <kurl.h>

@ -4,7 +4,7 @@
#include <configpagebase.h>
#include <kio/jobclasses.h>
#include <tdeio/jobclasses.h>
class Config;
class KPushButton;

@ -18,7 +18,7 @@
#include <kglobal.h>
//#include <kdebug.h>
#include <ktempfile.h>
#include <kio/job.h>
#include <tdeio/job.h>
//#include <kprocess.h>
#include <kstandarddirs.h>

@ -3,7 +3,7 @@
#ifndef CONVERT_H
#define CONVERT_H
#include <kio/jobclasses.h>
#include <tdeio/jobclasses.h>
#include <tqobject.h>
#include <tqvaluelist.h>

@ -13,7 +13,7 @@
#include <kpushbutton.h>
// #include <kurlrequester.h>
#include <klistbox.h>
#include <kfiledialog.h>
#include <tdefiledialog.h>
DirDialog::DirDialog( Config* config, Mode mode, TQWidget *parent, const char *name, bool modal, WFlags f )
: KDialog( parent, name, modal, f )

@ -38,7 +38,7 @@
#include "trueaudio/taglib_trueaudiofiletyperesolver.h"
#include "trueaudio/ttafile.h"
#include "wavpack/taglib_wavpackfiletyperesolver.h"
#include "wavpack/taglib_wavpactdefiletyperesolver.h"
#include "wavpack/wvfile.h"
#include "speex/taglib_speexfiletyperesolver.h"
#include "speex/speexfile.h"

@ -8,9 +8,9 @@ noinst_LTLIBRARIES = libtagwavpack.la
libtagwavpack_la_SOURCES = \
wvfile.cpp \
wvproperties.cpp \
taglib_wavpackfiletyperesolver.cpp
taglib_wavpactdefiletyperesolver.cpp
noinst_HEADERS = wvfile.h \
wvproperties.h \
taglib_wavpackfiletyperesolver.h
taglib_wavpactdefiletyperesolver.h

@ -19,7 +19,7 @@
* MA 02110-1301 USA *
***************************************************************************/
#include "taglib_wavpackfiletyperesolver.h"
#include "taglib_wavpactdefiletyperesolver.h"
#include "wvfile.h"
#include <string.h>

@ -13,7 +13,7 @@
#include <ktabwidget.h>
#include <kpushbutton.h>
#include <kiconloader.h>
#include <kio/job.h>
#include <tdeio/job.h>
#include <kstandarddirs.h>
// FIXME prevent converting wav files to wav

@ -7,7 +7,7 @@
#include "conversionoptions.h"
#include <kio/jobclasses.h>
#include <tdeio/jobclasses.h>
class OptionsSimple;
class OptionsDetailed;

@ -17,7 +17,7 @@
#include <klocale.h>
#include <kiconloader.h>
#include <kmessagebox.h>
#include <kfiledialog.h>
#include <tdefiledialog.h>
#include <ktoolbarbutton.h>
#include <kcombobox.h>
#include <klineedit.h>

@ -35,7 +35,7 @@
#include <ktrader.h>
#include <kpushbutton.h>
#include <kiconloader.h>
#include <kfiledialog.h>
#include <tdefiledialog.h>
#include <tdeparts/componentfactory.h>

@ -13,7 +13,7 @@
#include <klocale.h>
#include <kiconloader.h>
#include <kfiledialog.h>
#include <tdefiledialog.h>
#include <kpushbutton.h>
#include <kprogress.h>

@ -22,7 +22,7 @@
#include <kapplication.h>
#include <klocale.h>
#include <kiconloader.h>
#include <kfiledialog.h>
#include <tdefiledialog.h>
#include <kinputdialog.h>
#include <kpushbutton.h>
#include <kpopupmenu.h>
@ -32,7 +32,7 @@
#include <kedittoolbar.h>
#include <kmessagebox.h>
#include <kstddirs.h>
#include <kio/job.h>
#include <tdeio/job.h>
#include <kprocess.h>
#include <ksystemtray.h>

Loading…
Cancel
Save