Additional k => tde renaming and fixes

30 files changed, 81 insertions, 81 deletions

diff --git a/KMFIPTInterface/Makefile.am b/KMFIPTInterface/Makefile.am
index c8b96ab..052672d 100644
--- a/KMFIPTInterface/Makefile.am
+++ b/KMFIPTInterface/Makefile.am
@@ -1,7 +1,7 @@
 bin_PROGRAMS = kmfiptinterface
 INCLUDES = $(all_includes)
 kmfiptinterface_LDFLAGS = -module $(all_libraries) $(KDE_RPATH)
-kmfiptinterface_LDADD = $(LIB_KIO)
+kmfiptinterface_LDADD = $(LIB_TDEIO)
 kmfiptinterface_SOURCES = main.cpp kmfiptinterface.cpp iptchecker.cpp kmfiptinterface.skel
 
 
diff --git a/KMFSysTray/Makefile.am b/KMFSysTray/Makefile.am
index d6ca737..4331dd3 100644
--- a/KMFSysTray/Makefile.am
+++ b/KMFSysTray/Makefile.am
@@ -7,8 +7,8 @@ bin_PROGRAMS = kmfsystray
 
 
 
-kmfsystray_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kmfsystray_LDADD = ../kmyfirewall/core/libkmfcore.la ../kmyfirewall/kmfwidgets/libkmfwidgets.la $(LIB_TDEUI) $(LIB_KPARTS)
+kmfsystray_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kmfsystray_LDADD = ../kmyfirewall/core/libkmfcore.la ../kmyfirewall/kmfwidgets/libkmfwidgets.la $(LIB_TDEUI) $(LIB_TDEPARTS)
 
 kmfsystray_DATA = kmfsystray.desktop
 kmfsystraydir = $(kde_datadir)/kicker/applets
diff --git a/acinclude.m4 b/acinclude.m4
index 70b1bae..a0b0be6 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2070,35 +2070,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/doc/Makefile b/doc/Makefile
index 01122b7..db7b122 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -159,19 +159,19 @@ LIB_KDED =
 LIB_TDEPIM = -ltdepim
 LIB_TDEPRINT = -ltdeprint
 LIB_TDEUI = -ltdeui
-LIB_KDNSSD = -ltdednssd
+LIB_TDEDNSSD = -ltdednssd
 LIB_TDEFILE = -ltdeio
 LIB_KFM = 
 LIB_TDEHTML = -ltdehtml
-LIB_KIMPROXY = -ltdeimproxy
-LIB_KIO = -ltdeio
+LIB_TDEIMPROXY = -ltdeimproxy
+LIB_TDEIO = -ltdeio
 LIB_KJS = -lkjs
 LIB_KNEWSTUFF = -lknewstuff
-LIB_KPARTS = -ltdeparts
-LIB_KSPELL = -ltdespell
-LIB_KSYCOCA = -ltdeio
-LIB_KUNITTEST = -ltdeunittest
-LIB_KUTILS = -ltdeutils
+LIB_TDEPARTS = -ltdeparts
+LIB_TDESPELL = -ltdespell
+LIB_TDESYCOCA = -ltdeio
+LIB_TDEUNITTEST = -ltdeunittest
+LIB_TDEUTILS = -ltdeutils
 LIB_POLL = 
 LIB_QPE = 
 LIB_QT = -lqt-mt  $(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM) -lpthread
diff --git a/doc/kmyfirewall/Makefile b/doc/kmyfirewall/Makefile
index fd4837a..fdd611b 100644
--- a/doc/kmyfirewall/Makefile
+++ b/doc/kmyfirewall/Makefile
@@ -143,19 +143,19 @@ LIB_KDED =
 LIB_TDEPIM = -ltdepim
 LIB_TDEPRINT = -ltdeprint
 LIB_TDEUI = -ltdeui
-LIB_KDNSSD = -ltdednssd
+LIB_TDEDNSSD = -ltdednssd
 LIB_TDEFILE = -ltdeio
 LIB_KFM = 
 LIB_TDEHTML = -ltdehtml
-LIB_KIMPROXY = -ltdeimproxy
-LIB_KIO = -ltdeio
+LIB_TDEIMPROXY = -ltdeimproxy
+LIB_TDEIO = -ltdeio
 LIB_KJS = -lkjs
 LIB_KNEWSTUFF = -lknewstuff
-LIB_KPARTS = -ltdeparts
-LIB_KSPELL = -ltdespell
-LIB_KSYCOCA = -ltdeio
-LIB_KUNITTEST = -ltdeunittest
-LIB_KUTILS = -ltdeutils
+LIB_TDEPARTS = -ltdeparts
+LIB_TDESPELL = -ltdespell
+LIB_TDESYCOCA = -ltdeio
+LIB_TDEUNITTEST = -ltdeunittest
+LIB_TDEUTILS = -ltdeutils
 LIB_POLL = 
 LIB_QPE = 
 LIB_QT = -lqt-mt  $(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM) -lpthread
diff --git a/doc/kmyfirewall/index.docbook b/doc/kmyfirewall/index.docbook
index 1435246..3620251 100644
--- a/doc/kmyfirewall/index.docbook
+++ b/doc/kmyfirewall/index.docbook
@@ -945,7 +945,7 @@ METASOURCES = AUTO
 kde_module_LTLIBRARIES =  libkmfruleoptionedit_mac.la
 
 libkmfruleoptionedit_mac_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
-libkmfruleoptionedit_mac_la_LIBADD = ../../core/libkmfcore.la ../../interfaces/libkmfinterfaces.la $(LIB_KPARTS)
+libkmfruleoptionedit_mac_la_LIBADD = ../../core/libkmfcore.la ../../interfaces/libkmfinterfaces.la $(LIB_TDEPARTS)
 noinst_HEADERS =  kmfruleoptioneditmac.h kmfruleeditmac.h
 
 libkmfruleoptionedit_mac_la_SOURCES = kmfruleoptioneditmac.cpp kmfruleeditmac.cpp  kmyfirewallruleeditormac.ui
diff --git a/kmyfirewall/Makefile.am b/kmyfirewall/Makefile.am
index a2c1ae3..5c16cf9 100644
--- a/kmyfirewall/Makefile.am
+++ b/kmyfirewall/Makefile.am
@@ -11,9 +11,9 @@ METASOURCES = AUTO
 #########################################################################
 bin_PROGRAMS = kmyfirewall
 kmyfirewall_SOURCES = kmfconfigdialog.cpp kmyfirewall.cpp main.cpp
-kmyfirewall_LDFLAGS = -no-undefined $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kmyfirewall_LDFLAGS = -no-undefined $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kmyfirewall_LDADD = kmfwidgets/libkmfwidgets.la \
-	core/libkmfcore.la $(LIB_KPARTS)
+	core/libkmfcore.la $(LIB_TDEPARTS)
 
 
 # this is where the desktop file will go
diff --git a/kmyfirewall/compilers/iptables/Makefile.am b/kmyfirewall/compilers/iptables/Makefile.am
index 2e69cd0..fb9c6b0 100644
--- a/kmyfirewall/compilers/iptables/Makefile.am
+++ b/kmyfirewall/compilers/iptables/Makefile.am
@@ -2,10 +2,10 @@ INCLUDES = $(all_includes) -I../../core -I../../kmfwidgets -I../../libkmfplugins
 METASOURCES = AUTO
 kde_module_LTLIBRARIES =  libkmfcompiler_ipt.la
 libkmfcompiler_ipt_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) \
-	$(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO)
+	$(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO)
 libkmfcompiler_ipt_la_SOURCES = kmfiptablescompiler.cpp kmfiptablesscriptgenerator.cpp kmfiptablesdocumentconverter.cpp
 libkmfcompiler_ipt_la_LIBADD = \
-	$(LIB_KPARTS) ../../kmfwidgets/libkmfwidgets.la ../../core/libkmfcore.la 
+	$(LIB_TDEPARTS) ../../kmfwidgets/libkmfwidgets.la ../../core/libkmfcore.la 
 
 partdesktopdir = $(kde_servicesdir)
 partdesktop_DATA = kmfcompiler_ipt.desktop
diff --git a/kmyfirewall/compilers/pf/Makefile.am b/kmyfirewall/compilers/pf/Makefile.am
index 793906e..931bea7 100644
--- a/kmyfirewall/compilers/pf/Makefile.am
+++ b/kmyfirewall/compilers/pf/Makefile.am
@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES =  libkmfcompiler_pf.la
 libkmfcompiler_pf_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
 libkmfcompiler_pf_la_SOURCES = kmfpfcompiler.cpp kmfpfscriptgenerator.cpp
 libkmfcompiler_pf_la_LIBADD = \
-	$(LIB_KPARTS) ../../kmfwidgets/libkmfwidgets.la ../../core/libkmfcore.la 
+	$(LIB_TDEPARTS) ../../kmfwidgets/libkmfwidgets.la ../../core/libkmfcore.la 
 
 partdesktopdir = $(kde_servicesdir)
 partdesktop_DATA = kmfcompiler_pf.desktop
diff --git a/kmyfirewall/core/Makefile.am b/kmyfirewall/core/Makefile.am
index 826dd67..2168aff 100644
--- a/kmyfirewall/core/Makefile.am
+++ b/kmyfirewall/core/Makefile.am
@@ -53,7 +53,7 @@ libkmfcore_la_SOURCES = ipaddress.cpp \
 
 libkmfcoreincludedir = $(includedir)/kmyfirewall/core/
 
-libkmfcore_la_LIBADD = $(LIB_KPARTS) $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
+libkmfcore_la_LIBADD = $(LIB_TDEPARTS) $(LIB_TDEIO) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
 
 libkmfcoreinclude_HEADERS = ipaddress.h \
 	iptable.h \
diff --git a/kmyfirewall/genericinterface/Makefile.am b/kmyfirewall/genericinterface/Makefile.am
index 9f4bb57..ee1c368 100644
--- a/kmyfirewall/genericinterface/Makefile.am
+++ b/kmyfirewall/genericinterface/Makefile.am
@@ -6,9 +6,9 @@ partrcdir   = $(kde_datadir)/kmfgenericinterfacepart
 partrc_DATA = kmfgenericinterfacepartui.rc
 
 libkmfgenericinterfacepart_la_LDFLAGS = -module -no-undefined $(all_libraries) \
-	$(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO)
+	$(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO)
 libkmfgenericinterfacepart_la_LIBADD = \
-	$(LIB_KPARTS) ../kmfwidgets/libkmfwidgets.la ../core/libkmfcore.la 
+	$(LIB_TDEPARTS) ../kmfwidgets/libkmfwidgets.la ../core/libkmfcore.la 
 
 libkmfgenericinterfacepart_la_SOURCES = kmfgenericinterface.cpp \
 	kmfgenericinterface_part.cpp kmfgenericinterfaceprotocol.cpp kmfgenericinterfacenat.cpp \
diff --git a/kmyfirewall/installer/Makefile.am b/kmyfirewall/installer/Makefile.am
index df7d33b..1f8a7a6 100644
--- a/kmyfirewall/installer/Makefile.am
+++ b/kmyfirewall/installer/Makefile.am
@@ -11,13 +11,13 @@ partdesktopdir = $(kde_servicetypesdir)
 partdesktop_DATA = kmfinstallerplugin.desktop
 
 libkmfinstallerplugin_la_LDFLAGS = -module -no-undefined $(all_libraries) \
-	$(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO)
+	$(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO)
 
 libkmfinstallerplugin_la_SOURCES = kmfinstallerplugin.cpp
 noinst_HEADERS = kmfinstallerplugin.h
 
 libkmfinstallerplugin_la_LIBADD = \
-	../kmfwidgets/libkmfwidgets.la ../core/libkmfcore.la $(LIB_KPARTS)
+	../kmfwidgets/libkmfwidgets.la ../core/libkmfcore.la $(LIB_TDEPARTS)
 
 templatedir = $(kde_datadir)/kmyfirewall/
 template_DATA = README.InstallerPackage.txt
diff --git a/kmyfirewall/installer/linux/Makefile.am b/kmyfirewall/installer/linux/Makefile.am
index d9a26c7..ab9ad13 100644
--- a/kmyfirewall/installer/linux/Makefile.am
+++ b/kmyfirewall/installer/linux/Makefile.am
@@ -1,11 +1,11 @@
 INCLUDES = $(all_includes) -I../../core -I../../kmfwidgets -I../../libkmfplugins
 METASOURCES = AUTO
 kde_module_LTLIBRARIES =  libkmfinstaller_linux.la
-libkmfinstaller_linux_la_LDFLAGS = -module -no-undefined $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) $(KDE_PLUGIN) \
+libkmfinstaller_linux_la_LDFLAGS = -module -no-undefined $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(KDE_PLUGIN) \
 	$(all_libraries)
 libkmfinstaller_linux_la_SOURCES = kmfiptinstaller.cpp
 libkmfinstaller_linux_la_LIBADD = \
-	../../kmfwidgets/libkmfwidgets.la ../../core/libkmfcore.la $(LIB_KPARTS)
+	../../kmfwidgets/libkmfwidgets.la ../../core/libkmfcore.la $(LIB_TDEPARTS)
 
 noinst_HEADERS = kmfiptinstaller.h
 
diff --git a/kmyfirewall/installer/openbsd/Makefile b/kmyfirewall/installer/openbsd/Makefile
index 429b5ab..fc9f2c0 100644
--- a/kmyfirewall/installer/openbsd/Makefile
+++ b/kmyfirewall/installer/openbsd/Makefile
@@ -197,19 +197,19 @@ LIB_KDED =
 LIB_TDEPIM = -ltdepim
 LIB_TDEPRINT = -ltdeprint
 LIB_TDEUI = -ltdeui
-LIB_KDNSSD = -ltdednssd
+LIB_TDEDNSSD = -ltdednssd
 LIB_TDEFILE = -ltdeio
 LIB_KFM = 
 LIB_TDEHTML = -ltdehtml
-LIB_KIMPROXY = -ltdeimproxy
-LIB_KIO = -ltdeio
+LIB_TDEIMPROXY = -ltdeimproxy
+LIB_TDEIO = -ltdeio
 LIB_KJS = -lkjs
 LIB_KNEWSTUFF = -lknewstuff
-LIB_KPARTS = -ltdeparts
-LIB_KSPELL = -ltdespell
-LIB_KSYCOCA = -ltdeio
-LIB_KUNITTEST = -ltdeunittest
-LIB_KUTILS = -ltdeutils
+LIB_TDEPARTS = -ltdeparts
+LIB_TDESPELL = -ltdespell
+LIB_TDESYCOCA = -ltdeio
+LIB_TDEUNITTEST = -ltdeunittest
+LIB_TDEUTILS = -ltdeutils
 LIB_POLL = 
 LIB_QPE = 
 LIB_QT = -lqt-mt  $(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM) -lpthread
@@ -361,7 +361,7 @@ libkmfinstaller_openbsd_la_LDFLAGS = -module -no-undefined $(KDE_NO_UNDEFINED) $
 
 libkmfinstaller_openbsd_la_SOURCES = kmfpfinstaller.cpp
 libkmfinstaller_openbsd_la_LIBADD = \
-	../../kmfwidgets/libkmfwidgets.la ../../core/libkmfcore.la $(LIB_KPARTS)
+	../../kmfwidgets/libkmfwidgets.la ../../core/libkmfcore.la $(LIB_TDEPARTS)
 
 noinst_HEADERS = kmfpfinstaller.h
 partdesktopdir = $(kde_servicesdir)
diff --git a/kmyfirewall/installer/openbsd/Makefile.am b/kmyfirewall/installer/openbsd/Makefile.am
index ac43767..f36fbc5 100644
--- a/kmyfirewall/installer/openbsd/Makefile.am
+++ b/kmyfirewall/installer/openbsd/Makefile.am
@@ -5,7 +5,7 @@ libkmfinstaller_openbsd_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) \
 	$(all_libraries)
 libkmfinstaller_openbsd_la_SOURCES = kmfpfinstaller.cpp
 libkmfinstaller_openbsd_la_LIBADD = \
-	../../kmfwidgets/libkmfwidgets.la ../../core/libkmfcore.la $(LIB_KPARTS)
+	../../kmfwidgets/libkmfwidgets.la ../../core/libkmfcore.la $(LIB_TDEPARTS)
 
 noinst_HEADERS = kmfpfinstaller.h
 
diff --git a/kmyfirewall/ipteditor/Makefile.am b/kmyfirewall/ipteditor/Makefile.am
index 0923389..0e66d8b 100644
--- a/kmyfirewall/ipteditor/Makefile.am
+++ b/kmyfirewall/ipteditor/Makefile.am
@@ -21,9 +21,9 @@ libkmfipteditorpart_la_SOURCES = kmfchainedit.cpp kmfnewchaindlg.cpp kmfruleedit
 noinst_HEADERS = kmfchainedit.h kmfnewchaindlg.h kmfruleedit.h kmfipteditorpart.h
 
 libkmfipteditorpart_la_LDFLAGS = -module -no-undefined $(all_libraries) \
-	$(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO)
+	$(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO)
 libkmfipteditorpart_la_LIBADD = \
-	 $(LIB_KPARTS) ../kmfwidgets/libkmfwidgets.la ../core/libkmfcore.la
+	 $(LIB_TDEPARTS) ../kmfwidgets/libkmfwidgets.la ../core/libkmfcore.la
 
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(kde_datadir)/kmyfirewall/ruleoptions/
diff --git a/kmyfirewall/kmfwidgets/Makefile.am b/kmyfirewall/kmfwidgets/Makefile.am
index 0b88aea..f093bad 100644
--- a/kmyfirewall/kmfwidgets/Makefile.am
+++ b/kmyfirewall/kmfwidgets/Makefile.am
@@ -3,7 +3,7 @@ METASOURCES = AUTO
 lib_LTLIBRARIES =  libkmfwidgets.la
 libkmfwidgets_la_LDFLAGS = -no-undefined $(all_libraries)
 libkmfwidgets_la_LIBADD = \
-	$(LIB_KPARTS) ../core/libkmfcore.la
+	$(LIB_TDEPARTS) ../core/libkmfcore.la
 	
 
 libkmfwidgets_la_SOURCES = kmfchecklistitem.cpp kmfchecklistoutput.cpp \
diff --git a/kmyfirewall/ruleoptionplugins/custom_option/Makefile.am b/kmyfirewall/ruleoptionplugins/custom_option/Makefile.am
index accc6cf..99c1994 100644
--- a/kmyfirewall/ruleoptionplugins/custom_option/Makefile.am
+++ b/kmyfirewall/ruleoptionplugins/custom_option/Makefile.am
@@ -3,9 +3,9 @@ METASOURCES = AUTO
 kde_module_LTLIBRARIES =  libkmfruleoptionedit_custom.la
 
 libkmfruleoptionedit_custom_la_LDFLAGS = -module -no-undefined $(all_libraries) \
-	$(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO)
+	$(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO)
 libkmfruleoptionedit_custom_la_LIBADD = \
-	$(LIB_KPARTS) ../../core/libkmfcore.la 
+	$(LIB_TDEPARTS) ../../core/libkmfcore.la 
 noinst_HEADERS =  kmfruleoptioneditcustom.h kmfruleeditcustomopt.h 
 
 libkmfruleoptionedit_custom_la_SOURCES = kmfruleoptioneditcustom.cpp kmfruleeditcustomopt.cpp kmyfirewallruleeditorcustomrule.ui
diff --git a/kmyfirewall/ruleoptionplugins/interface_option/Makefile.am b/kmyfirewall/ruleoptionplugins/interface_option/Makefile.am
index 74229d9..9f4e429 100644
--- a/kmyfirewall/ruleoptionplugins/interface_option/Makefile.am
+++ b/kmyfirewall/ruleoptionplugins/interface_option/Makefile.am
@@ -3,9 +3,9 @@ METASOURCES = AUTO
 kde_module_LTLIBRARIES =  libkmfruleoptionedit_interface.la
 
 libkmfruleoptionedit_interface_la_LDFLAGS = -module -no-undefined \
-	$(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO)
+	$(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO)
 libkmfruleoptionedit_interface_la_LIBADD = \
-	 $(LIB_KPARTS) ../../core/libkmfcore.la
+	 $(LIB_TDEPARTS) ../../core/libkmfcore.la
 
 noinst_HEADERS =  kmfruleeditorinterface.h kmfruleoptioneditinterface.h
 
diff --git a/kmyfirewall/ruleoptionplugins/ip_option/Makefile.am b/kmyfirewall/ruleoptionplugins/ip_option/Makefile.am
index 1dcd950..287c73d 100644
--- a/kmyfirewall/ruleoptionplugins/ip_option/Makefile.am
+++ b/kmyfirewall/ruleoptionplugins/ip_option/Makefile.am
@@ -3,9 +3,9 @@ METASOURCES = AUTO
 kde_module_LTLIBRARIES =  libkmfruleoptionedit_ip.la
 
 libkmfruleoptionedit_ip_la_LDFLAGS = -module -no-undefined $(all_libraries) \
-	$(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO)
+	$(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO)
 libkmfruleoptionedit_ip_la_LIBADD = \
-	../../core/libkmfcore.la $(LIB_KPARTS)
+	../../core/libkmfcore.la $(LIB_TDEPARTS)
 noinst_HEADERS =  kmfruleoptioneditip.h kmfruleeditip.h 
 
 libkmfruleoptionedit_ip_la_SOURCES = kmfruleoptioneditip.cpp kmfruleeditip.cpp kmyfirewallruleeditorip.ui
diff --git a/kmyfirewall/ruleoptionplugins/limit_option/Makefile.am b/kmyfirewall/ruleoptionplugins/limit_option/Makefile.am
index 89b4944..761b8e5 100644
--- a/kmyfirewall/ruleoptionplugins/limit_option/Makefile.am
+++ b/kmyfirewall/ruleoptionplugins/limit_option/Makefile.am
@@ -3,9 +3,9 @@ METASOURCES = AUTO
 kde_module_LTLIBRARIES =  libkmfruleoptionedit_limit.la
 
 libkmfruleoptionedit_limit_la_LDFLAGS = -module -no-undefined $(all_libraries) \
-	$(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO)
+	$(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO)
 libkmfruleoptionedit_limit_la_LIBADD = \
-	../../core/libkmfcore.la $(LIB_KPARTS)
+	../../core/libkmfcore.la $(LIB_TDEPARTS)
 noinst_HEADERS =  kmfruleoptioneditlimit.h kmfruleeditorlimit.h 
 
 libkmfruleoptionedit_limit_la_SOURCES = kmfruleoptioneditlimit.cpp kmfruleeditorlimit.cpp kmyfirewallruleeditorlimit.ui
diff --git a/kmyfirewall/ruleoptionplugins/log_target_option/Makefile.am b/kmyfirewall/ruleoptionplugins/log_target_option/Makefile.am
index daed804..95c263c 100644
--- a/kmyfirewall/ruleoptionplugins/log_target_option/Makefile.am
+++ b/kmyfirewall/ruleoptionplugins/log_target_option/Makefile.am
@@ -3,9 +3,9 @@ METASOURCES = AUTO
 kde_module_LTLIBRARIES =  libkmfruletargetoptionedit_log.la
 
 libkmfruletargetoptionedit_log_la_LDFLAGS = -module -no-undefined \
-	$(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO)
+	$(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO)
 libkmfruletargetoptionedit_log_la_LIBADD = \
-	../../core/libkmfcore.la $(LIB_KPARTS)
+	../../core/libkmfcore.la $(LIB_TDEPARTS)
 noinst_HEADERS =  kmfruletargetoptioneditlog.h kmfruleedittargetlog.h 
 
 libkmfruletargetoptionedit_log_la_SOURCES = kmfruletargetoptioneditlog.cpp kmfruleedittargetlog.cpp kmyfirewallruleeditortargetlog.ui
diff --git a/kmyfirewall/ruleoptionplugins/mac_option/Makefile.am b/kmyfirewall/ruleoptionplugins/mac_option/Makefile.am
index 22c2734..2da7894 100644
--- a/kmyfirewall/ruleoptionplugins/mac_option/Makefile.am
+++ b/kmyfirewall/ruleoptionplugins/mac_option/Makefile.am
@@ -3,9 +3,9 @@ METASOURCES = AUTO
 kde_module_LTLIBRARIES =  libkmfruleoptionedit_mac.la
 
 libkmfruleoptionedit_mac_la_LDFLAGS = -module -no-undefined $(all_libraries) \
-	$(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO)
+	$(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO)
 libkmfruleoptionedit_mac_la_LIBADD = \
-	../../core/libkmfcore.la $(LIB_KPARTS)
+	../../core/libkmfcore.la $(LIB_TDEPARTS)
 noinst_HEADERS =  kmfruleoptioneditmac.h kmfruleeditmac.h
 
 libkmfruleoptionedit_mac_la_SOURCES = kmfruleoptioneditmac.cpp kmfruleeditmac.cpp  kmyfirewallruleeditormac.ui
diff --git a/kmyfirewall/ruleoptionplugins/mark_target_option/Makefile.am b/kmyfirewall/ruleoptionplugins/mark_target_option/Makefile.am
index ecf5cfa..14c6460 100644
--- a/kmyfirewall/ruleoptionplugins/mark_target_option/Makefile.am
+++ b/kmyfirewall/ruleoptionplugins/mark_target_option/Makefile.am
@@ -3,9 +3,9 @@ METASOURCES = AUTO
 kde_module_LTLIBRARIES =  libkmfruletargetoptionedit_mark.la
 
 libkmfruletargetoptionedit_mark_la_LDFLAGS = -module -no-undefined \
-	$(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO)
+	$(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO)
 libkmfruletargetoptionedit_mark_la_LIBADD = \
-	../../core/libkmfcore.la $(LIB_KPARTS)
+	../../core/libkmfcore.la $(LIB_TDEPARTS)
 noinst_HEADERS =  kmfruletargetoptioneditmark.h kmfruleedittargetmark.h 
 
 libkmfruletargetoptionedit_mark_la_SOURCES = kmfruletargetoptioneditmark.cpp kmfruleedittargetmark.cpp kmyfirewallruleeditortargetmark.ui
diff --git a/kmyfirewall/ruleoptionplugins/nat_target_option/Makefile.am b/kmyfirewall/ruleoptionplugins/nat_target_option/Makefile.am
index f1c9329..27c971f 100644
--- a/kmyfirewall/ruleoptionplugins/nat_target_option/Makefile.am
+++ b/kmyfirewall/ruleoptionplugins/nat_target_option/Makefile.am
@@ -3,9 +3,9 @@ METASOURCES = AUTO
 kde_module_LTLIBRARIES =  libkmfruletargetoptionedit_nat.la
 
 libkmfruletargetoptionedit_nat_la_LDFLAGS = -module -no-undefined \
-	$(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO)
+	$(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO)
 libkmfruletargetoptionedit_nat_la_LIBADD = \
-	../../core/libkmfcore.la $(LIB_KPARTS)
+	../../core/libkmfcore.la $(LIB_TDEPARTS)
 noinst_HEADERS =  kmfruletargetoptioneditnat.h kmfruleeditortargetnat.h 
 
 libkmfruletargetoptionedit_nat_la_SOURCES = kmfruletargetoptioneditnat.cpp kmfruleeditortargetnat.cpp kmyfirewallruleeditortargetnat.ui
diff --git a/kmyfirewall/ruleoptionplugins/protocol_option/Makefile.am b/kmyfirewall/ruleoptionplugins/protocol_option/Makefile.am
index 387006d..5d16334 100644
--- a/kmyfirewall/ruleoptionplugins/protocol_option/Makefile.am
+++ b/kmyfirewall/ruleoptionplugins/protocol_option/Makefile.am
@@ -3,9 +3,9 @@ METASOURCES = AUTO
 kde_module_LTLIBRARIES =  libkmfruleoptionedit_protocol.la
 
 libkmfruleoptionedit_protocol_la_LDFLAGS = -module -no-undefined \
-	$(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO)
+	$(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO)
 libkmfruleoptionedit_protocol_la_LIBADD = \
-	../../kmfwidgets/libkmfwidgets.la ../../core/libkmfcore.la $(LIB_KPARTS)
+	../../kmfwidgets/libkmfwidgets.la ../../core/libkmfcore.la $(LIB_TDEPARTS)
 noinst_HEADERS =  kmfruleoptioneditprotocol.h kmfruleeditorprotocol.h 
 
 libkmfruleoptionedit_protocol_la_SOURCES = kmfruleoptioneditprotocol.cpp kmfruleeditorprotocol.cpp kmyfirewallruleeditorprotocol.ui
diff --git a/kmyfirewall/ruleoptionplugins/state_option/Makefile.am b/kmyfirewall/ruleoptionplugins/state_option/Makefile.am
index 4910470..169cf16 100644
--- a/kmyfirewall/ruleoptionplugins/state_option/Makefile.am
+++ b/kmyfirewall/ruleoptionplugins/state_option/Makefile.am
@@ -3,9 +3,9 @@ METASOURCES = AUTO
 kde_module_LTLIBRARIES =  libkmfruleoptionedit_state.la
 
 libkmfruleoptionedit_state_la_LDFLAGS = -module -no-undefined $(all_libraries) \
-	$(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO)
+	$(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO)
 libkmfruleoptionedit_state_la_LIBADD = \
-	../../core/libkmfcore.la $(LIB_KPARTS)
+	../../core/libkmfcore.la $(LIB_TDEPARTS)
 noinst_HEADERS =  kmfruleoptioneditstate.h kmfruleeditorstate.h 
 
 libkmfruleoptionedit_state_la_SOURCES = kmyfirewallruleeditorstate.ui kmfruleoptioneditstate.cpp kmfruleeditorstate.cpp 
diff --git a/kmyfirewall/ruleoptionplugins/tos_option/Makefile.am b/kmyfirewall/ruleoptionplugins/tos_option/Makefile.am
index a480e52..172b5ed 100644
--- a/kmyfirewall/ruleoptionplugins/tos_option/Makefile.am
+++ b/kmyfirewall/ruleoptionplugins/tos_option/Makefile.am
@@ -3,9 +3,9 @@ METASOURCES = AUTO
 kde_module_LTLIBRARIES =  libkmfruleoptionedit_tos.la
 
 libkmfruleoptionedit_tos_la_LDFLAGS = -module -no-undefined $(all_libraries) \
-	$(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO)
+	$(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO)
 libkmfruleoptionedit_tos_la_LIBADD = \
-	../../core/libkmfcore.la $(LIB_KPARTS)
+	../../core/libkmfcore.la $(LIB_TDEPARTS)
 noinst_HEADERS =  kmfruleoptionedittos.h kmfruleeditortos.h 
 
 libkmfruleoptionedit_tos_la_SOURCES = kmfruleoptionedittos.cpp kmfruleeditortos.cpp kmyfirewallruleeditortos.ui
diff --git a/kmyfirewall/ruleoptionplugins/tos_target_option/Makefile.am b/kmyfirewall/ruleoptionplugins/tos_target_option/Makefile.am
index 2d89131..f969244 100644
--- a/kmyfirewall/ruleoptionplugins/tos_target_option/Makefile.am
+++ b/kmyfirewall/ruleoptionplugins/tos_target_option/Makefile.am
@@ -3,9 +3,9 @@ METASOURCES = AUTO
 kde_module_LTLIBRARIES =  libkmfruletargetoptionedit_tos.la
 
 libkmfruletargetoptionedit_tos_la_LDFLAGS = -module -no-undefined \
-	$(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO)
+	$(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO)
 libkmfruletargetoptionedit_tos_la_LIBADD = \
-	../../core/libkmfcore.la $(LIB_KPARTS)
+	../../core/libkmfcore.la $(LIB_TDEPARTS)
 noinst_HEADERS =  kmfruletargetoptionedittos.h kmfruleeditortos.h 
 
 libkmfruletargetoptionedit_tos_la_SOURCES = kmfruletargetoptionedittos.cpp kmfruleeditortos.cpp kmyfirewallruleeditortos.ui