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

r14.0.x
Timothy Pearson 12 years ago
parent a1d4239c83
commit 77343a1b8c

@ -225,7 +225,7 @@
* fixed select all/find in editor [bug reported by gduprey] * fixed select all/find in editor [bug reported by gduprey]
0.11.3 (7 September 2006) 0.11.3 (7 September 2006)
* fixed crashes due to dependence on libkio for piklab-prog * fixed crashes due to dependence on libtdeio for piklab-prog
0.11.2 (6 September 2006) 0.11.2 (6 September 2006)
* fixed compilation by detecting libncurses under Suse * fixed compilation by detecting libncurses under Suse

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

@ -20,7 +20,7 @@ public:
}; };
#else #else
# include <kapplication.h> # include <kapplication.h>
# include <kconfig.h> # include <tdeconfig.h>
class GenericConfigPrivate class GenericConfigPrivate
{ {
public: public:

@ -35,7 +35,7 @@
# include <kaboutdata.h> # include <kaboutdata.h>
# include <kcmdlineargs.h> # include <kcmdlineargs.h>
# include <ktempfile.h> # include <ktempfile.h>
# include <kconfigbackend.h> # include <tdeconfigbackend.h>
#endif #endif
#if defined(Q_OS_WIN) #if defined(Q_OS_WIN)

@ -19,9 +19,9 @@
#include "process.h" #include "process.h"
#if !defined(NO_KDE) #if !defined(NO_KDE)
# include <kio/netaccess.h> # include <tdeio/netaccess.h>
# include <kfileitem.h> # include <tdefileitem.h>
# include <kconfigbackend.h> # include <tdeconfigbackend.h>
#endif #endif
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

@ -9,7 +9,7 @@
#include "pfile_ext.h" #include "pfile_ext.h"
#include <tqfile.h> #include <tqfile.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <ktempfile.h> #include <ktempfile.h>
#include "common/gui/misc_gui.h" #include "common/gui/misc_gui.h"

@ -10,10 +10,10 @@
#include <tqfile.h> #include <tqfile.h>
#include <tqapplication.h> #include <tqapplication.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <kfileitem.h> #include <tdefileitem.h>
#include <ktempfile.h> #include <ktempfile.h>
#include <kconfigbackend.h> #include <tdeconfigbackend.h>
#include "common/global/pfile.h" #include "common/global/pfile.h"

@ -12,7 +12,7 @@
#include <kiconloader.h> #include <kiconloader.h>
#include <kpushbutton.h> #include <kpushbutton.h>
#include <krun.h> #include <krun.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <kdirselectdialog.h> #include <kdirselectdialog.h>
#include "misc_gui.h" #include "misc_gui.h"

@ -82,7 +82,7 @@ bool showWin32FilePropertyDialog(const TQString& fileName);
/** /**
\return two-letter locale name (like "en" or "pl") taken from MS Windows native registry. \return two-letter locale name (like "en" or "pl") taken from MS Windows native registry.
Useful when we don't want to rely on KSyCoCa. Useful when we don't want to rely on KSyCoCa.
Used e.g. by kbuildsycoca application. Used e.g. by tdebuildsycoca application.
*/ */
KDEWIN32_EXPORT KDEWIN32_EXPORT
TQCString getWin32LocaleName(); TQCString getWin32LocaleName();

@ -10,7 +10,7 @@
#include "global_config.h" #include "global_config.h"
#include <kapplication.h> #include <kapplication.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <klocale.h> #include <klocale.h>
#include "progs/list/prog_list.h" #include "progs/list/prog_list.h"

@ -20,7 +20,7 @@
#include <kapplication.h> #include <kapplication.h>
#include <kaboutdata.h> #include <kaboutdata.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kaboutdata.h> #include <kaboutdata.h>
#include <klocale.h> #include <klocale.h>
@ -452,10 +452,10 @@ void LikeBack::init(bool isDevelopmentVersion, Button buttons)
if (m_process) if (m_process)
return; return;
m_process = new TDEProcess(); m_process = new TDEProcess();
*m_process << TQString::fromLatin1("kcmshell") << TQString::fromLatin1("kcm_useraccount"); *m_process << TQString::fromLatin1("tdecmshell") << TQString::fromLatin1("kcm_useraccount");
connect( m_process, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(endFetchingEmailFrom()) ); connect( m_process, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(endFetchingEmailFrom()) );
if (!m_process->start()) { if (!m_process->start()) {
kdDebug() << "Couldn't start kcmshell.." << endl; kdDebug() << "Couldn't start tdecmshell.." << endl;
delete m_process; delete m_process;
m_process = 0; m_process = 0;
return; return;

@ -12,7 +12,7 @@
#include <tqvbuttongroup.h> #include <tqvbuttongroup.h>
#include <tqradiobutton.h> #include <tqradiobutton.h>
#include <tqstyle.h> #include <tqstyle.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <kiconloader.h> #include <kiconloader.h>
#include "common/gui/purl_gui.h" #include "common/gui/purl_gui.h"

@ -16,7 +16,7 @@
#include <klibloader.h> #include <klibloader.h>
#include <kpopupmenu.h> #include <kpopupmenu.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <klocale.h> #include <klocale.h>
#include <kapplication.h> #include <kapplication.h>
#include <tdetexteditor/markinterface.h> #include <tdetexteditor/markinterface.h>

@ -24,10 +24,10 @@
#include <klocale.h> #include <klocale.h>
#include <kedittoolbar.h> #include <kedittoolbar.h>
#include <kapplication.h> #include <kapplication.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kaction.h> #include <kaction.h>
#include <kcmdlineargs.h> #include <kcmdlineargs.h>
#include <kio/observer.h> #include <tdeio/observer.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kpopupmenu.h> #include <kpopupmenu.h>
#include <khelpmenu.h> #include <khelpmenu.h>

@ -8,7 +8,7 @@
***************************************************************************/ ***************************************************************************/
#include "pickit2_group_ui.h" #include "pickit2_group_ui.h"
#include <kfiledialog.h> #include <tdefiledialog.h>
#include "common/global/purl.h" #include "common/global/purl.h"
#include "common/gui/misc_gui.h" #include "common/gui/misc_gui.h"

Loading…
Cancel
Save