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

pull/1/head
Timothy Pearson 12 years ago
parent 7843a9b39e
commit 7890a8168b

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

@ -11,11 +11,11 @@ The simplest way to compile KNemo for Mandrake is:
2. Open the file `knemod\interfaceicon.cpp' and go to line 257. 2. Open the file `knemod\interfaceicon.cpp' and go to line 257.
Change the line from Change the line from
process << "kcmshell" << "kcm_knemo"; process << "tdecmshell" << "kcm_knemo";
to to
process << "kcmshell" << "/usr/share/applnk/Settings/Network/kcm_knemo"; process << "tdecmshell" << "/usr/share/applnk/Settings/Network/kcm_knemo";
Do the same in line 64 of `knemod\knemodaemon.cpp' Do the same in line 64 of `knemod\knemodaemon.cpp'
@ -33,7 +33,7 @@ IMPORTANT: If you already installed and started KNemo before doing the
above changes it may be neccessary to open the configuration dialog above changes it may be neccessary to open the configuration dialog
manually by running manually by running
kcmshell /usr/share/applnk/Settings/Network/kcm_knemo tdecmshell /usr/share/applnk/Settings/Network/kcm_knemo
on the console after you have installed KNemo with the above solution, on the console after you have installed KNemo with the above solution,
because KNemo won't display any icons in the system traybar until it because KNemo won't display any icons in the system traybar until it

@ -34,12 +34,12 @@
#include <tqdatastream.h> #include <tqdatastream.h>
#include <kglobal.h> #include <kglobal.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <klocale.h> #include <klocale.h>
#include <knuminput.h> #include <knuminput.h>
#include <dcopclient.h> #include <dcopclient.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <kdesktopfile.h> #include <kdesktopfile.h>
#include <kcolorbutton.h> #include <kcolorbutton.h>
#include <kinputdialog.h> #include <kinputdialog.h>

@ -1,7 +1,7 @@
[Desktop Entry] [Desktop Entry]
Encoding=UTF-8 Encoding=UTF-8
Type=Application Type=Application
Exec=kcmshell kcm_knemo Exec=tdecmshell kcm_knemo
Icon=knemo Icon=knemo
X-TDE-ModuleType=Library X-TDE-ModuleType=Library

@ -23,7 +23,7 @@
#include <kdebug.h> #include <kdebug.h>
#include <kprocess.h> #include <kprocess.h>
#include <kio/global.h> #include <tdeio/global.h>
#include "nettoolsbackend.h" #include "nettoolsbackend.h"

@ -31,7 +31,7 @@
#include <kdebug.h> #include <kdebug.h>
#include <kprocess.h> #include <kprocess.h>
#include <kio/global.h> #include <tdeio/global.h>
#include "sysbackend.h" #include "sysbackend.h"

@ -286,7 +286,7 @@ void InterfaceIcon::showConfigDialog()
KNemoDaemon::sSelectedInterface = mInterface->getName(); KNemoDaemon::sSelectedInterface = mInterface->getName();
TDEProcess process; TDEProcess process;
process << "kcmshell" << "kcm_knemo"; process << "tdecmshell" << "kcm_knemo";
process.start( TDEProcess::DontCare ); process.start( TDEProcess::DontCare );
} }

@ -22,7 +22,7 @@
#include <tqpushbutton.h> #include <tqpushbutton.h>
#include <klocale.h> #include <klocale.h>
#include <kio/global.h> #include <tdeio/global.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kcalendarsystem.h> #include <kcalendarsystem.h>

@ -25,12 +25,12 @@
#include <tqtabwidget.h> #include <tqtabwidget.h>
#include <kdebug.h> #include <kdebug.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <klocale.h> #include <klocale.h>
#include <kglobal.h> #include <kglobal.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kactivelabel.h> #include <kactivelabel.h>
#include <kio/global.h> #include <tdeio/global.h>
#include "data.h" #include "data.h"
#include "interface.h" #include "interface.h"

@ -22,7 +22,7 @@
#include <kdebug.h> #include <kdebug.h>
#include <klocale.h> #include <klocale.h>
#include <kio/global.h> #include <tdeio/global.h>
#include "data.h" #include "data.h"
#include "interface.h" #include "interface.h"

@ -23,7 +23,7 @@
#include <kdebug.h> #include <kdebug.h>
#include <kglobal.h> #include <kglobal.h>
#include <klocale.h> #include <klocale.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kprocess.h> #include <kprocess.h>
#include <kinstance.h> #include <kinstance.h>
#include <kmessagebox.h> #include <kmessagebox.h>

@ -29,7 +29,7 @@
#include <tqpixmap.h> #include <tqpixmap.h>
#include <kdebug.h> #include <kdebug.h>
#include <kconfig.h> #include <tdeconfig.h>
#include "signalplotter.h" #include "signalplotter.h"

Loading…
Cancel
Save