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

133 files changed, 185 insertions, 185 deletions

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