瀏覽代碼

Additional k => tde renaming and fixes

tags/r14.0.0
Slávek Banko 7 年之前
父節點
當前提交
93d33c9c9c
共有 7 個檔案被更改,包括 18 行新增18 行删除
  1. +11
    -11
      acinclude.m4
  2. +1
    -1
      admin
  3. +2
    -2
      bibletime/Makefile.am
  4. +1
    -1
      bibletime/frontend/btinstallmgr.cpp
  5. +1
    -1
      bibletime/frontend/cswordsetupdialog.cpp
  6. +1
    -1
      pot/handbook.pot
  7. +1
    -1
      pot/howto.pot

+ 11
- 11
acinclude.m4 查看文件

@@ -2066,34 +2066,34 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES],
if test $kde_qtver = 3; then
AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-ltdeio")
AC_SUBST(LIB_TDEIO, "-ltdeio")
AC_SUBST(LIB_KJS, "-lkjs")
AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_TDEABC, "-ltdeabc")
AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-ltdeparts")
AC_SUBST(LIB_TDESPELL, "-ltdespell")
AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
AC_SUBST(LIB_KUTILS, "-ltdeutils")
AC_SUBST(LIB_TDEUTILS, "-ltdeutils")
AC_SUBST(LIB_TDEPIM, "-ltdepim")
AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
AC_SUBST(LIB_TDEIMPROXY, "-ltdeimproxy")
AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
AC_SUBST(LIB_KDNSSD, "-ltdednssd")
AC_SUBST(LIB_TDEDNSSD, "-ltdednssd")
# these are for backward compatibility
AC_SUBST(LIB_KSYCOCA, "-ltdeio")
AC_SUBST(LIB_TDESYCOCA, "-ltdeio")
AC_SUBST(LIB_TDEFILE, "-ltdeio")
elif test $kde_qtver = 2; then
AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-ltdeio")
AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
AC_SUBST(LIB_TDEIO, "-ltdeio")
AC_SUBST(LIB_TDESYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_TDEFILE, "-ltdefile")
AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-ltdeparts")
AC_SUBST(LIB_TDESPELL, "-ltdespell")
AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
else
AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")


+ 1
- 1
admin

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

+ 2
- 2
bibletime/Makefile.am 查看文件

@@ -22,7 +22,7 @@ $(LIB_X11) \
$(LIB_SWORD) \
$(LIB_CLUCENE) \
$(LIBSOCKET) \
$(LIB_KPARTS)
$(LIB_TDEPARTS)

SUBDIRS = display-templates backend frontend xml pics util

@@ -54,7 +54,7 @@ bin_PROGRAMS = bibletime
bibletime_METASOURCES = AUTO

# 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
DISTCLEANFILES = $(bibletime_METASOURCES)


+ 1
- 1
bibletime/frontend/btinstallmgr.cpp 查看文件

@@ -335,7 +335,7 @@ namespace BookshelfManager {
}

// FTPTransport *BTInstallMgr::createFTPTransport(const char *host, StatusReporter *statusReporter) {
// return new KIO_FTPTransport(host, statusReporter);
// return new TDEIO_FTPTransport(host, statusReporter);
// }




+ 1
- 1
bibletime/frontend/cswordsetupdialog.cpp 查看文件

@@ -507,7 +507,7 @@ the module remote installation feature!</b>")
m_refreshedRemoteSources = 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.");
m_refreshedRemoteSources = false;
success = false;


+ 1
- 1
pot/handbook.pot 查看文件

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


+ 1
- 1
pot/howto.pot 查看文件

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


Loading…
取消
儲存