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

pull/1/head
Timothy Pearson 12 years ago
parent 7db1efb556
commit 5d9cfd6445

@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
fi
if test -n "$kde32ornewer"; 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 "$kde33ornewer"; then
@ -1788,7 +1788,7 @@ if test "$kde_qtver" = 1; then
kde_check_lib="libkdecore.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_KDECORE, "-lkdecore -lXext $(LIB_QT)")
AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_KDEUI)")
AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
fi
])

@ -23,10 +23,10 @@
***************************************************************************/
//BEGIN INCLUDES
#include <kmessagebox.h>
#include <kio/netaccess.h>
#include <tdeio/netaccess.h>
#include <ktempfile.h>
#include <klocale.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <kdialogbase.h>
#include <kcombobox.h>
#include <kurlrequester.h>

@ -23,10 +23,10 @@
***************************************************************************/
//BEGIN INCLUDES
#include <kmessagebox.h>
#include <kio/netaccess.h>
#include <tdeio/netaccess.h>
#include <ktempfile.h>
#include <klocale.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <kdialogbase.h>
#include <kcombobox.h>
#include <kurlrequester.h>

@ -19,10 +19,10 @@
***************************************************************************/
//BEGIN INCLUDES
#include <kmessagebox.h>
#include <kio/netaccess.h>
#include <tdeio/netaccess.h>
#include <ktempfile.h>
#include <klocale.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <kdialogbase.h>
#include <kurlrequester.h>
#include <kcombobox.h>

@ -75,7 +75,7 @@
#include <kstddirs.h>
#include <klineeditdlg.h>
#include <kmessagebox.h>
#include <kio/netaccess.h>
#include <tdeio/netaccess.h>
#include <ktempfile.h>
#include <klistview.h>
#include <kglobal.h>
@ -84,7 +84,7 @@
#include <tdewallet.h>
#include <kinputdialog.h>
#include <kactioncollection.h>
#include <kfiledialog.h>
#include <tdefiledialog.h>
#include "kvpnc.h"
#include "mainview.h"
@ -5145,16 +5145,16 @@ void KVpnc::connectClicked()
if ( GlobalConfig->currentProfile->getAuthType() == VpnAccountData::psk )
{
// write psk.<profile>.key
TQFile Pskfile ( tmpPath + "psk." + ProfileName + ".key" );
stream.setDevice ( &Pskfile );
if ( Pskfile.open ( IO_WriteOnly ) )
TQFile Pstdefile ( tmpPath + "psk." + ProfileName + ".key" );
stream.setDevice ( &Pstdefile );
if ( Pstdefile.open ( IO_WriteOnly ) )
{
stream << GlobalConfig->currentProfile->getPreSharedKey() << "\n";
Pskfile.close();
Pstdefile.close();
}
else
{
GlobalConfig->appendLogEntry ( i18n ( "%1 could not opened. Stop." ).arg ( Pskfile.name() ),GlobalConfig->error );
GlobalConfig->appendLogEntry ( i18n ( "%1 could not opened. Stop." ).arg ( Pstdefile.name() ),GlobalConfig->error );
}
stream.unsetDevice();

@ -33,7 +33,7 @@
#include <tqtextedit.h>
#include <tqcolor.h>
#include <tqstringlist.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <tdewallet.h>
#include <kstatusbar.h>

@ -24,7 +24,7 @@
#include <tqwidget.h>
#include <kprocess.h>
#include <tqprocess.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include "mainviewbase.h"
#include "kvpnckicker.h"
#include "debugoutputtextedit.h"

@ -33,7 +33,7 @@
#include <kurlrequester.h>
#include <knuminput.h>
#include <kpassdlg.h>
#include <kfiledialog.h>
#include <tdefiledialog.h>
#include <tqspinbox.h>
#include <tqcursor.h>
#include <tqbuttongroup.h>

Loading…
Cancel
Save