Rename a number of libraries and executables to avoid conflicts with KDE4

441 files changed, 2584 insertions, 2584 deletions

diff --git a/ChangeLog b/ChangeLog
index ec33c4c..13abe9e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -59,7 +59,7 @@ all modules working for KDE 3.4.3 - minor fixes
 ------------------------------------------------------------------------
 r113 | (jim) | 2006-01-16 22:13:25 -0800 (Mon, 16 Jan 2006) | 2 lines
 
-kabc, kresources touchup
+kabc, tderesources touchup
 
 ------------------------------------------------------------------------
 r112 | (jim) | 2006-01-16 21:57:28 -0800 (Mon, 16 Jan 2006) | 2 lines
@@ -74,12 +74,12 @@ minor fix
 ------------------------------------------------------------------------
 r109 | (jim) | 2006-01-16 20:35:03 -0800 (Mon, 16 Jan 2006) | 2 lines
 
-yet more debugging kabc, kresources
+yet more debugging kabc, tderesources
 
 ------------------------------------------------------------------------
 r108 | (jim) | 2006-01-16 20:22:55 -0800 (Mon, 16 Jan 2006) | 2 lines
 
-more debugging kabc, kresources
+more debugging kabc, tderesources
 
 ------------------------------------------------------------------------
 r107 | (jim) | 2006-01-16 20:15:50 -0800 (Mon, 16 Jan 2006) | 2 lines
@@ -94,23 +94,23 @@ kabc, kresource debugging
 ------------------------------------------------------------------------
 r105 | (jim) | 2006-01-16 20:08:37 -0800 (Mon, 16 Jan 2006) | 2 lines
 
-kabc, kresources through KDE 3.4.3
+kabc, tderesources through KDE 3.4.3
 
 ------------------------------------------------------------------------
 r104 | (jim) | 2006-01-16 18:33:10 -0800 (Mon, 16 Jan 2006) | 2 lines
 
-removed erroneous kresources .diff file
+removed erroneous tderesources .diff file
 
 ------------------------------------------------------------------------
 r103 | (jim) | 2006-01-16 18:24:05 -0800 (Mon, 16 Jan 2006) | 3 lines
 
-more kabc and kresources debugging - compiles
+more kabc and tderesources debugging - compiles
 through KDE 330
 
 ------------------------------------------------------------------------
 r102 | (jim) | 2006-01-16 00:47:43 -0800 (Mon, 16 Jan 2006) | 2 lines
 
-debug configure.py, kabc, kresources
+debug configure.py, kabc, tderesources
 
 ------------------------------------------------------------------------
 r101 | (jim) | 2006-01-15 22:27:45 -0800 (Sun, 15 Jan 2006) | 2 lines
@@ -120,7 +120,7 @@ fixed typo in configure.py
 ------------------------------------------------------------------------
 r100 | (jim) | 2006-01-15 22:22:50 -0800 (Sun, 15 Jan 2006) | 2 lines
 
-added kabc and kresources through KDE 3.3.0
+added kabc and tderesources through KDE 3.3.0
 
 ------------------------------------------------------------------------
 r97 | (jim) | 2006-01-15 15:04:44 -0800 (Sun, 15 Jan 2006) | 2 lines
@@ -267,7 +267,7 @@ added bool type to DCOP extensions
 ------------------------------------------------------------------------
 r71 | (jim) | 2005-06-18 19:16:03 -0700 (Sat, 18 Jun 2005) | 2 lines
 
-Added explicit link of tdeui for kspell module
+Added explicit link of tdeui for tdespell module
 
 ------------------------------------------------------------------------
 r70 | (jim) | 2005-06-18 17:59:10 -0700 (Sat, 18 Jun 2005) | 2 lines
@@ -293,7 +293,7 @@ Fix typos in previous patch
 ------------------------------------------------------------------------
 r66 | (jim) | 2005-03-15 16:07:18 -0800 (Tue, 15 Mar 2005) | 2 lines
 
-Added ConvertToSubclassCode blocks for kmdi, kutils
+Added ConvertToSubclassCode blocks for tdemdi, tdeutils
 
 ------------------------------------------------------------------------
 r65 | (jim) | 2005-03-10 10:41:57 -0800 (Thu, 10 Mar 2005) | 2 lines
@@ -344,22 +344,22 @@ added extra/kde340
 ------------------------------------------------------------------------
 r55 | (jim) | 2005-03-04 23:58:35 -0800 (Fri, 04 Mar 2005) | 2 lines
 
-kmdimod.sip.in one more time
+tdemdimod.sip.in one more time
 
 ------------------------------------------------------------------------
 r54 | (jim) | 2005-03-04 23:53:37 -0800 (Fri, 04 Mar 2005) | 2 lines
 
-kmdimod.sip.in again
+tdemdimod.sip.in again
 
 ------------------------------------------------------------------------
 r53 | (jim) | 2005-03-04 23:37:43 -0800 (Fri, 04 Mar 2005) | 2 lines
 
-fixed kmdimod.sip.in and kutils.sip.in
+fixed tdemdimod.sip.in and tdeutils.sip.in
 
 ------------------------------------------------------------------------
 r52 | (jim) | 2005-03-04 23:08:29 -0800 (Fri, 04 Mar 2005) | 2 lines
 
-correct qt path in kutils.sip.in
+correct qt path in tdeutils.sip.in
 
 ------------------------------------------------------------------------
 r51 | (jim) | 2005-03-04 23:04:54 -0800 (Fri, 04 Mar 2005) | 2 lines
@@ -441,7 +441,7 @@ KDE 3.3.2 and sip 4.2 updates
 ------------------------------------------------------------------------
 r33 | (jim) | 2004-11-28 13:58:07 -0800 (Sun, 28 Nov 2004) | 2 lines
 
-Modified kmdidefines.sip for sip 4.2 enumerator name problem
+Modified tdemdidefines.sip for sip 4.2 enumerator name problem
 
 ------------------------------------------------------------------------
 r32 | (jim) | 2004-11-28 13:56:19 -0800 (Sun, 28 Nov 2004) | 2 lines
@@ -496,12 +496,12 @@ Added post proc for WId in twinmodule signals
 ------------------------------------------------------------------------
 r22 | (jim) | 2004-08-21 16:50:33 -0700 (Sat, 21 Aug 2004) | 2 lines
 
-same khtml_part patch as the previous rev ???
+same tdehtml_part patch as the previous rev ???
 
 ------------------------------------------------------------------------
 r21 | (jim) | 2004-08-21 16:42:06 -0700 (Sat, 21 Aug 2004) | 2 lines
 
-khtml_part: fixed enum values for sip3.10.2 with KDE 3.3.0
+tdehtml_part: fixed enum values for sip3.10.2 with KDE 3.3.0
 
 ------------------------------------------------------------------------
 r20 | (jim) | 2004-08-21 01:10:05 -0700 (Sat, 21 Aug 2004) | 2 lines
@@ -526,7 +526,7 @@ Updated to KDE 3.3.0 final
 ------------------------------------------------------------------------
 r16 | (jim) | 2004-08-20 09:59:28 -0700 (Fri, 20 Aug 2004) | 2 lines
 
-Removed khtml_part.sip (different versions for different KDE versions)
+Removed tdehtml_part.sip (different versions for different KDE versions)
 
 ------------------------------------------------------------------------
 r15 | (jim) | 2004-08-19 23:52:31 -0700 (Thu, 19 Aug 2004) | 2 lines
@@ -576,13 +576,13 @@ Corrected error - configure.py spippath defined in wrong place
 ------------------------------------------------------------------------
 r6 | (jim) | 2004-08-15 12:19:37 -0700 (Sun, 15 Aug 2004) | 2 lines
 
-Added khtml_part.sip versions
+Added tdehtml_part.sip versions
 
 ------------------------------------------------------------------------
 r5 | (jim) | 2004-08-15 12:14:27 -0700 (Sun, 15 Aug 2004) | 3 lines
 
-Changes to configure.py for khtml/kutils when KDE < 3.3.0 and
-kutils isn't needed/supported
+Changes to configure.py for tdehtml/tdeutils when KDE < 3.3.0 and
+tdeutils isn't needed/supported
 
 ------------------------------------------------------------------------
 r4 | (jim) | 2004-08-15 12:04:57 -0700 (Sun, 15 Aug 2004) | 2 lines
diff --git a/ChangeLog.2001-4 b/ChangeLog.2001-4
index 7f2d4d9..a976907 100644
--- a/ChangeLog.2001-4
+++ b/ChangeLog.2001-4
@@ -1,14 +1,14 @@
 2004/08/25 16:44:00 jim
 Released 3.11.3; added post-processing for WId args
-in KWinModule signals; fixed enum in khtml_part (for
+in KWinModule signals; fixed enum in tdehtml_part (for
 KDE >= 3.3); updated version numbers
 
 2004/08/16 17:57:00 jim
 Updated to KDE3.3.0beta2; minor fixes for earlier
 KDE versions using sip4; fixed KUniqueApplication
-(was missing); added kutils module (kspell2 missing
+(was missing); added tdeutils module (tdespell2 missing
 from beta2); docs; removed event %ConvertToSubClassCode
-from kparts - was causing problems; other fixes;
+from tdeparts - was causing problems; other fixes;
 snapshot released
 
 2003/11/22 12:19:00 jim
@@ -175,7 +175,7 @@ to struct (no longer mapped type);
 
 
 2001/11/19 22:12:00 jim
-3.0alpha2:Added kparts, khtml, kjs, kspell; converted some
+3.0alpha2:Added tdeparts, tdehtml, kjs, tdespell; converted some
 structs from mapped types to classes; revised all docs; revised
 autoconf to look for top level KDE include dir; added some
 missing classes and methods;bugs fixed;versioning to KDE2.1.2
diff --git a/Changelog b/Changelog
index c18847d..b0efa96 100644
--- a/Changelog
+++ b/Changelog
@@ -24,7 +24,7 @@ version methods deleted (and in docs)
 ------------------------------------------------------------------------
 r156 | (no author) | 2006-09-21 17:56:59 -0700 (Thu, 21 Sep 2006) | 2 lines
 
-update sip.in and diff files for kparts.konsole_part
+update sip.in and diff files for tdeparts.konsole_part
 
 ------------------------------------------------------------------------
 r155 | (no author) | 2006-09-21 17:54:25 -0700 (Thu, 21 Sep 2006) | 2 lines
@@ -167,12 +167,12 @@ kio/global.sip
 ------------------------------------------------------------------------
 r125 | (no author) | 2006-01-22 21:45:55 -0800 (Sun, 22 Jan 2006) | 8 lines
 
-modify configure.py to drop kresources for KDE < 3.2;
+modify configure.py to drop tderesources for KDE < 3.2;
 version Resource class in kabc/resource.sip; version
 64 bit read/write stuff in tdecore/kconfigbase.sip;
 version copy ctor in tdecore/kprocctrl.sip; version
 out longlong/ulonglong mapped types in kio/global.sip;
-version one method in kio/ksycoca.sip; fix line with
+version one method in kio/tdesycoca.sip; fix line with
 illegal char (?) in extensions/dcopexport.py
 
 ------------------------------------------------------------------------
@@ -236,7 +236,7 @@ all modules working for KDE 3.4.3 - minor fixes
 ------------------------------------------------------------------------
 r113 | (no author) | 2006-01-16 22:13:25 -0800 (Mon, 16 Jan 2006) | 2 lines
 
-kabc, kresources touchup
+kabc, tderesources touchup
 
 ------------------------------------------------------------------------
 r112 | (no author) | 2006-01-16 21:57:28 -0800 (Mon, 16 Jan 2006) | 2 lines
@@ -251,12 +251,12 @@ minor fix
 ------------------------------------------------------------------------
 r109 | (no author) | 2006-01-16 20:35:03 -0800 (Mon, 16 Jan 2006) | 2 lines
 
-yet more debugging kabc, kresources
+yet more debugging kabc, tderesources
 
 ------------------------------------------------------------------------
 r108 | (no author) | 2006-01-16 20:22:55 -0800 (Mon, 16 Jan 2006) | 2 lines
 
-more debugging kabc, kresources
+more debugging kabc, tderesources
 
 ------------------------------------------------------------------------
 r107 | (no author) | 2006-01-16 20:15:50 -0800 (Mon, 16 Jan 2006) | 2 lines
@@ -271,23 +271,23 @@ kabc, kresource debugging
 ------------------------------------------------------------------------
 r105 | (no author) | 2006-01-16 20:08:37 -0800 (Mon, 16 Jan 2006) | 2 lines
 
-kabc, kresources through KDE 3.4.3
+kabc, tderesources through KDE 3.4.3
 
 ------------------------------------------------------------------------
 r104 | (no author) | 2006-01-16 18:33:10 -0800 (Mon, 16 Jan 2006) | 2 lines
 
-removed erroneous kresources .diff file
+removed erroneous tderesources .diff file
 
 ------------------------------------------------------------------------
 r103 | (no author) | 2006-01-16 18:24:05 -0800 (Mon, 16 Jan 2006) | 3 lines
 
-more kabc and kresources debugging - compiles
+more kabc and tderesources debugging - compiles
 through KDE 330
 
 ------------------------------------------------------------------------
 r102 | (no author) | 2006-01-16 00:47:43 -0800 (Mon, 16 Jan 2006) | 2 lines
 
-debug configure.py, kabc, kresources
+debug configure.py, kabc, tderesources
 
 ------------------------------------------------------------------------
 r101 | (no author) | 2006-01-15 22:27:45 -0800 (Sun, 15 Jan 2006) | 2 lines
@@ -297,7 +297,7 @@ fixed typo in configure.py
 ------------------------------------------------------------------------
 r100 | (no author) | 2006-01-15 22:22:50 -0800 (Sun, 15 Jan 2006) | 2 lines
 
-added kabc and kresources through KDE 3.3.0
+added kabc and tderesources through KDE 3.3.0
 
 ------------------------------------------------------------------------
 r97 | (no author) | 2006-01-15 15:04:44 -0800 (Sun, 15 Jan 2006) | 2 lines
@@ -444,7 +444,7 @@ added bool type to DCOP extensions
 ------------------------------------------------------------------------
 r71 | (no author) | 2005-06-18 19:16:03 -0700 (Sat, 18 Jun 2005) | 2 lines
 
-Added explicit link of tdeui for kspell module
+Added explicit link of tdeui for tdespell module
 
 ------------------------------------------------------------------------
 r70 | (no author) | 2005-06-18 17:59:10 -0700 (Sat, 18 Jun 2005) | 2 lines
@@ -470,7 +470,7 @@ Fix typos in previous patch
 ------------------------------------------------------------------------
 r66 | (no author) | 2005-03-15 16:07:18 -0800 (Tue, 15 Mar 2005) | 2 lines
 
-Added ConvertToSubclassCode blocks for kmdi, kutils
+Added ConvertToSubclassCode blocks for tdemdi, tdeutils
 
 ------------------------------------------------------------------------
 r65 | (no author) | 2005-03-10 10:41:57 -0800 (Thu, 10 Mar 2005) | 2 lines
@@ -521,22 +521,22 @@ added extra/kde340
 ------------------------------------------------------------------------
 r55 | (no author) | 2005-03-04 23:58:35 -0800 (Fri, 04 Mar 2005) | 2 lines
 
-kmdimod.sip.in one more time
+tdemdimod.sip.in one more time
 
 ------------------------------------------------------------------------
 r54 | (no author) | 2005-03-04 23:53:37 -0800 (Fri, 04 Mar 2005) | 2 lines
 
-kmdimod.sip.in again
+tdemdimod.sip.in again
 
 ------------------------------------------------------------------------
 r53 | (no author) | 2005-03-04 23:37:43 -0800 (Fri, 04 Mar 2005) | 2 lines
 
-fixed kmdimod.sip.in and kutils.sip.in
+fixed tdemdimod.sip.in and tdeutils.sip.in
 
 ------------------------------------------------------------------------
 r52 | (no author) | 2005-03-04 23:08:29 -0800 (Fri, 04 Mar 2005) | 2 lines
 
-correct qt path in kutils.sip.in
+correct qt path in tdeutils.sip.in
 
 ------------------------------------------------------------------------
 r51 | (no author) | 2005-03-04 23:04:54 -0800 (Fri, 04 Mar 2005) | 2 lines
@@ -618,7 +618,7 @@ KDE 3.3.2 and sip 4.2 updates
 ------------------------------------------------------------------------
 r33 | (no author) | 2004-11-28 13:58:07 -0800 (Sun, 28 Nov 2004) | 2 lines
 
-Modified kmdidefines.sip for sip 4.2 enumerator name problem
+Modified tdemdidefines.sip for sip 4.2 enumerator name problem
 
 ------------------------------------------------------------------------
 r32 | (no author) | 2004-11-28 13:56:19 -0800 (Sun, 28 Nov 2004) | 2 lines
@@ -673,12 +673,12 @@ Added post proc for WId in twinmodule signals
 ------------------------------------------------------------------------
 r22 | (no author) | 2004-08-21 16:50:33 -0700 (Sat, 21 Aug 2004) | 2 lines
 
-same khtml_part patch as the previous rev ???
+same tdehtml_part patch as the previous rev ???
 
 ------------------------------------------------------------------------
 r21 | (no author) | 2004-08-21 16:42:06 -0700 (Sat, 21 Aug 2004) | 2 lines
 
-khtml_part: fixed enum values for sip3.10.2 with KDE 3.3.0
+tdehtml_part: fixed enum values for sip3.10.2 with KDE 3.3.0
 
 ------------------------------------------------------------------------
 r20 | (no author) | 2004-08-21 01:10:05 -0700 (Sat, 21 Aug 2004) | 2 lines
@@ -703,7 +703,7 @@ Updated to KDE 3.3.0 final
 ------------------------------------------------------------------------
 r16 | (no author) | 2004-08-20 09:59:28 -0700 (Fri, 20 Aug 2004) | 2 lines
 
-Removed khtml_part.sip (different versions for different KDE versions)
+Removed tdehtml_part.sip (different versions for different KDE versions)
 
 ------------------------------------------------------------------------
 r15 | (no author) | 2004-08-19 23:52:31 -0700 (Thu, 19 Aug 2004) | 2 lines
@@ -753,13 +753,13 @@ Corrected error - configure.py spippath defined in wrong place
 ------------------------------------------------------------------------
 r6 | (no author) | 2004-08-15 12:19:37 -0700 (Sun, 15 Aug 2004) | 2 lines
 
-Added khtml_part.sip versions
+Added tdehtml_part.sip versions
 
 ------------------------------------------------------------------------
 r5 | (no author) | 2004-08-15 12:14:27 -0700 (Sun, 15 Aug 2004) | 3 lines
 
-Changes to configure.py for khtml/kutils when KDE < 3.3.0 and
-kutils isn't needed/supported
+Changes to configure.py for tdehtml/tdeutils when KDE < 3.3.0 and
+tdeutils isn't needed/supported
 
 ------------------------------------------------------------------------
 r4 | (no author) | 2004-08-15 12:04:57 -0700 (Sun, 15 Aug 2004) | 2 lines
diff --git a/THANKS b/THANKS
index 58e83d5..30bd1f6 100644
--- a/THANKS
+++ b/THANKS
@@ -11,7 +11,7 @@ Torsten Marek
         bug reports; PyKDE/PyTQt wiki
 
 Troy Melhase
-        kmdi advocacy and the example programs for kmdi and qxembed
+        tdemdi advocacy and the example programs for tdemdi and qxembed
 
 Steve Robson
         Slackware bug reports and persistence
diff --git a/configure.py b/configure.py
index dd251d2..9c9a388 100644
--- a/configure.py
+++ b/configure.py
@@ -96,8 +96,8 @@ opt_dep_warnings  = 0
 opt_libdir        = "lib"
 opt_dist_name     = ""
 
-pytde_modules     = ["dcop", "tdecore", "tdefx", "tdeui", "kio", "kresources", "kabc", "kutils", "kfile", "kparts",\
-                     "khtml", "kspell", "tdeprint", "kmdi"] #, "kspell2"]
+pytde_modules     = ["dcop", "tdecore", "tdefx", "tdeui", "kio", "tderesources", "kabc", "tdeutils", "kfile", "tdeparts",\
+                     "tdehtml", "tdespell", "tdeprint", "tdemdi"] #, "tdespell2"]
 
 pytde_imports     = {
                     "dcop":       ["qt"],
@@ -106,16 +106,16 @@ pytde_imports     = {
                     "tdefx":      ["qt", "dcop", "tdecore"],
                     "tdeui":      ["qt", "qtxml", "dcop", "tdecore", "tdefx"],
                     "kio":        ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui"],
-                    "kresources": ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui", "kio"],
-                    "kabc":       ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui", "kio", "kresources"],
-                    "kutils":     ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui", "kio"],
+                    "tderesources": ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui", "kio"],
+                    "kabc":       ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui", "kio", "tderesources"],
+                    "tdeutils":     ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui", "kio"],
                     "kfile":      ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui", "kio"],
-                    "kparts":     ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui", "kio"],
-                    "khtml":      ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui", "kutils", "kio", "kparts"],
-                    "kspell":     ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui", "kio", "kfile"],
+                    "tdeparts":     ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui", "kio"],
+                    "tdehtml":      ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeutils", "kio", "tdeparts"],
+                    "tdespell":     ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui", "kio", "kfile"],
                     "tdeprint":   ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui"],
-                    "kmdi":       ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui", "kio", "kparts"],
-                    "kspell2":    ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui"]
+                    "tdemdi":       ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui", "kio", "tdeparts"],
+                    "tdespell2":    ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui"]
                     }
 
 kde_includes      = {
@@ -125,16 +125,16 @@ kde_includes      = {
                     "tdefx":      None,
                     "tdeui":      None,
                     "kio":        ["kio"],
-                    "kresources": ["kio", "../kio", "kresources"],
-                    "kabc":       ["kio", "../kio", "kresources", "kabc"],
+                    "tderesources": ["kio", "../kio", "tderesources"],
+                    "kabc":       ["kio", "../kio", "tderesources", "kabc"],
                     "kfile":      ["kio", "../kio"],
-                    "kparts":     ["kio", "../kio", "kparts"],
-                    "khtml":      ["kio", "../kio", "kparts", "dom"],
-                    "kspell":     ["kio"],
+                    "tdeparts":     ["kio", "../kio", "tdeparts"],
+                    "tdehtml":      ["kio", "../kio", "tdeparts", "dom"],
+                    "tdespell":     ["kio"],
                     "tdeprint":   ["tdeprint"],
-                    "kmdi":       ["kmdi", "kio", "../kio", "kparts"],
-                    "kutils":     ["kio", "../kio"] #,
-#                    "kspell2":    None
+                    "tdemdi":       ["tdemdi", "kio", "../kio", "tdeparts"],
+                    "tdeutils":     ["kio", "../kio"] #,
+#                    "tdespell2":    None
                     }
 
 postProcess       = {
@@ -145,17 +145,17 @@ postProcess       = {
 #                    "tdesu":      None,
                     "tdefx":      None,
                     "tdeui":      None, #[["-p ", "tdeui", "-o", "shpix",  "siptdeuiKSharedPixmap.cpp"]],
-                    "kresources": None,
+                    "tderesources": None,
                     "kabc":       None,
                     "kio":        None,
                     "kfile":      None,
-                    "kparts":     None,
-                    "khtml":      None,
-                    "kspell":     None,
+                    "tdeparts":     None,
+                    "tdehtml":      None,
+                    "tdespell":     None,
                     "tdeprint":   None,
-                    "kmdi":       None,
-                    "kutils":     None #,
-#                    "kspell2":    None
+                    "tdemdi":       None,
+                    "tdeutils":     None #,
+#                    "tdespell2":    None
                     }
 
 opt_startModName  = ""
@@ -474,7 +474,7 @@ def create_top_level (mname):
         elif string.find (line, "@mark@") == 0:
             for p in plus:
                 sipout.write (p)
-        elif mname == "kabc" and kde_version < 0x030200 and string.find (line, "kresourcesmod.sip") >= 0:
+        elif mname == "kabc" and kde_version < 0x030200 and string.find (line, "tderesourcesmod.sip") >= 0:
             pass
         else:
             sipout.write (line)
@@ -484,14 +484,14 @@ def create_top_level (mname):
     sipin.close ()
     sipout.close ()
 
-    if mname == "khtml":
-        # PyKDE < 3.3.0 doesn't provide kutils (and khtml doesn't need it)
+    if mname == "tdehtml":
+        # PyKDE < 3.3.0 doesn't provide tdeutils (and tdehtml doesn't need it)
         sippath = srcPath(os.path.join ("sip", mname))
         if kde_version < 0x030300:
             sipin   = open (os.path.join (sippath, mname + "mod.sip"))
             sipout  = open (os.path.join (sippath, mname + "mod.sip.new"), "w")
             for line in sipin:
-                if line.find ("kutilsmod.sip") > 0:
+                if line.find ("tdeutilsmod.sip") > 0:
                     continue
                 sipout.write (line)
             sipin.close ()
@@ -499,10 +499,10 @@ def create_top_level (mname):
             os.unlink (os.path.join (sippath, mname + "mod.sip"))
             os.rename (os.path.join (sippath, mname + "mod.sip.new"), os.path.join (sippath, mname + "mod.sip"))
 
-            os.system ("cp %s %s" % (os.path.join (sippath, "khtml_part.sip.323"), os.path.join (sippath, "khtml_part.sip")))
+            os.system ("cp %s %s" % (os.path.join (sippath, "tdehtml_part.sip.323"), os.path.join (sippath, "tdehtml_part.sip")))
 
         else:
-            os.system ("cp %s %s" % (os.path.join (sippath, "khtml_part.sip.330"), os.path.join (sippath, "khtml_part.sip")))
+            os.system ("cp %s %s" % (os.path.join (sippath, "tdehtml_part.sip.330"), os.path.join (sippath, "tdehtml_part.sip")))
 
 
 def check_distribution ():
@@ -755,11 +755,11 @@ def generate_code(mname, imports=None, extra_cflags=None, extra_cxxflags=None, e
     makefile.extra_libs.append(extra_lib)
     if extra_lib == "tdefx":
         makefile.extra_libs.append ("tdecore")
-    if extra_lib == "kspell":
+    if extra_lib == "tdespell":
         makefile.extra_libs.append ("tdeui")
     if extra_lib == "kabc" and kde_version >= 0x030200:
         makefile.extra_libs.append ("kabc_file")
-    if extra_lib == "kparts" and kde_version >= 0x030500:
+    if extra_lib == "tdeparts" and kde_version >= 0x030500:
         makefile.extra_lib_dirs.append (os.path.join (opt_kdelibdir, "trinity"))
 
     if extra_lib == "tdeprint":
@@ -894,15 +894,15 @@ def main(argv):
 
     # Set the SIP platform, version and feature flags.
     if kde_version < 0x030200:
-        pytde_modules.remove ("kmdi")
-        pytde_modules.remove ("kresources")
-        pytde_imports ["kabc"].remove ("kresources")
-        kde_includes ["kabc"].remove ("kresources")
+        pytde_modules.remove ("tdemdi")
+        pytde_modules.remove ("tderesources")
+        pytde_imports ["kabc"].remove ("tderesources")
+        kde_includes ["kabc"].remove ("tderesources")
 
     if kde_version < 0x030300:
-        pytde_modules.remove ("kutils")
-#        pytde_modules.remove ("kspell2")
-        pytde_imports ["khtml"].remove ("kutils")
+        pytde_modules.remove ("tdeutils")
+#        pytde_modules.remove ("tdespell2")
+        pytde_imports ["tdehtml"].remove ("tdeutils")
 
     opt_endmod = len (pytde_modules)
     if opt_startModName != "":
diff --git a/doc/classref/allclasses.html b/doc/classref/allclasses.html
index 38a23a1..771f32b 100644
--- a/doc/classref/allclasses.html
+++ b/doc/classref/allclasses.html
@@ -31,122 +31,122 @@
 <tr ><td><a href="dcop/DCOPRef.html">DCOPRef</A></td></tr>
 <tr ><td><a href="dcop/DCOPReply.html">DCOPReply</A></td></tr>
 <tr ><td><a href="dcop/DCOPStub.html">DCOPStub</A></td></tr>
-<tr ><td><a href="khtml/DOM.AbstractView.html">DOM.AbstractView</A></td></tr>
-<tr ><td><a href="khtml/DOM.Attr.html">DOM.Attr</A></td></tr>
-<tr ><td><a href="khtml/DOM.CDATASection.html">DOM.CDATASection</A></td></tr>
-<tr ><td><a href="khtml/DOM.CSSCharsetRule.html">DOM.CSSCharsetRule</A></td></tr>
-<tr ><td><a href="khtml/DOM.CSSException.html">DOM.CSSException</A></td></tr>
-<tr ><td><a href="khtml/DOM.CSSFontFaceRule.html">DOM.CSSFontFaceRule</A></td></tr>
-<tr ><td><a href="khtml/DOM.CSSImportRule.html">DOM.CSSImportRule</A></td></tr>
-<tr ><td><a href="khtml/DOM.CSSMediaRule.html">DOM.CSSMediaRule</A></td></tr>
-<tr ><td><a href="khtml/DOM.CSSPageRule.html">DOM.CSSPageRule</A></td></tr>
-<tr ><td><a href="khtml/DOM.CSSPrimitiveValue.html">DOM.CSSPrimitiveValue</A></td></tr>
-<tr ><td><a href="khtml/DOM.CSSRule.html">DOM.CSSRule</A></td></tr>
-<tr ><td><a href="khtml/DOM.CSSRuleList.html">DOM.CSSRuleList</A></td></tr>
-<tr ><td><a href="khtml/DOM.CSSStyleDeclaration.html">DOM.CSSStyleDeclaration</A></td></tr>
-<tr ><td><a href="khtml/DOM.CSSStyleRule.html">DOM.CSSStyleRule</A></td></tr>
-<tr ><td><a href="khtml/DOM.CSSStyleSheet.html">DOM.CSSStyleSheet</A></td></tr>
-<tr ><td><a href="khtml/DOM.CSSUnknownRule.html">DOM.CSSUnknownRule</A></td></tr>
-<tr ><td><a href="khtml/DOM.CSSValue.html">DOM.CSSValue</A></td></tr>
-<tr ><td><a href="khtml/DOM.CSSValueList.html">DOM.CSSValueList</A></td></tr>
-<tr ><td><a href="khtml/DOM.CharacterData.html">DOM.CharacterData</A></td></tr>
-<tr ><td><a href="khtml/DOM.Comment.html">DOM.Comment</A></td></tr>
-<tr ><td><a href="khtml/DOM.Counter.html">DOM.Counter</A></td></tr>
-<tr ><td><a href="khtml/DOM.CustomNodeFilter.html">DOM.CustomNodeFilter</A></td></tr>
-<tr ><td><a href="khtml/DOM.DOMException.html">DOM.DOMException</A></td></tr>
-<tr ><td><a href="khtml/DOM.DOMImplementation.html">DOM.DOMImplementation</A></td></tr>
-<tr ><td><a href="khtml/DOM.DOMString.html">DOM.DOMString</A></td></tr>
-<tr ><td><a href="khtml/DOM.Document.html">DOM.Document</A></td></tr>
-<tr ><td><a href="khtml/DOM.DocumentFragment.html">DOM.DocumentFragment</A></td></tr>
-<tr ><td><a href="khtml/DOM.DocumentStyle.html">DOM.DocumentStyle</A></td></tr>
-<tr ><td><a href="khtml/DOM.DocumentType.html">DOM.DocumentType</A></td></tr>
-<tr ><td><a href="khtml/DOM.DomShared.html">DOM.DomShared</A></td></tr>
-<tr ><td><a href="khtml/DOM.Element.html">DOM.Element</A></td></tr>
-<tr ><td><a href="khtml/DOM.Entity.html">DOM.Entity</A></td></tr>
-<tr ><td><a href="khtml/DOM.EntityReference.html">DOM.EntityReference</A></td></tr>
-<tr ><td><a href="khtml/DOM.Event.html">DOM.Event</A></td></tr>
-<tr ><td><a href="khtml/DOM.EventException.html">DOM.EventException</A></td></tr>
-<tr ><td><a href="khtml/DOM.EventListener.html">DOM.EventListener</A></td></tr>
-<tr ><td><a href="khtml/DOM.HTMLAnchorElement.html">DOM.HTMLAnchorElement</A></td></tr>
-<tr ><td><a href="khtml/DOM.HTMLAppletElement.html">DOM.HTMLAppletElement</A></td></tr>
-<tr ><td><a href="khtml/DOM.HTMLAreaElement.html">DOM.HTMLAreaElement</A></td></tr>
-<tr ><td><a href="khtml/DOM.HTMLBRElement.html">DOM.HTMLBRElement</A></td></tr>
-<tr ><td><a href="khtml/DOM.HTMLBaseElement.html">DOM.HTMLBaseElement</A></td></tr>
-<tr ><td><a href="khtml/DOM.HTMLBaseFontElement.html">DOM.HTMLBaseFontElement</A></td></tr>
-<tr ><td><a href="khtml/DOM.HTMLBlockquoteElement.html">DOM.HTMLBlockquoteElement</A></td></tr>
-<tr ><td><a href="khtml/DOM.HTMLBodyElement.html">DOM.HTMLBodyElement</A></td></tr>
-<tr ><td><a href="khtml/DOM.HTMLButtonElement.html">DOM.HTMLButtonElement</A></td></tr>
-<tr ><td><a href="khtml/DOM.HTMLCollection.html">DOM.HTMLCollection</A></td></tr>
-<tr ><td><a href="khtml/DOM.HTMLDListElement.html">DOM.HTMLDListElement</A></td></tr>
-<tr ><td><a href="khtml/DOM.HTMLDirectoryElement.html">DOM.HTMLDirectoryElement</A></td></tr>
-<tr ><td><a href="khtml/DOM.HTMLDivElement.html">DOM.HTMLDivElement</A></td></tr>
-<tr ><td><a href="khtml/DOM.HTMLDocument.html">DOM.HTMLDocument</A></td></tr>
-<tr ><td><a href="khtml/DOM.HTMLElement.html">DOM.HTMLElement</A></td></tr>
-<tr ><td><a href="khtml/DOM.HTMLFieldSetElement.html">DOM.HTMLFieldSetElement</A></td></tr>
-<tr ><td><a href="khtml/DOM.HTMLFontElement.html">DOM.HTMLFontElement</A></td></tr>
-<tr ><td><a href="khtml/DOM.HTMLFormElement.html">DOM.HTMLFormElement</A></td></tr>
-<tr ><td><a href="khtml/DOM.HTMLFrameElement.html">DOM.HTMLFrameElement</A></td></tr>
-<tr ><td><a href="khtml/DOM.HTMLFrameSetElement.html">DOM.HTMLFrameSetElement</A></td></tr>
-<tr ><td><a href="khtml/DOM.HTMLHRElement.html">DOM.HTMLHRElement</A></td></tr>
-<tr ><td><a href="khtml/DOM.HTMLHeadElement.html">DOM.HTMLHeadElement</A></td></tr>
-<tr ><td><a href="khtml/DOM.HTMLHeadingElement.html">DOM.HTMLHeadingElement</A></td></tr>
-<tr ><td><a href="khtml/DOM.HTMLHtmlElement.html">DOM.HTMLHtmlElement</A></td></tr>
-<tr ><td><a href="khtml/DOM.HTMLIFrameElement.html">DOM.HTMLIFrameElement</A></td></tr>
-<tr ><td><a href="khtml/DOM.HTMLImageElement.html">DOM.HTMLImageElement</A></td></tr>
-<tr ><td><a href="khtml/DOM.HTMLInputElement.html">DOM.HTMLInputElement</A></td></tr>
-<tr ><td><a href="khtml/DOM.HTMLIsIndexElement.html">DOM.HTMLIsIndexElement</A></td></tr>
-<tr ><td><a href="khtml/DOM.HTMLLIElement.html">DOM.HTMLLIElement</A></td></tr>
-<tr ><td><a href="khtml/DOM.HTMLLabelElement.html">DOM.HTMLLabelElement</A></td></tr>
-<tr ><td><a href="khtml/DOM.HTMLLayerElement.html">DOM.HTMLLayerElement</A></td></tr>
-<tr ><td><a href="khtml/DOM.HTMLLegendElement.html">DOM.HTMLLegendElement</A></td></tr>
-<tr ><td><a href="khtml/DOM.HTMLLinkElement.html">DOM.HTMLLinkElement</A></td></tr>
-<tr ><td><a href="khtml/DOM.HTMLMapElement.html">DOM.HTMLMapElement</A></td></tr>
-<tr ><td><a href="khtml/DOM.HTMLMenuElement.html">DOM.HTMLMenuElement</A></td></tr>
-<tr ><td><a href="khtml/DOM.HTMLMetaElement.html">DOM.HTMLMetaElement</A></td></tr>
-<tr ><td><a href="khtml/DOM.HTMLModElement.html">DOM.HTMLModElement</A></td></tr>
-<tr ><td><a href="khtml/DOM.HTMLOListElement.html">DOM.HTMLOListElement</A></td></tr>
-<tr ><td><a href="khtml/DOM.HTMLObjectElement.html">DOM.HTMLObjectElement</A></td></tr>
-<tr ><td><a href="khtml/DOM.HTMLOptGroupElement.html">DOM.HTMLOptGroupElement</A></td></tr>
-<tr ><td><a href="khtml/DOM.HTMLOptionElement.html">DOM.HTMLOptionElement</A></td></tr>
-<tr ><td><a href="khtml/DOM.HTMLParagraphElement.html">DOM.HTMLParagraphElement</A></td></tr>
-<tr ><td><a href="khtml/DOM.HTMLParamElement.html">DOM.HTMLParamElement</A></td></tr>
-<tr ><td><a href="khtml/DOM.HTMLPreElement.html">DOM.HTMLPreElement</A></td></tr>
-<tr ><td><a href="khtml/DOM.HTMLQuoteElement.html">DOM.HTMLQuoteElement</A></td></tr>
-<tr ><td><a href="khtml/DOM.HTMLScriptElement.html">DOM.HTMLScriptElement</A></td></tr>
-<tr ><td><a href="khtml/DOM.HTMLSelectElement.html">DOM.HTMLSelectElement</A></td></tr>
-<tr ><td><a href="khtml/DOM.HTMLStyleElement.html">DOM.HTMLStyleElement</A></td></tr>
-<tr ><td><a href="khtml/DOM.HTMLTableCaptionElement.html">DOM.HTMLTableCaptionElement</A></td></tr>
-<tr ><td><a href="khtml/DOM.HTMLTableCellElement.html">DOM.HTMLTableCellElement</A></td></tr>
-<tr ><td><a href="khtml/DOM.HTMLTableColElement.html">DOM.HTMLTableColElement</A></td></tr>
-<tr ><td><a href="khtml/DOM.HTMLTableElement.html">DOM.HTMLTableElement</A></td></tr>
-<tr ><td><a href="khtml/DOM.HTMLTableRowElement.html">DOM.HTMLTableRowElement</A></td></tr>
-<tr ><td><a href="khtml/DOM.HTMLTableSectionElement.html">DOM.HTMLTableSectionElement</A></td></tr>
-<tr ><td><a href="khtml/DOM.HTMLTextAreaElement.html">DOM.HTMLTextAreaElement</A></td></tr>
-<tr ><td><a href="khtml/DOM.HTMLTitleElement.html">DOM.HTMLTitleElement</A></td></tr>
-<tr ><td><a href="khtml/DOM.HTMLUListElement.html">DOM.HTMLUListElement</A></td></tr>
-<tr ><td><a href="khtml/DOM.LinkStyle.html">DOM.LinkStyle</A></td></tr>
-<tr ><td><a href="khtml/DOM.MediaList.html">DOM.MediaList</A></td></tr>
-<tr ><td><a href="khtml/DOM.MouseEvent.html">DOM.MouseEvent</A></td></tr>
-<tr ><td><a href="khtml/DOM.MutationEvent.html">DOM.MutationEvent</A></td></tr>
-<tr ><td><a href="khtml/DOM.NamedNodeMap.html">DOM.NamedNodeMap</A></td></tr>
-<tr ><td><a href="khtml/DOM.Node.html">DOM.Node</A></td></tr>
-<tr ><td><a href="khtml/DOM.NodeFilter.html">DOM.NodeFilter</A></td></tr>
-<tr ><td><a href="khtml/DOM.NodeIterator.html">DOM.NodeIterator</A></td></tr>
-<tr ><td><a href="khtml/DOM.NodeList.html">DOM.NodeList</A></td></tr>
-<tr ><td><a href="khtml/DOM.Notation.html">DOM.Notation</A></td></tr>
-<tr ><td><a href="khtml/DOM.ProcessingInstruction.html">DOM.ProcessingInstruction</A></td></tr>
-<tr ><td><a href="khtml/DOM.RGBColor.html">DOM.RGBColor</A></td></tr>
-<tr ><td><a href="khtml/DOM.Range.html">DOM.Range</A></td></tr>
-<tr ><td><a href="khtml/DOM.RangeException.html">DOM.RangeException</A></td></tr>
-<tr ><td><a href="khtml/DOM.Rect.html">DOM.Rect</A></td></tr>
-<tr ><td><a href="khtml/DOM.StyleSheet.html">DOM.StyleSheet</A></td></tr>
-<tr ><td><a href="khtml/DOM.StyleSheetList.html">DOM.StyleSheetList</A></td></tr>
-<tr ><td><a href="khtml/DOM.Text.html">DOM.Text</A></td></tr>
-<tr ><td><a href="khtml/DOM.TextEvent.html">DOM.TextEvent</A></td></tr>
-<tr ><td><a href="khtml/DOM.TreeWalker.html">DOM.TreeWalker</A></td></tr>
-<tr ><td><a href="khtml/DOM.UIEvent.html">DOM.UIEvent</A></td></tr>
-<tr ><td><a href="khtml/DOM.html">DOM</A></td></tr>
-<tr ><td><a href="kparts/ExtTerminalInterface.html"><i>ExtTerminalInterface</i></A></td></tr>
+<tr ><td><a href="tdehtml/DOM.AbstractView.html">DOM.AbstractView</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.Attr.html">DOM.Attr</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.CDATASection.html">DOM.CDATASection</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.CSSCharsetRule.html">DOM.CSSCharsetRule</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.CSSException.html">DOM.CSSException</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.CSSFontFaceRule.html">DOM.CSSFontFaceRule</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.CSSImportRule.html">DOM.CSSImportRule</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.CSSMediaRule.html">DOM.CSSMediaRule</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.CSSPageRule.html">DOM.CSSPageRule</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.CSSPrimitiveValue.html">DOM.CSSPrimitiveValue</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.CSSRule.html">DOM.CSSRule</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.CSSRuleList.html">DOM.CSSRuleList</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.CSSStyleDeclaration.html">DOM.CSSStyleDeclaration</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.CSSStyleRule.html">DOM.CSSStyleRule</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.CSSStyleSheet.html">DOM.CSSStyleSheet</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.CSSUnknownRule.html">DOM.CSSUnknownRule</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.CSSValue.html">DOM.CSSValue</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.CSSValueList.html">DOM.CSSValueList</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.CharacterData.html">DOM.CharacterData</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.Comment.html">DOM.Comment</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.Counter.html">DOM.Counter</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.CustomNodeFilter.html">DOM.CustomNodeFilter</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.DOMException.html">DOM.DOMException</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.DOMImplementation.html">DOM.DOMImplementation</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.DOMString.html">DOM.DOMString</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.Document.html">DOM.Document</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.DocumentFragment.html">DOM.DocumentFragment</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.DocumentStyle.html">DOM.DocumentStyle</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.DocumentType.html">DOM.DocumentType</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.DomShared.html">DOM.DomShared</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.Element.html">DOM.Element</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.Entity.html">DOM.Entity</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.EntityReference.html">DOM.EntityReference</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.Event.html">DOM.Event</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.EventException.html">DOM.EventException</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.EventListener.html">DOM.EventListener</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.HTMLAnchorElement.html">DOM.HTMLAnchorElement</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.HTMLAppletElement.html">DOM.HTMLAppletElement</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.HTMLAreaElement.html">DOM.HTMLAreaElement</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.HTMLBRElement.html">DOM.HTMLBRElement</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.HTMLBaseElement.html">DOM.HTMLBaseElement</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.HTMLBaseFontElement.html">DOM.HTMLBaseFontElement</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.HTMLBlockquoteElement.html">DOM.HTMLBlockquoteElement</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.HTMLBodyElement.html">DOM.HTMLBodyElement</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.HTMLButtonElement.html">DOM.HTMLButtonElement</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.HTMLCollection.html">DOM.HTMLCollection</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.HTMLDListElement.html">DOM.HTMLDListElement</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.HTMLDirectoryElement.html">DOM.HTMLDirectoryElement</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.HTMLDivElement.html">DOM.HTMLDivElement</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.HTMLDocument.html">DOM.HTMLDocument</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.HTMLElement.html">DOM.HTMLElement</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.HTMLFieldSetElement.html">DOM.HTMLFieldSetElement</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.HTMLFontElement.html">DOM.HTMLFontElement</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.HTMLFormElement.html">DOM.HTMLFormElement</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.HTMLFrameElement.html">DOM.HTMLFrameElement</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.HTMLFrameSetElement.html">DOM.HTMLFrameSetElement</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.HTMLHRElement.html">DOM.HTMLHRElement</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.HTMLHeadElement.html">DOM.HTMLHeadElement</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.HTMLHeadingElement.html">DOM.HTMLHeadingElement</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.HTMLHtmlElement.html">DOM.HTMLHtmlElement</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.HTMLIFrameElement.html">DOM.HTMLIFrameElement</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.HTMLImageElement.html">DOM.HTMLImageElement</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.HTMLInputElement.html">DOM.HTMLInputElement</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.HTMLIsIndexElement.html">DOM.HTMLIsIndexElement</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.HTMLLIElement.html">DOM.HTMLLIElement</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.HTMLLabelElement.html">DOM.HTMLLabelElement</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.HTMLLayerElement.html">DOM.HTMLLayerElement</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.HTMLLegendElement.html">DOM.HTMLLegendElement</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.HTMLLinkElement.html">DOM.HTMLLinkElement</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.HTMLMapElement.html">DOM.HTMLMapElement</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.HTMLMenuElement.html">DOM.HTMLMenuElement</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.HTMLMetaElement.html">DOM.HTMLMetaElement</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.HTMLModElement.html">DOM.HTMLModElement</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.HTMLOListElement.html">DOM.HTMLOListElement</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.HTMLObjectElement.html">DOM.HTMLObjectElement</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.HTMLOptGroupElement.html">DOM.HTMLOptGroupElement</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.HTMLOptionElement.html">DOM.HTMLOptionElement</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.HTMLParagraphElement.html">DOM.HTMLParagraphElement</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.HTMLParamElement.html">DOM.HTMLParamElement</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.HTMLPreElement.html">DOM.HTMLPreElement</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.HTMLQuoteElement.html">DOM.HTMLQuoteElement</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.HTMLScriptElement.html">DOM.HTMLScriptElement</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.HTMLSelectElement.html">DOM.HTMLSelectElement</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.HTMLStyleElement.html">DOM.HTMLStyleElement</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.HTMLTableCaptionElement.html">DOM.HTMLTableCaptionElement</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.HTMLTableCellElement.html">DOM.HTMLTableCellElement</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.HTMLTableColElement.html">DOM.HTMLTableColElement</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.HTMLTableElement.html">DOM.HTMLTableElement</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.HTMLTableRowElement.html">DOM.HTMLTableRowElement</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.HTMLTableSectionElement.html">DOM.HTMLTableSectionElement</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.HTMLTextAreaElement.html">DOM.HTMLTextAreaElement</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.HTMLTitleElement.html">DOM.HTMLTitleElement</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.HTMLUListElement.html">DOM.HTMLUListElement</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.LinkStyle.html">DOM.LinkStyle</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.MediaList.html">DOM.MediaList</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.MouseEvent.html">DOM.MouseEvent</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.MutationEvent.html">DOM.MutationEvent</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.NamedNodeMap.html">DOM.NamedNodeMap</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.Node.html">DOM.Node</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.NodeFilter.html">DOM.NodeFilter</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.NodeIterator.html">DOM.NodeIterator</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.NodeList.html">DOM.NodeList</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.Notation.html">DOM.Notation</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.ProcessingInstruction.html">DOM.ProcessingInstruction</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.RGBColor.html">DOM.RGBColor</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.Range.html">DOM.Range</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.RangeException.html">DOM.RangeException</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.Rect.html">DOM.Rect</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.StyleSheet.html">DOM.StyleSheet</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.StyleSheetList.html">DOM.StyleSheetList</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.Text.html">DOM.Text</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.TextEvent.html">DOM.TextEvent</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.TreeWalker.html">DOM.TreeWalker</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.UIEvent.html">DOM.UIEvent</A></td></tr>
+<tr ><td><a href="tdehtml/DOM.html">DOM</A></td></tr>
+<tr ><td><a href="tdeparts/ExtTerminalInterface.html"><i>ExtTerminalInterface</i></A></td></tr>
 <tr ><td><a href="kabc/KABC.Address.html">KABC.Address</A></td></tr>
 <tr ><td><a href="kabc/KABC.AddressBook.html">KABC.AddressBook</A></td></tr>
 <tr ><td><a href="kabc/KABC.AddressLineEdit.html">KABC.AddressLineEdit</A></td></tr>
@@ -249,10 +249,10 @@
 <tr ><td><a href="tdeui/KBugReport.html">KBugReport</A></td></tr>
 <tr ><td><a href="tdeui/KButtonBox.html">KButtonBox</A></td></tr>
 <tr ><td><a href="tdeui/TDECModule.html">TDECModule</A></td></tr>
-<tr ><td><a href="kutils/TDECModuleInfo.html">TDECModuleInfo</A></td></tr>
-<tr ><td><a href="kutils/TDECModuleLoader.html">TDECModuleLoader</A></td></tr>
-<tr ><td><a href="kutils/TDECModuleProxy.html">TDECModuleProxy</A></td></tr>
-<tr ><td><a href="kutils/KCMultiDialog.html">KCMultiDialog</A></td></tr>
+<tr ><td><a href="tdeutils/TDECModuleInfo.html">TDECModuleInfo</A></td></tr>
+<tr ><td><a href="tdeutils/TDECModuleLoader.html">TDECModuleLoader</A></td></tr>
+<tr ><td><a href="tdeutils/TDECModuleProxy.html">TDECModuleProxy</A></td></tr>
+<tr ><td><a href="tdeutils/KCMultiDialog.html">KCMultiDialog</A></td></tr>
 <tr ><td><a href="tdefx/KCPUInfo.html">KCPUInfo</A></td></tr>
 <tr ><td><a href="tdecore/KCalendarSystem.html"><i>KCalendarSystem</i></A></td></tr>
 <tr ><td><a href="tdecore/KCalendarSystemFactory.html">KCalendarSystemFactory</A></td></tr>
@@ -340,7 +340,7 @@
 <tr ><td><a href="tdeui/KDialog.html">KDialog</A></td></tr>
 <tr ><td><a href="tdeui/KDialogBase.html">KDialogBase</A></td></tr>
 <tr ><td><a href="tdeui/KDialogQueue.html">KDialogQueue</A></td></tr>
-<tr ><td><a href="kspell/KDictSpellingHighlighter.html">KDictSpellingHighlighter</A></td></tr>
+<tr ><td><a href="tdespell/KDictSpellingHighlighter.html">KDictSpellingHighlighter</A></td></tr>
 <tr ><td><a href="kio/KDirLister.html">KDirLister</A></td></tr>
 <tr ><td><a href="kio/KDirNotify.html"><i>KDirNotify</i></A></td></tr>
 <tr ><td><a href="kfile/KDirOperator.html">KDirOperator</A></td></tr>
@@ -407,8 +407,8 @@
 <tr ><td><a href="kfile/KFileViewSignaler.html">KFileViewSignaler</A></td></tr>
 <tr ><td><a href="kio/KFilterBase.html"><i>KFilterBase</i></A></td></tr>
 <tr ><td><a href="kio/KFilterDev.html">KFilterDev</A></td></tr>
-<tr ><td><a href="kutils/KFind.html">KFind</A></td></tr>
-<tr ><td><a href="kutils/KFindDialog.html">KFindDialog</A></td></tr>
+<tr ><td><a href="tdeutils/KFind.html">KFind</A></td></tr>
+<tr ><td><a href="tdeutils/KFindDialog.html">KFindDialog</A></td></tr>
 <tr ><td><a href="tdeui/KFloatValidator.html">KFloatValidator</A></td></tr>
 <tr ><td><a href="kio/KFolderType.html">KFolderType</A></td></tr>
 <tr ><td><a href="tdeui/KFontAction.html">KFontAction</A></td></tr>
@@ -424,9 +424,9 @@
 <tr ><td><a href="tdeui/KGradientSelector.html">KGradientSelector</A></td></tr>
 <tr ><td><a href="tdeui/KGuiItem.html">KGuiItem</A></td></tr>
 <tr ><td><a href="tdeui/KHSSelector.html">KHSSelector</A></td></tr>
-<tr ><td><a href="khtml/KHTMLPart.html">KHTMLPart</A></td></tr>
-<tr ><td><a href="khtml/KHTMLSettings.html">KHTMLSettings</A></td></tr>
-<tr ><td><a href="khtml/KHTMLView.html">KHTMLView</A></td></tr>
+<tr ><td><a href="tdehtml/KHTMLPart.html">KHTMLPart</A></td></tr>
+<tr ><td><a href="tdehtml/KHTMLSettings.html">KHTMLSettings</A></td></tr>
+<tr ><td><a href="tdehtml/KHTMLView.html">KHTMLView</A></td></tr>
 <tr ><td><a href="tdeui/KHelpMenu.html">KHelpMenu</A></td></tr>
 <tr ><td><a href="tdeui/KHistoryCombo.html">KHistoryCombo</A></td></tr>
 <tr ><td><a href="tdecore/KIDNA.html">KIDNA</A></td></tr>
@@ -527,24 +527,24 @@
 <tr ><td><a href="tdecore/KMacroExpanderBase.html">KMacroExpanderBase</A></td></tr>
 <tr ><td><a href="tdeui/KMainWindow.html">KMainWindow</A></td></tr>
 <tr ><td><a href="tdeui/KMainWindowInterface.html">KMainWindowInterface</A></td></tr>
-<tr ><td><a href="kmdi/KMdi.html">KMdi</A></td></tr>
-<tr ><td><a href="kmdi/KMdiChildArea.html">KMdiChildArea</A></td></tr>
-<tr ><td><a href="kmdi/KMdiChildFrm.html">KMdiChildFrm</A></td></tr>
-<tr ><td><a href="kmdi/KMdiChildFrmCaption.html">KMdiChildFrmCaption</A></td></tr>
-<tr ><td><a href="kmdi/KMdiChildFrmDragBeginEvent.html">KMdiChildFrmDragBeginEvent</A></td></tr>
-<tr ><td><a href="kmdi/KMdiChildFrmDragEndEvent.html">KMdiChildFrmDragEndEvent</A></td></tr>
-<tr ><td><a href="kmdi/KMdiChildFrmMoveEvent.html">KMdiChildFrmMoveEvent</A></td></tr>
-<tr ><td><a href="kmdi/KMdiChildFrmResizeBeginEvent.html">KMdiChildFrmResizeBeginEvent</A></td></tr>
-<tr ><td><a href="kmdi/KMdiChildFrmResizeEndEvent.html">KMdiChildFrmResizeEndEvent</A></td></tr>
-<tr ><td><a href="kmdi/KMdiChildView.html">KMdiChildView</A></td></tr>
-<tr ><td><a href="kmdi/KMdiMainFrm.html">KMdiMainFrm</A></td></tr>
-<tr ><td><a href="kmdi/KMdiTaskBar.html">KMdiTaskBar</A></td></tr>
+<tr ><td><a href="tdemdi/KMdi.html">KMdi</A></td></tr>
+<tr ><td><a href="tdemdi/KMdiChildArea.html">KMdiChildArea</A></td></tr>
+<tr ><td><a href="tdemdi/KMdiChildFrm.html">KMdiChildFrm</A></td></tr>
+<tr ><td><a href="tdemdi/KMdiChildFrmCaption.html">KMdiChildFrmCaption</A></td></tr>
+<tr ><td><a href="tdemdi/KMdiChildFrmDragBeginEvent.html">KMdiChildFrmDragBeginEvent</A></td></tr>
+<tr ><td><a href="tdemdi/KMdiChildFrmDragEndEvent.html">KMdiChildFrmDragEndEvent</A></td></tr>
+<tr ><td><a href="tdemdi/KMdiChildFrmMoveEvent.html">KMdiChildFrmMoveEvent</A></td></tr>
+<tr ><td><a href="tdemdi/KMdiChildFrmResizeBeginEvent.html">KMdiChildFrmResizeBeginEvent</A></td></tr>
+<tr ><td><a href="tdemdi/KMdiChildFrmResizeEndEvent.html">KMdiChildFrmResizeEndEvent</A></td></tr>
+<tr ><td><a href="tdemdi/KMdiChildView.html">KMdiChildView</A></td></tr>
+<tr ><td><a href="tdemdi/KMdiMainFrm.html">KMdiMainFrm</A></td></tr>
+<tr ><td><a href="tdemdi/KMdiTaskBar.html">KMdiTaskBar</A></td></tr>
 </table></td><td valign="top"><table border="0">
 <tr bgcolor="#fff0ff"><th>KMdiTaskBarButton - konsolePart</th></tr>
-<tr ><td><a href="kmdi/KMdiTaskBarButton.html">KMdiTaskBarButton</A></td></tr>
-<tr ><td><a href="kmdi/KMdiToolViewAccessor.html">KMdiToolViewAccessor</A></td></tr>
-<tr ><td><a href="kmdi/KMdiViewCloseEvent.html">KMdiViewCloseEvent</A></td></tr>
-<tr ><td><a href="kmdi/KMdiWin32IconButton.html">KMdiWin32IconButton</A></td></tr>
+<tr ><td><a href="tdemdi/KMdiTaskBarButton.html">KMdiTaskBarButton</A></td></tr>
+<tr ><td><a href="tdemdi/KMdiToolViewAccessor.html">KMdiToolViewAccessor</A></td></tr>
+<tr ><td><a href="tdemdi/KMdiViewCloseEvent.html">KMdiViewCloseEvent</A></td></tr>
+<tr ><td><a href="tdemdi/KMdiWin32IconButton.html">KMdiWin32IconButton</A></td></tr>
 <tr ><td><a href="tdeui/KMenuBar.html">KMenuBar</A></td></tr>
 <tr ><td><a href="tdeui/KMessageBox.html">KMessageBox</A></td></tr>
 <tr ><td><a href="kio/KMimeMagic.html">KMimeMagic</A></td></tr>
@@ -556,9 +556,9 @@
 <tr ><td><a href="kio/KMimeTypeChooserDialog.html">KMimeTypeChooserDialog</A></td></tr>
 <tr ><td><a href="tdeui/KMimeTypeValidator.html">KMimeTypeValidator</A></td></tr>
 <tr ><td><a href="tdecore/KMountPoint.html">KMountPoint</A></td></tr>
-<tr ><td><a href="kutils/KMultiTabBar.html">KMultiTabBar</A></td></tr>
-<tr ><td><a href="kutils/KMultiTabBarButton.html">KMultiTabBarButton</A></td></tr>
-<tr ><td><a href="kutils/KMultiTabBarTab.html">KMultiTabBarTab</A></td></tr>
+<tr ><td><a href="tdeutils/KMultiTabBar.html">KMultiTabBar</A></td></tr>
+<tr ><td><a href="tdeutils/KMultiTabBarButton.html">KMultiTabBarButton</A></td></tr>
+<tr ><td><a href="tdeutils/KMultiTabBarTab.html">KMultiTabBarTab</A></td></tr>
 <tr ><td><a href="tdecore/KMultipleDrag.html">KMultipleDrag</A></td></tr>
 <tr ><td><a href="kio/KNFSShare.html">KNFSShare</A></td></tr>
 <tr ><td><a href="tdeui/KNamedCommand.html">KNamedCommand</A></td></tr>
@@ -582,31 +582,31 @@
 <tr ><td><a href="tdeui/KPanelApplet.html">KPanelApplet</A></td></tr>
 <tr ><td><a href="tdeui/KPanelExtension.html">KPanelExtension</A></td></tr>
 <tr ><td><a href="tdeui/KPanelMenu.html"><i>KPanelMenu</i></A></td></tr>
-<tr ><td><a href="kparts/KParts.BrowserExtension.html">KParts.BrowserExtension</A></td></tr>
-<tr ><td><a href="kparts/KParts.BrowserHostExtension.html">KParts.BrowserHostExtension</A></td></tr>
-<tr ><td><a href="kparts/KParts.BrowserInterface.html">KParts.BrowserInterface</A></td></tr>
-<tr ><td><a href="kparts/KParts.BrowserRun.html">KParts.BrowserRun</A></td></tr>
-<tr ><td><a href="kparts/KParts.DockMainWindow.html">KParts.DockMainWindow</A></td></tr>
-<tr ><td><a href="kparts/KParts.Event.html">KParts.Event</A></td></tr>
-<tr ><td><a href="kparts/KParts.Factory.html">KParts.Factory</A></td></tr>
-<tr ><td><a href="kparts/KParts.GUIActivateEvent.html">KParts.GUIActivateEvent</A></td></tr>
-<tr ><td><a href="kparts/KParts.HistoryProvider.html">KParts.HistoryProvider</A></td></tr>
-<tr ><td><a href="kparts/KParts.LiveConnectExtension.html">KParts.LiveConnectExtension</A></td></tr>
-<tr ><td><a href="kparts/KParts.MainWindow.html">KParts.MainWindow</A></td></tr>
-<tr ><td><a href="kparts/KParts.OpenURLEvent.html">KParts.OpenURLEvent</A></td></tr>
-<tr ><td><a href="kparts/KParts.Part.html">KParts.Part</A></td></tr>
-<tr ><td><a href="kparts/KParts.PartActivateEvent.html">KParts.PartActivateEvent</A></td></tr>
-<tr ><td><a href="kparts/KParts.PartBase.html">KParts.PartBase</A></td></tr>
-<tr ><td><a href="kparts/KParts.PartManager.html">KParts.PartManager</A></td></tr>
-<tr ><td><a href="kparts/KParts.PartSelectEvent.html">KParts.PartSelectEvent</A></td></tr>
-<tr ><td><a href="kparts/KParts.Plugin.PluginInfo.html">KParts.Plugin.PluginInfo</A></td></tr>
-<tr ><td><a href="kparts/KParts.Plugin.html">KParts.Plugin</A></td></tr>
-<tr ><td><a href="kparts/KParts.ReadOnlyPart.html"><i>KParts.ReadOnlyPart</i></A></td></tr>
-<tr ><td><a href="kparts/KParts.ReadWritePart.html"><i>KParts.ReadWritePart</i></A></td></tr>
-<tr ><td><a href="kparts/KParts.StatusBarExtension.html">KParts.StatusBarExtension</A></td></tr>
-<tr ><td><a href="kparts/KParts.URLArgs.html">KParts.URLArgs</A></td></tr>
-<tr ><td><a href="kparts/KParts.WindowArgs.html">KParts.WindowArgs</A></td></tr>
-<tr ><td><a href="kparts/KParts.html">KParts</A></td></tr>
+<tr ><td><a href="tdeparts/KParts.BrowserExtension.html">KParts.BrowserExtension</A></td></tr>
+<tr ><td><a href="tdeparts/KParts.BrowserHostExtension.html">KParts.BrowserHostExtension</A></td></tr>
+<tr ><td><a href="tdeparts/KParts.BrowserInterface.html">KParts.BrowserInterface</A></td></tr>
+<tr ><td><a href="tdeparts/KParts.BrowserRun.html">KParts.BrowserRun</A></td></tr>
+<tr ><td><a href="tdeparts/KParts.DockMainWindow.html">KParts.DockMainWindow</A></td></tr>
+<tr ><td><a href="tdeparts/KParts.Event.html">KParts.Event</A></td></tr>
+<tr ><td><a href="tdeparts/KParts.Factory.html">KParts.Factory</A></td></tr>
+<tr ><td><a href="tdeparts/KParts.GUIActivateEvent.html">KParts.GUIActivateEvent</A></td></tr>
+<tr ><td><a href="tdeparts/KParts.HistoryProvider.html">KParts.HistoryProvider</A></td></tr>
+<tr ><td><a href="tdeparts/KParts.LiveConnectExtension.html">KParts.LiveConnectExtension</A></td></tr>
+<tr ><td><a href="tdeparts/KParts.MainWindow.html">KParts.MainWindow</A></td></tr>
+<tr ><td><a href="tdeparts/KParts.OpenURLEvent.html">KParts.OpenURLEvent</A></td></tr>
+<tr ><td><a href="tdeparts/KParts.Part.html">KParts.Part</A></td></tr>
+<tr ><td><a href="tdeparts/KParts.PartActivateEvent.html">KParts.PartActivateEvent</A></td></tr>
+<tr ><td><a href="tdeparts/KParts.PartBase.html">KParts.PartBase</A></td></tr>
+<tr ><td><a href="tdeparts/KParts.PartManager.html">KParts.PartManager</A></td></tr>
+<tr ><td><a href="tdeparts/KParts.PartSelectEvent.html">KParts.PartSelectEvent</A></td></tr>
+<tr ><td><a href="tdeparts/KParts.Plugin.PluginInfo.html">KParts.Plugin.PluginInfo</A></td></tr>
+<tr ><td><a href="tdeparts/KParts.Plugin.html">KParts.Plugin</A></td></tr>
+<tr ><td><a href="tdeparts/KParts.ReadOnlyPart.html"><i>KParts.ReadOnlyPart</i></A></td></tr>
+<tr ><td><a href="tdeparts/KParts.ReadWritePart.html"><i>KParts.ReadWritePart</i></A></td></tr>
+<tr ><td><a href="tdeparts/KParts.StatusBarExtension.html">KParts.StatusBarExtension</A></td></tr>
+<tr ><td><a href="tdeparts/KParts.URLArgs.html">KParts.URLArgs</A></td></tr>
+<tr ><td><a href="tdeparts/KParts.WindowArgs.html">KParts.WindowArgs</A></td></tr>
+<tr ><td><a href="tdeparts/KParts.html">KParts</A></td></tr>
 <tr ><td><a href="tdeui/KPassivePopup.html">KPassivePopup</A></td></tr>
 <tr ><td><a href="tdeui/KPasswordDialog.html">KPasswordDialog</A></td></tr>
 <tr ><td><a href="tdeui/KPasswordEdit.html">KPasswordEdit</A></td></tr>
@@ -618,8 +618,8 @@
 <tr ><td><a href="tdeui/KPixmapRegionSelectorDialog.html">KPixmapRegionSelectorDialog</A></td></tr>
 <tr ><td><a href="tdeui/KPixmapRegionSelectorWidget.html">KPixmapRegionSelectorWidget</A></td></tr>
 <tr ><td><a href="tdefx/KPixmapSplitter.html">KPixmapSplitter</A></td></tr>
-<tr ><td><a href="kutils/KPluginInfo.html">KPluginInfo</A></td></tr>
-<tr ><td><a href="kutils/KPluginSelector.html">KPluginSelector</A></td></tr>
+<tr ><td><a href="tdeutils/KPluginInfo.html">KPluginInfo</A></td></tr>
+<tr ><td><a href="tdeutils/KPluginSelector.html">KPluginSelector</A></td></tr>
 <tr ><td><a href="tdeui/KPopupFrame.html">KPopupFrame</A></td></tr>
 <tr ><td><a href="tdeui/KPopupMenu.html">KPopupMenu</A></td></tr>
 <tr ><td><a href="tdeui/KPopupTitle.html">KPopupTitle</A></td></tr>
@@ -640,14 +640,14 @@
 <tr ><td><a href="kio/KProtocolInfo.html">KProtocolInfo</A></td></tr>
 <tr ><td><a href="kio/KProtocolManager.html">KProtocolManager</A></td></tr>
 <tr ><td><a href="tdeui/KPushButton.html">KPushButton</A></td></tr>
-<tr ><td><a href="kresources/KRES.ConfigDialog.html">KRES.ConfigDialog</A></td></tr>
-<tr ><td><a href="kresources/KRES.ConfigWidget.html"><i>KRES.ConfigWidget</i></A></td></tr>
-<tr ><td><a href="kresources/KRES.Factory.html">KRES.Factory</A></td></tr>
-<tr ><td><a href="kresources/KRES.PluginFactoryBase.html"><i>KRES.PluginFactoryBase</i></A></td></tr>
-<tr ><td><a href="kresources/KRES.Resource.html">KRES.Resource</A></td></tr>
-<tr ><td><a href="kresources/KRES.ResourcePageInfo.html">KRES.ResourcePageInfo</A></td></tr>
-<tr ><td><a href="kresources/KRES.SelectDialog.html">KRES.SelectDialog</A></td></tr>
-<tr ><td><a href="kresources/KRES.html">KRES</A></td></tr>
+<tr ><td><a href="tderesources/KRES.ConfigDialog.html">KRES.ConfigDialog</A></td></tr>
+<tr ><td><a href="tderesources/KRES.ConfigWidget.html"><i>KRES.ConfigWidget</i></A></td></tr>
+<tr ><td><a href="tderesources/KRES.Factory.html">KRES.Factory</A></td></tr>
+<tr ><td><a href="tderesources/KRES.PluginFactoryBase.html"><i>KRES.PluginFactoryBase</i></A></td></tr>
+<tr ><td><a href="tderesources/KRES.Resource.html">KRES.Resource</A></td></tr>
+<tr ><td><a href="tderesources/KRES.ResourcePageInfo.html">KRES.ResourcePageInfo</A></td></tr>
+<tr ><td><a href="tderesources/KRES.SelectDialog.html">KRES.SelectDialog</A></td></tr>
+<tr ><td><a href="tderesources/KRES.html">KRES</A></td></tr>
 <tr ><td><a href="tdecore/KRFCDate.html">KRFCDate</A></td></tr>
 <tr ><td><a href="tdeui/KRadioAction.html">KRadioAction</A></td></tr>
 <tr ><td><a href="tdecore/KRandomSequence.html">KRandomSequence</A></td></tr>
@@ -655,8 +655,8 @@
 <tr ><td><a href="tdeui/KRecentFilesAction.html">KRecentFilesAction</A></td></tr>
 <tr ><td><a href="tdecore/KRegExp.html">KRegExp</A></td></tr>
 <tr ><td><a href="kio/KRemoteEncoding.html">KRemoteEncoding</A></td></tr>
-<tr ><td><a href="kutils/KReplace.html">KReplace</A></td></tr>
-<tr ><td><a href="kutils/KReplaceDialog.html">KReplaceDialog</A></td></tr>
+<tr ><td><a href="tdeutils/KReplace.html">KReplace</A></td></tr>
+<tr ><td><a href="tdeutils/KReplaceDialog.html">KReplaceDialog</A></td></tr>
 <tr ><td><a href="tdeui/KRestrictedLine.html">KRestrictedLine</A></td></tr>
 <tr ><td><a href="tdeui/KRootPermsIcon.html">KRootPermsIcon</A></td></tr>
 <tr ><td><a href="tdeui/KRootPixmap.html">KRootPixmap</A></td></tr>
@@ -691,10 +691,10 @@
 <tr ><td><a href="kio/KShred.html">KShred</A></td></tr>
 <tr ><td><a href="tdecore/KSimpleConfig.html">KSimpleConfig</A></td></tr>
 <tr ><td><a href="kio/KSimpleFileFilter.html">KSimpleFileFilter</A></td></tr>
-<tr ><td><a href="kspell/KSpell.html">KSpell</A></td></tr>
-<tr ><td><a href="kspell/KSpellConfig.html">KSpellConfig</A></td></tr>
-<tr ><td><a href="kspell/KSpellDlg.html">KSpellDlg</A></td></tr>
-<tr ><td><a href="kspell/KSpellingHighlighter.html"><i>KSpellingHighlighter</i></A></td></tr>
+<tr ><td><a href="tdespell/KSpell.html">KSpell</A></td></tr>
+<tr ><td><a href="tdespell/KSpellConfig.html">KSpellConfig</A></td></tr>
+<tr ><td><a href="tdespell/KSpellDlg.html">KSpellDlg</A></td></tr>
+<tr ><td><a href="tdespell/KSpellingHighlighter.html"><i>KSpellingHighlighter</i></A></td></tr>
 <tr ><td><a href="tdeui/KSplashScreen.html">KSplashScreen</A></td></tr>
 <tr ><td><a href="tdeui/KSqueezedTextLabel.html">KSqueezedTextLabel</A></td></tr>
 <tr ><td><a href="tdecore/KStartupInfo.html">KStartupInfo</A></td></tr>
@@ -713,7 +713,7 @@
 <tr ><td><a href="kio/KSycoca.html">KSycoca</A></td></tr>
 <tr ><td><a href="kio/KSycocaEntry.html"><i>KSycocaEntry</i></A></td></tr>
 <tr ><td><a href="kio/KSycocaFactory.html"><i>KSycocaFactory</i></A></td></tr>
-<tr ><td><a href="kspell/KSyntaxHighlighter.html">KSyntaxHighlighter</A></td></tr>
+<tr ><td><a href="tdespell/KSyntaxHighlighter.html">KSyntaxHighlighter</A></td></tr>
 <tr ><td><a href="tdeui/KSystemTray.html">KSystemTray</A></td></tr>
 <tr ><td><a href="tdeui/KTabBar.html">KTabBar</A></td></tr>
 <tr ><td><a href="tdeui/KTabCtl.html">KTabCtl</A></td></tr>
@@ -791,11 +791,11 @@
 <tr ><td><a href="kio/Observer.html">Observer</A></td></tr>
 <tr ><td><a href="tdeui/QXEmbed.html">QXEmbed</A></td></tr>
 <tr ><td><a href="kio/RenameDlgPlugin.html">RenameDlgPlugin</A></td></tr>
-<tr ><td><a href="kparts/TerminalInterface.html"><i>TerminalInterface</i></A></td></tr>
+<tr ><td><a href="tdeparts/TerminalInterface.html"><i>TerminalInterface</i></A></td></tr>
 <tr ><td><a href="kio/ThumbCreator.html"><i>ThumbCreator</i></A></td></tr>
-<tr ><td><a href="kparts/konsoleBrowserExtension.html">konsoleBrowserExtension</A></td></tr>
-<tr ><td><a href="kparts/konsoleFactory.html">konsoleFactory</A></td></tr>
-<tr ><td><a href="kparts/konsolePart.html">konsolePart</A></td></tr>
+<tr ><td><a href="tdeparts/konsoleBrowserExtension.html">konsoleBrowserExtension</A></td></tr>
+<tr ><td><a href="tdeparts/konsoleFactory.html">konsoleFactory</A></td></tr>
+<tr ><td><a href="tdeparts/konsolePart.html">konsolePart</A></td></tr>
 </table></td></tr></table>
 </body>
 </html>
diff --git a/doc/classref/index.html b/doc/classref/index.html
index a87c05c..f51a507 100644
--- a/doc/classref/index.html
+++ b/doc/classref/index.html
@@ -28,13 +28,13 @@
 <li><a href="tdeprint/index.html">tdeprint</a></li>
 <li><a href="tdeui/index.html">tdeui</a></li>
 <li><a href="kfile/index.html">kfile</a></li>
-<li><a href="khtml/index.html">khtml</a></li>
+<li><a href="tdehtml/index.html">tdehtml</a></li>
 <li><a href="kio/index.html">kio</a></li>
-<li><a href="kmdi/index.html">kmdi</a></li>
-<li><a href="kparts/index.html">kparts</a></li>
-<li><a href="kresources/index.html">kresources</a></li>
-<li><a href="kspell/index.html">kspell</a></li>
-<li><a href="kutils/index.html">kutils</a></li>
+<li><a href="tdemdi/index.html">tdemdi</a></li>
+<li><a href="tdeparts/index.html">tdeparts</a></li>
+<li><a href="tderesources/index.html">tderesources</a></li>
+<li><a href="tdespell/index.html">tdespell</a></li>
+<li><a href="tdeutils/index.html">tdeutils</a></li>
 </ul>
         </td>
         </table>
diff --git a/doc/classref/kspell/kspell-globals.html b/doc/classref/kspell/kspell-globals.html
deleted file mode 100644
index 906321c..0000000
--- a/doc/classref/kspell/kspell-globals.html
+++ /dev/null
@@ -1,38 +0,0 @@
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN
-        "http://www.w3.org/TR/html4/loose.dtd"">
-<html>
-<head>
-  <title>kspell globals</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-  <meta name="GENERATOR" content="wabbit dumphtml">
-</head>
-<body>
-<h4>PyKDE - Python Bindings for KDE</h4>
-<hr>
-<table width="100%"><tr>
-            <td width ="70%">
-                <h1>kspell Globals</h1><hr>
-            </td>
-            <td  width="30%" valign="top" align="right">
-                <table>
-                    <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
-                    <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kspell Classes</a></td></tr>
-                    <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
-                </table>
-            </td>
-        </tr></table>
-        <h3>enums</h3><ul>
-<li><b><a href="sip/kspell/all-globals.html#Encoding">Encoding</a></b> = {KS_E_ASCII, KS_E_LATIN1, KS_E_LATIN2, KS_E_LATIN3, KS_E_LATIN4, KS_E_LATIN5, KS_E_LATIN7, KS_E_LATIN8, KS_E_LATIN9, KS_E_LATIN13, KS_E_LATIN15, KS_E_UTF8, KS_E_KOI8R, KS_E_KOI8U, KS_E_CP1251, KS_E_CP1255
-}<li><b><a href="sip/kspell/all-globals.html#Encoding">Encoding</a></b> = {KS_E_ASCII, KS_E_LATIN1, KS_E_LATIN2, KS_E_LATIN3, KS_E_LATIN4, KS_E_LATIN5, KS_E_LATIN7, KS_E_LATIN8, KS_E_LATIN9, KS_E_LATIN13, KS_E_LATIN15, KS_E_UTF8, KS_E_KOI8R, KS_E_KOI8U, KS_E_CP1251
-}<li><b><a href="sip/kspell/all-globals.html#Encoding">Encoding</a></b> = {KS_E_ASCII, KS_E_LATIN1, KS_E_LATIN2, KS_E_LATIN3, KS_E_LATIN4, KS_E_LATIN5, KS_E_LATIN7, KS_E_LATIN8, KS_E_LATIN9, KS_E_LATIN15, KS_E_UTF8, KS_E_KOI8R, KS_E_KOI8U, KS_E_CP1251, KS_E_LATIN13
-}<li><b><a href="sip/kspell/all-globals.html#KS_RESULT">KS_RESULT</a></b> = {KS_CANCEL, KS_REPLACE, KS_REPLACEALL, KS_IGNORE, KS_IGNOREALL, KS_ADD, KS_STOP, KS_SUGGEST, KS_CONFIG
-}<li><b><a href="sip/kspell/all-globals.html#KS_RESULT">KS_RESULT</a></b> = {KS_CANCEL, KS_REPLACE, KS_REPLACEALL, KS_IGNORE, KS_IGNOREALL, KS_ADD, KS_STOP
-}<li><b><a href="sip/kspell/all-globals.html#KSpellClients">KSpellClients</a></b> = {KS_CLIENT_ISPELL, KS_CLIENT_ASPELL, KS_CLIENT_HSPELL, KS_CLIENT_ZEMBEREK
-}<li><b><a href="sip/kspell/all-globals.html#KSpellClients">KSpellClients</a></b> = {KS_CLIENT_ISPELL, KS_CLIENT_ASPELL, KS_CLIENT_HSPELL
-}<li><b><a href="sip/kspell/all-globals.html#KSpellClients">KSpellClients</a></b> = {KS_CLIENT_ISPELL, KS_CLIENT_ASPELL
-}</ul>
-
-</body>
-</html>
diff --git a/doc/classref/khtml/DOM.AbstractView.html b/doc/classref/tdehtml/DOM.AbstractView.html
index 72349b8..13e338e 100644
--- a/doc/classref/khtml/DOM.AbstractView.html
+++ b/doc/classref/tdehtml/DOM.AbstractView.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.AbstractView</td>
diff --git a/doc/classref/khtml/DOM.Attr.html b/doc/classref/tdehtml/DOM.Attr.html
index 631082d..e300dc4 100644
--- a/doc/classref/khtml/DOM.Attr.html
+++ b/doc/classref/tdehtml/DOM.Attr.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.Attr</td>
diff --git a/doc/classref/khtml/DOM.CDATASection.html b/doc/classref/tdehtml/DOM.CDATASection.html
index d2519ca..e9d7a57 100644
--- a/doc/classref/khtml/DOM.CDATASection.html
+++ b/doc/classref/tdehtml/DOM.CDATASection.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.CDATASection</td>
diff --git a/doc/classref/khtml/DOM.CSSCharsetRule.html b/doc/classref/tdehtml/DOM.CSSCharsetRule.html
index 34e716a..f429d07 100644
--- a/doc/classref/khtml/DOM.CSSCharsetRule.html
+++ b/doc/classref/tdehtml/DOM.CSSCharsetRule.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.CSSCharsetRule</td>
diff --git a/doc/classref/khtml/DOM.CSSException.html b/doc/classref/tdehtml/DOM.CSSException.html
index dac4e99..55a084e 100644
--- a/doc/classref/khtml/DOM.CSSException.html
+++ b/doc/classref/tdehtml/DOM.CSSException.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.CSSException</td>
diff --git a/doc/classref/khtml/DOM.CSSFontFaceRule.html b/doc/classref/tdehtml/DOM.CSSFontFaceRule.html
index 3059e87..15e5a9a 100644
--- a/doc/classref/khtml/DOM.CSSFontFaceRule.html
+++ b/doc/classref/tdehtml/DOM.CSSFontFaceRule.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.CSSFontFaceRule</td>
diff --git a/doc/classref/khtml/DOM.CSSImportRule.html b/doc/classref/tdehtml/DOM.CSSImportRule.html
index 15245c4..79656e0 100644
--- a/doc/classref/khtml/DOM.CSSImportRule.html
+++ b/doc/classref/tdehtml/DOM.CSSImportRule.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.CSSImportRule</td>
diff --git a/doc/classref/khtml/DOM.CSSMediaRule.html b/doc/classref/tdehtml/DOM.CSSMediaRule.html
index f7733aa..eb6fb23 100644
--- a/doc/classref/khtml/DOM.CSSMediaRule.html
+++ b/doc/classref/tdehtml/DOM.CSSMediaRule.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.CSSMediaRule</td>
diff --git a/doc/classref/khtml/DOM.CSSPageRule.html b/doc/classref/tdehtml/DOM.CSSPageRule.html
index 5634a75..2b8dfbb 100644
--- a/doc/classref/khtml/DOM.CSSPageRule.html
+++ b/doc/classref/tdehtml/DOM.CSSPageRule.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.CSSPageRule</td>
diff --git a/doc/classref/khtml/DOM.CSSPrimitiveValue.html b/doc/classref/tdehtml/DOM.CSSPrimitiveValue.html
index 78a4f70..3ed8975 100644
--- a/doc/classref/khtml/DOM.CSSPrimitiveValue.html
+++ b/doc/classref/tdehtml/DOM.CSSPrimitiveValue.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.CSSPrimitiveValue</td>
diff --git a/doc/classref/khtml/DOM.CSSRule.html b/doc/classref/tdehtml/DOM.CSSRule.html
index 4e89126..7f90549 100644
--- a/doc/classref/khtml/DOM.CSSRule.html
+++ b/doc/classref/tdehtml/DOM.CSSRule.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.CSSRule</td>
diff --git a/doc/classref/khtml/DOM.CSSRuleList.html b/doc/classref/tdehtml/DOM.CSSRuleList.html
index 1a0f852..0677da5 100644
--- a/doc/classref/khtml/DOM.CSSRuleList.html
+++ b/doc/classref/tdehtml/DOM.CSSRuleList.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.CSSRuleList</td>
diff --git a/doc/classref/khtml/DOM.CSSStyleDeclaration.html b/doc/classref/tdehtml/DOM.CSSStyleDeclaration.html
index 763ec61..2b826fa 100644
--- a/doc/classref/khtml/DOM.CSSStyleDeclaration.html
+++ b/doc/classref/tdehtml/DOM.CSSStyleDeclaration.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.CSSStyleDeclaration</td>
diff --git a/doc/classref/khtml/DOM.CSSStyleRule.html b/doc/classref/tdehtml/DOM.CSSStyleRule.html
index 823498d..86ae0af 100644
--- a/doc/classref/khtml/DOM.CSSStyleRule.html
+++ b/doc/classref/tdehtml/DOM.CSSStyleRule.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.CSSStyleRule</td>
diff --git a/doc/classref/khtml/DOM.CSSStyleSheet.html b/doc/classref/tdehtml/DOM.CSSStyleSheet.html
index 83b4b8b..ec2b3bd 100644
--- a/doc/classref/khtml/DOM.CSSStyleSheet.html
+++ b/doc/classref/tdehtml/DOM.CSSStyleSheet.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.CSSStyleSheet</td>
diff --git a/doc/classref/khtml/DOM.CSSUnknownRule.html b/doc/classref/tdehtml/DOM.CSSUnknownRule.html
index 963db0e..a6d9db4 100644
--- a/doc/classref/khtml/DOM.CSSUnknownRule.html
+++ b/doc/classref/tdehtml/DOM.CSSUnknownRule.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.CSSUnknownRule</td>
diff --git a/doc/classref/khtml/DOM.CSSValue.html b/doc/classref/tdehtml/DOM.CSSValue.html
index b8bbec4..fcb7d54 100644
--- a/doc/classref/khtml/DOM.CSSValue.html
+++ b/doc/classref/tdehtml/DOM.CSSValue.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.CSSValue</td>
diff --git a/doc/classref/khtml/DOM.CSSValueList.html b/doc/classref/tdehtml/DOM.CSSValueList.html
index 0b3e226..01a3c56 100644
--- a/doc/classref/khtml/DOM.CSSValueList.html
+++ b/doc/classref/tdehtml/DOM.CSSValueList.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.CSSValueList</td>
diff --git a/doc/classref/khtml/DOM.CharacterData.html b/doc/classref/tdehtml/DOM.CharacterData.html
index 26e7951..601be8d 100644
--- a/doc/classref/khtml/DOM.CharacterData.html
+++ b/doc/classref/tdehtml/DOM.CharacterData.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.CharacterData</td>
diff --git a/doc/classref/khtml/DOM.Comment.html b/doc/classref/tdehtml/DOM.Comment.html
index 526f868..89eb7f7 100644
--- a/doc/classref/khtml/DOM.Comment.html
+++ b/doc/classref/tdehtml/DOM.Comment.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.Comment</td>
diff --git a/doc/classref/khtml/DOM.Counter.html b/doc/classref/tdehtml/DOM.Counter.html
index 1bc741c..6b2c254 100644
--- a/doc/classref/khtml/DOM.Counter.html
+++ b/doc/classref/tdehtml/DOM.Counter.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.Counter</td>
diff --git a/doc/classref/khtml/DOM.CustomNodeFilter.html b/doc/classref/tdehtml/DOM.CustomNodeFilter.html
index e48c617..7312c43 100644
--- a/doc/classref/khtml/DOM.CustomNodeFilter.html
+++ b/doc/classref/tdehtml/DOM.CustomNodeFilter.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.CustomNodeFilter</td>
diff --git a/doc/classref/khtml/DOM.DOMException.html b/doc/classref/tdehtml/DOM.DOMException.html
index cb254cb..b3db40e 100644
--- a/doc/classref/khtml/DOM.DOMException.html
+++ b/doc/classref/tdehtml/DOM.DOMException.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.DOMException</td>
diff --git a/doc/classref/khtml/DOM.DOMImplementation.html b/doc/classref/tdehtml/DOM.DOMImplementation.html
index 1ddd503..f4bfa84 100644
--- a/doc/classref/khtml/DOM.DOMImplementation.html
+++ b/doc/classref/tdehtml/DOM.DOMImplementation.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.DOMImplementation</td>
diff --git a/doc/classref/khtml/DOM.DOMString.html b/doc/classref/tdehtml/DOM.DOMString.html
index d252212..3eaf645 100644
--- a/doc/classref/khtml/DOM.DOMString.html
+++ b/doc/classref/tdehtml/DOM.DOMString.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.DOMString</td>
diff --git a/doc/classref/khtml/DOM.Document.html b/doc/classref/tdehtml/DOM.Document.html
index dd12a98..bfa3049 100644
--- a/doc/classref/khtml/DOM.Document.html
+++ b/doc/classref/tdehtml/DOM.Document.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.Document</td>
diff --git a/doc/classref/khtml/DOM.DocumentFragment.html b/doc/classref/tdehtml/DOM.DocumentFragment.html
index d35a07a..559412d 100644
--- a/doc/classref/khtml/DOM.DocumentFragment.html
+++ b/doc/classref/tdehtml/DOM.DocumentFragment.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.DocumentFragment</td>
diff --git a/doc/classref/khtml/DOM.DocumentStyle.html b/doc/classref/tdehtml/DOM.DocumentStyle.html
index 1b2df6e..7d63ef5 100644
--- a/doc/classref/khtml/DOM.DocumentStyle.html
+++ b/doc/classref/tdehtml/DOM.DocumentStyle.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.DocumentStyle</td>
diff --git a/doc/classref/khtml/DOM.DocumentType.html b/doc/classref/tdehtml/DOM.DocumentType.html
index 3c7911e..c29aeaa 100644
--- a/doc/classref/khtml/DOM.DocumentType.html
+++ b/doc/classref/tdehtml/DOM.DocumentType.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.DocumentType</td>
diff --git a/doc/classref/khtml/DOM.DomShared.html b/doc/classref/tdehtml/DOM.DomShared.html
index 885a8ac..87ed8c4 100644
--- a/doc/classref/khtml/DOM.DomShared.html
+++ b/doc/classref/tdehtml/DOM.DomShared.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.DomShared</td>
diff --git a/doc/classref/khtml/DOM.Element.html b/doc/classref/tdehtml/DOM.Element.html
index c7fd5be..e4d306f 100644
--- a/doc/classref/khtml/DOM.Element.html
+++ b/doc/classref/tdehtml/DOM.Element.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.Element</td>
@@ -116,35 +116,35 @@
 <li><b>isHTMLElement</b> ()
 <table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(bool)</i></td></tr>
 </table></td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
-<li><b>khtmlMalformedPrefix</b> (name)
+<li><b>tdehtmlMalformedPrefix</b> (name)
 <table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(bool)</i></td></tr>
 <tr><td><i>static</i></td></tr>
 </table><table><tr  bgcolor="#fff0ff"><th>Argument</th><th>Type</th><th>Default</th></tr>
 <tr><td>name</td><td>DOM.DOMString</td><td></td></tr>
 </table>
 </td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
-<li><b>khtmlMalformedQualifiedName</b> (name)
+<li><b>tdehtmlMalformedQualifiedName</b> (name)
 <table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(bool)</i></td></tr>
 <tr><td><i>static</i></td></tr>
 </table><table><tr  bgcolor="#fff0ff"><th>Argument</th><th>Type</th><th>Default</th></tr>
 <tr><td>name</td><td>DOM.DOMString</td><td></td></tr>
 </table>
 </td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
-<li><b>khtmlValidAttrName</b> (name)
+<li><b>tdehtmlValidAttrName</b> (name)
 <table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(bool)</i></td></tr>
 <tr><td><i>static</i></td></tr>
 </table><table><tr  bgcolor="#fff0ff"><th>Argument</th><th>Type</th><th>Default</th></tr>
 <tr><td>name</td><td>DOM.DOMString</td><td></td></tr>
 </table>
 </td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
-<li><b>khtmlValidPrefix</b> (name)
+<li><b>tdehtmlValidPrefix</b> (name)
 <table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(bool)</i></td></tr>
 <tr><td><i>static</i></td></tr>
 </table><table><tr  bgcolor="#fff0ff"><th>Argument</th><th>Type</th><th>Default</th></tr>
 <tr><td>name</td><td>DOM.DOMString</td><td></td></tr>
 </table>
 </td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
-<li><b>khtmlValidQualifiedName</b> (name)
+<li><b>tdehtmlValidQualifiedName</b> (name)
 <table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(bool)</i></td></tr>
 <tr><td><i>static</i></td></tr>
 </table><table><tr  bgcolor="#fff0ff"><th>Argument</th><th>Type</th><th>Default</th></tr>
diff --git a/doc/classref/khtml/DOM.Entity.html b/doc/classref/tdehtml/DOM.Entity.html
index c264e3c..d4ad0b0 100644
--- a/doc/classref/khtml/DOM.Entity.html
+++ b/doc/classref/tdehtml/DOM.Entity.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.Entity</td>
diff --git a/doc/classref/khtml/DOM.EntityReference.html b/doc/classref/tdehtml/DOM.EntityReference.html
index de2a1d7..9606cd2 100644
--- a/doc/classref/khtml/DOM.EntityReference.html
+++ b/doc/classref/tdehtml/DOM.EntityReference.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.EntityReference</td>
diff --git a/doc/classref/khtml/DOM.Event.html b/doc/classref/tdehtml/DOM.Event.html
index 1dd15f6..84f9f1e 100644
--- a/doc/classref/khtml/DOM.Event.html
+++ b/doc/classref/tdehtml/DOM.Event.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.Event</td>
diff --git a/doc/classref/khtml/DOM.EventException.html b/doc/classref/tdehtml/DOM.EventException.html
index de6744a..b0ee837 100644
--- a/doc/classref/khtml/DOM.EventException.html
+++ b/doc/classref/tdehtml/DOM.EventException.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.EventException</td>
diff --git a/doc/classref/khtml/DOM.EventListener.html b/doc/classref/tdehtml/DOM.EventListener.html
index 54257ce..cd94f31 100644
--- a/doc/classref/khtml/DOM.EventListener.html
+++ b/doc/classref/tdehtml/DOM.EventListener.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.EventListener</td>
diff --git a/doc/classref/khtml/DOM.HTMLAnchorElement.html b/doc/classref/tdehtml/DOM.HTMLAnchorElement.html
index 7ecfb86..f6e4d77 100644
--- a/doc/classref/khtml/DOM.HTMLAnchorElement.html
+++ b/doc/classref/tdehtml/DOM.HTMLAnchorElement.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.HTMLAnchorElement</td>
diff --git a/doc/classref/khtml/DOM.HTMLAppletElement.html b/doc/classref/tdehtml/DOM.HTMLAppletElement.html
index b217715..9b57b7d 100644
--- a/doc/classref/khtml/DOM.HTMLAppletElement.html
+++ b/doc/classref/tdehtml/DOM.HTMLAppletElement.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.HTMLAppletElement</td>
diff --git a/doc/classref/khtml/DOM.HTMLAreaElement.html b/doc/classref/tdehtml/DOM.HTMLAreaElement.html
index 9f7b5db..c1c0571 100644
--- a/doc/classref/khtml/DOM.HTMLAreaElement.html
+++ b/doc/classref/tdehtml/DOM.HTMLAreaElement.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.HTMLAreaElement</td>
diff --git a/doc/classref/khtml/DOM.HTMLBRElement.html b/doc/classref/tdehtml/DOM.HTMLBRElement.html
index 18b9b13..50fffaf 100644
--- a/doc/classref/khtml/DOM.HTMLBRElement.html
+++ b/doc/classref/tdehtml/DOM.HTMLBRElement.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.HTMLBRElement</td>
diff --git a/doc/classref/khtml/DOM.HTMLBaseElement.html b/doc/classref/tdehtml/DOM.HTMLBaseElement.html
index 60ca3e9..8db1bc0 100644
--- a/doc/classref/khtml/DOM.HTMLBaseElement.html
+++ b/doc/classref/tdehtml/DOM.HTMLBaseElement.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.HTMLBaseElement</td>
diff --git a/doc/classref/khtml/DOM.HTMLBaseFontElement.html b/doc/classref/tdehtml/DOM.HTMLBaseFontElement.html
index 3218d92..8feff10 100644
--- a/doc/classref/khtml/DOM.HTMLBaseFontElement.html
+++ b/doc/classref/tdehtml/DOM.HTMLBaseFontElement.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.HTMLBaseFontElement</td>
diff --git a/doc/classref/khtml/DOM.HTMLBlockquoteElement.html b/doc/classref/tdehtml/DOM.HTMLBlockquoteElement.html
index a34399d..2a2868c 100644
--- a/doc/classref/khtml/DOM.HTMLBlockquoteElement.html
+++ b/doc/classref/tdehtml/DOM.HTMLBlockquoteElement.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.HTMLBlockquoteElement</td>
diff --git a/doc/classref/khtml/DOM.HTMLBodyElement.html b/doc/classref/tdehtml/DOM.HTMLBodyElement.html
index 30686b4..88014e3 100644
--- a/doc/classref/khtml/DOM.HTMLBodyElement.html
+++ b/doc/classref/tdehtml/DOM.HTMLBodyElement.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.HTMLBodyElement</td>
diff --git a/doc/classref/khtml/DOM.HTMLButtonElement.html b/doc/classref/tdehtml/DOM.HTMLButtonElement.html
index 5b3d372..63945a0 100644
--- a/doc/classref/khtml/DOM.HTMLButtonElement.html
+++ b/doc/classref/tdehtml/DOM.HTMLButtonElement.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.HTMLButtonElement</td>
diff --git a/doc/classref/khtml/DOM.HTMLCollection.html b/doc/classref/tdehtml/DOM.HTMLCollection.html
index 475cb69..3dbf376 100644
--- a/doc/classref/khtml/DOM.HTMLCollection.html
+++ b/doc/classref/tdehtml/DOM.HTMLCollection.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.HTMLCollection</td>
diff --git a/doc/classref/khtml/DOM.HTMLDListElement.html b/doc/classref/tdehtml/DOM.HTMLDListElement.html
index ab14426..772601b 100644
--- a/doc/classref/khtml/DOM.HTMLDListElement.html
+++ b/doc/classref/tdehtml/DOM.HTMLDListElement.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.HTMLDListElement</td>
diff --git a/doc/classref/khtml/DOM.HTMLDirectoryElement.html b/doc/classref/tdehtml/DOM.HTMLDirectoryElement.html
index 1e5825f..a5bed3d 100644
--- a/doc/classref/khtml/DOM.HTMLDirectoryElement.html
+++ b/doc/classref/tdehtml/DOM.HTMLDirectoryElement.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.HTMLDirectoryElement</td>
diff --git a/doc/classref/khtml/DOM.HTMLDivElement.html b/doc/classref/tdehtml/DOM.HTMLDivElement.html
index 7b2cdcc..3d1079c 100644
--- a/doc/classref/khtml/DOM.HTMLDivElement.html
+++ b/doc/classref/tdehtml/DOM.HTMLDivElement.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.HTMLDivElement</td>
diff --git a/doc/classref/khtml/DOM.HTMLDocument.html b/doc/classref/tdehtml/DOM.HTMLDocument.html
index ae8d21b..f5d28f4 100644
--- a/doc/classref/khtml/DOM.HTMLDocument.html
+++ b/doc/classref/tdehtml/DOM.HTMLDocument.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.HTMLDocument</td>
diff --git a/doc/classref/khtml/DOM.HTMLElement.html b/doc/classref/tdehtml/DOM.HTMLElement.html
index 07cf854..b8abff6 100644
--- a/doc/classref/khtml/DOM.HTMLElement.html
+++ b/doc/classref/tdehtml/DOM.HTMLElement.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.HTMLElement</td>
diff --git a/doc/classref/khtml/DOM.HTMLFieldSetElement.html b/doc/classref/tdehtml/DOM.HTMLFieldSetElement.html
index 86d49c4..8fffcf3 100644
--- a/doc/classref/khtml/DOM.HTMLFieldSetElement.html
+++ b/doc/classref/tdehtml/DOM.HTMLFieldSetElement.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.HTMLFieldSetElement</td>
diff --git a/doc/classref/khtml/DOM.HTMLFontElement.html b/doc/classref/tdehtml/DOM.HTMLFontElement.html
index 8b793e7..2cab36e 100644
--- a/doc/classref/khtml/DOM.HTMLFontElement.html
+++ b/doc/classref/tdehtml/DOM.HTMLFontElement.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.HTMLFontElement</td>
diff --git a/doc/classref/khtml/DOM.HTMLFormElement.html b/doc/classref/tdehtml/DOM.HTMLFormElement.html
index 04215c4..e98cc63 100644
--- a/doc/classref/khtml/DOM.HTMLFormElement.html
+++ b/doc/classref/tdehtml/DOM.HTMLFormElement.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.HTMLFormElement</td>
diff --git a/doc/classref/khtml/DOM.HTMLFrameElement.html b/doc/classref/tdehtml/DOM.HTMLFrameElement.html
index 2e53b4f..8ee19cf 100644
--- a/doc/classref/khtml/DOM.HTMLFrameElement.html
+++ b/doc/classref/tdehtml/DOM.HTMLFrameElement.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.HTMLFrameElement</td>
diff --git a/doc/classref/khtml/DOM.HTMLFrameSetElement.html b/doc/classref/tdehtml/DOM.HTMLFrameSetElement.html
index e88fb21..cdec1af 100644
--- a/doc/classref/khtml/DOM.HTMLFrameSetElement.html
+++ b/doc/classref/tdehtml/DOM.HTMLFrameSetElement.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.HTMLFrameSetElement</td>
diff --git a/doc/classref/khtml/DOM.HTMLHRElement.html b/doc/classref/tdehtml/DOM.HTMLHRElement.html
index abef8ca..5fe2cc6 100644
--- a/doc/classref/khtml/DOM.HTMLHRElement.html
+++ b/doc/classref/tdehtml/DOM.HTMLHRElement.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.HTMLHRElement</td>
diff --git a/doc/classref/khtml/DOM.HTMLHeadElement.html b/doc/classref/tdehtml/DOM.HTMLHeadElement.html
index fe32927..c7fdace 100644
--- a/doc/classref/khtml/DOM.HTMLHeadElement.html
+++ b/doc/classref/tdehtml/DOM.HTMLHeadElement.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.HTMLHeadElement</td>
diff --git a/doc/classref/khtml/DOM.HTMLHeadingElement.html b/doc/classref/tdehtml/DOM.HTMLHeadingElement.html
index 0d4f824..f4b61e6 100644
--- a/doc/classref/khtml/DOM.HTMLHeadingElement.html
+++ b/doc/classref/tdehtml/DOM.HTMLHeadingElement.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.HTMLHeadingElement</td>
diff --git a/doc/classref/khtml/DOM.HTMLHtmlElement.html b/doc/classref/tdehtml/DOM.HTMLHtmlElement.html
index 66ff63e..19f0c13 100644
--- a/doc/classref/khtml/DOM.HTMLHtmlElement.html
+++ b/doc/classref/tdehtml/DOM.HTMLHtmlElement.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.HTMLHtmlElement</td>
diff --git a/doc/classref/khtml/DOM.HTMLIFrameElement.html b/doc/classref/tdehtml/DOM.HTMLIFrameElement.html
index 3d22a8a..6f1a90e 100644
--- a/doc/classref/khtml/DOM.HTMLIFrameElement.html
+++ b/doc/classref/tdehtml/DOM.HTMLIFrameElement.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.HTMLIFrameElement</td>
diff --git a/doc/classref/khtml/DOM.HTMLImageElement.html b/doc/classref/tdehtml/DOM.HTMLImageElement.html
index ed00f02..d2cf572 100644
--- a/doc/classref/khtml/DOM.HTMLImageElement.html
+++ b/doc/classref/tdehtml/DOM.HTMLImageElement.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.HTMLImageElement</td>
diff --git a/doc/classref/khtml/DOM.HTMLInputElement.html b/doc/classref/tdehtml/DOM.HTMLInputElement.html
index 5dfa038..665211b 100644
--- a/doc/classref/khtml/DOM.HTMLInputElement.html
+++ b/doc/classref/tdehtml/DOM.HTMLInputElement.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.HTMLInputElement</td>
diff --git a/doc/classref/khtml/DOM.HTMLIsIndexElement.html b/doc/classref/tdehtml/DOM.HTMLIsIndexElement.html
index 24ba7a6..d9720f4 100644
--- a/doc/classref/khtml/DOM.HTMLIsIndexElement.html
+++ b/doc/classref/tdehtml/DOM.HTMLIsIndexElement.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.HTMLIsIndexElement</td>
diff --git a/doc/classref/khtml/DOM.HTMLLIElement.html b/doc/classref/tdehtml/DOM.HTMLLIElement.html
index aa868ad..20e10d1 100644
--- a/doc/classref/khtml/DOM.HTMLLIElement.html
+++ b/doc/classref/tdehtml/DOM.HTMLLIElement.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.HTMLLIElement</td>
diff --git a/doc/classref/khtml/DOM.HTMLLabelElement.html b/doc/classref/tdehtml/DOM.HTMLLabelElement.html
index 9e89da4..f113ecc 100644
--- a/doc/classref/khtml/DOM.HTMLLabelElement.html
+++ b/doc/classref/tdehtml/DOM.HTMLLabelElement.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.HTMLLabelElement</td>
diff --git a/doc/classref/khtml/DOM.HTMLLayerElement.html b/doc/classref/tdehtml/DOM.HTMLLayerElement.html
index 71c0a9f..e7738fe 100644
--- a/doc/classref/khtml/DOM.HTMLLayerElement.html
+++ b/doc/classref/tdehtml/DOM.HTMLLayerElement.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.HTMLLayerElement</td>
diff --git a/doc/classref/khtml/DOM.HTMLLegendElement.html b/doc/classref/tdehtml/DOM.HTMLLegendElement.html
index d1fc749..876a3e0 100644
--- a/doc/classref/khtml/DOM.HTMLLegendElement.html
+++ b/doc/classref/tdehtml/DOM.HTMLLegendElement.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.HTMLLegendElement</td>
diff --git a/doc/classref/khtml/DOM.HTMLLinkElement.html b/doc/classref/tdehtml/DOM.HTMLLinkElement.html
index 9facd14..6020c04 100644
--- a/doc/classref/khtml/DOM.HTMLLinkElement.html
+++ b/doc/classref/tdehtml/DOM.HTMLLinkElement.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.HTMLLinkElement</td>
diff --git a/doc/classref/khtml/DOM.HTMLMapElement.html b/doc/classref/tdehtml/DOM.HTMLMapElement.html
index 4abbb14..fc2ff0b 100644
--- a/doc/classref/khtml/DOM.HTMLMapElement.html
+++ b/doc/classref/tdehtml/DOM.HTMLMapElement.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.HTMLMapElement</td>
diff --git a/doc/classref/khtml/DOM.HTMLMenuElement.html b/doc/classref/tdehtml/DOM.HTMLMenuElement.html
index 5df6303..56bb352 100644
--- a/doc/classref/khtml/DOM.HTMLMenuElement.html
+++ b/doc/classref/tdehtml/DOM.HTMLMenuElement.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.HTMLMenuElement</td>
diff --git a/doc/classref/khtml/DOM.HTMLMetaElement.html b/doc/classref/tdehtml/DOM.HTMLMetaElement.html
index e20d07f..f5e7db1 100644
--- a/doc/classref/khtml/DOM.HTMLMetaElement.html
+++ b/doc/classref/tdehtml/DOM.HTMLMetaElement.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.HTMLMetaElement</td>
diff --git a/doc/classref/khtml/DOM.HTMLModElement.html b/doc/classref/tdehtml/DOM.HTMLModElement.html
index 5240472..a32e7fc 100644
--- a/doc/classref/khtml/DOM.HTMLModElement.html
+++ b/doc/classref/tdehtml/DOM.HTMLModElement.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.HTMLModElement</td>
diff --git a/doc/classref/khtml/DOM.HTMLOListElement.html b/doc/classref/tdehtml/DOM.HTMLOListElement.html
index b71ed54..5c064ad 100644
--- a/doc/classref/khtml/DOM.HTMLOListElement.html
+++ b/doc/classref/tdehtml/DOM.HTMLOListElement.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.HTMLOListElement</td>
diff --git a/doc/classref/khtml/DOM.HTMLObjectElement.html b/doc/classref/tdehtml/DOM.HTMLObjectElement.html
index 8c868c2..9c993ce 100644
--- a/doc/classref/khtml/DOM.HTMLObjectElement.html
+++ b/doc/classref/tdehtml/DOM.HTMLObjectElement.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.HTMLObjectElement</td>
diff --git a/doc/classref/khtml/DOM.HTMLOptGroupElement.html b/doc/classref/tdehtml/DOM.HTMLOptGroupElement.html
index 82de37f..a58a5bd 100644
--- a/doc/classref/khtml/DOM.HTMLOptGroupElement.html
+++ b/doc/classref/tdehtml/DOM.HTMLOptGroupElement.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.HTMLOptGroupElement</td>
diff --git a/doc/classref/khtml/DOM.HTMLOptionElement.html b/doc/classref/tdehtml/DOM.HTMLOptionElement.html
index 4da1c41..637805d 100644
--- a/doc/classref/khtml/DOM.HTMLOptionElement.html
+++ b/doc/classref/tdehtml/DOM.HTMLOptionElement.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.HTMLOptionElement</td>
diff --git a/doc/classref/khtml/DOM.HTMLParagraphElement.html b/doc/classref/tdehtml/DOM.HTMLParagraphElement.html
index 8cd2b7f..397b589 100644
--- a/doc/classref/khtml/DOM.HTMLParagraphElement.html
+++ b/doc/classref/tdehtml/DOM.HTMLParagraphElement.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.HTMLParagraphElement</td>
diff --git a/doc/classref/khtml/DOM.HTMLParamElement.html b/doc/classref/tdehtml/DOM.HTMLParamElement.html
index 1b06ca0..bbcce1e 100644
--- a/doc/classref/khtml/DOM.HTMLParamElement.html
+++ b/doc/classref/tdehtml/DOM.HTMLParamElement.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.HTMLParamElement</td>
diff --git a/doc/classref/khtml/DOM.HTMLPreElement.html b/doc/classref/tdehtml/DOM.HTMLPreElement.html
index 0bd3a4f..7a74f37 100644
--- a/doc/classref/khtml/DOM.HTMLPreElement.html
+++ b/doc/classref/tdehtml/DOM.HTMLPreElement.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.HTMLPreElement</td>
diff --git a/doc/classref/khtml/DOM.HTMLQuoteElement.html b/doc/classref/tdehtml/DOM.HTMLQuoteElement.html
index 478c13d..a2acd95 100644
--- a/doc/classref/khtml/DOM.HTMLQuoteElement.html
+++ b/doc/classref/tdehtml/DOM.HTMLQuoteElement.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.HTMLQuoteElement</td>
diff --git a/doc/classref/khtml/DOM.HTMLScriptElement.html b/doc/classref/tdehtml/DOM.HTMLScriptElement.html
index 82b2e08..038f978 100644
--- a/doc/classref/khtml/DOM.HTMLScriptElement.html
+++ b/doc/classref/tdehtml/DOM.HTMLScriptElement.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.HTMLScriptElement</td>
diff --git a/doc/classref/khtml/DOM.HTMLSelectElement.html b/doc/classref/tdehtml/DOM.HTMLSelectElement.html
index e6492bf..b1f9a07 100644
--- a/doc/classref/khtml/DOM.HTMLSelectElement.html
+++ b/doc/classref/tdehtml/DOM.HTMLSelectElement.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.HTMLSelectElement</td>
diff --git a/doc/classref/khtml/DOM.HTMLStyleElement.html b/doc/classref/tdehtml/DOM.HTMLStyleElement.html
index 778ded7..3418b30 100644
--- a/doc/classref/khtml/DOM.HTMLStyleElement.html
+++ b/doc/classref/tdehtml/DOM.HTMLStyleElement.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.HTMLStyleElement</td>
diff --git a/doc/classref/khtml/DOM.HTMLTableCaptionElement.html b/doc/classref/tdehtml/DOM.HTMLTableCaptionElement.html
index 66c0cf2..494f44a 100644
--- a/doc/classref/khtml/DOM.HTMLTableCaptionElement.html
+++ b/doc/classref/tdehtml/DOM.HTMLTableCaptionElement.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.HTMLTableCaptionElement</td>
diff --git a/doc/classref/khtml/DOM.HTMLTableCellElement.html b/doc/classref/tdehtml/DOM.HTMLTableCellElement.html
index 0a67afe..cad2341 100644
--- a/doc/classref/khtml/DOM.HTMLTableCellElement.html
+++ b/doc/classref/tdehtml/DOM.HTMLTableCellElement.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.HTMLTableCellElement</td>
diff --git a/doc/classref/khtml/DOM.HTMLTableColElement.html b/doc/classref/tdehtml/DOM.HTMLTableColElement.html
index e8476ff..96e964c 100644
--- a/doc/classref/khtml/DOM.HTMLTableColElement.html
+++ b/doc/classref/tdehtml/DOM.HTMLTableColElement.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.HTMLTableColElement</td>
diff --git a/doc/classref/khtml/DOM.HTMLTableElement.html b/doc/classref/tdehtml/DOM.HTMLTableElement.html
index aab07f0..735e0e5 100644
--- a/doc/classref/khtml/DOM.HTMLTableElement.html
+++ b/doc/classref/tdehtml/DOM.HTMLTableElement.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.HTMLTableElement</td>
diff --git a/doc/classref/khtml/DOM.HTMLTableRowElement.html b/doc/classref/tdehtml/DOM.HTMLTableRowElement.html
index 2383f76..63fa1dc 100644
--- a/doc/classref/khtml/DOM.HTMLTableRowElement.html
+++ b/doc/classref/tdehtml/DOM.HTMLTableRowElement.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.HTMLTableRowElement</td>
diff --git a/doc/classref/khtml/DOM.HTMLTableSectionElement.html b/doc/classref/tdehtml/DOM.HTMLTableSectionElement.html
index d21647a..67a10f0 100644
--- a/doc/classref/khtml/DOM.HTMLTableSectionElement.html
+++ b/doc/classref/tdehtml/DOM.HTMLTableSectionElement.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.HTMLTableSectionElement</td>
diff --git a/doc/classref/khtml/DOM.HTMLTextAreaElement.html b/doc/classref/tdehtml/DOM.HTMLTextAreaElement.html
index ba158ad..1107cb8 100644
--- a/doc/classref/khtml/DOM.HTMLTextAreaElement.html
+++ b/doc/classref/tdehtml/DOM.HTMLTextAreaElement.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.HTMLTextAreaElement</td>
diff --git a/doc/classref/khtml/DOM.HTMLTitleElement.html b/doc/classref/tdehtml/DOM.HTMLTitleElement.html
index 1a08e65..3104c68 100644
--- a/doc/classref/khtml/DOM.HTMLTitleElement.html
+++ b/doc/classref/tdehtml/DOM.HTMLTitleElement.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.HTMLTitleElement</td>
diff --git a/doc/classref/khtml/DOM.HTMLUListElement.html b/doc/classref/tdehtml/DOM.HTMLUListElement.html
index 21e71d4..ed211b8 100644
--- a/doc/classref/khtml/DOM.HTMLUListElement.html
+++ b/doc/classref/tdehtml/DOM.HTMLUListElement.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.HTMLUListElement</td>
diff --git a/doc/classref/khtml/DOM.LinkStyle.html b/doc/classref/tdehtml/DOM.LinkStyle.html
index db3004e..54b55d5 100644
--- a/doc/classref/khtml/DOM.LinkStyle.html
+++ b/doc/classref/tdehtml/DOM.LinkStyle.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.LinkStyle</td>
diff --git a/doc/classref/khtml/DOM.MediaList.html b/doc/classref/tdehtml/DOM.MediaList.html
index 4fe4224..575d347 100644
--- a/doc/classref/khtml/DOM.MediaList.html
+++ b/doc/classref/tdehtml/DOM.MediaList.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.MediaList</td>
diff --git a/doc/classref/khtml/DOM.MouseEvent.html b/doc/classref/tdehtml/DOM.MouseEvent.html
index 5341488..77afaef 100644
--- a/doc/classref/khtml/DOM.MouseEvent.html
+++ b/doc/classref/tdehtml/DOM.MouseEvent.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.MouseEvent</td>
diff --git a/doc/classref/khtml/DOM.MutationEvent.html b/doc/classref/tdehtml/DOM.MutationEvent.html
index 9d5b60d..6a338f9 100644
--- a/doc/classref/khtml/DOM.MutationEvent.html
+++ b/doc/classref/tdehtml/DOM.MutationEvent.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.MutationEvent</td>
diff --git a/doc/classref/khtml/DOM.NamedNodeMap.html b/doc/classref/tdehtml/DOM.NamedNodeMap.html
index 6f377c9..9ea899f 100644
--- a/doc/classref/khtml/DOM.NamedNodeMap.html
+++ b/doc/classref/tdehtml/DOM.NamedNodeMap.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.NamedNodeMap</td>
diff --git a/doc/classref/khtml/DOM.Node.html b/doc/classref/tdehtml/DOM.Node.html
index fcca583..c3742bc 100644
--- a/doc/classref/khtml/DOM.Node.html
+++ b/doc/classref/tdehtml/DOM.Node.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.Node</td>
diff --git a/doc/classref/khtml/DOM.NodeFilter.html b/doc/classref/tdehtml/DOM.NodeFilter.html
index 8eed4a1..55d9884 100644
--- a/doc/classref/khtml/DOM.NodeFilter.html
+++ b/doc/classref/tdehtml/DOM.NodeFilter.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.NodeFilter</td>
diff --git a/doc/classref/khtml/DOM.NodeIterator.html b/doc/classref/tdehtml/DOM.NodeIterator.html
index 10c7c51..3c7387b 100644
--- a/doc/classref/khtml/DOM.NodeIterator.html
+++ b/doc/classref/tdehtml/DOM.NodeIterator.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.NodeIterator</td>
diff --git a/doc/classref/khtml/DOM.NodeList.html b/doc/classref/tdehtml/DOM.NodeList.html
index 3b089c8..10a00db 100644
--- a/doc/classref/khtml/DOM.NodeList.html
+++ b/doc/classref/tdehtml/DOM.NodeList.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.NodeList</td>
diff --git a/doc/classref/khtml/DOM.Notation.html b/doc/classref/tdehtml/DOM.Notation.html
index 6e333af..258de76 100644
--- a/doc/classref/khtml/DOM.Notation.html
+++ b/doc/classref/tdehtml/DOM.Notation.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.Notation</td>
diff --git a/doc/classref/khtml/DOM.ProcessingInstruction.html b/doc/classref/tdehtml/DOM.ProcessingInstruction.html
index 1ae2ff7..402803e 100644
--- a/doc/classref/khtml/DOM.ProcessingInstruction.html
+++ b/doc/classref/tdehtml/DOM.ProcessingInstruction.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.ProcessingInstruction</td>
diff --git a/doc/classref/khtml/DOM.RGBColor.html b/doc/classref/tdehtml/DOM.RGBColor.html
index d7963c4..87d0ab6 100644
--- a/doc/classref/khtml/DOM.RGBColor.html
+++ b/doc/classref/tdehtml/DOM.RGBColor.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.RGBColor</td>
diff --git a/doc/classref/khtml/DOM.Range.html b/doc/classref/tdehtml/DOM.Range.html
index 56d53f4..334c391 100644
--- a/doc/classref/khtml/DOM.Range.html
+++ b/doc/classref/tdehtml/DOM.Range.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.Range</td>
diff --git a/doc/classref/khtml/DOM.RangeException.html b/doc/classref/tdehtml/DOM.RangeException.html
index a660b95..756db32 100644
--- a/doc/classref/khtml/DOM.RangeException.html
+++ b/doc/classref/tdehtml/DOM.RangeException.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.RangeException</td>
diff --git a/doc/classref/khtml/DOM.Rect.html b/doc/classref/tdehtml/DOM.Rect.html
index b9149c7..a7b01ca 100644
--- a/doc/classref/khtml/DOM.Rect.html
+++ b/doc/classref/tdehtml/DOM.Rect.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.Rect</td>
diff --git a/doc/classref/khtml/DOM.StyleSheet.html b/doc/classref/tdehtml/DOM.StyleSheet.html
index 8a2317f..fb6baa9 100644
--- a/doc/classref/khtml/DOM.StyleSheet.html
+++ b/doc/classref/tdehtml/DOM.StyleSheet.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.StyleSheet</td>
diff --git a/doc/classref/khtml/DOM.StyleSheetList.html b/doc/classref/tdehtml/DOM.StyleSheetList.html
index 4872d73..fc4d49e 100644
--- a/doc/classref/khtml/DOM.StyleSheetList.html
+++ b/doc/classref/tdehtml/DOM.StyleSheetList.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.StyleSheetList</td>
diff --git a/doc/classref/khtml/DOM.Text.html b/doc/classref/tdehtml/DOM.Text.html
index 6e74165..5ad238e 100644
--- a/doc/classref/khtml/DOM.Text.html
+++ b/doc/classref/tdehtml/DOM.Text.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.Text</td>
diff --git a/doc/classref/khtml/DOM.TextEvent.html b/doc/classref/tdehtml/DOM.TextEvent.html
index 6c16128..29b6d1f 100644
--- a/doc/classref/khtml/DOM.TextEvent.html
+++ b/doc/classref/tdehtml/DOM.TextEvent.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.TextEvent</td>
diff --git a/doc/classref/khtml/DOM.TreeWalker.html b/doc/classref/tdehtml/DOM.TreeWalker.html
index a1d6a96..65747bb 100644
--- a/doc/classref/khtml/DOM.TreeWalker.html
+++ b/doc/classref/tdehtml/DOM.TreeWalker.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.TreeWalker</td>
diff --git a/doc/classref/khtml/DOM.UIEvent.html b/doc/classref/tdehtml/DOM.UIEvent.html
index 1605f5c..b0c8886 100644
--- a/doc/classref/khtml/DOM.UIEvent.html
+++ b/doc/classref/tdehtml/DOM.UIEvent.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM.UIEvent</td>
diff --git a/doc/classref/khtml/DOM.html b/doc/classref/tdehtml/DOM.html
index 89a13c9..fb273f8 100644
--- a/doc/classref/khtml/DOM.html
+++ b/doc/classref/tdehtml/DOM.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>DOM</td>
diff --git a/doc/classref/khtml/KHTMLPart.html b/doc/classref/tdehtml/KHTMLPart.html
index 9edb948..55ad168 100644
--- a/doc/classref/khtml/KHTMLPart.html
+++ b/doc/classref/tdehtml/KHTMLPart.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>KHTMLPart</td>
@@ -233,7 +233,7 @@
 </table>
 </td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
 <li><b>findFrameParent</b> (callingPart, f)
-<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(KHTMLPart) childFrame (khtml.ChildFrame)</i></td></tr>
+<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(KHTMLPart) childFrame (tdehtml.ChildFrame)</i></td></tr>
 </table><table><tr  bgcolor="#fff0ff"><th>Argument</th><th>Type</th><th>Default</th></tr>
 <tr><td>callingPart</td><td>KParts.ReadOnlyPart</td><td></td></tr>
 <tr><td>f</td><td>TQString</td><td></td></tr>
@@ -377,19 +377,19 @@
 <li><b>jsStatusBarText</b> ()
 <table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(TQString)</i></td></tr>
 </table></td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
-<li><b>khtmlDrawContentsEvent</b> (a0)
+<li><b>tdehtmlDrawContentsEvent</b> (a0)
 <table width = "100%"><tr><td width="50%" valign="top"><table><tr><td><i>Not Implemented</i></td></tr></table>
 </td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
-<li><b>khtmlMouseDoubleClickEvent</b> (a0)
+<li><b>tdehtmlMouseDoubleClickEvent</b> (a0)
 <table width = "100%"><tr><td width="50%" valign="top"><table><tr><td><i>Not Implemented</i></td></tr></table>
 </td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
-<li><b>khtmlMouseMoveEvent</b> (event)
+<li><b>tdehtmlMouseMoveEvent</b> (event)
 <table width = "100%"><tr><td width="50%" valign="top"><table><tr><td><i>Not Implemented</i></td></tr></table>
 </td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
-<li><b>khtmlMousePressEvent</b> (event)
+<li><b>tdehtmlMousePressEvent</b> (event)
 <table width = "100%"><tr><td width="50%" valign="top"><table><tr><td><i>Not Implemented</i></td></tr></table>
 </td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
-<li><b>khtmlMouseReleaseEvent</b> (event)
+<li><b>tdehtmlMouseReleaseEvent</b> (event)
 <table width = "100%"><tr><td width="50%" valign="top"><table><tr><td><i>Not Implemented</i></td></tr></table>
 </td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
 <li><b>lastModified</b> ()
diff --git a/doc/classref/khtml/KHTMLSettings.html b/doc/classref/tdehtml/KHTMLSettings.html
index efa0fca..fa095e5 100644
--- a/doc/classref/khtml/KHTMLSettings.html
+++ b/doc/classref/tdehtml/KHTMLSettings.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>KHTMLSettings</td>
diff --git a/doc/classref/khtml/KHTMLView.html b/doc/classref/tdehtml/KHTMLView.html
index d3d85ca..f863593 100644
--- a/doc/classref/khtml/KHTMLView.html
+++ b/doc/classref/tdehtml/KHTMLView.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>khtml</td>
+            <td width="30%" align=left>tdehtml</td>
         </tr>
         <tr><td>Class</td>
             <td>KHTMLView</td>
diff --git a/doc/classref/khtml/index.html b/doc/classref/tdehtml/index.html
index 601c9c1..ec14a1f 100644
--- a/doc/classref/khtml/index.html
+++ b/doc/classref/tdehtml/index.html
@@ -3,7 +3,7 @@
         "http://www.w3.org/TR/html4/loose.dtd"">
 <html>
 <head>
-  <title>module khtml</title>
+  <title>module tdehtml</title>
   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
   <meta name="GENERATOR" content="wabbit dumphtml">
 </head>
@@ -12,7 +12,7 @@
 <hr>
 <table width="100%"><tr>
             <td width ="70%">
-                <h1>khtml Class Index</h1><hr>
+                <h1>tdehtml Class Index</h1><hr>
             </td>
             <td  width="30%" valign="top" align="right">
                 <table>
@@ -22,7 +22,7 @@
                 </table>
             </td>
         </tr></table>
-        <a href = "khtml-globals.html">khtml Global and Namespace members</a><p></p>
+        <a href = "tdehtml-globals.html">tdehtml Global and Namespace members</a><p></p>
 <table width="100%" border="0"><tr>
 <td valign="top"><table border="0">
 <tr bgcolor="#fff0ff"><th>DOM - DOM.HTMLAreaElement</th></tr>
diff --git a/doc/classref/kmdi/kmdi-globals.html b/doc/classref/tdehtml/tdehtml-globals.html
index 111b4e7..898d4ad 100644
--- a/doc/classref/kmdi/kmdi-globals.html
+++ b/doc/classref/tdehtml/tdehtml-globals.html
@@ -3,7 +3,7 @@
         "http://www.w3.org/TR/html4/loose.dtd"">
 <html>
 <head>
-  <title>kmdi globals</title>
+  <title>tdehtml globals</title>
   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
   <meta name="GENERATOR" content="wabbit dumphtml">
 </head>
@@ -12,13 +12,13 @@
 <hr>
 <table width="100%"><tr>
             <td width ="70%">
-                <h1>kmdi Globals</h1><hr>
+                <h1>tdehtml Globals</h1><hr>
             </td>
             <td  width="30%" valign="top" align="right">
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kmdi Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdehtml Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
diff --git a/doc/classref/kmdi/KMdi.html b/doc/classref/tdemdi/KMdi.html
index 45f32a1..8e9f413 100644
--- a/doc/classref/kmdi/KMdi.html
+++ b/doc/classref/tdemdi/KMdi.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kmdi Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdemdi Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kmdi</td>
+            <td width="30%" align=left>tdemdi</td>
         </tr>
         <tr><td>Class</td>
             <td>KMdi</td>
diff --git a/doc/classref/kmdi/KMdiChildArea.html b/doc/classref/tdemdi/KMdiChildArea.html
index 793a911..0e4e20a 100644
--- a/doc/classref/kmdi/KMdiChildArea.html
+++ b/doc/classref/tdemdi/KMdiChildArea.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kmdi Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdemdi Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kmdi</td>
+            <td width="30%" align=left>tdemdi</td>
         </tr>
         <tr><td>Class</td>
             <td>KMdiChildArea</td>
diff --git a/doc/classref/kmdi/KMdiChildFrm.html b/doc/classref/tdemdi/KMdiChildFrm.html
index bbfb7d5..d1b4e6f 100644
--- a/doc/classref/kmdi/KMdiChildFrm.html
+++ b/doc/classref/tdemdi/KMdiChildFrm.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kmdi Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdemdi Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kmdi</td>
+            <td width="30%" align=left>tdemdi</td>
         </tr>
         <tr><td>Class</td>
             <td>KMdiChildFrm</td>
diff --git a/doc/classref/kmdi/KMdiChildFrmCaption.html b/doc/classref/tdemdi/KMdiChildFrmCaption.html
index 84a055e..55bca98 100644
--- a/doc/classref/kmdi/KMdiChildFrmCaption.html
+++ b/doc/classref/tdemdi/KMdiChildFrmCaption.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kmdi Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdemdi Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kmdi</td>
+            <td width="30%" align=left>tdemdi</td>
         </tr>
         <tr><td>Class</td>
             <td>KMdiChildFrmCaption</td>
diff --git a/doc/classref/kmdi/KMdiChildFrmDragBeginEvent.html b/doc/classref/tdemdi/KMdiChildFrmDragBeginEvent.html
index c70524b..5524cd1 100644
--- a/doc/classref/kmdi/KMdiChildFrmDragBeginEvent.html
+++ b/doc/classref/tdemdi/KMdiChildFrmDragBeginEvent.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kmdi Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdemdi Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kmdi</td>
+            <td width="30%" align=left>tdemdi</td>
         </tr>
         <tr><td>Class</td>
             <td>KMdiChildFrmDragBeginEvent</td>
diff --git a/doc/classref/kmdi/KMdiChildFrmDragEndEvent.html b/doc/classref/tdemdi/KMdiChildFrmDragEndEvent.html
index d312995..f1dc435 100644
--- a/doc/classref/kmdi/KMdiChildFrmDragEndEvent.html
+++ b/doc/classref/tdemdi/KMdiChildFrmDragEndEvent.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kmdi Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdemdi Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kmdi</td>
+            <td width="30%" align=left>tdemdi</td>
         </tr>
         <tr><td>Class</td>
             <td>KMdiChildFrmDragEndEvent</td>
diff --git a/doc/classref/kmdi/KMdiChildFrmMoveEvent.html b/doc/classref/tdemdi/KMdiChildFrmMoveEvent.html
index b3ef932..2bf785a 100644
--- a/doc/classref/kmdi/KMdiChildFrmMoveEvent.html
+++ b/doc/classref/tdemdi/KMdiChildFrmMoveEvent.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kmdi Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdemdi Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kmdi</td>
+            <td width="30%" align=left>tdemdi</td>
         </tr>
         <tr><td>Class</td>
             <td>KMdiChildFrmMoveEvent</td>
diff --git a/doc/classref/kmdi/KMdiChildFrmResizeBeginEvent.html b/doc/classref/tdemdi/KMdiChildFrmResizeBeginEvent.html
index f2bcc38..6db3eaf 100644
--- a/doc/classref/kmdi/KMdiChildFrmResizeBeginEvent.html
+++ b/doc/classref/tdemdi/KMdiChildFrmResizeBeginEvent.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kmdi Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdemdi Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kmdi</td>
+            <td width="30%" align=left>tdemdi</td>
         </tr>
         <tr><td>Class</td>
             <td>KMdiChildFrmResizeBeginEvent</td>
diff --git a/doc/classref/kmdi/KMdiChildFrmResizeEndEvent.html b/doc/classref/tdemdi/KMdiChildFrmResizeEndEvent.html
index 78e2e03..fc0230d 100644
--- a/doc/classref/kmdi/KMdiChildFrmResizeEndEvent.html
+++ b/doc/classref/tdemdi/KMdiChildFrmResizeEndEvent.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kmdi Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdemdi Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kmdi</td>
+            <td width="30%" align=left>tdemdi</td>
         </tr>
         <tr><td>Class</td>
             <td>KMdiChildFrmResizeEndEvent</td>
diff --git a/doc/classref/kmdi/KMdiChildView.html b/doc/classref/tdemdi/KMdiChildView.html
index 8671787..3cb44d3 100644
--- a/doc/classref/kmdi/KMdiChildView.html
+++ b/doc/classref/tdemdi/KMdiChildView.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kmdi Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdemdi Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kmdi</td>
+            <td width="30%" align=left>tdemdi</td>
         </tr>
         <tr><td>Class</td>
             <td>KMdiChildView</td>
diff --git a/doc/classref/kmdi/KMdiMainFrm.html b/doc/classref/tdemdi/KMdiMainFrm.html
index cf2b3f2..d8cdacf 100644
--- a/doc/classref/kmdi/KMdiMainFrm.html
+++ b/doc/classref/tdemdi/KMdiMainFrm.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kmdi Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdemdi Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kmdi</td>
+            <td width="30%" align=left>tdemdi</td>
         </tr>
         <tr><td>Class</td>
             <td>KMdiMainFrm</td>
diff --git a/doc/classref/kmdi/KMdiTaskBar.html b/doc/classref/tdemdi/KMdiTaskBar.html
index c0ed608..680e9df 100644
--- a/doc/classref/kmdi/KMdiTaskBar.html
+++ b/doc/classref/tdemdi/KMdiTaskBar.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kmdi Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdemdi Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kmdi</td>
+            <td width="30%" align=left>tdemdi</td>
         </tr>
         <tr><td>Class</td>
             <td>KMdiTaskBar</td>
diff --git a/doc/classref/kmdi/KMdiTaskBarButton.html b/doc/classref/tdemdi/KMdiTaskBarButton.html
index ccf5d8d..01df3f8 100644
--- a/doc/classref/kmdi/KMdiTaskBarButton.html
+++ b/doc/classref/tdemdi/KMdiTaskBarButton.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kmdi Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdemdi Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kmdi</td>
+            <td width="30%" align=left>tdemdi</td>
         </tr>
         <tr><td>Class</td>
             <td>KMdiTaskBarButton</td>
diff --git a/doc/classref/kmdi/KMdiToolViewAccessor.html b/doc/classref/tdemdi/KMdiToolViewAccessor.html
index e65d736..a94c57f 100644
--- a/doc/classref/kmdi/KMdiToolViewAccessor.html
+++ b/doc/classref/tdemdi/KMdiToolViewAccessor.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kmdi Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdemdi Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kmdi</td>
+            <td width="30%" align=left>tdemdi</td>
         </tr>
         <tr><td>Class</td>
             <td>KMdiToolViewAccessor</td>
diff --git a/doc/classref/kmdi/KMdiViewCloseEvent.html b/doc/classref/tdemdi/KMdiViewCloseEvent.html
index 2b8e6c3..a6c761a 100644
--- a/doc/classref/kmdi/KMdiViewCloseEvent.html
+++ b/doc/classref/tdemdi/KMdiViewCloseEvent.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kmdi Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdemdi Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kmdi</td>
+            <td width="30%" align=left>tdemdi</td>
         </tr>
         <tr><td>Class</td>
             <td>KMdiViewCloseEvent</td>
diff --git a/doc/classref/kmdi/KMdiWin32IconButton.html b/doc/classref/tdemdi/KMdiWin32IconButton.html
index 1882941..45bc112 100644
--- a/doc/classref/kmdi/KMdiWin32IconButton.html
+++ b/doc/classref/tdemdi/KMdiWin32IconButton.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kmdi Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdemdi Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kmdi</td>
+            <td width="30%" align=left>tdemdi</td>
         </tr>
         <tr><td>Class</td>
             <td>KMdiWin32IconButton</td>
diff --git a/doc/classref/kmdi/index.html b/doc/classref/tdemdi/index.html
index 6e69f64..a7eaed9 100644
--- a/doc/classref/kmdi/index.html
+++ b/doc/classref/tdemdi/index.html
@@ -3,7 +3,7 @@
         "http://www.w3.org/TR/html4/loose.dtd"">
 <html>
 <head>
-  <title>module kmdi</title>
+  <title>module tdemdi</title>
   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
   <meta name="GENERATOR" content="wabbit dumphtml">
 </head>
@@ -12,7 +12,7 @@
 <hr>
 <table width="100%"><tr>
             <td width ="70%">
-                <h1>kmdi Class Index</h1><hr>
+                <h1>tdemdi Class Index</h1><hr>
             </td>
             <td  width="30%" valign="top" align="right">
                 <table>
@@ -22,7 +22,7 @@
                 </table>
             </td>
         </tr></table>
-        <a href = "kmdi-globals.html">kmdi Global and Namespace members</a><p></p>
+        <a href = "tdemdi-globals.html">tdemdi Global and Namespace members</a><p></p>
 <table width="100%" border="0"><tr>
 <td valign="top"><table border="0">
 <tr bgcolor="#fff0ff"><th>KMdi - KMdiChildFrmDragEndEvent</th></tr>
diff --git a/doc/classref/khtml/khtml-globals.html b/doc/classref/tdemdi/tdemdi-globals.html
index 817eb1e..05880c4 100644
--- a/doc/classref/khtml/khtml-globals.html
+++ b/doc/classref/tdemdi/tdemdi-globals.html
@@ -3,7 +3,7 @@
         "http://www.w3.org/TR/html4/loose.dtd"">
 <html>
 <head>
-  <title>khtml globals</title>
+  <title>tdemdi globals</title>
   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
   <meta name="GENERATOR" content="wabbit dumphtml">
 </head>
@@ -12,13 +12,13 @@
 <hr>
 <table width="100%"><tr>
             <td width ="70%">
-                <h1>khtml Globals</h1><hr>
+                <h1>tdemdi Globals</h1><hr>
             </td>
             <td  width="30%" valign="top" align="right">
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">khtml Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdemdi Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
diff --git a/doc/classref/kparts/ExtTerminalInterface.html b/doc/classref/tdeparts/ExtTerminalInterface.html
index 769cb80..95894cc 100644
--- a/doc/classref/kparts/ExtTerminalInterface.html
+++ b/doc/classref/tdeparts/ExtTerminalInterface.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kparts Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdeparts Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kparts</td>
+            <td width="30%" align=left>tdeparts</td>
         </tr>
         <tr><td>Class</td>
             <td>ExtTerminalInterface <a href = "sip/glossary.html#abstract">(<i>abstract</i>)</a></td>
diff --git a/doc/classref/kparts/KParts.BrowserExtension.html b/doc/classref/tdeparts/KParts.BrowserExtension.html
index 9dfbdc2..c613576 100644
--- a/doc/classref/kparts/KParts.BrowserExtension.html
+++ b/doc/classref/tdeparts/KParts.BrowserExtension.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kparts Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdeparts Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kparts</td>
+            <td width="30%" align=left>tdeparts</td>
         </tr>
         <tr><td>Class</td>
             <td>KParts.BrowserExtension</td>
diff --git a/doc/classref/kparts/KParts.BrowserHostExtension.html b/doc/classref/tdeparts/KParts.BrowserHostExtension.html
index 9f8c337..3ef462a 100644
--- a/doc/classref/kparts/KParts.BrowserHostExtension.html
+++ b/doc/classref/tdeparts/KParts.BrowserHostExtension.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kparts Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdeparts Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kparts</td>
+            <td width="30%" align=left>tdeparts</td>
         </tr>
         <tr><td>Class</td>
             <td>KParts.BrowserHostExtension</td>
diff --git a/doc/classref/kparts/KParts.BrowserInterface.html b/doc/classref/tdeparts/KParts.BrowserInterface.html
index ca285d6..e7cef0e 100644
--- a/doc/classref/kparts/KParts.BrowserInterface.html
+++ b/doc/classref/tdeparts/KParts.BrowserInterface.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kparts Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdeparts Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kparts</td>
+            <td width="30%" align=left>tdeparts</td>
         </tr>
         <tr><td>Class</td>
             <td>KParts.BrowserInterface</td>
diff --git a/doc/classref/kparts/KParts.BrowserRun.html b/doc/classref/tdeparts/KParts.BrowserRun.html
index 9cde0c8..4a7d5b9 100644
--- a/doc/classref/kparts/KParts.BrowserRun.html
+++ b/doc/classref/tdeparts/KParts.BrowserRun.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kparts Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdeparts Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kparts</td>
+            <td width="30%" align=left>tdeparts</td>
         </tr>
         <tr><td>Class</td>
             <td>KParts.BrowserRun</td>
diff --git a/doc/classref/kparts/KParts.DockMainWindow.html b/doc/classref/tdeparts/KParts.DockMainWindow.html
index 7976d61..ea89a5a 100644
--- a/doc/classref/kparts/KParts.DockMainWindow.html
+++ b/doc/classref/tdeparts/KParts.DockMainWindow.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kparts Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdeparts Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kparts</td>
+            <td width="30%" align=left>tdeparts</td>
         </tr>
         <tr><td>Class</td>
             <td>KParts.DockMainWindow</td>
diff --git a/doc/classref/kparts/KParts.Event.html b/doc/classref/tdeparts/KParts.Event.html
index 1f1aa3b..8ea0a67 100644
--- a/doc/classref/kparts/KParts.Event.html
+++ b/doc/classref/tdeparts/KParts.Event.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kparts Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdeparts Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kparts</td>
+            <td width="30%" align=left>tdeparts</td>
         </tr>
         <tr><td>Class</td>
             <td>KParts.Event</td>
diff --git a/doc/classref/kparts/KParts.Factory.html b/doc/classref/tdeparts/KParts.Factory.html
index e6faf89..1e27faf 100644
--- a/doc/classref/kparts/KParts.Factory.html
+++ b/doc/classref/tdeparts/KParts.Factory.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kparts Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdeparts Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kparts</td>
+            <td width="30%" align=left>tdeparts</td>
         </tr>
         <tr><td>Class</td>
             <td>KParts.Factory</td>
diff --git a/doc/classref/kparts/KParts.GUIActivateEvent.html b/doc/classref/tdeparts/KParts.GUIActivateEvent.html
index 23165e6..7efc3fc 100644
--- a/doc/classref/kparts/KParts.GUIActivateEvent.html
+++ b/doc/classref/tdeparts/KParts.GUIActivateEvent.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kparts Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdeparts Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kparts</td>
+            <td width="30%" align=left>tdeparts</td>
         </tr>
         <tr><td>Class</td>
             <td>KParts.GUIActivateEvent</td>
diff --git a/doc/classref/kparts/KParts.HistoryProvider.html b/doc/classref/tdeparts/KParts.HistoryProvider.html
index 9361b84..f84e6a0 100644
--- a/doc/classref/kparts/KParts.HistoryProvider.html
+++ b/doc/classref/tdeparts/KParts.HistoryProvider.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kparts Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdeparts Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kparts</td>
+            <td width="30%" align=left>tdeparts</td>
         </tr>
         <tr><td>Class</td>
             <td>KParts.HistoryProvider</td>
diff --git a/doc/classref/kparts/KParts.LiveConnectExtension.html b/doc/classref/tdeparts/KParts.LiveConnectExtension.html
index 3287768..fb0b1e3 100644
--- a/doc/classref/kparts/KParts.LiveConnectExtension.html
+++ b/doc/classref/tdeparts/KParts.LiveConnectExtension.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kparts Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdeparts Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kparts</td>
+            <td width="30%" align=left>tdeparts</td>
         </tr>
         <tr><td>Class</td>
             <td>KParts.LiveConnectExtension</td>
diff --git a/doc/classref/kparts/KParts.MainWindow.html b/doc/classref/tdeparts/KParts.MainWindow.html
index 7015ed5..8a392bf 100644
--- a/doc/classref/kparts/KParts.MainWindow.html
+++ b/doc/classref/tdeparts/KParts.MainWindow.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kparts Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdeparts Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kparts</td>
+            <td width="30%" align=left>tdeparts</td>
         </tr>
         <tr><td>Class</td>
             <td>KParts.MainWindow</td>
diff --git a/doc/classref/kparts/KParts.OpenURLEvent.html b/doc/classref/tdeparts/KParts.OpenURLEvent.html
index be65ab4..44a7637 100644
--- a/doc/classref/kparts/KParts.OpenURLEvent.html
+++ b/doc/classref/tdeparts/KParts.OpenURLEvent.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kparts Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdeparts Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kparts</td>
+            <td width="30%" align=left>tdeparts</td>
         </tr>
         <tr><td>Class</td>
             <td>KParts.OpenURLEvent</td>
diff --git a/doc/classref/kparts/KParts.Part.html b/doc/classref/tdeparts/KParts.Part.html
index 0f8223d..ff68941 100644
--- a/doc/classref/kparts/KParts.Part.html
+++ b/doc/classref/tdeparts/KParts.Part.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kparts Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdeparts Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kparts</td>
+            <td width="30%" align=left>tdeparts</td>
         </tr>
         <tr><td>Class</td>
             <td>KParts.Part</td>
diff --git a/doc/classref/kparts/KParts.PartActivateEvent.html b/doc/classref/tdeparts/KParts.PartActivateEvent.html
index e2a9b5e..dbd92dd 100644
--- a/doc/classref/kparts/KParts.PartActivateEvent.html
+++ b/doc/classref/tdeparts/KParts.PartActivateEvent.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kparts Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdeparts Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kparts</td>
+            <td width="30%" align=left>tdeparts</td>
         </tr>
         <tr><td>Class</td>
             <td>KParts.PartActivateEvent</td>
diff --git a/doc/classref/kparts/KParts.PartBase.html b/doc/classref/tdeparts/KParts.PartBase.html
index 2c241f2..22c7d04 100644
--- a/doc/classref/kparts/KParts.PartBase.html
+++ b/doc/classref/tdeparts/KParts.PartBase.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kparts Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdeparts Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kparts</td>
+            <td width="30%" align=left>tdeparts</td>
         </tr>
         <tr><td>Class</td>
             <td>KParts.PartBase</td>
diff --git a/doc/classref/kparts/KParts.PartManager.html b/doc/classref/tdeparts/KParts.PartManager.html
index 72bca44..7bf815d 100644
--- a/doc/classref/kparts/KParts.PartManager.html
+++ b/doc/classref/tdeparts/KParts.PartManager.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kparts Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdeparts Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kparts</td>
+            <td width="30%" align=left>tdeparts</td>
         </tr>
         <tr><td>Class</td>
             <td>KParts.PartManager</td>
diff --git a/doc/classref/kparts/KParts.PartSelectEvent.html b/doc/classref/tdeparts/KParts.PartSelectEvent.html
index 607c909..05ef81b 100644
--- a/doc/classref/kparts/KParts.PartSelectEvent.html
+++ b/doc/classref/tdeparts/KParts.PartSelectEvent.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kparts Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdeparts Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kparts</td>
+            <td width="30%" align=left>tdeparts</td>
         </tr>
         <tr><td>Class</td>
             <td>KParts.PartSelectEvent</td>
diff --git a/doc/classref/kparts/KParts.Plugin.PluginInfo.html b/doc/classref/tdeparts/KParts.Plugin.PluginInfo.html
index 9070e4e..1bd1e3b 100644
--- a/doc/classref/kparts/KParts.Plugin.PluginInfo.html
+++ b/doc/classref/tdeparts/KParts.Plugin.PluginInfo.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kparts Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdeparts Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kparts</td>
+            <td width="30%" align=left>tdeparts</td>
         </tr>
         <tr><td>Class</td>
             <td>KParts.Plugin.PluginInfo</td>
diff --git a/doc/classref/kparts/KParts.Plugin.html b/doc/classref/tdeparts/KParts.Plugin.html
index deb8fc9..e9ee7b9 100644
--- a/doc/classref/kparts/KParts.Plugin.html
+++ b/doc/classref/tdeparts/KParts.Plugin.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kparts Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdeparts Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kparts</td>
+            <td width="30%" align=left>tdeparts</td>
         </tr>
         <tr><td>Class</td>
             <td>KParts.Plugin</td>
diff --git a/doc/classref/kparts/KParts.ReadOnlyPart.html b/doc/classref/tdeparts/KParts.ReadOnlyPart.html
index f25d6f0..919a6ff 100644
--- a/doc/classref/kparts/KParts.ReadOnlyPart.html
+++ b/doc/classref/tdeparts/KParts.ReadOnlyPart.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kparts Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdeparts Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kparts</td>
+            <td width="30%" align=left>tdeparts</td>
         </tr>
         <tr><td>Class</td>
             <td>KParts.ReadOnlyPart <a href = "sip/glossary.html#abstract">(<i>abstract</i>)</a></td>
diff --git a/doc/classref/kparts/KParts.ReadWritePart.html b/doc/classref/tdeparts/KParts.ReadWritePart.html
index 9d3c30e..7e8af77 100644
--- a/doc/classref/kparts/KParts.ReadWritePart.html
+++ b/doc/classref/tdeparts/KParts.ReadWritePart.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kparts Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdeparts Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kparts</td>
+            <td width="30%" align=left>tdeparts</td>
         </tr>
         <tr><td>Class</td>
             <td>KParts.ReadWritePart <a href = "sip/glossary.html#abstract">(<i>abstract</i>)</a></td>
diff --git a/doc/classref/kparts/KParts.StatusBarExtension.html b/doc/classref/tdeparts/KParts.StatusBarExtension.html
index fecc505..9c9dcbb 100644
--- a/doc/classref/kparts/KParts.StatusBarExtension.html
+++ b/doc/classref/tdeparts/KParts.StatusBarExtension.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kparts Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdeparts Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kparts</td>
+            <td width="30%" align=left>tdeparts</td>
         </tr>
         <tr><td>Class</td>
             <td>KParts.StatusBarExtension</td>
diff --git a/doc/classref/kparts/KParts.URLArgs.html b/doc/classref/tdeparts/KParts.URLArgs.html
index 63e91a1..a8657ec 100644
--- a/doc/classref/kparts/KParts.URLArgs.html
+++ b/doc/classref/tdeparts/KParts.URLArgs.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kparts Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdeparts Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kparts</td>
+            <td width="30%" align=left>tdeparts</td>
         </tr>
         <tr><td>Class</td>
             <td>KParts.URLArgs</td>
diff --git a/doc/classref/kparts/KParts.WindowArgs.html b/doc/classref/tdeparts/KParts.WindowArgs.html
index d3ef46e..68fabe4 100644
--- a/doc/classref/kparts/KParts.WindowArgs.html
+++ b/doc/classref/tdeparts/KParts.WindowArgs.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kparts Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdeparts Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kparts</td>
+            <td width="30%" align=left>tdeparts</td>
         </tr>
         <tr><td>Class</td>
             <td>KParts.WindowArgs</td>
diff --git a/doc/classref/kparts/KParts.html b/doc/classref/tdeparts/KParts.html
index 4256d83..dc65e8f 100644
--- a/doc/classref/kparts/KParts.html
+++ b/doc/classref/tdeparts/KParts.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kparts Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdeparts Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kparts</td>
+            <td width="30%" align=left>tdeparts</td>
         </tr>
         <tr><td>Class</td>
             <td>KParts</td>
diff --git a/doc/classref/kparts/TerminalInterface.html b/doc/classref/tdeparts/TerminalInterface.html
index 51b0a7b..7042adc 100644
--- a/doc/classref/kparts/TerminalInterface.html
+++ b/doc/classref/tdeparts/TerminalInterface.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kparts Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdeparts Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kparts</td>
+            <td width="30%" align=left>tdeparts</td>
         </tr>
         <tr><td>Class</td>
             <td>TerminalInterface <a href = "sip/glossary.html#abstract">(<i>abstract</i>)</a></td>
diff --git a/doc/classref/kparts/index.html b/doc/classref/tdeparts/index.html
index 2ad94c2..2d5d37f 100644
--- a/doc/classref/kparts/index.html
+++ b/doc/classref/tdeparts/index.html
@@ -3,7 +3,7 @@
         "http://www.w3.org/TR/html4/loose.dtd"">
 <html>
 <head>
-  <title>module kparts</title>
+  <title>module tdeparts</title>
   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
   <meta name="GENERATOR" content="wabbit dumphtml">
 </head>
@@ -12,7 +12,7 @@
 <hr>
 <table width="100%"><tr>
             <td width ="70%">
-                <h1>kparts Class Index</h1><hr>
+                <h1>tdeparts Class Index</h1><hr>
             </td>
             <td  width="30%" valign="top" align="right">
                 <table>
@@ -22,7 +22,7 @@
                 </table>
             </td>
         </tr></table>
-        <a href = "kparts-globals.html">kparts Global and Namespace members</a><p></p>
+        <a href = "tdeparts-globals.html">tdeparts Global and Namespace members</a><p></p>
 <table width="100%" border="0"><tr>
 <td valign="top"><table border="0">
 <tr bgcolor="#fff0ff"><th>ExtTerminalInterface - KParts.GUIActivateEvent</th></tr>
diff --git a/doc/classref/kparts/konsoleBrowserExtension.html b/doc/classref/tdeparts/konsoleBrowserExtension.html
index 41229e3..0c6b530 100644
--- a/doc/classref/kparts/konsoleBrowserExtension.html
+++ b/doc/classref/tdeparts/konsoleBrowserExtension.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kparts Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdeparts Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kparts</td>
+            <td width="30%" align=left>tdeparts</td>
         </tr>
         <tr><td>Class</td>
             <td>konsoleBrowserExtension</td>
diff --git a/doc/classref/kparts/konsoleFactory.html b/doc/classref/tdeparts/konsoleFactory.html
index fb39ffa..8610dae 100644
--- a/doc/classref/kparts/konsoleFactory.html
+++ b/doc/classref/tdeparts/konsoleFactory.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kparts Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdeparts Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kparts</td>
+            <td width="30%" align=left>tdeparts</td>
         </tr>
         <tr><td>Class</td>
             <td>konsoleFactory</td>
diff --git a/doc/classref/kparts/konsolePart.html b/doc/classref/tdeparts/konsolePart.html
index 8832e60..de59c31 100644
--- a/doc/classref/kparts/konsolePart.html
+++ b/doc/classref/tdeparts/konsolePart.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kparts Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdeparts Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kparts</td>
+            <td width="30%" align=left>tdeparts</td>
         </tr>
         <tr><td>Class</td>
             <td>konsolePart</td>
diff --git a/doc/classref/kparts/kparts-globals.html b/doc/classref/tdeparts/tdeparts-globals.html
index 3527474..55eb972 100644
--- a/doc/classref/kparts/kparts-globals.html
+++ b/doc/classref/tdeparts/tdeparts-globals.html
@@ -3,7 +3,7 @@
         "http://www.w3.org/TR/html4/loose.dtd"">
 <html>
 <head>
-  <title>kparts globals</title>
+  <title>tdeparts globals</title>
   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
   <meta name="GENERATOR" content="wabbit dumphtml">
 </head>
@@ -12,13 +12,13 @@
 <hr>
 <table width="100%"><tr>
             <td width ="70%">
-                <h1>kparts Globals</h1><hr>
+                <h1>tdeparts Globals</h1><hr>
             </td>
             <td  width="30%" valign="top" align="right">
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kparts Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdeparts Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
diff --git a/doc/classref/kresources/KRES.ConfigDialog.html b/doc/classref/tderesources/KRES.ConfigDialog.html
index eaa806d..19ef0dc 100644
--- a/doc/classref/kresources/KRES.ConfigDialog.html
+++ b/doc/classref/tderesources/KRES.ConfigDialog.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kresources Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tderesources Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kresources</td>
+            <td width="30%" align=left>tderesources</td>
         </tr>
         <tr><td>Class</td>
             <td>KRES.ConfigDialog</td>
diff --git a/doc/classref/kresources/KRES.ConfigWidget.html b/doc/classref/tderesources/KRES.ConfigWidget.html
index 0ee8a93..c4d3a44 100644
--- a/doc/classref/kresources/KRES.ConfigWidget.html
+++ b/doc/classref/tderesources/KRES.ConfigWidget.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kresources Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tderesources Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kresources</td>
+            <td width="30%" align=left>tderesources</td>
         </tr>
         <tr><td>Class</td>
             <td>KRES.ConfigWidget <a href = "sip/glossary.html#abstract">(<i>abstract</i>)</a></td>
diff --git a/doc/classref/kresources/KRES.Factory.html b/doc/classref/tderesources/KRES.Factory.html
index a46909f..5f63ecf 100644
--- a/doc/classref/kresources/KRES.Factory.html
+++ b/doc/classref/tderesources/KRES.Factory.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kresources Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tderesources Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kresources</td>
+            <td width="30%" align=left>tderesources</td>
         </tr>
         <tr><td>Class</td>
             <td>KRES.Factory</td>
diff --git a/doc/classref/kresources/KRES.PluginFactoryBase.html b/doc/classref/tderesources/KRES.PluginFactoryBase.html
index b6e98f5..971bb87 100644
--- a/doc/classref/kresources/KRES.PluginFactoryBase.html
+++ b/doc/classref/tderesources/KRES.PluginFactoryBase.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kresources Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tderesources Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kresources</td>
+            <td width="30%" align=left>tderesources</td>
         </tr>
         <tr><td>Class</td>
             <td>KRES.PluginFactoryBase <a href = "sip/glossary.html#abstract">(<i>abstract</i>)</a></td>
diff --git a/doc/classref/kresources/KRES.Resource.html b/doc/classref/tderesources/KRES.Resource.html
index e8e2e60..28f6dbd 100644
--- a/doc/classref/kresources/KRES.Resource.html
+++ b/doc/classref/tderesources/KRES.Resource.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kresources Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tderesources Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kresources</td>
+            <td width="30%" align=left>tderesources</td>
         </tr>
         <tr><td>Class</td>
             <td>KRES.Resource</td>
diff --git a/doc/classref/kresources/KRES.ResourcePageInfo.html b/doc/classref/tderesources/KRES.ResourcePageInfo.html
index 516b5ba..763ef00 100644
--- a/doc/classref/kresources/KRES.ResourcePageInfo.html
+++ b/doc/classref/tderesources/KRES.ResourcePageInfo.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kresources Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tderesources Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kresources</td>
+            <td width="30%" align=left>tderesources</td>
         </tr>
         <tr><td>Class</td>
             <td>KRES.ResourcePageInfo</td>
diff --git a/doc/classref/kresources/KRES.SelectDialog.html b/doc/classref/tderesources/KRES.SelectDialog.html
index 62dbb7d..d6c972c 100644
--- a/doc/classref/kresources/KRES.SelectDialog.html
+++ b/doc/classref/tderesources/KRES.SelectDialog.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kresources Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tderesources Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kresources</td>
+            <td width="30%" align=left>tderesources</td>
         </tr>
         <tr><td>Class</td>
             <td>KRES.SelectDialog</td>
diff --git a/doc/classref/kresources/KRES.html b/doc/classref/tderesources/KRES.html
index ade3154..bd76ba5 100644
--- a/doc/classref/kresources/KRES.html
+++ b/doc/classref/tderesources/KRES.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kresources Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tderesources Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kresources</td>
+            <td width="30%" align=left>tderesources</td>
         </tr>
         <tr><td>Class</td>
             <td>KRES</td>
diff --git a/doc/classref/kresources/index.html b/doc/classref/tderesources/index.html
index 9896b14..8faa88f 100644
--- a/doc/classref/kresources/index.html
+++ b/doc/classref/tderesources/index.html
@@ -3,7 +3,7 @@
         "http://www.w3.org/TR/html4/loose.dtd"">
 <html>
 <head>
-  <title>module kresources</title>
+  <title>module tderesources</title>
   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
   <meta name="GENERATOR" content="wabbit dumphtml">
 </head>
@@ -12,7 +12,7 @@
 <hr>
 <table width="100%"><tr>
             <td width ="70%">
-                <h1>kresources Class Index</h1><hr>
+                <h1>tderesources Class Index</h1><hr>
             </td>
             <td  width="30%" valign="top" align="right">
                 <table>
diff --git a/doc/classref/kspell/KDictSpellingHighlighter.html b/doc/classref/tdespell/KDictSpellingHighlighter.html
index a5ce592..6396920 100644
--- a/doc/classref/kspell/KDictSpellingHighlighter.html
+++ b/doc/classref/tdespell/KDictSpellingHighlighter.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kspell Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdespell Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kspell</td>
+            <td width="30%" align=left>tdespell</td>
         </tr>
         <tr><td>Class</td>
             <td>KDictSpellingHighlighter</td>
diff --git a/doc/classref/kspell/KSpell.html b/doc/classref/tdespell/KSpell.html
index 3eb99e8..050c387 100644
--- a/doc/classref/kspell/KSpell.html
+++ b/doc/classref/tdespell/KSpell.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kspell Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdespell Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kspell</td>
+            <td width="30%" align=left>tdespell</td>
         </tr>
         <tr><td>Class</td>
             <td>KSpell</td>
diff --git a/doc/classref/kspell/KSpellConfig.html b/doc/classref/tdespell/KSpellConfig.html
index 7684d73..65acbe9 100644
--- a/doc/classref/kspell/KSpellConfig.html
+++ b/doc/classref/tdespell/KSpellConfig.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kspell Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdespell Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kspell</td>
+            <td width="30%" align=left>tdespell</td>
         </tr>
         <tr><td>Class</td>
             <td>KSpellConfig</td>
diff --git a/doc/classref/kspell/KSpellDlg.html b/doc/classref/tdespell/KSpellDlg.html
index 507e16a..629061a 100644
--- a/doc/classref/kspell/KSpellDlg.html
+++ b/doc/classref/tdespell/KSpellDlg.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kspell Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdespell Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kspell</td>
+            <td width="30%" align=left>tdespell</td>
         </tr>
         <tr><td>Class</td>
             <td>KSpellDlg</td>
diff --git a/doc/classref/kspell/KSpellingHighlighter.html b/doc/classref/tdespell/KSpellingHighlighter.html
index c424101..3d412a1 100644
--- a/doc/classref/kspell/KSpellingHighlighter.html
+++ b/doc/classref/tdespell/KSpellingHighlighter.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kspell Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdespell Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kspell</td>
+            <td width="30%" align=left>tdespell</td>
         </tr>
         <tr><td>Class</td>
             <td>KSpellingHighlighter <a href = "sip/glossary.html#abstract">(<i>abstract</i>)</a></td>
diff --git a/doc/classref/kspell/KSyntaxHighlighter.html b/doc/classref/tdespell/KSyntaxHighlighter.html
index 8fb31c1..26fbd0d 100644
--- a/doc/classref/kspell/KSyntaxHighlighter.html
+++ b/doc/classref/tdespell/KSyntaxHighlighter.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kspell Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdespell Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kspell</td>
+            <td width="30%" align=left>tdespell</td>
         </tr>
         <tr><td>Class</td>
             <td>KSyntaxHighlighter</td>
diff --git a/doc/classref/kspell/index.html b/doc/classref/tdespell/index.html
index e9487c5..621740b 100644
--- a/doc/classref/kspell/index.html
+++ b/doc/classref/tdespell/index.html
@@ -3,7 +3,7 @@
         "http://www.w3.org/TR/html4/loose.dtd"">
 <html>
 <head>
-  <title>module kspell</title>
+  <title>module tdespell</title>
   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
   <meta name="GENERATOR" content="wabbit dumphtml">
 </head>
@@ -12,7 +12,7 @@
 <hr>
 <table width="100%"><tr>
             <td width ="70%">
-                <h1>kspell Class Index</h1><hr>
+                <h1>tdespell Class Index</h1><hr>
             </td>
             <td  width="30%" valign="top" align="right">
                 <table>
@@ -22,7 +22,7 @@
                 </table>
             </td>
         </tr></table>
-        <a href = "kspell-globals.html">kspell Global and Namespace members</a><p></p>
+        <a href = "tdespell-globals.html">tdespell Global and Namespace members</a><p></p>
 <table width="100%" border="0"><tr>
 <td valign="top"><table border="0">
 <tr bgcolor="#fff0ff"><th>KDictSpellingHighlighter - KSpell</th></tr>
diff --git a/doc/classref/tdespell/tdespell-globals.html b/doc/classref/tdespell/tdespell-globals.html
new file mode 100644
index 0000000..e45f2c1
--- /dev/null
+++ b/doc/classref/tdespell/tdespell-globals.html
@@ -0,0 +1,38 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN
+        "http://www.w3.org/TR/html4/loose.dtd"">
+<html>
+<head>
+  <title>tdespell globals</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+  <meta name="GENERATOR" content="wabbit dumphtml">
+</head>
+<body>
+<h4>PyKDE - Python Bindings for KDE</h4>
+<hr>
+<table width="100%"><tr>
+            <td width ="70%">
+                <h1>tdespell Globals</h1><hr>
+            </td>
+            <td  width="30%" valign="top" align="right">
+                <table>
+                    <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
+                    <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdespell Classes</a></td></tr>
+                    <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
+                </table>
+            </td>
+        </tr></table>
+        <h3>enums</h3><ul>
+<li><b><a href="sip/tdespell/all-globals.html#Encoding">Encoding</a></b> = {KS_E_ASCII, KS_E_LATIN1, KS_E_LATIN2, KS_E_LATIN3, KS_E_LATIN4, KS_E_LATIN5, KS_E_LATIN7, KS_E_LATIN8, KS_E_LATIN9, KS_E_LATIN13, KS_E_LATIN15, KS_E_UTF8, KS_E_KOI8R, KS_E_KOI8U, KS_E_CP1251, KS_E_CP1255
+}<li><b><a href="sip/tdespell/all-globals.html#Encoding">Encoding</a></b> = {KS_E_ASCII, KS_E_LATIN1, KS_E_LATIN2, KS_E_LATIN3, KS_E_LATIN4, KS_E_LATIN5, KS_E_LATIN7, KS_E_LATIN8, KS_E_LATIN9, KS_E_LATIN13, KS_E_LATIN15, KS_E_UTF8, KS_E_KOI8R, KS_E_KOI8U, KS_E_CP1251
+}<li><b><a href="sip/tdespell/all-globals.html#Encoding">Encoding</a></b> = {KS_E_ASCII, KS_E_LATIN1, KS_E_LATIN2, KS_E_LATIN3, KS_E_LATIN4, KS_E_LATIN5, KS_E_LATIN7, KS_E_LATIN8, KS_E_LATIN9, KS_E_LATIN15, KS_E_UTF8, KS_E_KOI8R, KS_E_KOI8U, KS_E_CP1251, KS_E_LATIN13
+}<li><b><a href="sip/tdespell/all-globals.html#KS_RESULT">KS_RESULT</a></b> = {KS_CANCEL, KS_REPLACE, KS_REPLACEALL, KS_IGNORE, KS_IGNOREALL, KS_ADD, KS_STOP, KS_SUGGEST, KS_CONFIG
+}<li><b><a href="sip/tdespell/all-globals.html#KS_RESULT">KS_RESULT</a></b> = {KS_CANCEL, KS_REPLACE, KS_REPLACEALL, KS_IGNORE, KS_IGNOREALL, KS_ADD, KS_STOP
+}<li><b><a href="sip/tdespell/all-globals.html#KSpellClients">KSpellClients</a></b> = {KS_CLIENT_ISPELL, KS_CLIENT_ASPELL, KS_CLIENT_HSPELL, KS_CLIENT_ZEMBEREK
+}<li><b><a href="sip/tdespell/all-globals.html#KSpellClients">KSpellClients</a></b> = {KS_CLIENT_ISPELL, KS_CLIENT_ASPELL, KS_CLIENT_HSPELL
+}<li><b><a href="sip/tdespell/all-globals.html#KSpellClients">KSpellClients</a></b> = {KS_CLIENT_ISPELL, KS_CLIENT_ASPELL
+}</ul>
+
+</body>
+</html>
diff --git a/doc/classref/kutils/KCMultiDialog.html b/doc/classref/tdeutils/KCMultiDialog.html
index 0970aeb..c5eabaa 100644
--- a/doc/classref/kutils/KCMultiDialog.html
+++ b/doc/classref/tdeutils/KCMultiDialog.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kutils Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdeutils Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kutils</td>
+            <td width="30%" align=left>tdeutils</td>
         </tr>
         <tr><td>Class</td>
             <td>KCMultiDialog</td>
diff --git a/doc/classref/kutils/KFind.html b/doc/classref/tdeutils/KFind.html
index bea730a..eb14876 100644
--- a/doc/classref/kutils/KFind.html
+++ b/doc/classref/tdeutils/KFind.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kutils Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdeutils Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kutils</td>
+            <td width="30%" align=left>tdeutils</td>
         </tr>
         <tr><td>Class</td>
             <td>KFind</td>
diff --git a/doc/classref/kutils/KFindDialog.html b/doc/classref/tdeutils/KFindDialog.html
index 2eb6170..42de38c 100644
--- a/doc/classref/kutils/KFindDialog.html
+++ b/doc/classref/tdeutils/KFindDialog.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kutils Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdeutils Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kutils</td>
+            <td width="30%" align=left>tdeutils</td>
         </tr>
         <tr><td>Class</td>
             <td>KFindDialog</td>
diff --git a/doc/classref/kutils/KMultiTabBar.html b/doc/classref/tdeutils/KMultiTabBar.html
index 7d9091c..be38341 100644
--- a/doc/classref/kutils/KMultiTabBar.html
+++ b/doc/classref/tdeutils/KMultiTabBar.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kutils Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdeutils Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kutils</td>
+            <td width="30%" align=left>tdeutils</td>
         </tr>
         <tr><td>Class</td>
             <td>KMultiTabBar</td>
diff --git a/doc/classref/kutils/KMultiTabBarButton.html b/doc/classref/tdeutils/KMultiTabBarButton.html
index 18003b3..ae74559 100644
--- a/doc/classref/kutils/KMultiTabBarButton.html
+++ b/doc/classref/tdeutils/KMultiTabBarButton.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kutils Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdeutils Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kutils</td>
+            <td width="30%" align=left>tdeutils</td>
         </tr>
         <tr><td>Class</td>
             <td>KMultiTabBarButton</td>
diff --git a/doc/classref/kutils/KMultiTabBarTab.html b/doc/classref/tdeutils/KMultiTabBarTab.html
index a76c4a6..db7692b 100644
--- a/doc/classref/kutils/KMultiTabBarTab.html
+++ b/doc/classref/tdeutils/KMultiTabBarTab.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kutils Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdeutils Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kutils</td>
+            <td width="30%" align=left>tdeutils</td>
         </tr>
         <tr><td>Class</td>
             <td>KMultiTabBarTab</td>
diff --git a/doc/classref/kutils/KPluginInfo.html b/doc/classref/tdeutils/KPluginInfo.html
index 32de03d..dd520fa 100644
--- a/doc/classref/kutils/KPluginInfo.html
+++ b/doc/classref/tdeutils/KPluginInfo.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kutils Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdeutils Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kutils</td>
+            <td width="30%" align=left>tdeutils</td>
         </tr>
         <tr><td>Class</td>
             <td>KPluginInfo</td>
diff --git a/doc/classref/kutils/KPluginSelector.html b/doc/classref/tdeutils/KPluginSelector.html
index 6f17ff3..ad2c3d0 100644
--- a/doc/classref/kutils/KPluginSelector.html
+++ b/doc/classref/tdeutils/KPluginSelector.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kutils Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdeutils Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kutils</td>
+            <td width="30%" align=left>tdeutils</td>
         </tr>
         <tr><td>Class</td>
             <td>KPluginSelector</td>
diff --git a/doc/classref/kutils/KReplace.html b/doc/classref/tdeutils/KReplace.html
index c34b69c..c165e28 100644
--- a/doc/classref/kutils/KReplace.html
+++ b/doc/classref/tdeutils/KReplace.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kutils Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdeutils Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kutils</td>
+            <td width="30%" align=left>tdeutils</td>
         </tr>
         <tr><td>Class</td>
             <td>KReplace</td>
diff --git a/doc/classref/kutils/KReplaceDialog.html b/doc/classref/tdeutils/KReplaceDialog.html
index 66abb85..ae07d47 100644
--- a/doc/classref/kutils/KReplaceDialog.html
+++ b/doc/classref/tdeutils/KReplaceDialog.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kutils Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdeutils Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kutils</td>
+            <td width="30%" align=left>tdeutils</td>
         </tr>
         <tr><td>Class</td>
             <td>KReplaceDialog</td>
diff --git a/doc/classref/kutils/TDECModuleContainer.html b/doc/classref/tdeutils/TDECModuleContainer.html
index a379095..6760d4a 100644
--- a/doc/classref/kutils/TDECModuleContainer.html
+++ b/doc/classref/tdeutils/TDECModuleContainer.html
@@ -17,14 +17,14 @@
             <td  width="30%" valign="top" align="right">
                 <table>
                     <tr><td align="right"><a href= "../../index.html">Table of contents</a></td></tr>                    <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kutils Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdeutils Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kutils</td>
+            <td width="30%" align=left>tdeutils</td>
         </tr>
         <tr><td>Class</td>
             <td>TDECModuleContainer</td>
diff --git a/doc/classref/kutils/TDECModuleInfo.html b/doc/classref/tdeutils/TDECModuleInfo.html
index 19a3ab5..8b30d39 100644
--- a/doc/classref/kutils/TDECModuleInfo.html
+++ b/doc/classref/tdeutils/TDECModuleInfo.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kutils Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdeutils Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kutils</td>
+            <td width="30%" align=left>tdeutils</td>
         </tr>
         <tr><td>Class</td>
             <td>TDECModuleInfo</td>
diff --git a/doc/classref/kutils/TDECModuleLoader.html b/doc/classref/tdeutils/TDECModuleLoader.html
index 904577e..8d8c3fd 100644
--- a/doc/classref/kutils/TDECModuleLoader.html
+++ b/doc/classref/tdeutils/TDECModuleLoader.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kutils Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdeutils Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kutils</td>
+            <td width="30%" align=left>tdeutils</td>
         </tr>
         <tr><td>Class</td>
             <td>TDECModuleLoader</td>
diff --git a/doc/classref/kutils/TDECModuleProxy.html b/doc/classref/tdeutils/TDECModuleProxy.html
index 3746793..526eeb9 100644
--- a/doc/classref/kutils/TDECModuleProxy.html
+++ b/doc/classref/tdeutils/TDECModuleProxy.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kutils Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdeutils Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kutils</td>
+            <td width="30%" align=left>tdeutils</td>
         </tr>
         <tr><td>Class</td>
             <td>TDECModuleProxy</td>
diff --git a/doc/classref/kutils/index.html b/doc/classref/tdeutils/index.html
index 4453e8c..11909e3 100644
--- a/doc/classref/kutils/index.html
+++ b/doc/classref/tdeutils/index.html
@@ -3,7 +3,7 @@
         "http://www.w3.org/TR/html4/loose.dtd"">
 <html>
 <head>
-  <title>module kutils</title>
+  <title>module tdeutils</title>
   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
   <meta name="GENERATOR" content="wabbit dumphtml">
 </head>
@@ -12,7 +12,7 @@
 <hr>
 <table width="100%"><tr>
             <td width ="70%">
-                <h1>kutils Class Index</h1><hr>
+                <h1>tdeutils Class Index</h1><hr>
             </td>
             <td  width="30%" valign="top" align="right">
                 <table>
diff --git a/doc/examples.html b/doc/examples.html
index 8b409a9..0857d79 100644
--- a/doc/examples.html
+++ b/doc/examples.html
@@ -87,7 +87,7 @@ The output will vary with KDE version running or from machine to machine.
 <p>
 pyKHTMLPart.py demonstrates importing KHTMLPart as a KPart.
 </p>
-<img src="images/khtmlpart.png" border=0>
+<img src="images/tdehtmlpart.png" border=0>
 <p>
 The program is hard-coded to display the KDE website's main page, and requires
 an active internet connection to do the display (it will be blank if no internet
diff --git a/doc/images/khtmlpart.png b/doc/images/tdehtmlpart.png
index a1bb08b..a1bb08b 100644
--- a/doc/images/khtmlpart.png
+++ b/doc/images/tdehtmlpart.png
diff --git a/doc/index1.html b/doc/index1.html
index f0c9f4e..d4a0cec 100644
--- a/doc/index1.html
+++ b/doc/index1.html
@@ -36,14 +36,14 @@ the names of the separate KDE libraries, i.e.
 <TT CLASS="LITERAL">tdefx</TT>,
 <TT CLASS="LITERAL">tdeui</TT>,
 <TT CLASS="LITERAL">kio</TT>,
-<TT CLASS="LITERAL">kresources</TT>,
+<TT CLASS="LITERAL">tderesources</TT>,
 <TT CLASS="LITERAL">kabc</TT>,
 <TT CLASS="LITERAL">kfile</TT>,
-<TT CLASS="LITERAL">kparts</TT>,
-<TT CLASS="LITERAL">khtml</TT>,
-<TT CLASS="LITERAL">kspell</TT>,
+<TT CLASS="LITERAL">tdeparts</TT>,
+<TT CLASS="LITERAL">tdehtml</TT>,
+<TT CLASS="LITERAL">tdespell</TT>,
 <TT CLASS="LITERAL">tdeprint</TT>,
-<TT CLASS="LITERAL">kmdi</TT>.
+<TT CLASS="LITERAL">tdemdi</TT>.
 </P>
 <H2>Changes</H2>
 <P>
diff --git a/doc/static.html b/doc/static.html
index df876f4..d16c0be 100644
--- a/doc/static.html
+++ b/doc/static.html
@@ -69,8 +69,8 @@ TQFrame.TabFocus
 <H2>Namespaces</H2>
 <P>
 The C++ code in KDE makes extensive use of namespaces (especially in the kio, kjs,
-khtml, kfile, and kparts modules). In PyKDE, namespaces are treated as a "superclass".
-For example, "from kparts import KParts" will import the KParts namespace and all
+tdehtml, kfile, and tdeparts modules). In PyKDE, namespaces are treated as a "superclass".
+For example, "from tdeparts import KParts" will import the KParts namespace and all
 its members. To reference a class in the namespace, use &lt;namespace name&gt;..&lt;classname&gt;,
 for example, KParts.ReadOnlyPart. It isn't necessary to import the &lt;classname&gt; (ReadOnlyPart
 in the example).
diff --git a/examples/pyKHTMLPart.py b/examples/pyKHTMLPart.py
index e483d6f..2795526 100644
--- a/examples/pyKHTMLPart.py
+++ b/examples/pyKHTMLPart.py
@@ -51,10 +51,10 @@ from qt import  TQString, TQStringList
 
 from kio import KTrader
 
-from khtml import KHTMLPart, KHTMLView
+from tdehtml import KHTMLPart, KHTMLView
 
 # Importing the KParts namespace gets us all of the KParts:: classes
-from kparts import KParts, createReadOnlyPart, createReadWritePart
+from tdeparts import KParts, createReadOnlyPart, createReadWritePart
 
 import sys, os
 
diff --git a/examples/pytde-sampler/gen_todo.py b/examples/pytde-sampler/gen_todo.py
index 6abd5be..d094ab6 100644
--- a/examples/pytde-sampler/gen_todo.py
+++ b/examples/pytde-sampler/gen_todo.py
@@ -1,4 +1,4 @@
-mods = ['dcop', 'tdecore', 'tdefx', 'tdeprint', 'tdesu', 'tdeui', 'kfile', 'khtml', 'kio', 'kmdi', 'kparts', 'kspell', ]
+mods = ['dcop', 'tdecore', 'tdefx', 'tdeprint', 'tdesu', 'tdeui', 'kfile', 'tdehtml', 'kio', 'tdemdi', 'tdeparts', 'tdespell', ]
 all = []
 
 
diff --git a/examples/pytde-sampler/qt_widgets/CONTRIB b/examples/pytde-sampler/qt_widgets/CONTRIB
index bf546f4..ea10773 100644
--- a/examples/pytde-sampler/qt_widgets/CONTRIB
+++ b/examples/pytde-sampler/qt_widgets/CONTRIB
@@ -392,10 +392,10 @@ kfile,KURLComboRequester,,,
 kfile,KURLPropsPlugin,,,
 kfile,KURLRequester,,,
 kfile,KURLRequesterDlg,,,
-khtml,DOM,,,
-khtml,KHTMLPart,,,
-khtml,KHTMLSettings,,,
-khtml,KHTMLView,,,
+tdehtml,DOM,,,
+tdehtml,KHTMLPart,,,
+tdehtml,KHTMLSettings,,,
+tdehtml,KHTMLView,,,
 kio,KAr,,,
 kio,KArchive,,,
 kio,KArchiveDirectory,,,
@@ -484,54 +484,54 @@ kio,ThumbCreator,,,
 kio,testKIOMetaData,,,
 kio,testKIOUDSEntry,,,
 kio,testKIOUDSEntryList,,,
-kmdi,KMdi,,,
-kmdi,KMdiChildArea,,,
-kmdi,KMdiChildFrm,,,
-kmdi,KMdiChildFrmCaption,,,
-kmdi,KMdiChildFrmDragBeginEvent,,,
-kmdi,KMdiChildFrmDragEndEvent,,,
-kmdi,KMdiChildFrmMoveEvent,,,
-kmdi,KMdiChildFrmResizeBeginEvent,,,
-kmdi,KMdiChildFrmResizeEndEvent,,,
-kmdi,KMdiChildView,,,
-kmdi,KMdiMainFrm,,,
-kmdi,KMdiTaskBar,,,
-kmdi,KMdiTaskBarButton,,,
-kmdi,KMdiToolViewAccessor,,,
-kmdi,KMdiViewCloseEvent,,,
-kmdi,KMdiWin32IconButton,,,
-kparts,KParts,,,
-kparts,createReadOnlyPart,,,
-kparts,createReadWritePart,,,
-kparts,testTQMapTQCStringInt,,,
-kspell,KS_ADD,,,
-kspell,KS_CANCEL,,,
-kspell,KS_CLIENT_ASPELL,,,
-kspell,KS_CLIENT_HSPELL,,,
-kspell,KS_CLIENT_ISPELL,,,
-kspell,KS_CONFIG,,,
-kspell,KS_E_ASCII,,,
-kspell,KS_E_CP1251,,,
-kspell,KS_E_CP1255,,,
-kspell,KS_E_KOI8R,,,
-kspell,KS_E_KOI8U,,,
-kspell,KS_E_LATIN1,,,
-kspell,KS_E_LATIN13,,,
-kspell,KS_E_LATIN15,,,
-kspell,KS_E_LATIN2,,,
-kspell,KS_E_LATIN3,,,
-kspell,KS_E_LATIN4,,,
-kspell,KS_E_LATIN5,,,
-kspell,KS_E_LATIN7,,,
-kspell,KS_E_LATIN8,,,
-kspell,KS_E_LATIN9,,,
-kspell,KS_E_UTF8,,,
-kspell,KS_IGNORE,,,
-kspell,KS_IGNOREALL,,,
-kspell,KS_REPLACE,,,
-kspell,KS_REPLACEALL,,,
-kspell,KS_STOP,,,
-kspell,KS_SUGGEST,,,
-kspell,KSpell,,,
-kspell,KSpellConfig,,,
-kspell,KSpellDlg,,,
+tdemdi,KMdi,,,
+tdemdi,KMdiChildArea,,,
+tdemdi,KMdiChildFrm,,,
+tdemdi,KMdiChildFrmCaption,,,
+tdemdi,KMdiChildFrmDragBeginEvent,,,
+tdemdi,KMdiChildFrmDragEndEvent,,,
+tdemdi,KMdiChildFrmMoveEvent,,,
+tdemdi,KMdiChildFrmResizeBeginEvent,,,
+tdemdi,KMdiChildFrmResizeEndEvent,,,
+tdemdi,KMdiChildView,,,
+tdemdi,KMdiMainFrm,,,
+tdemdi,KMdiTaskBar,,,
+tdemdi,KMdiTaskBarButton,,,
+tdemdi,KMdiToolViewAccessor,,,
+tdemdi,KMdiViewCloseEvent,,,
+tdemdi,KMdiWin32IconButton,,,
+tdeparts,KParts,,,
+tdeparts,createReadOnlyPart,,,
+tdeparts,createReadWritePart,,,
+tdeparts,testTQMapTQCStringInt,,,
+tdespell,KS_ADD,,,
+tdespell,KS_CANCEL,,,
+tdespell,KS_CLIENT_ASPELL,,,
+tdespell,KS_CLIENT_HSPELL,,,
+tdespell,KS_CLIENT_ISPELL,,,
+tdespell,KS_CONFIG,,,
+tdespell,KS_E_ASCII,,,
+tdespell,KS_E_CP1251,,,
+tdespell,KS_E_CP1255,,,
+tdespell,KS_E_KOI8R,,,
+tdespell,KS_E_KOI8U,,,
+tdespell,KS_E_LATIN1,,,
+tdespell,KS_E_LATIN13,,,
+tdespell,KS_E_LATIN15,,,
+tdespell,KS_E_LATIN2,,,
+tdespell,KS_E_LATIN3,,,
+tdespell,KS_E_LATIN4,,,
+tdespell,KS_E_LATIN5,,,
+tdespell,KS_E_LATIN7,,,
+tdespell,KS_E_LATIN8,,,
+tdespell,KS_E_LATIN9,,,
+tdespell,KS_E_UTF8,,,
+tdespell,KS_IGNORE,,,
+tdespell,KS_IGNOREALL,,,
+tdespell,KS_REPLACE,,,
+tdespell,KS_REPLACEALL,,,
+tdespell,KS_STOP,,,
+tdespell,KS_SUGGEST,,,
+tdespell,KSpell,,,
+tdespell,KSpellConfig,,,
+tdespell,KSpellDlg,,,
diff --git a/examples/pytde-sampler/sampler.py b/examples/pytde-sampler/sampler.py
index 183b185..f90a1bb 100755
--- a/examples/pytde-sampler/sampler.py
+++ b/examples/pytde-sampler/sampler.py
@@ -22,8 +22,8 @@ from tdeui import KMainWindow, KPushButton, KSplashScreen, KStdAction
 from tdeui import KKeyDialog, KEditToolbar
 
 from kio import KTrader
-from kparts import createReadOnlyPart, createReadWritePart
-from khtml import KHTMLPart
+from tdeparts import createReadOnlyPart, createReadWritePart
+from tdehtml import KHTMLPart
 
 import about
 import lib
@@ -152,7 +152,7 @@ class WebFrame(CommonFrame):
     def __init__(self, parent):
         CommonFrame.__init__(self, parent)
         self.part = part = buildPart(self, 'text/html', "Type == 'Service'")
-        #part.connect(part, SIGNAL('khtmlMousePressEvent(a)'), self.onURL)
+        #part.connect(part, SIGNAL('tdehtmlMousePressEvent(a)'), self.onURL)
 
     def onURL(self, a):
         print '****', a
diff --git a/examples/uikmdi.py b/examples/uitdemdi.py
index 6c9cc21..f746384 100644
--- a/examples/uikmdi.py
+++ b/examples/uitdemdi.py
@@ -2,7 +2,7 @@
 """
 This is a rough Python translation of the ideas presented in this KMDI tutorial:
 
-    http://web.tiscali.it/andreabergia/kmditutorial.html
+    http://web.tiscali.it/andreabergia/tdemditutorial.html
 
 What does work:
 
@@ -33,7 +33,7 @@ from tdecore import i18n, TDEAboutData, TDEApplication, TDEGlobal, KIcon, TDECmd
 from tdeui import KDockWidget, KListBox, KStdAction
 
 try:
-    from kmdi import KMdi, KMdiMainFrm, KMdiChildView
+    from tdemdi import KMdi, KMdiMainFrm, KMdiChildView
 except (ImportError, ):
     print 'Exception importing KMDI; check your PyKDE installation'
     sys.exit(1)
@@ -55,7 +55,7 @@ class KmdiExample(KMdiMainFrm):
     """ KmdiExample(parent=None) -> an example KMdiMainFrm window
 
     """
-    uifilebase = 'uikmdi.rc'
+    uifilebase = 'uitdemdi.rc'
     viewIcons = ('network', 'email', 'stop', 'back', 'forward', )
     toolIcons = ('view_icon', 'configure')
 
@@ -167,7 +167,7 @@ class KmdiExample(KMdiMainFrm):
         try:
             caption = which.tabCaption()
         except (AttributeError, ):
-            ## probably None; bug in kmdi?
+            ## probably None; bug in tdemdi?
             return
         self.removeMainToolItem(which)
         which.close()
diff --git a/examples/uikmdi.rc b/examples/uitdemdi.rc
index a7e2196..a7e2196 100644
--- a/examples/uikmdi.rc
+++ b/examples/uitdemdi.rc
diff --git a/extra/kde300/konsole_part.h b/extra/kde300/konsole_part.h
index fcbd612..8fbf1b6 100644
--- a/extra/kde300/konsole_part.h
+++ b/extra/kde300/konsole_part.h
@@ -21,8 +21,8 @@
 #ifndef __KONSOLE_PART_H__
 #define __KONSOLE_PART_H__
 
-#include <kparts/browserextension.h>
-#include <kparts/factory.h>
+#include <tdeparts/browserextension.h>
+#include <tdeparts/factory.h>
 
 
 #include <kdialogbase.h>
diff --git a/extra/kde300/ksycocafactory.h b/extra/kde300/tdesycocafactory.h
index ff1d43c..2be0e58 100644
--- a/extra/kde300/ksycocafactory.h
+++ b/extra/kde300/tdesycocafactory.h
@@ -16,11 +16,11 @@
  *  Boston, MA 02110-1301, USA.
  **/
 
-#ifndef __ksycocafactory_h__
-#define __ksycocafactory_h__ "$Id: ksycocafactory.h,v 1.12 2002/03/03 21:20:26 lunakl Exp $"
+#ifndef __tdesycocafactory_h__
+#define __tdesycocafactory_h__ "$Id: tdesycocafactory.h,v 1.12 2002/03/03 21:20:26 lunakl Exp $"
 
-#include "ksycocatype.h"
-#include "ksycocaentry.h"
+#include "tdesycocatype.h"
+#include "tdesycocaentry.h"
 
 #include <tqdict.h>
 #include <tqptrlist.h>
diff --git a/extra/kde301/konsole_part.h b/extra/kde301/konsole_part.h
index fcbd612..8fbf1b6 100644
--- a/extra/kde301/konsole_part.h
+++ b/extra/kde301/konsole_part.h
@@ -21,8 +21,8 @@
 #ifndef __KONSOLE_PART_H__
 #define __KONSOLE_PART_H__
 
-#include <kparts/browserextension.h>
-#include <kparts/factory.h>
+#include <tdeparts/browserextension.h>
+#include <tdeparts/factory.h>
 
 
 #include <kdialogbase.h>
diff --git a/extra/kde301/ksycocafactory.h b/extra/kde301/tdesycocafactory.h
index ff1d43c..2be0e58 100644
--- a/extra/kde301/ksycocafactory.h
+++ b/extra/kde301/tdesycocafactory.h
@@ -16,11 +16,11 @@
  *  Boston, MA 02110-1301, USA.
  **/
 
-#ifndef __ksycocafactory_h__
-#define __ksycocafactory_h__ "$Id: ksycocafactory.h,v 1.12 2002/03/03 21:20:26 lunakl Exp $"
+#ifndef __tdesycocafactory_h__
+#define __tdesycocafactory_h__ "$Id: tdesycocafactory.h,v 1.12 2002/03/03 21:20:26 lunakl Exp $"
 
-#include "ksycocatype.h"
-#include "ksycocaentry.h"
+#include "tdesycocatype.h"
+#include "tdesycocaentry.h"
 
 #include <tqdict.h>
 #include <tqptrlist.h>
diff --git a/extra/kde303/konsole_part.h b/extra/kde303/konsole_part.h
index fcbd612..8fbf1b6 100644
--- a/extra/kde303/konsole_part.h
+++ b/extra/kde303/konsole_part.h
@@ -21,8 +21,8 @@
 #ifndef __KONSOLE_PART_H__
 #define __KONSOLE_PART_H__
 
-#include <kparts/browserextension.h>
-#include <kparts/factory.h>
+#include <tdeparts/browserextension.h>
+#include <tdeparts/factory.h>
 
 
 #include <kdialogbase.h>
diff --git a/extra/kde303/ksycocafactory.h b/extra/kde303/tdesycocafactory.h
index ff1d43c..2be0e58 100644
--- a/extra/kde303/ksycocafactory.h
+++ b/extra/kde303/tdesycocafactory.h
@@ -16,11 +16,11 @@
  *  Boston, MA 02110-1301, USA.
  **/
 
-#ifndef __ksycocafactory_h__
-#define __ksycocafactory_h__ "$Id: ksycocafactory.h,v 1.12 2002/03/03 21:20:26 lunakl Exp $"
+#ifndef __tdesycocafactory_h__
+#define __tdesycocafactory_h__ "$Id: tdesycocafactory.h,v 1.12 2002/03/03 21:20:26 lunakl Exp $"
 
-#include "ksycocatype.h"
-#include "ksycocaentry.h"
+#include "tdesycocatype.h"
+#include "tdesycocaentry.h"
 
 #include <tqdict.h>
 #include <tqptrlist.h>
diff --git a/extra/kde310/konsole_part.h b/extra/kde310/konsole_part.h
index fcbd612..8fbf1b6 100644
--- a/extra/kde310/konsole_part.h
+++ b/extra/kde310/konsole_part.h
@@ -21,8 +21,8 @@
 #ifndef __KONSOLE_PART_H__
 #define __KONSOLE_PART_H__
 
-#include <kparts/browserextension.h>
-#include <kparts/factory.h>
+#include <tdeparts/browserextension.h>
+#include <tdeparts/factory.h>
 
 
 #include <kdialogbase.h>
diff --git a/extra/kde310/ksycocafactory.h b/extra/kde310/tdesycocafactory.h
index 1959edd..1b3bdf3 100644
--- a/extra/kde310/ksycocafactory.h
+++ b/extra/kde310/tdesycocafactory.h
@@ -16,11 +16,11 @@
  *  Boston, MA 02110-1301, USA.
  **/
 
-#ifndef __ksycocafactory_h__
-#define __ksycocafactory_h__ "$Id: ksycocafactory.h,v 1.13 2002/09/21 15:07:27 tjansen Exp $"
+#ifndef __tdesycocafactory_h__
+#define __tdesycocafactory_h__ "$Id: tdesycocafactory.h,v 1.13 2002/09/21 15:07:27 tjansen Exp $"
 
-#include "ksycocatype.h"
-#include "ksycocaentry.h"
+#include "tdesycocatype.h"
+#include "tdesycocaentry.h"
 
 #include <tqdict.h>
 #include <tqptrlist.h>
diff --git a/extra/kde311/konsole_part.h b/extra/kde311/konsole_part.h
index fcbd612..8fbf1b6 100644
--- a/extra/kde311/konsole_part.h
+++ b/extra/kde311/konsole_part.h
@@ -21,8 +21,8 @@
 #ifndef __KONSOLE_PART_H__
 #define __KONSOLE_PART_H__
 
-#include <kparts/browserextension.h>
-#include <kparts/factory.h>
+#include <tdeparts/browserextension.h>
+#include <tdeparts/factory.h>
 
 
 #include <kdialogbase.h>
diff --git a/extra/kde311/ksycocafactory.h b/extra/kde311/tdesycocafactory.h
index 1959edd..1b3bdf3 100644
--- a/extra/kde311/ksycocafactory.h
+++ b/extra/kde311/tdesycocafactory.h
@@ -16,11 +16,11 @@
  *  Boston, MA 02110-1301, USA.
  **/
 
-#ifndef __ksycocafactory_h__
-#define __ksycocafactory_h__ "$Id: ksycocafactory.h,v 1.13 2002/09/21 15:07:27 tjansen Exp $"
+#ifndef __tdesycocafactory_h__
+#define __tdesycocafactory_h__ "$Id: tdesycocafactory.h,v 1.13 2002/09/21 15:07:27 tjansen Exp $"
 
-#include "ksycocatype.h"
-#include "ksycocaentry.h"
+#include "tdesycocatype.h"
+#include "tdesycocaentry.h"
 
 #include <tqdict.h>
 #include <tqptrlist.h>
diff --git a/extra/kde312/konsole_part.h b/extra/kde312/konsole_part.h
index fcbd612..8fbf1b6 100644
--- a/extra/kde312/konsole_part.h
+++ b/extra/kde312/konsole_part.h
@@ -21,8 +21,8 @@
 #ifndef __KONSOLE_PART_H__
 #define __KONSOLE_PART_H__
 
-#include <kparts/browserextension.h>
-#include <kparts/factory.h>
+#include <tdeparts/browserextension.h>
+#include <tdeparts/factory.h>
 
 
 #include <kdialogbase.h>
diff --git a/extra/kde312/ksycocafactory.h b/extra/kde312/tdesycocafactory.h
index 1959edd..1b3bdf3 100644
--- a/extra/kde312/ksycocafactory.h
+++ b/extra/kde312/tdesycocafactory.h
@@ -16,11 +16,11 @@
  *  Boston, MA 02110-1301, USA.
  **/
 
-#ifndef __ksycocafactory_h__
-#define __ksycocafactory_h__ "$Id: ksycocafactory.h,v 1.13 2002/09/21 15:07:27 tjansen Exp $"
+#ifndef __tdesycocafactory_h__
+#define __tdesycocafactory_h__ "$Id: tdesycocafactory.h,v 1.13 2002/09/21 15:07:27 tjansen Exp $"
 
-#include "ksycocatype.h"
-#include "ksycocaentry.h"
+#include "tdesycocatype.h"
+#include "tdesycocaentry.h"
 
 #include <tqdict.h>
 #include <tqptrlist.h>
diff --git a/extra/kde313/konsole_part.h b/extra/kde313/konsole_part.h
index fcbd612..8fbf1b6 100644
--- a/extra/kde313/konsole_part.h
+++ b/extra/kde313/konsole_part.h
@@ -21,8 +21,8 @@
 #ifndef __KONSOLE_PART_H__
 #define __KONSOLE_PART_H__
 
-#include <kparts/browserextension.h>
-#include <kparts/factory.h>
+#include <tdeparts/browserextension.h>
+#include <tdeparts/factory.h>
 
 
 #include <kdialogbase.h>
diff --git a/extra/kde313/ksycocafactory.h b/extra/kde313/tdesycocafactory.h
index 1959edd..1b3bdf3 100644
--- a/extra/kde313/ksycocafactory.h
+++ b/extra/kde313/tdesycocafactory.h
@@ -16,11 +16,11 @@
  *  Boston, MA 02110-1301, USA.
  **/
 
-#ifndef __ksycocafactory_h__
-#define __ksycocafactory_h__ "$Id: ksycocafactory.h,v 1.13 2002/09/21 15:07:27 tjansen Exp $"
+#ifndef __tdesycocafactory_h__
+#define __tdesycocafactory_h__ "$Id: tdesycocafactory.h,v 1.13 2002/09/21 15:07:27 tjansen Exp $"
 
-#include "ksycocatype.h"
-#include "ksycocaentry.h"
+#include "tdesycocatype.h"
+#include "tdesycocaentry.h"
 
 #include <tqdict.h>
 #include <tqptrlist.h>
diff --git a/extra/kde314/konsole_part.h b/extra/kde314/konsole_part.h
index fcbd612..8fbf1b6 100644
--- a/extra/kde314/konsole_part.h
+++ b/extra/kde314/konsole_part.h
@@ -21,8 +21,8 @@
 #ifndef __KONSOLE_PART_H__
 #define __KONSOLE_PART_H__
 
-#include <kparts/browserextension.h>
-#include <kparts/factory.h>
+#include <tdeparts/browserextension.h>
+#include <tdeparts/factory.h>
 
 
 #include <kdialogbase.h>
diff --git a/extra/kde314/ksycocafactory.h b/extra/kde314/ksycocafactory.h
deleted file mode 100644
index 1959edd..0000000
--- a/extra/kde314/ksycocafactory.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/*  This file is part of the KDE libraries
- *  Copyright (C) 1999 Waldo Bastian <bastian@kde.org>
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public
- *  License version 2 as published by the Free Software Foundation;
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public License
- *  along with this library; see the file COPYING.LIB.  If not, write to
- *  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- *  Boston, MA 02110-1301, USA.
- **/
-
-#ifndef __ksycocafactory_h__
-#define __ksycocafactory_h__ "$Id: ksycocafactory.h,v 1.13 2002/09/21 15:07:27 tjansen Exp $"
-
-#include "ksycocatype.h"
-#include "ksycocaentry.h"
-
-#include <tqdict.h>
-#include <tqptrlist.h>
-class KSycoca;
-class TQStringList;
-class TQString;
-class KSycocaDict;
-class KSycocaResourceList;
-
-typedef TQDict<KSycocaEntry::Ptr> KSycocaEntryDict;
-
-/**
- * @internal
- * Base class for sycoca factories
- */
-class KSycocaFactory
-{
-public:
-   virtual KSycocaFactoryId factoryId() const = 0;
- 
-protected: // virtual class
-   /**
-    * Create a factory which can be used to lookup from/create a database
-    * (depending on KSycoca::isBuilding())
-    */
-   KSycocaFactory( KSycocaFactoryId factory_id );
-
-public:
-   virtual ~KSycocaFactory();
-
-   /**
-    * @return the position of the factory in the sycoca file
-    */
-   int offset() { return mOffset; }
-
-   /**
-    * @return the dict, for special use by KBuildSycoca
-    */
-   KSycocaEntryDict * entryDict() { return m_entryDict; }
-
-   /**
-    * Construct an entry from a config file.
-    * To be implemented in the real factories.
-    */
-   virtual KSycocaEntry *createEntry(const TQString &file, const char *resource) = 0;
-
-   /**
-    * Add an entry
-    */
-   virtual void addEntry(KSycocaEntry *newEntry, const char *resource);
-
-   /**
-    * Read an entry from the database
-    */
-   virtual KSycocaEntry *createEntry(int offset)=0;
-
-   /**
-    * Get a list of all entries from the database.
-    */
-   KSycocaEntry::List allEntries();
-
-   /**
-    * Saves all entries it maintains as well as index files
-    * for these entries to the stream 'str'.
-    *
-    * Also sets mOffset to the starting position.
-    *
-    * The stream is positioned at the end of the last index.
-    *
-    * Don't forget to call the parent first when you override 
-    * this function.
-    */
-   virtual void save(TQDataStream &str);
-
-   /**
-    * Writes out a header to the stream 'str'.
-    * The baseclass positions the stream correctly.
-    *
-    * Don't forget to call the parent first when you override 
-    * this function.
-    */
-   virtual void saveHeader(TQDataStream &str);
-
-   /**
-    * @return the resources for which this factory is responsible.
-    */
-   virtual const KSycocaResourceList * resourceList() const { return m_resourceList; }
-
-private:
-   int mOffset;
-
-protected:
-   int m_sycocaDictOffset;
-   int m_beginEntryOffset;
-   int m_endEntryOffset;
-   TQDataStream *m_str;
-
-   KSycocaResourceList *m_resourceList;
-   KSycocaEntryDict *m_entryDict;
-   KSycocaDict *m_sycocaDict;
-protected:
-   virtual void virtual_hook( int id, void* data );
-};
-
-/** This, instead of a typedef, allows to declare "class ..." in header files
- * @internal
- */
-class KSycocaFactoryList : public TQPtrList<KSycocaFactory>
-{
-public:
-   KSycocaFactoryList() { }
-};
-
-#endif
diff --git a/extra/kde314/tdesycocafactory.h b/extra/kde314/tdesycocafactory.h
new file mode 100644
index 0000000..1b3bdf3
--- /dev/null
+++ b/extra/kde314/tdesycocafactory.h
@@ -0,0 +1,137 @@
+/*  This file is part of the KDE libraries
+ *  Copyright (C) 1999 Waldo Bastian <bastian@kde.org>
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Library General Public
+ *  License version 2 as published by the Free Software Foundation;
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Library General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Library General Public License
+ *  along with this library; see the file COPYING.LIB.  If not, write to
+ *  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ *  Boston, MA 02110-1301, USA.
+ **/
+
+#ifndef __tdesycocafactory_h__
+#define __tdesycocafactory_h__ "$Id: tdesycocafactory.h,v 1.13 2002/09/21 15:07:27 tjansen Exp $"
+
+#include "tdesycocatype.h"
+#include "tdesycocaentry.h"
+
+#include <tqdict.h>
+#include <tqptrlist.h>
+class KSycoca;
+class TQStringList;
+class TQString;
+class KSycocaDict;
+class KSycocaResourceList;
+
+typedef TQDict<KSycocaEntry::Ptr> KSycocaEntryDict;
+
+/**
+ * @internal
+ * Base class for sycoca factories
+ */
+class KSycocaFactory
+{
+public:
+   virtual KSycocaFactoryId factoryId() const = 0;
+ 
+protected: // virtual class
+   /**
+    * Create a factory which can be used to lookup from/create a database
+    * (depending on KSycoca::isBuilding())
+    */
+   KSycocaFactory( KSycocaFactoryId factory_id );
+
+public:
+   virtual ~KSycocaFactory();
+
+   /**
+    * @return the position of the factory in the sycoca file
+    */
+   int offset() { return mOffset; }
+
+   /**
+    * @return the dict, for special use by KBuildSycoca
+    */
+   KSycocaEntryDict * entryDict() { return m_entryDict; }
+
+   /**
+    * Construct an entry from a config file.
+    * To be implemented in the real factories.
+    */
+   virtual KSycocaEntry *createEntry(const TQString &file, const char *resource) = 0;
+
+   /**
+    * Add an entry
+    */
+   virtual void addEntry(KSycocaEntry *newEntry, const char *resource);
+
+   /**
+    * Read an entry from the database
+    */
+   virtual KSycocaEntry *createEntry(int offset)=0;
+
+   /**
+    * Get a list of all entries from the database.
+    */
+   KSycocaEntry::List allEntries();
+
+   /**
+    * Saves all entries it maintains as well as index files
+    * for these entries to the stream 'str'.
+    *
+    * Also sets mOffset to the starting position.
+    *
+    * The stream is positioned at the end of the last index.
+    *
+    * Don't forget to call the parent first when you override 
+    * this function.
+    */
+   virtual void save(TQDataStream &str);
+
+   /**
+    * Writes out a header to the stream 'str'.
+    * The baseclass positions the stream correctly.
+    *
+    * Don't forget to call the parent first when you override 
+    * this function.
+    */
+   virtual void saveHeader(TQDataStream &str);
+
+   /**
+    * @return the resources for which this factory is responsible.
+    */
+   virtual const KSycocaResourceList * resourceList() const { return m_resourceList; }
+
+private:
+   int mOffset;
+
+protected:
+   int m_sycocaDictOffset;
+   int m_beginEntryOffset;
+   int m_endEntryOffset;
+   TQDataStream *m_str;
+
+   KSycocaResourceList *m_resourceList;
+   KSycocaEntryDict *m_entryDict;
+   KSycocaDict *m_sycocaDict;
+protected:
+   virtual void virtual_hook( int id, void* data );
+};
+
+/** This, instead of a typedef, allows to declare "class ..." in header files
+ * @internal
+ */
+class KSycocaFactoryList : public TQPtrList<KSycocaFactory>
+{
+public:
+   KSycocaFactoryList() { }
+};
+
+#endif
diff --git a/extra/kde315/konsole_part.h b/extra/kde315/konsole_part.h
index fcbd612..8fbf1b6 100644
--- a/extra/kde315/konsole_part.h
+++ b/extra/kde315/konsole_part.h
@@ -21,8 +21,8 @@
 #ifndef __KONSOLE_PART_H__
 #define __KONSOLE_PART_H__
 
-#include <kparts/browserextension.h>
-#include <kparts/factory.h>
+#include <tdeparts/browserextension.h>
+#include <tdeparts/factory.h>
 
 
 #include <kdialogbase.h>
diff --git a/extra/kde315/ksycocafactory.h b/extra/kde315/ksycocafactory.h
deleted file mode 100644
index 1959edd..0000000
--- a/extra/kde315/ksycocafactory.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/*  This file is part of the KDE libraries
- *  Copyright (C) 1999 Waldo Bastian <bastian@kde.org>
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public
- *  License version 2 as published by the Free Software Foundation;
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public License
- *  along with this library; see the file COPYING.LIB.  If not, write to
- *  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- *  Boston, MA 02110-1301, USA.
- **/
-
-#ifndef __ksycocafactory_h__
-#define __ksycocafactory_h__ "$Id: ksycocafactory.h,v 1.13 2002/09/21 15:07:27 tjansen Exp $"
-
-#include "ksycocatype.h"
-#include "ksycocaentry.h"
-
-#include <tqdict.h>
-#include <tqptrlist.h>
-class KSycoca;
-class TQStringList;
-class TQString;
-class KSycocaDict;
-class KSycocaResourceList;
-
-typedef TQDict<KSycocaEntry::Ptr> KSycocaEntryDict;
-
-/**
- * @internal
- * Base class for sycoca factories
- */
-class KSycocaFactory
-{
-public:
-   virtual KSycocaFactoryId factoryId() const = 0;
- 
-protected: // virtual class
-   /**
-    * Create a factory which can be used to lookup from/create a database
-    * (depending on KSycoca::isBuilding())
-    */
-   KSycocaFactory( KSycocaFactoryId factory_id );
-
-public:
-   virtual ~KSycocaFactory();
-
-   /**
-    * @return the position of the factory in the sycoca file
-    */
-   int offset() { return mOffset; }
-
-   /**
-    * @return the dict, for special use by KBuildSycoca
-    */
-   KSycocaEntryDict * entryDict() { return m_entryDict; }
-
-   /**
-    * Construct an entry from a config file.
-    * To be implemented in the real factories.
-    */
-   virtual KSycocaEntry *createEntry(const TQString &file, const char *resource) = 0;
-
-   /**
-    * Add an entry
-    */
-   virtual void addEntry(KSycocaEntry *newEntry, const char *resource);
-
-   /**
-    * Read an entry from the database
-    */
-   virtual KSycocaEntry *createEntry(int offset)=0;
-
-   /**
-    * Get a list of all entries from the database.
-    */
-   KSycocaEntry::List allEntries();
-
-   /**
-    * Saves all entries it maintains as well as index files
-    * for these entries to the stream 'str'.
-    *
-    * Also sets mOffset to the starting position.
-    *
-    * The stream is positioned at the end of the last index.
-    *
-    * Don't forget to call the parent first when you override 
-    * this function.
-    */
-   virtual void save(TQDataStream &str);
-
-   /**
-    * Writes out a header to the stream 'str'.
-    * The baseclass positions the stream correctly.
-    *
-    * Don't forget to call the parent first when you override 
-    * this function.
-    */
-   virtual void saveHeader(TQDataStream &str);
-
-   /**
-    * @return the resources for which this factory is responsible.
-    */
-   virtual const KSycocaResourceList * resourceList() const { return m_resourceList; }
-
-private:
-   int mOffset;
-
-protected:
-   int m_sycocaDictOffset;
-   int m_beginEntryOffset;
-   int m_endEntryOffset;
-   TQDataStream *m_str;
-
-   KSycocaResourceList *m_resourceList;
-   KSycocaEntryDict *m_entryDict;
-   KSycocaDict *m_sycocaDict;
-protected:
-   virtual void virtual_hook( int id, void* data );
-};
-
-/** This, instead of a typedef, allows to declare "class ..." in header files
- * @internal
- */
-class KSycocaFactoryList : public TQPtrList<KSycocaFactory>
-{
-public:
-   KSycocaFactoryList() { }
-};
-
-#endif
diff --git a/extra/kde315/tdesycocafactory.h b/extra/kde315/tdesycocafactory.h
new file mode 100644
index 0000000..1b3bdf3
--- /dev/null
+++ b/extra/kde315/tdesycocafactory.h
@@ -0,0 +1,137 @@
+/*  This file is part of the KDE libraries
+ *  Copyright (C) 1999 Waldo Bastian <bastian@kde.org>
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Library General Public
+ *  License version 2 as published by the Free Software Foundation;
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Library General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Library General Public License
+ *  along with this library; see the file COPYING.LIB.  If not, write to
+ *  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ *  Boston, MA 02110-1301, USA.
+ **/
+
+#ifndef __tdesycocafactory_h__
+#define __tdesycocafactory_h__ "$Id: tdesycocafactory.h,v 1.13 2002/09/21 15:07:27 tjansen Exp $"
+
+#include "tdesycocatype.h"
+#include "tdesycocaentry.h"
+
+#include <tqdict.h>
+#include <tqptrlist.h>
+class KSycoca;
+class TQStringList;
+class TQString;
+class KSycocaDict;
+class KSycocaResourceList;
+
+typedef TQDict<KSycocaEntry::Ptr> KSycocaEntryDict;
+
+/**
+ * @internal
+ * Base class for sycoca factories
+ */
+class KSycocaFactory
+{
+public:
+   virtual KSycocaFactoryId factoryId() const = 0;
+ 
+protected: // virtual class
+   /**
+    * Create a factory which can be used to lookup from/create a database
+    * (depending on KSycoca::isBuilding())
+    */
+   KSycocaFactory( KSycocaFactoryId factory_id );
+
+public:
+   virtual ~KSycocaFactory();
+
+   /**
+    * @return the position of the factory in the sycoca file
+    */
+   int offset() { return mOffset; }
+
+   /**
+    * @return the dict, for special use by KBuildSycoca
+    */
+   KSycocaEntryDict * entryDict() { return m_entryDict; }
+
+   /**
+    * Construct an entry from a config file.
+    * To be implemented in the real factories.
+    */
+   virtual KSycocaEntry *createEntry(const TQString &file, const char *resource) = 0;
+
+   /**
+    * Add an entry
+    */
+   virtual void addEntry(KSycocaEntry *newEntry, const char *resource);
+
+   /**
+    * Read an entry from the database
+    */
+   virtual KSycocaEntry *createEntry(int offset)=0;
+
+   /**
+    * Get a list of all entries from the database.
+    */
+   KSycocaEntry::List allEntries();
+
+   /**
+    * Saves all entries it maintains as well as index files
+    * for these entries to the stream 'str'.
+    *
+    * Also sets mOffset to the starting position.
+    *
+    * The stream is positioned at the end of the last index.
+    *
+    * Don't forget to call the parent first when you override 
+    * this function.
+    */
+   virtual void save(TQDataStream &str);
+
+   /**
+    * Writes out a header to the stream 'str'.
+    * The baseclass positions the stream correctly.
+    *
+    * Don't forget to call the parent first when you override 
+    * this function.
+    */
+   virtual void saveHeader(TQDataStream &str);
+
+   /**
+    * @return the resources for which this factory is responsible.
+    */
+   virtual const KSycocaResourceList * resourceList() const { return m_resourceList; }
+
+private:
+   int mOffset;
+
+protected:
+   int m_sycocaDictOffset;
+   int m_beginEntryOffset;
+   int m_endEntryOffset;
+   TQDataStream *m_str;
+
+   KSycocaResourceList *m_resourceList;
+   KSycocaEntryDict *m_entryDict;
+   KSycocaDict *m_sycocaDict;
+protected:
+   virtual void virtual_hook( int id, void* data );
+};
+
+/** This, instead of a typedef, allows to declare "class ..." in header files
+ * @internal
+ */
+class KSycocaFactoryList : public TQPtrList<KSycocaFactory>
+{
+public:
+   KSycocaFactoryList() { }
+};
+
+#endif
diff --git a/extra/kde320/configwidget.h b/extra/kde320/configwidget.h
index afe677e..3c2052c 100644
--- a/extra/kde320/configwidget.h
+++ b/extra/kde320/configwidget.h
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkresources.
+    This file is part of libtderesources.
     Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
     Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
 
diff --git a/extra/kde320/konsole_part.h b/extra/kde320/konsole_part.h
index fcbd612..8fbf1b6 100644
--- a/extra/kde320/konsole_part.h
+++ b/extra/kde320/konsole_part.h
@@ -21,8 +21,8 @@
 #ifndef __KONSOLE_PART_H__
 #define __KONSOLE_PART_H__
 
-#include <kparts/browserextension.h>
-#include <kparts/factory.h>
+#include <tdeparts/browserextension.h>
+#include <tdeparts/factory.h>
 
 
 #include <kdialogbase.h>
diff --git a/extra/kde320/selectdialog.h b/extra/kde320/selectdialog.h
index 680d48e..4fc3685 100644
--- a/extra/kde320/selectdialog.h
+++ b/extra/kde320/selectdialog.h
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkresources.
+    This file is part of libtderesources.
 
     Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
     Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
diff --git a/extra/kde320/ksycocafactory.h b/extra/kde320/tdesycocafactory.h
index 2a114ee..97d2e19 100644
--- a/extra/kde320/ksycocafactory.h
+++ b/extra/kde320/tdesycocafactory.h
@@ -16,11 +16,11 @@
  *  Boston, MA 02110-1301, USA.
  **/
 
-#ifndef __ksycocafactory_h__
-#define __ksycocafactory_h__ "$Id: ksycocafactory.h,v 1.14 2003/10/29 17:59:18 waba Exp $"
+#ifndef __tdesycocafactory_h__
+#define __tdesycocafactory_h__ "$Id: tdesycocafactory.h,v 1.14 2003/10/29 17:59:18 waba Exp $"
 
-#include "ksycocatype.h"
-#include "ksycocaentry.h"
+#include "tdesycocatype.h"
+#include "tdesycocaentry.h"
 
 #include <tqdict.h>
 #include <tqptrlist.h>
diff --git a/extra/kde321/configwidget.h b/extra/kde321/configwidget.h
index afe677e..3c2052c 100644
--- a/extra/kde321/configwidget.h
+++ b/extra/kde321/configwidget.h
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkresources.
+    This file is part of libtderesources.
     Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
     Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
 
diff --git a/extra/kde321/konsole_part.h b/extra/kde321/konsole_part.h
index fcbd612..8fbf1b6 100644
--- a/extra/kde321/konsole_part.h
+++ b/extra/kde321/konsole_part.h
@@ -21,8 +21,8 @@
 #ifndef __KONSOLE_PART_H__
 #define __KONSOLE_PART_H__
 
-#include <kparts/browserextension.h>
-#include <kparts/factory.h>
+#include <tdeparts/browserextension.h>
+#include <tdeparts/factory.h>
 
 
 #include <kdialogbase.h>
diff --git a/extra/kde321/selectdialog.h b/extra/kde321/selectdialog.h
index 680d48e..4fc3685 100644
--- a/extra/kde321/selectdialog.h
+++ b/extra/kde321/selectdialog.h
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkresources.
+    This file is part of libtderesources.
 
     Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
     Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
diff --git a/extra/kde321/ksycocafactory.h b/extra/kde321/tdesycocafactory.h
index 2a114ee..97d2e19 100644
--- a/extra/kde321/ksycocafactory.h
+++ b/extra/kde321/tdesycocafactory.h
@@ -16,11 +16,11 @@
  *  Boston, MA 02110-1301, USA.
  **/
 
-#ifndef __ksycocafactory_h__
-#define __ksycocafactory_h__ "$Id: ksycocafactory.h,v 1.14 2003/10/29 17:59:18 waba Exp $"
+#ifndef __tdesycocafactory_h__
+#define __tdesycocafactory_h__ "$Id: tdesycocafactory.h,v 1.14 2003/10/29 17:59:18 waba Exp $"
 
-#include "ksycocatype.h"
-#include "ksycocaentry.h"
+#include "tdesycocatype.h"
+#include "tdesycocaentry.h"
 
 #include <tqdict.h>
 #include <tqptrlist.h>
diff --git a/extra/kde322/configwidget.h b/extra/kde322/configwidget.h
index afe677e..3c2052c 100644
--- a/extra/kde322/configwidget.h
+++ b/extra/kde322/configwidget.h
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkresources.
+    This file is part of libtderesources.
     Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
     Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
 
diff --git a/extra/kde322/konsole_part.h b/extra/kde322/konsole_part.h
index fcbd612..8fbf1b6 100644
--- a/extra/kde322/konsole_part.h
+++ b/extra/kde322/konsole_part.h
@@ -21,8 +21,8 @@
 #ifndef __KONSOLE_PART_H__
 #define __KONSOLE_PART_H__
 
-#include <kparts/browserextension.h>
-#include <kparts/factory.h>
+#include <tdeparts/browserextension.h>
+#include <tdeparts/factory.h>
 
 
 #include <kdialogbase.h>
diff --git a/extra/kde322/selectdialog.h b/extra/kde322/selectdialog.h
index 680d48e..4fc3685 100644
--- a/extra/kde322/selectdialog.h
+++ b/extra/kde322/selectdialog.h
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkresources.
+    This file is part of libtderesources.
 
     Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
     Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
diff --git a/extra/kde322/ksycocafactory.h b/extra/kde322/tdesycocafactory.h
index 2a114ee..97d2e19 100644
--- a/extra/kde322/ksycocafactory.h
+++ b/extra/kde322/tdesycocafactory.h
@@ -16,11 +16,11 @@
  *  Boston, MA 02110-1301, USA.
  **/
 
-#ifndef __ksycocafactory_h__
-#define __ksycocafactory_h__ "$Id: ksycocafactory.h,v 1.14 2003/10/29 17:59:18 waba Exp $"
+#ifndef __tdesycocafactory_h__
+#define __tdesycocafactory_h__ "$Id: tdesycocafactory.h,v 1.14 2003/10/29 17:59:18 waba Exp $"
 
-#include "ksycocatype.h"
-#include "ksycocaentry.h"
+#include "tdesycocatype.h"
+#include "tdesycocaentry.h"
 
 #include <tqdict.h>
 #include <tqptrlist.h>
diff --git a/extra/kde323/configwidget.h b/extra/kde323/configwidget.h
index afe677e..3c2052c 100644
--- a/extra/kde323/configwidget.h
+++ b/extra/kde323/configwidget.h
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkresources.
+    This file is part of libtderesources.
     Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
     Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
 
diff --git a/extra/kde323/konsole_part.h b/extra/kde323/konsole_part.h
index fcbd612..8fbf1b6 100644
--- a/extra/kde323/konsole_part.h
+++ b/extra/kde323/konsole_part.h
@@ -21,8 +21,8 @@
 #ifndef __KONSOLE_PART_H__
 #define __KONSOLE_PART_H__
 
-#include <kparts/browserextension.h>
-#include <kparts/factory.h>
+#include <tdeparts/browserextension.h>
+#include <tdeparts/factory.h>
 
 
 #include <kdialogbase.h>
diff --git a/extra/kde323/selectdialog.h b/extra/kde323/selectdialog.h
index 680d48e..4fc3685 100644
--- a/extra/kde323/selectdialog.h
+++ b/extra/kde323/selectdialog.h
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkresources.
+    This file is part of libtderesources.
 
     Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
     Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
diff --git a/extra/kde323/ksycocafactory.h b/extra/kde323/tdesycocafactory.h
index 2a114ee..97d2e19 100644
--- a/extra/kde323/ksycocafactory.h
+++ b/extra/kde323/tdesycocafactory.h
@@ -16,11 +16,11 @@
  *  Boston, MA 02110-1301, USA.
  **/
 
-#ifndef __ksycocafactory_h__
-#define __ksycocafactory_h__ "$Id: ksycocafactory.h,v 1.14 2003/10/29 17:59:18 waba Exp $"
+#ifndef __tdesycocafactory_h__
+#define __tdesycocafactory_h__ "$Id: tdesycocafactory.h,v 1.14 2003/10/29 17:59:18 waba Exp $"
 
-#include "ksycocatype.h"
-#include "ksycocaentry.h"
+#include "tdesycocatype.h"
+#include "tdesycocaentry.h"
 
 #include <tqdict.h>
 #include <tqptrlist.h>
diff --git a/extra/kde330/configwidget.h b/extra/kde330/configwidget.h
index afe677e..3c2052c 100644
--- a/extra/kde330/configwidget.h
+++ b/extra/kde330/configwidget.h
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkresources.
+    This file is part of libtderesources.
     Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
     Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
 
diff --git a/extra/kde330/konsole_part.h b/extra/kde330/konsole_part.h
index 94847b1..88da3f9 100644
--- a/extra/kde330/konsole_part.h
+++ b/extra/kde330/konsole_part.h
@@ -21,8 +21,8 @@
 #ifndef __KONSOLE_PART_H__
 #define __KONSOLE_PART_H__
 
-#include <kparts/browserextension.h>
-#include <kparts/factory.h>
+#include <tdeparts/browserextension.h>
+#include <tdeparts/factory.h>
 
 
 #include <kdialogbase.h>
diff --git a/extra/kde330/ksycocafactory.h b/extra/kde330/ksycocafactory.h
deleted file mode 100644
index 2a114ee..0000000
--- a/extra/kde330/ksycocafactory.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/*  This file is part of the KDE libraries
- *  Copyright (C) 1999 Waldo Bastian <bastian@kde.org>
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public
- *  License version 2 as published by the Free Software Foundation;
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public License
- *  along with this library; see the file COPYING.LIB.  If not, write to
- *  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- *  Boston, MA 02110-1301, USA.
- **/
-
-#ifndef __ksycocafactory_h__
-#define __ksycocafactory_h__ "$Id: ksycocafactory.h,v 1.14 2003/10/29 17:59:18 waba Exp $"
-
-#include "ksycocatype.h"
-#include "ksycocaentry.h"
-
-#include <tqdict.h>
-#include <tqptrlist.h>
-class KSycoca;
-class TQStringList;
-class TQString;
-class KSycocaDict;
-class KSycocaResourceList;
-
-typedef TQDict<KSycocaEntry::Ptr> KSycocaEntryDict;
-
-/**
- * @internal
- * Base class for sycoca factories
- */
-class KSycocaFactory
-{
-public:
-   virtual KSycocaFactoryId factoryId() const = 0;
- 
-protected: // virtual class
-   /**
-    * Create a factory which can be used to lookup from/create a database
-    * (depending on KSycoca::isBuilding())
-    */
-   KSycocaFactory( KSycocaFactoryId factory_id );
-
-public:
-   virtual ~KSycocaFactory();
-
-   /**
-    * @return the position of the factory in the sycoca file
-    */
-   int offset() { return mOffset; }
-
-   /**
-    * @return the dict, for special use by KBuildSycoca
-    */
-   KSycocaEntryDict * entryDict() { return m_entryDict; }
-
-   /**
-    * Construct an entry from a config file.
-    * To be implemented in the real factories.
-    */
-   virtual KSycocaEntry *createEntry(const TQString &file, const char *resource) = 0;
-
-   /**
-    * Add an entry
-    */
-   virtual void addEntry(KSycocaEntry *newEntry, const char *resource);
-
-   /**
-    * Remove an entry
-    * Not very fast, use with care. O(N)
-    */
-   void removeEntry(KSycocaEntry *newEntry);
-
-   /**
-    * Read an entry from the database
-    */
-   virtual KSycocaEntry *createEntry(int offset)=0;
-
-   /**
-    * Get a list of all entries from the database.
-    */
-   KSycocaEntry::List allEntries();
-
-   /**
-    * Saves all entries it maintains as well as index files
-    * for these entries to the stream 'str'.
-    *
-    * Also sets mOffset to the starting position.
-    *
-    * The stream is positioned at the end of the last index.
-    *
-    * Don't forget to call the parent first when you override 
-    * this function.
-    */
-   virtual void save(TQDataStream &str);
-
-   /**
-    * Writes out a header to the stream 'str'.
-    * The baseclass positions the stream correctly.
-    *
-    * Don't forget to call the parent first when you override 
-    * this function.
-    */
-   virtual void saveHeader(TQDataStream &str);
-
-   /**
-    * @return the resources for which this factory is responsible.
-    */
-   virtual const KSycocaResourceList * resourceList() const { return m_resourceList; }
-
-private:
-   int mOffset;
-
-protected:
-   int m_sycocaDictOffset;
-   int m_beginEntryOffset;
-   int m_endEntryOffset;
-   TQDataStream *m_str;
-
-   KSycocaResourceList *m_resourceList;
-   KSycocaEntryDict *m_entryDict;
-   KSycocaDict *m_sycocaDict;
-protected:
-   virtual void virtual_hook( int id, void* data );
-};
-
-/** This, instead of a typedef, allows to declare "class ..." in header files
- * @internal
- */
-class KSycocaFactoryList : public TQPtrList<KSycocaFactory>
-{
-public:
-   KSycocaFactoryList() { }
-};
-
-#endif
diff --git a/extra/kde330/selectdialog.h b/extra/kde330/selectdialog.h
index 680d48e..4fc3685 100644
--- a/extra/kde330/selectdialog.h
+++ b/extra/kde330/selectdialog.h
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkresources.
+    This file is part of libtderesources.
 
     Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
     Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
diff --git a/extra/kde330/tdesycocafactory.h b/extra/kde330/tdesycocafactory.h
new file mode 100644
index 0000000..97d2e19
--- /dev/null
+++ b/extra/kde330/tdesycocafactory.h
@@ -0,0 +1,143 @@
+/*  This file is part of the KDE libraries
+ *  Copyright (C) 1999 Waldo Bastian <bastian@kde.org>
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Library General Public
+ *  License version 2 as published by the Free Software Foundation;
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Library General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Library General Public License
+ *  along with this library; see the file COPYING.LIB.  If not, write to
+ *  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ *  Boston, MA 02110-1301, USA.
+ **/
+
+#ifndef __tdesycocafactory_h__
+#define __tdesycocafactory_h__ "$Id: tdesycocafactory.h,v 1.14 2003/10/29 17:59:18 waba Exp $"
+
+#include "tdesycocatype.h"
+#include "tdesycocaentry.h"
+
+#include <tqdict.h>
+#include <tqptrlist.h>
+class KSycoca;
+class TQStringList;
+class TQString;
+class KSycocaDict;
+class KSycocaResourceList;
+
+typedef TQDict<KSycocaEntry::Ptr> KSycocaEntryDict;
+
+/**
+ * @internal
+ * Base class for sycoca factories
+ */
+class KSycocaFactory
+{
+public:
+   virtual KSycocaFactoryId factoryId() const = 0;
+ 
+protected: // virtual class
+   /**
+    * Create a factory which can be used to lookup from/create a database
+    * (depending on KSycoca::isBuilding())
+    */
+   KSycocaFactory( KSycocaFactoryId factory_id );
+
+public:
+   virtual ~KSycocaFactory();
+
+   /**
+    * @return the position of the factory in the sycoca file
+    */
+   int offset() { return mOffset; }
+
+   /**
+    * @return the dict, for special use by KBuildSycoca
+    */
+   KSycocaEntryDict * entryDict() { return m_entryDict; }
+
+   /**
+    * Construct an entry from a config file.
+    * To be implemented in the real factories.
+    */
+   virtual KSycocaEntry *createEntry(const TQString &file, const char *resource) = 0;
+
+   /**
+    * Add an entry
+    */
+   virtual void addEntry(KSycocaEntry *newEntry, const char *resource);
+
+   /**
+    * Remove an entry
+    * Not very fast, use with care. O(N)
+    */
+   void removeEntry(KSycocaEntry *newEntry);
+
+   /**
+    * Read an entry from the database
+    */
+   virtual KSycocaEntry *createEntry(int offset)=0;
+
+   /**
+    * Get a list of all entries from the database.
+    */
+   KSycocaEntry::List allEntries();
+
+   /**
+    * Saves all entries it maintains as well as index files
+    * for these entries to the stream 'str'.
+    *
+    * Also sets mOffset to the starting position.
+    *
+    * The stream is positioned at the end of the last index.
+    *
+    * Don't forget to call the parent first when you override 
+    * this function.
+    */
+   virtual void save(TQDataStream &str);
+
+   /**
+    * Writes out a header to the stream 'str'.
+    * The baseclass positions the stream correctly.
+    *
+    * Don't forget to call the parent first when you override 
+    * this function.
+    */
+   virtual void saveHeader(TQDataStream &str);
+
+   /**
+    * @return the resources for which this factory is responsible.
+    */
+   virtual const KSycocaResourceList * resourceList() const { return m_resourceList; }
+
+private:
+   int mOffset;
+
+protected:
+   int m_sycocaDictOffset;
+   int m_beginEntryOffset;
+   int m_endEntryOffset;
+   TQDataStream *m_str;
+
+   KSycocaResourceList *m_resourceList;
+   KSycocaEntryDict *m_entryDict;
+   KSycocaDict *m_sycocaDict;
+protected:
+   virtual void virtual_hook( int id, void* data );
+};
+
+/** This, instead of a typedef, allows to declare "class ..." in header files
+ * @internal
+ */
+class KSycocaFactoryList : public TQPtrList<KSycocaFactory>
+{
+public:
+   KSycocaFactoryList() { }
+};
+
+#endif
diff --git a/extra/kde331/configwidget.h b/extra/kde331/configwidget.h
index afe677e..3c2052c 100644
--- a/extra/kde331/configwidget.h
+++ b/extra/kde331/configwidget.h
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkresources.
+    This file is part of libtderesources.
     Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
     Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
 
diff --git a/extra/kde331/konsole_part.h b/extra/kde331/konsole_part.h
index 94847b1..88da3f9 100644
--- a/extra/kde331/konsole_part.h
+++ b/extra/kde331/konsole_part.h
@@ -21,8 +21,8 @@
 #ifndef __KONSOLE_PART_H__
 #define __KONSOLE_PART_H__
 
-#include <kparts/browserextension.h>
-#include <kparts/factory.h>
+#include <tdeparts/browserextension.h>
+#include <tdeparts/factory.h>
 
 
 #include <kdialogbase.h>
diff --git a/extra/kde331/ksycocafactory.h b/extra/kde331/ksycocafactory.h
deleted file mode 100644
index 2a114ee..0000000
--- a/extra/kde331/ksycocafactory.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/*  This file is part of the KDE libraries
- *  Copyright (C) 1999 Waldo Bastian <bastian@kde.org>
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public
- *  License version 2 as published by the Free Software Foundation;
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public License
- *  along with this library; see the file COPYING.LIB.  If not, write to
- *  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- *  Boston, MA 02110-1301, USA.
- **/
-
-#ifndef __ksycocafactory_h__
-#define __ksycocafactory_h__ "$Id: ksycocafactory.h,v 1.14 2003/10/29 17:59:18 waba Exp $"
-
-#include "ksycocatype.h"
-#include "ksycocaentry.h"
-
-#include <tqdict.h>
-#include <tqptrlist.h>
-class KSycoca;
-class TQStringList;
-class TQString;
-class KSycocaDict;
-class KSycocaResourceList;
-
-typedef TQDict<KSycocaEntry::Ptr> KSycocaEntryDict;
-
-/**
- * @internal
- * Base class for sycoca factories
- */
-class KSycocaFactory
-{
-public:
-   virtual KSycocaFactoryId factoryId() const = 0;
- 
-protected: // virtual class
-   /**
-    * Create a factory which can be used to lookup from/create a database
-    * (depending on KSycoca::isBuilding())
-    */
-   KSycocaFactory( KSycocaFactoryId factory_id );
-
-public:
-   virtual ~KSycocaFactory();
-
-   /**
-    * @return the position of the factory in the sycoca file
-    */
-   int offset() { return mOffset; }
-
-   /**
-    * @return the dict, for special use by KBuildSycoca
-    */
-   KSycocaEntryDict * entryDict() { return m_entryDict; }
-
-   /**
-    * Construct an entry from a config file.
-    * To be implemented in the real factories.
-    */
-   virtual KSycocaEntry *createEntry(const TQString &file, const char *resource) = 0;
-
-   /**
-    * Add an entry
-    */
-   virtual void addEntry(KSycocaEntry *newEntry, const char *resource);
-
-   /**
-    * Remove an entry
-    * Not very fast, use with care. O(N)
-    */
-   void removeEntry(KSycocaEntry *newEntry);
-
-   /**
-    * Read an entry from the database
-    */
-   virtual KSycocaEntry *createEntry(int offset)=0;
-
-   /**
-    * Get a list of all entries from the database.
-    */
-   KSycocaEntry::List allEntries();
-
-   /**
-    * Saves all entries it maintains as well as index files
-    * for these entries to the stream 'str'.
-    *
-    * Also sets mOffset to the starting position.
-    *
-    * The stream is positioned at the end of the last index.
-    *
-    * Don't forget to call the parent first when you override 
-    * this function.
-    */
-   virtual void save(TQDataStream &str);
-
-   /**
-    * Writes out a header to the stream 'str'.
-    * The baseclass positions the stream correctly.
-    *
-    * Don't forget to call the parent first when you override 
-    * this function.
-    */
-   virtual void saveHeader(TQDataStream &str);
-
-   /**
-    * @return the resources for which this factory is responsible.
-    */
-   virtual const KSycocaResourceList * resourceList() const { return m_resourceList; }
-
-private:
-   int mOffset;
-
-protected:
-   int m_sycocaDictOffset;
-   int m_beginEntryOffset;
-   int m_endEntryOffset;
-   TQDataStream *m_str;
-
-   KSycocaResourceList *m_resourceList;
-   KSycocaEntryDict *m_entryDict;
-   KSycocaDict *m_sycocaDict;
-protected:
-   virtual void virtual_hook( int id, void* data );
-};
-
-/** This, instead of a typedef, allows to declare "class ..." in header files
- * @internal
- */
-class KSycocaFactoryList : public TQPtrList<KSycocaFactory>
-{
-public:
-   KSycocaFactoryList() { }
-};
-
-#endif
diff --git a/extra/kde331/selectdialog.h b/extra/kde331/selectdialog.h
index 680d48e..4fc3685 100644
--- a/extra/kde331/selectdialog.h
+++ b/extra/kde331/selectdialog.h
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkresources.
+    This file is part of libtderesources.
 
     Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
     Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
diff --git a/extra/kde331/tdesycocafactory.h b/extra/kde331/tdesycocafactory.h
new file mode 100644
index 0000000..97d2e19
--- /dev/null
+++ b/extra/kde331/tdesycocafactory.h
@@ -0,0 +1,143 @@
+/*  This file is part of the KDE libraries
+ *  Copyright (C) 1999 Waldo Bastian <bastian@kde.org>
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Library General Public
+ *  License version 2 as published by the Free Software Foundation;
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Library General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Library General Public License
+ *  along with this library; see the file COPYING.LIB.  If not, write to
+ *  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ *  Boston, MA 02110-1301, USA.
+ **/
+
+#ifndef __tdesycocafactory_h__
+#define __tdesycocafactory_h__ "$Id: tdesycocafactory.h,v 1.14 2003/10/29 17:59:18 waba Exp $"
+
+#include "tdesycocatype.h"
+#include "tdesycocaentry.h"
+
+#include <tqdict.h>
+#include <tqptrlist.h>
+class KSycoca;
+class TQStringList;
+class TQString;
+class KSycocaDict;
+class KSycocaResourceList;
+
+typedef TQDict<KSycocaEntry::Ptr> KSycocaEntryDict;
+
+/**
+ * @internal
+ * Base class for sycoca factories
+ */
+class KSycocaFactory
+{
+public:
+   virtual KSycocaFactoryId factoryId() const = 0;
+ 
+protected: // virtual class
+   /**
+    * Create a factory which can be used to lookup from/create a database
+    * (depending on KSycoca::isBuilding())
+    */
+   KSycocaFactory( KSycocaFactoryId factory_id );
+
+public:
+   virtual ~KSycocaFactory();
+
+   /**
+    * @return the position of the factory in the sycoca file
+    */
+   int offset() { return mOffset; }
+
+   /**
+    * @return the dict, for special use by KBuildSycoca
+    */
+   KSycocaEntryDict * entryDict() { return m_entryDict; }
+
+   /**
+    * Construct an entry from a config file.
+    * To be implemented in the real factories.
+    */
+   virtual KSycocaEntry *createEntry(const TQString &file, const char *resource) = 0;
+
+   /**
+    * Add an entry
+    */
+   virtual void addEntry(KSycocaEntry *newEntry, const char *resource);
+
+   /**
+    * Remove an entry
+    * Not very fast, use with care. O(N)
+    */
+   void removeEntry(KSycocaEntry *newEntry);
+
+   /**
+    * Read an entry from the database
+    */
+   virtual KSycocaEntry *createEntry(int offset)=0;
+
+   /**
+    * Get a list of all entries from the database.
+    */
+   KSycocaEntry::List allEntries();
+
+   /**
+    * Saves all entries it maintains as well as index files
+    * for these entries to the stream 'str'.
+    *
+    * Also sets mOffset to the starting position.
+    *
+    * The stream is positioned at the end of the last index.
+    *
+    * Don't forget to call the parent first when you override 
+    * this function.
+    */
+   virtual void save(TQDataStream &str);
+
+   /**
+    * Writes out a header to the stream 'str'.
+    * The baseclass positions the stream correctly.
+    *
+    * Don't forget to call the parent first when you override 
+    * this function.
+    */
+   virtual void saveHeader(TQDataStream &str);
+
+   /**
+    * @return the resources for which this factory is responsible.
+    */
+   virtual const KSycocaResourceList * resourceList() const { return m_resourceList; }
+
+private:
+   int mOffset;
+
+protected:
+   int m_sycocaDictOffset;
+   int m_beginEntryOffset;
+   int m_endEntryOffset;
+   TQDataStream *m_str;
+
+   KSycocaResourceList *m_resourceList;
+   KSycocaEntryDict *m_entryDict;
+   KSycocaDict *m_sycocaDict;
+protected:
+   virtual void virtual_hook( int id, void* data );
+};
+
+/** This, instead of a typedef, allows to declare "class ..." in header files
+ * @internal
+ */
+class KSycocaFactoryList : public TQPtrList<KSycocaFactory>
+{
+public:
+   KSycocaFactoryList() { }
+};
+
+#endif
diff --git a/extra/kde332/configwidget.h b/extra/kde332/configwidget.h
index afe677e..3c2052c 100644
--- a/extra/kde332/configwidget.h
+++ b/extra/kde332/configwidget.h
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkresources.
+    This file is part of libtderesources.
     Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
     Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
 
diff --git a/extra/kde332/konsole_part.h b/extra/kde332/konsole_part.h
index 94847b1..88da3f9 100644
--- a/extra/kde332/konsole_part.h
+++ b/extra/kde332/konsole_part.h
@@ -21,8 +21,8 @@
 #ifndef __KONSOLE_PART_H__
 #define __KONSOLE_PART_H__
 
-#include <kparts/browserextension.h>
-#include <kparts/factory.h>
+#include <tdeparts/browserextension.h>
+#include <tdeparts/factory.h>
 
 
 #include <kdialogbase.h>
diff --git a/extra/kde332/ksycocafactory.h b/extra/kde332/ksycocafactory.h
deleted file mode 100644
index 2a114ee..0000000
--- a/extra/kde332/ksycocafactory.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/*  This file is part of the KDE libraries
- *  Copyright (C) 1999 Waldo Bastian <bastian@kde.org>
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public
- *  License version 2 as published by the Free Software Foundation;
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public License
- *  along with this library; see the file COPYING.LIB.  If not, write to
- *  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- *  Boston, MA 02110-1301, USA.
- **/
-
-#ifndef __ksycocafactory_h__
-#define __ksycocafactory_h__ "$Id: ksycocafactory.h,v 1.14 2003/10/29 17:59:18 waba Exp $"
-
-#include "ksycocatype.h"
-#include "ksycocaentry.h"
-
-#include <tqdict.h>
-#include <tqptrlist.h>
-class KSycoca;
-class TQStringList;
-class TQString;
-class KSycocaDict;
-class KSycocaResourceList;
-
-typedef TQDict<KSycocaEntry::Ptr> KSycocaEntryDict;
-
-/**
- * @internal
- * Base class for sycoca factories
- */
-class KSycocaFactory
-{
-public:
-   virtual KSycocaFactoryId factoryId() const = 0;
- 
-protected: // virtual class
-   /**
-    * Create a factory which can be used to lookup from/create a database
-    * (depending on KSycoca::isBuilding())
-    */
-   KSycocaFactory( KSycocaFactoryId factory_id );
-
-public:
-   virtual ~KSycocaFactory();
-
-   /**
-    * @return the position of the factory in the sycoca file
-    */
-   int offset() { return mOffset; }
-
-   /**
-    * @return the dict, for special use by KBuildSycoca
-    */
-   KSycocaEntryDict * entryDict() { return m_entryDict; }
-
-   /**
-    * Construct an entry from a config file.
-    * To be implemented in the real factories.
-    */
-   virtual KSycocaEntry *createEntry(const TQString &file, const char *resource) = 0;
-
-   /**
-    * Add an entry
-    */
-   virtual void addEntry(KSycocaEntry *newEntry, const char *resource);
-
-   /**
-    * Remove an entry
-    * Not very fast, use with care. O(N)
-    */
-   void removeEntry(KSycocaEntry *newEntry);
-
-   /**
-    * Read an entry from the database
-    */
-   virtual KSycocaEntry *createEntry(int offset)=0;
-
-   /**
-    * Get a list of all entries from the database.
-    */
-   KSycocaEntry::List allEntries();
-
-   /**
-    * Saves all entries it maintains as well as index files
-    * for these entries to the stream 'str'.
-    *
-    * Also sets mOffset to the starting position.
-    *
-    * The stream is positioned at the end of the last index.
-    *
-    * Don't forget to call the parent first when you override 
-    * this function.
-    */
-   virtual void save(TQDataStream &str);
-
-   /**
-    * Writes out a header to the stream 'str'.
-    * The baseclass positions the stream correctly.
-    *
-    * Don't forget to call the parent first when you override 
-    * this function.
-    */
-   virtual void saveHeader(TQDataStream &str);
-
-   /**
-    * @return the resources for which this factory is responsible.
-    */
-   virtual const KSycocaResourceList * resourceList() const { return m_resourceList; }
-
-private:
-   int mOffset;
-
-protected:
-   int m_sycocaDictOffset;
-   int m_beginEntryOffset;
-   int m_endEntryOffset;
-   TQDataStream *m_str;
-
-   KSycocaResourceList *m_resourceList;
-   KSycocaEntryDict *m_entryDict;
-   KSycocaDict *m_sycocaDict;
-protected:
-   virtual void virtual_hook( int id, void* data );
-};
-
-/** This, instead of a typedef, allows to declare "class ..." in header files
- * @internal
- */
-class KSycocaFactoryList : public TQPtrList<KSycocaFactory>
-{
-public:
-   KSycocaFactoryList() { }
-};
-
-#endif
diff --git a/extra/kde332/selectdialog.h b/extra/kde332/selectdialog.h
index 680d48e..4fc3685 100644
--- a/extra/kde332/selectdialog.h
+++ b/extra/kde332/selectdialog.h
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkresources.
+    This file is part of libtderesources.
 
     Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
     Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
diff --git a/extra/kde332/tdesycocafactory.h b/extra/kde332/tdesycocafactory.h
new file mode 100644
index 0000000..97d2e19
--- /dev/null
+++ b/extra/kde332/tdesycocafactory.h
@@ -0,0 +1,143 @@
+/*  This file is part of the KDE libraries
+ *  Copyright (C) 1999 Waldo Bastian <bastian@kde.org>
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Library General Public
+ *  License version 2 as published by the Free Software Foundation;
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Library General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Library General Public License
+ *  along with this library; see the file COPYING.LIB.  If not, write to
+ *  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ *  Boston, MA 02110-1301, USA.
+ **/
+
+#ifndef __tdesycocafactory_h__
+#define __tdesycocafactory_h__ "$Id: tdesycocafactory.h,v 1.14 2003/10/29 17:59:18 waba Exp $"
+
+#include "tdesycocatype.h"
+#include "tdesycocaentry.h"
+
+#include <tqdict.h>
+#include <tqptrlist.h>
+class KSycoca;
+class TQStringList;
+class TQString;
+class KSycocaDict;
+class KSycocaResourceList;
+
+typedef TQDict<KSycocaEntry::Ptr> KSycocaEntryDict;
+
+/**
+ * @internal
+ * Base class for sycoca factories
+ */
+class KSycocaFactory
+{
+public:
+   virtual KSycocaFactoryId factoryId() const = 0;
+ 
+protected: // virtual class
+   /**
+    * Create a factory which can be used to lookup from/create a database
+    * (depending on KSycoca::isBuilding())
+    */
+   KSycocaFactory( KSycocaFactoryId factory_id );
+
+public:
+   virtual ~KSycocaFactory();
+
+   /**
+    * @return the position of the factory in the sycoca file
+    */
+   int offset() { return mOffset; }
+
+   /**
+    * @return the dict, for special use by KBuildSycoca
+    */
+   KSycocaEntryDict * entryDict() { return m_entryDict; }
+
+   /**
+    * Construct an entry from a config file.
+    * To be implemented in the real factories.
+    */
+   virtual KSycocaEntry *createEntry(const TQString &file, const char *resource) = 0;
+
+   /**
+    * Add an entry
+    */
+   virtual void addEntry(KSycocaEntry *newEntry, const char *resource);
+
+   /**
+    * Remove an entry
+    * Not very fast, use with care. O(N)
+    */
+   void removeEntry(KSycocaEntry *newEntry);
+
+   /**
+    * Read an entry from the database
+    */
+   virtual KSycocaEntry *createEntry(int offset)=0;
+
+   /**
+    * Get a list of all entries from the database.
+    */
+   KSycocaEntry::List allEntries();
+
+   /**
+    * Saves all entries it maintains as well as index files
+    * for these entries to the stream 'str'.
+    *
+    * Also sets mOffset to the starting position.
+    *
+    * The stream is positioned at the end of the last index.
+    *
+    * Don't forget to call the parent first when you override 
+    * this function.
+    */
+   virtual void save(TQDataStream &str);
+
+   /**
+    * Writes out a header to the stream 'str'.
+    * The baseclass positions the stream correctly.
+    *
+    * Don't forget to call the parent first when you override 
+    * this function.
+    */
+   virtual void saveHeader(TQDataStream &str);
+
+   /**
+    * @return the resources for which this factory is responsible.
+    */
+   virtual const KSycocaResourceList * resourceList() const { return m_resourceList; }
+
+private:
+   int mOffset;
+
+protected:
+   int m_sycocaDictOffset;
+   int m_beginEntryOffset;
+   int m_endEntryOffset;
+   TQDataStream *m_str;
+
+   KSycocaResourceList *m_resourceList;
+   KSycocaEntryDict *m_entryDict;
+   KSycocaDict *m_sycocaDict;
+protected:
+   virtual void virtual_hook( int id, void* data );
+};
+
+/** This, instead of a typedef, allows to declare "class ..." in header files
+ * @internal
+ */
+class KSycocaFactoryList : public TQPtrList<KSycocaFactory>
+{
+public:
+   KSycocaFactoryList() { }
+};
+
+#endif
diff --git a/extra/kde340/configwidget.h b/extra/kde340/configwidget.h
index 3a2fe3f..30ebf2a 100644
--- a/extra/kde340/configwidget.h
+++ b/extra/kde340/configwidget.h
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkresources.
+    This file is part of libtderesources.
     Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
     Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
 
diff --git a/extra/kde340/konsole_part.h b/extra/kde340/konsole_part.h
index ed18ad6..ecc7924 100644
--- a/extra/kde340/konsole_part.h
+++ b/extra/kde340/konsole_part.h
@@ -21,8 +21,8 @@
 #ifndef __KONSOLE_PART_H__
 #define __KONSOLE_PART_H__
 
-#include <kparts/browserextension.h>
-#include <kparts/factory.h>
+#include <tdeparts/browserextension.h>
+#include <tdeparts/factory.h>
 
 
 #include <kdialogbase.h>
diff --git a/extra/kde340/selectdialog.h b/extra/kde340/selectdialog.h
index 987dcb6..1a6560d 100644
--- a/extra/kde340/selectdialog.h
+++ b/extra/kde340/selectdialog.h
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkresources.
+    This file is part of libtderesources.
 
     Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
     Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
diff --git a/extra/kde340/ksycocafactory.h b/extra/kde340/tdesycocafactory.h
index 1000478..4569fff 100644
--- a/extra/kde340/ksycocafactory.h
+++ b/extra/kde340/tdesycocafactory.h
@@ -16,11 +16,11 @@
  *  Boston, MA 02110-1301, USA.
  **/
 
-#ifndef __ksycocafactory_h__
-#define __ksycocafactory_h__
+#ifndef __tdesycocafactory_h__
+#define __tdesycocafactory_h__
 
-#include "ksycocatype.h"
-#include "ksycocaentry.h"
+#include "tdesycocatype.h"
+#include "tdesycocaentry.h"
 
 #include <tqdict.h>
 #include <tqptrlist.h>
diff --git a/extra/kde341/configwidget.h b/extra/kde341/configwidget.h
index 3a2fe3f..30ebf2a 100644
--- a/extra/kde341/configwidget.h
+++ b/extra/kde341/configwidget.h
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkresources.
+    This file is part of libtderesources.
     Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
     Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
 
diff --git a/extra/kde341/konsole_part.h b/extra/kde341/konsole_part.h
index ed18ad6..ecc7924 100644
--- a/extra/kde341/konsole_part.h
+++ b/extra/kde341/konsole_part.h
@@ -21,8 +21,8 @@
 #ifndef __KONSOLE_PART_H__
 #define __KONSOLE_PART_H__
 
-#include <kparts/browserextension.h>
-#include <kparts/factory.h>
+#include <tdeparts/browserextension.h>
+#include <tdeparts/factory.h>
 
 
 #include <kdialogbase.h>
diff --git a/extra/kde341/selectdialog.h b/extra/kde341/selectdialog.h
index 987dcb6..1a6560d 100644
--- a/extra/kde341/selectdialog.h
+++ b/extra/kde341/selectdialog.h
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkresources.
+    This file is part of libtderesources.
 
     Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
     Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
diff --git a/extra/kde341/ksycocafactory.h b/extra/kde341/tdesycocafactory.h
index 1000478..4569fff 100644
--- a/extra/kde341/ksycocafactory.h
+++ b/extra/kde341/tdesycocafactory.h
@@ -16,11 +16,11 @@
  *  Boston, MA 02110-1301, USA.
  **/
 
-#ifndef __ksycocafactory_h__
-#define __ksycocafactory_h__
+#ifndef __tdesycocafactory_h__
+#define __tdesycocafactory_h__
 
-#include "ksycocatype.h"
-#include "ksycocaentry.h"
+#include "tdesycocatype.h"
+#include "tdesycocaentry.h"
 
 #include <tqdict.h>
 #include <tqptrlist.h>
diff --git a/extra/kde342/configwidget.h b/extra/kde342/configwidget.h
index 3a2fe3f..30ebf2a 100644
--- a/extra/kde342/configwidget.h
+++ b/extra/kde342/configwidget.h
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkresources.
+    This file is part of libtderesources.
     Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
     Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
 
diff --git a/extra/kde342/konsole_part.h b/extra/kde342/konsole_part.h
index ed18ad6..ecc7924 100644
--- a/extra/kde342/konsole_part.h
+++ b/extra/kde342/konsole_part.h
@@ -21,8 +21,8 @@
 #ifndef __KONSOLE_PART_H__
 #define __KONSOLE_PART_H__
 
-#include <kparts/browserextension.h>
-#include <kparts/factory.h>
+#include <tdeparts/browserextension.h>
+#include <tdeparts/factory.h>
 
 
 #include <kdialogbase.h>
diff --git a/extra/kde342/selectdialog.h b/extra/kde342/selectdialog.h
index 987dcb6..1a6560d 100644
--- a/extra/kde342/selectdialog.h
+++ b/extra/kde342/selectdialog.h
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkresources.
+    This file is part of libtderesources.
 
     Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
     Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
diff --git a/extra/kde342/ksycocafactory.h b/extra/kde342/tdesycocafactory.h
index 1000478..4569fff 100644
--- a/extra/kde342/ksycocafactory.h
+++ b/extra/kde342/tdesycocafactory.h
@@ -16,11 +16,11 @@
  *  Boston, MA 02110-1301, USA.
  **/
 
-#ifndef __ksycocafactory_h__
-#define __ksycocafactory_h__
+#ifndef __tdesycocafactory_h__
+#define __tdesycocafactory_h__
 
-#include "ksycocatype.h"
-#include "ksycocaentry.h"
+#include "tdesycocatype.h"
+#include "tdesycocaentry.h"
 
 #include <tqdict.h>
 #include <tqptrlist.h>
diff --git a/extra/kde343/configwidget.h b/extra/kde343/configwidget.h
index 3a2fe3f..30ebf2a 100644
--- a/extra/kde343/configwidget.h
+++ b/extra/kde343/configwidget.h
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkresources.
+    This file is part of libtderesources.
     Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
     Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
 
diff --git a/extra/kde343/konsole_part.h b/extra/kde343/konsole_part.h
index ed18ad6..ecc7924 100644
--- a/extra/kde343/konsole_part.h
+++ b/extra/kde343/konsole_part.h
@@ -21,8 +21,8 @@
 #ifndef __KONSOLE_PART_H__
 #define __KONSOLE_PART_H__
 
-#include <kparts/browserextension.h>
-#include <kparts/factory.h>
+#include <tdeparts/browserextension.h>
+#include <tdeparts/factory.h>
 
 
 #include <kdialogbase.h>
diff --git a/extra/kde343/selectdialog.h b/extra/kde343/selectdialog.h
index 987dcb6..1a6560d 100644
--- a/extra/kde343/selectdialog.h
+++ b/extra/kde343/selectdialog.h
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkresources.
+    This file is part of libtderesources.
 
     Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
     Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
diff --git a/extra/kde343/ksycocafactory.h b/extra/kde343/tdesycocafactory.h
index 1000478..4569fff 100644
--- a/extra/kde343/ksycocafactory.h
+++ b/extra/kde343/tdesycocafactory.h
@@ -16,11 +16,11 @@
  *  Boston, MA 02110-1301, USA.
  **/
 
-#ifndef __ksycocafactory_h__
-#define __ksycocafactory_h__
+#ifndef __tdesycocafactory_h__
+#define __tdesycocafactory_h__
 
-#include "ksycocatype.h"
-#include "ksycocaentry.h"
+#include "tdesycocatype.h"
+#include "tdesycocaentry.h"
 
 #include <tqdict.h>
 #include <tqptrlist.h>
diff --git a/extra/kde350/configwidget.h b/extra/kde350/configwidget.h
index 3a2fe3f..30ebf2a 100644
--- a/extra/kde350/configwidget.h
+++ b/extra/kde350/configwidget.h
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkresources.
+    This file is part of libtderesources.
     Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
     Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
 
diff --git a/extra/kde350/konsole_part.h b/extra/kde350/konsole_part.h
index 44b7588..a50b5af 100644
--- a/extra/kde350/konsole_part.h
+++ b/extra/kde350/konsole_part.h
@@ -21,8 +21,8 @@
 #ifndef KONSOLE_PART_H
 #define KONSOLE_PART_H
 
-#include <kparts/browserextension.h>
-#include <kparts/factory.h>
+#include <tdeparts/browserextension.h>
+#include <tdeparts/factory.h>
 
 
 #include <kdialogbase.h>
diff --git a/extra/kde350/ksycocafactory.h b/extra/kde350/ksycocafactory.h
deleted file mode 100644
index 1000478..0000000
--- a/extra/kde350/ksycocafactory.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/*  This file is part of the KDE libraries
- *  Copyright (C) 1999 Waldo Bastian <bastian@kde.org>
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public
- *  License version 2 as published by the Free Software Foundation;
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public License
- *  along with this library; see the file COPYING.LIB.  If not, write to
- *  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- *  Boston, MA 02110-1301, USA.
- **/
-
-#ifndef __ksycocafactory_h__
-#define __ksycocafactory_h__
-
-#include "ksycocatype.h"
-#include "ksycocaentry.h"
-
-#include <tqdict.h>
-#include <tqptrlist.h>
-class KSycoca;
-class TQStringList;
-class TQString;
-class KSycocaDict;
-class KSycocaResourceList;
-
-typedef TQDict<KSycocaEntry::Ptr> KSycocaEntryDict;
-
-/**
- * @internal
- * Base class for sycoca factories
- */
-class TDECORE_EXPORT KSycocaFactory
-{
-public:
-   virtual KSycocaFactoryId factoryId() const = 0;
- 
-protected: // virtual class
-   /**
-    * Create a factory which can be used to lookup from/create a database
-    * (depending on KSycoca::isBuilding())
-    */
-   KSycocaFactory( KSycocaFactoryId factory_id );
-
-public:
-   virtual ~KSycocaFactory();
-
-   /**
-    * @return the position of the factory in the sycoca file
-    */
-   int offset() { return mOffset; }
-
-   /**
-    * @return the dict, for special use by KBuildSycoca
-    */
-   KSycocaEntryDict * entryDict() { return m_entryDict; }
-
-   /**
-    * Construct an entry from a config file.
-    * To be implemented in the real factories.
-    */
-   virtual KSycocaEntry *createEntry(const TQString &file, const char *resource) = 0;
-
-   /**
-    * Add an entry
-    */
-   virtual void addEntry(KSycocaEntry *newEntry, const char *resource);
-
-   /**
-    * Remove an entry
-    * Not very fast, use with care. O(N)
-    */
-   void removeEntry(KSycocaEntry *newEntry);
-
-   /**
-    * Read an entry from the database
-    */
-   virtual KSycocaEntry *createEntry(int offset)=0;
-
-   /**
-    * Get a list of all entries from the database.
-    */
-   KSycocaEntry::List allEntries();
-
-   /**
-    * Saves all entries it maintains as well as index files
-    * for these entries to the stream 'str'.
-    *
-    * Also sets mOffset to the starting position.
-    *
-    * The stream is positioned at the end of the last index.
-    *
-    * Don't forget to call the parent first when you override 
-    * this function.
-    */
-   virtual void save(TQDataStream &str);
-
-   /**
-    * Writes out a header to the stream 'str'.
-    * The baseclass positions the stream correctly.
-    *
-    * Don't forget to call the parent first when you override 
-    * this function.
-    */
-   virtual void saveHeader(TQDataStream &str);
-
-   /**
-    * @return the resources for which this factory is responsible.
-    */
-   virtual const KSycocaResourceList * resourceList() const { return m_resourceList; }
-
-private:
-   int mOffset;
-
-protected:
-   int m_sycocaDictOffset;
-   int m_beginEntryOffset;
-   int m_endEntryOffset;
-   TQDataStream *m_str;
-
-   KSycocaResourceList *m_resourceList;
-   KSycocaEntryDict *m_entryDict;
-   KSycocaDict *m_sycocaDict;
-protected:
-   virtual void virtual_hook( int id, void* data );
-};
-
-/** This, instead of a typedef, allows to declare "class ..." in header files
- * @internal
- */
-class TDECORE_EXPORT KSycocaFactoryList : public TQPtrList<KSycocaFactory>
-{
-public:
-   KSycocaFactoryList() { }
-};
-
-#endif
diff --git a/extra/kde350/selectdialog.h b/extra/kde350/selectdialog.h
index 987dcb6..1a6560d 100644
--- a/extra/kde350/selectdialog.h
+++ b/extra/kde350/selectdialog.h
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkresources.
+    This file is part of libtderesources.
 
     Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
     Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
diff --git a/extra/kde350/tdesycocafactory.h b/extra/kde350/tdesycocafactory.h
new file mode 100644
index 0000000..4569fff
--- /dev/null
+++ b/extra/kde350/tdesycocafactory.h
@@ -0,0 +1,143 @@
+/*  This file is part of the KDE libraries
+ *  Copyright (C) 1999 Waldo Bastian <bastian@kde.org>
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Library General Public
+ *  License version 2 as published by the Free Software Foundation;
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Library General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Library General Public License
+ *  along with this library; see the file COPYING.LIB.  If not, write to
+ *  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ *  Boston, MA 02110-1301, USA.
+ **/
+
+#ifndef __tdesycocafactory_h__
+#define __tdesycocafactory_h__
+
+#include "tdesycocatype.h"
+#include "tdesycocaentry.h"
+
+#include <tqdict.h>
+#include <tqptrlist.h>
+class KSycoca;
+class TQStringList;
+class TQString;
+class KSycocaDict;
+class KSycocaResourceList;
+
+typedef TQDict<KSycocaEntry::Ptr> KSycocaEntryDict;
+
+/**
+ * @internal
+ * Base class for sycoca factories
+ */
+class TDECORE_EXPORT KSycocaFactory
+{
+public:
+   virtual KSycocaFactoryId factoryId() const = 0;
+ 
+protected: // virtual class
+   /**
+    * Create a factory which can be used to lookup from/create a database
+    * (depending on KSycoca::isBuilding())
+    */
+   KSycocaFactory( KSycocaFactoryId factory_id );
+
+public:
+   virtual ~KSycocaFactory();
+
+   /**
+    * @return the position of the factory in the sycoca file
+    */
+   int offset() { return mOffset; }
+
+   /**
+    * @return the dict, for special use by KBuildSycoca
+    */
+   KSycocaEntryDict * entryDict() { return m_entryDict; }
+
+   /**
+    * Construct an entry from a config file.
+    * To be implemented in the real factories.
+    */
+   virtual KSycocaEntry *createEntry(const TQString &file, const char *resource) = 0;
+
+   /**
+    * Add an entry
+    */
+   virtual void addEntry(KSycocaEntry *newEntry, const char *resource);
+
+   /**
+    * Remove an entry
+    * Not very fast, use with care. O(N)
+    */
+   void removeEntry(KSycocaEntry *newEntry);
+
+   /**
+    * Read an entry from the database
+    */
+   virtual KSycocaEntry *createEntry(int offset)=0;
+
+   /**
+    * Get a list of all entries from the database.
+    */
+   KSycocaEntry::List allEntries();
+
+   /**
+    * Saves all entries it maintains as well as index files
+    * for these entries to the stream 'str'.
+    *
+    * Also sets mOffset to the starting position.
+    *
+    * The stream is positioned at the end of the last index.
+    *
+    * Don't forget to call the parent first when you override 
+    * this function.
+    */
+   virtual void save(TQDataStream &str);
+
+   /**
+    * Writes out a header to the stream 'str'.
+    * The baseclass positions the stream correctly.
+    *
+    * Don't forget to call the parent first when you override 
+    * this function.
+    */
+   virtual void saveHeader(TQDataStream &str);
+
+   /**
+    * @return the resources for which this factory is responsible.
+    */
+   virtual const KSycocaResourceList * resourceList() const { return m_resourceList; }
+
+private:
+   int mOffset;
+
+protected:
+   int m_sycocaDictOffset;
+   int m_beginEntryOffset;
+   int m_endEntryOffset;
+   TQDataStream *m_str;
+
+   KSycocaResourceList *m_resourceList;
+   KSycocaEntryDict *m_entryDict;
+   KSycocaDict *m_sycocaDict;
+protected:
+   virtual void virtual_hook( int id, void* data );
+};
+
+/** This, instead of a typedef, allows to declare "class ..." in header files
+ * @internal
+ */
+class TDECORE_EXPORT KSycocaFactoryList : public TQPtrList<KSycocaFactory>
+{
+public:
+   KSycocaFactoryList() { }
+};
+
+#endif
diff --git a/extra/kde351/konsole_part.h b/extra/kde351/konsole_part.h
index 44b7588..a50b5af 100644
--- a/extra/kde351/konsole_part.h
+++ b/extra/kde351/konsole_part.h
@@ -21,8 +21,8 @@
 #ifndef KONSOLE_PART_H
 #define KONSOLE_PART_H
 
-#include <kparts/browserextension.h>
-#include <kparts/factory.h>
+#include <tdeparts/browserextension.h>
+#include <tdeparts/factory.h>
 
 
 #include <kdialogbase.h>
diff --git a/extra/kde351/ksycocafactory.h b/extra/kde351/ksycocafactory.h
deleted file mode 100644
index 1000478..0000000
--- a/extra/kde351/ksycocafactory.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/*  This file is part of the KDE libraries
- *  Copyright (C) 1999 Waldo Bastian <bastian@kde.org>
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public
- *  License version 2 as published by the Free Software Foundation;
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public License
- *  along with this library; see the file COPYING.LIB.  If not, write to
- *  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- *  Boston, MA 02110-1301, USA.
- **/
-
-#ifndef __ksycocafactory_h__
-#define __ksycocafactory_h__
-
-#include "ksycocatype.h"
-#include "ksycocaentry.h"
-
-#include <tqdict.h>
-#include <tqptrlist.h>
-class KSycoca;
-class TQStringList;
-class TQString;
-class KSycocaDict;
-class KSycocaResourceList;
-
-typedef TQDict<KSycocaEntry::Ptr> KSycocaEntryDict;
-
-/**
- * @internal
- * Base class for sycoca factories
- */
-class TDECORE_EXPORT KSycocaFactory
-{
-public:
-   virtual KSycocaFactoryId factoryId() const = 0;
- 
-protected: // virtual class
-   /**
-    * Create a factory which can be used to lookup from/create a database
-    * (depending on KSycoca::isBuilding())
-    */
-   KSycocaFactory( KSycocaFactoryId factory_id );
-
-public:
-   virtual ~KSycocaFactory();
-
-   /**
-    * @return the position of the factory in the sycoca file
-    */
-   int offset() { return mOffset; }
-
-   /**
-    * @return the dict, for special use by KBuildSycoca
-    */
-   KSycocaEntryDict * entryDict() { return m_entryDict; }
-
-   /**
-    * Construct an entry from a config file.
-    * To be implemented in the real factories.
-    */
-   virtual KSycocaEntry *createEntry(const TQString &file, const char *resource) = 0;
-
-   /**
-    * Add an entry
-    */
-   virtual void addEntry(KSycocaEntry *newEntry, const char *resource);
-
-   /**
-    * Remove an entry
-    * Not very fast, use with care. O(N)
-    */
-   void removeEntry(KSycocaEntry *newEntry);
-
-   /**
-    * Read an entry from the database
-    */
-   virtual KSycocaEntry *createEntry(int offset)=0;
-
-   /**
-    * Get a list of all entries from the database.
-    */
-   KSycocaEntry::List allEntries();
-
-   /**
-    * Saves all entries it maintains as well as index files
-    * for these entries to the stream 'str'.
-    *
-    * Also sets mOffset to the starting position.
-    *
-    * The stream is positioned at the end of the last index.
-    *
-    * Don't forget to call the parent first when you override 
-    * this function.
-    */
-   virtual void save(TQDataStream &str);
-
-   /**
-    * Writes out a header to the stream 'str'.
-    * The baseclass positions the stream correctly.
-    *
-    * Don't forget to call the parent first when you override 
-    * this function.
-    */
-   virtual void saveHeader(TQDataStream &str);
-
-   /**
-    * @return the resources for which this factory is responsible.
-    */
-   virtual const KSycocaResourceList * resourceList() const { return m_resourceList; }
-
-private:
-   int mOffset;
-
-protected:
-   int m_sycocaDictOffset;
-   int m_beginEntryOffset;
-   int m_endEntryOffset;
-   TQDataStream *m_str;
-
-   KSycocaResourceList *m_resourceList;
-   KSycocaEntryDict *m_entryDict;
-   KSycocaDict *m_sycocaDict;
-protected:
-   virtual void virtual_hook( int id, void* data );
-};
-
-/** This, instead of a typedef, allows to declare "class ..." in header files
- * @internal
- */
-class TDECORE_EXPORT KSycocaFactoryList : public TQPtrList<KSycocaFactory>
-{
-public:
-   KSycocaFactoryList() { }
-};
-
-#endif
diff --git a/extra/kde351/tdesycocafactory.h b/extra/kde351/tdesycocafactory.h
new file mode 100644
index 0000000..4569fff
--- /dev/null
+++ b/extra/kde351/tdesycocafactory.h
@@ -0,0 +1,143 @@
+/*  This file is part of the KDE libraries
+ *  Copyright (C) 1999 Waldo Bastian <bastian@kde.org>
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Library General Public
+ *  License version 2 as published by the Free Software Foundation;
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Library General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Library General Public License
+ *  along with this library; see the file COPYING.LIB.  If not, write to
+ *  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ *  Boston, MA 02110-1301, USA.
+ **/
+
+#ifndef __tdesycocafactory_h__
+#define __tdesycocafactory_h__
+
+#include "tdesycocatype.h"
+#include "tdesycocaentry.h"
+
+#include <tqdict.h>
+#include <tqptrlist.h>
+class KSycoca;
+class TQStringList;
+class TQString;
+class KSycocaDict;
+class KSycocaResourceList;
+
+typedef TQDict<KSycocaEntry::Ptr> KSycocaEntryDict;
+
+/**
+ * @internal
+ * Base class for sycoca factories
+ */
+class TDECORE_EXPORT KSycocaFactory
+{
+public:
+   virtual KSycocaFactoryId factoryId() const = 0;
+ 
+protected: // virtual class
+   /**
+    * Create a factory which can be used to lookup from/create a database
+    * (depending on KSycoca::isBuilding())
+    */
+   KSycocaFactory( KSycocaFactoryId factory_id );
+
+public:
+   virtual ~KSycocaFactory();
+
+   /**
+    * @return the position of the factory in the sycoca file
+    */
+   int offset() { return mOffset; }
+
+   /**
+    * @return the dict, for special use by KBuildSycoca
+    */
+   KSycocaEntryDict * entryDict() { return m_entryDict; }
+
+   /**
+    * Construct an entry from a config file.
+    * To be implemented in the real factories.
+    */
+   virtual KSycocaEntry *createEntry(const TQString &file, const char *resource) = 0;
+
+   /**
+    * Add an entry
+    */
+   virtual void addEntry(KSycocaEntry *newEntry, const char *resource);
+
+   /**
+    * Remove an entry
+    * Not very fast, use with care. O(N)
+    */
+   void removeEntry(KSycocaEntry *newEntry);
+
+   /**
+    * Read an entry from the database
+    */
+   virtual KSycocaEntry *createEntry(int offset)=0;
+
+   /**
+    * Get a list of all entries from the database.
+    */
+   KSycocaEntry::List allEntries();
+
+   /**
+    * Saves all entries it maintains as well as index files
+    * for these entries to the stream 'str'.
+    *
+    * Also sets mOffset to the starting position.
+    *
+    * The stream is positioned at the end of the last index.
+    *
+    * Don't forget to call the parent first when you override 
+    * this function.
+    */
+   virtual void save(TQDataStream &str);
+
+   /**
+    * Writes out a header to the stream 'str'.
+    * The baseclass positions the stream correctly.
+    *
+    * Don't forget to call the parent first when you override 
+    * this function.
+    */
+   virtual void saveHeader(TQDataStream &str);
+
+   /**
+    * @return the resources for which this factory is responsible.
+    */
+   virtual const KSycocaResourceList * resourceList() const { return m_resourceList; }
+
+private:
+   int mOffset;
+
+protected:
+   int m_sycocaDictOffset;
+   int m_beginEntryOffset;
+   int m_endEntryOffset;
+   TQDataStream *m_str;
+
+   KSycocaResourceList *m_resourceList;
+   KSycocaEntryDict *m_entryDict;
+   KSycocaDict *m_sycocaDict;
+protected:
+   virtual void virtual_hook( int id, void* data );
+};
+
+/** This, instead of a typedef, allows to declare "class ..." in header files
+ * @internal
+ */
+class TDECORE_EXPORT KSycocaFactoryList : public TQPtrList<KSycocaFactory>
+{
+public:
+   KSycocaFactoryList() { }
+};
+
+#endif
diff --git a/extra/kde352/konsole_part.h b/extra/kde352/konsole_part.h
index 44b7588..a50b5af 100644
--- a/extra/kde352/konsole_part.h
+++ b/extra/kde352/konsole_part.h
@@ -21,8 +21,8 @@
 #ifndef KONSOLE_PART_H
 #define KONSOLE_PART_H
 
-#include <kparts/browserextension.h>
-#include <kparts/factory.h>
+#include <tdeparts/browserextension.h>
+#include <tdeparts/factory.h>
 
 
 #include <kdialogbase.h>
diff --git a/extra/kde352/ksycocafactory.h b/extra/kde352/ksycocafactory.h
deleted file mode 100644
index 1000478..0000000
--- a/extra/kde352/ksycocafactory.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/*  This file is part of the KDE libraries
- *  Copyright (C) 1999 Waldo Bastian <bastian@kde.org>
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public
- *  License version 2 as published by the Free Software Foundation;
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public License
- *  along with this library; see the file COPYING.LIB.  If not, write to
- *  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- *  Boston, MA 02110-1301, USA.
- **/
-
-#ifndef __ksycocafactory_h__
-#define __ksycocafactory_h__
-
-#include "ksycocatype.h"
-#include "ksycocaentry.h"
-
-#include <tqdict.h>
-#include <tqptrlist.h>
-class KSycoca;
-class TQStringList;
-class TQString;
-class KSycocaDict;
-class KSycocaResourceList;
-
-typedef TQDict<KSycocaEntry::Ptr> KSycocaEntryDict;
-
-/**
- * @internal
- * Base class for sycoca factories
- */
-class TDECORE_EXPORT KSycocaFactory
-{
-public:
-   virtual KSycocaFactoryId factoryId() const = 0;
- 
-protected: // virtual class
-   /**
-    * Create a factory which can be used to lookup from/create a database
-    * (depending on KSycoca::isBuilding())
-    */
-   KSycocaFactory( KSycocaFactoryId factory_id );
-
-public:
-   virtual ~KSycocaFactory();
-
-   /**
-    * @return the position of the factory in the sycoca file
-    */
-   int offset() { return mOffset; }
-
-   /**
-    * @return the dict, for special use by KBuildSycoca
-    */
-   KSycocaEntryDict * entryDict() { return m_entryDict; }
-
-   /**
-    * Construct an entry from a config file.
-    * To be implemented in the real factories.
-    */
-   virtual KSycocaEntry *createEntry(const TQString &file, const char *resource) = 0;
-
-   /**
-    * Add an entry
-    */
-   virtual void addEntry(KSycocaEntry *newEntry, const char *resource);
-
-   /**
-    * Remove an entry
-    * Not very fast, use with care. O(N)
-    */
-   void removeEntry(KSycocaEntry *newEntry);
-
-   /**
-    * Read an entry from the database
-    */
-   virtual KSycocaEntry *createEntry(int offset)=0;
-
-   /**
-    * Get a list of all entries from the database.
-    */
-   KSycocaEntry::List allEntries();
-
-   /**
-    * Saves all entries it maintains as well as index files
-    * for these entries to the stream 'str'.
-    *
-    * Also sets mOffset to the starting position.
-    *
-    * The stream is positioned at the end of the last index.
-    *
-    * Don't forget to call the parent first when you override 
-    * this function.
-    */
-   virtual void save(TQDataStream &str);
-
-   /**
-    * Writes out a header to the stream 'str'.
-    * The baseclass positions the stream correctly.
-    *
-    * Don't forget to call the parent first when you override 
-    * this function.
-    */
-   virtual void saveHeader(TQDataStream &str);
-
-   /**
-    * @return the resources for which this factory is responsible.
-    */
-   virtual const KSycocaResourceList * resourceList() const { return m_resourceList; }
-
-private:
-   int mOffset;
-
-protected:
-   int m_sycocaDictOffset;
-   int m_beginEntryOffset;
-   int m_endEntryOffset;
-   TQDataStream *m_str;
-
-   KSycocaResourceList *m_resourceList;
-   KSycocaEntryDict *m_entryDict;
-   KSycocaDict *m_sycocaDict;
-protected:
-   virtual void virtual_hook( int id, void* data );
-};
-
-/** This, instead of a typedef, allows to declare "class ..." in header files
- * @internal
- */
-class TDECORE_EXPORT KSycocaFactoryList : public TQPtrList<KSycocaFactory>
-{
-public:
-   KSycocaFactoryList() { }
-};
-
-#endif
diff --git a/extra/kde352/tdesycocafactory.h b/extra/kde352/tdesycocafactory.h
new file mode 100644
index 0000000..4569fff
--- /dev/null
+++ b/extra/kde352/tdesycocafactory.h
@@ -0,0 +1,143 @@
+/*  This file is part of the KDE libraries
+ *  Copyright (C) 1999 Waldo Bastian <bastian@kde.org>
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Library General Public
+ *  License version 2 as published by the Free Software Foundation;
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Library General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Library General Public License
+ *  along with this library; see the file COPYING.LIB.  If not, write to
+ *  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ *  Boston, MA 02110-1301, USA.
+ **/
+
+#ifndef __tdesycocafactory_h__
+#define __tdesycocafactory_h__
+
+#include "tdesycocatype.h"
+#include "tdesycocaentry.h"
+
+#include <tqdict.h>
+#include <tqptrlist.h>
+class KSycoca;
+class TQStringList;
+class TQString;
+class KSycocaDict;
+class KSycocaResourceList;
+
+typedef TQDict<KSycocaEntry::Ptr> KSycocaEntryDict;
+
+/**
+ * @internal
+ * Base class for sycoca factories
+ */
+class TDECORE_EXPORT KSycocaFactory
+{
+public:
+   virtual KSycocaFactoryId factoryId() const = 0;
+ 
+protected: // virtual class
+   /**
+    * Create a factory which can be used to lookup from/create a database
+    * (depending on KSycoca::isBuilding())
+    */
+   KSycocaFactory( KSycocaFactoryId factory_id );
+
+public:
+   virtual ~KSycocaFactory();
+
+   /**
+    * @return the position of the factory in the sycoca file
+    */
+   int offset() { return mOffset; }
+
+   /**
+    * @return the dict, for special use by KBuildSycoca
+    */
+   KSycocaEntryDict * entryDict() { return m_entryDict; }
+
+   /**
+    * Construct an entry from a config file.
+    * To be implemented in the real factories.
+    */
+   virtual KSycocaEntry *createEntry(const TQString &file, const char *resource) = 0;
+
+   /**
+    * Add an entry
+    */
+   virtual void addEntry(KSycocaEntry *newEntry, const char *resource);
+
+   /**
+    * Remove an entry
+    * Not very fast, use with care. O(N)
+    */
+   void removeEntry(KSycocaEntry *newEntry);
+
+   /**
+    * Read an entry from the database
+    */
+   virtual KSycocaEntry *createEntry(int offset)=0;
+
+   /**
+    * Get a list of all entries from the database.
+    */
+   KSycocaEntry::List allEntries();
+
+   /**
+    * Saves all entries it maintains as well as index files
+    * for these entries to the stream 'str'.
+    *
+    * Also sets mOffset to the starting position.
+    *
+    * The stream is positioned at the end of the last index.
+    *
+    * Don't forget to call the parent first when you override 
+    * this function.
+    */
+   virtual void save(TQDataStream &str);
+
+   /**
+    * Writes out a header to the stream 'str'.
+    * The baseclass positions the stream correctly.
+    *
+    * Don't forget to call the parent first when you override 
+    * this function.
+    */
+   virtual void saveHeader(TQDataStream &str);
+
+   /**
+    * @return the resources for which this factory is responsible.
+    */
+   virtual const KSycocaResourceList * resourceList() const { return m_resourceList; }
+
+private:
+   int mOffset;
+
+protected:
+   int m_sycocaDictOffset;
+   int m_beginEntryOffset;
+   int m_endEntryOffset;
+   TQDataStream *m_str;
+
+   KSycocaResourceList *m_resourceList;
+   KSycocaEntryDict *m_entryDict;
+   KSycocaDict *m_sycocaDict;
+protected:
+   virtual void virtual_hook( int id, void* data );
+};
+
+/** This, instead of a typedef, allows to declare "class ..." in header files
+ * @internal
+ */
+class TDECORE_EXPORT KSycocaFactoryList : public TQPtrList<KSycocaFactory>
+{
+public:
+   KSycocaFactoryList() { }
+};
+
+#endif
diff --git a/extra/kde353/konsole_part.h b/extra/kde353/konsole_part.h
index 44b7588..a50b5af 100644
--- a/extra/kde353/konsole_part.h
+++ b/extra/kde353/konsole_part.h
@@ -21,8 +21,8 @@
 #ifndef KONSOLE_PART_H
 #define KONSOLE_PART_H
 
-#include <kparts/browserextension.h>
-#include <kparts/factory.h>
+#include <tdeparts/browserextension.h>
+#include <tdeparts/factory.h>
 
 
 #include <kdialogbase.h>
diff --git a/extra/kde353/ksycocafactory.h b/extra/kde353/ksycocafactory.h
deleted file mode 100644
index 1000478..0000000
--- a/extra/kde353/ksycocafactory.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/*  This file is part of the KDE libraries
- *  Copyright (C) 1999 Waldo Bastian <bastian@kde.org>
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public
- *  License version 2 as published by the Free Software Foundation;
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public License
- *  along with this library; see the file COPYING.LIB.  If not, write to
- *  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- *  Boston, MA 02110-1301, USA.
- **/
-
-#ifndef __ksycocafactory_h__
-#define __ksycocafactory_h__
-
-#include "ksycocatype.h"
-#include "ksycocaentry.h"
-
-#include <tqdict.h>
-#include <tqptrlist.h>
-class KSycoca;
-class TQStringList;
-class TQString;
-class KSycocaDict;
-class KSycocaResourceList;
-
-typedef TQDict<KSycocaEntry::Ptr> KSycocaEntryDict;
-
-/**
- * @internal
- * Base class for sycoca factories
- */
-class TDECORE_EXPORT KSycocaFactory
-{
-public:
-   virtual KSycocaFactoryId factoryId() const = 0;
- 
-protected: // virtual class
-   /**
-    * Create a factory which can be used to lookup from/create a database
-    * (depending on KSycoca::isBuilding())
-    */
-   KSycocaFactory( KSycocaFactoryId factory_id );
-
-public:
-   virtual ~KSycocaFactory();
-
-   /**
-    * @return the position of the factory in the sycoca file
-    */
-   int offset() { return mOffset; }
-
-   /**
-    * @return the dict, for special use by KBuildSycoca
-    */
-   KSycocaEntryDict * entryDict() { return m_entryDict; }
-
-   /**
-    * Construct an entry from a config file.
-    * To be implemented in the real factories.
-    */
-   virtual KSycocaEntry *createEntry(const TQString &file, const char *resource) = 0;
-
-   /**
-    * Add an entry
-    */
-   virtual void addEntry(KSycocaEntry *newEntry, const char *resource);
-
-   /**
-    * Remove an entry
-    * Not very fast, use with care. O(N)
-    */
-   void removeEntry(KSycocaEntry *newEntry);
-
-   /**
-    * Read an entry from the database
-    */
-   virtual KSycocaEntry *createEntry(int offset)=0;
-
-   /**
-    * Get a list of all entries from the database.
-    */
-   KSycocaEntry::List allEntries();
-
-   /**
-    * Saves all entries it maintains as well as index files
-    * for these entries to the stream 'str'.
-    *
-    * Also sets mOffset to the starting position.
-    *
-    * The stream is positioned at the end of the last index.
-    *
-    * Don't forget to call the parent first when you override 
-    * this function.
-    */
-   virtual void save(TQDataStream &str);
-
-   /**
-    * Writes out a header to the stream 'str'.
-    * The baseclass positions the stream correctly.
-    *
-    * Don't forget to call the parent first when you override 
-    * this function.
-    */
-   virtual void saveHeader(TQDataStream &str);
-
-   /**
-    * @return the resources for which this factory is responsible.
-    */
-   virtual const KSycocaResourceList * resourceList() const { return m_resourceList; }
-
-private:
-   int mOffset;
-
-protected:
-   int m_sycocaDictOffset;
-   int m_beginEntryOffset;
-   int m_endEntryOffset;
-   TQDataStream *m_str;
-
-   KSycocaResourceList *m_resourceList;
-   KSycocaEntryDict *m_entryDict;
-   KSycocaDict *m_sycocaDict;
-protected:
-   virtual void virtual_hook( int id, void* data );
-};
-
-/** This, instead of a typedef, allows to declare "class ..." in header files
- * @internal
- */
-class TDECORE_EXPORT KSycocaFactoryList : public TQPtrList<KSycocaFactory>
-{
-public:
-   KSycocaFactoryList() { }
-};
-
-#endif
diff --git a/extra/kde353/tdesycocafactory.h b/extra/kde353/tdesycocafactory.h
new file mode 100644
index 0000000..4569fff
--- /dev/null
+++ b/extra/kde353/tdesycocafactory.h
@@ -0,0 +1,143 @@
+/*  This file is part of the KDE libraries
+ *  Copyright (C) 1999 Waldo Bastian <bastian@kde.org>
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Library General Public
+ *  License version 2 as published by the Free Software Foundation;
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Library General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Library General Public License
+ *  along with this library; see the file COPYING.LIB.  If not, write to
+ *  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ *  Boston, MA 02110-1301, USA.
+ **/
+
+#ifndef __tdesycocafactory_h__
+#define __tdesycocafactory_h__
+
+#include "tdesycocatype.h"
+#include "tdesycocaentry.h"
+
+#include <tqdict.h>
+#include <tqptrlist.h>
+class KSycoca;
+class TQStringList;
+class TQString;
+class KSycocaDict;
+class KSycocaResourceList;
+
+typedef TQDict<KSycocaEntry::Ptr> KSycocaEntryDict;
+
+/**
+ * @internal
+ * Base class for sycoca factories
+ */
+class TDECORE_EXPORT KSycocaFactory
+{
+public:
+   virtual KSycocaFactoryId factoryId() const = 0;
+ 
+protected: // virtual class
+   /**
+    * Create a factory which can be used to lookup from/create a database
+    * (depending on KSycoca::isBuilding())
+    */
+   KSycocaFactory( KSycocaFactoryId factory_id );
+
+public:
+   virtual ~KSycocaFactory();
+
+   /**
+    * @return the position of the factory in the sycoca file
+    */
+   int offset() { return mOffset; }
+
+   /**
+    * @return the dict, for special use by KBuildSycoca
+    */
+   KSycocaEntryDict * entryDict() { return m_entryDict; }
+
+   /**
+    * Construct an entry from a config file.
+    * To be implemented in the real factories.
+    */
+   virtual KSycocaEntry *createEntry(const TQString &file, const char *resource) = 0;
+
+   /**
+    * Add an entry
+    */
+   virtual void addEntry(KSycocaEntry *newEntry, const char *resource);
+
+   /**
+    * Remove an entry
+    * Not very fast, use with care. O(N)
+    */
+   void removeEntry(KSycocaEntry *newEntry);
+
+   /**
+    * Read an entry from the database
+    */
+   virtual KSycocaEntry *createEntry(int offset)=0;
+
+   /**
+    * Get a list of all entries from the database.
+    */
+   KSycocaEntry::List allEntries();
+
+   /**
+    * Saves all entries it maintains as well as index files
+    * for these entries to the stream 'str'.
+    *
+    * Also sets mOffset to the starting position.
+    *
+    * The stream is positioned at the end of the last index.
+    *
+    * Don't forget to call the parent first when you override 
+    * this function.
+    */
+   virtual void save(TQDataStream &str);
+
+   /**
+    * Writes out a header to the stream 'str'.
+    * The baseclass positions the stream correctly.
+    *
+    * Don't forget to call the parent first when you override 
+    * this function.
+    */
+   virtual void saveHeader(TQDataStream &str);
+
+   /**
+    * @return the resources for which this factory is responsible.
+    */
+   virtual const KSycocaResourceList * resourceList() const { return m_resourceList; }
+
+private:
+   int mOffset;
+
+protected:
+   int m_sycocaDictOffset;
+   int m_beginEntryOffset;
+   int m_endEntryOffset;
+   TQDataStream *m_str;
+
+   KSycocaResourceList *m_resourceList;
+   KSycocaEntryDict *m_entryDict;
+   KSycocaDict *m_sycocaDict;
+protected:
+   virtual void virtual_hook( int id, void* data );
+};
+
+/** This, instead of a typedef, allows to declare "class ..." in header files
+ * @internal
+ */
+class TDECORE_EXPORT KSycocaFactoryList : public TQPtrList<KSycocaFactory>
+{
+public:
+   KSycocaFactoryList() { }
+};
+
+#endif
diff --git a/importTest.py b/importTest.py
index 1a36338..33fc9bc 100644
--- a/importTest.py
+++ b/importTest.py
@@ -7,7 +7,7 @@ except:
 
 pytdecfg = pytdeconfig.Configuration ()
 
-#modules = ["dcop", "tdecore", "tdesu", "tdefx", "tdeui", "kio", "kfile", "kparts", "khtml", "kjs", "kspell", "tdeprint"]
+#modules = ["dcop", "tdecore", "tdesu", "tdefx", "tdeui", "kio", "kfile", "tdeparts", "tdehtml", "kjs", "tdespell", "tdeprint"]
 print "Modules built:"
 print " ",pytdecfg.pytde_modules
 print
diff --git a/pytde350.prj b/pytde350.prj
index 8ebd589..9047e2d 100644
--- a/pytde350.prj
+++ b/pytde350.prj
@@ -66,7 +66,7 @@ module = tdecore
 
 source     = $SRC/tdecore
 ignore     = netwm_p.h kde_dmalloc.h kunload.h kdatastream.h  ksockaddr.h kextsock.h ksocks.h
-ignore     = ksycocaentry.h ksycocafactory.h ksycocatype.h ksycoca.h kapp.h kstandarddirs.h
+ignore     = tdesycocaentry.h tdesycocafactory.h tdesycocatype.h tdesycoca.h kapp.h kstandarddirs.h
 ignore     = kgenericfactory.h ktypelist.h kvmallocator.h  ksortablevaluelist.h
 ignore     = kextendedsocket.h klargefile.h kdebug.h kdebugclasses.h kxmessages.h kaccelmanager.h
 ignore     = kdemacros.h kxerrorhandler.h fixx11.h kuser.h kuniqueapp.h kde_file.h tdelibs_export.h
@@ -142,7 +142,7 @@ module = tdeui
 
 source     = $SRC/tdeui/
 ignore     = kcolorbutton.h kcolordlg.h kwidgetid.h kaccelgen.h kdatepik.h kdualcolorbtn.h kxmlgui.h kdockwidget_p.h
-ignore     = kdockwindow.h ksconfig.h kspell.h kspelldlg.h klistviewlineedit.h ksyntaxhighlighter.h ksharedpixmap.h
+ignore     = kdockwindow.h ksconfig.h tdespell.h tdespelldlg.h klistviewlineedit.h ksyntaxhighlighter.h ksharedpixmap.h
 compare    = $COMP
 subst      = $DST/extra/kde350
 import     = qtmod.sip (TQt_3_0_0 TQt_4_0_0 WS_X11)
@@ -196,11 +196,11 @@ retain
 
 // -----------------------------------------
 
-module = kresources
+module = tderesources
 
-source     = $SRC/kresources
+source     = $SRC/tderesources
 ignore     =
-compare    = $COMP $COMP/kresources
+compare    = $COMP $COMP/tderesources
 subst      =
 ignore     = manager.h manageriface.h managerimpl.h
 import     = qtmod.sip (TQt_3_0_0 TQt_4_0_0 WS_X11)
@@ -211,7 +211,7 @@ import     = tdefxmod.sip
 import     = tdeuimod.sip
 import     = kiomod.sip
 importpath = $IMP
-libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lkresources
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -ltderesources
 define     = "KDE_DEPRECATED", ""
 define     = "KRESOURCES_EXPORT", ""
 
@@ -232,7 +232,7 @@ import     = tdecoremod.sip
 import     = tdefxmod.sip
 import     = tdeuimod.sip
 import     = kiomod.sip
-import     = kresourcesmod.sip
+import     = tderesourcesmod.sip
 importpath = $IMP
 libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lkabc
 define     = "KDE_DEPRECATED", ""
@@ -243,9 +243,9 @@ retain
 
 // -----------------------------------------
 
-module = kutils
+module = tdeutils
 
-source     = $SRC/kutils/
+source     = $SRC/tdeutils/
 ignore     =
 compare    = $COMP
 subst      = $DST/extra/kde350
@@ -258,12 +258,12 @@ import     = tdefxmod.sip
 import     = tdeuimod.sip
 //import     = kiomod.sip
 //import     = kfilemod.sip
-//import     = kpartsmod.sip
+//import     = tdepartsmod.sip
 importpath = $IMP
 include    =  ../dcop ../tdecore  ../tdeui ../pythonize ../pykpanelapplet
 libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lqtxmlcmodule -lDCOP -ltdecore -ltdeui\
              -ldcopcmodule -ltdecorecmodule -ltqt-mt -ltdefx -ltdefxcmodule -lpythonize -ltdeuicmodule\
-             -lkutils
+             -ltdeutils
 define     = "class\ KMultiTabBarButton\ \*", "KMultiTabBarButton *"
 define     = "class\ KMultiTabBarTab\ \*", "KMultiTabBarTab *"
 
@@ -295,11 +295,11 @@ retain
 
 // -----------------------------------------
 
-module = kparts
+module = tdeparts
 
-source     = $SRC/kparts
+source     = $SRC/tdeparts
 ignore     = componentfactory.h
-compare    = $COMP/kparts
+compare    = $COMP/tdeparts
 subst      = $DST/extra/kde350
 import     = qtmod.sip (TQt_3_0_0 TQt_4_0_0 WS_X11)
 import     = qtxmlmod.sip (TQt_3_0_0 TQt_4_0_0 WS_X11)
@@ -311,18 +311,18 @@ import     = kio
 importpath = $IMP
 amend      = * ctor parent /TransferThis/
 amend      = * all parent /Transfer/
-include    = @KDE_INCLUDEPATH@/kparts  @KDE_INCLUDEPATH@/kio  ../tdecore ../kio
-libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -lkparts -ltdeui -ltdecore -lkio -ltdeuicmodule\
+include    = @KDE_INCLUDEPATH@/tdeparts  @KDE_INCLUDEPATH@/kio  ../tdecore ../kio
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -ltdeparts -ltdeui -ltdecore -lkio -ltdeuicmodule\
              -ltdecorecmodule -lkiocmodule -ldcopcmodule -lkiocmodule
 
 retain
 
 // -----------------------------------------
 
-module = khtml
+module = tdehtml
 
-source     = $SRC/khtml $SRC/khtml/dom
-ignore     = khtmldefaults.h dom_core.h dom_html.h khtml_events.h
+source     = $SRC/tdehtml $SRC/tdehtml/dom
+ignore     = tdehtmldefaults.h dom_core.h dom_html.h tdehtml_events.h
 compare    = $COMP  $COMP/dom
 subst      = $DST/extra/kde350
 import     = qtmod.sip (TQt_3_0_0 TQt_4_0_0 WS_X11)
@@ -332,15 +332,15 @@ import     = tdecore
 import     = tdefx
 import     = tdeui
 import     = kio
-import     = kutils
-import     = kparts
+import     = tdeutils
+import     = tdeparts
 importpath = $IMP
 amend      = * ctor parent /TransferThis/
 amend      = * all parent /Transfer/
-include    = @KDE_INCLUDEPATH@/khtml @KDE_INCLUDEPATH@/dom  @KDE_INCLUDEPATH@/kparts\
+include    = @KDE_INCLUDEPATH@/tdehtml @KDE_INCLUDEPATH@/dom  @KDE_INCLUDEPATH@/tdeparts\
              @KDE_INCLUDEPATH@/kio ../tdecore ../kio
-libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -ltdeui -lkhtml -lkparts -ltdecore -lkio\
-            -ltdeuicmodule -ltdecorecmodule -lkiocmodule -lkpartscmodule -ldcopcmodule
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -ltdeui -ltdehtml -ltdeparts -ltdecore -lkio\
+            -ltdeuicmodule -ltdecorecmodule -lkiocmodule -ltdepartscmodule -ldcopcmodule
 
 define     = "KHTML_EXPORT", ""
 retain
@@ -360,24 +360,24 @@ retain
 //import     = tdefx
 //import     = tdeui
 //import     = kio
-//import     = kparts
-//import     = khtml
+//import     = tdeparts
+//import     = tdehtml
 //importpath = $IMP
 //include    = @KDE_INCLUDEPATH@/kjs @KDE_INCLUDEPATH@/dom @KDE_INCLUDEPATH@/kio\
 //             ../tdecore  ../kio
 //amend      = * ctor parent /TransferThis/
 //amend      = * all parent /Transfer/
-//libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -lkjs -ltdeui -ltdecore -lkio -lkhtml\
-//             -ltdeuicmodule -ltdecorecmodule -lkhtmlcmodule -lkiocmodule -ldcopcmodule
+//libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -lkjs -ltdeui -ltdecore -lkio -ltdehtml\
+//             -ltdeuicmodule -ltdecorecmodule -ltdehtmlcmodule -lkiocmodule -ldcopcmodule
 
 //retain
 
 // -----------------------------------------
 
-module = kspell
+module = tdespell
 
 ignore     =
-source     = $DST/extra/kde350/kspell
+source     = $DST/extra/kde350/tdespell
 compare    = $COMP
 subst      = $DST/extra/kde350
 import     = qtmod.sip (TQt_3_0_0 TQt_4_0_0 WS_X11)
@@ -392,9 +392,9 @@ include    = ../tdecore  @KDE_INCLUDEPATH@/kio
 amend      = * ctor parent /TransferThis/        const KGuiItem& nullGuiItem (TQString::null);
 
 amend      = * all parent /Transfer/
-libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -lkspell -ltdeui -ltdecore -lkio\
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -ltdespell -ltdeui -ltdecore -lkio\
              -ltdecorecmodule -ltdeuicmodule -lkfilecmodule -ldcopcmodule
-sipslot    = obj slot kspell
+sipslot    = obj slot tdespell
 
 code
 %PrePythonCode
@@ -429,9 +429,9 @@ retain
 
 // -----------------------------------------
 
-module = kmdi
+module = tdemdi
 
-source     = $SRC/kmdi/
+source     = $SRC/tdemdi/
 ignore     =
 compare    = $COMP
 subst      = $DST/extra/kde350
@@ -443,14 +443,14 @@ import     = tdefxmod.sip
 import     = tdeuimod.sip
 //import     = kiomod.sip
 //import     = kfilemod.sip
-//import     = kpartsmod.sip
+//import     = tdepartsmod.sip
 importpath = $IMP
-ignore     = kmdiiterator.h kmdilistiterator.h kmdinulliterator.h
+ignore     = tdemdiiterator.h tdemdilistiterator.h tdemdinulliterator.h
 
 include    =  ../dcop ../tdecore  ../tdeui ../pythonize ../pykpanelapplet
 libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lqtxmlcmodule -lDCOP -ltdecore -ltdeui\
              -ldcopcmodule -ltdecorecmodule -ltqt-mt -ltdefx -ltdefxcmodule -lpythonize -ltdeuicmodule\
-             -lkmdi
+             -ltdemdi
 define     = "TQT_VERSION", "301"
 define     = "TQMainWindow::ToolBarDock", "TQt::Dock"
 
@@ -459,9 +459,9 @@ retain
 
 // -----------------------------------------
 
-//module = kspell2
+//module = tdespell2
 
-//source     = $SRC/kspell2/
+//source     = $SRC/tdespell2/
 //ignore     =
 //compare    = $COMP
 //subst      = $DST/extra/kde350
@@ -473,12 +473,12 @@ retain
 //import     = tdeuimod.sip
 ////import     = kiomod.sip
 ////import     = kfilemod.sip
-////import     = kpartsmod.sip
+////import     = tdepartsmod.sip
 //importpath = $IMP
 //include    =  ../dcop ../tdecore  ../tdeui ../pythonize ../pykpanelapplet
 //libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lqtxmlcmodule -lDCOP -ltdecore -ltdeui\
 //             -ldcopcmodule -ltdecorecmodule -ltqt-mt -ltdefx -ltdefxcmodule -lpythonize -ltdeuicmodule\
-//             -lkspell2
+//             -ltdespell2
 //
 //retain
 
diff --git a/pytde351.prj b/pytde351.prj
index ce1c3cb..cd30eb2 100644
--- a/pytde351.prj
+++ b/pytde351.prj
@@ -66,7 +66,7 @@ module = tdecore
 
 source     = $SRC/tdecore
 ignore     = netwm_p.h kde_dmalloc.h kunload.h kdatastream.h  ksockaddr.h kextsock.h ksocks.h
-ignore     = ksycocaentry.h ksycocafactory.h ksycocatype.h ksycoca.h kapp.h kstandarddirs.h
+ignore     = tdesycocaentry.h tdesycocafactory.h tdesycocatype.h tdesycoca.h kapp.h kstandarddirs.h
 ignore     = kgenericfactory.h ktypelist.h kvmallocator.h  ksortablevaluelist.h
 ignore     = kextendedsocket.h klargefile.h kdebug.h kdebugclasses.h kxmessages.h kaccelmanager.h
 ignore     = kdemacros.h kxerrorhandler.h fixx11.h kuser.h kuniqueapp.h kde_file.h tdelibs_export.h
@@ -142,7 +142,7 @@ module = tdeui
 
 source     = $SRC/tdeui/
 ignore     = kcolorbutton.h kcolordlg.h kwidgetid.h kaccelgen.h kdatepik.h kdualcolorbtn.h kxmlgui.h kdockwidget_p.h
-ignore     = kdockwindow.h ksconfig.h kspell.h kspelldlg.h klistviewlineedit.h ksyntaxhighlighter.h ksharedpixmap.h
+ignore     = kdockwindow.h ksconfig.h tdespell.h tdespelldlg.h klistviewlineedit.h ksyntaxhighlighter.h ksharedpixmap.h
 compare    = $COMP
 subst      = $DST/extra/kde351
 import     = qtmod.sip (TQt_3_0_0 TQt_4_0_0 WS_X11)
@@ -196,11 +196,11 @@ retain
 
 // -----------------------------------------
 
-module = kresources
+module = tderesources
 
-source     = $SRC/kresources
+source     = $SRC/tderesources
 ignore     =
-compare    = $COMP $COMP/kresources
+compare    = $COMP $COMP/tderesources
 subst      =
 ignore     = manager.h manageriface.h managerimpl.h
 import     = qtmod.sip (TQt_3_0_0 TQt_4_0_0 WS_X11)
@@ -211,7 +211,7 @@ import     = tdefxmod.sip
 import     = tdeuimod.sip
 import     = kiomod.sip
 importpath = $IMP
-libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lkresources
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -ltderesources
 define     = "KDE_DEPRECATED", ""
 define     = "KRESOURCES_EXPORT", ""
 
@@ -232,7 +232,7 @@ import     = tdecoremod.sip
 import     = tdefxmod.sip
 import     = tdeuimod.sip
 import     = kiomod.sip
-import     = kresourcesmod.sip
+import     = tderesourcesmod.sip
 importpath = $IMP
 libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lkabc -lkabc_file
 define     = "KDE_DEPRECATED", ""
@@ -243,9 +243,9 @@ retain
 
 // -----------------------------------------
 
-module = kutils
+module = tdeutils
 
-source     = $SRC/kutils/
+source     = $SRC/tdeutils/
 ignore     =
 compare    = $COMP
 subst      = $DST/extra/kde351
@@ -258,12 +258,12 @@ import     = tdefxmod.sip
 import     = tdeuimod.sip
 //import     = kiomod.sip
 //import     = kfilemod.sip
-//import     = kpartsmod.sip
+//import     = tdepartsmod.sip
 importpath = $IMP
 include    =  ../dcop ../tdecore  ../tdeui ../pythonize ../pykpanelapplet
 libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lqtxmlcmodule -lDCOP -ltdecore -ltdeui\
              -ldcopcmodule -ltdecorecmodule -ltqt-mt -ltdefx -ltdefxcmodule -lpythonize -ltdeuicmodule\
-             -lkutils
+             -ltdeutils
 define     = "class\ KMultiTabBarButton\ \*", "KMultiTabBarButton *"
 define     = "class\ KMultiTabBarTab\ \*", "KMultiTabBarTab *"
 
@@ -295,11 +295,11 @@ retain
 
 // -----------------------------------------
 
-module = kparts
+module = tdeparts
 
-source     = $SRC/kparts
+source     = $SRC/tdeparts
 ignore     = componentfactory.h
-compare    = $COMP/kparts
+compare    = $COMP/tdeparts
 subst      = $DST/extra/kde351
 import     = qtmod.sip (TQt_3_0_0 TQt_4_0_0 WS_X11)
 import     = qtxmlmod.sip (TQt_3_0_0 TQt_4_0_0 WS_X11)
@@ -311,18 +311,18 @@ import     = kio
 importpath = $IMP
 amend      = * ctor parent /TransferThis/
 amend      = * all parent /Transfer/
-include    = @KDE_INCLUDEPATH@/kparts  @KDE_INCLUDEPATH@/kio  ../tdecore ../kio
-libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -lkparts -ltdeui -ltdecore -lkio -ltdeuicmodule\
+include    = @KDE_INCLUDEPATH@/tdeparts  @KDE_INCLUDEPATH@/kio  ../tdecore ../kio
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -ltdeparts -ltdeui -ltdecore -lkio -ltdeuicmodule\
              -ltdecorecmodule -lkiocmodule -ldcopcmodule -lkiocmodule
 
 retain
 
 // -----------------------------------------
 
-module = khtml
+module = tdehtml
 
-source     = $SRC/khtml $SRC/khtml/dom
-ignore     = khtmldefaults.h dom_core.h dom_html.h khtml_events.h
+source     = $SRC/tdehtml $SRC/tdehtml/dom
+ignore     = tdehtmldefaults.h dom_core.h dom_html.h tdehtml_events.h
 compare    = $COMP  $COMP/dom
 subst      = $DST/extra/kde351
 import     = qtmod.sip (TQt_3_0_0 TQt_4_0_0 WS_X11)
@@ -332,15 +332,15 @@ import     = tdecore
 import     = tdefx
 import     = tdeui
 import     = kio
-import     = kutils
-import     = kparts
+import     = tdeutils
+import     = tdeparts
 importpath = $IMP
 amend      = * ctor parent /TransferThis/
 amend      = * all parent /Transfer/
-include    = @KDE_INCLUDEPATH@/khtml @KDE_INCLUDEPATH@/dom  @KDE_INCLUDEPATH@/kparts\
+include    = @KDE_INCLUDEPATH@/tdehtml @KDE_INCLUDEPATH@/dom  @KDE_INCLUDEPATH@/tdeparts\
              @KDE_INCLUDEPATH@/kio ../tdecore ../kio
-libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -ltdeui -lkhtml -lkparts -ltdecore -lkio\
-            -ltdeuicmodule -ltdecorecmodule -lkiocmodule -lkpartscmodule -ldcopcmodule
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -ltdeui -ltdehtml -ltdeparts -ltdecore -lkio\
+            -ltdeuicmodule -ltdecorecmodule -lkiocmodule -ltdepartscmodule -ldcopcmodule
 
 define     = "KHTML_EXPORT", ""
 retain
@@ -360,24 +360,24 @@ retain
 //import     = tdefx
 //import     = tdeui
 //import     = kio
-//import     = kparts
-//import     = khtml
+//import     = tdeparts
+//import     = tdehtml
 //importpath = $IMP
 //include    = @KDE_INCLUDEPATH@/kjs @KDE_INCLUDEPATH@/dom @KDE_INCLUDEPATH@/kio\
 //             ../tdecore  ../kio
 //amend      = * ctor parent /TransferThis/
 //amend      = * all parent /Transfer/
-//libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -lkjs -ltdeui -ltdecore -lkio -lkhtml\
-//             -ltdeuicmodule -ltdecorecmodule -lkhtmlcmodule -lkiocmodule -ldcopcmodule
+//libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -lkjs -ltdeui -ltdecore -lkio -ltdehtml\
+//             -ltdeuicmodule -ltdecorecmodule -ltdehtmlcmodule -lkiocmodule -ldcopcmodule
 
 //retain
 
 // -----------------------------------------
 
-module = kspell
+module = tdespell
 
 ignore     =
-source     = $DST/extra/kde351/kspell
+source     = $DST/extra/kde351/tdespell
 compare    = $COMP
 subst      = $DST/extra/kde351
 import     = qtmod.sip (TQt_3_0_0 TQt_4_0_0 WS_X11)
@@ -392,9 +392,9 @@ include    = ../tdecore  @KDE_INCLUDEPATH@/kio
 amend      = * ctor parent /TransferThis/        const KGuiItem& nullGuiItem (TQString::null);
 
 amend      = * all parent /Transfer/
-libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -lkspell -ltdeui -ltdecore -lkio\
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -ltdespell -ltdeui -ltdecore -lkio\
              -ltdecorecmodule -ltdeuicmodule -lkfilecmodule -ldcopcmodule
-sipslot    = obj slot kspell
+sipslot    = obj slot tdespell
 
 code
 %PrePythonCode
@@ -429,9 +429,9 @@ retain
 
 // -----------------------------------------
 
-module = kmdi
+module = tdemdi
 
-source     = $SRC/kmdi/
+source     = $SRC/tdemdi/
 ignore     =
 compare    = $COMP
 subst      = $DST/extra/kde351
@@ -443,14 +443,14 @@ import     = tdefxmod.sip
 import     = tdeuimod.sip
 //import     = kiomod.sip
 //import     = kfilemod.sip
-//import     = kpartsmod.sip
+//import     = tdepartsmod.sip
 importpath = $IMP
-ignore     = kmdiiterator.h kmdilistiterator.h kmdinulliterator.h
+ignore     = tdemdiiterator.h tdemdilistiterator.h tdemdinulliterator.h
 
 include    =  ../dcop ../tdecore  ../tdeui ../pythonize ../pykpanelapplet
 libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lqtxmlcmodule -lDCOP -ltdecore -ltdeui\
              -ldcopcmodule -ltdecorecmodule -ltqt-mt -ltdefx -ltdefxcmodule -lpythonize -ltdeuicmodule\
-             -lkmdi
+             -ltdemdi
 define     = "TQT_VERSION", "301"
 define     = "TQMainWindow::ToolBarDock", "TQt::Dock"
 
@@ -459,9 +459,9 @@ retain
 
 // -----------------------------------------
 
-//module = kspell2
+//module = tdespell2
 
-//source     = $SRC/kspell2/
+//source     = $SRC/tdespell2/
 //ignore     =
 //compare    = $COMP
 //subst      = $DST/extra/kde351
@@ -473,12 +473,12 @@ retain
 //import     = tdeuimod.sip
 ////import     = kiomod.sip
 ////import     = kfilemod.sip
-////import     = kpartsmod.sip
+////import     = tdepartsmod.sip
 //importpath = $IMP
 //include    =  ../dcop ../tdecore  ../tdeui ../pythonize ../pykpanelapplet
 //libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lqtxmlcmodule -lDCOP -ltdecore -ltdeui\
 //             -ldcopcmodule -ltdecorecmodule -ltqt-mt -ltdefx -ltdefxcmodule -lpythonize -ltdeuicmodule\
-//             -lkspell2
+//             -ltdespell2
 //
 //retain
 
diff --git a/pytde352.prj b/pytde352.prj
index f32ee60..b648841 100644
--- a/pytde352.prj
+++ b/pytde352.prj
@@ -66,7 +66,7 @@ module = tdecore
 
 source     = $SRC/tdecore
 ignore     = netwm_p.h kde_dmalloc.h kunload.h kdatastream.h  ksockaddr.h kextsock.h ksocks.h
-ignore     = ksycocaentry.h ksycocafactory.h ksycocatype.h ksycoca.h kapp.h kstandarddirs.h
+ignore     = tdesycocaentry.h tdesycocafactory.h tdesycocatype.h tdesycoca.h kapp.h kstandarddirs.h
 ignore     = kgenericfactory.h ktypelist.h kvmallocator.h  ksortablevaluelist.h
 ignore     = kextendedsocket.h klargefile.h kdebug.h kdebugclasses.h kxmessages.h kaccelmanager.h
 ignore     = kdemacros.h kxerrorhandler.h fixx11.h kuser.h kuniqueapp.h kde_file.h tdelibs_export.h
@@ -142,7 +142,7 @@ module = tdeui
 
 source     = $SRC/tdeui/
 ignore     = kcolorbutton.h kcolordlg.h kwidgetid.h kaccelgen.h kdatepik.h kdualcolorbtn.h kxmlgui.h kdockwidget_p.h
-ignore     = kdockwindow.h ksconfig.h kspell.h kspelldlg.h klistviewlineedit.h ksyntaxhighlighter.h ksharedpixmap.h
+ignore     = kdockwindow.h ksconfig.h tdespell.h tdespelldlg.h klistviewlineedit.h ksyntaxhighlighter.h ksharedpixmap.h
 compare    = $COMP
 subst      = $DST/extra/kde352
 import     = qtmod.sip (TQt_3_0_0 TQt_4_0_0 WS_X11)
@@ -196,11 +196,11 @@ retain
 
 // -----------------------------------------
 
-module = kresources
+module = tderesources
 
-source     = $SRC/kresources
+source     = $SRC/tderesources
 ignore     =
-compare    = $COMP $COMP/kresources
+compare    = $COMP $COMP/tderesources
 subst      =
 ignore     = manager.h manageriface.h managerimpl.h
 import     = qtmod.sip (TQt_3_0_0 TQt_4_0_0 WS_X11)
@@ -211,7 +211,7 @@ import     = tdefxmod.sip
 import     = tdeuimod.sip
 import     = kiomod.sip
 importpath = $IMP
-libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lkresources
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -ltderesources
 define     = "KDE_DEPRECATED", ""
 define     = "KRESOURCES_EXPORT", ""
 
@@ -232,7 +232,7 @@ import     = tdecoremod.sip
 import     = tdefxmod.sip
 import     = tdeuimod.sip
 import     = kiomod.sip
-import     = kresourcesmod.sip
+import     = tderesourcesmod.sip
 importpath = $IMP
 libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lkabc -lkabc_file
 define     = "KDE_DEPRECATED", ""
@@ -243,9 +243,9 @@ retain
 
 // -----------------------------------------
 
-module = kutils
+module = tdeutils
 
-source     = $SRC/kutils/
+source     = $SRC/tdeutils/
 ignore     =
 compare    = $COMP
 subst      = $DST/extra/kde352
@@ -258,12 +258,12 @@ import     = tdefxmod.sip
 import     = tdeuimod.sip
 //import     = kiomod.sip
 //import     = kfilemod.sip
-//import     = kpartsmod.sip
+//import     = tdepartsmod.sip
 importpath = $IMP
 include    =  ../dcop ../tdecore  ../tdeui ../pythonize ../pykpanelapplet
 libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lqtxmlcmodule -lDCOP -ltdecore -ltdeui\
              -ldcopcmodule -ltdecorecmodule -ltqt-mt -ltdefx -ltdefxcmodule -lpythonize -ltdeuicmodule\
-             -lkutils
+             -ltdeutils
 define     = "class\ KMultiTabBarButton\ \*", "KMultiTabBarButton *"
 define     = "class\ KMultiTabBarTab\ \*", "KMultiTabBarTab *"
 
@@ -295,11 +295,11 @@ retain
 
 // -----------------------------------------
 
-module = kparts
+module = tdeparts
 
-source     = $SRC/kparts
+source     = $SRC/tdeparts
 ignore     = componentfactory.h
-compare    = $COMP/kparts
+compare    = $COMP/tdeparts
 subst      = $DST/extra/kde352
 import     = qtmod.sip (TQt_3_0_0 TQt_4_0_0 WS_X11)
 import     = qtxmlmod.sip (TQt_3_0_0 TQt_4_0_0 WS_X11)
@@ -311,18 +311,18 @@ import     = kio
 importpath = $IMP
 amend      = * ctor parent /TransferThis/
 amend      = * all parent /Transfer/
-include    = @KDE_INCLUDEPATH@/kparts  @KDE_INCLUDEPATH@/kio  ../tdecore ../kio
-libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -lkparts -ltdeui -ltdecore -lkio -ltdeuicmodule\
+include    = @KDE_INCLUDEPATH@/tdeparts  @KDE_INCLUDEPATH@/kio  ../tdecore ../kio
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -ltdeparts -ltdeui -ltdecore -lkio -ltdeuicmodule\
              -ltdecorecmodule -lkiocmodule -ldcopcmodule -lkiocmodule
 
 retain
 
 // -----------------------------------------
 
-module = khtml
+module = tdehtml
 
-source     = $SRC/khtml $SRC/khtml/dom
-ignore     = khtmldefaults.h dom_core.h dom_html.h khtml_events.h
+source     = $SRC/tdehtml $SRC/tdehtml/dom
+ignore     = tdehtmldefaults.h dom_core.h dom_html.h tdehtml_events.h
 compare    = $COMP  $COMP/dom
 subst      = $DST/extra/kde352
 import     = qtmod.sip (TQt_3_0_0 TQt_4_0_0 WS_X11)
@@ -332,15 +332,15 @@ import     = tdecore
 import     = tdefx
 import     = tdeui
 import     = kio
-import     = kutils
-import     = kparts
+import     = tdeutils
+import     = tdeparts
 importpath = $IMP
 amend      = * ctor parent /TransferThis/
 amend      = * all parent /Transfer/
-include    = @KDE_INCLUDEPATH@/khtml @KDE_INCLUDEPATH@/dom  @KDE_INCLUDEPATH@/kparts\
+include    = @KDE_INCLUDEPATH@/tdehtml @KDE_INCLUDEPATH@/dom  @KDE_INCLUDEPATH@/tdeparts\
              @KDE_INCLUDEPATH@/kio ../tdecore ../kio
-libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -ltdeui -lkhtml -lkparts -ltdecore -lkio\
-            -ltdeuicmodule -ltdecorecmodule -lkiocmodule -lkpartscmodule -ldcopcmodule
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -ltdeui -ltdehtml -ltdeparts -ltdecore -lkio\
+            -ltdeuicmodule -ltdecorecmodule -lkiocmodule -ltdepartscmodule -ldcopcmodule
 
 define     = "KHTML_EXPORT", ""
 retain
@@ -360,24 +360,24 @@ retain
 //import     = tdefx
 //import     = tdeui
 //import     = kio
-//import     = kparts
-//import     = khtml
+//import     = tdeparts
+//import     = tdehtml
 //importpath = $IMP
 //include    = @KDE_INCLUDEPATH@/kjs @KDE_INCLUDEPATH@/dom @KDE_INCLUDEPATH@/kio\
 //             ../tdecore  ../kio
 //amend      = * ctor parent /TransferThis/
 //amend      = * all parent /Transfer/
-//libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -lkjs -ltdeui -ltdecore -lkio -lkhtml\
-//             -ltdeuicmodule -ltdecorecmodule -lkhtmlcmodule -lkiocmodule -ldcopcmodule
+//libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -lkjs -ltdeui -ltdecore -lkio -ltdehtml\
+//             -ltdeuicmodule -ltdecorecmodule -ltdehtmlcmodule -lkiocmodule -ldcopcmodule
 
 //retain
 
 // -----------------------------------------
 
-module = kspell
+module = tdespell
 
 ignore     =
-source     = $DST/extra/kde352/kspell
+source     = $DST/extra/kde352/tdespell
 compare    = $COMP
 subst      = $DST/extra/kde352
 import     = qtmod.sip (TQt_3_0_0 TQt_4_0_0 WS_X11)
@@ -392,9 +392,9 @@ include    = ../tdecore  @KDE_INCLUDEPATH@/kio
 amend      = * ctor parent /TransferThis/        const KGuiItem& nullGuiItem (TQString::null);
 
 amend      = * all parent /Transfer/
-libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -lkspell -ltdeui -ltdecore -lkio\
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -ltdespell -ltdeui -ltdecore -lkio\
              -ltdecorecmodule -ltdeuicmodule -lkfilecmodule -ldcopcmodule
-sipslot    = obj slot kspell
+sipslot    = obj slot tdespell
 
 code
 %PrePythonCode
@@ -429,9 +429,9 @@ retain
 
 // -----------------------------------------
 
-module = kmdi
+module = tdemdi
 
-source     = $SRC/kmdi/
+source     = $SRC/tdemdi/
 ignore     =
 compare    = $COMP
 subst      = $DST/extra/kde352
@@ -443,14 +443,14 @@ import     = tdefxmod.sip
 import     = tdeuimod.sip
 //import     = kiomod.sip
 //import     = kfilemod.sip
-//import     = kpartsmod.sip
+//import     = tdepartsmod.sip
 importpath = $IMP
-ignore     = kmdiiterator.h kmdilistiterator.h kmdinulliterator.h
+ignore     = tdemdiiterator.h tdemdilistiterator.h tdemdinulliterator.h
 
 include    =  ../dcop ../tdecore  ../tdeui ../pythonize ../pykpanelapplet
 libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lqtxmlcmodule -lDCOP -ltdecore -ltdeui\
              -ldcopcmodule -ltdecorecmodule -ltqt-mt -ltdefx -ltdefxcmodule -lpythonize -ltdeuicmodule\
-             -lkmdi
+             -ltdemdi
 define     = "TQT_VERSION", "301"
 define     = "TQMainWindow::ToolBarDock", "TQt::Dock"
 
@@ -459,9 +459,9 @@ retain
 
 // -----------------------------------------
 
-//module = kspell2
+//module = tdespell2
 
-//source     = $SRC/kspell2/
+//source     = $SRC/tdespell2/
 //ignore     =
 //compare    = $COMP
 //subst      = $DST/extra/kde352
@@ -473,12 +473,12 @@ retain
 //import     = tdeuimod.sip
 ////import     = kiomod.sip
 ////import     = kfilemod.sip
-////import     = kpartsmod.sip
+////import     = tdepartsmod.sip
 //importpath = $IMP
 //include    =  ../dcop ../tdecore  ../tdeui ../pythonize ../pykpanelapplet
 //libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lqtxmlcmodule -lDCOP -ltdecore -ltdeui\
 //             -ldcopcmodule -ltdecorecmodule -ltqt-mt -ltdefx -ltdefxcmodule -lpythonize -ltdeuicmodule\
-//             -lkspell2
+//             -ltdespell2
 //
 //retain
 
diff --git a/pytde353.prj b/pytde353.prj
index dd75fdb..e2ae43b 100644
--- a/pytde353.prj
+++ b/pytde353.prj
@@ -66,7 +66,7 @@ module = tdecore
 
 source     = $SRC/tdecore
 ignore     = netwm_p.h kde_dmalloc.h kunload.h kdatastream.h  ksockaddr.h kextsock.h ksocks.h
-ignore     = ksycocaentry.h ksycocafactory.h ksycocatype.h ksycoca.h kapp.h kstandarddirs.h
+ignore     = tdesycocaentry.h tdesycocafactory.h tdesycocatype.h tdesycoca.h kapp.h kstandarddirs.h
 ignore     = kgenericfactory.h ktypelist.h kvmallocator.h  ksortablevaluelist.h
 ignore     = kextendedsocket.h klargefile.h kdebug.h kdebugclasses.h kxmessages.h kaccelmanager.h
 ignore     = kdemacros.h kxerrorhandler.h fixx11.h kuser.h kuniqueapp.h kde_file.h tdelibs_export.h
@@ -142,7 +142,7 @@ module = tdeui
 
 source     = $SRC/tdeui/
 ignore     = kcolorbutton.h kcolordlg.h kwidgetid.h kaccelgen.h kdatepik.h kdualcolorbtn.h kxmlgui.h kdockwidget_p.h
-ignore     = kdockwindow.h ksconfig.h kspell.h kspelldlg.h klistviewlineedit.h ksyntaxhighlighter.h ksharedpixmap.h
+ignore     = kdockwindow.h ksconfig.h tdespell.h tdespelldlg.h klistviewlineedit.h ksyntaxhighlighter.h ksharedpixmap.h
 compare    = $COMP
 subst      = $DST/extra/kde353
 import     = qtmod.sip (TQt_3_0_0 TQt_4_0_0 WS_X11)
@@ -196,11 +196,11 @@ retain
 
 // -----------------------------------------
 
-module = kresources
+module = tderesources
 
-source     = $SRC/kresources
+source     = $SRC/tderesources
 ignore     =
-compare    = $COMP $COMP/kresources
+compare    = $COMP $COMP/tderesources
 subst      =
 ignore     = manager.h manageriface.h managerimpl.h
 import     = qtmod.sip (TQt_3_0_0 TQt_4_0_0 WS_X11)
@@ -211,7 +211,7 @@ import     = tdefxmod.sip
 import     = tdeuimod.sip
 import     = kiomod.sip
 importpath = $IMP
-libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lkresources
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -ltderesources
 define     = "KDE_DEPRECATED", ""
 define     = "KRESOURCES_EXPORT", ""
 
@@ -232,7 +232,7 @@ import     = tdecoremod.sip
 import     = tdefxmod.sip
 import     = tdeuimod.sip
 import     = kiomod.sip
-import     = kresourcesmod.sip
+import     = tderesourcesmod.sip
 importpath = $IMP
 libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lkabc -lkabc_file
 define     = "KDE_DEPRECATED", ""
@@ -243,9 +243,9 @@ retain
 
 // -----------------------------------------
 
-module = kutils
+module = tdeutils
 
-source     = $SRC/kutils/
+source     = $SRC/tdeutils/
 ignore     =
 compare    = $COMP
 subst      = $DST/extra/kde353
@@ -258,12 +258,12 @@ import     = tdefxmod.sip
 import     = tdeuimod.sip
 //import     = kiomod.sip
 //import     = kfilemod.sip
-//import     = kpartsmod.sip
+//import     = tdepartsmod.sip
 importpath = $IMP
 include    =  ../dcop ../tdecore  ../tdeui ../pythonize ../pykpanelapplet
 libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lqtxmlcmodule -lDCOP -ltdecore -ltdeui\
              -ldcopcmodule -ltdecorecmodule -ltqt-mt -ltdefx -ltdefxcmodule -lpythonize -ltdeuicmodule\
-             -lkutils
+             -ltdeutils
 define     = "class\ KMultiTabBarButton\ \*", "KMultiTabBarButton *"
 define     = "class\ KMultiTabBarTab\ \*", "KMultiTabBarTab *"
 
@@ -295,11 +295,11 @@ retain
 
 // -----------------------------------------
 
-module = kparts
+module = tdeparts
 
-source     = $SRC/kparts
+source     = $SRC/tdeparts
 ignore     = componentfactory.h
-compare    = $COMP/kparts
+compare    = $COMP/tdeparts
 subst      = $DST/extra/kde353
 import     = qtmod.sip (TQt_3_0_0 TQt_4_0_0 WS_X11)
 import     = qtxmlmod.sip (TQt_3_0_0 TQt_4_0_0 WS_X11)
@@ -311,18 +311,18 @@ import     = kio
 importpath = $IMP
 amend      = * ctor parent /TransferThis/
 amend      = * all parent /Transfer/
-include    = @KDE_INCLUDEPATH@/kparts  @KDE_INCLUDEPATH@/kio  ../tdecore ../kio
-libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -lkparts -ltdeui -ltdecore -lkio -ltdeuicmodule\
+include    = @KDE_INCLUDEPATH@/tdeparts  @KDE_INCLUDEPATH@/kio  ../tdecore ../kio
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -ltdeparts -ltdeui -ltdecore -lkio -ltdeuicmodule\
              -ltdecorecmodule -lkiocmodule -ldcopcmodule -lkiocmodule
 
 retain
 
 // -----------------------------------------
 
-module = khtml
+module = tdehtml
 
-source     = $SRC/khtml $SRC/khtml/dom
-ignore     = khtmldefaults.h dom_core.h dom_html.h khtml_events.h
+source     = $SRC/tdehtml $SRC/tdehtml/dom
+ignore     = tdehtmldefaults.h dom_core.h dom_html.h tdehtml_events.h
 compare    = $COMP  $COMP/dom
 subst      = $DST/extra/kde353
 import     = qtmod.sip (TQt_3_0_0 TQt_4_0_0 WS_X11)
@@ -332,15 +332,15 @@ import     = tdecore
 import     = tdefx
 import     = tdeui
 import     = kio
-import     = kutils
-import     = kparts
+import     = tdeutils
+import     = tdeparts
 importpath = $IMP
 amend      = * ctor parent /TransferThis/
 amend      = * all parent /Transfer/
-include    = @KDE_INCLUDEPATH@/khtml @KDE_INCLUDEPATH@/dom  @KDE_INCLUDEPATH@/kparts\
+include    = @KDE_INCLUDEPATH@/tdehtml @KDE_INCLUDEPATH@/dom  @KDE_INCLUDEPATH@/tdeparts\
              @KDE_INCLUDEPATH@/kio ../tdecore ../kio
-libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -ltdeui -lkhtml -lkparts -ltdecore -lkio\
-            -ltdeuicmodule -ltdecorecmodule -lkiocmodule -lkpartscmodule -ldcopcmodule
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -ltdeui -ltdehtml -ltdeparts -ltdecore -lkio\
+            -ltdeuicmodule -ltdecorecmodule -lkiocmodule -ltdepartscmodule -ldcopcmodule
 
 define     = "KHTML_EXPORT", ""
 retain
@@ -360,24 +360,24 @@ retain
 //import     = tdefx
 //import     = tdeui
 //import     = kio
-//import     = kparts
-//import     = khtml
+//import     = tdeparts
+//import     = tdehtml
 //importpath = $IMP
 //include    = @KDE_INCLUDEPATH@/kjs @KDE_INCLUDEPATH@/dom @KDE_INCLUDEPATH@/kio\
 //             ../tdecore  ../kio
 //amend      = * ctor parent /TransferThis/
 //amend      = * all parent /Transfer/
-//libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -lkjs -ltdeui -ltdecore -lkio -lkhtml\
-//             -ltdeuicmodule -ltdecorecmodule -lkhtmlcmodule -lkiocmodule -ldcopcmodule
+//libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -lkjs -ltdeui -ltdecore -lkio -ltdehtml\
+//             -ltdeuicmodule -ltdecorecmodule -ltdehtmlcmodule -lkiocmodule -ldcopcmodule
 
 //retain
 
 // -----------------------------------------
 
-module = kspell
+module = tdespell
 
 ignore     =
-source     = $DST/extra/kde353/kspell
+source     = $DST/extra/kde353/tdespell
 compare    = $COMP
 subst      = $DST/extra/kde353
 import     = qtmod.sip (TQt_3_0_0 TQt_4_0_0 WS_X11)
@@ -392,9 +392,9 @@ include    = ../tdecore  @KDE_INCLUDEPATH@/kio
 amend      = * ctor parent /TransferThis/        const KGuiItem& nullGuiItem (TQString::null);
 
 amend      = * all parent /Transfer/
-libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -lkspell -ltdeui -ltdecore -lkio\
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -ltdespell -ltdeui -ltdecore -lkio\
              -ltdecorecmodule -ltdeuicmodule -lkfilecmodule -ldcopcmodule
-sipslot    = obj slot kspell
+sipslot    = obj slot tdespell
 
 code
 %PrePythonCode
@@ -429,9 +429,9 @@ retain
 
 // -----------------------------------------
 
-module = kmdi
+module = tdemdi
 
-source     = $SRC/kmdi/
+source     = $SRC/tdemdi/
 ignore     =
 compare    = $COMP
 subst      = $DST/extra/kde353
@@ -443,14 +443,14 @@ import     = tdefxmod.sip
 import     = tdeuimod.sip
 //import     = kiomod.sip
 //import     = kfilemod.sip
-//import     = kpartsmod.sip
+//import     = tdepartsmod.sip
 importpath = $IMP
-ignore     = kmdiiterator.h kmdilistiterator.h kmdinulliterator.h
+ignore     = tdemdiiterator.h tdemdilistiterator.h tdemdinulliterator.h
 
 include    =  ../dcop ../tdecore  ../tdeui ../pythonize ../pykpanelapplet
 libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lqtxmlcmodule -lDCOP -ltdecore -ltdeui\
              -ldcopcmodule -ltdecorecmodule -ltqt-mt -ltdefx -ltdefxcmodule -lpythonize -ltdeuicmodule\
-             -lkmdi
+             -ltdemdi
 define     = "TQT_VERSION", "301"
 define     = "TQMainWindow::ToolBarDock", "TQt::Dock"
 
@@ -459,9 +459,9 @@ retain
 
 // -----------------------------------------
 
-//module = kspell2
+//module = tdespell2
 
-//source     = $SRC/kspell2/
+//source     = $SRC/tdespell2/
 //ignore     =
 //compare    = $COMP
 //subst      = $DST/extra/kde353
@@ -473,12 +473,12 @@ retain
 //import     = tdeuimod.sip
 ////import     = kiomod.sip
 ////import     = kfilemod.sip
-////import     = kpartsmod.sip
+////import     = tdepartsmod.sip
 //importpath = $IMP
 //include    =  ../dcop ../tdecore  ../tdeui ../pythonize ../pykpanelapplet
 //libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lqtxmlcmodule -lDCOP -ltdecore -ltdeui\
 //             -ldcopcmodule -ltdecorecmodule -ltqt-mt -ltdefx -ltdefxcmodule -lpythonize -ltdeuicmodule\
-//             -lkspell2
+//             -ltdespell2
 //
 //retain
 
diff --git a/pytdeconfig.py b/pytdeconfig.py
index fe44ff0..e3f5fb8 100644
--- a/pytdeconfig.py
+++ b/pytdeconfig.py
@@ -38,7 +38,7 @@ _pkg_config = {
     'libdir':               'lib',
     'pytde_kde_sip_flags':  '-t ALL -x TQt_STYLE_WINDOWSXP -x TQt_STYLE_INTERLACE -x TQt_STYLE_WINDOWSXP -x TQt_SIP_PRE_4_7_2 -x VendorID -t WS_X11 -t TQt_3_3_6 -t KDE_3_5_3',
     'pytde_mod_dir':        '/usr/lib/python2.5/site-packages',
-    'pytde_modules':        'dcop tdecore tdefx tdeui kio kresources kabc kutils kfile kparts khtml kspell tdeprint kmdi',
+    'pytde_modules':        'dcop tdecore tdefx tdeui kio tderesources kabc tdeutils kfile tdeparts tdehtml tdespell tdeprint tdemdi',
     'pytde_sip_dir':        '/usr/share/sip',
     'pytde_version':        0x031000,
     'pytde_version_str':    '3.16.0'
@@ -169,7 +169,7 @@ class KfileModuleMakefile(KioModuleMakefile):
         KioModuleMakefile.finalise(self)
 
 class KpartsModuleMakefile(KfileModuleMakefile):
-    """The Makefile class for modules that %Import kparts.
+    """The Makefile class for modules that %Import tdeparts.
     """
     def finalise(self):
         """Finalise the macros.
@@ -178,12 +178,12 @@ class KpartsModuleMakefile(KfileModuleMakefile):
             # Note that we don't use self.extra_lib_dirs because we don't want
             # it to be added to the rpath.
             self.LIBDIR.append(self.config.pyqt_mod_dir)
-            self.extra_libs.append(self.module_as_lib("kparts"))
+            self.extra_libs.append(self.module_as_lib("tdeparts"))
 
         KfileModuleMakefile.finalise(self)
 
 class KhtmlModuleMakefile(KpartsModuleMakefile):
-    """The Makefile class for modules that %Import khtml.
+    """The Makefile class for modules that %Import tdehtml.
     """
     def finalise(self):
         """Finalise the macros.
@@ -192,7 +192,7 @@ class KhtmlModuleMakefile(KpartsModuleMakefile):
             # Note that we don't use self.extra_lib_dirs because we don't want
             # it to be added to the rpath.
             self.LIBDIR.append(self.config.pyqt_mod_dir)
-            self.extra_libs.append(self.module_as_lib("khtml"))
+            self.extra_libs.append(self.module_as_lib("tdehtml"))
 
         KpartsModuleMakefile.finalise(self)
 
diff --git a/pytdeconfig.py.in b/pytdeconfig.py.in
index 9a075b1..f04957d 100644
--- a/pytdeconfig.py.in
+++ b/pytdeconfig.py.in
@@ -151,7 +151,7 @@ class KfileModuleMakefile(KioModuleMakefile):
         KioModuleMakefile.finalise(self)
 
 class KpartsModuleMakefile(KfileModuleMakefile):
-    """The Makefile class for modules that %Import kparts.
+    """The Makefile class for modules that %Import tdeparts.
     """
     def finalise(self):
         """Finalise the macros.
@@ -160,12 +160,12 @@ class KpartsModuleMakefile(KfileModuleMakefile):
             # Note that we don't use self.extra_lib_dirs because we don't want
             # it to be added to the rpath.
             self.LIBDIR.append(self.config.pyqt_mod_dir)
-            self.extra_libs.append(self.module_as_lib("kparts"))
+            self.extra_libs.append(self.module_as_lib("tdeparts"))
 
         KfileModuleMakefile.finalise(self)
 
 class KhtmlModuleMakefile(KpartsModuleMakefile):
-    """The Makefile class for modules that %Import khtml.
+    """The Makefile class for modules that %Import tdehtml.
     """
     def finalise(self):
         """Finalise the macros.
@@ -174,7 +174,7 @@ class KhtmlModuleMakefile(KpartsModuleMakefile):
             # Note that we don't use self.extra_lib_dirs because we don't want
             # it to be added to the rpath.
             self.LIBDIR.append(self.config.pyqt_mod_dir)
-            self.extra_libs.append(self.module_as_lib("khtml"))
+            self.extra_libs.append(self.module_as_lib("tdehtml"))
 
         KpartsModuleMakefile.finalise(self)
 
diff --git a/sip/kabc/kabcmod.sip.in b/sip/kabc/kabcmod.sip.in
index 644b7fb..4ba6d94 100644
--- a/sip/kabc/kabcmod.sip.in
+++ b/sip/kabc/kabcmod.sip.in
@@ -35,7 +35,7 @@
 %Import tdefxmod.sip
 %Import tdeuimod.sip
 %Import kiomod.sip
-%Import kresourcesmod.sip
+%Import tderesourcesmod.sip
 
 %Include address.sip
 %Include addressbook.sip
diff --git a/sip/kio/kiomod.sip.in b/sip/kio/kiomod.sip.in
index dbcb336..5439424 100644
--- a/sip/kio/kiomod.sip.in
+++ b/sip/kio/kiomod.sip.in
@@ -66,10 +66,10 @@
 %Include kservicetype.sip
 %Include kshellcompletion.sip
 %Include kshred.sip
-%Include ksycoca.sip
-%Include ksycocaentry.sip
-%Include ksycocafactory.sip
-%Include ksycocatype.sip
+%Include tdesycoca.sip
+%Include tdesycocaentry.sip
+%Include tdesycocafactory.sip
+%Include tdesycocatype.sip
 %Include ktar.sip
 %Include ktrader.sip
 %Include kurifilter.sip
diff --git a/sip/kio/ksycoca.sip b/sip/kio/tdesycoca.sip
index 823868b..c83166d 100644
--- a/sip/kio/ksycoca.sip
+++ b/sip/kio/tdesycoca.sip
@@ -27,7 +27,7 @@
 class KSycoca : TQObject, DCOPObject
 {
 %TypeHeaderCode
-#include <ksycoca.h>
+#include <tdesycoca.h>
 %End
 
 
diff --git a/sip/kio/ksycocadict.sip b/sip/kio/tdesycocadict.sip
index 5cc527a..0340c6e 100644
--- a/sip/kio/ksycocadict.sip
+++ b/sip/kio/tdesycocadict.sip
@@ -29,7 +29,7 @@
 class KSycocaDict
 {
 %TypeHeaderCode
-#include <ksycocadict.h>
+#include <tdesycocadict.h>
 %End
 
 public:
diff --git a/sip/kio/ksycocaentry.sip b/sip/kio/tdesycocaentry.sip
index 3137721..d428bdd 100644
--- a/sip/kio/ksycocaentry.sip
+++ b/sip/kio/tdesycocaentry.sip
@@ -27,7 +27,7 @@
 class KSycocaEntry : KShared
 {
 %TypeHeaderCode
-#include <ksycocaentry.h>
+#include <tdesycocaentry.h>
 %End
 
 
@@ -70,7 +70,7 @@ protected:
 {
 %TypeHeaderCode
 #include <ksharedptr.h>
-#include <ksycocaentry.h>
+#include <tdesycocaentry.h>
 %End
 
 %ConvertFromTypeCode
@@ -115,8 +115,8 @@ protected:
 #include <ksharedptr.h>
 #include <kservice.h>
 #include <kservicegroup.h>
-#include <ksycocaentry.h>
-#include <ksycocatype.h>
+#include <tdesycocaentry.h>
+#include <tdesycocatype.h>
 #include <tqvaluelist.h>
 %End
 
diff --git a/sip/kio/ksycocafactory.sip b/sip/kio/tdesycocafactory.sip
index 44cb184..decb1ab 100644
--- a/sip/kio/ksycocafactory.sip
+++ b/sip/kio/tdesycocafactory.sip
@@ -27,7 +27,7 @@
 class KSycocaFactory
 {
 %TypeHeaderCode
-#include <ksycocafactory.h>
+#include <tdesycocafactory.h>
 %End
 
 
diff --git a/sip/kio/ksycocatype.sip b/sip/kio/tdesycocatype.sip
index 4babc21..4babc21 100644
--- a/sip/kio/ksycocatype.sip
+++ b/sip/kio/tdesycocatype.sip
diff --git a/sip/kspell/kspell-kde351.diff b/sip/kspell/kspell-kde351.diff
deleted file mode 100644
index 1aa2b6c..0000000
--- a/sip/kspell/kspell-kde351.diff
+++ /dev/null
@@ -1,3 +0,0 @@
-- %Include ksconfig.sip
-- %Include kspell.sip
-- %Include kspelldlg.sip
diff --git a/sip/tdecore/tdecoremod.sip.in b/sip/tdecore/tdecoremod.sip.in
index fc2fea9..27f0764 100644
--- a/sip/tdecore/tdecoremod.sip.in
+++ b/sip/tdecore/tdecoremod.sip.in
@@ -66,7 +66,7 @@
 %Include klocale.sip
 %Include kmdcodec.sip
 %Include kmimesourcefactory.sip
-%Include kmultipledrag.sip
+%Include tdemultipledrag.sip
 %Include knotifyclient.sip
 %Include kpalette.sip
 %Include kpixmapprovider.sip
diff --git a/sip/tdecore/kmultipledrag.sip b/sip/tdecore/tdemultipledrag.sip
index 9889afb..9b5cd6c 100644
--- a/sip/tdecore/kmultipledrag.sip
+++ b/sip/tdecore/tdemultipledrag.sip
@@ -27,7 +27,7 @@
 class KMultipleDrag : TQDragObject
 {
 %TypeHeaderCode
-#include <kmultipledrag.h>
+#include <tdemultipledrag.h>
 %End
 
 
diff --git a/sip/khtml/css_rule.sip b/sip/tdehtml/css_rule.sip
index 74ceb1b..10ca623 100644
--- a/sip/khtml/css_rule.sip
+++ b/sip/tdehtml/css_rule.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module khtml  version KDE 3.5.3
+//            module tdehtml  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/khtml/css_stylesheet.sip b/sip/tdehtml/css_stylesheet.sip
index 3e43c36..67baf80 100644
--- a/sip/khtml/css_stylesheet.sip
+++ b/sip/tdehtml/css_stylesheet.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module khtml  version KDE 3.5.3
+//            module tdehtml  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/khtml/css_value.sip b/sip/tdehtml/css_value.sip
index a3b7a68..f2ae1d7 100644
--- a/sip/khtml/css_value.sip
+++ b/sip/tdehtml/css_value.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module khtml  version KDE 3.5.3
+//            module tdehtml  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/khtml/dom2_events.sip b/sip/tdehtml/dom2_events.sip
index 31772fe..136a781 100644
--- a/sip/khtml/dom2_events.sip
+++ b/sip/tdehtml/dom2_events.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module khtml  version KDE 3.5.3
+//            module tdehtml  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/khtml/dom2_range.sip b/sip/tdehtml/dom2_range.sip
index a39378d..debc1bc 100644
--- a/sip/khtml/dom2_range.sip
+++ b/sip/tdehtml/dom2_range.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module khtml  version KDE 3.5.3
+//            module tdehtml  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/khtml/dom2_traversal.sip b/sip/tdehtml/dom2_traversal.sip
index 54d7acb..3c20e1c 100644
--- a/sip/khtml/dom2_traversal.sip
+++ b/sip/tdehtml/dom2_traversal.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module khtml  version KDE 3.5.3
+//            module tdehtml  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/khtml/dom2_views.sip b/sip/tdehtml/dom2_views.sip
index 664a2c9..c3dd4aa 100644
--- a/sip/khtml/dom2_views.sip
+++ b/sip/tdehtml/dom2_views.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module khtml  version KDE 3.5.3
+//            module tdehtml  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/khtml/dom_doc.sip b/sip/tdehtml/dom_doc.sip
index 1a132d8..ef0db05 100644
--- a/sip/khtml/dom_doc.sip
+++ b/sip/tdehtml/dom_doc.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module khtml  version KDE 3.5.3
+//            module tdehtml  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/khtml/dom_element.sip b/sip/tdehtml/dom_element.sip
index 090e9d3..d86c5d8 100644
--- a/sip/khtml/dom_element.sip
+++ b/sip/tdehtml/dom_element.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module khtml  version KDE 3.5.3
+//            module tdehtml  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
@@ -89,11 +89,11 @@ public:
     DOM::Element         form () const;
 %End
 
-    static bool          khtmlValidAttrName (const DOM::DOMString&);
-    static bool          khtmlValidPrefix (const DOM::DOMString&);
-    static bool          khtmlValidQualifiedName (const DOM::DOMString&);
-    static bool          khtmlMalformedQualifiedName (const DOM::DOMString&);
-    static bool          khtmlMalformedPrefix (const DOM::DOMString&);
+    static bool          tdehtmlValidAttrName (const DOM::DOMString&);
+    static bool          tdehtmlValidPrefix (const DOM::DOMString&);
+    static bool          tdehtmlValidQualifiedName (const DOM::DOMString&);
+    static bool          tdehtmlMalformedQualifiedName (const DOM::DOMString&);
+    static bool          tdehtmlMalformedPrefix (const DOM::DOMString&);
 
 protected:
 //ig                          Element (ElementImpl*);
diff --git a/sip/khtml/dom_exception.sip b/sip/tdehtml/dom_exception.sip
index 6a446a8..6711d8a 100644
--- a/sip/khtml/dom_exception.sip
+++ b/sip/tdehtml/dom_exception.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module khtml  version KDE 3.5.3
+//            module tdehtml  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/khtml/dom_misc.sip b/sip/tdehtml/dom_misc.sip
index 30c090f..ba39167 100644
--- a/sip/khtml/dom_misc.sip
+++ b/sip/tdehtml/dom_misc.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module khtml  version KDE 3.5.3
+//            module tdehtml  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/khtml/dom_node.sip b/sip/tdehtml/dom_node.sip
index 2efb881..80a6481 100644
--- a/sip/khtml/dom_node.sip
+++ b/sip/tdehtml/dom_node.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module khtml  version KDE 3.5.3
+//            module tdehtml  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/khtml/dom_string.sip b/sip/tdehtml/dom_string.sip
index 98a41eb..c2bac0c 100644
--- a/sip/khtml/dom_string.sip
+++ b/sip/tdehtml/dom_string.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module khtml  version KDE 3.5.3
+//            module tdehtml  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/khtml/dom_text.sip b/sip/tdehtml/dom_text.sip
index bc06c16..d4ece11 100644
--- a/sip/khtml/dom_text.sip
+++ b/sip/tdehtml/dom_text.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module khtml  version KDE 3.5.3
+//            module tdehtml  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/khtml/dom_xml.sip b/sip/tdehtml/dom_xml.sip
index c1d306e..bc58c30 100644
--- a/sip/khtml/dom_xml.sip
+++ b/sip/tdehtml/dom_xml.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module khtml  version KDE 3.5.3
+//            module tdehtml  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/khtml/html_base.sip b/sip/tdehtml/html_base.sip
index bc0cadc..bf15085 100644
--- a/sip/khtml/html_base.sip
+++ b/sip/tdehtml/html_base.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module khtml  version KDE 3.5.3
+//            module tdehtml  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/khtml/html_block.sip b/sip/tdehtml/html_block.sip
index df70827..3f730f1 100644
--- a/sip/khtml/html_block.sip
+++ b/sip/tdehtml/html_block.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module khtml  version KDE 3.5.3
+//            module tdehtml  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/khtml/html_document.sip b/sip/tdehtml/html_document.sip
index 82205ef..107e540 100644
--- a/sip/khtml/html_document.sip
+++ b/sip/tdehtml/html_document.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module khtml  version KDE 3.5.3
+//            module tdehtml  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/khtml/html_element.sip b/sip/tdehtml/html_element.sip
index dcc8c5b..66965d4 100644
--- a/sip/khtml/html_element.sip
+++ b/sip/tdehtml/html_element.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module khtml  version KDE 3.5.3
+//            module tdehtml  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/khtml/html_form.sip b/sip/tdehtml/html_form.sip
index 05683cb..58a6c3b 100644
--- a/sip/khtml/html_form.sip
+++ b/sip/tdehtml/html_form.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module khtml  version KDE 3.5.3
+//            module tdehtml  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/khtml/html_head.sip b/sip/tdehtml/html_head.sip
index 46badd3..3bd56a5 100644
--- a/sip/khtml/html_head.sip
+++ b/sip/tdehtml/html_head.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module khtml  version KDE 3.5.3
+//            module tdehtml  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/khtml/html_image.sip b/sip/tdehtml/html_image.sip
index 5db67b1..45bbea1 100644
--- a/sip/khtml/html_image.sip
+++ b/sip/tdehtml/html_image.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module khtml  version KDE 3.5.3
+//            module tdehtml  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/khtml/html_inline.sip b/sip/tdehtml/html_inline.sip
index bd3b1b0..234f54a 100644
--- a/sip/khtml/html_inline.sip
+++ b/sip/tdehtml/html_inline.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module khtml  version KDE 3.5.3
+//            module tdehtml  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/khtml/html_list.sip b/sip/tdehtml/html_list.sip
index fa6cd0e..2f37d47 100644
--- a/sip/khtml/html_list.sip
+++ b/sip/tdehtml/html_list.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module khtml  version KDE 3.5.3
+//            module tdehtml  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/khtml/html_misc.sip b/sip/tdehtml/html_misc.sip
index 291a491..52a32f7 100644
--- a/sip/khtml/html_misc.sip
+++ b/sip/tdehtml/html_misc.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module khtml  version KDE 3.5.3
+//            module tdehtml  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/khtml/html_object.sip b/sip/tdehtml/html_object.sip
index 94b027d..2130163 100644
--- a/sip/khtml/html_object.sip
+++ b/sip/tdehtml/html_object.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module khtml  version KDE 3.5.3
+//            module tdehtml  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/khtml/html_table.sip b/sip/tdehtml/html_table.sip
index 3ae6ed4..1f04e2d 100644
--- a/sip/khtml/html_table.sip
+++ b/sip/tdehtml/html_table.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module khtml  version KDE 3.5.3
+//            module tdehtml  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/khtml/khtml_part.sip b/sip/tdehtml/tdehtml_part.sip
index 711ebac..22152ad 100644
--- a/sip/khtml/khtml_part.sip
+++ b/sip/tdehtml/tdehtml_part.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module khtml  version KDE_3_3_0
+//            module tdehtml  version KDE_3_3_0
 
 
 // This software is free software; you can redistribute it and/or
@@ -27,7 +27,7 @@
 class KHTMLPart : KParts::ReadOnlyPart
 {
 %TypeHeaderCode
-#include <khtml_part.h>
+#include <tdehtml_part.h>
 %End
 
 
@@ -50,7 +50,7 @@ public:
     KParts::BrowserExtension* browserExtension () const;
 
 %If ( KDE_3_1_0 -  )
-//ig     KParts::LiveConnectExtension* liveConnectExtension (const khtml::RenderPart*) const;
+//ig     KParts::LiveConnectExtension* liveConnectExtension (const tdehtml::RenderPart*) const;
 %End
 
     KHTMLView*           view () const;
@@ -229,11 +229,11 @@ protected:
     KURL                 completeURL (const TQString&);
     void                 htmlError (int, const TQString&, const KURL&);
     virtual void         customEvent (TQCustomEvent*);
-//ig     virtual void         khtmlMousePressEvent (khtml::MousePressEvent*);
-//ig     virtual void         khtmlMouseDoubleClickEvent (khtml::MouseDoubleClickEvent*);
-//ig     virtual void         khtmlMouseMoveEvent (khtml::MouseMoveEvent*);
-//ig     virtual void         khtmlMouseReleaseEvent (khtml::MouseReleaseEvent*);
-//ig     virtual void         khtmlDrawContentsEvent (khtml::DrawContentsEvent*);
+//ig     virtual void         tdehtmlMousePressEvent (tdehtml::MousePressEvent*);
+//ig     virtual void         tdehtmlMouseDoubleClickEvent (tdehtml::MouseDoubleClickEvent*);
+//ig     virtual void         tdehtmlMouseMoveEvent (tdehtml::MouseMoveEvent*);
+//ig     virtual void         tdehtmlMouseReleaseEvent (tdehtml::MouseReleaseEvent*);
+//ig     virtual void         tdehtmlDrawContentsEvent (tdehtml::DrawContentsEvent*);
     virtual void         guiActivateEvent (KParts::GUIActivateEvent*);
     virtual bool         openFile ();
     virtual void         urlSelected (const TQString&, int, int, const TQString&, KParts::URLArgs = KParts ::URLArgs ());
diff --git a/sip/khtml/khtml_part.sip.323 b/sip/tdehtml/tdehtml_part.sip.323
index b338cc6..a45ccbe 100644
--- a/sip/khtml/khtml_part.sip.323
+++ b/sip/tdehtml/tdehtml_part.sip.323
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module khtml  version KDE_3_3_0
+//            module tdehtml  version KDE_3_3_0
 
 
 // This software is free software; you can redistribute it and/or
@@ -27,7 +27,7 @@
 class KHTMLPart : KParts::ReadOnlyPart
 {
 %TypeHeaderCode
-#include <khtml_part.h>
+#include <tdehtml_part.h>
 %End
 
 
@@ -50,7 +50,7 @@ public:
     KParts::BrowserExtension* browserExtension () const;
 
 %If ( KDE_3_1_0 -  )
-//ig     KParts::LiveConnectExtension* liveConnectExtension (const khtml::RenderPart*) const;
+//ig     KParts::LiveConnectExtension* liveConnectExtension (const tdehtml::RenderPart*) const;
 %End
 
     KHTMLView*           view () const;
@@ -219,11 +219,11 @@ protected:
     KURL                 completeURL (const TQString&);
     void                 htmlError (int, const TQString&, const KURL&);
     virtual void         customEvent (TQCustomEvent*);
-//ig     virtual void         khtmlMousePressEvent (khtml::MousePressEvent*);
-//ig     virtual void         khtmlMouseDoubleClickEvent (khtml::MouseDoubleClickEvent*);
-//ig     virtual void         khtmlMouseMoveEvent (khtml::MouseMoveEvent*);
-//ig     virtual void         khtmlMouseReleaseEvent (khtml::MouseReleaseEvent*);
-//ig     virtual void         khtmlDrawContentsEvent (khtml::DrawContentsEvent*);
+//ig     virtual void         tdehtmlMousePressEvent (tdehtml::MousePressEvent*);
+//ig     virtual void         tdehtmlMouseDoubleClickEvent (tdehtml::MouseDoubleClickEvent*);
+//ig     virtual void         tdehtmlMouseMoveEvent (tdehtml::MouseMoveEvent*);
+//ig     virtual void         tdehtmlMouseReleaseEvent (tdehtml::MouseReleaseEvent*);
+//ig     virtual void         tdehtmlDrawContentsEvent (tdehtml::DrawContentsEvent*);
     virtual void         guiActivateEvent (KParts::GUIActivateEvent*);
     virtual bool         openFile ();
     virtual void         urlSelected (const TQString&, int, int, const TQString&, KParts::URLArgs = KParts ::URLArgs ());
diff --git a/sip/khtml/khtml_part.sip.330 b/sip/tdehtml/tdehtml_part.sip.330
index 711ebac..22152ad 100644
--- a/sip/khtml/khtml_part.sip.330
+++ b/sip/tdehtml/tdehtml_part.sip.330
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module khtml  version KDE_3_3_0
+//            module tdehtml  version KDE_3_3_0
 
 
 // This software is free software; you can redistribute it and/or
@@ -27,7 +27,7 @@
 class KHTMLPart : KParts::ReadOnlyPart
 {
 %TypeHeaderCode
-#include <khtml_part.h>
+#include <tdehtml_part.h>
 %End
 
 
@@ -50,7 +50,7 @@ public:
     KParts::BrowserExtension* browserExtension () const;
 
 %If ( KDE_3_1_0 -  )
-//ig     KParts::LiveConnectExtension* liveConnectExtension (const khtml::RenderPart*) const;
+//ig     KParts::LiveConnectExtension* liveConnectExtension (const tdehtml::RenderPart*) const;
 %End
 
     KHTMLView*           view () const;
@@ -229,11 +229,11 @@ protected:
     KURL                 completeURL (const TQString&);
     void                 htmlError (int, const TQString&, const KURL&);
     virtual void         customEvent (TQCustomEvent*);
-//ig     virtual void         khtmlMousePressEvent (khtml::MousePressEvent*);
-//ig     virtual void         khtmlMouseDoubleClickEvent (khtml::MouseDoubleClickEvent*);
-//ig     virtual void         khtmlMouseMoveEvent (khtml::MouseMoveEvent*);
-//ig     virtual void         khtmlMouseReleaseEvent (khtml::MouseReleaseEvent*);
-//ig     virtual void         khtmlDrawContentsEvent (khtml::DrawContentsEvent*);
+//ig     virtual void         tdehtmlMousePressEvent (tdehtml::MousePressEvent*);
+//ig     virtual void         tdehtmlMouseDoubleClickEvent (tdehtml::MouseDoubleClickEvent*);
+//ig     virtual void         tdehtmlMouseMoveEvent (tdehtml::MouseMoveEvent*);
+//ig     virtual void         tdehtmlMouseReleaseEvent (tdehtml::MouseReleaseEvent*);
+//ig     virtual void         tdehtmlDrawContentsEvent (tdehtml::DrawContentsEvent*);
     virtual void         guiActivateEvent (KParts::GUIActivateEvent*);
     virtual bool         openFile ();
     virtual void         urlSelected (const TQString&, int, int, const TQString&, KParts::URLArgs = KParts ::URLArgs ());
diff --git a/sip/khtml/khtml_settings.sip b/sip/tdehtml/tdehtml_settings.sip
index 686d7b7..a383ac8 100644
--- a/sip/khtml/khtml_settings.sip
+++ b/sip/tdehtml/tdehtml_settings.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module khtml  version KDE 3.5.3
+//            module tdehtml  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
@@ -27,7 +27,7 @@
 class KHTMLSettings
 {
 %TypeHeaderCode
-#include <khtml_settings.h>
+#include <tdehtml_settings.h>
 %End
 
 
@@ -213,7 +213,7 @@ public:
 %TypeHeaderCode
 #include <tqvaluelist.h>
 #include <tqstring.h>
-#include <khtml_settings.h>
+#include <tdehtml_settings.h>
 typedef TQPair<TQString,TQChar> AssignPair;
 %End
 
diff --git a/sip/khtml/khtmlmod.sip.in b/sip/tdehtml/tdehtmlmod.sip.in
index cefbc61..69d1f64 100644
--- a/sip/khtml/khtmlmod.sip.in
+++ b/sip/tdehtml/tdehtmlmod.sip.in
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module khtml  version KDE_3_5_2
+//            module tdehtml  version KDE_3_5_2
 
 %Copying
 
@@ -26,7 +26,7 @@
 
 %End
 
-%Module khtml
+%Module tdehtml
 
 %Import qt/qtmod.sip
 %Import qtxml/qtxmlmod.sip
@@ -35,8 +35,8 @@
 %Import tdefxmod.sip
 %Import tdeuimod.sip
 %Import kiomod.sip
-%Import kutilsmod.sip
-%Import kpartsmod.sip
+%Import tdeutilsmod.sip
+%Import tdepartsmod.sip
 
 %Include css_rule.sip
 %Include css_stylesheet.sip
@@ -65,7 +65,7 @@
 %Include html_misc.sip
 %Include html_object.sip
 %Include html_table.sip
-%Include khtml_part.sip
-%Include khtml_settings.sip
-%Include khtmlview.sip
+%Include tdehtml_part.sip
+%Include tdehtml_settings.sip
+%Include tdehtmlview.sip
 @mark@
diff --git a/sip/khtml/khtmlview.sip b/sip/tdehtml/tdehtmlview.sip
index 67bc258..a03102a 100644
--- a/sip/khtml/khtmlview.sip
+++ b/sip/tdehtml/tdehtmlview.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module khtml  version KDE 3.5.3
+//            module tdehtml  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
@@ -23,13 +23,13 @@
 // If not, write to the Free Software Foundation, Inc.,
 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
-//ig namespace khtml;
+//ig namespace tdehtml;
 
 
 class KHTMLView : TQScrollView
 {
 %TypeHeaderCode
-#include <khtmlview.h>
+#include <tdehtmlview.h>
 %End
 
 
diff --git a/sip/kmdi/kmdichildarea.sip b/sip/tdemdi/tdemdichildarea.sip
index 5fb48b6..b264ac7 100644
--- a/sip/kmdi/kmdichildarea.sip
+++ b/sip/tdemdi/tdemdichildarea.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kmdi  version KDE 3.5.3
+//            module tdemdi  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
@@ -27,7 +27,7 @@
 class KMdiChildArea : TQFrame
 {
 %TypeHeaderCode
-#include <kmdichildarea.h>
+#include <tdemdichildarea.h>
 %End
 
 
diff --git a/sip/kmdi/kmdichildfrm.sip b/sip/tdemdi/tdemdichildfrm.sip
index 2b8f298..bd3c674 100644
--- a/sip/kmdi/kmdichildfrm.sip
+++ b/sip/tdemdi/tdemdichildfrm.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kmdi  version KDE 3.5.3
+//            module tdemdi  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
@@ -27,7 +27,7 @@
 class KMdiWin32IconButton : TQLabel
 {
 %TypeHeaderCode
-#include <kmdichildfrm.h>
+#include <tdemdichildfrm.h>
 %End
 
 
@@ -44,7 +44,7 @@ signals:
 class KMdiChildFrmMoveEvent : TQCustomEvent
 {
 %TypeHeaderCode
-#include <kmdichildfrm.h>
+#include <tdemdichildfrm.h>
 %End
 
 
@@ -57,7 +57,7 @@ public:
 class KMdiChildFrmDragBeginEvent : TQCustomEvent
 {
 %TypeHeaderCode
-#include <kmdichildfrm.h>
+#include <tdemdichildfrm.h>
 %End
 
 
@@ -70,7 +70,7 @@ public:
 class KMdiChildFrmDragEndEvent : TQCustomEvent
 {
 %TypeHeaderCode
-#include <kmdichildfrm.h>
+#include <tdemdichildfrm.h>
 %End
 
 
@@ -83,7 +83,7 @@ public:
 class KMdiChildFrmResizeBeginEvent : TQCustomEvent
 {
 %TypeHeaderCode
-#include <kmdichildfrm.h>
+#include <tdemdichildfrm.h>
 %End
 
 
@@ -96,7 +96,7 @@ public:
 class KMdiChildFrmResizeEndEvent : TQCustomEvent
 {
 %TypeHeaderCode
-#include <kmdichildfrm.h>
+#include <tdemdichildfrm.h>
 %End
 
 
@@ -109,7 +109,7 @@ public:
 class KMdiChildFrm : TQFrame
 {
 %TypeHeaderCode
-#include <kmdichildfrm.h>
+#include <tdemdichildfrm.h>
 %End
 
 
diff --git a/sip/kmdi/kmdichildfrmcaption.sip b/sip/tdemdi/tdemdichildfrmcaption.sip
index d057c59..4047145 100644
--- a/sip/kmdi/kmdichildfrmcaption.sip
+++ b/sip/tdemdi/tdemdichildfrmcaption.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kmdi  version KDE 3.5.3
+//            module tdemdi  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
@@ -27,7 +27,7 @@
 class KMdiChildFrmCaption : TQWidget
 {
 %TypeHeaderCode
-#include <kmdichildfrmcaption.h>
+#include <tdemdichildfrmcaption.h>
 %End
 
 
diff --git a/sip/kmdi/kmdichildview.sip b/sip/tdemdi/tdemdichildview.sip
index 344c184..c92499b 100644
--- a/sip/kmdi/kmdichildview.sip
+++ b/sip/tdemdi/tdemdichildview.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kmdi  version KDE 3.5.3
+//            module tdemdi  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
@@ -27,7 +27,7 @@
 class KMdiChildView : TQWidget
 {
 %TypeHeaderCode
-#include <kmdichildview.h>
+#include <tdemdichildview.h>
 %End
 
 
diff --git a/sip/kmdi/kmdidefines.sip b/sip/tdemdi/tdemdidefines.sip
index 99fa008..1374cbb 100644
--- a/sip/kmdi/kmdidefines.sip
+++ b/sip/tdemdi/tdemdidefines.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kmdi  version KDE 3.5.3
+//            module tdemdi  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
@@ -24,7 +24,7 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 %ModuleHeaderCode
-#include <kmdidefines.h>
+#include <tdemdidefines.h>
 %End
 
 namespace KMdi
diff --git a/sip/kmdi/kmdimainfrm.sip b/sip/tdemdi/tdemdimainfrm.sip
index 3070c17..df213b4 100644
--- a/sip/kmdi/kmdimainfrm.sip
+++ b/sip/tdemdi/tdemdimainfrm.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kmdi  version KDE 3.5.3
+//            module tdemdi  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
@@ -27,7 +27,7 @@
 class KMdiViewCloseEvent : TQCustomEvent
 {
 %TypeHeaderCode
-#include <kmdimainfrm.h>
+#include <tdemdimainfrm.h>
 %End
 
 
@@ -40,7 +40,7 @@ public:
 class KMdiMainFrm : KParts::DockMainWindow
 {
 %TypeHeaderCode
-#include <kmdimainfrm.h>
+#include <tdemdimainfrm.h>
 %End
 
 
diff --git a/sip/kmdi/kmdimod.sip.in b/sip/tdemdi/tdemdimod.sip.in
index 06be2b7..3160b4a 100644
--- a/sip/kmdi/kmdimod.sip.in
+++ b/sip/tdemdi/tdemdimod.sip.in
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kmdi  version KDE_3_5_2
+//            module tdemdi  version KDE_3_5_2
 
 %Copying
 
@@ -26,7 +26,7 @@
 
 %End
 
-%Module kmdi
+%Module tdemdi
 
 %Import qt/qtmod.sip
 %Import dcopmod.sip
@@ -35,14 +35,14 @@
 %Import tdefxmod.sip
 %Import tdeuimod.sip
 %Import kiomod.sip
-%Import kpartsmod.sip
-
-%Include kmdichildarea.sip
-%Include kmdichildfrm.sip
-%Include kmdichildfrmcaption.sip
-%Include kmdichildview.sip
-%Include kmdidefines.sip
-%Include kmdimainfrm.sip
-%Include kmditaskbar.sip
-%Include kmditoolviewaccessor.sip
+%Import tdepartsmod.sip
+
+%Include tdemdichildarea.sip
+%Include tdemdichildfrm.sip
+%Include tdemdichildfrmcaption.sip
+%Include tdemdichildview.sip
+%Include tdemdidefines.sip
+%Include tdemdimainfrm.sip
+%Include tdemditaskbar.sip
+%Include tdemditoolviewaccessor.sip
 @mark@
diff --git a/sip/kmdi/kmditaskbar.sip b/sip/tdemdi/tdemditaskbar.sip
index d7fde53..bd54d7f 100644
--- a/sip/kmdi/kmditaskbar.sip
+++ b/sip/tdemdi/tdemditaskbar.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kmdi  version KDE 3.5.3
+//            module tdemdi  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
@@ -27,7 +27,7 @@
 class KMdiTaskBarButton : TQPushButton
 {
 %TypeHeaderCode
-#include <kmditaskbar.h>
+#include <tdemditaskbar.h>
 %End
 
 
@@ -60,7 +60,7 @@ protected:
 class KMdiTaskBar : KToolBar
 {
 %TypeHeaderCode
-#include <kmditaskbar.h>
+#include <tdemditaskbar.h>
 %End
 
 
diff --git a/sip/kmdi/kmditoolviewaccessor.sip b/sip/tdemdi/tdemditoolviewaccessor.sip
index a0a8a46..33af36d 100644
--- a/sip/kmdi/kmditoolviewaccessor.sip
+++ b/sip/tdemdi/tdemditoolviewaccessor.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kmdi  version KDE 3.5.3
+//            module tdemdi  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
@@ -27,7 +27,7 @@
 class KMdiToolViewAccessor : TQObject
 {
 %TypeHeaderCode
-#include <kmditoolviewaccessor.h>
+#include <tdemditoolviewaccessor.h>
 %End
 
 
diff --git a/sip/kparts/browserextension.sip b/sip/tdeparts/browserextension.sip
index 67175c3..cf93792 100644
--- a/sip/kparts/browserextension.sip
+++ b/sip/tdeparts/browserextension.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kparts  version KDE 3.5.3
+//            module tdeparts  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kparts/browserinterface.sip b/sip/tdeparts/browserinterface.sip
index b57ad05..56ad91f 100644
--- a/sip/kparts/browserinterface.sip
+++ b/sip/tdeparts/browserinterface.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kparts  version KDE 3.5.3
+//            module tdeparts  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kparts/browserrun.sip b/sip/tdeparts/browserrun.sip
index d728ec8..dc2dcc3 100644
--- a/sip/kparts/browserrun.sip
+++ b/sip/tdeparts/browserrun.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kparts  version KDE 3.5.3
+//            module tdeparts  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kparts/dockmainwindow.sip b/sip/tdeparts/dockmainwindow.sip
index b2a7fa3..1d05909 100644
--- a/sip/kparts/dockmainwindow.sip
+++ b/sip/tdeparts/dockmainwindow.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kparts  version KDE 3.5.3
+//            module tdeparts  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kparts/event.sip b/sip/tdeparts/event.sip
index 1288e9b..0a5ee41 100644
--- a/sip/kparts/event.sip
+++ b/sip/tdeparts/event.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kparts  version KDE 3.5.3
+//            module tdeparts  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kparts/factory.sip b/sip/tdeparts/factory.sip
index 35b18f8..00b25e0 100644
--- a/sip/kparts/factory.sip
+++ b/sip/tdeparts/factory.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kparts  version KDE 3.5.3
+//            module tdeparts  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kparts/genericfactory.sip b/sip/tdeparts/genericfactory.sip
index b76a574..81a5bd2 100644
--- a/sip/kparts/genericfactory.sip
+++ b/sip/tdeparts/genericfactory.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kparts  version KDE 3.5.3
+//            module tdeparts  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kparts/historyprovider.sip b/sip/tdeparts/historyprovider.sip
index d562810..f93be1f 100644
--- a/sip/kparts/historyprovider.sip
+++ b/sip/tdeparts/historyprovider.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kparts  version KDE 3.5.3
+//            module tdeparts  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kparts/mainwindow.sip b/sip/tdeparts/mainwindow.sip
index 181af5f..9fc9758 100644
--- a/sip/kparts/mainwindow.sip
+++ b/sip/tdeparts/mainwindow.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kparts  version KDE 3.5.3
+//            module tdeparts  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kparts/part.sip b/sip/tdeparts/part.sip
index 188c134..be35510 100644
--- a/sip/kparts/part.sip
+++ b/sip/tdeparts/part.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kparts  version KDE 3.5.3
+//            module tdeparts  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kparts/partmanager.sip b/sip/tdeparts/partmanager.sip
index ed4f6ca..c4ebc86 100644
--- a/sip/kparts/partmanager.sip
+++ b/sip/tdeparts/partmanager.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kparts  version KDE 3.5.3
+//            module tdeparts  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kparts/plugin.sip b/sip/tdeparts/plugin.sip
index 54102dc..670ef6b 100644
--- a/sip/kparts/plugin.sip
+++ b/sip/tdeparts/plugin.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kparts  version KDE 3.5.3
+//            module tdeparts  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kparts/statusbarextension.sip b/sip/tdeparts/statusbarextension.sip
index 1a43377..4f835d7 100644
--- a/sip/kparts/statusbarextension.sip
+++ b/sip/tdeparts/statusbarextension.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kparts  version KDE 3.5.3
+//            module tdeparts  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kparts/kparts-kde320.diff b/sip/tdeparts/tdeparts-kde320.diff
index 8ad0226..8ad0226 100644
--- a/sip/kparts/kparts-kde320.diff
+++ b/sip/tdeparts/tdeparts-kde320.diff
diff --git a/sip/kparts/kparts-kde321.diff b/sip/tdeparts/tdeparts-kde321.diff
index 8ad0226..8ad0226 100644
--- a/sip/kparts/kparts-kde321.diff
+++ b/sip/tdeparts/tdeparts-kde321.diff
diff --git a/sip/kparts/kparts-kde322.diff b/sip/tdeparts/tdeparts-kde322.diff
index 8ad0226..8ad0226 100644
--- a/sip/kparts/kparts-kde322.diff
+++ b/sip/tdeparts/tdeparts-kde322.diff
diff --git a/sip/kparts/kparts-kde323.diff b/sip/tdeparts/tdeparts-kde323.diff
index 8ad0226..8ad0226 100644
--- a/sip/kparts/kparts-kde323.diff
+++ b/sip/tdeparts/tdeparts-kde323.diff
diff --git a/sip/kparts/kparts-kde330.diff b/sip/tdeparts/tdeparts-kde330.diff
index 8ad0226..8ad0226 100644
--- a/sip/kparts/kparts-kde330.diff
+++ b/sip/tdeparts/tdeparts-kde330.diff
diff --git a/sip/kparts/kparts-kde331.diff b/sip/tdeparts/tdeparts-kde331.diff
index 8ad0226..8ad0226 100644
--- a/sip/kparts/kparts-kde331.diff
+++ b/sip/tdeparts/tdeparts-kde331.diff
diff --git a/sip/kparts/kparts-kde332.diff b/sip/tdeparts/tdeparts-kde332.diff
index 8ad0226..8ad0226 100644
--- a/sip/kparts/kparts-kde332.diff
+++ b/sip/tdeparts/tdeparts-kde332.diff
diff --git a/sip/kparts/kparts-kde340.diff b/sip/tdeparts/tdeparts-kde340.diff
index 8ad0226..8ad0226 100644
--- a/sip/kparts/kparts-kde340.diff
+++ b/sip/tdeparts/tdeparts-kde340.diff
diff --git a/sip/kparts/kparts-kde341.diff b/sip/tdeparts/tdeparts-kde341.diff
index 8ad0226..8ad0226 100644
--- a/sip/kparts/kparts-kde341.diff
+++ b/sip/tdeparts/tdeparts-kde341.diff
diff --git a/sip/kparts/kparts-kde342.diff b/sip/tdeparts/tdeparts-kde342.diff
index 8ad0226..8ad0226 100644
--- a/sip/kparts/kparts-kde342.diff
+++ b/sip/tdeparts/tdeparts-kde342.diff
diff --git a/sip/kparts/kparts-kde343.diff b/sip/tdeparts/tdeparts-kde343.diff
index 8ad0226..8ad0226 100644
--- a/sip/kparts/kparts-kde343.diff
+++ b/sip/tdeparts/tdeparts-kde343.diff
diff --git a/sip/kparts/kparts-kde350.diff b/sip/tdeparts/tdeparts-kde350.diff
index 8ad0226..8ad0226 100644
--- a/sip/kparts/kparts-kde350.diff
+++ b/sip/tdeparts/tdeparts-kde350.diff
diff --git a/sip/kparts/kparts-kde351.diff b/sip/tdeparts/tdeparts-kde351.diff
index 8ad0226..8ad0226 100644
--- a/sip/kparts/kparts-kde351.diff
+++ b/sip/tdeparts/tdeparts-kde351.diff
diff --git a/sip/kparts/kparts-kde352.diff b/sip/tdeparts/tdeparts-kde352.diff
index 8ad0226..8ad0226 100644
--- a/sip/kparts/kparts-kde352.diff
+++ b/sip/tdeparts/tdeparts-kde352.diff
diff --git a/sip/kparts/kparts-kde353.diff b/sip/tdeparts/tdeparts-kde353.diff
index 8ad0226..8ad0226 100644
--- a/sip/kparts/kparts-kde353.diff
+++ b/sip/tdeparts/tdeparts-kde353.diff
diff --git a/sip/kparts/kpartsmod.sip.in b/sip/tdeparts/tdepartsmod.sip.in
index 3254a04..89e7863 100644
--- a/sip/kparts/kpartsmod.sip.in
+++ b/sip/tdeparts/tdepartsmod.sip.in
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kparts  version KDE_3_5_2
+//            module tdeparts  version KDE_3_5_2
 
 %Copying
 
@@ -26,7 +26,7 @@
 
 %End
 
-%Module kparts
+%Module tdeparts
 
 %Import qt/qtmod.sip
 %Import qtxml/qtxmlmod.sip
diff --git a/sip/kresources/configdialog.sip b/sip/tderesources/configdialog.sip
index d49cf85..aaec6a5 100644
--- a/sip/kresources/configdialog.sip
+++ b/sip/tderesources/configdialog.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kresources  version KDE 3.5.3
+//            module tderesources  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kresources/configpage.sip b/sip/tderesources/configpage.sip
index 5d7a1de..43efd25 100644
--- a/sip/kresources/configpage.sip
+++ b/sip/tderesources/configpage.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kresources  version KDE 3.5.3
+//            module tderesources  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kresources/configwidget.sip b/sip/tderesources/configwidget.sip
index 7a5f6f6..bbf8a0d 100644
--- a/sip/kresources/configwidget.sip
+++ b/sip/tderesources/configwidget.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kresources  version KDE 3.5.3
+//            module tderesources  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kresources/factory.sip b/sip/tderesources/factory.sip
index e6555c8..5b76ac3 100644
--- a/sip/kresources/factory.sip
+++ b/sip/tderesources/factory.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kresources  version KDE 3.5.3
+//            module tderesources  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kresources/resource.sip b/sip/tderesources/resource.sip
index 231cee2..0831a82 100644
--- a/sip/kresources/resource.sip
+++ b/sip/tderesources/resource.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kresources  version KDE 3.5.3
+//            module tderesources  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kresources/selectdialog.sip b/sip/tderesources/selectdialog.sip
index fd81f67..bd61888 100644
--- a/sip/kresources/selectdialog.sip
+++ b/sip/tderesources/selectdialog.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kresources  version KDE 3.5.3
+//            module tderesources  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kresources/kresourcesmod.sip.in b/sip/tderesources/tderesourcesmod.sip.in
index 5df9d85..8871a13 100644
--- a/sip/kresources/kresourcesmod.sip.in
+++ b/sip/tderesources/tderesourcesmod.sip.in
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kresources  version KDE_3_5_2
+//            module tderesources  version KDE_3_5_2
 
 %Copying
 
@@ -26,7 +26,7 @@
 
 %End
 
-%Module kresources
+%Module tderesources
 
 %Import qt/qtmod.sip
 %Import qtxml/qtxmlmod.sip
diff --git a/sip/kspell/ksconfig.sip b/sip/tdespell/ksconfig.sip
index 26a1bd6..dc757a2 100644
--- a/sip/kspell/ksconfig.sip
+++ b/sip/tdespell/ksconfig.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kspell  version KDE 3.5.3
+//            module tdespell  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kspell/ksyntaxhighlighter.sip b/sip/tdespell/ksyntaxhighlighter.sip
index 983b447..a1329b0 100644
--- a/sip/kspell/ksyntaxhighlighter.sip
+++ b/sip/tdespell/ksyntaxhighlighter.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kspell  version KDE 3.5.3
+//            module tdespell  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kspell/kspell-kde320.diff b/sip/tdespell/tdespell-kde320.diff
index 303f31f..303f31f 100644
--- a/sip/kspell/kspell-kde320.diff
+++ b/sip/tdespell/tdespell-kde320.diff
diff --git a/sip/kspell/kspell-kde321.diff b/sip/tdespell/tdespell-kde321.diff
index 303f31f..303f31f 100644
--- a/sip/kspell/kspell-kde321.diff
+++ b/sip/tdespell/tdespell-kde321.diff
diff --git a/sip/kspell/kspell-kde322.diff b/sip/tdespell/tdespell-kde322.diff
index 303f31f..303f31f 100644
--- a/sip/kspell/kspell-kde322.diff
+++ b/sip/tdespell/tdespell-kde322.diff
diff --git a/sip/kspell/kspell-kde323.diff b/sip/tdespell/tdespell-kde323.diff
index 5fa0372..5fa0372 100644
--- a/sip/kspell/kspell-kde323.diff
+++ b/sip/tdespell/tdespell-kde323.diff
diff --git a/sip/kspell/kspell-kde330.diff b/sip/tdespell/tdespell-kde330.diff
index 5fa0372..5fa0372 100644
--- a/sip/kspell/kspell-kde330.diff
+++ b/sip/tdespell/tdespell-kde330.diff
diff --git a/sip/kspell/kspell-kde331.diff b/sip/tdespell/tdespell-kde331.diff
index 5fa0372..5fa0372 100644
--- a/sip/kspell/kspell-kde331.diff
+++ b/sip/tdespell/tdespell-kde331.diff
diff --git a/sip/kspell/kspell-kde332.diff b/sip/tdespell/tdespell-kde332.diff
index 5fa0372..5fa0372 100644
--- a/sip/kspell/kspell-kde332.diff
+++ b/sip/tdespell/tdespell-kde332.diff
diff --git a/sip/kspell/kspell-kde340.diff b/sip/tdespell/tdespell-kde340.diff
index 5fa0372..5fa0372 100644
--- a/sip/kspell/kspell-kde340.diff
+++ b/sip/tdespell/tdespell-kde340.diff
diff --git a/sip/kspell/kspell-kde341.diff b/sip/tdespell/tdespell-kde341.diff
index 5fa0372..5fa0372 100644
--- a/sip/kspell/kspell-kde341.diff
+++ b/sip/tdespell/tdespell-kde341.diff
diff --git a/sip/kspell/kspell-kde342.diff b/sip/tdespell/tdespell-kde342.diff
index 5fa0372..5fa0372 100644
--- a/sip/kspell/kspell-kde342.diff
+++ b/sip/tdespell/tdespell-kde342.diff
diff --git a/sip/kspell/kspell-kde343.diff b/sip/tdespell/tdespell-kde343.diff
index 5fa0372..5fa0372 100644
--- a/sip/kspell/kspell-kde343.diff
+++ b/sip/tdespell/tdespell-kde343.diff
diff --git a/sip/kspell/kspell-kde350.diff b/sip/tdespell/tdespell-kde350.diff
index 5fa0372..5fa0372 100644
--- a/sip/kspell/kspell-kde350.diff
+++ b/sip/tdespell/tdespell-kde350.diff
diff --git a/sip/tdespell/tdespell-kde351.diff b/sip/tdespell/tdespell-kde351.diff
new file mode 100644
index 0000000..a39d0ce
--- /dev/null
+++ b/sip/tdespell/tdespell-kde351.diff
@@ -0,0 +1,3 @@
+- %Include ksconfig.sip
+- %Include tdespell.sip
+- %Include tdespelldlg.sip
diff --git a/sip/kspell/kspell-kde352.diff b/sip/tdespell/tdespell-kde352.diff
index 5fa0372..5fa0372 100644
--- a/sip/kspell/kspell-kde352.diff
+++ b/sip/tdespell/tdespell-kde352.diff
diff --git a/sip/kspell/kspell-kde353.diff b/sip/tdespell/tdespell-kde353.diff
index 5fa0372..5fa0372 100644
--- a/sip/kspell/kspell-kde353.diff
+++ b/sip/tdespell/tdespell-kde353.diff
diff --git a/sip/kspell/kspell.sip b/sip/tdespell/tdespell.sip
index ce45612..5efdded 100644
--- a/sip/kspell/kspell.sip
+++ b/sip/tdespell/tdespell.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kspell  version KDE 3.5.3
+//            module tdespell  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
@@ -27,7 +27,7 @@
 class KSpell : TQObject
 {
 %TypeHeaderCode
-#include <kspell.h>
+#include <tdespell.h>
 %End
 
 
diff --git a/sip/kspell/kspelldlg.sip b/sip/tdespell/tdespelldlg.sip
index 20097b6..e4d5991 100644
--- a/sip/kspell/kspelldlg.sip
+++ b/sip/tdespell/tdespelldlg.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kspell  version KDE 3.5.3
+//            module tdespell  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
@@ -27,7 +27,7 @@
 class KSpellDlg : KDialogBase
 {
 %TypeHeaderCode
-#include <kspelldlg.h>
+#include <tdespelldlg.h>
 %End
 
 
@@ -90,7 +90,7 @@ protected slots:
 
 
 %ModuleCode
-#include <kspelldlg.h>
+#include <tdespelldlg.h>
 %End
 
 %If ( KDE_3_2_0 -  )
diff --git a/sip/kspell/kspellmod.sip.in b/sip/tdespell/tdespellmod.sip.in
index 79f60d3..cc6d5c4 100644
--- a/sip/kspell/kspellmod.sip.in
+++ b/sip/tdespell/tdespellmod.sip.in
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kspell  version KDE_3_5_2
+//            module tdespell  version KDE_3_5_2
 
 %Copying
 
@@ -26,7 +26,7 @@
 
 %End
 
-%Module kspell
+%Module tdespell
 
 %Import qt/qtmod.sip
 %Import qtxml/qtxmlmod.sip
@@ -37,6 +37,6 @@
 %Import kfilemod.sip
 
 %Include ksconfig.sip
-%Include kspell.sip
-%Include kspelldlg.sip
+%Include tdespell.sip
+%Include tdespelldlg.sip
 @mark@
diff --git a/sip/kspell2/backgroundchecker.sip b/sip/tdespell2/backgroundchecker.sip
index 3f6a0eb..6002c3a 100644
--- a/sip/kspell2/backgroundchecker.sip
+++ b/sip/tdespell2/backgroundchecker.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kspell2  version KDE_3_3_0
+//            module tdespell2  version KDE_3_3_0
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kspell2/broker.sip b/sip/tdespell2/broker.sip
index 9b1ed03..b506f3c 100644
--- a/sip/kspell2/broker.sip
+++ b/sip/tdespell2/broker.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kspell2  version KDE_3_3_0
+//            module tdespell2  version KDE_3_3_0
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kspell2/configdialog.sip b/sip/tdespell2/configdialog.sip
index 94a0c19..b13da2b 100644
--- a/sip/kspell2/configdialog.sip
+++ b/sip/tdespell2/configdialog.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kspell2  version KDE_3_3_0
+//            module tdespell2  version KDE_3_3_0
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kspell2/configwidget.sip b/sip/tdespell2/configwidget.sip
index ecf6012..a86b5d5 100644
--- a/sip/kspell2/configwidget.sip
+++ b/sip/tdespell2/configwidget.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kspell2  version KDE_3_3_0
+//            module tdespell2  version KDE_3_3_0
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kspell2/defaultdictionary.sip b/sip/tdespell2/defaultdictionary.sip
index 5190f7e..ae803c4 100644
--- a/sip/kspell2/defaultdictionary.sip
+++ b/sip/tdespell2/defaultdictionary.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kspell2  version KDE_3_3_0
+//            module tdespell2  version KDE_3_3_0
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kspell2/dialog.sip b/sip/tdespell2/dialog.sip
index 42b287a..33b7d47 100644
--- a/sip/kspell2/dialog.sip
+++ b/sip/tdespell2/dialog.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kspell2  version KDE_3_3_0
+//            module tdespell2  version KDE_3_3_0
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kspell2/dictionary.sip b/sip/tdespell2/dictionary.sip
index f0241ba..5293390 100644
--- a/sip/kspell2/dictionary.sip
+++ b/sip/tdespell2/dictionary.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kspell2  version KDE_3_3_0
+//            module tdespell2  version KDE_3_3_0
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kspell2/filter.sip b/sip/tdespell2/filter.sip
index 9094dfc..d720a17 100644
--- a/sip/kspell2/filter.sip
+++ b/sip/tdespell2/filter.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kspell2  version KDE_3_3_0
+//            module tdespell2  version KDE_3_3_0
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kspell2/highlighter.sip b/sip/tdespell2/highlighter.sip
index ee6388f..45796f8 100644
--- a/sip/kspell2/highlighter.sip
+++ b/sip/tdespell2/highlighter.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kspell2  version KDE_3_3_0
+//            module tdespell2  version KDE_3_3_0
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kspell2/settings.sip b/sip/tdespell2/settings.sip
index 999779b..0c4692b 100644
--- a/sip/kspell2/settings.sip
+++ b/sip/tdespell2/settings.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kspell2  version KDE_3_3_0
+//            module tdespell2  version KDE_3_3_0
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kspell2/kspell2mod.sip.in b/sip/tdespell2/tdespell2mod.sip.in
index ae2b3db..1078351 100644
--- a/sip/kspell2/kspell2mod.sip.in
+++ b/sip/tdespell2/tdespell2mod.sip.in
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kspell2  version KDE_3_3_0
+//            module tdespell2  version KDE_3_3_0
 
 %Copying
 
@@ -26,7 +26,7 @@
 
 %End
 
-%Module kspell2
+%Module tdespell2
 
 %Import qt/qtmod.sip
 %Import qtxml/qtxmlmod.sip
diff --git a/sip/kutils/kcmultidialog.sip b/sip/tdeutils/kcmultidialog.sip
index 3a1f511..a20e383 100644
--- a/sip/kutils/kcmultidialog.sip
+++ b/sip/tdeutils/kcmultidialog.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kutils  version KDE 3.5.3
+//            module tdeutils  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kutils/kfind.sip b/sip/tdeutils/kfind.sip
index 57c33b4..59c4022 100644
--- a/sip/kutils/kfind.sip
+++ b/sip/tdeutils/kfind.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kutils  version KDE 3.5.3
+//            module tdeutils  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kutils/kfinddialog.sip b/sip/tdeutils/kfinddialog.sip
index f3624fa..df30625 100644
--- a/sip/kutils/kfinddialog.sip
+++ b/sip/tdeutils/kfinddialog.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kutils  version KDE 3.5.3
+//            module tdeutils  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kutils/kplugininfo.sip b/sip/tdeutils/kplugininfo.sip
index c2ef478..d71148d 100644
--- a/sip/kutils/kplugininfo.sip
+++ b/sip/tdeutils/kplugininfo.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kutils  version KDE 3.5.3
+//            module tdeutils  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kutils/kpluginselector.sip b/sip/tdeutils/kpluginselector.sip
index c53f1c4..d542bea 100644
--- a/sip/kutils/kpluginselector.sip
+++ b/sip/tdeutils/kpluginselector.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kutils  version KDE 3.5.3
+//            module tdeutils  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kutils/kreplace.sip b/sip/tdeutils/kreplace.sip
index e692923..ee3842e 100644
--- a/sip/kutils/kreplace.sip
+++ b/sip/tdeutils/kreplace.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kutils  version KDE 3.5.3
+//            module tdeutils  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kutils/kreplacedialog.sip b/sip/tdeutils/kreplacedialog.sip
index 79b58e4..0546165 100644
--- a/sip/kutils/kreplacedialog.sip
+++ b/sip/tdeutils/kreplacedialog.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kutils  version KDE 3.5.3
+//            module tdeutils  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kutils/tdecmoduleinfo.sip b/sip/tdeutils/tdecmoduleinfo.sip
index 2adda6c..6403dc5 100644
--- a/sip/kutils/tdecmoduleinfo.sip
+++ b/sip/tdeutils/tdecmoduleinfo.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kutils  version KDE 3.5.3
+//            module tdeutils  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kutils/tdecmoduleloader.sip b/sip/tdeutils/tdecmoduleloader.sip
index 9d87854..a5744b5 100644
--- a/sip/kutils/tdecmoduleloader.sip
+++ b/sip/tdeutils/tdecmoduleloader.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kutils  version KDE 3.5.3
+//            module tdeutils  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kutils/tdecmoduleproxy.sip b/sip/tdeutils/tdecmoduleproxy.sip
index 6e65ce9..3b4baec 100644
--- a/sip/kutils/tdecmoduleproxy.sip
+++ b/sip/tdeutils/tdecmoduleproxy.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kutils  version KDE 3.5.3
+//            module tdeutils  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kutils/kmultitabbar.sip b/sip/tdeutils/tdemultitabbar.sip
index 68f77f5..4f52d78 100644
--- a/sip/kutils/kmultitabbar.sip
+++ b/sip/tdeutils/tdemultitabbar.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kutils  version KDE 3.5.3
+//            module tdeutils  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
@@ -29,7 +29,7 @@
 class KMultiTabBar : TQWidget
 {
 %TypeHeaderCode
-#include <kmultitabbar.h>
+#include <tdemultitabbar.h>
 %End
 
 
@@ -99,7 +99,7 @@ protected:
 class KMultiTabBarButton : TQPushButton
 {
 %TypeHeaderCode
-#include <kmultitabbar.h>
+#include <tdemultitabbar.h>
 %End
 
 
@@ -134,7 +134,7 @@ protected slots:
 class KMultiTabBarTab : KMultiTabBarButton
 {
 %TypeHeaderCode
-#include <kmultitabbar.h>
+#include <tdemultitabbar.h>
 %End
 
 
diff --git a/sip/kutils/kutils-kde340.diff b/sip/tdeutils/tdeutils-kde340.diff
index 0805f47..0805f47 100644
--- a/sip/kutils/kutils-kde340.diff
+++ b/sip/tdeutils/tdeutils-kde340.diff
diff --git a/sip/kutils/kutils-kde341.diff b/sip/tdeutils/tdeutils-kde341.diff
index 0805f47..0805f47 100644
--- a/sip/kutils/kutils-kde341.diff
+++ b/sip/tdeutils/tdeutils-kde341.diff
diff --git a/sip/kutils/kutilsmod.sip.in b/sip/tdeutils/tdeutilsmod.sip.in
index ebd8f69..ad606c9 100644
--- a/sip/kutils/kutilsmod.sip.in
+++ b/sip/tdeutils/tdeutilsmod.sip.in
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kutils  version KDE_3_5_2
+//            module tdeutils  version KDE_3_5_2
 
 %Copying
 
@@ -26,7 +26,7 @@
 
 %End
 
-%Module kutils
+%Module tdeutils
 
 %Import qt/qtmod.sip
 %Import dcopmod.sip
@@ -42,7 +42,7 @@
 %Include kcmultidialog.sip
 %Include kfind.sip
 %Include kfinddialog.sip
-%Include kmultitabbar.sip
+%Include tdemultitabbar.sip
 %Include kplugininfo.sip
 %Include kpluginselector.sip
 %Include kreplace.sip