Additional k => tde renaming and fixes

pull/1/head
Slávek Banko 11 years ago
parent bafc4152b1
commit f74f82b8f3

@ -2070,35 +2070,35 @@ if test $kde_qtver = 3; then
AC_SUBST(LIB_KDED, $lib_kded) AC_SUBST(LIB_KDED, $lib_kded)
AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-ltdeio") AC_SUBST(LIB_TDEIO, "-ltdeio")
AC_SUBST(LIB_KJS, "-lkjs") AC_SUBST(LIB_KJS, "-lkjs")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KABC, "-ltdeabc") AC_SUBST(LIB_KABC, "-ltdeabc")
AC_SUBST(LIB_TDEHTML, "-ltdehtml") AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell") AC_SUBST(LIB_TDESPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
AC_SUBST(LIB_KUTILS, "-ltdeutils") AC_SUBST(LIB_TDEUTILS, "-ltdeutils")
AC_SUBST(LIB_TDEPIM, "-ltdepim") AC_SUBST(LIB_TDEPIM, "-ltdepim")
AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy") AC_SUBST(LIB_TDEIMPROXY, "-ltdeimproxy")
AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
AC_SUBST(LIB_KDNSSD, "-ltdednssd") AC_SUBST(LIB_TDEDNSSD, "-ltdednssd")
AC_SUBST(LIB_KUNITTEST, "-ltdeunittest") AC_SUBST(LIB_TDEUNITTEST, "-ltdeunittest")
# these are for backward compatibility # these are for backward compatibility
AC_SUBST(LIB_KSYCOCA, "-ltdeio") AC_SUBST(LIB_TDESYCOCA, "-ltdeio")
AC_SUBST(LIB_KFILE, "-ltdeio") AC_SUBST(LIB_KFILE, "-ltdeio")
elif test $kde_qtver = 2; then 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, "-ltdeio") AC_SUBST(LIB_TDEIO, "-ltdeio")
AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") AC_SUBST(LIB_TDESYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KFILE, "-ltdefile") AC_SUBST(LIB_KFILE, "-ltdefile")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_TDEHTML, "-ltdehtml") AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell") AC_SUBST(LIB_TDESPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPARTS, "-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)")

@ -1 +1 @@
Subproject commit b4d585c643d92787bfa17b935ce00b09960ee360 Subproject commit 6b7f7225eff4c49b2dd71804d5fdacb03efcf461

@ -83,9 +83,9 @@ dnl =======================================================
dnl PACKAGE set before dnl PACKAGE set before
dnl Check for the 3.4 kde version (for tdednssd) dnl Check for the 3.4 kde version (for tdednssd)
AC_DEFUN([CHECK_KDNSSD], AC_DEFUN([CHECK_TDEDNSSD],
[ [
AC_MSG_CHECKING(for KDNSSD support) AC_MSG_CHECKING(for TDEDNSSD support)
AC_CACHE_VAL(ac_cv_tdednssd, AC_CACHE_VAL(ac_cv_tdednssd,
[ [
AC_LANG_SAVE AC_LANG_SAVE
@ -112,13 +112,13 @@ AC_DEFUN([CHECK_KDNSSD],
if test "$ac_cv_tdednssd" = "yes"; then if test "$ac_cv_tdednssd" = "yes"; then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
LIB_KDNSSD="-ltdednssd" LIB_TDEDNSSD="-ltdednssd"
else else
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
LIB_KDNSSD="" LIB_TDEDNSSD=""
fi fi
AC_SUBST(LIB_KDNSSD) AC_SUBST(LIB_TDEDNSSD)
]) ])
@ -184,7 +184,7 @@ AC_CHECK_FUNCS([endpwent gethostbyaddr gethostbyname getpass memmove memset \
dnl Check for some stuff dnl Check for some stuff
KDE_CHECK_SSL KDE_CHECK_SSL
CHECK_KDEVERSION CHECK_KDEVERSION
CHECK_KDNSSD CHECK_TDEDNSSD
AC_C_BIGENDIAN AC_C_BIGENDIAN
AC_CHECK_KDEMAXPATHLEN AC_CHECK_KDEMAXPATHLEN

@ -3,9 +3,9 @@
AM_INIT_AUTOMAKE(kftpgrabber, 0.8.0) AM_INIT_AUTOMAKE(kftpgrabber, 0.8.0)
dnl Check for the 3.4 kde version (for tdednssd) dnl Check for the 3.4 kde version (for tdednssd)
AC_DEFUN([CHECK_KDNSSD], AC_DEFUN([CHECK_TDEDNSSD],
[ [
AC_MSG_CHECKING(for KDNSSD support) AC_MSG_CHECKING(for TDEDNSSD support)
AC_CACHE_VAL(ac_cv_tdednssd, AC_CACHE_VAL(ac_cv_tdednssd,
[ [
AC_LANG_SAVE AC_LANG_SAVE
@ -32,13 +32,13 @@ AC_DEFUN([CHECK_KDNSSD],
if test "$ac_cv_tdednssd" = "yes"; then if test "$ac_cv_tdednssd" = "yes"; then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
LIB_KDNSSD="-ltdednssd" LIB_TDEDNSSD="-ltdednssd"
else else
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
LIB_KDNSSD="" LIB_TDEDNSSD=""
fi fi
AC_SUBST(LIB_KDNSSD) AC_SUBST(LIB_TDEDNSSD)
]) ])
@ -104,7 +104,7 @@ AC_CHECK_FUNCS([endpwent gethostbyaddr gethostbyname getpass memmove memset \
dnl Check for some stuff dnl Check for some stuff
KDE_CHECK_SSL KDE_CHECK_SSL
CHECK_KDEVERSION CHECK_KDEVERSION
CHECK_KDNSSD CHECK_TDEDNSSD
AC_C_BIGENDIAN AC_C_BIGENDIAN
AC_CHECK_KDEMAXPATHLEN AC_CHECK_KDEMAXPATHLEN

@ -48,8 +48,8 @@ kftpgrabber_LDADD = \
ui/libui.a \ ui/libui.a \
misc/interfaces/libkftpinterfaces.la \ misc/interfaces/libkftpinterfaces.la \
misc/libs/ssh/libssh.a \ misc/libs/ssh/libssh.a \
$(LIB_KDNSSD) -ltdewalletclient $(LIBSSL) $(LIB_KPARTS) \ $(LIB_TDEDNSSD) -ltdewalletclient $(LIBSSL) $(LIB_TDEPARTS) \
$(LIB_KIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) -lz $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) -lz
# this is where the desktop file will go # this is where the desktop file will go
xdg_apps_DATA = kftpgrabber.desktop xdg_apps_DATA = kftpgrabber.desktop

@ -9,7 +9,7 @@ METASOURCES = AUTO
lib_LTLIBRARIES = libkftpinterfaces.la lib_LTLIBRARIES = libkftpinterfaces.la
libkftpinterfaces_la_SOURCES = kftpbookmarkimportplugin.cpp libkftpinterfaces_la_SOURCES = kftpbookmarkimportplugin.cpp
libkftpinterfaces_la_LDFLAGS = $(all_libraries) -version-info 0:0:0 -no-undefined libkftpinterfaces_la_LDFLAGS = $(all_libraries) -version-info 0:0:0 -no-undefined
libkftpinterfaces_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) libkftpinterfaces_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS)
kftpgrabberincludedir = $(includedir)/kftpgrabber kftpgrabberincludedir = $(includedir)/kftpgrabber
kftpgrabberinclude_HEADERS = kftpbookmarkimportplugin.h kftpgrabberinclude_HEADERS = kftpbookmarkimportplugin.h

@ -45,7 +45,7 @@
#endif #endif
/** /**
* This class provides an interface to KDNSSD (that is available from KDE 3.4). * This class provides an interface to TDEDNSSD (that is available from KDE 3.4).
* *
* @author Jernej Kos * @author Jernej Kos
*/ */

@ -6,7 +6,7 @@ METASOURCES = AUTO
kde_module_LTLIBRARIES = kftpimportplugin_filezilla3.la kde_module_LTLIBRARIES = kftpimportplugin_filezilla3.la
kftpimportplugin_filezilla3_la_SOURCES = kftpimportfz3plugin.cpp kftpimportplugin_filezilla3_la_SOURCES = kftpimportfz3plugin.cpp
kftpimportplugin_filezilla3_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) ../../../interfaces/libkftpinterfaces.la kftpimportplugin_filezilla3_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) ../../../interfaces/libkftpinterfaces.la
kftpimportplugin_filezilla3_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) kftpimportplugin_filezilla3_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
kde_services_DATA = kftpimportplugin_filezilla3.desktop kde_services_DATA = kftpimportplugin_filezilla3.desktop

@ -6,7 +6,7 @@ METASOURCES = AUTO
kde_module_LTLIBRARIES = kftpimportplugin_gftp.la kde_module_LTLIBRARIES = kftpimportplugin_gftp.la
kftpimportplugin_gftp_la_SOURCES = kftpimportgftpplugin.cpp kftpimportplugin_gftp_la_SOURCES = kftpimportgftpplugin.cpp
kftpimportplugin_gftp_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) ../../../interfaces/libkftpinterfaces.la kftpimportplugin_gftp_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) ../../../interfaces/libkftpinterfaces.la
kftpimportplugin_gftp_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) kftpimportplugin_gftp_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
kde_services_DATA = kftpimportplugin_gftp.desktop kde_services_DATA = kftpimportplugin_gftp.desktop

@ -6,7 +6,7 @@ METASOURCES = AUTO
kde_module_LTLIBRARIES = kftpimportplugin_kftp.la kde_module_LTLIBRARIES = kftpimportplugin_kftp.la
kftpimportplugin_kftp_la_SOURCES = kftpimportkftpplugin.cpp kftpimportplugin_kftp_la_SOURCES = kftpimportkftpplugin.cpp
kftpimportplugin_kftp_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) ../../../interfaces/libkftpinterfaces.la kftpimportplugin_kftp_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) ../../../interfaces/libkftpinterfaces.la
kftpimportplugin_kftp_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) kftpimportplugin_kftp_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
kde_services_DATA = kftpimportplugin_kftp.desktop kde_services_DATA = kftpimportplugin_kftp.desktop

@ -6,7 +6,7 @@ METASOURCES = AUTO
kde_module_LTLIBRARIES = kftpimportplugin_ncftp.la kde_module_LTLIBRARIES = kftpimportplugin_ncftp.la
kftpimportplugin_ncftp_la_SOURCES = kftpimportncftpplugin.cpp kftpimportplugin_ncftp_la_SOURCES = kftpimportncftpplugin.cpp
kftpimportplugin_ncftp_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) ../../../interfaces/libkftpinterfaces.la kftpimportplugin_ncftp_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) ../../../interfaces/libkftpinterfaces.la
kftpimportplugin_ncftp_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) kftpimportplugin_ncftp_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
kde_services_DATA = kftpimportplugin_ncftp.desktop kde_services_DATA = kftpimportplugin_ncftp.desktop

@ -13,7 +13,7 @@ msgstr ""
"POT-Creation-Date: 2007-04-15 07:14+0200\n" "POT-Creation-Date: 2007-04-15 07:14+0200\n"
"PO-Revision-Date: 2007-04-18 15:59+0200\n" "PO-Revision-Date: 2007-04-18 15:59+0200\n"
"Last-Translator: Jannick Kuhr <jannick.kuhr@kdemail.net>\n" "Last-Translator: Jannick Kuhr <jannick.kuhr@kdemail.net>\n"
"Language-Team: Deutsch <tde-i18n-de@kde.org>\n" "Language-Team: Deutsch <kde-i18n-de@kde.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"

@ -8,7 +8,7 @@ msgstr ""
"POT-Creation-Date: 2007-04-15 07:14+0200\n" "POT-Creation-Date: 2007-04-15 07:14+0200\n"
"PO-Revision-Date: 2007-04-19 18:04+0300\n" "PO-Revision-Date: 2007-04-19 18:04+0300\n"
"Last-Translator: Toussis Manolis <manolis@koppermind.homelinux.org>\n" "Last-Translator: Toussis Manolis <manolis@koppermind.homelinux.org>\n"
"Language-Team: greek <tde-i18n-el@kde.org>\n" "Language-Team: greek <kde-i18n-el@kde.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"

@ -8,7 +8,7 @@ msgstr ""
"POT-Creation-Date: 2007-04-15 07:14+0200\n" "POT-Creation-Date: 2007-04-15 07:14+0200\n"
"PO-Revision-Date: 2007-04-21 14:26+0200\n" "PO-Revision-Date: 2007-04-21 14:26+0200\n"
"Last-Translator: Nicola Ruggero <nicola@nxnt.org>\n" "Last-Translator: Nicola Ruggero <nicola@nxnt.org>\n"
"Language-Team: Italian <tde-i18n-it@kde.org>\n" "Language-Team: Italian <kde-i18n-it@kde.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"

@ -9,7 +9,7 @@ msgstr ""
"POT-Creation-Date: 2007-04-15 07:14+0200\n" "POT-Creation-Date: 2007-04-15 07:14+0200\n"
"PO-Revision-Date: 2005-09-10 19:40+0300\n" "PO-Revision-Date: 2005-09-10 19:40+0300\n"
"Last-Translator: Donatas Glodenis <dgvirtual@akl.lt>\n" "Last-Translator: Donatas Glodenis <dgvirtual@akl.lt>\n"
"Language-Team: Lithuanian <tde-i18n-lt@kde.org>\n" "Language-Team: Lithuanian <kde-i18n-lt@kde.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"

@ -9,7 +9,7 @@ msgstr ""
"POT-Creation-Date: 2007-04-15 07:14+0200\n" "POT-Creation-Date: 2007-04-15 07:14+0200\n"
"PO-Revision-Date: 2006-12-11 19:57+0100\n" "PO-Revision-Date: 2006-12-11 19:57+0100\n"
"Last-Translator: Rinse de Vries <rinsedevries@kde.nl>\n" "Last-Translator: Rinse de Vries <rinsedevries@kde.nl>\n"
"Language-Team: Dutch <tde-i18n-nl@kde.org>\n" "Language-Team: Dutch <kde-i18n-nl@kde.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"

@ -4,7 +4,7 @@ msgstr ""
"POT-Creation-Date: 2007-04-15 07:14+0200\n" "POT-Creation-Date: 2007-04-15 07:14+0200\n"
"PO-Revision-Date: 2007-04-10 11:05+0100\n" "PO-Revision-Date: 2007-04-10 11:05+0100\n"
"Last-Translator: José Nuno Coelho Pires <jncp@netcabo.pt>\n" "Last-Translator: José Nuno Coelho Pires <jncp@netcabo.pt>\n"
"Language-Team: LANGUAGE <tde-i18n-doc@kde.org>\n" "Language-Team: LANGUAGE <kde-i18n-doc@kde.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"

Loading…
Cancel
Save