From 4a0539910776182d5d7a38dee2439b00327fbfdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Tue, 3 Sep 2013 19:58:47 +0200 Subject: [PATCH] Additional k => tde renaming and fixes --- acinclude.m4 | 24 ++++++++++++------------ po/it.po | 2 +- po/nl.po | 2 +- src/Makefile.am | 4 ++-- src/filehandler.h | 2 +- src/imagefactory.h | 4 ++-- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index cbe9efd..1c5bc81 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2075,35 +2075,35 @@ if test $kde_qtver = 3; then AC_SUBST(LIB_KDED, $lib_kded) 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_KUNITTEST, "-ltdeunittest") + AC_SUBST(LIB_TDEDNSSD, "-ltdednssd") + AC_SUBST(LIB_TDEUNITTEST, "-ltdeunittest") # 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)") diff --git a/po/it.po b/po/it.po index a035ff6..98d695d 100644 --- a/po/it.po +++ b/po/it.po @@ -10,7 +10,7 @@ msgstr "" "POT-Creation-Date: 2008-01-26 10:52-0800\n" "PO-Revision-Date: 2005-10-12 18:20+0200\n" "Last-Translator: Lorenzo Novaro \n" -"Language-Team: Italiano \n" +"Language-Team: Italiano \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/nl.po b/po/nl.po index a291f29..e628ac3 100644 --- a/po/nl.po +++ b/po/nl.po @@ -10,7 +10,7 @@ msgstr "" "POT-Creation-Date: 2008-01-26 10:52-0800\n" "PO-Revision-Date: 2005-08-11 11:02+0200\n" "Last-Translator: Fred Marchee \n" -"Language-Team: Nederlands \n" +"Language-Team: Nederlands \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/src/Makefile.am b/src/Makefile.am index 53220b2..3776b22 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -31,7 +31,7 @@ tellico_LDADD = ./core/libcore.a ./cite/libcite.a ./fetch/libfetch.a \ ./translators/pilotdb/libflatfile/liblibflatfile.a ./gui/libgui.a \ ./translators/pilotdb/libpalm/liblibpalm.a ./rtf2html/librtf2html.a \ ./commands/libcommands.a -lexslt $(LIB_TDEFILE) $(LIB_TDEHTML) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) \ - $(LIBSOCKET) $(LIBXSLT_LIBS) $(TAGLIB_LIBS) $(KCDDB_LIBS) $(YAZ_LIBS) $(LIB_KIO) \ + $(LIBSOCKET) $(LIBXSLT_LIBS) $(TAGLIB_LIBS) $(KCDDB_LIBS) $(YAZ_LIBS) $(LIB_TDEIO) \ $(LIB_TDEABC) $(KCAL_LIBS) $(LDADD_LIBBTPARSE) $(LIB_KNEWSTUFF) $(EXEMPI_LIBS) \ $(POPPLER_LIBS) $(LDADD_LIBBARCODE) $(LIBXML_LIBS) @@ -122,7 +122,7 @@ KDE_OPTIONS = noautodist CLEANFILES = *~ *.loT # the library search path. -tellico_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_KPARTS) +tellico_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(LIB_TDEPARTS) uidir = $(kde_datadir)/tellico ui_DATA = tellicoui.rc diff --git a/src/filehandler.h b/src/filehandler.h index 653f84f..45dbc7b 100644 --- a/src/filehandler.h +++ b/src/filehandler.h @@ -45,7 +45,7 @@ friend class ImageFactory; public: /** - * An internal class to handle KIO stuff. Exposed so a FileRef pointer + * An internal class to handle TDEIO stuff. Exposed so a FileRef pointer * can be returned from FileHandler. */ class FileRef { diff --git a/src/imagefactory.h b/src/imagefactory.h index f653d83..8f90e02 100644 --- a/src/imagefactory.h +++ b/src/imagefactory.h @@ -68,7 +68,7 @@ public: * Add an image, reading it from a URL, which is the case when adding a new image from the * @ref ImageWidget. * - * @param url The URL of the image, anything KIO can handle + * @param url The URL of the image, anything TDEIO can handle * @param quiet If any error should not be reported. * @return The image id, empty if null */ @@ -146,7 +146,7 @@ private: * Add an image, reading it from a URL, which is the case when adding a new image from the * @ref ImageWidget. * - * @param url The URL of the image, anything KIO can handle + * @param url The URL of the image, anything TDEIO can handle * @param quiet If any error should not be reported. * @return The image */