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

pull/1/head
Timothy Pearson 11 years ago
parent bd136c5965
commit 81e4241ea8

@ -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,7 +11,7 @@
<keyword>Code</keyword> <keyword>Code</keyword>
<keyword>Qt</keyword> <keyword>Qt</keyword>
<keyword>KDE</keyword> <keyword>KDE</keyword>
<keyword>kioslave</keyword> <keyword>tdeioslave</keyword>
</keywords> </keywords>
<projectdirectory>.</projectdirectory> <projectdirectory>.</projectdirectory>
<absoluteprojectpath>false</absoluteprojectpath> <absoluteprojectpath>false</absoluteprojectpath>
@ -26,7 +26,7 @@
</general> </general>
<kdevautoproject> <kdevautoproject>
<general> <general>
<activetarget>src/kio_apt.la</activetarget> <activetarget>src/tdeio_apt.la</activetarget>
<useconfiguration>debug</useconfiguration> <useconfiguration>debug</useconfiguration>
</general> </general>
<configurations> <configurations>

@ -12,11 +12,11 @@ kio_apt_la_LDFLAGS = -avoid-version -module $(all_libraries) $(KDE_PLUGIN) $(LIB
protocoldir = $(kde_servicesdir) protocoldir = $(kde_servicesdir)
protocol_DATA = apt.protocol apt+http.protocol protocol_DATA = apt.protocol apt+http.protocol
appdatadir = $(kde_datadir)/kio_apt/ appdatadir = $(kde_datadir)/tdeio_apt/
appdata_DATA = kio_apt.css kdedeb_logo.png appdata_DATA = kio_apt.css kdedeb_logo.png
messages: rc.cpp messages: rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/kio_apt.pot $(XGETTEXT) *.cpp -o $(podir)/tdeio_apt.pot
noinst_HEADERS = debug.h aptcache.h apt.h regexps.h dpkg.h packagemanager.h noinst_HEADERS = debug.h aptcache.h apt.h regexps.h dpkg.h packagemanager.h

@ -6,6 +6,6 @@ output=stream
reading=true reading=true
defaultMimetype=text/html defaultMimetype=text/html
Icon=remote Icon=remote
Description=A kioslave for using apt-cache functionalities inside konqueror Description=A tdeioslave for using apt-cache functionalities inside konqueror
determineMimetypeFromExtension=false determineMimetypeFromExtension=false
DocPath=kio_apt/index.html DocPath=kio_apt/index.html

@ -21,11 +21,11 @@
#include <kapplication.h> #include <kapplication.h>
#include <kinstance.h> #include <kinstance.h>
#include <kglobal.h> #include <kglobal.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <klocale.h> #include <klocale.h>
#include <kurl.h> #include <kurl.h>
#include <kio/slavebase.h> #include <tdeio/slavebase.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kdebug.h> #include <kdebug.h>
@ -226,7 +226,7 @@ AptProtocol::AptProtocol( const TQCString &pool_socket, const TQCString &app_soc
{ {
KStandardDirs* dirs = TDEGlobal::dirs(); KStandardDirs* dirs = TDEGlobal::dirs();
m_stylesheet = dirs->findResource( "data", "kio_apt/kio_apt.css" ); m_stylesheet = dirs->findResource( "data", "kio_apt/tdeio_apt.css" );
m_logo = dirs->findResource( "data", "kio_apt/" m_logo = dirs->findResource( "data", "kio_apt/"
+ TDEGlobal::config() -> readEntryUntranslated("logo", "kdedeb_logo.png" ) ); + TDEGlobal::config() -> readEntryUntranslated("logo", "kdedeb_logo.png" ) );

@ -5,8 +5,8 @@
#include <tqcstring.h> #include <tqcstring.h>
#include <kurl.h> #include <kurl.h>
#include <kio/global.h> #include <tdeio/global.h>
#include <kio/slavebase.h> #include <tdeio/slavebase.h>
#include "debug.h" #include "debug.h"
#include "aptcache.h" #include "aptcache.h"

@ -6,6 +6,6 @@ output=stream
reading=true reading=true
defaultMimetype=text/html defaultMimetype=text/html
Icon=kioapt Icon=kioapt
Description=A kioslave for using apt-cache functionalities inside konqueror Description=A tdeioslave for using apt-cache functionalities inside konqueror
determineMimetypeFromExtension=false determineMimetypeFromExtension=false
DocPath=kio_apt/index.html DocPath=kio_apt/index.html

@ -11,7 +11,7 @@
#include "parsers.h" #include "parsers.h"
#include "../apt.h" #include "../apt.h"
#include <kio/slavebase.h> #include <tdeio/slavebase.h>
#include <klocale.h> #include <klocale.h>
#include <tqregexp.h> #include <tqregexp.h>
#include <kurl.h> #include <kurl.h>

@ -12,7 +12,7 @@
#include <kuserprofile.h> #include <kuserprofile.h>
#include <kio/slavebase.h> #include <tdeio/slavebase.h>
#include <qhtmlstream.h> #include <qhtmlstream.h>
#include <tqregexp.h> #include <tqregexp.h>

@ -13,7 +13,7 @@
#include "qhtmlstream.h" #include "qhtmlstream.h"
#include <kio/slavebase.h> #include <tdeio/slavebase.h>
namespace Parsers namespace Parsers
{ {

Loading…
Cancel
Save