Additional k => tde renaming and fixes

10 files changed, 30 insertions, 30 deletions

diff --git a/acinclude.m4 b/acinclude.m4
index a83a187..e47a74e 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2029,31 +2029,31 @@ 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_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")
 # 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/aclocal.m4 b/aclocal.m4
index 697bef8..b126c3d 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -2041,31 +2041,31 @@ 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_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")
 # 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/kiosktool/Makefile.am b/kiosktool/Makefile.am
index 5561505..f259bbf 100644
--- a/kiosktool/Makefile.am
+++ b/kiosktool/Makefile.am
@@ -12,7 +12,7 @@ bin_PROGRAMS = kiosktool kiosktool-tdedirs
 INCLUDES         = $(all_includes)
 
 # the library search path. 
-kiosktool_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kiosktool_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 # the libraries to link against.
 kiosktool_LDADD   = $(LIB_TDEFILE) -ltdeprint
@@ -32,7 +32,7 @@ kiosktool_SOURCES =	main.cpp kioskgui.cpp kioskdata.cpp kioskrun.cpp \
 	kiosksync.cpp
 
 # the library search path. 
-kiosktool_tdedirs_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kiosktool_tdedirs_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 # the libraries to link against.
 kiosktool_tdedirs_LDADD   = $(LIB_TDECORE)
diff --git a/kiosktool/kcms/autostart/Makefile.am b/kiosktool/kcms/autostart/Makefile.am
index 993941a..e79d9fc 100644
--- a/kiosktool/kcms/autostart/Makefile.am
+++ b/kiosktool/kcms/autostart/Makefile.am
@@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_autostart.la
 kcm_autostart_la_SOURCES = kcmautostart.cpp
 
 kcm_autostart_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-kcm_autostart_la_LIBADD =  $(LIB_KIO)
+kcm_autostart_la_LIBADD =  $(LIB_TDEIO)
 
 INCLUDES= $(all_includes)
 
diff --git a/po/it/kiosktool.po b/po/it/kiosktool.po
index 307566a..7f9494d 100644
--- a/po/it/kiosktool.po
+++ b/po/it/kiosktool.po
@@ -6,7 +6,7 @@ msgstr ""
 "POT-Creation-Date: 2005-01-22 01:28+0100\n"
 "PO-Revision-Date: 2004-11-05 02:00+0100\n"
 "Last-Translator: Federico Zenith <[email protected]>\n"
-"Language-Team: Italian <[email protected]>\n"
+"Language-Team: Italian <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/lt/kiosktool.po b/po/lt/kiosktool.po
index 6e46d1e..40b58fd 100644
--- a/po/lt/kiosktool.po
+++ b/po/lt/kiosktool.po
@@ -1278,7 +1278,7 @@ msgstr ""
 "&Pridėti\n"
 "#-#-#-#-#  tdeprint.po (tdeprint)  #-#-#-#-#\n"
 "&Pridėti\n"
-"#-#-#-#-#  kio.po (kio)  #-#-#-#-#\n"
+"#-#-#-#-#  tdeio.po (tdeio)  #-#-#-#-#\n"
 "&Pridėti\n"
 "#-#-#-#-#  artscontrol.po (artscontrol)  #-#-#-#-#\n"
 "&Pridėti\n"
@@ -1635,7 +1635,7 @@ msgstr ""
 "Aprašymas\n"
 "#-#-#-#-#  tdeprint.po (tdeprint)  #-#-#-#-#\n"
 "Aprašymas:\n"
-"#-#-#-#-#  kio.po (kio)  #-#-#-#-#\n"
+"#-#-#-#-#  tdeio.po (tdeio)  #-#-#-#-#\n"
 "Aprašymas:\n"
 "#-#-#-#-#  tdefile_ogg.po (tdefile_ogg)  #-#-#-#-#\n"
 "Aprašymas\n"
@@ -1751,7 +1751,7 @@ msgstr ""
 "Grupė\n"
 "#-#-#-#-#  cupsdconf.po (cupsdconf)  #-#-#-#-#\n"
 "Grupė\n"
-"#-#-#-#-#  kio.po (kio)  #-#-#-#-#\n"
+"#-#-#-#-#  tdeio.po (tdeio)  #-#-#-#-#\n"
 "Grupė\n"
 "#-#-#-#-#  ppdtranslations.po (ppdtranslations)  #-#-#-#-#\n"
 "Grupė\n"
diff --git a/po/nl/kiosktool.po b/po/nl/kiosktool.po
index ce9893b..b9f7a86 100644
--- a/po/nl/kiosktool.po
+++ b/po/nl/kiosktool.po
@@ -9,7 +9,7 @@ msgstr ""
 "POT-Creation-Date: 2005-01-22 01:28+0100\n"
 "PO-Revision-Date: 2004-11-10 13:37+0100\n"
 "Last-Translator: Rinse de Vries <[email protected]>\n"
-"Language-Team: Nederlands <[email protected]>\n"
+"Language-Team: Nederlands <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/pt_BR/kiosktool.po b/po/pt_BR/kiosktool.po
index 1382cdc..a4b829f 100644
--- a/po/pt_BR/kiosktool.po
+++ b/po/pt_BR/kiosktool.po
@@ -6,7 +6,7 @@ msgstr ""
 "POT-Creation-Date: 2005-01-22 01:28+0100\n"
 "PO-Revision-Date: 2004-07-27 00:04-0300\n"
 "Last-Translator: Lisiane Sztoltz Teixeira <[email protected]>\n"
-"Language-Team: Brazilian Portuguese <[email protected]>\n"
+"Language-Team: Brazilian Portuguese <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/ro/kiosktool.po b/po/ro/kiosktool.po
index d6cf928..ca2de69 100644
--- a/po/ro/kiosktool.po
+++ b/po/ro/kiosktool.po
@@ -6,7 +6,7 @@ msgstr ""
 "POT-Creation-Date: 2005-01-22 01:28+0100\n"
 "PO-Revision-Date: 2004-06-13 19:16+0300\n"
 "Last-Translator: Claudiu Costin <[email protected]>\n"
-"Language-Team: Romanian <[email protected]>\n"
+"Language-Team: Romanian <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"