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

pull/1/head
Timothy Pearson 10 years ago
parent c61c58c166
commit 8cc395707c

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

@ -1,18 +1,18 @@
# set the include path for X, qt and KDE
INCLUDES = $(all_includes)
kde_module_LTLIBRARIES = kfile_kbarcode.la
kde_module_LTLIBRARIES = tdefile_kbarcode.la
kfile_kbarcode_la_SOURCES = kfile_kbarcode.cpp
kfile_kbarcode_la_LDFLAGS = -module $(KDE_PLUGIN) $(LIB_QT) $(all_libraries)
kfile_kbarcode_la_LIBADD = $(LIB_KSYCOCA) $(LIB_TDECORE)
tdefile_kbarcode_la_SOURCES = tdefile_kbarcode.cpp
tdefile_kbarcode_la_LDFLAGS = -module $(KDE_PLUGIN) $(LIB_QT) $(all_libraries)
tdefile_kbarcode_la_LIBADD = $(LIB_KSYCOCA) $(LIB_TDECORE)
# let automoc handle all of the meta source files (moc)
METASOURCES = AUTO
# messages: rc.cpp
# $(XGETTEXT) *.cpp -o $(podir)/kfile_kbarcode.pot
# $(XGETTEXT) *.cpp -o $(podir)/tdefile_kbarcode.pot
services_DATA = kfile_kbarcode.desktop
services_DATA = tdefile_kbarcode.desktop
servicesdir = $(kde_servicesdir)

@ -2,7 +2,7 @@
* Copyright (C) 2003 Dominik Seichter <domseichter@web.de>
*/
#include "kfile_kbarcode.h"
#include "tdefile_kbarcode.h"
#include <kgenericfactory.h>
#include <klocale.h>
@ -10,7 +10,7 @@
#include <tqfile.h>
#include <tqdom.h>
K_EXPORT_COMPONENT_FACTORY(kfile_kbarcode, KGenericFactory<KBarcodePlugin>( "kfile_kbarcode" ));
K_EXPORT_COMPONENT_FACTORY(tdefile_kbarcode, KGenericFactory<KBarcodePlugin>( "tdefile_kbarcode" ));
KBarcodePlugin::KBarcodePlugin(TQObject *parent, const char *name,
const TQStringList &args)
@ -81,4 +81,4 @@ bool KBarcodePlugin::readInfo( KFileMetaInfo& info, uint )
return true;
}
#include "kfile_kbarcode.moc"
#include "tdefile_kbarcode.moc"

@ -5,5 +5,5 @@ Comment=KBarcode Info
Icon=kbarcode
ServiceTypes=KFilePlugin
MimeType=application/kbarcode-label
X-TDE-Library=kfile_kbarcode
X-TDE-Library=tdefile_kbarcode
SupportsThumbnail=

@ -5,7 +5,7 @@
#ifndef _PLUGIN_KBARCODEFILEPLUGIN_H_
#define _PLUGIN_KBARCODEFILEPLUGIN_H_
#include <kfilemetainfo.h>
#include <tdefilemetainfo.h>
class TQStringList;

@ -24,7 +24,7 @@
// KDE includes
#include <kapplication.h>
#include <kfiledialog.h>
#include <tdefiledialog.h>
#include <kiconloader.h>
#include <kimageio.h>
#include <klocale.h>

@ -33,7 +33,7 @@
#include <kabc/addressee.h>
#include <kabc/addresseelist.h>
#include <kapplication.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <kimageio.h>
#include <klocale.h>
#include <kmessagebox.h>

@ -50,7 +50,7 @@
#include <kapplication.h>
#include <kcombobox.h>
#include <kcompletion.h>
#include <kfiledialog.h>
#include <tdefiledialog.h>
#include <kiconloader.h>
#include <kimageio.h>
#include <klineedit.h>

@ -32,7 +32,7 @@
// KDE includes
#include <kabc/addressee.h>
#include <kapplication.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <kcolorbutton.h>
#include <kiconloader.h>
#include <kimageio.h>

@ -25,7 +25,7 @@
// KDE includes
#include <kapplication.h>
#include <kfiledialog.h>
#include <tdefiledialog.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kstandarddirs.h>

@ -31,7 +31,7 @@
// KDE includes
#include <kaction.h>
#include <kapplication.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <kiconloader.h>
#include <klocale.h>
#include <kmenubar.h>

@ -23,7 +23,7 @@
// KDE includes
#include <kapplication.h>
#include <kcolorbutton.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <klineedit.h>
#include <knuminput.h>

@ -83,7 +83,7 @@
#include <kcolordialog.h>
#include <kcommand.h>
#include <kcombobox.h>
#include <kfiledialog.h>
#include <tdefiledialog.h>
#include <kiconloader.h>
#include <kimageio.h>
#include <klineedit.h>

@ -22,7 +22,7 @@
#include <kaction.h>
#include <tdeversion.h>
#include <kcolordialog.h>
#include <kfiledialog.h>
#include <tdefiledialog.h>
#include <klocale.h>
#include <tdespell.h>
#include <dstextedit.h>

@ -29,7 +29,7 @@ f/***************************************************************************
// KDE includes
#include <kapplication.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kprocess.h>

@ -33,7 +33,7 @@
#include <kabc/addresseedialog.h>
#include <kapplication.h>
#include <kcombobox.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <kiconloader.h>
#include <klineedit.h>
#include <klocale.h>

@ -21,7 +21,7 @@
// KDE includes
#include <kapplication.h>
#include <kcombobox.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <kglobal.h>
#include <klocale.h>
#include <kurl.h>

@ -31,7 +31,7 @@
// KDE includes
#include <kapplication.h>
#include <kcombobox.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <klineedit.h>
#include <klocale.h>
#include <kmessagebox.h>

@ -36,7 +36,7 @@
// KDE includes
#include <kapplication.h>
#include <kcombobox.h>
#include <kfiledialog.h>
#include <tdefiledialog.h>
#include <kiconloader.h>
#include <klistview.h>
#include <klineedit.h>

@ -36,7 +36,7 @@
// KDE includes
#include <kapplication.h>
#include <kcombobox.h>
#include <kfiledialog.h>
#include <tdefiledialog.h>
#include <kiconloader.h>
#include <klistview.h>
#include <klineedit.h>

@ -17,7 +17,7 @@
#include <kaction.h>
#include <tdeversion.h>
#include <kcolordialog.h>
#include <kfiledialog.h>
#include <tdefiledialog.h>
#include <klocale.h>
#include <tdespell.h>
#include <klineedit.h>

Loading…
Cancel
Save