Additional k => tde renaming and fixes

acinclude.m4

@@ -2010,30 +2010,30 @@ 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")
 # 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)")

aclocal.m4

@@ -2022,30 +2022,30 @@ 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")
 # 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)")

admin

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

ksystemlog/doc/Makefile

@@ -127,11 +127,11 @@ LIB_TDEUI = -ltdeui
 LIB_TDEFILE = -ltdeio
 LIB_KFM = 
 LIB_TDEHTML = -ltdehtml
-LIB_KIO = -ltdeio
-LIB_KPARTS = -ltdeparts
-LIB_KSPELL = -ltdespell
-LIB_KSYCOCA = -ltdeio
-LIB_KUTILS = -ltdeutils
+LIB_TDEIO = -ltdeio
+LIB_TDEPARTS = -ltdeparts
+LIB_TDESPELL = -ltdespell
+LIB_TDESYCOCA = -ltdeio
+LIB_TDEUTILS = -ltdeutils
 LIB_POLL = 
 LIB_QPE = 
 LIB_QT = -lqt-mt  $(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM) -lpthread

ksystemlog/doc/en/Makefile

@@ -124,11 +124,11 @@ LIB_TDEUI = -ltdeui
 LIB_TDEFILE = -ltdeio
 LIB_KFM = 
 LIB_TDEHTML = -ltdehtml
-LIB_KIO = -ltdeio
-LIB_KPARTS = -ltdeparts
-LIB_KSPELL = -ltdespell
-LIB_KSYCOCA = -ltdeio
-LIB_KUTILS = -ltdeutils
+LIB_TDEIO = -ltdeio
+LIB_TDEPARTS = -ltdeparts
+LIB_TDESPELL = -ltdespell
+LIB_TDESYCOCA = -ltdeio
+LIB_TDEUTILS = -ltdeutils
 LIB_POLL = 
 LIB_QPE = 
 LIB_QT = -lqt-mt  $(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM) -lpthread

ksystemlog/po/Makefile

@@ -124,11 +124,11 @@ LIB_TDEUI = -ltdeui
 LIB_TDEFILE = -ltdeio
 LIB_KFM = 
 LIB_TDEHTML = -ltdehtml
-LIB_KIO = -ltdeio
-LIB_KPARTS = -ltdeparts
-LIB_KSPELL = -ltdespell
-LIB_KSYCOCA = -ltdeio
-LIB_KUTILS = -ltdeutils
+LIB_TDEIO = -ltdeio
+LIB_TDEPARTS = -ltdeparts
+LIB_TDESPELL = -ltdespell
+LIB_TDESYCOCA = -ltdeio
+LIB_TDEUTILS = -ltdeutils
 LIB_POLL = 
 LIB_QPE = 
 LIB_QT = -lqt-mt  $(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM) -lpthread

ksystemlog/src/Makefile.am

@@ -14,7 +14,7 @@ INCLUDES = -I$(top_srcdir)/ksystemlog/src      -I$(top_builddir)/ksystemlog/src/
 	-I$(top_srcdir)/ksystemlog/src/system  -I$(top_srcdir)/ksystemlog/src/xorg $(all_includes)
 
 # the library search path. 
-ksystemlog_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -ltdeutils
+ksystemlog_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -ltdeutils
 
 # the libraries to link against.
 ksystemlog_LDADD = \