diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2013-09-03 19:56:28 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2013-09-03 19:56:28 +0200 |
| commit | bb6ac09196ce098b3f97dd4c890821a403849c11 (patch) | |
| tree | b045e44902eb6edc99feabd32e924ae2b6b1a29d | |
| parent | f692a866733505de64bd95ba3e4527b41554aa57 (diff) | |
| download | dolphin-bb6ac09196ce098b3f97dd4c890821a403849c11.tar.gz dolphin-bb6ac09196ce098b3f97dd4c890821a403849c11.zip | |
Additional k => tde renaming and fixes
| -rw-r--r-- | acinclude.m4 | 24 | ||||
| m--------- | admin | 0 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/dolphin.cpp | 2 |
4 files changed, 14 insertions, 14 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 8455084..8ad786a 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2094,35 +2094,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/admin b/admin -Subproject b4d585c643d92787bfa17b935ce00b09960ee36 +Subproject 6b7f7225eff4c49b2dd71804d5fdacb03efcf46 diff --git a/src/Makefile.am b/src/Makefile.am index 6c17e39..23759fd 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -10,7 +10,7 @@ bin_PROGRAMS = d3lphin INCLUDES = $(all_includes) # the library search path. -d3lphin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +d3lphin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor # the libraries to link against. d3lphin_LDADD = $(LIB_TDEFILE) $(LIB_TDEPRINT) -lkonq diff --git a/src/dolphin.cpp b/src/dolphin.cpp index 879ee5c..2e85ea3 100644 --- a/src/dolphin.cpp +++ b/src/dolphin.cpp @@ -1563,7 +1563,7 @@ void Dolphin::updateViewProperties(const KURL::List& urls) } // Updating the view properties might take up to several seconds - // when dragging several thousand URLs. Writing a KIO slave for this + // when dragging several thousand URLs. Writing a TDEIO slave for this // use case is not worth the effort, but at least the main widget // must be disabled and a progress should be shown. ProgressIndicator progressIndicator(i18n("Updating view properties..."), |