TDE
/
bibletime
6
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Additional k => tde renaming and fixes

Browse Source
r14.0.x
Slávek Banko 11 years ago
parent 164fc3be52
commit 93d33c9c9c
7 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File

22
acinclude.m4
Unescape View File

@ -2066,34 +2066,34 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES],
if test $kde_qtver = 3; then if test $kde_qtver = 3; 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_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_TDEABC, "-ltdeabc") AC_SUBST(LIB_TDEABC, "-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")
# these are for backward compatibility # these are for backward compatibility
AC_SUBST(LIB_KSYCOCA, "-ltdeio") AC_SUBST(LIB_TDESYCOCA, "-ltdeio")
AC_SUBST(LIB_TDEFILE, "-ltdeio") AC_SUBST(LIB_TDEFILE, "-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_TDEFILE, "-ltdefile") AC_SUBST(LIB_TDEFILE, "-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)")

2
admin

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

4
bibletime/Makefile.am
Unescape View File

@ -22,7 +22,7 @@ $(LIB_X11) \
$(LIB_SWORD) \ $(LIB_SWORD) \
$(LIB_CLUCENE) \ $(LIB_CLUCENE) \
$(LIBSOCKET) \ $(LIBSOCKET) \
$(LIB_KPARTS) $(LIB_TDEPARTS)
SUBDIRS = display-templates backend frontend xml pics util SUBDIRS = display-templates backend frontend xml pics util
@ -54,7 +54,7 @@ bin_PROGRAMS = bibletime
bibletime_METASOURCES = AUTO bibletime_METASOURCES = AUTO
# the library search path. # the library search path.
bibletime_LDFLAGS = $(BT_LDFLAGS) $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_KPARTS) bibletime_LDFLAGS = $(BT_LDFLAGS) $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(LIB_TDEPARTS)
# them while "make clean", use CLEANFILES # them while "make clean", use CLEANFILES
DISTCLEANFILES = $(bibletime_METASOURCES) DISTCLEANFILES = $(bibletime_METASOURCES)

2
bibletime/frontend/btinstallmgr.cpp
Unescape View File

@ -335,7 +335,7 @@ namespace BookshelfManager {
} }
// FTPTransport *BTInstallMgr::createFTPTransport(const char *host, StatusReporter *statusReporter) { // FTPTransport *BTInstallMgr::createFTPTransport(const char *host, StatusReporter *statusReporter) {
// return new KIO_FTPTransport(host, statusReporter); // return new TDEIO_FTPTransport(host, statusReporter);
// } // }

2
bibletime/frontend/cswordsetupdialog.cpp
Unescape View File

@ -507,7 +507,7 @@ the module remote installation feature!</b>")
m_refreshedRemoteSources = true; m_refreshedRemoteSources = true;
success = true; success = true;
} }
else { //an error occurres, the KIO library should display an error message else { //an error occurres, the TDEIO library should display an error message
tqWarning("InstallMgr: refreshRemoteSources returned an error."); tqWarning("InstallMgr: refreshRemoteSources returned an error.");
m_refreshedRemoteSources = false; m_refreshedRemoteSources = false;
success = false; success = false;

2
pot/handbook.pot
Unescape View File

@ -9,7 +9,7 @@ msgstr ""
"POT-Creation-Date: 2007-04-17 19:46+0000\n" "POT-Creation-Date: 2007-04-17 19:46+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: application/x-xml2pot; charset=UTF-8\n" "Content-Type: application/x-xml2pot; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"

2
pot/howto.pot
Unescape View File

@ -9,7 +9,7 @@ msgstr ""
"POT-Creation-Date: 2007-04-17 19:46+0000\n" "POT-Creation-Date: 2007-04-17 19:46+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: application/x-xml2pot; charset=UTF-8\n" "Content-Type: application/x-xml2pot; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"

Write Preview
Loading…
Cancel
Save