Additional k => tde renaming and fixes

34 files changed, 60 insertions, 60 deletions

diff --git a/blinken/src/Makefile.am b/blinken/src/Makefile.am
index 167bf188..d6a19815 100644
--- a/blinken/src/Makefile.am
+++ b/blinken/src/Makefile.am
@@ -8,8 +8,8 @@ bin_PROGRAMS = blinken
 
 INCLUDES = $(all_includes)
 
-blinken_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-blinken_LDADD = $(LIB_TDEUI) $(LIB_KIO) $(artslib)
+blinken_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+blinken_LDADD = $(LIB_TDEUI) $(LIB_TDEIO) $(artslib)
 
 blinken_SOURCES = main.cpp blinken.cpp artsplayer.cpp blinkengame.cpp number.cpp highscoredialog.cpp counter.cpp fontutils.cpp fontchecker.cpp button.cpp settings.kcfgc
 
diff --git a/kalzium/src/Makefile.am b/kalzium/src/Makefile.am
index f8072595..d781491e 100644
--- a/kalzium/src/Makefile.am
+++ b/kalzium/src/Makefile.am
@@ -35,7 +35,7 @@ kalzium_SOURCES = eqresult.cpp eqchemview.cpp kalzium.cpp \
 			moleculeparser.cpp \
 			tempunit.cpp
 
-kalzium_LDADD   = ../../libtdeedu/tdeeduplot/libtdeeduplot.la ../../libtdeedu/tdeeduui/libtdeeduui.la $(LIB_KIO) $(LIB_TDEUI) $(LIB_TDEHTML) $(OCAMLLIB_FLAGS) $(FACILELIB_FLAGS) $(EQCHEM_LDADD)
+kalzium_LDADD   = ../../libtdeedu/tdeeduplot/libtdeeduplot.la ../../libtdeedu/tdeeduui/libtdeeduui.la $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDEHTML) $(OCAMLLIB_FLAGS) $(FACILELIB_FLAGS) $(EQCHEM_LDADD)
 KDE_CXXFLAGS    = -D_ISOC99_SOURCE
 
 SUBDIRS = icons elementpics data $(EQCHEM_SUB)
@@ -79,7 +79,7 @@ rcui_DATA = kalziumui.rc
 KDE_ICON = AUTO
 
 # the library search path. 
-kalzium_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kalzium_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 #this RegExp-monster grep for <name origin=foo">bar</name> and puts the i18n() around foo and bar
 messages-old: rc.cpp
diff --git a/kanagram/src/Makefile.am b/kanagram/src/Makefile.am
index 1f8f4d5c..dd90b696 100644
--- a/kanagram/src/Makefile.am
+++ b/kanagram/src/Makefile.am
@@ -28,8 +28,8 @@ bin_PROGRAMS = kanagram
 
 # the application source, library search path, and link libraries
 kanagram_SOURCES = main.cpp kanagram.cpp kanagramgame.cpp fontutils.cpp kanagramsettings.kcfgc mainsettingswidget.ui vocabsettingswidget.ui vocabeditwidget.ui mainsettings.cpp vocabsettings.cpp vocabedit.cpp keduvocdocument.cpp keduvocexpression.cpp keduvockvtmlreader.cpp keduvockvtmlwriter.cpp leitnerbox.cpp leitnersystem.cpp multiplechoice.cpp grammarmanager.cpp leitnersystemview.cpp newstuffwidget.ui newstuffdialog.cpp newstuff.cpp
-kanagram_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kanagram_LDADD =  $(LIB_TDEUI) $(LIB_KNEWSTUFF) $(LIB_KIO) $(artslib)
+kanagram_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kanagram_LDADD =  $(LIB_TDEUI) $(LIB_KNEWSTUFF) $(LIB_TDEIO) $(artslib)
 
 kde_kcfg_DATA=kanagram.kcfg
 
diff --git a/kbruch/src/Makefile.am b/kbruch/src/Makefile.am
index fc9f6676..ede0aee6 100644
--- a/kbruch/src/Makefile.am
+++ b/kbruch/src/Makefile.am
@@ -4,7 +4,7 @@ kbruch_COMPILE_FIRST = version.h
 kbruch_SOURCES = exercisebase.cpp taskvieweroptionsbase.ui task.cpp ratio.cpp taskview.cpp statisticsview.cpp primenumber.cpp kbruch.cpp mainqtwidget.cpp taskwidget.cpp fractionbasewidget.cpp resultwidget.cpp exercisecompare.cpp ratiowidget.cpp rationalwidget.cpp exerciseconvert.cpp exercisefactorize.cpp factorizedwidget.cpp settingsclass.kcfgc
 kbruch_LDADD   =  $(LIB_TDEUI)
 # the library search path.
-kbruch_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kbruch_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 EXTRA_DIST = kbruch.cpp kbruch.h kbruch.desktop hi32-app-kbruch.png hi16-app-kbruch.png lo32-app-kbruch.png lo16-app-kbruch.png mainqtwidget.cpp mainqtwidget.h primenumber.cpp primenumber.h statisticsview.cpp statisticsview.h exercisebase.cpp exercisebase.h taskview.cpp taskview.h ratio.cpp ratio.h task.cpp task.h taskwidget.cpp taskwidget.h fractionbasewidget.cpp fractionbasewidget.h resultwidget.cpp resultwidget.h exercisecompare.cpp exercisecompare.h ratiowidget.cpp ratiowidget.h rationalwidget.cpp rationalwidget.h exerciseconvert.cpp exerciseconvert.h exercisefactorize.cpp exercisefactorize.h factorizedwidget.cpp factorizedwidget.h kbruch.rc taskvieweroptionsbase.ui
 
diff --git a/kbruch/testcases/Makefile.am b/kbruch/testcases/Makefile.am
index 2f05f22d..b2389856 100644
--- a/kbruch/testcases/Makefile.am
+++ b/kbruch/testcases/Makefile.am
@@ -5,7 +5,7 @@ kbruch_test_SOURCES = task.cpp ratio.cpp ratio_test.cpp primenumber.cpp primenum
 kbruch_test_LDADD   = -lboost_unit_test_framework-gcc $(LIB_TDEUI)
 
 # the library search path.
-kbruch_test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kbruch_test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 EXTRA_DIST = primenumber.cpp primenumber.h ratio.cpp ratio.h task.cpp task.h primenumber_test.cpp ratio_test.cpp kbruch_test.cpp
 
diff --git a/keduca/keduca/Makefile.am b/keduca/keduca/Makefile.am
index c116f6fc..efc38114 100644
--- a/keduca/keduca/Makefile.am
+++ b/keduca/keduca/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES= -I../libkeduca $(all_includes)
 # The binary program keduca
 bin_PROGRAMS   = keduca
 keduca_LDFLAGS = $(all_libraries)
-keduca_LDADD   = $(LIB_TDEFILE) $(LIB_KPARTS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) ../libkeduca/libkeduca.la
+keduca_LDADD   = $(LIB_TDEFILE) $(LIB_TDEPARTS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) ../libkeduca/libkeduca.la
 keduca_SOURCES = main.cpp keduca.cpp 
 
 # Convenience library
@@ -17,8 +17,8 @@ keduca_SOURCES = main.cpp keduca.cpp
 
 # The KParts Component
 kde_module_LTLIBRARIES = libkeducapart.la
-libkeducapart_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO)
-libkeducapart_la_LIBADD  = ../libkeduca/libkeduca.la $(LIB_KPARTS)
+libkeducapart_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO)
+libkeducapart_la_LIBADD  = ../libkeduca/libkeduca.la $(LIB_TDEPARTS)
 libkeducapart_la_SOURCES = keduca_part.cpp tderadioeduca.cpp kquestion.cpp \
                            kgroupeduca.cpp keducaview.cpp keducaprefs.cpp \
                            kcheckeduca.cpp settings.kcfgc configdialogbase.ui
diff --git a/keduca/keduca/tderadioeduca.h b/keduca/keduca/tderadioeduca.h
index 7ffb503f..27af9c13 100644
--- a/keduca/keduca/tderadioeduca.h
+++ b/keduca/keduca/tderadioeduca.h
@@ -15,8 +15,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef KRADIOEDUCA_H
-#define KRADIOEDUCA_H
+#ifndef TDERADIOEDUCA_H
+#define TDERADIOEDUCA_H
 
 
 #include <tqradiobutton.h>
diff --git a/keduca/keducabuilder/Makefile.am b/keduca/keducabuilder/Makefile.am
index 84ae5186..160d29c1 100644
--- a/keduca/keducabuilder/Makefile.am
+++ b/keduca/keducabuilder/Makefile.am
@@ -23,7 +23,7 @@ INCLUDES= -I../libkeduca $(all_includes)
 METASOURCES = AUTO
 
 # the library search path. 
-keducabuilder_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+keducabuilder_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 # Uncomment the following two lines if you add a ui.rc file for your application to make use of
 # KDE´s XML GUI builing
diff --git a/keduca/libkeduca/Makefile.am b/keduca/libkeduca/Makefile.am
index 2df02456..1e1cf9c6 100644
--- a/keduca/libkeduca/Makefile.am
+++ b/keduca/libkeduca/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES=$(all_includes)
 
 noinst_LTLIBRARIES = libkeduca.la
 libkeduca_la_SOURCES = kgallerydialogbase.ui fileread.cpp kgallerydialog.cpp
-libkeduca_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+libkeduca_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 libkeduca_la_LIBADD  = -ltdeprint
 noinst_HEADERS = fileread.h kgallerydialog.h kgallerydialogbase.h
 
diff --git a/kgeography/src/Makefile.am b/kgeography/src/Makefile.am
index 6084761e..54a3bede 100644
--- a/kgeography/src/Makefile.am
+++ b/kgeography/src/Makefile.am
@@ -8,7 +8,7 @@ bin_PROGRAMS = kgeography
 INCLUDES         = $(all_includes)
 
 # the library search path.
-kgeography_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kgeography_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 # the libraries to link against.
 kgeography_LDADD = $(LIB_TDEUI)
diff --git a/khangman/khangman/Makefile.am b/khangman/khangman/Makefile.am
index 95658c83..fbbd51d6 100644
--- a/khangman/khangman/Makefile.am
+++ b/khangman/khangman/Makefile.am
@@ -1,7 +1,7 @@
 ####### tdevelop will overwrite this part!!! (begin)##########
 bin_PROGRAMS = khangman
 khangman_SOURCES = khangman.cpp main.cpp khangmanview.cpp prefs.kcfgc khnewstuff.cpp normal.ui advanced.ui timerdlg.ui timer.cpp  fontchecker.cpp 
-khangman_LDADD   =  $(LIB_TDEUI) $(LIB_KIO) $(top_builddir)/libtdeedu/tdeeducore/libtdeeducore.la -lknewstuff
+khangman_LDADD   =  $(LIB_TDEUI) $(LIB_TDEIO) $(top_builddir)/libtdeedu/tdeeducore/libtdeeducore.la -lknewstuff
 
 SUBDIRS = data pics sounds icons fonts
 
@@ -17,7 +17,7 @@ INCLUDES= -I$(top_srcdir)/libtdeedu/tdeeducore $(all_includes)
 METASOURCES = AUTO
 
 # the library search path.
-khangman_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+khangman_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 rc_DATA = khangmanui.rc
 rcdir = $(kde_datadir)/khangman
diff --git a/kig/Makefile.am b/kig/Makefile.am
index d7eb4457..5081c354 100644
--- a/kig/Makefile.am
+++ b/kig/Makefile.am
@@ -25,8 +25,8 @@ SUBDIRS = \
 
 kde_module_LTLIBRARIES = libkigpart.la
 libkigpart_la_SOURCES = dummy.cpp
-libkigpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) -ltdetexteditor
-libkigpart_la_LIBADD  = $(LIB_KPARTS) \
+libkigpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) -ltdetexteditor
+libkigpart_la_LIBADD  = $(LIB_TDEPARTS) \
 	misc/libmisc.la objects/libobjects.la filters/libfilters.la \
 	modes/libmodes.la kig/libkigparttemp.la $(scriptinglib)
 
diff --git a/kig/kig/Makefile.am b/kig/kig/Makefile.am
index 4ffc5b85..f01a4b29 100644
--- a/kig/kig/Makefile.am
+++ b/kig/kig/Makefile.am
@@ -23,8 +23,8 @@ bin_PROGRAMS = kig
 
 # the application source, library search path, and link libraries
 kig_SOURCES = main.cpp kig.cpp
-kig_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kig_LDADD   = $(LIB_KPARTS)
+kig_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kig_LDADD   = $(LIB_TDEPARTS)
 
 # this is where the desktop file will go 
 xdg_apps_DATA = kig.desktop
@@ -46,7 +46,7 @@ libkigparttemp_la_SOURCES = \
 	kig_commands.cpp
 
 libkigparttemp_la_LDFLAGS = $(all_libraries)
-libkigparttemp_la_LIBADD = $(LIB_TDEPRINT) $(LIB_KIO)
+libkigparttemp_la_LIBADD = $(LIB_TDEPRINT) $(LIB_TDEIO)
 
 # this is where the desktop file will go 
 partdesktopdir   = $(kde_servicesdir)
diff --git a/kig/tdefile/Makefile.am b/kig/tdefile/Makefile.am
index fc0e4c0f..ca77dc8e 100644
--- a/kig/tdefile/Makefile.am
+++ b/kig/tdefile/Makefile.am
@@ -9,12 +9,12 @@ kde_module_LTLIBRARIES = \
 	tdefile_kig.la
 
 tdefile_drgeo_la_SOURCES = tdefile_drgeo.cpp
-tdefile_drgeo_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) -module $(KDE_PLUGIN)
-tdefile_drgeo_la_LIBADD = $(LIB_KIO)
+tdefile_drgeo_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) -module $(KDE_PLUGIN)
+tdefile_drgeo_la_LIBADD = $(LIB_TDEIO)
 
 tdefile_kig_la_SOURCES = tdefile_kig.cpp
-tdefile_kig_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) -module $(KDE_PLUGIN)
-tdefile_kig_la_LIBADD = $(LIB_KIO)
+tdefile_kig_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) -module $(KDE_PLUGIN)
+tdefile_kig_la_LIBADD = $(LIB_TDEIO)
 
 METASOURCES = AUTO
 
diff --git a/kiten/Makefile.am b/kiten/Makefile.am
index 67356d1e..944d816e 100644
--- a/kiten/Makefile.am
+++ b/kiten/Makefile.am
@@ -6,8 +6,8 @@ kiten_SOURCES = main.cpp kiten.cpp learn.cpp kloader.cpp ksaver.cpp \
 	configsearching.ui configlearn.ui configfont.ui configdictionariesbase.ui \
 	configdictionaries.cpp optiondialog.cpp kitenconfig.kcfgc
 
-kiten_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kiten_LDADD = libkiten.la $(LIB_KIO)
+kiten_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kiten_LDADD = libkiten.la $(LIB_TDEIO)
 
 bin_PROGRAMS = kiten kitengen
 lib_LTLIBRARIES = libkiten.la
@@ -23,7 +23,7 @@ libkiteninclude_HEADERS = \
 	asyndeta.h dict.h widgets.h kromajiedit.h rad.h deinf.h
 
 kitengen_SOURCES = xjdxgen.c
-kitengen_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kitengen_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 METASOURCES = AUTO
 
diff --git a/klatin/klatin/Makefile.am b/klatin/klatin/Makefile.am
index 0231f6e1..b5d40d94 100644
--- a/klatin/klatin/Makefile.am
+++ b/klatin/klatin/Makefile.am
@@ -12,7 +12,7 @@ bin_PROGRAMS = klatin
 INCLUDES         = $(all_includes)
 
 # the library search path.
-klatin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+klatin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 # the libraries to link against.
 klatin_LDADD   = $(LIB_TDEFILE) $(top_builddir)/libtdeedu/tdeeducore/libtdeeducore.la
diff --git a/klettres/klettres/Makefile.am b/klettres/klettres/Makefile.am
index a42dcde2..4bf8aa60 100644
--- a/klettres/klettres/Makefile.am
+++ b/klettres/klettres/Makefile.am
@@ -24,7 +24,7 @@ METASOURCES = AUTO
 KDE_ICON = AUTO
 
 # the library search path.
-klettres_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+klettres_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 messages: rc.cpp
 	$(XGETTEXT) *.cpp -o $(podir)/klettres.pot;
diff --git a/kmplot/TODO b/kmplot/TODO
index 1a9acc22..f470a0d8 100644
--- a/kmplot/TODO
+++ b/kmplot/TODO
@@ -65,7 +65,7 @@ DONE
 * Four modes for zooming.
 * Basic popup menu for single parametric points.
 * Configure Dialog for global Settings / save as default Checkboxes (Started)
-* Replace QFile with KIO in KmplotIO.
+* Replace QFile with TDEIO in KmplotIO.
 * Ability to export the parameter values.
 * Support for more than 10 functions.
 * Support for more than 10 parameter values for a function.
diff --git a/kmplot/kmplot/Makefile.am b/kmplot/kmplot/Makefile.am
index 6dc6fac4..1817b1cb 100644
--- a/kmplot/kmplot/Makefile.am
+++ b/kmplot/kmplot/Makefile.am
@@ -25,8 +25,8 @@ bin_PROGRAMS = kmplot
 
 # the application source, library search path, and link libraries
 kmplot_SOURCES = main.cpp kmplot.cpp kmplotprogress.cpp kmplotIface.skel
-kmplot_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) $(LIB_KPARTS) -lDCOP
-kmplot_LDADD   = $(LIB_KPARTS)
+kmplot_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_TDEPARTS) -lDCOP
+kmplot_LDADD   = $(LIB_TDEPARTS)
 
 # this is where the desktop file will go
 appmimedir = $(kde_mimedir)/application
@@ -44,7 +44,7 @@ kde_module_LTLIBRARIES = libkmplotpart.la
 
 # the Part's source, library search path, and link libraries
 libkmplotpart_la_SOURCES = FktDlgData.ui parser.cpp xparser.cpp  diagr.cpp View.cpp MainDlg.cpp FktDlg.cpp kprinterdlg.cpp settings.kcfgc settingspagecolor.ui kconstanteditor.cpp qparametereditor.ui kparametereditor.cpp settingspagecoords.ui settingspagefonts.ui settingspagescaling.ui settingspageprecision.ui qeditparametric.ui keditparametric.cpp qeditpolar.ui keditpolar.cpp editfunctionpage.ui editderivativespage.ui editintegralpage.ui editfunction.cpp qeditconstant.ui qminmax.ui kminmax.cpp qconstanteditor.ui keditconstant.cpp kmplotio.cpp sliderwindow.ui ksliderwindow.cpp MainDlgIface.skel parseriface.skel Viewiface.skel coordsconfigdialog.cpp
-libkmplotpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) $(LIB_KPARTS) -lDCOP
+libkmplotpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_TDEPARTS) -lDCOP
 libkmplotpart_la_LIBADD  = $(LIB_TDEFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) $(LIBSOCKET) $(LIB_TDEPRINT)
 
 # this is where the desktop file will go
diff --git a/kpercentage/kpercentage/Makefile.am b/kpercentage/kpercentage/Makefile.am
index 7f02bc35..6eefc6cc 100644
--- a/kpercentage/kpercentage/Makefile.am
+++ b/kpercentage/kpercentage/Makefile.am
@@ -30,7 +30,7 @@ METASOURCES = AUTO
 
 
 # the library search path.
-kpercentage_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kpercentage_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 
 stringstocpp:
diff --git a/kstars/kstars/Makefile.am b/kstars/kstars/Makefile.am
index 58404f65..e6f89a45 100644
--- a/kstars/kstars/Makefile.am
+++ b/kstars/kstars/Makefile.am
@@ -54,7 +54,7 @@ INCLUDES= -I$(top_srcdir) -Itools -I$(srcdir)/tools $(all_includes)
 METASOURCES = AUTO
 
 # the library search path.
-kstars_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kstars_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 # Uncomment the following two lines if you add a ui.rc file for your application to make use of
 # KDE
diff --git a/ktouch/src/Makefile.am b/ktouch/src/Makefile.am
index e3661e88..f7b33145 100644
--- a/ktouch/src/Makefile.am
+++ b/ktouch/src/Makefile.am
@@ -50,11 +50,11 @@ ktouch_SOURCES = ktouchchartwidget.cpp ktouchcoloreditor_dlg.ui \
 		ktouchutils.cpp main.cpp prefs.kcfgc ktouchcoloreditor.cpp
 
 # the library search path.
-ktouch_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+ktouch_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 # the libraries to link against. Be aware of the order. First the libraries,
 # that depend on the following ones.
-ktouch_LDADD = ../../libtdeedu/tdeeduplot/libtdeeduplot.la $(LIB_KIO)
+ktouch_LDADD = ../../libtdeedu/tdeeduplot/libtdeeduplot.la $(LIB_TDEIO)
 
 rcdir = $(kde_datadir)/ktouch
 rc_DATA = ktouchui.rc
diff --git a/ktouch/src/ktouchkeyboard.cpp b/ktouch/src/ktouchkeyboard.cpp
index 9d8a6c9a..6263208d 100644
--- a/ktouch/src/ktouchkeyboard.cpp
+++ b/ktouch/src/ktouchkeyboard.cpp
@@ -36,7 +36,7 @@ void KTouchKeyboard::clear() {
 
 // Loads a keyboard layout (old format) from file (returns true if successful).
 bool KTouchKeyboard::load(TQWidget * window, const KURL& url) {
-    // Ok, first download the contents as usual using the KIO lib
+    // Ok, first download the contents as usual using the TDEIO lib
     // File is only downloaded if not local, otherwise it's just opened
     TQString target;
     bool result = false;
@@ -56,7 +56,7 @@ bool KTouchKeyboard::load(TQWidget * window, const KURL& url) {
 
 // Loads a lecture (in XML format) from file (returns true if successful).
 bool KTouchKeyboard::loadXML(TQWidget * window, const KURL& url) {
-    // Ok, first download the contents as usual using the KIO lib
+    // Ok, first download the contents as usual using the TDEIO lib
     // File is only downloaded if not local, otherwise it's just opened
     TQString target;
     bool result = false;
diff --git a/ktouch/src/ktouchlecture.cpp b/ktouch/src/ktouchlecture.cpp
index ce834df5..cb581475 100644
--- a/ktouch/src/ktouchlecture.cpp
+++ b/ktouch/src/ktouchlecture.cpp
@@ -23,7 +23,7 @@
 #include <tdeio/netaccess.h>
 
 bool KTouchLecture::load(TQWidget * window, const KURL& url) {
-    // Ok, first download the contents as usual using the KIO lib
+    // Ok, first download the contents as usual using the TDEIO lib
     // File is only downloaded if not local, otherwise it's just opened
     TQString target;
     bool result = false;
@@ -43,7 +43,7 @@ bool KTouchLecture::load(TQWidget * window, const KURL& url) {
 // ----------------------------------------------------------------------------
 
 bool KTouchLecture::loadXML(TQWidget * window, const KURL& url) {
-    // Ok, first download the contents as usual using the KIO lib
+    // Ok, first download the contents as usual using the TDEIO lib
     // File is only downloaded if not local, otherwise it's just opened
     TQString target;
     bool result = false;
diff --git a/ktouch/src/ktouchstatisticsdata.cpp b/ktouch/src/ktouchstatisticsdata.cpp
index 4e9d0ef9..295777fd 100644
--- a/ktouch/src/ktouchstatisticsdata.cpp
+++ b/ktouch/src/ktouchstatisticsdata.cpp
@@ -448,7 +448,7 @@ void KTouchStatisticsData::clear() {
 
 bool KTouchStatisticsData::read(TQWidget * window, const KURL& url) {
 	if (url.isEmpty()) return false;
-    // Ok, first download the contents as usual using the KIO lib
+    // Ok, first download the contents as usual using the TDEIO lib
     // File is only downloaded if not local, otherwise it's just opened
     TQString target;
     bool result = false;
diff --git a/kturtle/file.txt b/kturtle/file.txt
index 05305192..e2f39a42 100644
--- a/kturtle/file.txt
+++ b/kturtle/file.txt
@@ -14,7 +14,7 @@ The following packages will be REMOVED:
   arts gideon gideon-data gideon-plugins kaddressbook kalarm kalarmd kandy
   kappfinder karm kate kcontrol kde-cvs-snapshot tdeartwork tdeartwork-misc
   tdeartwork-style tdeartwork-theme-desktop tdeartwork-theme-window tdebase
-  tdebase-bin tdebase-data tdebase-kio-plugins tdelibs tdelibs-bin tdelibs-data
+  tdebase-bin tdebase-data tdebase-tdeio-plugins tdelibs tdelibs-bin tdelibs-data
   tdelibs4 tdelibs4-doc tdepim tdepim-tdefile-plugins tdepim-libs tdeprint
   kdesktop tdm kfind kgpgcertmanager khelpcenter kicker kitchensync klipper
   kmail kmailcvt kmenuedit knode knotes konqueror konqueror-nsplugins konsole
diff --git a/kturtle/src/Makefile.am b/kturtle/src/Makefile.am
index 48282292..a5706a23 100644
--- a/kturtle/src/Makefile.am
+++ b/kturtle/src/Makefile.am
@@ -4,10 +4,10 @@ INCLUDES = $(all_includes)
 SUBDIRS = pics
 
 # added from kjots
-AM_LDFLAGS   = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+AM_LDFLAGS   = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
-kturtle_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kturtle_LDADD = $(LIB_TDEUI) $(LIB_KIO) $(LIB_TDEPRINT) $(LIB_KPARTS) -lkatepartinterfaces
+kturtle_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kturtle_LDADD = $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_TDEPRINT) $(LIB_TDEPARTS) -lkatepartinterfaces
 
 KDE_ICON = kturtle
 
diff --git a/kverbos/kverbos/Makefile.am b/kverbos/kverbos/Makefile.am
index 6f8436f2..88dd731f 100644
--- a/kverbos/kverbos/Makefile.am
+++ b/kverbos/kverbos/Makefile.am
@@ -19,7 +19,7 @@ INCLUDES= $(all_includes)
 METASOURCES = AUTO
 
 # the library search path. 
-kverbos_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kverbos_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 rcdir = $(kde_datadir)/kverbos
 rc_DATA = kverbosui.rc
diff --git a/kvoctrain/kvoctrain/Makefile.am b/kvoctrain/kvoctrain/Makefile.am
index 1749e1d8..236a4cfd 100644
--- a/kvoctrain/kvoctrain/Makefile.am
+++ b/kvoctrain/kvoctrain/Makefile.am
@@ -40,8 +40,8 @@ INCLUDES = -I$(srcdir)/.. -I$(srcdir)/kvt-core -Icommon-dialogs \
 bin_PROGRAMS = kvoctrain spotlight2kvtml
 
 # the library search path.
-kvoctrain_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-spotlight2kvtml_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kvoctrain_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+spotlight2kvtml_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 CLEANFILES = *.i.c
 
diff --git a/kvoctrain/kvoctrain/kvt-core/Makefile.am b/kvoctrain/kvoctrain/kvt-core/Makefile.am
index 70f055b6..e31da775 100644
--- a/kvoctrain/kvoctrain/kvt-core/Makefile.am
+++ b/kvoctrain/kvoctrain/kvt-core/Makefile.am
@@ -12,6 +12,6 @@ libkvoctraincore_la_SOURCES = langset.cpp LineList.cpp kvoctrainexpr.cpp \
 
 SUBDIRS = kvt-xml
 
-libkvoctraincore_la_LIBADD= $(all_libraries) $(KDE_RPATH) kvt-xml/libkvtxml.la ../common-dialogs/libcommondlg.la $(LIB_QT) $(LIB_TDECORE) $(LIB_KIO) $(LIB_TDEUI) -lDCOP
+libkvoctraincore_la_LIBADD= $(all_libraries) $(KDE_RPATH) kvt-xml/libkvtxml.la ../common-dialogs/libcommondlg.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_TDEUI) -lDCOP
 
 noinst_HEADERS = grammarmanager.h
diff --git a/kwordquiz/src/Makefile.am b/kwordquiz/src/Makefile.am
index ade013c6..ade96b7e 100644
--- a/kwordquiz/src/Makefile.am
+++ b/kwordquiz/src/Makefile.am
@@ -50,7 +50,7 @@ SUBDIRS = . pics examples
 METASOURCES = AUTO
 
 # the library search path.
-kwordquiz_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kwordquiz_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 rcdir = $(kde_datadir)/kwordquiz
 rc_DATA = kwordquizui.rc eventsrc
diff --git a/libtdeedu/extdate/Makefile.am b/libtdeedu/extdate/Makefile.am
index c32d024f..e9fe3c61 100644
--- a/libtdeedu/extdate/Makefile.am
+++ b/libtdeedu/extdate/Makefile.am
@@ -11,11 +11,11 @@ libextdate_la_LIBADD = $(LIB_TDEUI) $(LIB_QT) $(LIB_TDECORE)
 
 test_extdate_SOURCES = test_extdate.cc
 test_extdate_LDADD = libextdate.la
-test_extdate_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+test_extdate_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 test_extdatepicker_SOURCES = testwidget.cpp main.cpp
 test_extdatepicker_LDADD = libextdate.la
-test_extdatepicker_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+test_extdatepicker_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 METASOURCES = AUTO
 
diff --git a/libtdeedu/tdeeduui/Makefile.am b/libtdeedu/tdeeduui/Makefile.am
index da4f5065..0cc29e05 100644
--- a/libtdeedu/tdeeduui/Makefile.am
+++ b/libtdeedu/tdeeduui/Makefile.am
@@ -10,7 +10,7 @@ libtdeeduuiincludedir = $(includedir)/libtdeedu
 libtdeeduuiinclude_HEADERS = tdeeduglossary.h
 
 libtdeeduui_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:5:0
-libtdeeduui_la_LIBADD = $(LIB_TDECORE) $(LIB_KIO) $(LIB_TDEUI) $(LIB_TDEHTML) $(LIB_QT)
+libtdeeduui_la_LIBADD = $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDEHTML) $(LIB_QT)
 
 METASOURCES = AUTO
 
diff --git a/libtdeedu/tdeeduui/tdeeduglossary.h b/libtdeedu/tdeeduui/tdeeduglossary.h
index 1307f97e..a649112e 100644
--- a/libtdeedu/tdeeduui/tdeeduglossary.h
+++ b/libtdeedu/tdeeduui/tdeeduglossary.h
@@ -1,5 +1,5 @@
-#ifndef KDEEDUGLOSSARY_H
-#define KDEEDUGLOSSARY_H
+#ifndef TDEEDUGLOSSARY_H
+#define TDEEDUGLOSSARY_H
 /***************************************************************************
 
     copyright            : (C) 2005 by Carsten Niehaus
@@ -289,5 +289,5 @@ class GlossaryDialog : public KDialogBase
 		void closed();
 };
 
-#endif // KDEEDUGLOSSARY_H
+#endif // TDEEDUGLOSSARY_H