From 969673f24ba313cb42262200403ccac2b4316328 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Sun, 21 Aug 2011 02:36:07 +0000
Subject: [PATCH] Fix python-trinity from last commit

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/libraries/python-trinity@1248415 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 ChangeLog             | 10 +++++-----
 ChangeLog.2001-4      |  2 +-
 Changelog             | 14 ++++++-------
 pykde350.prj          | 46 +++++++++++++++++++++----------------------
 pykde351.prj          | 46 +++++++++++++++++++++----------------------
 pykde352.prj          | 46 +++++++++++++++++++++----------------------
 pykde353.prj          | 46 +++++++++++++++++++++----------------------
 pykdeconfig.py        |  4 ++--
 sip/kdecore/kuser.sip |  2 +-
 9 files changed, 108 insertions(+), 108 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c8033c6..3bd0311 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -298,7 +298,7 @@ Added ConvertToSubclassCode blocks for kmdi, kutils
 ------------------------------------------------------------------------
 r65 | (jim) | 2005-03-10 10:41:57 -0800 (Thu, 10 Mar 2005) | 2 lines
 
-added kkeyserver.h to extra/trinity40
+added kkeyserver.h to extra/kde340
 
 ------------------------------------------------------------------------
 r64 | (jim) | 2005-03-08 14:14:58 -0800 (Tue, 08 Mar 2005) | 3 lines
@@ -329,17 +329,17 @@ removed kjs support
 ------------------------------------------------------------------------
 r58 | (jim) | 2005-03-05 00:42:59 -0800 (Sat, 05 Mar 2005) | 2 lines
 
-update extra/trinity40 h files
+update extra/kde340 h files
 
 ------------------------------------------------------------------------
 r57 | (jim) | 2005-03-05 00:36:09 -0800 (Sat, 05 Mar 2005) | 2 lines
 
-update .easibox - extra/trinity40
+update .easibox - extra/kde340
 
 ------------------------------------------------------------------------
 r56 | (jim) | 2005-03-05 00:34:34 -0800 (Sat, 05 Mar 2005) | 2 lines
 
-added extra/trinity40
+added extra/kde340
 
 ------------------------------------------------------------------------
 r55 | (jim) | 2005-03-04 23:58:35 -0800 (Fri, 04 Mar 2005) | 2 lines
@@ -415,7 +415,7 @@ Changed pid_t type from int to long; enabled KParts::URLArgs::metaData ()
 r39 | (jim) | 2005-02-28 23:49:09 -0800 (Mon, 28 Feb 2005) | 4 lines
 
 KFileMetaInfo typedefs removed; KProcessController versioning
-corrected; KRecentDirs (and extra/ hfiles) added; pytrinity32.prj
+corrected; KRecentDirs (and extra/ hfiles) added; pykde332.prj
 added
 
 ------------------------------------------------------------------------
diff --git a/ChangeLog.2001-4 b/ChangeLog.2001-4
index 1b979bd..7eb8682 100644
--- a/ChangeLog.2001-4
+++ b/ChangeLog.2001-4
@@ -108,7 +108,7 @@ PyKDE-3.3.2-2: fix Qt versioning change
 2002/8/9 13:00:00 jim
 PyKDE-3.3.2-1: handle Qt versioning change in
 Qt 3.0.5 (build.py); add '-I usr/X11R6/include'
-in sip/trinity0.kdecore.sip
+in sip/kde30.kdecore.sip
 
 2002/8/8 13:10:00 jim
 Cleaned up top-level sip files for all versions;
diff --git a/Changelog b/Changelog
index db5c31b..e959c61 100644
--- a/Changelog
+++ b/Changelog
@@ -45,7 +45,7 @@ konsole_part stuff
 r152 | (no author) | 2006-09-21 10:13:58 -0700 (Thu, 21 Sep 2006) | 3 lines
 
 added konsole_part.h to versions missing it; added
-extra/trinity53 to base fileset
+extra/kde353 to base fileset
 
 ------------------------------------------------------------------------
 r150 | (no author) | 2006-09-21 08:38:43 -0700 (Thu, 21 Sep 2006) | 3 lines
@@ -93,7 +93,7 @@ remove top-level (*mod.sip) files
 ------------------------------------------------------------------------
 r140 | (no author) | 2006-05-21 20:27:45 -0700 (Sun, 21 May 2006) | 2 lines
 
-added extra/trinity52
+added extra/kde352
 
 ------------------------------------------------------------------------
 r139 | (no author) | 2006-05-21 20:06:53 -0700 (Sun, 21 May 2006) | 2 lines
@@ -475,7 +475,7 @@ Added ConvertToSubclassCode blocks for kmdi, kutils
 ------------------------------------------------------------------------
 r65 | (no author) | 2005-03-10 10:41:57 -0800 (Thu, 10 Mar 2005) | 2 lines
 
-added kkeyserver.h to extra/trinity40
+added kkeyserver.h to extra/kde340
 
 ------------------------------------------------------------------------
 r64 | (no author) | 2005-03-08 14:14:58 -0800 (Tue, 08 Mar 2005) | 3 lines
@@ -506,17 +506,17 @@ removed kjs support
 ------------------------------------------------------------------------
 r58 | (no author) | 2005-03-05 00:42:59 -0800 (Sat, 05 Mar 2005) | 2 lines
 
-update extra/trinity40 h files
+update extra/kde340 h files
 
 ------------------------------------------------------------------------
 r57 | (no author) | 2005-03-05 00:36:09 -0800 (Sat, 05 Mar 2005) | 2 lines
 
-update .easibox - extra/trinity40
+update .easibox - extra/kde340
 
 ------------------------------------------------------------------------
 r56 | (no author) | 2005-03-05 00:34:34 -0800 (Sat, 05 Mar 2005) | 2 lines
 
-added extra/trinity40
+added extra/kde340
 
 ------------------------------------------------------------------------
 r55 | (no author) | 2005-03-04 23:58:35 -0800 (Fri, 04 Mar 2005) | 2 lines
@@ -592,7 +592,7 @@ Changed pid_t type from int to long; enabled KParts::URLArgs::metaData ()
 r39 | (no author) | 2005-02-28 23:49:09 -0800 (Mon, 28 Feb 2005) | 4 lines
 
 KFileMetaInfo typedefs removed; KProcessController versioning
-corrected; KRecentDirs (and extra/ hfiles) added; pytrinity32.prj
+corrected; KRecentDirs (and extra/ hfiles) added; pykde332.prj
 added
 
 ------------------------------------------------------------------------
diff --git a/pykde350.prj b/pykde350.prj
index b395d39..c6577f9 100644
--- a/pykde350.prj
+++ b/pykde350.prj
@@ -44,14 +44,14 @@ copyright   =
 module = dcop
 
 timeline   = KDE_3_0_0 KDE_3_0_1 KDE_3_0_3 KDE_3_1_0 KDE_3_1_1 KDE_3_1_2 KDE_3_1_3 KDE_3_1_4 KDE_3_1_5 KDE_3_2_0 KDE_3_2_1 KDE_3_2_2 KDE_3_2_3 KDE_3_3_0 KDE_3_3_1 KDE_3_3_2 KDE_3_4_0 KDE_3_4_1 KDE_3_4_2 KDE_3_4_3 KDE_3_5_0
-source     = $SRC/dcop $DST/extra/trinity50/dcop
+source     = $SRC/dcop $DST/extra/kde350/dcop
 ignore     = dcopc.h dcopserver.h dcopsignals.h kdatastream.h dcoptypes.h
-compare    = $COMP $DST/extra/trinity50/dcop
-subst      = $DST/extra/trinity50
+compare    = $COMP $DST/extra/kde350/dcop
+subst      = $DST/extra/kde350
 import     = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 importpath = $IMP
 sipslot    = callBackObj callBackSlot dcopClient
-include    = ../extra/trinity50/dcop
+include    = ../extra/kde350/dcop
 libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lDCOP
 define     = "KDE_DEPRECATED", ""
 define     = "DCOP_EXPORT", ""
@@ -71,8 +71,8 @@ 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 kdelibs_export.h
 ignore     = kswap.h
-compare    = $COMP $DST/extra/trinity50
-subst      = $DST/extra/trinity50
+compare    = $COMP $DST/extra/kde350
+subst      = $DST/extra/kde350
 import     = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = dcop
 importpath = $IMP
@@ -101,7 +101,7 @@ module = kdesu
 source     = $SRC/kdesu
 ignore     =
 compare    = $COMP/kdesu
-subst      = $DST/extra/trinity50
+subst      = $DST/extra/kde350
 import     = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = dcop
 import     = kdecore
@@ -121,7 +121,7 @@ module = kdefx
 ignore     =
 source     = $SRC/kdefx
 compare    = $COMP
-subst      = $DST/extra/trinity50
+subst      = $DST/extra/kde350
 import     = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = dcop
 import     = kdecore
@@ -144,7 +144,7 @@ source     = $SRC/kdeui/
 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
 compare    = $COMP
-subst      = $DST/extra/trinity50
+subst      = $DST/extra/kde350
 import     = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = qtxmlmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = dcop
@@ -170,11 +170,11 @@ retain
 
 module = kio
 
-source     = $SRC/kio/kio  $DST/extra/trinity50/kio
+source     = $SRC/kio/kio  $DST/extra/kde350/kio
 ignore     = kmdbase.h uiserver_stub.h kdirnotify_stub.h uiserver.h http_slave_defaults.h ioslave_defaults.h
 ignore     = kmimetyperesolver.h
 compare    = $COMP  $COMP/kio
-subst      = $DST/extra/trinity50
+subst      = $DST/extra/kde350
 import     = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = qtxmlmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = dcop
@@ -184,7 +184,7 @@ import     = kdeui
 importpath = $IMP
 amend      = * ctor parent /TransferThis/
 amend      = * all parent /Transfer/
-include    = ../extra/trinity50/kio @KDE_INCLUDEPATH@/kio ../kdecore
+include    = ../extra/kde350/kio @KDE_INCLUDEPATH@/kio ../kdecore
 libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lDCOP -lkio -lkdeui -lkdecore -ldcopcmodule\
              -lkdecorecmodule -lkdeuicmodule
 sipslot    =
@@ -248,7 +248,7 @@ module = kutils
 source     = $SRC/kutils/
 ignore     =
 compare    = $COMP
-subst      = $DST/extra/trinity50
+subst      = $DST/extra/kde350
 ignore     = kcmodulecontainer.h
 import     = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = dcopmod.sip
@@ -276,7 +276,7 @@ module = kfile
 source     = $SRC/kio/kfile
 ignore     = kpropsdlg.h
 compare    = $COMP  $COMP/kio
-subst      = $DST/extra/trinity50
+subst      = $DST/extra/kde350
 import     = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = qtxmlmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = dcop
@@ -300,7 +300,7 @@ module = kparts
 source     = $SRC/kparts
 ignore     = componentfactory.h
 compare    = $COMP/kparts
-subst      = $DST/extra/trinity50
+subst      = $DST/extra/kde350
 import     = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = qtxmlmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = dcop
@@ -324,7 +324,7 @@ module = khtml
 source     = $SRC/khtml $SRC/khtml/dom
 ignore     = khtmldefaults.h dom_core.h dom_html.h khtml_events.h
 compare    = $COMP  $COMP/dom
-subst      = $DST/extra/trinity50
+subst      = $DST/extra/kde350
 import     = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = qtxmlmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = dcop
@@ -351,8 +351,8 @@ retain
 
 //source     = $SRC/kjs
 //ignore     = global.h
-//compare    = $COMP/kjs $DST/extra/trinity50
-//subst      = $DST/extra/trinity50
+//compare    = $COMP/kjs $DST/extra/kde350
+//subst      = $DST/extra/kde350
 //import     = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 //import     = qtxmlmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 //import     = dcop
@@ -377,9 +377,9 @@ retain
 module = kspell
 
 ignore     =
-source     = $DST/extra/trinity50/kspell
+source     = $DST/extra/kde350/kspell
 compare    = $COMP
-subst      = $DST/extra/trinity50
+subst      = $DST/extra/kde350
 import     = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = qtxmlmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = dcop
@@ -411,7 +411,7 @@ module = kdeprint
 ignore     = driver.h
 source     = $SRC/kdeprint
 compare    = $COMP $COMP/kdeprint
-subst      = $DST/extra/trinity50
+subst      = $DST/extra/kde350
 import     = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = qtxmlmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = dcop
@@ -434,7 +434,7 @@ module = kmdi
 source     = $SRC/kmdi/
 ignore     =
 compare    = $COMP
-subst      = $DST/extra/trinity50
+subst      = $DST/extra/kde350
 import     = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = dcopmod.sip
 import     = kdecoremod.sip
@@ -464,7 +464,7 @@ retain
 //source     = $SRC/kspell2/
 //ignore     =
 //compare    = $COMP
-//subst      = $DST/extra/trinity50
+//subst      = $DST/extra/kde350
 //import     = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 //import     = dcopmod.sip
 //import     = kdecoremod.sip
diff --git a/pykde351.prj b/pykde351.prj
index 3ab9c17..4638a43 100644
--- a/pykde351.prj
+++ b/pykde351.prj
@@ -44,14 +44,14 @@ copyright   =
 module = dcop
 
 timeline   = KDE_3_0_0 KDE_3_0_1 KDE_3_0_3 KDE_3_1_0 KDE_3_1_1 KDE_3_1_2 KDE_3_1_3 KDE_3_1_4 KDE_3_1_5 KDE_3_2_0 KDE_3_2_1 KDE_3_2_2 KDE_3_2_3 KDE_3_3_0 KDE_3_3_1 KDE_3_3_2 KDE_3_4_0 KDE_3_4_1 KDE_3_4_2 KDE_3_4_3 KDE_3_5_0 KDE_3_5_1
-source     = $SRC/dcop $DST/extra/trinity51/dcop
+source     = $SRC/dcop $DST/extra/kde351/dcop
 ignore     = dcopc.h dcopserver.h dcopsignals.h kdatastream.h dcoptypes.h
-compare    = $COMP $DST/extra/trinity51/dcop
-subst      = $DST/extra/trinity51
+compare    = $COMP $DST/extra/kde351/dcop
+subst      = $DST/extra/kde351
 import     = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 importpath = $IMP
 sipslot    = callBackObj callBackSlot dcopClient
-include    = ../extra/trinity51/dcop
+include    = ../extra/kde351/dcop
 libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lDCOP
 define     = "KDE_DEPRECATED", ""
 define     = "DCOP_EXPORT", ""
@@ -71,8 +71,8 @@ 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 kdelibs_export.h
 ignore     = kswap.h
-compare    = $COMP $DST/extra/trinity51
-subst      = $DST/extra/trinity51
+compare    = $COMP $DST/extra/kde351
+subst      = $DST/extra/kde351
 import     = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = dcop
 importpath = $IMP
@@ -101,7 +101,7 @@ module = kdesu
 source     = $SRC/kdesu
 ignore     =
 compare    = $COMP/kdesu
-subst      = $DST/extra/trinity51
+subst      = $DST/extra/kde351
 import     = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = dcop
 import     = kdecore
@@ -121,7 +121,7 @@ module = kdefx
 ignore     =
 source     = $SRC/kdefx
 compare    = $COMP
-subst      = $DST/extra/trinity51
+subst      = $DST/extra/kde351
 import     = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = dcop
 import     = kdecore
@@ -144,7 +144,7 @@ source     = $SRC/kdeui/
 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
 compare    = $COMP
-subst      = $DST/extra/trinity51
+subst      = $DST/extra/kde351
 import     = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = qtxmlmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = dcop
@@ -170,11 +170,11 @@ retain
 
 module = kio
 
-source     = $SRC/kio/kio  $DST/extra/trinity51/kio
+source     = $SRC/kio/kio  $DST/extra/kde351/kio
 ignore     = kmdbase.h uiserver_stub.h kdirnotify_stub.h uiserver.h http_slave_defaults.h ioslave_defaults.h
 ignore     = kmimetyperesolver.h
 compare    = $COMP  $COMP/kio
-subst      = $DST/extra/trinity51
+subst      = $DST/extra/kde351
 import     = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = qtxmlmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = dcop
@@ -184,7 +184,7 @@ import     = kdeui
 importpath = $IMP
 amend      = * ctor parent /TransferThis/
 amend      = * all parent /Transfer/
-include    = ../extra/trinity51/kio @KDE_INCLUDEPATH@/kio ../kdecore
+include    = ../extra/kde351/kio @KDE_INCLUDEPATH@/kio ../kdecore
 libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lDCOP -lkio -lkdeui -lkdecore -ldcopcmodule\
              -lkdecorecmodule -lkdeuicmodule
 sipslot    =
@@ -248,7 +248,7 @@ module = kutils
 source     = $SRC/kutils/
 ignore     =
 compare    = $COMP
-subst      = $DST/extra/trinity51
+subst      = $DST/extra/kde351
 ignore     = kcmodulecontainer.h
 import     = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = dcopmod.sip
@@ -276,7 +276,7 @@ module = kfile
 source     = $SRC/kio/kfile
 ignore     = kpropsdlg.h
 compare    = $COMP  $COMP/kio
-subst      = $DST/extra/trinity51
+subst      = $DST/extra/kde351
 import     = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = qtxmlmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = dcop
@@ -300,7 +300,7 @@ module = kparts
 source     = $SRC/kparts
 ignore     = componentfactory.h
 compare    = $COMP/kparts
-subst      = $DST/extra/trinity51
+subst      = $DST/extra/kde351
 import     = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = qtxmlmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = dcop
@@ -324,7 +324,7 @@ module = khtml
 source     = $SRC/khtml $SRC/khtml/dom
 ignore     = khtmldefaults.h dom_core.h dom_html.h khtml_events.h
 compare    = $COMP  $COMP/dom
-subst      = $DST/extra/trinity51
+subst      = $DST/extra/kde351
 import     = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = qtxmlmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = dcop
@@ -351,8 +351,8 @@ retain
 
 //source     = $SRC/kjs
 //ignore     = global.h
-//compare    = $COMP/kjs $DST/extra/trinity51
-//subst      = $DST/extra/trinity51
+//compare    = $COMP/kjs $DST/extra/kde351
+//subst      = $DST/extra/kde351
 //import     = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 //import     = qtxmlmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 //import     = dcop
@@ -377,9 +377,9 @@ retain
 module = kspell
 
 ignore     =
-source     = $DST/extra/trinity51/kspell
+source     = $DST/extra/kde351/kspell
 compare    = $COMP
-subst      = $DST/extra/trinity51
+subst      = $DST/extra/kde351
 import     = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = qtxmlmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = dcop
@@ -411,7 +411,7 @@ module = kdeprint
 ignore     = driver.h
 source     = $SRC/kdeprint
 compare    = $COMP $COMP/kdeprint
-subst      = $DST/extra/trinity51
+subst      = $DST/extra/kde351
 import     = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = qtxmlmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = dcop
@@ -434,7 +434,7 @@ module = kmdi
 source     = $SRC/kmdi/
 ignore     =
 compare    = $COMP
-subst      = $DST/extra/trinity51
+subst      = $DST/extra/kde351
 import     = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = dcopmod.sip
 import     = kdecoremod.sip
@@ -464,7 +464,7 @@ retain
 //source     = $SRC/kspell2/
 //ignore     =
 //compare    = $COMP
-//subst      = $DST/extra/trinity51
+//subst      = $DST/extra/kde351
 //import     = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 //import     = dcopmod.sip
 //import     = kdecoremod.sip
diff --git a/pykde352.prj b/pykde352.prj
index ffa8817..c92e568 100644
--- a/pykde352.prj
+++ b/pykde352.prj
@@ -44,14 +44,14 @@ copyright   =
 module = dcop
 
 timeline   = KDE_3_0_0 KDE_3_0_1 KDE_3_0_3 KDE_3_1_0 KDE_3_1_1 KDE_3_1_2 KDE_3_1_3 KDE_3_1_4 KDE_3_1_5 KDE_3_2_0 KDE_3_2_1 KDE_3_2_2 KDE_3_2_3 KDE_3_3_0 KDE_3_3_1 KDE_3_3_2 KDE_3_4_0 KDE_3_4_1 KDE_3_4_2 KDE_3_4_3 KDE_3_5_0 KDE_3_5_1 KDE_3_5_2
-source     = $SRC/dcop $DST/extra/trinity52/dcop
+source     = $SRC/dcop $DST/extra/kde352/dcop
 ignore     = dcopc.h dcopserver.h dcopsignals.h kdatastream.h dcoptypes.h
-compare    = $COMP $DST/extra/trinity52/dcop
-subst      = $DST/extra/trinity52
+compare    = $COMP $DST/extra/kde352/dcop
+subst      = $DST/extra/kde352
 import     = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 importpath = $IMP
 sipslot    = callBackObj callBackSlot dcopClient
-include    = ../extra/trinity52/dcop
+include    = ../extra/kde352/dcop
 libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lDCOP
 define     = "KDE_DEPRECATED", ""
 define     = "DCOP_EXPORT", ""
@@ -71,8 +71,8 @@ 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 kdelibs_export.h
 ignore     = kswap.h
-compare    = $COMP $DST/extra/trinity52
-subst      = $DST/extra/trinity52
+compare    = $COMP $DST/extra/kde352
+subst      = $DST/extra/kde352
 import     = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = dcop
 importpath = $IMP
@@ -101,7 +101,7 @@ module = kdesu
 source     = $SRC/kdesu
 ignore     =
 compare    = $COMP/kdesu
-subst      = $DST/extra/trinity52
+subst      = $DST/extra/kde352
 import     = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = dcop
 import     = kdecore
@@ -121,7 +121,7 @@ module = kdefx
 ignore     =
 source     = $SRC/kdefx
 compare    = $COMP
-subst      = $DST/extra/trinity52
+subst      = $DST/extra/kde352
 import     = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = dcop
 import     = kdecore
@@ -144,7 +144,7 @@ source     = $SRC/kdeui/
 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
 compare    = $COMP
-subst      = $DST/extra/trinity52
+subst      = $DST/extra/kde352
 import     = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = qtxmlmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = dcop
@@ -170,11 +170,11 @@ retain
 
 module = kio
 
-source     = $SRC/kio/kio  $DST/extra/trinity52/kio
+source     = $SRC/kio/kio  $DST/extra/kde352/kio
 ignore     = kmdbase.h uiserver_stub.h kdirnotify_stub.h uiserver.h http_slave_defaults.h ioslave_defaults.h
 ignore     = kmimetyperesolver.h
 compare    = $COMP  $COMP/kio
-subst      = $DST/extra/trinity52
+subst      = $DST/extra/kde352
 import     = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = qtxmlmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = dcop
@@ -184,7 +184,7 @@ import     = kdeui
 importpath = $IMP
 amend      = * ctor parent /TransferThis/
 amend      = * all parent /Transfer/
-include    = ../extra/trinity52/kio @KDE_INCLUDEPATH@/kio ../kdecore
+include    = ../extra/kde352/kio @KDE_INCLUDEPATH@/kio ../kdecore
 libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lDCOP -lkio -lkdeui -lkdecore -ldcopcmodule\
              -lkdecorecmodule -lkdeuicmodule
 sipslot    =
@@ -248,7 +248,7 @@ module = kutils
 source     = $SRC/kutils/
 ignore     =
 compare    = $COMP
-subst      = $DST/extra/trinity52
+subst      = $DST/extra/kde352
 ignore     = kcmodulecontainer.h
 import     = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = dcopmod.sip
@@ -276,7 +276,7 @@ module = kfile
 source     = $SRC/kio/kfile
 ignore     = kpropsdlg.h
 compare    = $COMP  $COMP/kio
-subst      = $DST/extra/trinity52
+subst      = $DST/extra/kde352
 import     = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = qtxmlmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = dcop
@@ -300,7 +300,7 @@ module = kparts
 source     = $SRC/kparts
 ignore     = componentfactory.h
 compare    = $COMP/kparts
-subst      = $DST/extra/trinity52
+subst      = $DST/extra/kde352
 import     = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = qtxmlmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = dcop
@@ -324,7 +324,7 @@ module = khtml
 source     = $SRC/khtml $SRC/khtml/dom
 ignore     = khtmldefaults.h dom_core.h dom_html.h khtml_events.h
 compare    = $COMP  $COMP/dom
-subst      = $DST/extra/trinity52
+subst      = $DST/extra/kde352
 import     = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = qtxmlmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = dcop
@@ -351,8 +351,8 @@ retain
 
 //source     = $SRC/kjs
 //ignore     = global.h
-//compare    = $COMP/kjs $DST/extra/trinity52
-//subst      = $DST/extra/trinity52
+//compare    = $COMP/kjs $DST/extra/kde352
+//subst      = $DST/extra/kde352
 //import     = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 //import     = qtxmlmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 //import     = dcop
@@ -377,9 +377,9 @@ retain
 module = kspell
 
 ignore     =
-source     = $DST/extra/trinity52/kspell
+source     = $DST/extra/kde352/kspell
 compare    = $COMP
-subst      = $DST/extra/trinity52
+subst      = $DST/extra/kde352
 import     = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = qtxmlmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = dcop
@@ -411,7 +411,7 @@ module = kdeprint
 ignore     = driver.h
 source     = $SRC/kdeprint
 compare    = $COMP $COMP/kdeprint
-subst      = $DST/extra/trinity52
+subst      = $DST/extra/kde352
 import     = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = qtxmlmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = dcop
@@ -434,7 +434,7 @@ module = kmdi
 source     = $SRC/kmdi/
 ignore     =
 compare    = $COMP
-subst      = $DST/extra/trinity52
+subst      = $DST/extra/kde352
 import     = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = dcopmod.sip
 import     = kdecoremod.sip
@@ -464,7 +464,7 @@ retain
 //source     = $SRC/kspell2/
 //ignore     =
 //compare    = $COMP
-//subst      = $DST/extra/trinity52
+//subst      = $DST/extra/kde352
 //import     = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 //import     = dcopmod.sip
 //import     = kdecoremod.sip
diff --git a/pykde353.prj b/pykde353.prj
index f9d6696..da31234 100644
--- a/pykde353.prj
+++ b/pykde353.prj
@@ -44,14 +44,14 @@ copyright   =
 module = dcop
 
 timeline   = KDE_3_0_0 KDE_3_0_1 KDE_3_0_3 KDE_3_1_0 KDE_3_1_1 KDE_3_1_2 KDE_3_1_3 KDE_3_1_4 KDE_3_1_5 KDE_3_2_0 KDE_3_2_1 KDE_3_2_2 KDE_3_2_3 KDE_3_3_0 KDE_3_3_1 KDE_3_3_2 KDE_3_4_0 KDE_3_4_1 KDE_3_4_2 KDE_3_4_3 KDE_3_5_0 KDE_3_5_1 KDE_3_5_2 KDE_3_5_3
-source     = $SRC/dcop $DST/extra/trinity53/dcop
+source     = $SRC/dcop $DST/extra/kde353/dcop
 ignore     = dcopc.h dcopserver.h dcopsignals.h kdatastream.h dcoptypes.h
-compare    = $COMP $DST/extra/trinity53/dcop
-subst      = $DST/extra/trinity53
+compare    = $COMP $DST/extra/kde353/dcop
+subst      = $DST/extra/kde353
 import     = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 importpath = $IMP
 sipslot    = callBackObj callBackSlot dcopClient
-include    = ../extra/trinity53/dcop
+include    = ../extra/kde353/dcop
 libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lDCOP
 define     = "KDE_DEPRECATED", ""
 define     = "DCOP_EXPORT", ""
@@ -71,8 +71,8 @@ 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 kdelibs_export.h
 ignore     = kswap.h
-compare    = $COMP $DST/extra/trinity53
-subst      = $DST/extra/trinity53
+compare    = $COMP $DST/extra/kde353
+subst      = $DST/extra/kde353
 import     = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = dcop
 importpath = $IMP
@@ -101,7 +101,7 @@ module = kdesu
 source     = $SRC/kdesu
 ignore     =
 compare    = $COMP/kdesu
-subst      = $DST/extra/trinity53
+subst      = $DST/extra/kde353
 import     = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = dcop
 import     = kdecore
@@ -121,7 +121,7 @@ module = kdefx
 ignore     =
 source     = $SRC/kdefx
 compare    = $COMP
-subst      = $DST/extra/trinity53
+subst      = $DST/extra/kde353
 import     = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = dcop
 import     = kdecore
@@ -144,7 +144,7 @@ source     = $SRC/kdeui/
 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
 compare    = $COMP
-subst      = $DST/extra/trinity53
+subst      = $DST/extra/kde353
 import     = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = qtxmlmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = dcop
@@ -170,11 +170,11 @@ retain
 
 module = kio
 
-source     = $SRC/kio/kio  $DST/extra/trinity53/kio
+source     = $SRC/kio/kio  $DST/extra/kde353/kio
 ignore     = kmdbase.h uiserver_stub.h kdirnotify_stub.h uiserver.h http_slave_defaults.h ioslave_defaults.h
 ignore     = kmimetyperesolver.h
 compare    = $COMP  $COMP/kio
-subst      = $DST/extra/trinity53
+subst      = $DST/extra/kde353
 import     = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = qtxmlmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = dcop
@@ -184,7 +184,7 @@ import     = kdeui
 importpath = $IMP
 amend      = * ctor parent /TransferThis/
 amend      = * all parent /Transfer/
-include    = ../extra/trinity53/kio @KDE_INCLUDEPATH@/kio ../kdecore
+include    = ../extra/kde353/kio @KDE_INCLUDEPATH@/kio ../kdecore
 libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lDCOP -lkio -lkdeui -lkdecore -ldcopcmodule\
              -lkdecorecmodule -lkdeuicmodule
 sipslot    =
@@ -248,7 +248,7 @@ module = kutils
 source     = $SRC/kutils/
 ignore     =
 compare    = $COMP
-subst      = $DST/extra/trinity53
+subst      = $DST/extra/kde353
 ignore     = kcmodulecontainer.h
 import     = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = dcopmod.sip
@@ -276,7 +276,7 @@ module = kfile
 source     = $SRC/kio/kfile
 ignore     = kpropsdlg.h
 compare    = $COMP  $COMP/kio
-subst      = $DST/extra/trinity53
+subst      = $DST/extra/kde353
 import     = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = qtxmlmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = dcop
@@ -300,7 +300,7 @@ module = kparts
 source     = $SRC/kparts
 ignore     = componentfactory.h
 compare    = $COMP/kparts
-subst      = $DST/extra/trinity53
+subst      = $DST/extra/kde353
 import     = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = qtxmlmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = dcop
@@ -324,7 +324,7 @@ module = khtml
 source     = $SRC/khtml $SRC/khtml/dom
 ignore     = khtmldefaults.h dom_core.h dom_html.h khtml_events.h
 compare    = $COMP  $COMP/dom
-subst      = $DST/extra/trinity53
+subst      = $DST/extra/kde353
 import     = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = qtxmlmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = dcop
@@ -351,8 +351,8 @@ retain
 
 //source     = $SRC/kjs
 //ignore     = global.h
-//compare    = $COMP/kjs $DST/extra/trinity53
-//subst      = $DST/extra/trinity53
+//compare    = $COMP/kjs $DST/extra/kde353
+//subst      = $DST/extra/kde353
 //import     = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 //import     = qtxmlmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 //import     = dcop
@@ -377,9 +377,9 @@ retain
 module = kspell
 
 ignore     =
-source     = $DST/extra/trinity53/kspell
+source     = $DST/extra/kde353/kspell
 compare    = $COMP
-subst      = $DST/extra/trinity53
+subst      = $DST/extra/kde353
 import     = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = qtxmlmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = dcop
@@ -411,7 +411,7 @@ module = kdeprint
 ignore     = driver.h
 source     = $SRC/kdeprint
 compare    = $COMP $COMP/kdeprint
-subst      = $DST/extra/trinity53
+subst      = $DST/extra/kde353
 import     = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = qtxmlmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = dcop
@@ -434,7 +434,7 @@ module = kmdi
 source     = $SRC/kmdi/
 ignore     =
 compare    = $COMP
-subst      = $DST/extra/trinity53
+subst      = $DST/extra/kde353
 import     = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 import     = dcopmod.sip
 import     = kdecoremod.sip
@@ -464,7 +464,7 @@ retain
 //source     = $SRC/kspell2/
 //ignore     =
 //compare    = $COMP
-//subst      = $DST/extra/trinity53
+//subst      = $DST/extra/kde353
 //import     = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
 //import     = dcopmod.sip
 //import     = kdecoremod.sip
diff --git a/pykdeconfig.py b/pykdeconfig.py
index c8a922d..1ec43f8 100644
--- a/pykdeconfig.py
+++ b/pykdeconfig.py
@@ -29,8 +29,8 @@ import sipconfig, pyqtconfig
 _pkg_config = {
     'dist_name':            '',
     'kde_version':          0x030503,
-    'kde_version_extra':    'trinity53',
-    'kde_version_sfx':      '-trinity53.diff',
+    'kde_version_extra':    'kde353',
+    'kde_version_sfx':      '-kde353.diff',
     'kde_version_str':      '3.5.3',
     'kdebasedir':           '/opt/trinity',
     'kdeincdir':            '/opt/trinity/include',
diff --git a/sip/kdecore/kuser.sip b/sip/kdecore/kuser.sip
index 751ab17..d79ea99 100644
--- a/sip/kdecore/kuser.sip
+++ b/sip/kdecore/kuser.sip
@@ -29,7 +29,7 @@
 class KUser
 {
 %TypeHeaderCode
-#include <../extra/trinity20/ksharedptr.h>
+#include <../extra/kde320/ksharedptr.h>
 #include <kuser.h>
 %End