TDE
/
ktorrent
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/ktorrent
0
0
Fork 0
Code Issues Releases Wiki Activity

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

Browse Source
pull/1/head
Timothy Pearson 12 years ago
parent d46a1fe346
commit d2107b329f
15 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File

26
acinclude.m4
Unescape View File

@ -2099,16 +2099,16 @@ if test $kde_qtver = 3; then
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KABC, "-lkabc") AC_SUBST(LIB_KABC, "-lkabc")
AC_SUBST(LIB_KHTML, "-lkhtml") AC_SUBST(LIB_KHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-lkspell") AC_SUBST(LIB_KSPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-lkparts") AC_SUBST(LIB_KPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
AC_SUBST(LIB_KUTILS, "-lkutils") AC_SUBST(LIB_KUTILS, "-ltdeutils")
AC_SUBST(LIB_TDEPIM, "-ltdepim") AC_SUBST(LIB_TDEPIM, "-ltdepim")
AC_SUBST(LIB_KIMPROXY, "-lkimproxy") AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
AC_SUBST(LIB_KDNSSD, "-lkdnssd") AC_SUBST(LIB_KDNSSD, "-ltdednssd")
AC_SUBST(LIB_KUNITTEST, "-lkunittest") AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
# these are for backward compatibility # these are for backward compatibility
AC_SUBST(LIB_KSYCOCA, "-lkio") AC_SUBST(LIB_KSYCOCA, "-lkio")
AC_SUBST(LIB_KFILE, "-lkio") AC_SUBST(LIB_KFILE, "-lkio")
@ -2116,13 +2116,13 @@ elif test $kde_qtver = 2; then
AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_KIO, "-lkio")
AC_SUBST(LIB_KSYCOCA, "-lksycoca") AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KFILE, "-lkfile") AC_SUBST(LIB_KFILE, "-lkfile")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KHTML, "-lkhtml") AC_SUBST(LIB_KHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-lkspell") AC_SUBST(LIB_KSPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-lkparts") AC_SUBST(LIB_KPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
else else
AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
@ -2571,7 +2571,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
test "x$jpeg_incdir" = xNO && jpeg_incdir= test "x$jpeg_incdir" = xNO && jpeg_incdir=
dnl if headers _and_ libraries are missing, this is no error, and we dnl if headers _and_ libraries are missing, this is no error, and we
dnl continue with a warning (the user will get no jpeg support in khtml) dnl continue with a warning (the user will get no jpeg support in tdehtml)
dnl if only one is missing, it means a configuration error, but we still dnl if only one is missing, it means a configuration error, but we still
dnl only warn dnl only warn
if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@ -3514,7 +3514,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)" KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
AC_SUBST(KDE_PLUGIN) AC_SUBST(KDE_PLUGIN)
# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs. # This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)" KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
AC_SUBST(KDE_CHECK_PLUGIN) AC_SUBST(KDE_CHECK_PLUGIN)

26
aclocal.m4 vendored
Unescape View File

@ -2111,16 +2111,16 @@ if test $kde_qtver = 3; then
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KABC, "-lkabc") AC_SUBST(LIB_KABC, "-lkabc")
AC_SUBST(LIB_KHTML, "-lkhtml") AC_SUBST(LIB_KHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-lkspell") AC_SUBST(LIB_KSPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-lkparts") AC_SUBST(LIB_KPARTS, "-ltdeparts")
AC_SUBST(LIB_KDEPRINT, "-lkdeprint") AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
AC_SUBST(LIB_KUTILS, "-lkutils") AC_SUBST(LIB_KUTILS, "-ltdeutils")
AC_SUBST(LIB_KDEPIM, "-lkdepim") AC_SUBST(LIB_KDEPIM, "-lkdepim")
AC_SUBST(LIB_KIMPROXY, "-lkimproxy") AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
AC_SUBST(LIB_KDNSSD, "-lkdnssd") AC_SUBST(LIB_KDNSSD, "-ltdednssd")
AC_SUBST(LIB_KUNITTEST, "-lkunittest") AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
# these are for backward compatibility # these are for backward compatibility
AC_SUBST(LIB_KSYCOCA, "-lkio") AC_SUBST(LIB_KSYCOCA, "-lkio")
AC_SUBST(LIB_KFILE, "-lkio") AC_SUBST(LIB_KFILE, "-lkio")
@ -2128,13 +2128,13 @@ elif test $kde_qtver = 2; then
AC_SUBST(LIB_KDECORE, "-lkdecore") AC_SUBST(LIB_KDECORE, "-lkdecore")
AC_SUBST(LIB_KDEUI, "-lkdeui") AC_SUBST(LIB_KDEUI, "-lkdeui")
AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_KIO, "-lkio")
AC_SUBST(LIB_KSYCOCA, "-lksycoca") AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KFILE, "-lkfile") AC_SUBST(LIB_KFILE, "-lkfile")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KHTML, "-lkhtml") AC_SUBST(LIB_KHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-lkspell") AC_SUBST(LIB_KSPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-lkparts") AC_SUBST(LIB_KPARTS, "-ltdeparts")
AC_SUBST(LIB_KDEPRINT, "-lkdeprint") AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
else else
AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)") AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
@ -2583,7 +2583,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
test "x$jpeg_incdir" = xNO && jpeg_incdir= test "x$jpeg_incdir" = xNO && jpeg_incdir=
dnl if headers _and_ libraries are missing, this is no error, and we dnl if headers _and_ libraries are missing, this is no error, and we
dnl continue with a warning (the user will get no jpeg support in khtml) dnl continue with a warning (the user will get no jpeg support in tdehtml)
dnl if only one is missing, it means a configuration error, but we still dnl if only one is missing, it means a configuration error, but we still
dnl only warn dnl only warn
if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@ -3526,7 +3526,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)" KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
AC_SUBST(KDE_PLUGIN) AC_SUBST(KDE_PLUGIN)
# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs. # This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)" KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
AC_SUBST(KDE_CHECK_PLUGIN) AC_SUBST(KDE_CHECK_PLUGIN)

2
apps/ktcachecheck/Makefile.am
Unescape View File

@ -5,7 +5,7 @@ bin_PROGRAMS = ktcachecheck
ktcachecheck_SOURCES = cachecheck.cpp cachechecker.cpp singlecachechecker.cpp \ ktcachecheck_SOURCES = cachecheck.cpp cachechecker.cpp singlecachechecker.cpp \
multicachechecker.cpp multicachechecker.cpp
ktcachecheck_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor ktcachecheck_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
ktcachecheck_LDADD = $(LIB_KPARTS) ../../libktorrent/libktorrent.la \ ktcachecheck_LDADD = $(LIB_KPARTS) ../../libktorrent/libktorrent.la \
$(LIB_KFILE) $(LIB_KIO) $(LIB_KFILE) $(LIB_KIO)
noinst_HEADERS = cachechecker.h singlecachechecker.h multicachechecker.h noinst_HEADERS = cachechecker.h singlecachechecker.h multicachechecker.h

2
apps/ktorrent/Makefile.am
Unescape View File

@ -11,7 +11,7 @@ INCLUDES = -I$(top_builddir)/ktorrent/libktorrent -I$(top_builddir)/libktorrent/
$(all_includes) $(all_includes)
# the library search path. # the library search path.
ktorrent_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor ktorrent_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
# the libraries to link against. # the libraries to link against.
ktorrent_LDADD = ../../apps/ktorrent/newui/libnewui.la $(LIB_KFILE) \ ktorrent_LDADD = ../../apps/ktorrent/newui/libnewui.la $(LIB_KFILE) \

2
apps/ktorrent/README
Unescape View File

@ -53,7 +53,7 @@ embeddable in other apps. For example, the kmplayer kpart can be called to play
in your app. in your app.
For more details, consult : For more details, consult :
http://www-106.ibm.com/developerworks/library/l-kparts/ http://www-106.ibm.com/developerworks/library/l-tdeparts/
http://developer.kde.org/documentation/tutorials/dot/writing-plugins.html http://developer.kde.org/documentation/tutorials/dot/writing-plugins.html
http://developer.kde.org/documentation/tutorials/developing-a-plugin-structure/index.html http://developer.kde.org/documentation/tutorials/developing-a-plugin-structure/index.html

2
apps/ktorrent/newui/dmainwindow.h
Unescape View File

@ -21,7 +21,7 @@
#define DMAINWINDOW_H #define DMAINWINDOW_H
#include <kxmlguiclient.h> #include <kxmlguiclient.h>
#include <kparts/mainwindow.h> #include <tdeparts/mainwindow.h>
#include "ddockwindow.h" #include "ddockwindow.h"

2
apps/kttorinfo/Makefile.am
Unescape View File

@ -3,7 +3,7 @@ METASOURCES = AUTO
bin_PROGRAMS = kttorinfo bin_PROGRAMS = kttorinfo
kttorinfo_SOURCES = main.cpp kttorinfo_SOURCES = main.cpp
kttorinfo_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kttorinfo_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kttorinfo_LDADD = ../../libktorrent/libktorrent.la $(LIB_KPARTS) $(LIB_KFILE) \ kttorinfo_LDADD = ../../libktorrent/libktorrent.la $(LIB_KPARTS) $(LIB_KFILE) \
$(LIB_KIO) $(LIB_KIO)

2
apps/ktupnptest/Makefile.am
Unescape View File

@ -5,6 +5,6 @@ bin_PROGRAMS = ktupnptest
ktupnptest_SOURCES = main.cpp upnptestapp.cpp mainwidget.ui ktupnptest_SOURCES = main.cpp upnptestapp.cpp mainwidget.ui
ktupnptest_LDADD = ../../plugins/upnp/libktupnp.la \ ktupnptest_LDADD = ../../plugins/upnp/libktupnp.la \
../../libktorrent/libktorrent.la $(LIB_KIO) ../../libktorrent/libktorrent.la $(LIB_KIO)
ktupnptest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor ktupnptest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
noinst_HEADERS = upnptestapp.h noinst_HEADERS = upnptestapp.h
KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI) KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI)

2
libktorrent/interfaces/plugin.h
Unescape View File

@ -21,7 +21,7 @@
#define KTPLUGIN_H #define KTPLUGIN_H
#include <ktversion.h> #include <ktversion.h>
#include <kparts/plugin.h> #include <tdeparts/plugin.h>
namespace bt namespace bt
{ {

2
libktorrent/pluginmanager.cpp
Unescape View File

@ -19,7 +19,7 @@
***************************************************************************/ ***************************************************************************/
#include <tqfile.h> #include <tqfile.h>
#include <tqtextstream.h> #include <tqtextstream.h>
#include <kparts/componentfactory.h> #include <tdeparts/componentfactory.h>
#include <util/log.h> #include <util/log.h>
#include <util/error.h> #include <util/error.h>
#include <util/fileops.h> #include <util/fileops.h>

4
plugins/search/htmlpart.cpp
Unescape View File

@ -26,9 +26,9 @@
#include <kio/netaccess.h> #include <kio/netaccess.h>
#include <klocale.h> #include <klocale.h>
#include <kfiledialog.h> #include <kfiledialog.h>
#include <kparts/browserextension.h> #include <tdeparts/browserextension.h>
#include <util/constants.h> #include <util/constants.h>
#include <khtmlview.h> #include <tdehtmlview.h>
#include "htmlpart.h" #include "htmlpart.h"
using namespace bt; using namespace bt;

2
plugins/search/htmlpart.h
Unescape View File

@ -20,7 +20,7 @@
#ifndef HTMLPART_H #ifndef HTMLPART_H
#define HTMLPART_H #define HTMLPART_H
#include <khtml_part.h> #include <tdehtml_part.h>
namespace TDEIO namespace TDEIO
{ {

4
plugins/search/searchwidget.cpp
Unescape View File

@ -20,7 +20,7 @@
***************************************************************************/ ***************************************************************************/
#include <kapplication.h> #include <kapplication.h>
#include <khtmlview.h> #include <tdehtmlview.h>
#include <tqlayout.h> #include <tqlayout.h>
#include <tqfile.h> #include <tqfile.h>
#include <tqtextstream.h> #include <tqtextstream.h>
@ -34,7 +34,7 @@
#include <kiconloader.h> #include <kiconloader.h>
#include <kcombobox.h> #include <kcombobox.h>
#include <kpopupmenu.h> #include <kpopupmenu.h>
#include <kparts/partmanager.h> #include <tdeparts/partmanager.h>
#include <kio/job.h> #include <kio/job.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kfiledialog.h> #include <kfiledialog.h>

2
translations/lt/messages/ktorrent.po
Unescape View File

@ -185,7 +185,7 @@ msgstr "Pasirinkite bylą"
#, fuzzy #, fuzzy
msgid "Choose a filename to save under" msgid "Choose a filename to save under"
msgstr "" msgstr ""
"#-#-#-#-# ktexteditor_insertfile.po (ktexteditor_insertfile) #-#-#-#-#\n" "#-#-#-#-# tdetexteditor_insertfile.po (tdetexteditor_insertfile) #-#-#-#-#\n"
"Pasirinkite bylą įterpimui\n" "Pasirinkite bylą įterpimui\n"
"#-#-#-#-# katepart.po (katepart) #-#-#-#-#\n" "#-#-#-#-# katepart.po (katepart) #-#-#-#-#\n"
"Pasirinkite įterpiamą bylą" "Pasirinkite įterpiamą bylą"

2
utests/Makefile.am
Unescape View File

@ -3,7 +3,7 @@ METASOURCES = AUTO
noinst_HEADERS = unittest.h testrunner.h upnpparsedescriptiontest.h \ noinst_HEADERS = unittest.h testrunner.h upnpparsedescriptiontest.h \
upnpparseresponsetest.h dhtmsgparsetest.h biginttest.h rc4test.h difflehellmantest.h upnpparseresponsetest.h dhtmsgparsetest.h biginttest.h rc4test.h difflehellmantest.h
bin_PROGRAMS = ktutester bin_PROGRAMS = ktutester
ktutester_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor ktutester_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
ktutester_SOURCES = unittest.cpp testrunner.cpp main.cpp \ ktutester_SOURCES = unittest.cpp testrunner.cpp main.cpp \
upnpparsedescriptiontest.cpp upnpparseresponsetest.cpp dhtmsgparsetest.cpp biginttest.cpp \ upnpparsedescriptiontest.cpp upnpparseresponsetest.cpp dhtmsgparsetest.cpp biginttest.cpp \
rc4test.cpp difflehellmantest.cpp rc4test.cpp difflehellmantest.cpp

Write Preview
Loading…
Cancel
Save