From 8ac81197c8a85d49dd0703a9ae64438285a6ecf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Tue, 3 Sep 2013 19:57:34 +0200
Subject: [PATCH] Additional k => tde renaming and fixes

---
 acinclude.m4    | 18 +++++++++---------
 admin           |  2 +-
 src/Makefile.am |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 8ba1fec..799013d 100644
--- a/acinclude.m4
+++ b/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_KABC, "-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_KFILE, "-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_KFILE, "-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
index b4d585c..6b7f722 160000
--- a/admin
+++ b/admin
@@ -1 +1 @@
-Subproject commit b4d585c643d92787bfa17b935ce00b09960ee360
+Subproject commit 6b7f7225eff4c49b2dd71804d5fdacb03efcf461
diff --git a/src/Makefile.am b/src/Makefile.am
index 6b7d253..0ff077e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -31,7 +31,7 @@ knmap_SOURCES = main.cpp knmap.cpp mainwidget.cpp outputwidget.cpp \
 					tabwidgetptrlist.cpp tabwidgetdata.cpp scanwidget.cpp indexwidget.cpp scannamedialog.cpp \
 			scanstack.cpp scanmonitor.cpp scanmonitorevent.cpp nmapoutputbuffer.cpp
 knmap_LDFLAGS = $(TDE_RPATH) $(all_libraries)
-knmap_LDADD = $(LIB_KIO) $(LIB_TDEHTML) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
+knmap_LDADD = $(LIB_TDEIO) $(LIB_TDEHTML) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
 
 # this is where the desktop file will go 
 shelldesktopdir   = $(kde_appsdir)/Internet