From 8ae3c4904db32deba84086547459669d52fcc7e0 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Sun, 21 Aug 2011 01:43:11 +0000
Subject: Convert remaining references to kde3 (e.g. in paths) to trinity

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/digikam@1248408 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 ChangeLog                 | 2452 ++++++++++++++++++++++-----------------------
 acinclude.m4              |   40 +-
 digikam/PACKAGING         |    2 +-
 digikam/project/PACKAGING |    2 +-
 4 files changed, 1248 insertions(+), 1248 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bff37d80..4787af44 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -186,7 +186,7 @@
 
 	* utilities/imageeditor/editor/editortooliface.cpp,
 	  utilities/imageeditor/editor/editortooliface.h: backport commit
-	  #929686 to kde3 branch
+	  #929686 to trinity branch
 	  BUG: 182212
 
 2009-02-19 14:05  cgilles
@@ -5958,13 +5958,13 @@
 
 2008-04-26 07:44  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/NEWS: update
+        * /branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2008-04-25 11:03  abaecker
 
-        * /branches/extragear/kde3/graphics/digikam/NEWS,
-          /branches/extragear/kde3/graphics/digikam/libs/widgets/common/statuszoombar.cpp,
-          /branches/extragear/kde3/graphics/digikam/libs/widgets/common/statuszoombar.h:
+        * /branches/extragear/trinity/graphics/digikam/NEWS,
+          /branches/extragear/trinity/graphics/digikam/libs/widgets/common/statuszoombar.cpp,
+          /branches/extragear/trinity/graphics/digikam/libs/widgets/common/statuszoombar.h:
           Enforce consistent behaviour when using the mouse wheel over the
           zoom slider.
 
@@ -5973,32 +5973,32 @@
 
 2008-04-25 10:18  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/digikam/iconview.cpp:
+        * /branches/extragear/trinity/graphics/digikam/digikam/iconview.cpp:
           patch from Marcel to force updating of status bar with selection
           CCBUGS: 161084
 
 2008-04-24 11:24  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/NEWS: update
+        * /branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2008-04-24 08:42  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/libs/widgets/common/previewwidget.cpp:
+        * /branches/extragear/trinity/graphics/digikam/libs/widgets/common/previewwidget.cpp:
           polish
 
 2008-04-24 07:45  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/libs/widgets/common/previewwidget.cpp:
+        * /branches/extragear/trinity/graphics/digikam/libs/widgets/common/previewwidget.cpp:
           use const iterator
 
 2008-04-24 07:35  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/libs/widgets/common/previewwidget.cpp:
+        * /branches/extragear/trinity/graphics/digikam/libs/widgets/common/previewwidget.cpp:
           polish
 
 2008-04-24 07:27  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/libs/widgets/common/previewwidget.cpp:
+        * /branches/extragear/trinity/graphics/digikam/libs/widgets/common/previewwidget.cpp:
           always use ++it or --it with Qt iterator, not it++ and it--.
           see http://doc.trolltech.com/3.3/qt-template-lib.html into
           Iterator section.
@@ -6006,7 +6006,7 @@
 
 2008-04-24 06:09  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/libs/dimg/loaders/tiffloader.cpp:
+        * /branches/extragear/trinity/graphics/digikam/libs/dimg/loaders/tiffloader.cpp:
           Enable by default TIFF metadata support with DIMG loader.
           Exiv2 tiff writting mode is experimental in a dedicated branches
           of svn.
@@ -6014,14 +6014,14 @@
 
 2008-04-23 18:21  abaecker
 
-        * /branches/extragear/kde3/graphics/digikam/NEWS,
-          /branches/extragear/kde3/graphics/digikam/digikam/albumwidgetstack.cpp,
-          /branches/extragear/kde3/graphics/digikam/digikam/albumwidgetstack.h,
-          /branches/extragear/kde3/graphics/digikam/digikam/digikamview.cpp,
-          /branches/extragear/kde3/graphics/digikam/libs/widgets/common/previewwidget.cpp,
-          /branches/extragear/kde3/graphics/digikam/libs/widgets/common/previewwidget.h,
-          /branches/extragear/kde3/graphics/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp,
-          /branches/extragear/kde3/graphics/digikam/utilities/lighttable/lighttableview.cpp:
+        * /branches/extragear/trinity/graphics/digikam/NEWS,
+          /branches/extragear/trinity/graphics/digikam/digikam/albumwidgetstack.cpp,
+          /branches/extragear/trinity/graphics/digikam/digikam/albumwidgetstack.h,
+          /branches/extragear/trinity/graphics/digikam/digikam/digikamview.cpp,
+          /branches/extragear/trinity/graphics/digikam/libs/widgets/common/previewwidget.cpp,
+          /branches/extragear/trinity/graphics/digikam/libs/widgets/common/previewwidget.h,
+          /branches/extragear/trinity/graphics/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp,
+          /branches/extragear/trinity/graphics/digikam/utilities/lighttable/lighttableview.cpp:
           Make the zoom values of the slider snap to specific values
           (fit-to-window, 50% view, and 100% view).
           
@@ -6030,114 +6030,114 @@
 
 2008-04-23 13:58  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/NEWS: update
+        * /branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2008-04-23 13:57  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/libs/greycstoration/CImg.h,
-          /branches/extragear/kde3/graphics/digikam/libs/greycstoration/greycstoration.h:
+        * /branches/extragear/trinity/graphics/digikam/libs/greycstoration/CImg.h,
+          /branches/extragear/trinity/graphics/digikam/libs/greycstoration/greycstoration.h:
           digiKam from KDE3 branch : updated internal CImg library to 1.2.8
 
 2008-04-21 08:47  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/libs/widgets/common/dlogoaction.cpp,
-          /branches/extragear/kde3/graphics/digikam/libs/widgets/common/dlogoaction.h:
+        * /branches/extragear/trinity/graphics/digikam/libs/widgets/common/dlogoaction.cpp,
+          /branches/extragear/trinity/graphics/digikam/libs/widgets/common/dlogoaction.h:
           logo -> banner
 
 2008-04-21 08:46  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/data/pics/Makefile.am,
-          /branches/extragear/kde3/graphics/digikam/data/pics/banner-digikam.png,
-          /branches/extragear/kde3/graphics/digikam/data/pics/logo-digikam.png:
+        * /branches/extragear/trinity/graphics/digikam/data/pics/Makefile.am,
+          /branches/extragear/trinity/graphics/digikam/data/pics/banner-digikam.png,
+          /branches/extragear/trinity/graphics/digikam/data/pics/logo-digikam.png:
           logo => banner
 
 2008-04-20 13:26  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/digikam/timelinewidget.cpp:
+        * /branches/extragear/trinity/graphics/digikam/digikam/timelinewidget.cpp:
           fix color from theme
 
 2008-04-20 08:17  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/data/themes/Gray,
-          /branches/extragear/kde3/graphics/digikam/data/themes/Makefile.am,
-          /branches/extragear/kde3/graphics/digikam/data/themes/NeutralGray:
+        * /branches/extragear/trinity/graphics/digikam/data/themes/Gray,
+          /branches/extragear/trinity/graphics/digikam/data/themes/Makefile.am,
+          /branches/extragear/trinity/graphics/digikam/data/themes/NeutralGray:
           Neutral gray => gray
 
 2008-04-20 07:32  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/libs/widgets/metadata/mdkeylistviewitem.cpp:
+        * /branches/extragear/trinity/graphics/digikam/libs/widgets/metadata/mdkeylistviewitem.cpp:
           improve colors contrast with theme
 
 2008-04-18 19:39  doerr
 
-        * /branches/extragear/kde3/graphics/digikam/imageplugins/inserttext/imageeffect_inserttext.cpp:
+        * /branches/extragear/trinity/graphics/digikam/imageplugins/inserttext/imageeffect_inserttext.cpp:
           CCBUGS: 147597 Fixed 60-part2
 
 2008-04-18 19:36  doerr
 
-        * /branches/extragear/kde3/graphics/digikam/imageplugins/border/imageeffect_border.cpp,
-          /branches/extragear/kde3/graphics/digikam/imageplugins/distortionfx/imageeffect_distortionfx.cpp,
-          /branches/extragear/kde3/graphics/digikam/imageplugins/freerotation/imageeffect_freerotation.cpp,
-          /branches/extragear/kde3/graphics/digikam/imageplugins/inserttext/fontchooserwidget.cpp,
-          /branches/extragear/kde3/graphics/digikam/imageplugins/inserttext/imageeffect_inserttext.cpp,
-          /branches/extragear/kde3/graphics/digikam/imageplugins/sheartool/imageeffect_sheartool.cpp:
+        * /branches/extragear/trinity/graphics/digikam/imageplugins/border/imageeffect_border.cpp,
+          /branches/extragear/trinity/graphics/digikam/imageplugins/distortionfx/imageeffect_distortionfx.cpp,
+          /branches/extragear/trinity/graphics/digikam/imageplugins/freerotation/imageeffect_freerotation.cpp,
+          /branches/extragear/trinity/graphics/digikam/imageplugins/inserttext/fontchooserwidget.cpp,
+          /branches/extragear/trinity/graphics/digikam/imageplugins/inserttext/imageeffect_inserttext.cpp,
+          /branches/extragear/trinity/graphics/digikam/imageplugins/sheartool/imageeffect_sheartool.cpp:
           CCBUGS: 147597 Fixed 60-66
 
 2008-04-18 18:03  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/data/themes/Gray,
-          /branches/extragear/kde3/graphics/digikam/data/themes/Makefile.am,
-          /branches/extragear/kde3/graphics/digikam/data/themes/NeutralGray:
+        * /branches/extragear/trinity/graphics/digikam/data/themes/Gray,
+          /branches/extragear/trinity/graphics/digikam/data/themes/Makefile.am,
+          /branches/extragear/trinity/graphics/digikam/data/themes/NeutralGray:
           Gray => Neutral Gray
 
 2008-04-18 18:01  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/data/themes/Gray:
+        * /branches/extragear/trinity/graphics/digikam/data/themes/Gray:
           update gray color theme from Risto Saukonpaa
 
 2008-04-17 19:39  doerr
 
-        * /branches/extragear/kde3/graphics/digikam/imageplugins/blurfx/imageeffect_blurfx.cpp,
-          /branches/extragear/kde3/graphics/digikam/imageplugins/colorfx/imageeffect_colorfx.cpp,
-          /branches/extragear/kde3/graphics/digikam/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp,
-          /branches/extragear/kde3/graphics/digikam/imageplugins/distortionfx/imageeffect_distortionfx.cpp,
-          /branches/extragear/kde3/graphics/digikam/imageplugins/noisereduction/imageeffect_noisereduction.cpp,
-          /branches/extragear/kde3/graphics/digikam/imageplugins/texture/imageeffect_texture.cpp,
-          /branches/extragear/kde3/graphics/digikam/libs/dialogs/deletedialogbase.ui:
+        * /branches/extragear/trinity/graphics/digikam/imageplugins/blurfx/imageeffect_blurfx.cpp,
+          /branches/extragear/trinity/graphics/digikam/imageplugins/colorfx/imageeffect_colorfx.cpp,
+          /branches/extragear/trinity/graphics/digikam/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp,
+          /branches/extragear/trinity/graphics/digikam/imageplugins/distortionfx/imageeffect_distortionfx.cpp,
+          /branches/extragear/trinity/graphics/digikam/imageplugins/noisereduction/imageeffect_noisereduction.cpp,
+          /branches/extragear/trinity/graphics/digikam/imageplugins/texture/imageeffect_texture.cpp,
+          /branches/extragear/trinity/graphics/digikam/libs/dialogs/deletedialogbase.ui:
           CCBUGS: 147597 Fixed 55-59
 
 2008-04-17 19:13  doerr
 
-        * /branches/extragear/kde3/graphics/digikam/libs/dialogs/deletedialogbase.ui,
-          /branches/extragear/kde3/graphics/digikam/showfoto/setup/setuptooltip.cpp,
-          /branches/extragear/kde3/graphics/digikam/showfoto/showfoto.cpp,
-          /branches/extragear/kde3/graphics/digikam/utilities/imageeditor/editor/imagewindow.cpp:
+        * /branches/extragear/trinity/graphics/digikam/libs/dialogs/deletedialogbase.ui,
+          /branches/extragear/trinity/graphics/digikam/showfoto/setup/setuptooltip.cpp,
+          /branches/extragear/trinity/graphics/digikam/showfoto/showfoto.cpp,
+          /branches/extragear/trinity/graphics/digikam/utilities/imageeditor/editor/imagewindow.cpp:
           CCBUGS: 147597 Fixed 51-54
 
 2008-04-16 21:45  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/NEWS: update
+        * /branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2008-04-16 20:07  doerr
 
-        * /branches/extragear/kde3/graphics/digikam/showfoto/setup/setuptooltip.cpp,
-          /branches/extragear/kde3/graphics/digikam/utilities/setup/setuptooltip.cpp:
+        * /branches/extragear/trinity/graphics/digikam/showfoto/setup/setuptooltip.cpp,
+          /branches/extragear/trinity/graphics/digikam/utilities/setup/setuptooltip.cpp:
           CCBUGS: 147597 Fixed 47-50
 
 2008-04-16 19:37  doerr
 
-        * /branches/extragear/kde3/graphics/digikam/showfoto/setup/setupeditor.cpp,
-          /branches/extragear/kde3/graphics/digikam/showfoto/setup/setuptooltip.cpp,
-          /branches/extragear/kde3/graphics/digikam/utilities/setup/setup.cpp,
-          /branches/extragear/kde3/graphics/digikam/utilities/setup/setupeditor.cpp,
-          /branches/extragear/kde3/graphics/digikam/utilities/setup/setupslideshow.cpp,
-          /branches/extragear/kde3/graphics/digikam/utilities/setup/setuptooltip.cpp:
+        * /branches/extragear/trinity/graphics/digikam/showfoto/setup/setupeditor.cpp,
+          /branches/extragear/trinity/graphics/digikam/showfoto/setup/setuptooltip.cpp,
+          /branches/extragear/trinity/graphics/digikam/utilities/setup/setup.cpp,
+          /branches/extragear/trinity/graphics/digikam/utilities/setup/setupeditor.cpp,
+          /branches/extragear/trinity/graphics/digikam/utilities/setup/setupslideshow.cpp,
+          /branches/extragear/trinity/graphics/digikam/utilities/setup/setuptooltip.cpp:
           CCBUGS: 147597 Fixed 43-46
 
 2008-04-15 10:04  abaecker
 
-        * /branches/extragear/kde3/graphics/digikam/NEWS,
-          /branches/extragear/kde3/graphics/digikam/kioslave/digikamalbums.cpp:
+        * /branches/extragear/trinity/graphics/digikam/NEWS,
+          /branches/extragear/trinity/graphics/digikam/kioslave/digikamalbums.cpp:
           Only show folders below a given folder in recursive view mode.
           For this the whole path of a folder has to be matched from the
           beginning.
@@ -6147,107 +6147,107 @@
 
 2008-04-14 20:02  doerr
 
-        * /branches/extragear/kde3/graphics/digikam/digikam/digikamapp.cpp:
+        * /branches/extragear/trinity/graphics/digikam/digikam/digikamapp.cpp:
           CCBUGS: 147597 Fixed 37-part2
 
 2008-04-14 20:00  doerr
 
-        * /branches/extragear/kde3/graphics/digikam/digikam/digikamapp.cpp,
-          /branches/extragear/kde3/graphics/digikam/digikam/searchquickdialog.cpp,
-          /branches/extragear/kde3/graphics/digikam/showfoto/setup/setupeditor.cpp,
-          /branches/extragear/kde3/graphics/digikam/utilities/imageeditor/editor/editorwindow.cpp,
-          /branches/extragear/kde3/graphics/digikam/utilities/imageeditor/editor/imagewindow.cpp,
-          /branches/extragear/kde3/graphics/digikam/utilities/lighttable/lighttablewindow.cpp:
+        * /branches/extragear/trinity/graphics/digikam/digikam/digikamapp.cpp,
+          /branches/extragear/trinity/graphics/digikam/digikam/searchquickdialog.cpp,
+          /branches/extragear/trinity/graphics/digikam/showfoto/setup/setupeditor.cpp,
+          /branches/extragear/trinity/graphics/digikam/utilities/imageeditor/editor/editorwindow.cpp,
+          /branches/extragear/trinity/graphics/digikam/utilities/imageeditor/editor/imagewindow.cpp,
+          /branches/extragear/trinity/graphics/digikam/utilities/lighttable/lighttablewindow.cpp:
           CCBUGS: 147597 Fixed 37-42
 
 2008-04-14 19:46  doerr
 
-        * /branches/extragear/kde3/graphics/digikam/digikam/digikamapp.cpp,
-          /branches/extragear/kde3/graphics/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp,
-          /branches/extragear/kde3/graphics/digikam/utilities/imageeditor/canvas/dimginterface.cpp:
+        * /branches/extragear/trinity/graphics/digikam/digikam/digikamapp.cpp,
+          /branches/extragear/trinity/graphics/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp,
+          /branches/extragear/trinity/graphics/digikam/utilities/imageeditor/canvas/dimginterface.cpp:
           CCBUGS: 147597 Fixed 35+36
 
 2008-04-14 19:35  doerr
 
-        * /branches/extragear/kde3/graphics/digikam/digikam/albummanager.cpp,
-          /branches/extragear/kde3/graphics/digikam/digikam/scanlib.cpp,
-          /branches/extragear/kde3/graphics/digikam/digikam/searchadvanceddialog.cpp:
+        * /branches/extragear/trinity/graphics/digikam/digikam/albummanager.cpp,
+          /branches/extragear/trinity/graphics/digikam/digikam/scanlib.cpp,
+          /branches/extragear/trinity/graphics/digikam/digikam/searchadvanceddialog.cpp:
           CCBUGS: 147597 Fixed 31, 33,34, 30+32 not found
 
 2008-04-14 05:37  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/NEWS: update
+        * /branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2008-04-13 17:01  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/NEWS: update
+        * /branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2008-04-13 06:22  doerr
 
-        * /branches/extragear/kde3/graphics/digikam/digikam/firstrun.cpp:
+        * /branches/extragear/trinity/graphics/digikam/digikam/firstrun.cpp:
           CCBUGS: 147597 Fixed 28
 
 2008-04-13 06:17  doerr
 
-        * /branches/extragear/kde3/graphics/digikam/digikam/scanlib.cpp:
+        * /branches/extragear/trinity/graphics/digikam/digikam/scanlib.cpp:
           CCBUGS: 147597 Fixed 27-29
 
 2008-04-13 06:09  doerr
 
-        * /branches/extragear/kde3/graphics/digikam/libs/widgets/imageplugins/imagewidget.cpp:
+        * /branches/extragear/trinity/graphics/digikam/libs/widgets/imageplugins/imagewidget.cpp:
           CCBUGS: 147597 Fixed 26
 
 2008-04-12 19:59  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/NEWS: update
+        * /branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2008-04-12 19:54  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/libs/widgets/metadata/metadatawidget.cpp:
+        * /branches/extragear/trinity/graphics/digikam/libs/widgets/metadata/metadatawidget.cpp:
           fix layout
 
 2008-04-12 18:25  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/libs/widgets/iccprofiles/iccprofilewidget.cpp,
-          /branches/extragear/kde3/graphics/digikam/libs/widgets/iccprofiles/iccprofilewidget.h,
-          /branches/extragear/kde3/graphics/digikam/libs/widgets/metadata/Makefile.am,
-          /branches/extragear/kde3/graphics/digikam/libs/widgets/metadata/exifwidget.cpp,
-          /branches/extragear/kde3/graphics/digikam/libs/widgets/metadata/exifwidget.h,
-          /branches/extragear/kde3/graphics/digikam/libs/widgets/metadata/gpswidget.cpp,
-          /branches/extragear/kde3/graphics/digikam/libs/widgets/metadata/gpswidget.h,
-          /branches/extragear/kde3/graphics/digikam/libs/widgets/metadata/iptcwidget.cpp,
-          /branches/extragear/kde3/graphics/digikam/libs/widgets/metadata/iptcwidget.h,
-          /branches/extragear/kde3/graphics/digikam/libs/widgets/metadata/makernotewidget.cpp,
-          /branches/extragear/kde3/graphics/digikam/libs/widgets/metadata/makernotewidget.h,
-          /branches/extragear/kde3/graphics/digikam/libs/widgets/metadata/metadatalistview.cpp,
-          /branches/extragear/kde3/graphics/digikam/libs/widgets/metadata/metadatalistview.h,
-          /branches/extragear/kde3/graphics/digikam/libs/widgets/metadata/metadatawidget.cpp,
-          /branches/extragear/kde3/graphics/digikam/libs/widgets/metadata/metadatawidget.h,
-          /branches/extragear/kde3/graphics/digikam/libs/widgets/metadata/worldmapwidget.cpp,
-          /branches/extragear/kde3/graphics/digikam/libs/widgets/metadata/worldmapwidget.h:
+        * /branches/extragear/trinity/graphics/digikam/libs/widgets/iccprofiles/iccprofilewidget.cpp,
+          /branches/extragear/trinity/graphics/digikam/libs/widgets/iccprofiles/iccprofilewidget.h,
+          /branches/extragear/trinity/graphics/digikam/libs/widgets/metadata/Makefile.am,
+          /branches/extragear/trinity/graphics/digikam/libs/widgets/metadata/exifwidget.cpp,
+          /branches/extragear/trinity/graphics/digikam/libs/widgets/metadata/exifwidget.h,
+          /branches/extragear/trinity/graphics/digikam/libs/widgets/metadata/gpswidget.cpp,
+          /branches/extragear/trinity/graphics/digikam/libs/widgets/metadata/gpswidget.h,
+          /branches/extragear/trinity/graphics/digikam/libs/widgets/metadata/iptcwidget.cpp,
+          /branches/extragear/trinity/graphics/digikam/libs/widgets/metadata/iptcwidget.h,
+          /branches/extragear/trinity/graphics/digikam/libs/widgets/metadata/makernotewidget.cpp,
+          /branches/extragear/trinity/graphics/digikam/libs/widgets/metadata/makernotewidget.h,
+          /branches/extragear/trinity/graphics/digikam/libs/widgets/metadata/metadatalistview.cpp,
+          /branches/extragear/trinity/graphics/digikam/libs/widgets/metadata/metadatalistview.h,
+          /branches/extragear/trinity/graphics/digikam/libs/widgets/metadata/metadatawidget.cpp,
+          /branches/extragear/trinity/graphics/digikam/libs/widgets/metadata/metadatawidget.h,
+          /branches/extragear/trinity/graphics/digikam/libs/widgets/metadata/worldmapwidget.cpp,
+          /branches/extragear/trinity/graphics/digikam/libs/widgets/metadata/worldmapwidget.h:
           backport commits #795989 and #795898 from trunk
 
 2008-04-12 13:31  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/utilities/lighttable/lighttablepreview.cpp,
-          /branches/extragear/kde3/graphics/digikam/utilities/lighttable/lighttablepreview.h:
+        * /branches/extragear/trinity/graphics/digikam/utilities/lighttable/lighttablepreview.cpp,
+          /branches/extragear/trinity/graphics/digikam/utilities/lighttable/lighttablepreview.h:
           use const ref
 
 2008-04-12 13:27  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/utilities/imageeditor/canvas/canvas.cpp,
-          /branches/extragear/kde3/graphics/digikam/utilities/imageeditor/canvas/canvas.h:
+        * /branches/extragear/trinity/graphics/digikam/utilities/imageeditor/canvas/canvas.cpp,
+          /branches/extragear/trinity/graphics/digikam/utilities/imageeditor/canvas/canvas.h:
           use const ref
 
 2008-04-12 13:23  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/digikam/imagepreviewview.cpp,
-          /branches/extragear/kde3/graphics/digikam/digikam/imagepreviewview.h:
+        * /branches/extragear/trinity/graphics/digikam/digikam/imagepreviewview.cpp,
+          /branches/extragear/trinity/graphics/digikam/digikam/imagepreviewview.h:
           use const ref
 
 2008-04-12 12:22  abaecker
 
-        * /branches/extragear/kde3/graphics/digikam/digikam/digikamapp.cpp:
+        * /branches/extragear/trinity/graphics/digikam/digikam/digikamapp.cpp:
           Use SHIFT+Space to go to the previous image in the icon view.
 
           CCBUGS: 145083
@@ -6255,106 +6255,106 @@
 
 2008-04-12 08:14  doerr
 
-        * /branches/extragear/kde3/graphics/digikam/libs/widgets/imageplugins/imagewidget.cpp:
+        * /branches/extragear/trinity/graphics/digikam/libs/widgets/imageplugins/imagewidget.cpp:
           CCBUGS: 147597 Fixed 25
 
 2008-04-12 07:17  doerr
 
-        * /branches/extragear/kde3/graphics/digikam/libs/widgets/iccprofiles/iccprofilewidget.cpp:
+        * /branches/extragear/trinity/graphics/digikam/libs/widgets/iccprofiles/iccprofilewidget.cpp:
           CCBUGS: 147597 Fixed 21+22
 
 2008-04-12 06:08  doerr
 
-        * /branches/extragear/kde3/graphics/digikam/digikam/digikamapp.cpp,
-          /branches/extragear/kde3/graphics/digikam/libs/widgets/metadata/metadatawidget.cpp:
+        * /branches/extragear/trinity/graphics/digikam/digikam/digikamapp.cpp,
+          /branches/extragear/trinity/graphics/digikam/libs/widgets/metadata/metadatawidget.cpp:
           CCBUGS: 147597 Fixed 20
 
 2008-04-12 06:01  doerr
 
-        * /branches/extragear/kde3/graphics/digikam/libs/greycstoration/greycstorationwidget.cpp:
+        * /branches/extragear/trinity/graphics/digikam/libs/greycstoration/greycstorationwidget.cpp:
           CCBUGS: 147597 Fixed 19
 
 2008-04-12 05:54  doerr
 
-        * /branches/extragear/kde3/graphics/digikam/libs/greycstoration/greycstorationwidget.cpp:
+        * /branches/extragear/trinity/graphics/digikam/libs/greycstoration/greycstorationwidget.cpp:
           CCBUGS: 147597 Fixed 16 and 17
 
 2008-04-12 05:48  doerr
 
-        * /branches/extragear/kde3/graphics/digikam/libs/greycstoration/greycstorationwidget.cpp:
+        * /branches/extragear/trinity/graphics/digikam/libs/greycstoration/greycstorationwidget.cpp:
           CCBUGS: 147597 Fixed 15 and 18, could not find 16+17
 
 2008-04-12 05:38  doerr
 
-        * /branches/extragear/kde3/graphics/digikam/libs/dialogs/imageguidedlg.cpp,
-          /branches/extragear/kde3/graphics/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp:
+        * /branches/extragear/trinity/graphics/digikam/libs/dialogs/imageguidedlg.cpp,
+          /branches/extragear/trinity/graphics/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp:
           CCBUGS: 147597 Fixed 14
 
 2008-04-11 12:17  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/utilities/cameragui/albumselectdialog.cpp:
+        * /branches/extragear/trinity/graphics/digikam/utilities/cameragui/albumselectdialog.cpp:
           backport commit #795761 from trunk
 
 2008-04-11 12:04  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/utilities/cameragui/albumselectdialog.h:
+        * /branches/extragear/trinity/graphics/digikam/utilities/cameragui/albumselectdialog.h:
           polish
 
 2008-04-11 12:01  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/utilities/cameragui/albumselectdialog.h:
+        * /branches/extragear/trinity/graphics/digikam/utilities/cameragui/albumselectdialog.h:
           polish
 
 2008-04-11 09:37  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/digikam/imagepreviewview.cpp:
+        * /branches/extragear/trinity/graphics/digikam/digikam/imagepreviewview.cpp:
           fix broken signal
 
 2008-04-11 09:33  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/utilities/imageeditor/canvas/canvas.cpp:
+        * /branches/extragear/trinity/graphics/digikam/utilities/imageeditor/canvas/canvas.cpp:
           fix broken signal
 
 2008-04-11 09:30  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/utilities/lighttable/lighttablepreview.cpp:
+        * /branches/extragear/trinity/graphics/digikam/utilities/lighttable/lighttablepreview.cpp:
           fix broken signal
 
 2008-04-11 07:32  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/NEWS: update
+        * /branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2008-04-11 07:31  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/NEWS: update
+        * /branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2008-04-10 11:24  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/NEWS: update
+        * /branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2008-04-10 11:22  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/NEWS: update
+        * /branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2008-04-10 11:21  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/NEWS: update
+        * /branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2008-04-10 11:20  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/NEWS: update
+        * /branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2008-04-10 11:18  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/NEWS: update
+        * /branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2008-04-10 11:10  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/NEWS: update
+        * /branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2008-04-10 08:57  abaecker
 
-        * /branches/extragear/kde3/graphics/digikam/utilities/lighttable/lighttablewindow.cpp:
+        * /branches/extragear/trinity/graphics/digikam/utilities/lighttable/lighttablewindow.cpp:
           Use SHIFT+Space to go to the previous image in the light-table.
           
           CCBUGS: 145083
@@ -6362,8 +6362,8 @@
 
 2008-04-10 08:07  abaecker
 
-        * /branches/extragear/kde3/graphics/digikam/NEWS,
-          /branches/extragear/kde3/graphics/digikam/utilities/imageeditor/editor/editorwindow.cpp:
+        * /branches/extragear/trinity/graphics/digikam/NEWS,
+          /branches/extragear/trinity/graphics/digikam/utilities/imageeditor/editor/editorwindow.cpp:
           Use SHIFT+Space to go to the previous image in the image editor.
           
           CCBUGS: 145083
@@ -6371,13 +6371,13 @@
 
 2008-04-09 19:00  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/data/pics/menusidepixmap.png:
+        * /branches/extragear/trinity/graphics/digikam/data/pics/menusidepixmap.png:
           fix
 
 2008-04-09 10:52  abaecker
 
-        * /branches/extragear/kde3/graphics/digikam/NEWS,
-          /branches/extragear/kde3/graphics/digikam/digikam/albummanager.cpp:
+        * /branches/extragear/trinity/graphics/digikam/NEWS,
+          /branches/extragear/trinity/graphics/digikam/digikam/albummanager.cpp:
           By using KURL::fromPathOrURL instead of just KURL to construct
           the path when moving a directory proper escaping of # is ensured.
           
@@ -6386,52 +6386,52 @@
 
 2008-04-08 22:35  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/libs/widgets/common/searchtextbar.cpp:
+        * /branches/extragear/trinity/graphics/digikam/libs/widgets/common/searchtextbar.cpp:
           polish
 
 2008-04-08 22:03  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/digikam/albumiconviewfilter.cpp,
-          /branches/extragear/kde3/graphics/digikam/digikam/digikamview.cpp,
-          /branches/extragear/kde3/graphics/digikam/digikam/searchquickdialog.cpp,
-          /branches/extragear/kde3/graphics/digikam/digikam/searchquickdialog.h,
-          /branches/extragear/kde3/graphics/digikam/digikam/tageditdlg.cpp,
-          /branches/extragear/kde3/graphics/digikam/digikam/timelineview.cpp,
-          /branches/extragear/kde3/graphics/digikam/libs/dialogs/rawcameradlg.cpp,
-          /branches/extragear/kde3/graphics/digikam/libs/imageproperties/imagedescedittab.cpp,
-          /branches/extragear/kde3/graphics/digikam/libs/widgets/common/searchtextbar.cpp,
-          /branches/extragear/kde3/graphics/digikam/libs/widgets/common/searchtextbar.h,
-          /branches/extragear/kde3/graphics/digikam/utilities/setup/cameraselection.cpp:
+        * /branches/extragear/trinity/graphics/digikam/digikam/albumiconviewfilter.cpp,
+          /branches/extragear/trinity/graphics/digikam/digikam/digikamview.cpp,
+          /branches/extragear/trinity/graphics/digikam/digikam/searchquickdialog.cpp,
+          /branches/extragear/trinity/graphics/digikam/digikam/searchquickdialog.h,
+          /branches/extragear/trinity/graphics/digikam/digikam/tageditdlg.cpp,
+          /branches/extragear/trinity/graphics/digikam/digikam/timelineview.cpp,
+          /branches/extragear/trinity/graphics/digikam/libs/dialogs/rawcameradlg.cpp,
+          /branches/extragear/trinity/graphics/digikam/libs/imageproperties/imagedescedittab.cpp,
+          /branches/extragear/trinity/graphics/digikam/libs/widgets/common/searchtextbar.cpp,
+          /branches/extragear/trinity/graphics/digikam/libs/widgets/common/searchtextbar.h,
+          /branches/extragear/trinity/graphics/digikam/utilities/setup/cameraselection.cpp:
           digiKam from KDE3 branch : Save and Restore auto-completion
           settings with all Search text widget between program sessions.
 
 2008-04-08 15:18  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/digikam/version.h:
+        * /branches/extragear/trinity/graphics/digikam/digikam/version.h:
           update
 
 2008-04-08 15:18  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/digikam.lsm: update
+        * /branches/extragear/trinity/graphics/digikam/digikam.lsm: update
 
 2008-04-08 11:34  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/NEWS: update
+        * /branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2008-04-08 10:47  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/utilities/setup/cameraselection.cpp,
-          /branches/extragear/kde3/graphics/digikam/utilities/setup/cameraselection.h:
+        * /branches/extragear/trinity/graphics/digikam/utilities/setup/cameraselection.cpp,
+          /branches/extragear/trinity/graphics/digikam/utilities/setup/cameraselection.h:
           polish
 
 2008-04-08 10:39  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/NEWS: update
+        * /branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2008-04-08 10:37  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/utilities/setup/cameraselection.cpp,
-          /branches/extragear/kde3/graphics/digikam/utilities/setup/cameraselection.h:
+        * /branches/extragear/trinity/graphics/digikam/utilities/setup/cameraselection.cpp,
+          /branches/extragear/trinity/graphics/digikam/utilities/setup/cameraselection.h:
           digiKam from KDE3 branch : added search text bar to easy find a
           camera make/model from the huge list provided by libgphoto2.
           There is no way with libgphoto2 to separate camera make/model.
@@ -6444,187 +6444,187 @@
 
 2008-04-08 07:07  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/libs/widgets/common/searchtextbar.cpp:
+        * /branches/extragear/trinity/graphics/digikam/libs/widgets/common/searchtextbar.cpp:
           better color contrast
 
 2008-04-08 06:21  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/libs/dialogs/rawcameradlg.cpp:
+        * /branches/extragear/trinity/graphics/digikam/libs/dialogs/rawcameradlg.cpp:
           fix layout
 
 2008-04-07 21:17  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/libs/dialogs/rawcameradlg.cpp:
+        * /branches/extragear/trinity/graphics/digikam/libs/dialogs/rawcameradlg.cpp:
           polish
 
 2008-04-07 21:13  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/libs/dialogs/rawcameradlg.cpp:
+        * /branches/extragear/trinity/graphics/digikam/libs/dialogs/rawcameradlg.cpp:
           revert
 
 2008-04-07 21:08  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/libs/dialogs/rawcameradlg.cpp,
-          /branches/extragear/kde3/graphics/digikam/utilities/imageeditor/editor/editorwindow.cpp,
-          /branches/extragear/kde3/graphics/digikam/utilities/lighttable/lighttablewindow.cpp:
+        * /branches/extragear/trinity/graphics/digikam/libs/dialogs/rawcameradlg.cpp,
+          /branches/extragear/trinity/graphics/digikam/utilities/imageeditor/editor/editorwindow.cpp,
+          /branches/extragear/trinity/graphics/digikam/utilities/lighttable/lighttablewindow.cpp:
           polish
 
 2008-04-07 16:26  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/NEWS: update
+        * /branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2008-04-07 16:14  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/digikam/digikamapp.cpp,
-          /branches/extragear/kde3/graphics/digikam/libs/dialogs/Makefile.am,
-          /branches/extragear/kde3/graphics/digikam/libs/dialogs/rawcameradlg.cpp,
-          /branches/extragear/kde3/graphics/digikam/libs/dialogs/rawcameradlg.h,
-          /branches/extragear/kde3/graphics/digikam/project/project.kdevelop,
-          /branches/extragear/kde3/graphics/digikam/showfoto/Makefile.am,
-          /branches/extragear/kde3/graphics/digikam/utilities/imageeditor/editor/Makefile.am,
-          /branches/extragear/kde3/graphics/digikam/utilities/imageeditor/editor/editorwindow.cpp,
-          /branches/extragear/kde3/graphics/digikam/utilities/lighttable/lighttablewindow.cpp:
+        * /branches/extragear/trinity/graphics/digikam/digikam/digikamapp.cpp,
+          /branches/extragear/trinity/graphics/digikam/libs/dialogs/Makefile.am,
+          /branches/extragear/trinity/graphics/digikam/libs/dialogs/rawcameradlg.cpp,
+          /branches/extragear/trinity/graphics/digikam/libs/dialogs/rawcameradlg.h,
+          /branches/extragear/trinity/graphics/digikam/project/project.kdevelop,
+          /branches/extragear/trinity/graphics/digikam/showfoto/Makefile.am,
+          /branches/extragear/trinity/graphics/digikam/utilities/imageeditor/editor/Makefile.am,
+          /branches/extragear/trinity/graphics/digikam/utilities/imageeditor/editor/editorwindow.cpp,
+          /branches/extragear/trinity/graphics/digikam/utilities/lighttable/lighttablewindow.cpp:
           digiKam from KDE3 branch : new RAW camera list dialog with search
           camera model tool.
 
 2008-04-07 07:19  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/ChangeLog: update
+        * /branches/extragear/trinity/graphics/digikam/ChangeLog: update
 
 2008-04-07 06:40  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/release_digikam.rb:
+        * /branches/extragear/trinity/graphics/digikam/release_digikam.rb:
           update
 
 2008-04-07 06:37  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/digikam.lsm: update
+        * /branches/extragear/trinity/graphics/digikam/digikam.lsm: update
 
 0.9.4-beta3 2008-04-07
 -------------------------------------------------------------------------
 2008-04-03 13:40  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/NEWS: update
+        * /branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2008-04-01 19:33  doerr
 
-        * /branches/extragear/kde3/graphics/digikam/libs/dialogs/deletedialog.cpp:
+        * /branches/extragear/trinity/graphics/digikam/libs/dialogs/deletedialog.cpp:
           CCBUGS: 147597
 
 2008-04-01 19:28  doerr
 
-        * /branches/extragear/kde3/graphics/digikam/libs/dialogs/deletedialog.cpp:
+        * /branches/extragear/trinity/graphics/digikam/libs/dialogs/deletedialog.cpp:
           CCBUGS: 147597
 
 2008-04-01 19:24  doerr
 
-        * /branches/extragear/kde3/graphics/digikam/digikam/ratingfilter.cpp,
-          /branches/extragear/kde3/graphics/digikam/imageplugins/blurfx/imageeffect_blurfx.cpp,
-          /branches/extragear/kde3/graphics/digikam/imageplugins/border/imageeffect_border.cpp,
-          /branches/extragear/kde3/graphics/digikam/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp,
-          /branches/extragear/kde3/graphics/digikam/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp,
-          /branches/extragear/kde3/graphics/digikam/imageplugins/distortionfx/imageeffect_distortionfx.cpp,
-          /branches/extragear/kde3/graphics/digikam/utilities/setup/cameraselection.cpp,
-          /branches/extragear/kde3/graphics/digikam/utilities/setup/setupgeneral.cpp,
-          /branches/extragear/kde3/graphics/digikam/utilities/setup/setupicc.cpp:
+        * /branches/extragear/trinity/graphics/digikam/digikam/ratingfilter.cpp,
+          /branches/extragear/trinity/graphics/digikam/imageplugins/blurfx/imageeffect_blurfx.cpp,
+          /branches/extragear/trinity/graphics/digikam/imageplugins/border/imageeffect_border.cpp,
+          /branches/extragear/trinity/graphics/digikam/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp,
+          /branches/extragear/trinity/graphics/digikam/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp,
+          /branches/extragear/trinity/graphics/digikam/imageplugins/distortionfx/imageeffect_distortionfx.cpp,
+          /branches/extragear/trinity/graphics/digikam/utilities/setup/cameraselection.cpp,
+          /branches/extragear/trinity/graphics/digikam/utilities/setup/setupgeneral.cpp,
+          /branches/extragear/trinity/graphics/digikam/utilities/setup/setupicc.cpp:
           CCBUGS: 147597
 
 2008-04-01 19:19  doerr
 
-        * /branches/extragear/kde3/graphics/digikam/imageplugins/adjustlevels/adjustlevels.cpp,
-          /branches/extragear/kde3/graphics/digikam/imageplugins/freerotation/imageeffect_freerotation.cpp,
-          /branches/extragear/kde3/graphics/digikam/imageplugins/inpainting/imageeffect_inpainting.cpp,
-          /branches/extragear/kde3/graphics/digikam/imageplugins/inserttext/imageeffect_inserttext.cpp,
-          /branches/extragear/kde3/graphics/digikam/imageplugins/restoration/imageeffect_restoration.cpp,
-          /branches/extragear/kde3/graphics/digikam/utilities/cameragui/cameraui.cpp:
+        * /branches/extragear/trinity/graphics/digikam/imageplugins/adjustlevels/adjustlevels.cpp,
+          /branches/extragear/trinity/graphics/digikam/imageplugins/freerotation/imageeffect_freerotation.cpp,
+          /branches/extragear/trinity/graphics/digikam/imageplugins/inpainting/imageeffect_inpainting.cpp,
+          /branches/extragear/trinity/graphics/digikam/imageplugins/inserttext/imageeffect_inserttext.cpp,
+          /branches/extragear/trinity/graphics/digikam/imageplugins/restoration/imageeffect_restoration.cpp,
+          /branches/extragear/trinity/graphics/digikam/utilities/cameragui/cameraui.cpp:
           CCBUGS: 147597
 
 2008-04-01 18:47  doerr
 
-        * /branches/extragear/kde3/graphics/digikam/libs/imageproperties/imagepropertiescolorstab.cpp:
+        * /branches/extragear/trinity/graphics/digikam/libs/imageproperties/imagepropertiescolorstab.cpp:
           CCBUGS: 147597
 
 2008-04-01 18:45  doerr
 
-        * /branches/extragear/kde3/graphics/digikam/imageplugins/adjustcurves/adjustcurves.cpp,
-          /branches/extragear/kde3/graphics/digikam/imageplugins/channelmixer/channelmixer.cpp,
-          /branches/extragear/kde3/graphics/digikam/imageplugins/colorfx/imageeffect_colorfx.cpp,
-          /branches/extragear/kde3/graphics/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp:
+        * /branches/extragear/trinity/graphics/digikam/imageplugins/adjustcurves/adjustcurves.cpp,
+          /branches/extragear/trinity/graphics/digikam/imageplugins/channelmixer/channelmixer.cpp,
+          /branches/extragear/trinity/graphics/digikam/imageplugins/colorfx/imageeffect_colorfx.cpp,
+          /branches/extragear/trinity/graphics/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp:
           CCBUGS: 147597
 
 2008-04-01 18:39  doerr
 
-        * /branches/extragear/kde3/graphics/digikam/imageplugins/coreplugin/imageeffect_autocorrection.cpp,
-          /branches/extragear/kde3/graphics/digikam/imageplugins/coreplugin/imageeffect_bcg.cpp,
-          /branches/extragear/kde3/graphics/digikam/imageplugins/coreplugin/imageeffect_bwsepia.cpp,
-          /branches/extragear/kde3/graphics/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp,
-          /branches/extragear/kde3/graphics/digikam/imageplugins/coreplugin/imageeffect_redeye.cpp,
-          /branches/extragear/kde3/graphics/digikam/imageplugins/coreplugin/imageeffect_rgb.cpp:
+        * /branches/extragear/trinity/graphics/digikam/imageplugins/coreplugin/imageeffect_autocorrection.cpp,
+          /branches/extragear/trinity/graphics/digikam/imageplugins/coreplugin/imageeffect_bcg.cpp,
+          /branches/extragear/trinity/graphics/digikam/imageplugins/coreplugin/imageeffect_bwsepia.cpp,
+          /branches/extragear/trinity/graphics/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp,
+          /branches/extragear/trinity/graphics/digikam/imageplugins/coreplugin/imageeffect_redeye.cpp,
+          /branches/extragear/trinity/graphics/digikam/imageplugins/coreplugin/imageeffect_rgb.cpp:
           CCBUGS: 147597
 
 2008-04-01 18:34  doerr
 
-        * /branches/extragear/kde3/graphics/digikam/imageplugins/coreplugin/hsl/imageeffect_hsl.cpp:
+        * /branches/extragear/trinity/graphics/digikam/imageplugins/coreplugin/hsl/imageeffect_hsl.cpp:
           CCBUGS: 147597
 
 2008-04-01 18:30  doerr
 
-        * /branches/extragear/kde3/graphics/digikam/digikam/timelineview.cpp:
+        * /branches/extragear/trinity/graphics/digikam/digikam/timelineview.cpp:
           CCBUGS: 147597
 
 2008-03-31 21:07  doerr
 
-        * /branches/extragear/kde3/graphics/digikam/libs/imageproperties/imagedescedittab.cpp:
+        * /branches/extragear/trinity/graphics/digikam/libs/imageproperties/imagedescedittab.cpp:
           Fixed bug 147597
 
 2008-03-31 20:53  doerr
 
-        * /branches/extragear/kde3/graphics/digikam/libs/dimg/loaders/jp2ksettings.cpp:
+        * /branches/extragear/trinity/graphics/digikam/libs/dimg/loaders/jp2ksettings.cpp:
           Fix for bug 147597
 
 2008-03-31 20:46  doerr
 
-        * /branches/extragear/kde3/graphics/digikam/libs/dialogs/imagedialog.cpp:
+        * /branches/extragear/trinity/graphics/digikam/libs/dialogs/imagedialog.cpp:
           fixed typo unaviable -> unavailable
 
 2008-03-31 15:59  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/NEWS: update
+        * /branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2008-03-31 12:02  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/digikam/tageditdlg.cpp:
+        * /branches/extragear/trinity/graphics/digikam/digikam/tageditdlg.cpp:
           polish
 
 2008-03-31 11:41  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/NEWS: update
+        * /branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2008-03-31 11:29  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/libs/imageproperties/imagedescedittab.cpp:
+        * /branches/extragear/trinity/graphics/digikam/libs/imageproperties/imagedescedittab.cpp:
           polish
 
 2008-03-31 11:25  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/libs/imageproperties/imagedescedittab.h:
+        * /branches/extragear/trinity/graphics/digikam/libs/imageproperties/imagedescedittab.h:
           polish
 
 2008-03-31 11:23  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/libs/imageproperties/imagedescedittab.cpp,
-          /branches/extragear/kde3/graphics/digikam/libs/imageproperties/imagedescedittab.h:
+        * /branches/extragear/trinity/graphics/digikam/libs/imageproperties/imagedescedittab.cpp,
+          /branches/extragear/trinity/graphics/digikam/libs/imageproperties/imagedescedittab.h:
           polish
 
 2008-03-31 10:47  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/digikam/tageditdlg.cpp,
-          /branches/extragear/kde3/graphics/digikam/digikam/tageditdlg.h,
-          /branches/extragear/kde3/graphics/digikam/digikam/tagfilterview.cpp,
-          /branches/extragear/kde3/graphics/digikam/digikam/tagfolderview.cpp,
-          /branches/extragear/kde3/graphics/digikam/digikam/tagspopupmenu.cpp,
-          /branches/extragear/kde3/graphics/digikam/libs/imageproperties/imagedescedittab.cpp,
-          /branches/extragear/kde3/graphics/digikam/libs/imageproperties/imagedescedittab.h:
+        * /branches/extragear/trinity/graphics/digikam/digikam/tageditdlg.cpp,
+          /branches/extragear/trinity/graphics/digikam/digikam/tageditdlg.h,
+          /branches/extragear/trinity/graphics/digikam/digikam/tagfilterview.cpp,
+          /branches/extragear/trinity/graphics/digikam/digikam/tagfolderview.cpp,
+          /branches/extragear/trinity/graphics/digikam/digikam/tagspopupmenu.cpp,
+          /branches/extragear/trinity/graphics/digikam/libs/imageproperties/imagedescedittab.cpp,
+          /branches/extragear/trinity/graphics/digikam/libs/imageproperties/imagedescedittab.h:
           digiKam from KDE3 branch : Tag Edit Dialog is now the common
           implementation for simpler and fast Tags hierarchies entry.
           - Dialog is now redesigned. There is new text to guide user for
@@ -6639,79 +6639,79 @@
 
 2008-03-31 06:04  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/digikam/tageditdlg.cpp:
+        * /branches/extragear/trinity/graphics/digikam/digikam/tageditdlg.cpp:
           polish
 
 2008-03-31 06:01  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/digikam/tageditdlg.cpp,
-          /branches/extragear/kde3/graphics/digikam/digikam/tageditdlg.h:
+        * /branches/extragear/trinity/graphics/digikam/digikam/tageditdlg.cpp,
+          /branches/extragear/trinity/graphics/digikam/digikam/tageditdlg.h:
           polish
 
 2008-03-30 19:33  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/digikam/tageditdlg.cpp:
+        * /branches/extragear/trinity/graphics/digikam/digikam/tageditdlg.cpp:
           digiKam from KDE3 branch : start to rewritting Tag edit dialog to
           support simpler entry of tag. Not yet complete
 
 2008-03-30 17:05  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/NEWS: update
+        * /branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2008-03-30 15:05  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/digikam/Makefile.am,
-          /branches/extragear/kde3/graphics/digikam/digikam/tagcreatedlg.cpp,
-          /branches/extragear/kde3/graphics/digikam/digikam/tagcreatedlg.h,
-          /branches/extragear/kde3/graphics/digikam/digikam/tageditdlg.cpp,
-          /branches/extragear/kde3/graphics/digikam/digikam/tageditdlg.h,
-          /branches/extragear/kde3/graphics/digikam/digikam/tagfilterview.cpp,
-          /branches/extragear/kde3/graphics/digikam/digikam/tagfolderview.cpp,
-          /branches/extragear/kde3/graphics/digikam/digikam/tagspopupmenu.cpp,
-          /branches/extragear/kde3/graphics/digikam/libs/imageproperties/imagedescedittab.cpp,
-          /branches/extragear/kde3/graphics/digikam/libs/imageproperties/talbumlistview.cpp:
+        * /branches/extragear/trinity/graphics/digikam/digikam/Makefile.am,
+          /branches/extragear/trinity/graphics/digikam/digikam/tagcreatedlg.cpp,
+          /branches/extragear/trinity/graphics/digikam/digikam/tagcreatedlg.h,
+          /branches/extragear/trinity/graphics/digikam/digikam/tageditdlg.cpp,
+          /branches/extragear/trinity/graphics/digikam/digikam/tageditdlg.h,
+          /branches/extragear/trinity/graphics/digikam/digikam/tagfilterview.cpp,
+          /branches/extragear/trinity/graphics/digikam/digikam/tagfolderview.cpp,
+          /branches/extragear/trinity/graphics/digikam/digikam/tagspopupmenu.cpp,
+          /branches/extragear/trinity/graphics/digikam/libs/imageproperties/imagedescedittab.cpp,
+          /branches/extragear/trinity/graphics/digikam/libs/imageproperties/talbumlistview.cpp:
           tagcreatedlg => tageditdlg
 
 2008-03-30 15:00  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/digikam/tagcreatedlg.cpp:
+        * /branches/extragear/trinity/graphics/digikam/digikam/tagcreatedlg.cpp:
           polish
 
 2008-03-30 14:37  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/digikam/tagcreatedlg.cpp,
-          /branches/extragear/kde3/graphics/digikam/digikam/tagcreatedlg.h,
-          /branches/extragear/kde3/graphics/digikam/digikam/tagfilterview.cpp,
-          /branches/extragear/kde3/graphics/digikam/digikam/tagfolderview.cpp,
-          /branches/extragear/kde3/graphics/digikam/digikam/tagspopupmenu.cpp,
-          /branches/extragear/kde3/graphics/digikam/libs/imageproperties/imagedescedittab.cpp:
+        * /branches/extragear/trinity/graphics/digikam/digikam/tagcreatedlg.cpp,
+          /branches/extragear/trinity/graphics/digikam/digikam/tagcreatedlg.h,
+          /branches/extragear/trinity/graphics/digikam/digikam/tagfilterview.cpp,
+          /branches/extragear/trinity/graphics/digikam/digikam/tagfolderview.cpp,
+          /branches/extragear/trinity/graphics/digikam/digikam/tagspopupmenu.cpp,
+          /branches/extragear/trinity/graphics/digikam/libs/imageproperties/imagedescedittab.cpp:
           digiKam from KDE3 branch : Tag Edit dialog : code factoring : no
           need 2 dialog to edit or create tag.
 
 2008-03-30 13:51  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/libs/imageproperties/imagedescedittab.cpp:
+        * /branches/extragear/trinity/graphics/digikam/libs/imageproperties/imagedescedittab.cpp:
           compile
 
 2008-03-30 13:50  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/libs/imageproperties/imagedescedittab.cpp:
+        * /branches/extragear/trinity/graphics/digikam/libs/imageproperties/imagedescedittab.cpp:
           polish
 
 2008-03-30 10:02  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/libs/imageproperties/imagedescedittab.cpp:
+        * /branches/extragear/trinity/graphics/digikam/libs/imageproperties/imagedescedittab.cpp:
           handle properlly root tag path to create child tags from a
           hierarchy
 
 2008-03-29 21:39  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/libs/imageproperties/imagedescedittab.cpp:
+        * /branches/extragear/trinity/graphics/digikam/libs/imageproperties/imagedescedittab.cpp:
           remove Tag Create button.
 
 2008-03-29 21:04  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/libs/imageproperties/imagedescedittab.cpp:
+        * /branches/extragear/trinity/graphics/digikam/libs/imageproperties/imagedescedittab.cpp:
           digiKam from KDE3 branch : Caption & Tags: Create New Tags text
           field :
           - support tags path as with autocompletion (not only tags name)
@@ -6721,43 +6721,43 @@
 
 2008-03-29 20:20  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/libs/imageproperties/imagedescedittab.cpp:
+        * /branches/extragear/trinity/graphics/digikam/libs/imageproperties/imagedescedittab.cpp:
           digiKam from KDE3 branch : Captions & Tags: Create New Tags line
           edit now support auto-completion.
           CCBUGS: 114465
 
 2008-03-29 14:11  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/libs/imageproperties/imagedescedittab.cpp:
+        * /branches/extragear/trinity/graphics/digikam/libs/imageproperties/imagedescedittab.cpp:
           polish
 
 2008-03-29 11:34  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/libs/imageproperties/imagedescedittab.cpp,
-          /branches/extragear/kde3/graphics/digikam/libs/imageproperties/imagedescedittab.h:
+        * /branches/extragear/trinity/graphics/digikam/libs/imageproperties/imagedescedittab.cpp,
+          /branches/extragear/trinity/graphics/digikam/libs/imageproperties/imagedescedittab.h:
           do not give focus to new tag just created
 
 2008-03-29 09:50  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/libs/imageproperties/imagedescedittab.cpp:
+        * /branches/extragear/trinity/graphics/digikam/libs/imageproperties/imagedescedittab.cpp:
           strip white-space at bigen/end of tag
           CCBUGS:114465
 
 2008-03-28 22:25  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/libs/imageproperties/imagedescedittab.cpp:
+        * /branches/extragear/trinity/graphics/digikam/libs/imageproperties/imagedescedittab.cpp:
           polish
 
 2008-03-28 22:20  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/libs/imageproperties/imagedescedittab.cpp,
-          /branches/extragear/kde3/graphics/digikam/libs/imageproperties/imagedescedittab.h:
+        * /branches/extragear/trinity/graphics/digikam/libs/imageproperties/imagedescedittab.cpp,
+          /branches/extragear/trinity/graphics/digikam/libs/imageproperties/imagedescedittab.h:
           polish
 
 2008-03-28 22:04  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/libs/imageproperties/imagedescedittab.cpp,
-          /branches/extragear/kde3/graphics/digikam/libs/imageproperties/imagedescedittab.h:
+        * /branches/extragear/trinity/graphics/digikam/libs/imageproperties/imagedescedittab.cpp,
+          /branches/extragear/trinity/graphics/digikam/libs/imageproperties/imagedescedittab.h:
           digiKam from KDE3 branch : Caption & Tags sidebar tab : add new
           text edit field to create new tags in database
           CCBUGS: 114465
@@ -6765,100 +6765,100 @@
 
 2008-03-28 21:52  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/libs/widgets/common/paniconwidget.cpp,
-          /branches/extragear/kde3/graphics/digikam/libs/widgets/common/paniconwidget.h:
+        * /branches/extragear/trinity/graphics/digikam/libs/widgets/common/paniconwidget.cpp,
+          /branches/extragear/trinity/graphics/digikam/libs/widgets/common/paniconwidget.h:
           fix broken signals/slots
 
 2008-03-28 21:44  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp:
+        * /branches/extragear/trinity/graphics/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp:
           fix broken signal/slot connection
 
 2008-03-28 20:12  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/NEWS: update
+        * /branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2008-03-28 19:38  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/NEWS: update
+        * /branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2008-03-28 12:17  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/digikam/albumiconviewfilter.cpp:
+        * /branches/extragear/trinity/graphics/digikam/digikam/albumiconviewfilter.cpp:
           digiKam from KDE3 branch : Search Text from Status Bar : add
           auto-completion if search text query over icon view is true
 
 2008-03-28 12:09  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/libs/widgets/common/searchtextbar.cpp,
-          /branches/extragear/kde3/graphics/digikam/libs/widgets/common/searchtextbar.h:
+        * /branches/extragear/trinity/graphics/digikam/libs/widgets/common/searchtextbar.cpp,
+          /branches/extragear/trinity/graphics/digikam/libs/widgets/common/searchtextbar.h:
           digiKAm from KDE3 branch : add auto-completion if search text
           query is true
 
 2008-03-28 11:01  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/digikam/digikamview.cpp,
-          /branches/extragear/kde3/graphics/digikam/digikam/digikamview.h:
+        * /branches/extragear/trinity/graphics/digikam/digikam/digikamview.cpp,
+          /branches/extragear/trinity/graphics/digikam/digikam/digikamview.h:
           digiKam from KDE3 branch : Support auto-completion with Search
           text bars from all folder views.
 
 2008-03-28 10:56  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/digikam/timelineview.cpp,
-          /branches/extragear/kde3/graphics/digikam/digikam/timelineview.h:
+        * /branches/extragear/trinity/graphics/digikam/digikam/timelineview.cpp,
+          /branches/extragear/trinity/graphics/digikam/digikam/timelineview.h:
           digiKam from KDE3 branch : new method to access on search text
           bar
 
 2008-03-28 10:51  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/NEWS: update
+        * /branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2008-03-28 09:59  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/libs/imageproperties/imagedescedittab.cpp:
+        * /branches/extragear/trinity/graphics/digikam/libs/imageproperties/imagedescedittab.cpp:
           polish
 
 2008-03-28 09:48  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/libs/imageproperties/imagedescedittab.cpp:
+        * /branches/extragear/trinity/graphics/digikam/libs/imageproperties/imagedescedittab.cpp:
           polish
 
 2008-03-28 09:40  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/libs/imageproperties/imagedescedittab.cpp:
+        * /branches/extragear/trinity/graphics/digikam/libs/imageproperties/imagedescedittab.cpp:
           digiKam from KDE3 branch : add completion support with Search
           Tags name
 
 2008-03-28 09:36  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/libs/widgets/common/searchtextbar.cpp:
+        * /branches/extragear/trinity/graphics/digikam/libs/widgets/common/searchtextbar.cpp:
           digiKam from KDE3 branch: Added autocompletion support with
           Search Text Bar.
 
 2008-03-28 07:03  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/libs/widgets/common/searchtextbar.cpp,
-          /branches/extragear/kde3/graphics/digikam/libs/widgets/common/searchtextbar.h:
+        * /branches/extragear/trinity/graphics/digikam/libs/widgets/common/searchtextbar.cpp,
+          /branches/extragear/trinity/graphics/digikam/libs/widgets/common/searchtextbar.h:
           internal line edit widget is a Dline Edit not a KlineEdit
 
 2008-03-27 17:19  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/NEWS: update
+        * /branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2008-03-27 16:44  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/NEWS: update
+        * /branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2008-03-27 11:45  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/NEWS: update
+        * /branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2008-03-27 11:44  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/digikam/tagfilterview.cpp,
-          /branches/extragear/kde3/graphics/digikam/digikam/tagfolderview.cpp,
-          /branches/extragear/kde3/graphics/digikam/libs/imageproperties/imagedescedittab.cpp,
-          /branches/extragear/kde3/graphics/digikam/libs/imageproperties/imagedescedittab.h:
+        * /branches/extragear/trinity/graphics/digikam/digikam/tagfilterview.cpp,
+          /branches/extragear/trinity/graphics/digikam/digikam/tagfolderview.cpp,
+          /branches/extragear/trinity/graphics/digikam/libs/imageproperties/imagedescedittab.cpp,
+          /branches/extragear/trinity/graphics/digikam/libs/imageproperties/imagedescedittab.h:
           digiKam from KDE3 branch : Tag folder views : Delete Tag : check
           if tag is already assigned to items and report to user before to
           delete it really.
@@ -6867,77 +6867,77 @@
 
 2008-03-27 10:58  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/libs/imageproperties/imagedescedittab.cpp:
+        * /branches/extragear/trinity/graphics/digikam/libs/imageproperties/imagedescedittab.cpp:
           digiKam from KDE3 branch : missing to check if tag to remove has
           childs.
 
 2008-03-27 07:59  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/libs/widgets/common/dpopupmenu.cpp:
+        * /branches/extragear/trinity/graphics/digikam/libs/widgets/common/dpopupmenu.cpp:
           polish
 
 2008-03-27 07:49  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/libs/widgets/common/dpopupmenu.cpp,
-          /branches/extragear/kde3/graphics/digikam/libs/widgets/common/dpopupmenu.h:
+        * /branches/extragear/trinity/graphics/digikam/libs/widgets/common/dpopupmenu.cpp,
+          /branches/extragear/trinity/graphics/digikam/libs/widgets/common/dpopupmenu.h:
           digiKam from KDE3 branch: DPopupMenu follow color theme scheme.
           Fix few pixmap glitch on left frame
 
 2008-03-26 19:25  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/digikam/albumwidgetstack.cpp,
-          /branches/extragear/kde3/graphics/digikam/digikam/albumwidgetstack.h:
+        * /branches/extragear/trinity/graphics/digikam/digikam/albumwidgetstack.cpp,
+          /branches/extragear/trinity/graphics/digikam/digikam/albumwidgetstack.h:
           backport commit #790476 from KDE4
 
 2008-03-26 09:36  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/libs/widgets/imageplugins/imageguidewidget.cpp,
-          /branches/extragear/kde3/graphics/digikam/libs/widgets/imageplugins/imageguidewidget.h,
-          /branches/extragear/kde3/graphics/digikam/libs/widgets/imageplugins/imagepaniconwidget.cpp,
-          /branches/extragear/kde3/graphics/digikam/libs/widgets/imageplugins/imagepaniconwidget.h,
-          /branches/extragear/kde3/graphics/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp,
-          /branches/extragear/kde3/graphics/digikam/libs/widgets/imageplugins/imagepannelwidget.h,
-          /branches/extragear/kde3/graphics/digikam/libs/widgets/imageplugins/imageregionwidget.cpp,
-          /branches/extragear/kde3/graphics/digikam/libs/widgets/imageplugins/imageregionwidget.h,
-          /branches/extragear/kde3/graphics/digikam/libs/widgets/imageplugins/imagewidget.cpp,
-          /branches/extragear/kde3/graphics/digikam/libs/widgets/imageplugins/imagewidget.h,
-          /branches/extragear/kde3/graphics/digikam/libs/widgets/imageplugins/listboxpreviewitem.h:
+        * /branches/extragear/trinity/graphics/digikam/libs/widgets/imageplugins/imageguidewidget.cpp,
+          /branches/extragear/trinity/graphics/digikam/libs/widgets/imageplugins/imageguidewidget.h,
+          /branches/extragear/trinity/graphics/digikam/libs/widgets/imageplugins/imagepaniconwidget.cpp,
+          /branches/extragear/trinity/graphics/digikam/libs/widgets/imageplugins/imagepaniconwidget.h,
+          /branches/extragear/trinity/graphics/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp,
+          /branches/extragear/trinity/graphics/digikam/libs/widgets/imageplugins/imagepannelwidget.h,
+          /branches/extragear/trinity/graphics/digikam/libs/widgets/imageplugins/imageregionwidget.cpp,
+          /branches/extragear/trinity/graphics/digikam/libs/widgets/imageplugins/imageregionwidget.h,
+          /branches/extragear/trinity/graphics/digikam/libs/widgets/imageplugins/imagewidget.cpp,
+          /branches/extragear/trinity/graphics/digikam/libs/widgets/imageplugins/imagewidget.h,
+          /branches/extragear/trinity/graphics/digikam/libs/widgets/imageplugins/listboxpreviewitem.h:
           use const references
 
 2008-03-26 08:03  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/imageplugins/hotpixels/weights.cpp,
-          /branches/extragear/kde3/graphics/digikam/imageplugins/hotpixels/weights.h:
+        * /branches/extragear/trinity/graphics/digikam/imageplugins/hotpixels/weights.cpp,
+          /branches/extragear/trinity/graphics/digikam/imageplugins/hotpixels/weights.h:
           polish
 
 2008-03-26 07:49  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/imageplugins/hotpixels/hotpixel.h:
+        * /branches/extragear/trinity/graphics/digikam/imageplugins/hotpixels/hotpixel.h:
           polish
 
 2008-03-26 07:16  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/imageplugins/hotpixels/blackframeparser.cpp:
+        * /branches/extragear/trinity/graphics/digikam/imageplugins/hotpixels/blackframeparser.cpp:
           polish
 
 2008-03-25 22:42  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/imageplugins/hotpixels/imageeffect_hotpixels.cpp:
+        * /branches/extragear/trinity/graphics/digikam/imageplugins/hotpixels/imageeffect_hotpixels.cpp:
           polish
 
 2008-03-25 22:22  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/NEWS: update
+        * /branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2008-03-25 22:21  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/imageplugins/hotpixels/Makefile.am,
-          /branches/extragear/kde3/graphics/digikam/imageplugins/hotpixels/blackframelistview.cpp,
-          /branches/extragear/kde3/graphics/digikam/imageplugins/hotpixels/blackframelistview.h,
-          /branches/extragear/kde3/graphics/digikam/imageplugins/hotpixels/blackframeparser.cpp,
-          /branches/extragear/kde3/graphics/digikam/imageplugins/hotpixels/blackframeparser.h,
-          /branches/extragear/kde3/graphics/digikam/imageplugins/hotpixels/imageeffect_hotpixels.cpp,
-          /branches/extragear/kde3/graphics/digikam/imageplugins/hotpixels/imageeffect_hotpixels.h:
+        * /branches/extragear/trinity/graphics/digikam/imageplugins/hotpixels/Makefile.am,
+          /branches/extragear/trinity/graphics/digikam/imageplugins/hotpixels/blackframelistview.cpp,
+          /branches/extragear/trinity/graphics/digikam/imageplugins/hotpixels/blackframelistview.h,
+          /branches/extragear/trinity/graphics/digikam/imageplugins/hotpixels/blackframeparser.cpp,
+          /branches/extragear/trinity/graphics/digikam/imageplugins/hotpixels/blackframeparser.h,
+          /branches/extragear/trinity/graphics/digikam/imageplugins/hotpixels/imageeffect_hotpixels.cpp,
+          /branches/extragear/trinity/graphics/digikam/imageplugins/hotpixels/imageeffect_hotpixels.h:
           digiKam from KDE3 branch : HotPixels Tool : support of RAW
           pictures as reference black frames.
           BUG: 148935
@@ -6945,120 +6945,120 @@
 
 2008-03-25 11:48  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/libs/dialogs/imagedialog.cpp:
+        * /branches/extragear/trinity/graphics/digikam/libs/dialogs/imagedialog.cpp:
           polish
 
 2008-03-25 11:42  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/libs/dialogs/imagedialog.cpp:
+        * /branches/extragear/trinity/graphics/digikam/libs/dialogs/imagedialog.cpp:
           polish
 
 2008-03-25 11:41  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/imageplugins/hotpixels/blackframelistview.cpp,
-          /branches/extragear/kde3/graphics/digikam/imageplugins/hotpixels/blackframelistview.h,
-          /branches/extragear/kde3/graphics/digikam/imageplugins/hotpixels/blackframeparser.cpp,
-          /branches/extragear/kde3/graphics/digikam/imageplugins/hotpixels/blackframeparser.h,
-          /branches/extragear/kde3/graphics/digikam/imageplugins/hotpixels/imageeffect_hotpixels.cpp:
+        * /branches/extragear/trinity/graphics/digikam/imageplugins/hotpixels/blackframelistview.cpp,
+          /branches/extragear/trinity/graphics/digikam/imageplugins/hotpixels/blackframelistview.h,
+          /branches/extragear/trinity/graphics/digikam/imageplugins/hotpixels/blackframeparser.cpp,
+          /branches/extragear/trinity/graphics/digikam/imageplugins/hotpixels/blackframeparser.h,
+          /branches/extragear/trinity/graphics/digikam/imageplugins/hotpixels/imageeffect_hotpixels.cpp:
           HotPixel tool now use ImageDialog
 
 2008-03-25 11:40  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/libs/dialogs/imagedialog.cpp,
-          /branches/extragear/kde3/graphics/digikam/libs/dialogs/imagedialog.h:
+        * /branches/extragear/trinity/graphics/digikam/libs/dialogs/imagedialog.cpp,
+          /branches/extragear/trinity/graphics/digikam/libs/dialogs/imagedialog.h:
           new method to handle only one url
 
 2008-03-25 10:41  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/NEWS: update
+        * /branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2008-03-25 10:38  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/utilities/imageeditor/editor/editorwindow.cpp:
+        * /branches/extragear/trinity/graphics/digikam/utilities/imageeditor/editor/editorwindow.cpp:
           backport commit #789799 from KDE4
 
 2008-03-25 10:33  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/libs/dialogs/Makefile.am,
-          /branches/extragear/kde3/graphics/digikam/libs/dialogs/imagedialog.cpp,
-          /branches/extragear/kde3/graphics/digikam/libs/dialogs/imagedialog.h,
-          /branches/extragear/kde3/graphics/digikam/libs/thumbbar/thumbbar.cpp,
-          /branches/extragear/kde3/graphics/digikam/project/project.kdevelop,
-          /branches/extragear/kde3/graphics/digikam/showfoto/Makefile.am,
-          /branches/extragear/kde3/graphics/digikam/showfoto/showfoto.cpp:
+        * /branches/extragear/trinity/graphics/digikam/libs/dialogs/Makefile.am,
+          /branches/extragear/trinity/graphics/digikam/libs/dialogs/imagedialog.cpp,
+          /branches/extragear/trinity/graphics/digikam/libs/dialogs/imagedialog.h,
+          /branches/extragear/trinity/graphics/digikam/libs/thumbbar/thumbbar.cpp,
+          /branches/extragear/trinity/graphics/digikam/project/project.kdevelop,
+          /branches/extragear/trinity/graphics/digikam/showfoto/Makefile.am,
+          /branches/extragear/trinity/graphics/digikam/showfoto/showfoto.cpp:
           backport ImageDialog from KDE4. Used into Showfoto to open image
           files
 
 2008-03-25 04:34  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/NEWS: update
+        * /branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2008-03-24 09:41  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/PACKAGING: update
+        * /branches/extragear/trinity/graphics/digikam/PACKAGING: update
 
 2008-03-24 09:40  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/NEWS: update
+        * /branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2008-03-24 09:38  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/digikam/version.h:
+        * /branches/extragear/trinity/graphics/digikam/digikam/version.h:
           update
 
 2008-03-24 09:38  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/digikam.lsm: update
+        * /branches/extragear/trinity/graphics/digikam/digikam.lsm: update
 
 2008-03-23 21:27  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/ChangeLog: update
+        * /branches/extragear/trinity/graphics/digikam/ChangeLog: update
 
 2008-03-23 20:23  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/NEWS: update
+        * /branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2008-03-23 20:18  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/release_digikam.rb,
-          /branches/extragear/kde3/graphics/digikam/release_digikam_docs.rb:
+        * /branches/extragear/trinity/graphics/digikam/release_digikam.rb,
+          /branches/extragear/trinity/graphics/digikam/release_digikam_docs.rb:
           prepare 0.9.4-beta2
 
 2008-03-23 20:13  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/digikam.lsm: update
+        * /branches/extragear/trinity/graphics/digikam/digikam.lsm: update
 
 0.9.4-beta2 2008-03-23
 -------------------------------------------------------------------------
 2008-03-22 15:46  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/NEWS: update
+        * /branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2008-03-22 15:45  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/NEWS: update
+        * /branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2008-03-21 20:47  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/NEWS: update
+        * /branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2008-03-21 05:12  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/NEWS: update
+        * /branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2008-03-21 05:11  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/libs/widgets/metadata/metadatawidget.cpp:
+        * /branches/extragear/trinity/graphics/digikam/libs/widgets/metadata/metadatawidget.cpp:
           patch from Mik to add QToolTips over metadata widget buttons
           BUG: 141755
 
 2008-03-20 21:23  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/digikam/albummanager.cpp,
-          /branches/extragear/kde3/graphics/digikam/digikam/albummanager.h,
-          /branches/extragear/kde3/graphics/digikam/digikam/digikamapp.cpp,
-          /branches/extragear/kde3/graphics/digikam/digikam/scanlib.cpp,
-          /branches/extragear/kde3/graphics/digikam/digikam/scanlib.h:
+        * /branches/extragear/trinity/graphics/digikam/digikam/albummanager.cpp,
+          /branches/extragear/trinity/graphics/digikam/digikam/albummanager.h,
+          /branches/extragear/trinity/graphics/digikam/digikam/digikamapp.cpp,
+          /branches/extragear/trinity/graphics/digikam/digikam/scanlib.cpp,
+          /branches/extragear/trinity/graphics/digikam/digikam/scanlib.h:
           digiKam from KDE3 branch :
           - if Splashscreen is enable at startup, do not show Scan dialog
           and post progress to Splash
@@ -7067,49 +7067,49 @@
 
 2008-03-20 20:51  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/NEWS: update
+        * /branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2008-03-20 18:44  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/NEWS: update
+        * /branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2008-03-20 18:42  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/utilities/setup/setupgeneral.cpp:
+        * /branches/extragear/trinity/graphics/digikam/utilities/setup/setupgeneral.cpp:
           fix typo
 
 2008-03-20 17:39  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/NEWS: update
+        * /branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2008-03-20 13:49  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp,
-          /branches/extragear/kde3/graphics/digikam/imageplugins/coreplugin/imageeffect_iccproof.h:
+        * /branches/extragear/trinity/graphics/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp,
+          /branches/extragear/trinity/graphics/digikam/imageplugins/coreplugin/imageeffect_iccproof.h:
           typo
 
 2008-03-20 12:37  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/libs/thumbbar/thumbbar.cpp:
+        * /branches/extragear/trinity/graphics/digikam/libs/thumbbar/thumbbar.cpp:
           backport commit #788013
 
 2008-03-20 08:57  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/showfoto/showfoto.cpp:
+        * /branches/extragear/trinity/graphics/digikam/showfoto/showfoto.cpp:
           Bug fix : really toogle thumbbar with full screen mode
           accordingly with settings
 
 2008-03-20 07:02  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/NEWS: update
+        * /branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2008-03-19 22:03  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/NEWS: update
+        * /branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2008-03-19 21:59  mwiesweg
 
-        * /branches/extragear/kde3/graphics/digikam/digikam/imagepreviewview.cpp:
+        * /branches/extragear/trinity/graphics/digikam/digikam/imagepreviewview.cpp:
           Load high quality version also when preloading the preview.
           Seems to fix the bug.
           
@@ -7117,56 +7117,56 @@
 
 2008-03-19 20:04  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/NEWS: update
+        * /branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2008-03-19 19:27  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/NEWS: update
+        * /branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2008-03-19 18:31  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/NEWS: update
+        * /branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2008-03-19 15:33  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/NEWS: update
+        * /branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2008-03-19 15:32  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/digikam/main.cpp:
+        * /branches/extragear/trinity/graphics/digikam/digikam/main.cpp:
           polish
 
 2008-03-19 15:26  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/digikam/digikamapp.cpp,
-          /branches/extragear/kde3/graphics/digikam/digikam/main.cpp:
+        * /branches/extragear/trinity/graphics/digikam/digikam/digikamapp.cpp,
+          /branches/extragear/trinity/graphics/digikam/digikam/main.cpp:
           digiKAm from KDE3 branch : show splashcreen just before to scan
           whole albums to imediatly give to users program activity.
           BUG: 142469
 
 2008-03-19 14:40  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/NEWS: update
+        * /branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2008-03-19 12:19  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/NEWS: update
+        * /branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2008-03-19 11:42  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/NEWS: update
+        * /branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2008-03-19 11:18  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/NEWS: update
+        * /branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2008-03-19 11:05  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/NEWS: update
+        * /branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2008-03-19 11:05  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/showfoto/showfoto.cpp:
+        * /branches/extragear/trinity/graphics/digikam/showfoto/showfoto.cpp:
           digiKam from KDE3 branch : Showfoto : handle properlly the
           curentItem instance when user move to trash the current image
           loaded in editor
@@ -7174,12 +7174,12 @@
 
 2008-03-19 08:21  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/NEWS: update
+        * /branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2008-03-19 08:17  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/showfoto/setup/setupeditor.cpp,
-          /branches/extragear/kde3/graphics/digikam/showfoto/showfoto.cpp:
+        * /branches/extragear/trinity/graphics/digikam/showfoto/setup/setupeditor.cpp,
+          /branches/extragear/trinity/graphics/digikam/showfoto/showfoto.cpp:
           digiKam from KDE3 branch: Showfoto: apply patch from Arnd to a
           added 2 new options to set ordering of images when File/Open
           Folder action is used.
@@ -7187,70 +7187,70 @@
 
 2008-03-19 08:00  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/showfoto/showfoto.cpp:
+        * /branches/extragear/trinity/graphics/digikam/showfoto/showfoto.cpp:
           polish
 
 2008-03-19 05:13  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/NEWS: update
+        * /branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2008-03-18 22:19  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/NEWS: update
+        * /branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2008-03-18 18:10  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/NEWS: update
+        * /branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2008-03-18 17:39  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/NEWS: update
+        * /branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2008-03-18 13:13  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/NEWS: update
+        * /branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2008-03-18 12:05  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/NEWS: update
+        * /branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2008-03-18 09:21  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/digikam/albumlister.cpp,
-          /branches/extragear/kde3/graphics/digikam/digikam/albumlister.h:
+        * /branches/extragear/trinity/graphics/digikam/digikam/albumlister.cpp,
+          /branches/extragear/trinity/graphics/digikam/digikam/albumlister.h:
           clean up : private slotClear() is unsused
 
 2008-03-18 09:14  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/libs/thumbbar/thumbbar.cpp:
+        * /branches/extragear/trinity/graphics/digikam/libs/thumbbar/thumbbar.cpp:
           backport commit #786927 from KDE4
 
 2008-03-18 09:04  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/libs/thumbbar/thumbbar.cpp:
+        * /branches/extragear/trinity/graphics/digikam/libs/thumbbar/thumbbar.cpp:
           polish
 
 2008-03-18 08:53  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/libs/thumbbar/thumbbar.cpp,
-          /branches/extragear/kde3/graphics/digikam/libs/thumbbar/thumbbar.h:
+        * /branches/extragear/trinity/graphics/digikam/libs/thumbbar/thumbbar.cpp,
+          /branches/extragear/trinity/graphics/digikam/libs/thumbbar/thumbbar.h:
           digiKam from KDE3 branch : use mouse wheel to move thumbbar
           content.
 
 2008-03-18 08:14  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/utilities/lighttable/lighttablebar.cpp,
-          /branches/extragear/kde3/graphics/digikam/utilities/lighttable/lighttablebar.h:
+        * /branches/extragear/trinity/graphics/digikam/utilities/lighttable/lighttablebar.cpp,
+          /branches/extragear/trinity/graphics/digikam/utilities/lighttable/lighttablebar.h:
           polish
 
 2008-03-17 20:38  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/NEWS: update
+        * /branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2008-03-17 19:52  abaecker
 
-        * /branches/extragear/kde3/graphics/digikam/digikam/albummanager.cpp,
-          /branches/extragear/kde3/graphics/digikam/digikam/upgradedb_sqlite2tosqlite3.cpp:
+        * /branches/extragear/trinity/graphics/digikam/digikam/albummanager.cpp,
+          /branches/extragear/trinity/graphics/digikam/digikam/upgradedb_sqlite2tosqlite3.cpp:
           When upgradeDB_Sqlite2ToSqlite3 fails, this could also mean that
           the directory
           with the Album Path is write-protected or does not exist
@@ -7262,8 +7262,8 @@
 
 2008-03-17 19:08  abaecker
 
-        * /branches/extragear/kde3/graphics/digikam/NEWS,
-          /branches/extragear/kde3/graphics/digikam/utilities/imageeditor/editor/editorwindow.cpp:
+        * /branches/extragear/trinity/graphics/digikam/NEWS,
+          /branches/extragear/trinity/graphics/digikam/utilities/imageeditor/editor/editorwindow.cpp:
           Ensure that the umask setting is respected for both newly created
           files
           and when overwriting files.
@@ -7273,93 +7273,93 @@
 
 2008-03-17 13:50  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/libs/thumbbar/thumbbar.cpp:
+        * /branches/extragear/trinity/graphics/digikam/libs/thumbbar/thumbbar.cpp:
           backport commit #786621 from KDE4
 
 2008-03-17 10:01  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/utilities/lighttable/lighttablebar.cpp,
-          /branches/extragear/kde3/graphics/digikam/utilities/lighttable/lighttablebar.h:
+        * /branches/extragear/trinity/graphics/digikam/utilities/lighttable/lighttablebar.cpp,
+          /branches/extragear/trinity/graphics/digikam/utilities/lighttable/lighttablebar.h:
           polish
 
 2008-03-17 10:01  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/libs/thumbbar/thumbbar.h:
+        * /branches/extragear/trinity/graphics/digikam/libs/thumbbar/thumbbar.h:
           polish
 
 2008-03-16 17:12  gkulzer
 
-        * /branches/extragear/kde3/graphics/digikam/release_digikam_docs.rb:
+        * /branches/extragear/trinity/graphics/digikam/release_digikam_docs.rb:
           update to 0.9.4 release
           documentation has changed its place!
 
 2008-03-15 08:36  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/configure.in.bot,
-          /branches/extragear/kde3/graphics/digikam/configure.in.in:
+        * /branches/extragear/trinity/graphics/digikam/configure.in.bot,
+          /branches/extragear/trinity/graphics/digikam/configure.in.in:
           compile with old libkexiv2 0.1.6 and old libkipi 0.1.5
 
 2008-03-15 08:34  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/README: update
+        * /branches/extragear/trinity/graphics/digikam/README: update
 
 2008-03-15 08:33  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/showfoto/main.cpp:
+        * /branches/extragear/trinity/graphics/digikam/showfoto/main.cpp:
           compile with old libkexiv2 0.1.6
 
 2008-03-15 08:31  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/digikam/main.cpp:
+        * /branches/extragear/trinity/graphics/digikam/digikam/main.cpp:
           compile with old libkexiv2 0.1.6 and old libkipi 0.1.5
 
 2008-03-14 14:52  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/data/themes/Gray: more
+        * /branches/extragear/trinity/graphics/digikam/data/themes/Gray: more
           readable color
 
 2008-03-14 13:20  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/NEWS: update
+        * /branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2008-03-14 12:56  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/libs/widgets/metadata/Makefile.am,
-          /branches/extragear/kde3/graphics/digikam/libs/widgets/metadata/mdkeylistviewitem.cpp:
+        * /branches/extragear/trinity/graphics/digikam/libs/widgets/metadata/Makefile.am,
+          /branches/extragear/trinity/graphics/digikam/libs/widgets/metadata/mdkeylistviewitem.cpp:
           better support of color theme scheme
 
 2008-03-14 11:22  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/imageplugins/coreplugin/ratiocrop/imageselectionwidget.cpp,
-          /branches/extragear/kde3/graphics/digikam/imageplugins/coreplugin/ratiocrop/imageselectionwidget.h:
+        * /branches/extragear/trinity/graphics/digikam/imageplugins/coreplugin/ratiocrop/imageselectionwidget.cpp,
+          /branches/extragear/trinity/graphics/digikam/imageplugins/coreplugin/ratiocrop/imageselectionwidget.h:
           polish
 
 2008-03-14 10:27  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/imageplugins/coreplugin/ratiocrop/imageselectionwidget.cpp,
-          /branches/extragear/kde3/graphics/digikam/imageplugins/coreplugin/ratiocrop/imageselectionwidget.h:
+        * /branches/extragear/trinity/graphics/digikam/imageplugins/coreplugin/ratiocrop/imageselectionwidget.cpp,
+          /branches/extragear/trinity/graphics/digikam/imageplugins/coreplugin/ratiocrop/imageselectionwidget.h:
           polish
 
 2008-03-14 10:02  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/utilities/imageeditor/editor/imagewindow.cpp:
+        * /branches/extragear/trinity/graphics/digikam/utilities/imageeditor/editor/imagewindow.cpp:
           polish
 
 2008-03-14 09:21  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/NEWS: update
+        * /branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2008-03-14 09:20  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/showfoto/Makefile.am,
-          /branches/extragear/kde3/graphics/digikam/showfoto/setup/setupeditor.cpp,
-          /branches/extragear/kde3/graphics/digikam/showfoto/setup/setupeditor.h,
-          /branches/extragear/kde3/graphics/digikam/showfoto/showfoto.cpp,
-          /branches/extragear/kde3/graphics/digikam/showfoto/showfotoui.rc,
-          /branches/extragear/kde3/graphics/digikam/utilities/imageeditor/editor/editorwindow.cpp,
-          /branches/extragear/kde3/graphics/digikam/utilities/imageeditor/editor/editorwindow.h,
-          /branches/extragear/kde3/graphics/digikam/utilities/imageeditor/editor/imagewindow.cpp,
-          /branches/extragear/kde3/graphics/digikam/utilities/imageeditor/editor/imagewindow.h:
+        * /branches/extragear/trinity/graphics/digikam/showfoto/Makefile.am,
+          /branches/extragear/trinity/graphics/digikam/showfoto/setup/setupeditor.cpp,
+          /branches/extragear/trinity/graphics/digikam/showfoto/setup/setupeditor.h,
+          /branches/extragear/trinity/graphics/digikam/showfoto/showfoto.cpp,
+          /branches/extragear/trinity/graphics/digikam/showfoto/showfotoui.rc,
+          /branches/extragear/trinity/graphics/digikam/utilities/imageeditor/editor/editorwindow.cpp,
+          /branches/extragear/trinity/graphics/digikam/utilities/imageeditor/editor/editorwindow.h,
+          /branches/extragear/trinity/graphics/digikam/utilities/imageeditor/editor/imagewindow.cpp,
+          /branches/extragear/trinity/graphics/digikam/utilities/imageeditor/editor/imagewindow.h:
           digiKam from KDE3 branch : Showfoto now support Color Theme
           scheme as digiKam core
           
@@ -7368,139 +7368,139 @@
 
 2008-03-14 08:55  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/showfoto/showfoto.h:
+        * /branches/extragear/trinity/graphics/digikam/showfoto/showfoto.h:
           polish
 
 2008-03-14 07:02  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/libs/themeengine/themeengine.cpp,
-          /branches/extragear/kde3/graphics/digikam/libs/themeengine/themeengine.h:
+        * /branches/extragear/trinity/graphics/digikam/libs/themeengine/themeengine.cpp,
+          /branches/extragear/trinity/graphics/digikam/libs/themeengine/themeengine.h:
           new method to get theme name
 
 2008-03-13 13:29  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/showfoto/icons/cr128-action-crop.png,
-          /branches/extragear/kde3/graphics/digikam/showfoto/icons/cr128-action-rotate_cw.png,
-          /branches/extragear/kde3/graphics/digikam/showfoto/icons/cr16-action-crop.png,
-          /branches/extragear/kde3/graphics/digikam/showfoto/icons/cr16-action-rotate_cw.png,
-          /branches/extragear/kde3/graphics/digikam/showfoto/icons/cr22-action-crop.png,
-          /branches/extragear/kde3/graphics/digikam/showfoto/icons/cr22-action-rotate_cw.png,
-          /branches/extragear/kde3/graphics/digikam/showfoto/icons/cr32-action-crop.png,
-          /branches/extragear/kde3/graphics/digikam/showfoto/icons/cr32-action-rotate_cw.png,
-          /branches/extragear/kde3/graphics/digikam/showfoto/icons/cr48-action-crop.png,
-          /branches/extragear/kde3/graphics/digikam/showfoto/icons/cr48-action-rotate_cw.png,
-          /branches/extragear/kde3/graphics/digikam/showfoto/icons/cr64-action-crop.png,
-          /branches/extragear/kde3/graphics/digikam/showfoto/icons/cr64-action-rotate_cw.png,
-          /branches/extragear/kde3/graphics/digikam/showfoto/icons/crsc-action-crop.svgz,
-          /branches/extragear/kde3/graphics/digikam/showfoto/icons/crsc-action-rotate_cw.svgz,
-          /branches/extragear/kde3/graphics/digikam/showfoto/icons/hi128-action-flip.png,
-          /branches/extragear/kde3/graphics/digikam/showfoto/icons/hi128-action-histogram.png,
-          /branches/extragear/kde3/graphics/digikam/showfoto/icons/hi128-action-resize_image.png,
-          /branches/extragear/kde3/graphics/digikam/showfoto/icons/hi128-action-slideshow.png,
-          /branches/extragear/kde3/graphics/digikam/showfoto/icons/hi16-action-flip.png,
-          /branches/extragear/kde3/graphics/digikam/showfoto/icons/hi16-action-histogram.png,
-          /branches/extragear/kde3/graphics/digikam/showfoto/icons/hi16-action-resize_image.png,
-          /branches/extragear/kde3/graphics/digikam/showfoto/icons/hi16-action-slideshow.png,
-          /branches/extragear/kde3/graphics/digikam/showfoto/icons/hi22-action-flip.png,
-          /branches/extragear/kde3/graphics/digikam/showfoto/icons/hi22-action-histogram.png,
-          /branches/extragear/kde3/graphics/digikam/showfoto/icons/hi22-action-resize_image.png,
-          /branches/extragear/kde3/graphics/digikam/showfoto/icons/hi22-action-slideshow.png,
-          /branches/extragear/kde3/graphics/digikam/showfoto/icons/hi32-action-flip.png,
-          /branches/extragear/kde3/graphics/digikam/showfoto/icons/hi32-action-histogram.png,
-          /branches/extragear/kde3/graphics/digikam/showfoto/icons/hi32-action-resize_image.png,
-          /branches/extragear/kde3/graphics/digikam/showfoto/icons/hi32-action-slideshow.png,
-          /branches/extragear/kde3/graphics/digikam/showfoto/icons/hi48-action-flip.png,
-          /branches/extragear/kde3/graphics/digikam/showfoto/icons/hi48-action-histogram.png,
-          /branches/extragear/kde3/graphics/digikam/showfoto/icons/hi48-action-resize_image.png,
-          /branches/extragear/kde3/graphics/digikam/showfoto/icons/hi48-action-slideshow.png,
-          /branches/extragear/kde3/graphics/digikam/showfoto/icons/hi64-action-flip.png,
-          /branches/extragear/kde3/graphics/digikam/showfoto/icons/hi64-action-histogram.png,
-          /branches/extragear/kde3/graphics/digikam/showfoto/icons/hi64-action-resize_image.png,
-          /branches/extragear/kde3/graphics/digikam/showfoto/icons/hi64-action-slideshow.png,
-          /branches/extragear/kde3/graphics/digikam/showfoto/icons/hisc-action-flip.svgz,
-          /branches/extragear/kde3/graphics/digikam/showfoto/icons/hisc-action-histogram.svgz,
-          /branches/extragear/kde3/graphics/digikam/showfoto/icons/hisc-action-resize_image.svgz,
-          /branches/extragear/kde3/graphics/digikam/showfoto/icons/hisc-action-slideshow.svgz:
+        * /branches/extragear/trinity/graphics/digikam/showfoto/icons/cr128-action-crop.png,
+          /branches/extragear/trinity/graphics/digikam/showfoto/icons/cr128-action-rotate_cw.png,
+          /branches/extragear/trinity/graphics/digikam/showfoto/icons/cr16-action-crop.png,
+          /branches/extragear/trinity/graphics/digikam/showfoto/icons/cr16-action-rotate_cw.png,
+          /branches/extragear/trinity/graphics/digikam/showfoto/icons/cr22-action-crop.png,
+          /branches/extragear/trinity/graphics/digikam/showfoto/icons/cr22-action-rotate_cw.png,
+          /branches/extragear/trinity/graphics/digikam/showfoto/icons/cr32-action-crop.png,
+          /branches/extragear/trinity/graphics/digikam/showfoto/icons/cr32-action-rotate_cw.png,
+          /branches/extragear/trinity/graphics/digikam/showfoto/icons/cr48-action-crop.png,
+          /branches/extragear/trinity/graphics/digikam/showfoto/icons/cr48-action-rotate_cw.png,
+          /branches/extragear/trinity/graphics/digikam/showfoto/icons/cr64-action-crop.png,
+          /branches/extragear/trinity/graphics/digikam/showfoto/icons/cr64-action-rotate_cw.png,
+          /branches/extragear/trinity/graphics/digikam/showfoto/icons/crsc-action-crop.svgz,
+          /branches/extragear/trinity/graphics/digikam/showfoto/icons/crsc-action-rotate_cw.svgz,
+          /branches/extragear/trinity/graphics/digikam/showfoto/icons/hi128-action-flip.png,
+          /branches/extragear/trinity/graphics/digikam/showfoto/icons/hi128-action-histogram.png,
+          /branches/extragear/trinity/graphics/digikam/showfoto/icons/hi128-action-resize_image.png,
+          /branches/extragear/trinity/graphics/digikam/showfoto/icons/hi128-action-slideshow.png,
+          /branches/extragear/trinity/graphics/digikam/showfoto/icons/hi16-action-flip.png,
+          /branches/extragear/trinity/graphics/digikam/showfoto/icons/hi16-action-histogram.png,
+          /branches/extragear/trinity/graphics/digikam/showfoto/icons/hi16-action-resize_image.png,
+          /branches/extragear/trinity/graphics/digikam/showfoto/icons/hi16-action-slideshow.png,
+          /branches/extragear/trinity/graphics/digikam/showfoto/icons/hi22-action-flip.png,
+          /branches/extragear/trinity/graphics/digikam/showfoto/icons/hi22-action-histogram.png,
+          /branches/extragear/trinity/graphics/digikam/showfoto/icons/hi22-action-resize_image.png,
+          /branches/extragear/trinity/graphics/digikam/showfoto/icons/hi22-action-slideshow.png,
+          /branches/extragear/trinity/graphics/digikam/showfoto/icons/hi32-action-flip.png,
+          /branches/extragear/trinity/graphics/digikam/showfoto/icons/hi32-action-histogram.png,
+          /branches/extragear/trinity/graphics/digikam/showfoto/icons/hi32-action-resize_image.png,
+          /branches/extragear/trinity/graphics/digikam/showfoto/icons/hi32-action-slideshow.png,
+          /branches/extragear/trinity/graphics/digikam/showfoto/icons/hi48-action-flip.png,
+          /branches/extragear/trinity/graphics/digikam/showfoto/icons/hi48-action-histogram.png,
+          /branches/extragear/trinity/graphics/digikam/showfoto/icons/hi48-action-resize_image.png,
+          /branches/extragear/trinity/graphics/digikam/showfoto/icons/hi48-action-slideshow.png,
+          /branches/extragear/trinity/graphics/digikam/showfoto/icons/hi64-action-flip.png,
+          /branches/extragear/trinity/graphics/digikam/showfoto/icons/hi64-action-histogram.png,
+          /branches/extragear/trinity/graphics/digikam/showfoto/icons/hi64-action-resize_image.png,
+          /branches/extragear/trinity/graphics/digikam/showfoto/icons/hi64-action-slideshow.png,
+          /branches/extragear/trinity/graphics/digikam/showfoto/icons/hisc-action-flip.svgz,
+          /branches/extragear/trinity/graphics/digikam/showfoto/icons/hisc-action-histogram.svgz,
+          /branches/extragear/trinity/graphics/digikam/showfoto/icons/hisc-action-resize_image.svgz,
+          /branches/extragear/trinity/graphics/digikam/showfoto/icons/hisc-action-slideshow.svgz:
           all showfoto action icons are duplicate than data/icons
 
 2008-03-13 13:20  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/showfoto/showfotoui.rc:
+        * /branches/extragear/trinity/graphics/digikam/showfoto/showfotoui.rc:
           missing contribute option
 
 2008-03-13 07:22  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/digikam/timelinewidget.cpp:
+        * /branches/extragear/trinity/graphics/digikam/digikam/timelinewidget.cpp:
           better support of color scheme theme
 
 2008-03-11 22:43  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/libs/imageproperties/talbumlistview.cpp:
+        * /branches/extragear/trinity/graphics/digikam/libs/imageproperties/talbumlistview.cpp:
           regression tests. handle properlly 3 states when necessary since
           we use FolderItem here
 
 2008-03-11 19:39  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/libs/dimg/loaders/rawloader.cpp:
+        * /branches/extragear/trinity/graphics/digikam/libs/dimg/loaders/rawloader.cpp:
           fix warnings
 
 2008-03-11 18:08  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/NEWS: update
+        * /branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2008-03-11 18:05  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/NEWS: update
+        * /branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2008-03-11 14:54  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/imageplugins/hotpixels/blackframelistview.cpp,
-          /branches/extragear/kde3/graphics/digikam/imageplugins/hotpixels/blackframelistview.h:
+        * /branches/extragear/trinity/graphics/digikam/imageplugins/hotpixels/blackframelistview.cpp,
+          /branches/extragear/trinity/graphics/digikam/imageplugins/hotpixels/blackframelistview.h:
           better support of Dark color theme
 
 2008-03-11 14:49  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/utilities/cameragui/camerafolderitem.cpp,
-          /branches/extragear/kde3/graphics/digikam/utilities/cameragui/camerafolderitem.h,
-          /branches/extragear/kde3/graphics/digikam/utilities/cameragui/camerafolderview.cpp,
-          /branches/extragear/kde3/graphics/digikam/utilities/cameragui/camerafolderview.h:
+        * /branches/extragear/trinity/graphics/digikam/utilities/cameragui/camerafolderitem.cpp,
+          /branches/extragear/trinity/graphics/digikam/utilities/cameragui/camerafolderitem.h,
+          /branches/extragear/trinity/graphics/digikam/utilities/cameragui/camerafolderview.cpp,
+          /branches/extragear/trinity/graphics/digikam/utilities/cameragui/camerafolderview.h:
           better support of Dark color theme
 
 2008-03-11 14:36  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/libs/dialogs/dprogressdlg.cpp,
-          /branches/extragear/kde3/graphics/digikam/libs/dialogs/dprogressdlg.h:
+        * /branches/extragear/trinity/graphics/digikam/libs/dialogs/dprogressdlg.cpp,
+          /branches/extragear/trinity/graphics/digikam/libs/dialogs/dprogressdlg.h:
           better rendering with dark color theme scheme
 
 2008-03-11 10:25  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/libs/dimg/loaders/rawloader.cpp:
+        * /branches/extragear/trinity/graphics/digikam/libs/dimg/loaders/rawloader.cpp:
           backport commit #784433 from KDE4
 
 2008-03-11 08:55  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/libs/dimg/loaders/rawloader.cpp:
+        * /branches/extragear/trinity/graphics/digikam/libs/dimg/loaders/rawloader.cpp:
           use same transfert function to compute auto-gamma lut than
           default one used into dcraw
 
 2008-03-11 05:15  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/libs/dimg/loaders/rawloader.cpp:
+        * /branches/extragear/trinity/graphics/digikam/libs/dimg/loaders/rawloader.cpp:
           polish
 
 2008-03-11 04:55  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/libs/dimg/loaders/rawloader.cpp:
+        * /branches/extragear/trinity/graphics/digikam/libs/dimg/loaders/rawloader.cpp:
           added debug info
 
 2008-03-10 21:17  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/NEWS: update
+        * /branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2008-03-10 21:16  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/libs/dimg/loaders/Makefile.am,
-          /branches/extragear/kde3/graphics/digikam/libs/dimg/loaders/rawloader.cpp:
+        * /branches/extragear/trinity/graphics/digikam/libs/dimg/loaders/Makefile.am,
+          /branches/extragear/trinity/graphics/digikam/libs/dimg/loaders/rawloader.cpp:
           digiKam from KDE3 branch : RAW image loader : backport 8 bits
           color depth auto-gamma and auto-white balance adjustements from
           dcraw with 16 bits color depth.
@@ -7528,54 +7528,54 @@
 
 2008-03-10 13:39  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/libs/dimg/filters/bcgmodifier.cpp,
-          /branches/extragear/kde3/graphics/digikam/libs/dimg/filters/bcgmodifier.h:
+        * /branches/extragear/trinity/graphics/digikam/libs/dimg/filters/bcgmodifier.cpp,
+          /branches/extragear/trinity/graphics/digikam/libs/dimg/filters/bcgmodifier.h:
           new method to handle image data directly without to use a DImg
           object
 
 2008-03-10 06:49  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/libs/themeengine/themeengine.cpp:
+        * /branches/extragear/trinity/graphics/digikam/libs/themeengine/themeengine.cpp:
           backup full default palette is better
 
 2008-03-10 06:49  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/digikam/version.h:
+        * /branches/extragear/trinity/graphics/digikam/digikam/version.h:
           update
 
 2008-03-10 06:47  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/digikam.lsm: update
+        * /branches/extragear/trinity/graphics/digikam/digikam.lsm: update
 
 2008-03-10 06:47  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/NEWS: update
+        * /branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2008-03-10 06:46  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/libs/dimg/loaders/rawloader.h:
+        * /branches/extragear/trinity/graphics/digikam/libs/dimg/loaders/rawloader.h:
           fix warnings
 
 2008-03-10 05:19  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/libs/themeengine/themeengine.cpp:
+        * /branches/extragear/trinity/graphics/digikam/libs/themeengine/themeengine.cpp:
           preserve KDE background color with Default theme
 
 2008-03-09 15:22  cgilles
 
-        * /branches/extragear/kde3/graphics/digikam/libs/dimg/loaders/rawloader.cpp,
-          /branches/extragear/kde3/graphics/digikam/libs/dimg/loaders/rawloader.h:
+        * /branches/extragear/trinity/graphics/digikam/libs/dimg/loaders/rawloader.cpp,
+          /branches/extragear/trinity/graphics/digikam/libs/dimg/loaders/rawloader.h:
           polish
 
 2008-03-09 10:03  gkulzer
 
-        * /branches/extragear/kde3/graphics/digikam/ChangeLog: update to
+        * /branches/extragear/trinity/graphics/digikam/ChangeLog: update to
           0.9.4-beta1 relase
 
 2008-03-09 09:45  gkulzer
 
-        * /branches/extragear/kde3/graphics/digikam/release_digikam.rb,
-          /branches/extragear/kde3/graphics/digikam/release_digikam_docs.rb:
+        * /branches/extragear/trinity/graphics/digikam/release_digikam.rb,
+          /branches/extragear/trinity/graphics/digikam/release_digikam_docs.rb:
           update to 0.9.4-beta1 release
 
 0.9.4-beta1 2008-03-09
@@ -10063,33 +10063,33 @@ v0.9.3-beta2 - 2007-11-01
 ----------------------------------------------------------------------------
 2007-10-31 07:55  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/NEWS: polish
+	* branches/extragear/trinity/graphics/digikam/NEWS: polish
 
 2007-10-30 21:17  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/digikam/iconview.cpp,
-	  branches/extragear/kde3/graphics/digikam/digikam/iconview.h:
+	* branches/extragear/trinity/graphics/digikam/digikam/iconview.cpp,
+	  branches/extragear/trinity/graphics/digikam/digikam/iconview.h:
 	  polish
 
 2007-10-30 21:12  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/digikam/albumiconview.cpp:
+	* branches/extragear/trinity/graphics/digikam/digikam/albumiconview.cpp:
 	  polish
 
 2007-10-30 20:57  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/digikam/albumiconview.cpp:
+	* branches/extragear/trinity/graphics/digikam/digikam/albumiconview.cpp:
 	  polish
 
 2007-10-30 20:52  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/digikam/datefolderview.cpp:
+	* branches/extragear/trinity/graphics/digikam/digikam/datefolderview.cpp:
 	  polish
 
 2007-10-30 18:21  abaecker
 
-	* branches/extragear/kde3/graphics/digikam/NEWS,
-	  branches/extragear/kde3/graphics/digikam/kioslave/digikamsearch.cpp:
+	* branches/extragear/trinity/graphics/digikam/NEWS,
+	  branches/extragear/trinity/graphics/digikam/kioslave/digikamsearch.cpp:
 	  Treat non-voted pictures as if they have 0-rating when doing a
 	  search.
 
@@ -10098,20 +10098,20 @@ v0.9.3-beta2 - 2007-11-01
 
 2007-10-30 18:16  abaecker
 
-	* branches/extragear/kde3/graphics/digikam/NEWS,
-	  branches/extragear/kde3/graphics/digikam/digikam/album.cpp,
-	  branches/extragear/kde3/graphics/digikam/digikam/albumfolderview.cpp,
-	  branches/extragear/kde3/graphics/digikam/digikam/albumfolderview.h,
-	  branches/extragear/kde3/graphics/digikam/digikam/albumiconview.cpp,
-	  branches/extragear/kde3/graphics/digikam/digikam/albumiconview.h,
-	  branches/extragear/kde3/graphics/digikam/digikam/datefolderview.cpp,
-	  branches/extragear/kde3/graphics/digikam/digikam/datefolderview.h,
-	  branches/extragear/kde3/graphics/digikam/digikam/digikamview.cpp,
-	  branches/extragear/kde3/graphics/digikam/digikam/digikamview.h,
-	  branches/extragear/kde3/graphics/digikam/digikam/iconview.cpp,
-	  branches/extragear/kde3/graphics/digikam/digikam/iconview.h,
-	  branches/extragear/kde3/graphics/digikam/digikam/tagfolderview.h,
-	  branches/extragear/kde3/graphics/digikam/digikam/welcomepageview.cpp:
+	* branches/extragear/trinity/graphics/digikam/NEWS,
+	  branches/extragear/trinity/graphics/digikam/digikam/album.cpp,
+	  branches/extragear/trinity/graphics/digikam/digikam/albumfolderview.cpp,
+	  branches/extragear/trinity/graphics/digikam/digikam/albumfolderview.h,
+	  branches/extragear/trinity/graphics/digikam/digikam/albumiconview.cpp,
+	  branches/extragear/trinity/graphics/digikam/digikam/albumiconview.h,
+	  branches/extragear/trinity/graphics/digikam/digikam/datefolderview.cpp,
+	  branches/extragear/trinity/graphics/digikam/digikam/datefolderview.h,
+	  branches/extragear/trinity/graphics/digikam/digikam/digikamview.cpp,
+	  branches/extragear/trinity/graphics/digikam/digikam/digikamview.h,
+	  branches/extragear/trinity/graphics/digikam/digikam/iconview.cpp,
+	  branches/extragear/trinity/graphics/digikam/digikam/iconview.h,
+	  branches/extragear/trinity/graphics/digikam/digikam/tagfolderview.h,
+	  branches/extragear/trinity/graphics/digikam/digikam/welcomepageview.cpp:
 	  New entry of the right-mouse-click menu in the album view to go
 	  to the folder of a given image (when in tags/searches or date
 	  view)
@@ -10123,33 +10123,33 @@ v0.9.3-beta2 - 2007-11-01
 
 2007-10-30 13:37  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/digikam/welcomepageview.cpp:
+	* branches/extragear/trinity/graphics/digikam/digikam/welcomepageview.cpp:
 	  update new features
 
 2007-10-30 08:51  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/digikam/albumiconview.cpp:
+	* branches/extragear/trinity/graphics/digikam/digikam/albumiconview.cpp:
 	  do not mix both separator on menu, especially with Date and
 	  Search view
 
 2007-10-30 08:51  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/digikam/folderview.h:
+	* branches/extragear/trinity/graphics/digikam/digikam/folderview.h:
 	  polish
 
 2007-10-30 08:42  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/digikam/folderview.cpp:
+	* branches/extragear/trinity/graphics/digikam/digikam/folderview.cpp:
 	  init private members in private class
 
 2007-10-30 08:41  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/utilities/setup/setupicc.cpp:
+	* branches/extragear/trinity/graphics/digikam/utilities/setup/setupicc.cpp:
 	  fix indent
 
 2007-10-30 08:29  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/digikam/folderview.cpp:
+	* branches/extragear/trinity/graphics/digikam/digikam/folderview.cpp:
 	  few polish. test if foundItem exist before to call Qt methods. I
 	  don't know if api test validity of pointer. This will prevent a
 	  possible crash.
@@ -10157,8 +10157,8 @@ v0.9.3-beta2 - 2007-11-01
 
 2007-10-30 08:10  abaecker
 
-	* branches/extragear/kde3/graphics/digikam/NEWS,
-	  branches/extragear/kde3/graphics/digikam/digikam/folderview.cpp:
+	* branches/extragear/trinity/graphics/digikam/NEWS,
+	  branches/extragear/trinity/graphics/digikam/digikam/folderview.cpp:
 	  Scroll the left panel on start up to so that the current
 	  selection is visible.
 
@@ -10167,7 +10167,7 @@ v0.9.3-beta2 - 2007-11-01
 
 2007-10-26 17:15  abaecker
 
-	* branches/extragear/kde3/graphics/digikam/digikam/ratingwidget.cpp:
+	* branches/extragear/trinity/graphics/digikam/digikam/ratingwidget.cpp:
 	  Ensure that rating cannot be smaller than RatingMin when dragging
 	  the mouse.
 
@@ -10176,8 +10176,8 @@ v0.9.3-beta2 - 2007-11-01
 
 2007-10-26 16:52  abaecker
 
-	* branches/extragear/kde3/graphics/digikam/NEWS,
-	  branches/extragear/kde3/graphics/digikam/digikam/ratingwidget.cpp:
+	* branches/extragear/trinity/graphics/digikam/NEWS,
+	  branches/extragear/trinity/graphics/digikam/digikam/ratingwidget.cpp:
 	  Ensure that rating cannot be larger than RatingMax when dragging
 	  the mouse.
 
@@ -10186,74 +10186,74 @@ v0.9.3-beta2 - 2007-11-01
 
 2007-10-26 13:29  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/digikam/mimefilter.cpp:
+	* branches/extragear/trinity/graphics/digikam/digikam/mimefilter.cpp:
 	  add tool tip
 
 2007-10-26 13:23  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/NEWS: update
+	* branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2007-10-26 13:22  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/libs/greycstoration/CImg.h:
+	* branches/extragear/trinity/graphics/digikam/libs/greycstoration/CImg.h:
 	  update internal CImg library from 1.2.3 to last stable 1.2.4
 
 2007-10-23 17:16  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/digikam/mimefilter.cpp:
+	* branches/extragear/trinity/graphics/digikam/digikam/mimefilter.cpp:
 	  typo
 
 2007-10-23 09:31  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/digikam/kipiinterface.cpp:
+	* branches/extragear/trinity/graphics/digikam/digikam/kipiinterface.cpp:
 	  clone all attributes
 
 2007-10-23 08:40  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/NEWS: update
+	* branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2007-10-23 08:38  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/digikam/albumsettings.cpp:
+	* branches/extragear/trinity/graphics/digikam/digikam/albumsettings.cpp:
 	  polish
 
 2007-10-23 08:23  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/digikam/albumlister.cpp:
+	* branches/extragear/trinity/graphics/digikam/digikam/albumlister.cpp:
 	  polish
 
 2007-10-23 07:56  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/NEWS: update
+	* branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2007-10-23 07:54  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/release_digikam.rb: fix
+	* branches/extragear/trinity/graphics/digikam/release_digikam.rb: fix
 	  release
 
 2007-10-23 07:54  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/digikam.lsm: fix version
+	* branches/extragear/trinity/graphics/digikam/digikam.lsm: fix version
 
 2007-10-23 07:53  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/digikam/version.h: fix
+	* branches/extragear/trinity/graphics/digikam/digikam/version.h: fix
 	  version
 
 2007-10-23 07:50  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/digikam/Makefile.am,
-	  branches/extragear/kde3/graphics/digikam/digikam/albumlister.cpp,
-	  branches/extragear/kde3/graphics/digikam/digikam/albumlister.h,
-	  branches/extragear/kde3/graphics/digikam/digikam/albumsettings.cpp,
-	  branches/extragear/kde3/graphics/digikam/digikam/albumsettings.h,
-	  branches/extragear/kde3/graphics/digikam/digikam/digikamapp.cpp,
-	  branches/extragear/kde3/graphics/digikam/digikam/digikamapp.h,
-	  branches/extragear/kde3/graphics/digikam/digikam/digikamappprivate.h,
-	  branches/extragear/kde3/graphics/digikam/digikam/mimefilter.cpp,
-	  branches/extragear/kde3/graphics/digikam/digikam/mimefilter.h,
-	  branches/extragear/kde3/graphics/digikam/digikam/ratingfilter.cpp,
-	  branches/extragear/kde3/graphics/digikam/digikam/ratingfilter.h:
+	* branches/extragear/trinity/graphics/digikam/digikam/Makefile.am,
+	  branches/extragear/trinity/graphics/digikam/digikam/albumlister.cpp,
+	  branches/extragear/trinity/graphics/digikam/digikam/albumlister.h,
+	  branches/extragear/trinity/graphics/digikam/digikam/albumsettings.cpp,
+	  branches/extragear/trinity/graphics/digikam/digikam/albumsettings.h,
+	  branches/extragear/trinity/graphics/digikam/digikam/digikamapp.cpp,
+	  branches/extragear/trinity/graphics/digikam/digikam/digikamapp.h,
+	  branches/extragear/trinity/graphics/digikam/digikam/digikamappprivate.h,
+	  branches/extragear/trinity/graphics/digikam/digikam/mimefilter.cpp,
+	  branches/extragear/trinity/graphics/digikam/digikam/mimefilter.h,
+	  branches/extragear/trinity/graphics/digikam/digikam/ratingfilter.cpp,
+	  branches/extragear/trinity/graphics/digikam/digikam/ratingfilter.h:
 	  digiKam from KDE3 branch : added a mime type pattern selection to
 	  the Album GUI status bar to filter album content based on file
 	  mime type.
@@ -10276,50 +10276,50 @@ v0.9.3-beta2 - 2007-11-01
 
 2007-10-23 06:42  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/digikam/albumsettings.cpp,
-	  branches/extragear/kde3/graphics/digikam/digikam/albumsettings.h:
+	* branches/extragear/trinity/graphics/digikam/digikam/albumsettings.cpp,
+	  branches/extragear/trinity/graphics/digikam/digikam/albumsettings.h:
 	  fix credits
 
 2007-10-23 06:09  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/digikam/ratingfilter.cpp:
+	* branches/extragear/trinity/graphics/digikam/digikam/ratingfilter.cpp:
 	  compile
 
 2007-10-23 05:48  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/digikam/ratingfilter.cpp,
-	  branches/extragear/kde3/graphics/digikam/digikam/ratingfilter.h:
+	* branches/extragear/trinity/graphics/digikam/digikam/ratingfilter.cpp,
+	  branches/extragear/trinity/graphics/digikam/digikam/ratingfilter.h:
 	  add whatsthis
 
 2007-10-22 14:08  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/digikam/albumsettings.cpp,
-	  branches/extragear/kde3/graphics/digikam/digikam/digikamapp.cpp:
+	* branches/extragear/trinity/graphics/digikam/digikam/albumsettings.cpp,
+	  branches/extragear/trinity/graphics/digikam/digikam/digikamapp.cpp:
 	  polish
 
 2007-10-22 13:20  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/digikam/albumlister.cpp,
-	  branches/extragear/kde3/graphics/digikam/digikam/albumlister.h:
+	* branches/extragear/trinity/graphics/digikam/digikam/albumlister.cpp,
+	  branches/extragear/trinity/graphics/digikam/digikam/albumlister.h:
 	  polish
 
 2007-10-22 13:01  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/NEWS: polish
+	* branches/extragear/trinity/graphics/digikam/NEWS: polish
 
 2007-10-22 10:36  abaecker
 
-	* branches/extragear/kde3/graphics/digikam/NEWS,
-	  branches/extragear/kde3/graphics/digikam/digikam/Makefile.am,
-	  branches/extragear/kde3/graphics/digikam/digikam/albumlister.cpp,
-	  branches/extragear/kde3/graphics/digikam/digikam/albumlister.h,
-	  branches/extragear/kde3/graphics/digikam/digikam/albumsettings.cpp,
-	  branches/extragear/kde3/graphics/digikam/digikam/albumsettings.h,
-	  branches/extragear/kde3/graphics/digikam/digikam/digikamapp.cpp,
-	  branches/extragear/kde3/graphics/digikam/digikam/digikamapp.h,
-	  branches/extragear/kde3/graphics/digikam/digikam/digikamappprivate.h,
-	  branches/extragear/kde3/graphics/digikam/digikam/ratingfilter.cpp,
-	  branches/extragear/kde3/graphics/digikam/digikam/ratingfilter.h:
+	* branches/extragear/trinity/graphics/digikam/NEWS,
+	  branches/extragear/trinity/graphics/digikam/digikam/Makefile.am,
+	  branches/extragear/trinity/graphics/digikam/digikam/albumlister.cpp,
+	  branches/extragear/trinity/graphics/digikam/digikam/albumlister.h,
+	  branches/extragear/trinity/graphics/digikam/digikam/albumsettings.cpp,
+	  branches/extragear/trinity/graphics/digikam/digikam/albumsettings.h,
+	  branches/extragear/trinity/graphics/digikam/digikam/digikamapp.cpp,
+	  branches/extragear/trinity/graphics/digikam/digikam/digikamapp.h,
+	  branches/extragear/trinity/graphics/digikam/digikam/digikamappprivate.h,
+	  branches/extragear/trinity/graphics/digikam/digikam/ratingfilter.cpp,
+	  branches/extragear/trinity/graphics/digikam/digikam/ratingfilter.h:
 	  Addition of a Rating filter in the status bar.
 	  This allows to restrict the displayed images to be >=, =, <= a
 	  given rating.
@@ -10329,24 +10329,24 @@ v0.9.3-beta2 - 2007-11-01
 
 2007-10-21 17:53  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/utilities/setup/setupicc.cpp:
+	* branches/extragear/trinity/graphics/digikam/utilities/setup/setupicc.cpp:
 	  bug fix : the list of color profiles is not set properly into the
 	  squeezed combo box
 
 2007-10-21 17:53  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/libs/widgets/common/squeezedcombobox.cpp,
-	  branches/extragear/kde3/graphics/digikam/libs/widgets/common/squeezedcombobox.h:
+	* branches/extragear/trinity/graphics/digikam/libs/widgets/common/squeezedcombobox.cpp,
+	  branches/extragear/trinity/graphics/digikam/libs/widgets/common/squeezedcombobox.h:
 	  new method to set a list of items to a squeezed combo box
 
 2007-10-21 15:05  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/libs/widgets/common/squeezedcombobox.cpp:
+	* branches/extragear/trinity/graphics/digikam/libs/widgets/common/squeezedcombobox.cpp:
 	  backport commit #727706 from libkipiplugins
 
 2007-10-21 12:08  hasso
 
-	* branches/extragear/kde3/graphics/digikam/configure.in.in: Make it
+	* branches/extragear/trinity/graphics/digikam/configure.in.in: Make it
 	  to find the lcms from nonstandard places provided by user via
 	  --with-extra-* flags. Fixes detecting lcms installed from pkgsrc
 	  package
@@ -10354,70 +10354,70 @@ v0.9.3-beta2 - 2007-11-01
 
 2007-10-15 09:52  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/utilities/cameragui/renamecustomizer.cpp:
+	* branches/extragear/trinity/graphics/digikam/utilities/cameragui/renamecustomizer.cpp:
 	  typo
 
 2007-10-15 05:45  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/NEWS.0.9.1: fix
+	* branches/extragear/trinity/graphics/digikam/NEWS.0.9.1: fix
 	  duplicate
 
 2007-10-13 07:11  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/showfoto/showfoto.desktop:
+	* branches/extragear/trinity/graphics/digikam/showfoto/showfoto.desktop:
 	  patch from Angelo
 
 2007-10-09 16:08  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/digikam/ratingwidget.cpp:
+	* branches/extragear/trinity/graphics/digikam/digikam/ratingwidget.cpp:
 	  check rating limits
 
 2007-10-09 13:15  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/digikam/ratingwidget.cpp,
-	  branches/extragear/kde3/graphics/digikam/digikam/ratingwidget.h:
+	* branches/extragear/trinity/graphics/digikam/digikam/ratingwidget.cpp,
+	  branches/extragear/trinity/graphics/digikam/digikam/ratingwidget.h:
 	  update
 
 2007-10-09 12:55  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/digikam/ratingwidget.cpp,
-	  branches/extragear/kde3/graphics/digikam/digikam/ratingwidget.h:
+	* branches/extragear/trinity/graphics/digikam/digikam/ratingwidget.cpp,
+	  branches/extragear/trinity/graphics/digikam/digikam/ratingwidget.h:
 	  prepare rating widget to be derivated to a Rating filter widget
 	  dixit a patch from Arnd
 	  CCMAIL: baecker@physik.tu-dresden.de
 
 2007-10-09 11:19  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/libs/widgets/common/squeezedcombobox.h:
+	* branches/extragear/trinity/graphics/digikam/libs/widgets/common/squeezedcombobox.h:
 	  link
 
 2007-10-09 11:08  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/utilities/setup/setupicc.cpp:
+	* branches/extragear/trinity/graphics/digikam/utilities/setup/setupicc.cpp:
 	  backport commits #723326 on digiKam for KDE3
 	  CCBUGS: 148151
 
 2007-10-09 11:07  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/libs/widgets/common/squeezedcombobox.h:
+	* branches/extragear/trinity/graphics/digikam/libs/widgets/common/squeezedcombobox.h:
 	  backport depreceate methods from KDE4
 
 2007-10-09 08:34  gkulzer
 
-	* branches/extragear/kde3/graphics/digikam/PACKAGING: ML update
+	* branches/extragear/trinity/graphics/digikam/PACKAGING: ML update
 
 2007-10-08 14:01  gkulzer
 
-	* branches/extragear/kde3/graphics/digikam/release_digikam.rb:
+	* branches/extragear/trinity/graphics/digikam/release_digikam.rb:
 	  update for 0.9.3-beta1 release
 
 2007-10-08 05:51  gkulzer
 
-	* branches/extragear/kde3/graphics/digikam/ChangeLog: beta1
+	* branches/extragear/trinity/graphics/digikam/ChangeLog: beta1
 
 2007-10-08 05:35  gkulzer
 
-	* branches/extragear/kde3/graphics/digikam/NEWS: add digikamui.rc
+	* branches/extragear/trinity/graphics/digikam/NEWS: add digikamui.rc
 	  fix for missing toolbar
 
 
@@ -10425,26 +10425,26 @@ v0.9.3-beta1 - 2007-010-08
 ----------------------------------------------------------------------------
 2007-10-08 05:10  gkulzer
 
-	* branches/extragear/kde3/graphics/digikam/release_digikam.rb:
+	* branches/extragear/trinity/graphics/digikam/release_digikam.rb:
 	  release 0.9.3
 
 2007-10-08 04:19  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/digikam/version.h:
+	* branches/extragear/trinity/graphics/digikam/digikam/version.h:
 	  rc1->beta1
 
 2007-10-08 04:17  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/digikam.lsm: rc1 =>
+	* branches/extragear/trinity/graphics/digikam/digikam.lsm: rc1 =>
 	  beta1
 
 2007-10-08 04:15  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/NEWS: update
+	* branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2007-10-07 16:49  mwiesweg
 
-	* branches/extragear/kde3/graphics/digikam/digikam/digikamapp.cpp:
+	* branches/extragear/trinity/graphics/digikam/digikam/digikamapp.cpp:
 	  Fix the bug that after an exit from full screen mode, the hidden
 	  menu & tabs would be saved by KMainWindow as default setting.
 	  The first patch from Arnd was correct, except one problem: all
@@ -10456,38 +10456,38 @@ v0.9.3-beta1 - 2007-010-08
 
 2007-10-07 14:44  gkulzer
 
-	* branches/extragear/kde3/graphics/digikam/digikam.lsm: release
+	* branches/extragear/trinity/graphics/digikam/digikam.lsm: release
 	  0.9.3-rc1
 
 2007-10-07 14:42  gkulzer
 
-	* branches/extragear/kde3/graphics/digikam/digikam/version.h:
+	* branches/extragear/trinity/graphics/digikam/digikam/version.h:
 	  release 0.9.3-rc1
 
 2007-10-07 14:35  gkulzer
 
-	* branches/extragear/kde3/graphics/digikam/ChangeLog: release
+	* branches/extragear/trinity/graphics/digikam/ChangeLog: release
 	  0.9.3-beta1
 
 2007-10-07 13:38  mwiesweg
 
-	* branches/extragear/kde3/graphics/digikam/digikam/digikamui.rc:
+	* branches/extragear/trinity/graphics/digikam/digikam/digikamui.rc:
 	  Remove one tag too much which closed the xml and removed the
 	  toolbar (see reports on ML)
 
 
 2007-10-03 16:27  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/digikam/digikamui.rc:
+	* branches/extragear/trinity/graphics/digikam/digikam/digikamui.rc:
 	  backport commits #720743 from KDE4
 
 2007-10-03 14:38  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/NEWS: update
+	* branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2007-10-03 14:34  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/digikam/kipiinterface.cpp:
+	* branches/extragear/trinity/graphics/digikam/digikam/kipiinterface.cpp:
 	  digiKAm from KDE3 branch : kipi-plugins interface :
 	  setDescription() do only set picture comment in database and
 	  untouch picture metadata
@@ -10495,126 +10495,126 @@ v0.9.3-beta1 - 2007-010-08
 
 2007-10-03 12:58  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/utilities/setup/setupidentity.cpp:
+	* branches/extragear/trinity/graphics/digikam/utilities/setup/setupidentity.cpp:
 	  polish
 
 2007-10-03 11:36  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/libs/dimg/loaders/pngloader.cpp:
+	* branches/extragear/trinity/graphics/digikam/libs/dimg/loaders/pngloader.cpp:
 	  fix warnings
 
 2007-10-03 11:31  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/libs/dimg/loaders/jpegloader.cpp,
-	  branches/extragear/kde3/graphics/digikam/libs/dimg/loaders/tiffloader.cpp:
+	* branches/extragear/trinity/graphics/digikam/libs/dimg/loaders/jpegloader.cpp,
+	  branches/extragear/trinity/graphics/digikam/libs/dimg/loaders/tiffloader.cpp:
 	  fix warnings
 
 2007-10-03 11:27  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/libs/dimg/loaders/jpegsettings.cpp:
+	* branches/extragear/trinity/graphics/digikam/libs/dimg/loaders/jpegsettings.cpp:
 	  polish
 
 2007-10-03 11:24  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/utilities/setup/setupidentity.cpp:
+	* branches/extragear/trinity/graphics/digikam/utilities/setup/setupidentity.cpp:
 	  polish help
 
 2007-10-02 12:13  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/NEWS: update
+	* branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2007-10-01 12:29  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/libs/widgets/metadata/exifwidget.cpp,
-	  branches/extragear/kde3/graphics/digikam/libs/widgets/metadata/gpswidget.cpp,
-	  branches/extragear/kde3/graphics/digikam/libs/widgets/metadata/iptcwidget.cpp,
-	  branches/extragear/kde3/graphics/digikam/libs/widgets/metadata/makernotewidget.cpp:
+	* branches/extragear/trinity/graphics/digikam/libs/widgets/metadata/exifwidget.cpp,
+	  branches/extragear/trinity/graphics/digikam/libs/widgets/metadata/gpswidget.cpp,
+	  branches/extragear/trinity/graphics/digikam/libs/widgets/metadata/iptcwidget.cpp,
+	  branches/extragear/trinity/graphics/digikam/libs/widgets/metadata/makernotewidget.cpp:
 	  backport commit #719595 from trunk
 
 2007-09-28 14:18  gkulzer
 
-	* branches/extragear/kde3/graphics/digikam/utilities/setup/setupslideshow.cpp:
+	* branches/extragear/trinity/graphics/digikam/utilities/setup/setupslideshow.cpp:
 	  comments->caption = clearer English
 
 2007-09-28 13:36  fsalvi
 
-	* branches/extragear/kde3/graphics/digikam/utilities/cameragui/cameraui.cpp,
-	  branches/extragear/kde3/graphics/digikam/utilities/lighttable/lighttablebar.cpp:
+	* branches/extragear/trinity/graphics/digikam/utilities/cameragui/cameraui.cpp,
+	  branches/extragear/trinity/graphics/digikam/utilities/lighttable/lighttablebar.cpp:
 	  Fix i18n
 
 	  CCMAIL: digikam-devel@kde.org
 
 2007-09-28 10:45  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/libs/widgets/metadata/exifwidget.cpp,
-	  branches/extragear/kde3/graphics/digikam/libs/widgets/metadata/gpswidget.cpp,
-	  branches/extragear/kde3/graphics/digikam/libs/widgets/metadata/iptcwidget.cpp,
-	  branches/extragear/kde3/graphics/digikam/libs/widgets/metadata/makernotewidget.cpp:
+	* branches/extragear/trinity/graphics/digikam/libs/widgets/metadata/exifwidget.cpp,
+	  branches/extragear/trinity/graphics/digikam/libs/widgets/metadata/gpswidget.cpp,
+	  branches/extragear/trinity/graphics/digikam/libs/widgets/metadata/iptcwidget.cpp,
+	  branches/extragear/trinity/graphics/digikam/libs/widgets/metadata/makernotewidget.cpp:
 	  digiKam from KDE3 branch : if metadata tag key is unkown from
 	  Exiv2, do not display "Unkown", but the last section of the key
 	  instead
 
 2007-09-28 09:04  gkulzer
 
-	* branches/extragear/kde3/graphics/digikam/utilities/setup/setupgeneral.cpp,
-	  branches/extragear/kde3/graphics/digikam/utilities/setup/setupmetadata.cpp,
-	  branches/extragear/kde3/graphics/digikam/utilities/setup/setuptooltip.cpp:
+	* branches/extragear/trinity/graphics/digikam/utilities/setup/setupgeneral.cpp,
+	  branches/extragear/trinity/graphics/digikam/utilities/setup/setupmetadata.cpp,
+	  branches/extragear/trinity/graphics/digikam/utilities/setup/setuptooltip.cpp:
 	  comments->caption = clearer English
 
 2007-09-28 09:03  gkulzer
 
-	* branches/extragear/kde3/graphics/digikam/utilities/lighttable/lighttablebar.cpp:
+	* branches/extragear/trinity/graphics/digikam/utilities/lighttable/lighttablebar.cpp:
 	  comments->caption = clearer English
 
 2007-09-28 09:03  gkulzer
 
-	* branches/extragear/kde3/graphics/digikam/themedesigner/themediconitem.cpp:
+	* branches/extragear/trinity/graphics/digikam/themedesigner/themediconitem.cpp:
 	  comments->caption = clearer English
 
 2007-09-28 09:02  gkulzer
 
-	* branches/extragear/kde3/graphics/digikam/libs/imageproperties/imagedescedittab.cpp,
-	  branches/extragear/kde3/graphics/digikam/libs/imageproperties/imagepropertiessidebardb.cpp:
+	* branches/extragear/trinity/graphics/digikam/libs/imageproperties/imagedescedittab.cpp,
+	  branches/extragear/trinity/graphics/digikam/libs/imageproperties/imagepropertiessidebardb.cpp:
 	  comments->caption = clearer English
 
 2007-09-28 09:01  gkulzer
 
-	* branches/extragear/kde3/graphics/digikam/digikam/albumfiletip.cpp,
-	  branches/extragear/kde3/graphics/digikam/digikam/albumpropsedit.cpp:
+	* branches/extragear/trinity/graphics/digikam/digikam/albumfiletip.cpp,
+	  branches/extragear/trinity/graphics/digikam/digikam/albumpropsedit.cpp:
 	  comments->caption = clearer English
 
 2007-09-27 14:49  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/utilities/setup/setupmetadata.cpp:
+	* branches/extragear/trinity/graphics/digikam/utilities/setup/setupmetadata.cpp:
 	  polish
 
 2007-09-27 06:18  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/utilities/setup/setupcollections.cpp:
+	* branches/extragear/trinity/graphics/digikam/utilities/setup/setupcollections.cpp:
 	  add icons on buttons
 
 2007-09-27 06:07  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/utilities/setup/setupcamera.cpp:
+	* branches/extragear/trinity/graphics/digikam/utilities/setup/setupcamera.cpp:
 	  add icon on buttons
 
 2007-09-24 10:53  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.cpp:
+	* branches/extragear/trinity/graphics/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.cpp:
 	  fix i18n
 
 2007-09-24 09:05  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/AUTHORS: polish
+	* branches/extragear/trinity/graphics/digikam/AUTHORS: polish
 
 2007-09-24 09:02  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/AUTHORS: update
+	* branches/extragear/trinity/graphics/digikam/AUTHORS: update
 
 2007-09-24 08:57  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/showfoto/pics/showfoto-splash.png,
-	  branches/extragear/kde3/graphics/digikam/showfoto/pics/showfoto-splash.xcf:
+	* branches/extragear/trinity/graphics/digikam/showfoto/pics/showfoto-splash.png,
+	  branches/extragear/trinity/graphics/digikam/showfoto/pics/showfoto-splash.xcf:
 	  digiKam from KDE3 branch : new Showfoto 0.7.0 splashscreen from
 	  Joel Koop
 	  Joel, you is the winner...
@@ -10622,8 +10622,8 @@ v0.9.3-beta1 - 2007-010-08
 
 2007-09-24 08:55  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/data/pics/digikam-splash.png,
-	  branches/extragear/kde3/graphics/digikam/data/pics/digikam-splash.xcf:
+	* branches/extragear/trinity/graphics/digikam/data/pics/digikam-splash.png,
+	  branches/extragear/trinity/graphics/digikam/data/pics/digikam-splash.xcf:
 	  digiKam from KDE3 branch : new digiKam 0.9.3 splashscreen from
 	  Laurenz Gamper
 	  Laurenz, you is the winner...
@@ -10631,15 +10631,15 @@ v0.9.3-beta1 - 2007-010-08
 
 2007-09-22 15:15  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/NEWS: typo
+	* branches/extragear/trinity/graphics/digikam/NEWS: typo
 
 2007-09-19 06:04  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/NEWS: update
+	* branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2007-09-15 13:39  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/utilities/imageeditor/editor/editorwindow.cpp:
+	* branches/extragear/trinity/graphics/digikam/utilities/imageeditor/editor/editorwindow.cpp:
 	  digiKam from KDE3 branch : add "Do not ask me again" option about
 	  to overwrite current image when user when to save it from editor
 	  (File/Save)
@@ -10647,153 +10647,153 @@ v0.9.3-beta1 - 2007-010-08
 
 2007-09-15 07:50  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/libs/widgets/common/filesaveoptionsbox.cpp:
+	* branches/extragear/trinity/graphics/digikam/libs/widgets/common/filesaveoptionsbox.cpp:
 	  digiKam from KDE3 branch : bugfix : don't mix JPEG subsampling
 	  and compression settings.
 	  CCMAIL: gerhard@kulzer.net
 
 2007-09-14 11:48  gkulzer
 
-	* branches/extragear/kde3/graphics/digikam/digikam/albumfolderview.cpp,
-	  branches/extragear/kde3/graphics/digikam/digikam/digikamapp.cpp:
+	* branches/extragear/trinity/graphics/digikam/digikam/albumfolderview.cpp,
+	  branches/extragear/trinity/graphics/digikam/digikam/digikamapp.cpp:
 	  shorten icon texts, Edit Album Properties -> Album Properties
 
 2007-09-13 07:39  gkulzer
 
-	* branches/extragear/kde3/graphics/digikam/ChangeLog,
-	  branches/extragear/kde3/graphics/digikam/NEWS.0.9.0,
-	  branches/extragear/kde3/graphics/digikam/NEWS.0.9.1,
-	  branches/extragear/kde3/graphics/digikam/NEWS.0.9.2,
-	  branches/extragear/kde3/graphics/digikam/TODO,
-	  branches/extragear/kde3/graphics/digikam/libs/dmetadata/dmetadata.cpp,
-	  branches/extragear/kde3/graphics/digikam/libs/greycstoration/greycstorationwidget.cpp,
-	  branches/extragear/kde3/graphics/digikam/libs/imageproperties/imagedescedittab.cpp,
-	  branches/extragear/kde3/graphics/digikam/libs/imageproperties/talbumlistview.cpp,
-	  branches/extragear/kde3/graphics/digikam/libs/jpegutils/jpegutils.cpp,
-	  branches/extragear/kde3/graphics/digikam/libs/jpegutils/libjpeg62.README,
-	  branches/extragear/kde3/graphics/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp,
-	  branches/extragear/kde3/graphics/digikam/showfoto/setup/setuptooltip.cpp,
-	  branches/extragear/kde3/graphics/digikam/showfoto/showfoto.cpp,
-	  branches/extragear/kde3/graphics/digikam/utilities/batch/batchalbumssyncmetadata.cpp,
-	  branches/extragear/kde3/graphics/digikam/utilities/batch/batchsyncmetadata.cpp,
-	  branches/extragear/kde3/graphics/digikam/utilities/batch/batchsyncmetadata.h,
-	  branches/extragear/kde3/graphics/digikam/utilities/cameragui/camerafolderdialog.cpp,
-	  branches/extragear/kde3/graphics/digikam/utilities/cameragui/cameraui.cpp,
-	  branches/extragear/kde3/graphics/digikam/utilities/cameragui/renamecustomizer.cpp,
-	  branches/extragear/kde3/graphics/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.cpp,
-	  branches/extragear/kde3/graphics/digikam/utilities/imageeditor/editor/editorwindow.cpp,
-	  branches/extragear/kde3/graphics/digikam/utilities/imageeditor/tools/imageresize.cpp,
-	  branches/extragear/kde3/graphics/digikam/utilities/imageeditor/tools/imageresize.h,
-	  branches/extragear/kde3/graphics/digikam/utilities/setup/cameraselection.cpp,
-	  branches/extragear/kde3/graphics/digikam/utilities/setup/setupgeneral.cpp,
-	  branches/extragear/kde3/graphics/digikam/utilities/setup/setupicc.cpp,
-	  branches/extragear/kde3/graphics/digikam/utilities/setup/setupidentity.cpp,
-	  branches/extragear/kde3/graphics/digikam/utilities/setup/setuptooltip.cpp,
-	  branches/extragear/kde3/graphics/digikam/utilities/slideshow/slideshow.cpp,
-	  branches/extragear/kde3/graphics/digikam/utilities/slideshow/slideshowsettings.h:
+	* branches/extragear/trinity/graphics/digikam/ChangeLog,
+	  branches/extragear/trinity/graphics/digikam/NEWS.0.9.0,
+	  branches/extragear/trinity/graphics/digikam/NEWS.0.9.1,
+	  branches/extragear/trinity/graphics/digikam/NEWS.0.9.2,
+	  branches/extragear/trinity/graphics/digikam/TODO,
+	  branches/extragear/trinity/graphics/digikam/libs/dmetadata/dmetadata.cpp,
+	  branches/extragear/trinity/graphics/digikam/libs/greycstoration/greycstorationwidget.cpp,
+	  branches/extragear/trinity/graphics/digikam/libs/imageproperties/imagedescedittab.cpp,
+	  branches/extragear/trinity/graphics/digikam/libs/imageproperties/talbumlistview.cpp,
+	  branches/extragear/trinity/graphics/digikam/libs/jpegutils/jpegutils.cpp,
+	  branches/extragear/trinity/graphics/digikam/libs/jpegutils/libjpeg62.README,
+	  branches/extragear/trinity/graphics/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp,
+	  branches/extragear/trinity/graphics/digikam/showfoto/setup/setuptooltip.cpp,
+	  branches/extragear/trinity/graphics/digikam/showfoto/showfoto.cpp,
+	  branches/extragear/trinity/graphics/digikam/utilities/batch/batchalbumssyncmetadata.cpp,
+	  branches/extragear/trinity/graphics/digikam/utilities/batch/batchsyncmetadata.cpp,
+	  branches/extragear/trinity/graphics/digikam/utilities/batch/batchsyncmetadata.h,
+	  branches/extragear/trinity/graphics/digikam/utilities/cameragui/camerafolderdialog.cpp,
+	  branches/extragear/trinity/graphics/digikam/utilities/cameragui/cameraui.cpp,
+	  branches/extragear/trinity/graphics/digikam/utilities/cameragui/renamecustomizer.cpp,
+	  branches/extragear/trinity/graphics/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.cpp,
+	  branches/extragear/trinity/graphics/digikam/utilities/imageeditor/editor/editorwindow.cpp,
+	  branches/extragear/trinity/graphics/digikam/utilities/imageeditor/tools/imageresize.cpp,
+	  branches/extragear/trinity/graphics/digikam/utilities/imageeditor/tools/imageresize.h,
+	  branches/extragear/trinity/graphics/digikam/utilities/setup/cameraselection.cpp,
+	  branches/extragear/trinity/graphics/digikam/utilities/setup/setupgeneral.cpp,
+	  branches/extragear/trinity/graphics/digikam/utilities/setup/setupicc.cpp,
+	  branches/extragear/trinity/graphics/digikam/utilities/setup/setupidentity.cpp,
+	  branches/extragear/trinity/graphics/digikam/utilities/setup/setuptooltip.cpp,
+	  branches/extragear/trinity/graphics/digikam/utilities/slideshow/slideshow.cpp,
+	  branches/extragear/trinity/graphics/digikam/utilities/slideshow/slideshowsettings.h:
 	  i18n fix: picture -> image and other polish
 
 2007-09-13 07:16  gkulzer
 
-	* branches/extragear/kde3/graphics/digikam/imageplugins/distortionfx/imageeffect_distortionfx.cpp,
-	  branches/extragear/kde3/graphics/digikam/imageplugins/distortionfx/imageeffect_distortionfx.h,
-	  branches/extragear/kde3/graphics/digikam/imageplugins/distortionfx/imageplugin_distortionfx.cpp,
-	  branches/extragear/kde3/graphics/digikam/imageplugins/distortionfx/imageplugin_distortionfx.h:
+	* branches/extragear/trinity/graphics/digikam/imageplugins/distortionfx/imageeffect_distortionfx.cpp,
+	  branches/extragear/trinity/graphics/digikam/imageplugins/distortionfx/imageeffect_distortionfx.h,
+	  branches/extragear/trinity/graphics/digikam/imageplugins/distortionfx/imageplugin_distortionfx.cpp,
+	  branches/extragear/trinity/graphics/digikam/imageplugins/distortionfx/imageplugin_distortionfx.h:
 	  i18n fix: picture -> image and other polish
 
 2007-09-13 07:15  gkulzer
 
-	* branches/extragear/kde3/graphics/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp,
-	  branches/extragear/kde3/graphics/digikam/imageplugins/coreplugin/imageplugin_core.cpp:
+	* branches/extragear/trinity/graphics/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp,
+	  branches/extragear/trinity/graphics/digikam/imageplugins/coreplugin/imageplugin_core.cpp:
 	  i18n fix: picture -> image and other polish
 
 2007-09-13 06:37  gkulzer
 
-	* branches/extragear/kde3/graphics/digikam/imageplugins/colorfx/imageeffect_colorfx.cpp:
+	* branches/extragear/trinity/graphics/digikam/imageplugins/colorfx/imageeffect_colorfx.cpp:
 	  i18n fix: picture -> image and other polish
 
 2007-09-13 06:36  gkulzer
 
-	* branches/extragear/kde3/graphics/digikam/digikam/digikamview.cpp:
+	* branches/extragear/trinity/graphics/digikam/digikam/digikamview.cpp:
 	  i18n fix: picture -> image and other polish
 
 2007-09-13 06:35  gkulzer
 
-	* branches/extragear/kde3/graphics/digikam/digikam/welcomepageview.cpp:
+	* branches/extragear/trinity/graphics/digikam/digikam/welcomepageview.cpp:
 	  i18n fix: picture -> image and other polish
 
 2007-09-12 20:47  gkulzer
 
-	* branches/extragear/kde3/graphics/digikam/utilities/setup/setupiofiles.cpp:
+	* branches/extragear/trinity/graphics/digikam/utilities/setup/setupiofiles.cpp:
 	  Wrong ChromaSubsampling read \ni18 polish\n
 	  CCMAIL:gillae.caulier@gmail.com
 
 2007-09-12 20:46  gkulzer
 
-	* branches/extragear/kde3/graphics/digikam/libs/dimg/loaders/jpegsettings.cpp:
+	* branches/extragear/trinity/graphics/digikam/libs/dimg/loaders/jpegsettings.cpp:
 	  Wrong ChromaSubsampling read \ni18 polish\n
 	  CCMAIL:gillae.caulier@gmail.com
 
 2007-09-12 20:46  gkulzer
 
-	* branches/extragear/kde3/graphics/digikam/libs/widgets/common/filesaveoptionsbox.cpp:
+	* branches/extragear/trinity/graphics/digikam/libs/widgets/common/filesaveoptionsbox.cpp:
 	  Wrong ChromaSubsampling read \ni18 polish\n
 	  CCMAIL:gillae.caulier@gmail.com
 
 2007-09-12 14:00  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/digikam/digikamapp.cpp:
+	* branches/extragear/trinity/graphics/digikam/digikam/digikamapp.cpp:
 	  fix i18n
 
 2007-09-12 13:59  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/digikam/albumfolderview.cpp:
+	* branches/extragear/trinity/graphics/digikam/digikam/albumfolderview.cpp:
 	  add caption to dialog
 
 2007-09-12 12:50  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/digikam/albumfolderview.cpp:
+	* branches/extragear/trinity/graphics/digikam/digikam/albumfolderview.cpp:
 	  typo
 
 2007-09-12 09:10  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/digikam/searchwidgets.cpp:
+	* branches/extragear/trinity/graphics/digikam/digikam/searchwidgets.cpp:
 	  fix coding style
 
 2007-09-12 09:00  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/digikam/searchadvanceddialog.cpp:
+	* branches/extragear/trinity/graphics/digikam/digikam/searchadvanceddialog.cpp:
 	  fix ambiguous if/else condition + coding style
 
 2007-09-10 21:18  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/utilities/lighttable/lighttablewindow.cpp:
+	* branches/extragear/trinity/graphics/digikam/utilities/lighttable/lighttablewindow.cpp:
 	  fix layout
 
 2007-09-10 21:15  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/digikam/digikamapp.cpp:
+	* branches/extragear/trinity/graphics/digikam/digikam/digikamapp.cpp:
 	  fix layout
 
 2007-09-10 20:56  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/NEWS: update
+	* branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2007-09-10 13:56  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/libs/widgets/common/dcursortracker.cpp:
+	* branches/extragear/trinity/graphics/digikam/libs/widgets/common/dcursortracker.cpp:
 	  fix position of tracker properlly on the screen
 
 2007-09-10 13:41  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/libs/widgets/common/statusnavigatebar.cpp,
-	  branches/extragear/kde3/graphics/digikam/libs/widgets/common/statusprogressbar.cpp,
-	  branches/extragear/kde3/graphics/digikam/libs/widgets/common/statuszoombar.cpp:
+	* branches/extragear/trinity/graphics/digikam/libs/widgets/common/statusnavigatebar.cpp,
+	  branches/extragear/trinity/graphics/digikam/libs/widgets/common/statusprogressbar.cpp,
+	  branches/extragear/trinity/graphics/digikam/libs/widgets/common/statuszoombar.cpp:
 	  no need keyboard focus here
 
 2007-09-10 13:05  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/utilities/lighttable/lighttablewindow.cpp:
+	* branches/extragear/trinity/graphics/digikam/utilities/lighttable/lighttablewindow.cpp:
 	  polish commits #710518:
 	  - never use true/false with a pointer value.
 	  - no need to cast again a point which is already casted to the
@@ -10803,12 +10803,12 @@ v0.9.3-beta1 - 2007-010-08
 
 2007-09-10 07:41  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/libs/greycstoration/greycstorationiface.cpp:
+	* branches/extragear/trinity/graphics/digikam/libs/greycstoration/greycstorationiface.cpp:
 	  use 2 separate thread with CImg
 
 2007-09-10 07:30  abaecker
 
-	* branches/extragear/kde3/graphics/digikam/utilities/lighttable/lighttablewindow.cpp:
+	* branches/extragear/trinity/graphics/digikam/utilities/lighttable/lighttablewindow.cpp:
 	  Properly pdate left and right panel items of the lighttable after
 	  delete.
 	  CCBUGS: 147889
@@ -10816,13 +10816,13 @@ v0.9.3-beta1 - 2007-010-08
 
 2007-09-10 06:14  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/NEWS: update
+	* branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2007-09-10 06:12  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/libs/greycstoration/CImg.h,
-	  branches/extragear/kde3/graphics/digikam/libs/greycstoration/greycstoration.h,
-	  branches/extragear/kde3/graphics/digikam/libs/greycstoration/greycstorationiface.cpp:
+	* branches/extragear/trinity/graphics/digikam/libs/greycstoration/CImg.h,
+	  branches/extragear/trinity/graphics/digikam/libs/greycstoration/greycstoration.h,
+	  branches/extragear/trinity/graphics/digikam/libs/greycstoration/greycstorationiface.cpp:
 	  digiKam from KDE3 branch : updated internal CImg library to last
 	  stable 1.2.3 (released at 2007/08/24)
 	  CCMAIL: David.Tschumperle@greyc.ensicaen.fr
@@ -10831,13 +10831,13 @@ v0.9.3-beta1 - 2007-010-08
 
 2007-09-09 20:18  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/showfoto/showfoto.cpp:
+	* branches/extragear/trinity/graphics/digikam/showfoto/showfoto.cpp:
 	  polish
 
 2007-09-09 17:50  abaecker
 
-	* branches/extragear/kde3/graphics/digikam/NEWS,
-	  branches/extragear/kde3/graphics/digikam/showfoto/showfoto.cpp:
+	* branches/extragear/trinity/graphics/digikam/NEWS,
+	  branches/extragear/trinity/graphics/digikam/showfoto/showfoto.cpp:
 	  Deleting an image in showfotos thumbbar, the following image
 	  is made the selected one (and not the previous).
 	  CCBUGS: 149685
@@ -10845,57 +10845,57 @@ v0.9.3-beta1 - 2007-010-08
 
 2007-09-07 21:36  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/utilities/cameragui/freespacewidget.cpp:
+	* branches/extragear/trinity/graphics/digikam/utilities/cameragui/freespacewidget.cpp:
 	  improve tooltip
 
 2007-09-07 21:30  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/utilities/cameragui/cameraiconview.cpp:
+	* branches/extragear/trinity/graphics/digikam/utilities/cameragui/cameraiconview.cpp:
 	  use the proper icon if mime type is unknow
 
 2007-09-07 20:54  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/utilities/cameragui/cameraiconview.cpp:
+	* branches/extragear/trinity/graphics/digikam/utilities/cameragui/cameraiconview.cpp:
 	  compile
 
 2007-09-07 20:52  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/utilities/cameragui/cameraiconview.cpp:
+	* branches/extragear/trinity/graphics/digikam/utilities/cameragui/cameraiconview.cpp:
 	  fix crash if mime type is null
 
 2007-09-07 19:57  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/utilities/cameragui/cameracontroller.cpp:
+	* branches/extragear/trinity/graphics/digikam/utilities/cameragui/cameracontroller.cpp:
 	  sanity check
 
 2007-09-07 18:02  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/digikam/digikamapp.cpp:
+	* branches/extragear/trinity/graphics/digikam/digikam/digikamapp.cpp:
 	  forget to toogle on/off add to LT action if an item is a
 	  selection if active or not into the current album
 	  CCBUGS: 147854
 
 2007-09-07 14:35  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/libs/dimg/loaders/jpegsettings.cpp,
-	  branches/extragear/kde3/graphics/digikam/utilities/imageeditor/canvas/dimginterface.cpp:
+	* branches/extragear/trinity/graphics/digikam/libs/dimg/loaders/jpegsettings.cpp,
+	  branches/extragear/trinity/graphics/digikam/utilities/imageeditor/canvas/dimginterface.cpp:
 	  polish
 
 2007-09-07 14:12  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/NEWS: update
+	* branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2007-09-07 14:11  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/libs/dimg/loaders/jpegloader.cpp,
-	  branches/extragear/kde3/graphics/digikam/libs/dimg/loaders/jpegsettings.cpp,
-	  branches/extragear/kde3/graphics/digikam/libs/dimg/loaders/jpegsettings.h,
-	  branches/extragear/kde3/graphics/digikam/libs/widgets/common/filesaveoptionsbox.cpp,
-	  branches/extragear/kde3/graphics/digikam/project/project.kdevelop,
-	  branches/extragear/kde3/graphics/digikam/utilities/imageeditor/canvas/dimginterface.cpp,
-	  branches/extragear/kde3/graphics/digikam/utilities/imageeditor/canvas/iofilesettingscontainer.h,
-	  branches/extragear/kde3/graphics/digikam/utilities/imageeditor/editor/editorwindow.cpp,
-	  branches/extragear/kde3/graphics/digikam/utilities/setup/setupiofiles.cpp:
+	* branches/extragear/trinity/graphics/digikam/libs/dimg/loaders/jpegloader.cpp,
+	  branches/extragear/trinity/graphics/digikam/libs/dimg/loaders/jpegsettings.cpp,
+	  branches/extragear/trinity/graphics/digikam/libs/dimg/loaders/jpegsettings.h,
+	  branches/extragear/trinity/graphics/digikam/libs/widgets/common/filesaveoptionsbox.cpp,
+	  branches/extragear/trinity/graphics/digikam/project/project.kdevelop,
+	  branches/extragear/trinity/graphics/digikam/utilities/imageeditor/canvas/dimginterface.cpp,
+	  branches/extragear/trinity/graphics/digikam/utilities/imageeditor/canvas/iofilesettingscontainer.h,
+	  branches/extragear/trinity/graphics/digikam/utilities/imageeditor/editor/editorwindow.cpp,
+	  branches/extragear/trinity/graphics/digikam/utilities/setup/setupiofiles.cpp:
 	  digiKam from KDE3 branch : provide settings to adjust JPEG
 	  subsampling factor when new JPEG file is created by editor.
 	  TODO: KDE4PORT
@@ -10903,50 +10903,50 @@ v0.9.3-beta1 - 2007-010-08
 
 2007-09-07 11:03  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/data/icons/hi32-action-lighttable.png,
-	  branches/extragear/kde3/graphics/digikam/data/icons/hi32-action-lighttableadd.png,
-	  branches/extragear/kde3/graphics/digikam/digikam/albumiconview.cpp,
-	  branches/extragear/kde3/graphics/digikam/digikam/digikamapp.cpp,
-	  branches/extragear/kde3/graphics/digikam/digikam/imagepreviewview.cpp,
-	  branches/extragear/kde3/graphics/digikam/utilities/setup/setup.cpp:
+	* branches/extragear/trinity/graphics/digikam/data/icons/hi32-action-lighttable.png,
+	  branches/extragear/trinity/graphics/digikam/data/icons/hi32-action-lighttableadd.png,
+	  branches/extragear/trinity/graphics/digikam/digikam/albumiconview.cpp,
+	  branches/extragear/trinity/graphics/digikam/digikam/digikamapp.cpp,
+	  branches/extragear/trinity/graphics/digikam/digikam/imagepreviewview.cpp,
+	  branches/extragear/trinity/graphics/digikam/utilities/setup/setup.cpp:
 	  backport new icons for LT from KDE4
 	  CCBUGS: 147854
 
 2007-09-07 10:24  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/digikam/digikamui.rc:
+	* branches/extragear/trinity/graphics/digikam/digikam/digikamui.rc:
 	  unforget to increment rc file when a new action have been added
 	  to gui
 	  CCBUGS: 147854
 
 2007-09-07 10:22  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/digikam/digikamapp.cpp,
-	  branches/extragear/kde3/graphics/digikam/digikam/digikamappprivate.h:
+	* branches/extragear/trinity/graphics/digikam/digikam/digikamapp.cpp,
+	  branches/extragear/trinity/graphics/digikam/digikam/digikamappprivate.h:
 	  do not mix 2 action on the same container.
 	  CCBUGS: 147854
 
 2007-09-07 10:17  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/digikam/albumiconview.h,
-	  branches/extragear/kde3/graphics/digikam/utilities/lighttable/lighttablewindow.cpp:
+	* branches/extragear/trinity/graphics/digikam/digikam/albumiconview.h,
+	  branches/extragear/trinity/graphics/digikam/utilities/lighttable/lighttablewindow.cpp:
 	  polish
 
 2007-09-07 09:49  abaecker
 
-	* branches/extragear/kde3/graphics/digikam/NEWS: list bug 147854 in
+	* branches/extragear/trinity/graphics/digikam/NEWS: list bug 147854 in
 	  NEWS as solved.
 
 2007-09-07 09:47  abaecker
 
-	* branches/extragear/kde3/graphics/digikam/digikam/albumiconview.cpp,
-	  branches/extragear/kde3/graphics/digikam/digikam/albumiconview.h,
-	  branches/extragear/kde3/graphics/digikam/digikam/digikamapp.cpp,
-	  branches/extragear/kde3/graphics/digikam/digikam/digikamui.rc,
-	  branches/extragear/kde3/graphics/digikam/digikam/digikamview.cpp,
-	  branches/extragear/kde3/graphics/digikam/digikam/digikamview.h,
-	  branches/extragear/kde3/graphics/digikam/utilities/lighttable/lighttablewindow.cpp,
-	  branches/extragear/kde3/graphics/digikam/utilities/lighttable/lighttablewindow.h:
+	* branches/extragear/trinity/graphics/digikam/digikam/albumiconview.cpp,
+	  branches/extragear/trinity/graphics/digikam/digikam/albumiconview.h,
+	  branches/extragear/trinity/graphics/digikam/digikam/digikamapp.cpp,
+	  branches/extragear/trinity/graphics/digikam/digikam/digikamui.rc,
+	  branches/extragear/trinity/graphics/digikam/digikam/digikamview.cpp,
+	  branches/extragear/trinity/graphics/digikam/digikam/digikamview.h,
+	  branches/extragear/trinity/graphics/digikam/utilities/lighttable/lighttablewindow.cpp,
+	  branches/extragear/trinity/graphics/digikam/utilities/lighttable/lighttablewindow.h:
 	  Always put images into an empty light-table on F6. With CTRL+F6
 	  images
 	  are added to the existing images in the light table.
@@ -10955,58 +10955,58 @@ v0.9.3-beta1 - 2007-010-08
 
 2007-09-04 14:24  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/showfoto/main.cpp:
+	* branches/extragear/trinity/graphics/digikam/showfoto/main.cpp:
 	  missing blog entry
 
 2007-09-04 14:23  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/digikam/main.cpp:
+	* branches/extragear/trinity/graphics/digikam/digikam/main.cpp:
 	  missing blog entry
 
 2007-09-04 14:17  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/digikam/main.cpp: add
+	* branches/extragear/trinity/graphics/digikam/digikam/main.cpp: add
 	  Arnd as developer
 
 2007-09-04 14:15  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/showfoto/main.cpp: add
+	* branches/extragear/trinity/graphics/digikam/showfoto/main.cpp: add
 	  Arnd as developer
 
 2007-09-04 14:10  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/AUTHORS: update
+	* branches/extragear/trinity/graphics/digikam/AUTHORS: update
 
 2007-09-04 14:09  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/NEWS: update
+	* branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2007-09-04 14:03  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/utilities/lighttable/lighttablewindow.cpp:
+	* branches/extragear/trinity/graphics/digikam/utilities/lighttable/lighttablewindow.cpp:
 	  polish
 
 2007-09-04 13:07  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/utilities/cameragui/freespacewidget.cpp:
+	* branches/extragear/trinity/graphics/digikam/utilities/cameragui/freespacewidget.cpp:
 	  digiKam from KDE3 branch : backport commits #708283 from trunk
 
 2007-09-04 10:23  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/TODO: update
+	* branches/extragear/trinity/graphics/digikam/TODO: update
 
 2007-09-04 10:20  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/README: update
+	* branches/extragear/trinity/graphics/digikam/README: update
 
 2007-09-04 09:01  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/NEWS: update
+	* branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2007-09-04 09:00  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/utilities/cameragui/cameraui.cpp,
-	  branches/extragear/kde3/graphics/digikam/utilities/cameragui/cameraui.h:
+	* branches/extragear/trinity/graphics/digikam/utilities/cameragui/cameraui.cpp,
+	  branches/extragear/trinity/graphics/digikam/utilities/cameragui/cameraui.h:
 	  digiKam from KDE3 branch : Camera GUI : do not force to upper
 	  case sub album creation in all
 	  case to support file systems which do not take a care about that
@@ -11015,20 +11015,20 @@ v0.9.3-beta1 - 2007-010-08
 
 2007-09-04 08:22  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/NEWS: update
+	* branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2007-09-04 08:06  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/utilities/cameragui/cameracontroller.cpp:
+	* branches/extragear/trinity/graphics/digikam/utilities/cameragui/cameracontroller.cpp:
 	  polish. No need C ansi header now
 
 2007-09-04 07:19  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/NEWS: update
+	* branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2007-09-04 07:16  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/utilities/cameragui/cameracontroller.cpp:
+	* branches/extragear/trinity/graphics/digikam/utilities/cameragui/cameracontroller.cpp:
 	  digiKam from KDE3 branch : Camera Gui : always download the
 	  current picture as temp file before to check
 	  if target file already exist in target album. The advantage of
@@ -11058,7 +11058,7 @@ v0.9.3-beta1 - 2007-010-08
 
 2007-09-04 06:47  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/utilities/cameragui/cameraui.cpp:
+	* branches/extragear/trinity/graphics/digikam/utilities/cameragui/cameraui.cpp:
 	  digiKam from KDE3 branch : Camera Gui bug fix : if user skip
 	  downloading a file from camera
 	  (for ex. when file already exist in target folder from computer),
@@ -11069,23 +11069,23 @@ v0.9.3-beta1 - 2007-010-08
 
 2007-09-04 06:33  abaecker
 
-	* branches/extragear/kde3/graphics/digikam/NEWS,
-	  branches/extragear/kde3/graphics/digikam/libs/widgets/imageplugins/imageguidewidget.cpp,
-	  branches/extragear/kde3/graphics/digikam/utilities/imageeditor/editor/imageiface.cpp:
+	* branches/extragear/trinity/graphics/digikam/NEWS,
+	  branches/extragear/trinity/graphics/digikam/libs/widgets/imageplugins/imageguidewidget.cpp,
+	  branches/extragear/trinity/graphics/digikam/utilities/imageeditor/editor/imageiface.cpp:
 	  enable colormanagement in previews
 	  CCBUGS: 148648
 	  TODO:KDE4PORT
 
 2007-09-03 11:29  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/digikam/cameralist.cpp,
-	  branches/extragear/kde3/graphics/digikam/utilities/cameragui/gpcamera.cpp,
-	  branches/extragear/kde3/graphics/digikam/utilities/cameragui/gpcamera.h,
-	  branches/extragear/kde3/graphics/digikam/utilities/setup/Makefile.am,
-	  branches/extragear/kde3/graphics/digikam/utilities/setup/cameraselection.cpp,
-	  branches/extragear/kde3/graphics/digikam/utilities/setup/gpiface.cpp,
-	  branches/extragear/kde3/graphics/digikam/utilities/setup/gpiface.h,
-	  branches/extragear/kde3/graphics/digikam/utilities/setup/setupcamera.cpp:
+	* branches/extragear/trinity/graphics/digikam/digikam/cameralist.cpp,
+	  branches/extragear/trinity/graphics/digikam/utilities/cameragui/gpcamera.cpp,
+	  branches/extragear/trinity/graphics/digikam/utilities/cameragui/gpcamera.h,
+	  branches/extragear/trinity/graphics/digikam/utilities/setup/Makefile.am,
+	  branches/extragear/trinity/graphics/digikam/utilities/setup/cameraselection.cpp,
+	  branches/extragear/trinity/graphics/digikam/utilities/setup/gpiface.cpp,
+	  branches/extragear/trinity/graphics/digikam/utilities/setup/gpiface.h,
+	  branches/extragear/trinity/graphics/digikam/utilities/setup/setupcamera.cpp:
 	  digiKam from KDE3 branch : code factoring. Why we have 2
 	  implementions to provide a GPhoto2 interface? Code is the same.
 	  One is enough... All code have been merged in gpcamera.cpp.
@@ -11095,41 +11095,41 @@ v0.9.3-beta1 - 2007-010-08
 
 2007-09-02 13:45  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/NEWS: update
+	* branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2007-09-02 13:43  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/NEWS: update
+	* branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2007-09-02 13:20  mwiesweg
 
-	* branches/extragear/kde3/graphics/digikam/libs/dialogs/deletedialog.cpp,
-	  branches/extragear/kde3/graphics/digikam/libs/dialogs/deletedialog.h:
+	* branches/extragear/trinity/graphics/digikam/libs/dialogs/deletedialog.cpp,
+	  branches/extragear/trinity/graphics/digikam/libs/dialogs/deletedialog.h:
 	  Backport fix for 149469
 	  CCBUGS: 149469
 
 2007-09-01 15:00  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/NEWS: update
+	* branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2007-09-01 14:33  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/utilities/cameragui/cameraui.cpp:
+	* branches/extragear/trinity/graphics/digikam/utilities/cameragui/cameraui.cpp:
 	  polish
 
 2007-08-31 20:42  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/utilities/cameragui/cameraui.cpp,
-	  branches/extragear/kde3/graphics/digikam/utilities/cameragui/freespacewidget.cpp,
-	  branches/extragear/kde3/graphics/digikam/utilities/cameragui/freespacewidget.h:
+	* branches/extragear/trinity/graphics/digikam/utilities/cameragui/cameraui.cpp,
+	  branches/extragear/trinity/graphics/digikam/utilities/cameragui/freespacewidget.cpp,
+	  branches/extragear/trinity/graphics/digikam/utilities/cameragui/freespacewidget.h:
 	  always follow Album Libray Path if setup is changed during Camera
 	  Gui session
 
 2007-08-31 20:42  abaecker
 
-	* branches/extragear/kde3/graphics/digikam/digikam/albumiconview.cpp,
-	  branches/extragear/kde3/graphics/digikam/utilities/lighttable/lighttablewindow.cpp,
-	  branches/extragear/kde3/graphics/digikam/utilities/lighttable/lighttablewindow.h:
+	* branches/extragear/trinity/graphics/digikam/digikam/albumiconview.cpp,
+	  branches/extragear/trinity/graphics/digikam/utilities/lighttable/lighttablewindow.cpp,
+	  branches/extragear/trinity/graphics/digikam/utilities/lighttable/lighttablewindow.h:
 	  ensure that left and right view of the lighttable are populated
 	  properly on F6
 	  BUG: 146083
@@ -11137,28 +11137,28 @@ v0.9.3-beta1 - 2007-010-08
 
 2007-08-31 20:16  abaecker
 
-	* branches/extragear/kde3/graphics/digikam/digikam/digikamapp.cpp:
+	* branches/extragear/trinity/graphics/digikam/digikam/digikamapp.cpp:
 	  corrected error in string arguments
 
 2007-08-31 18:27  abaecker
 
-	* branches/extragear/kde3/graphics/digikam/digikam/digikamapp.cpp,
-	  branches/extragear/kde3/graphics/digikam/digikam/digikamapp.h,
-	  branches/extragear/kde3/graphics/digikam/digikam/digikamview.cpp,
-	  branches/extragear/kde3/graphics/digikam/digikam/digikamview.h:
+	* branches/extragear/trinity/graphics/digikam/digikam/digikamapp.cpp,
+	  branches/extragear/trinity/graphics/digikam/digikam/digikamapp.h,
+	  branches/extragear/trinity/graphics/digikam/digikam/digikamview.cpp,
+	  branches/extragear/trinity/graphics/digikam/digikam/digikamview.h:
 	  Display number of current image (or number of selected images)
 	  and total number of images in the statusline.
 	  TODO:KDE4PORT
 
 2007-08-31 14:47  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/utilities/cameragui/Makefile.am,
-	  branches/extragear/kde3/graphics/digikam/utilities/cameragui/cameraiconview.cpp,
-	  branches/extragear/kde3/graphics/digikam/utilities/cameragui/cameraiconview.h,
-	  branches/extragear/kde3/graphics/digikam/utilities/cameragui/cameraui.cpp,
-	  branches/extragear/kde3/graphics/digikam/utilities/cameragui/cameraui.h,
-	  branches/extragear/kde3/graphics/digikam/utilities/cameragui/freespacewidget.cpp,
-	  branches/extragear/kde3/graphics/digikam/utilities/cameragui/freespacewidget.h:
+	* branches/extragear/trinity/graphics/digikam/utilities/cameragui/Makefile.am,
+	  branches/extragear/trinity/graphics/digikam/utilities/cameragui/cameraiconview.cpp,
+	  branches/extragear/trinity/graphics/digikam/utilities/cameragui/cameraiconview.h,
+	  branches/extragear/trinity/graphics/digikam/utilities/cameragui/cameraui.cpp,
+	  branches/extragear/trinity/graphics/digikam/utilities/cameragui/cameraui.h,
+	  branches/extragear/trinity/graphics/digikam/utilities/cameragui/freespacewidget.cpp,
+	  branches/extragear/trinity/graphics/digikam/utilities/cameragui/freespacewidget.h:
 	  digiKam from KDE3 branch : Camera GUI improvements.
 	  - Add a new bargraph to report free space available on Album
 	  library path before and after to download pictures from camera.
@@ -11169,75 +11169,75 @@ v0.9.3-beta1 - 2007-010-08
 
 2007-08-31 07:59  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/NEWS: update
+	* branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2007-08-31 04:22  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/NEWS: update
+	* branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2007-08-31 04:11  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/NEWS: update
+	* branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2007-08-30 16:16  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/utilities/cameragui/cameraui.cpp:
+	* branches/extragear/trinity/graphics/digikam/utilities/cameragui/cameraui.cpp:
 	  digiKam from KDE3 branch : missing to force to selectAll item is
 	  DownloadAll or DownloadAndDeleteAll is used
 	  CCBUGS: 143934
 
 2007-08-30 14:01  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/digikam/searchfolderview.cpp:
+	* branches/extragear/trinity/graphics/digikam/digikam/searchfolderview.cpp:
 	  polish
 
 2007-08-30 14:01  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/NEWS: update
+	* branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2007-08-30 13:49  abaecker
 
-	* branches/extragear/kde3/graphics/digikam/digikam/searchfolderview.cpp:
+	* branches/extragear/trinity/graphics/digikam/digikam/searchfolderview.cpp:
 	  Add Yes/No Warning when deleting a search to avoid accidental
 	  removal of complex searches.
 	  BUG: 147439
 
 2007-08-30 13:43  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/NEWS: update
+	* branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2007-08-30 11:49  abaecker
 
-	* branches/extragear/kde3/graphics/digikam/configure.in.bot: More
+	* branches/extragear/trinity/graphics/digikam/configure.in.bot: More
 	  detailed explanation when libjasper is not found.
 	  BUG: 147119
 
 2007-08-30 09:50  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/NEWS: update
+	* branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2007-08-30 09:46  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/utilities/cameragui/cameraui.cpp:
+	* branches/extragear/trinity/graphics/digikam/utilities/cameragui/cameraui.cpp:
 	  digiKam from KDE3 branch : Camera GUI : always lets "Download
 	  All" option availalble
 	  CCBUGS: 143934
 
 2007-08-30 09:11  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/digikam/welcomepageview.cpp:
+	* branches/extragear/trinity/graphics/digikam/digikam/welcomepageview.cpp:
 	  update
 
 2007-08-30 09:10  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/NEWS: update
+	* branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2007-08-30 09:08  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/digikam/digikamapp.cpp,
-	  branches/extragear/kde3/graphics/digikam/digikam/digikamapp.h,
-	  branches/extragear/kde3/graphics/digikam/digikam/digikamview.cpp,
-	  branches/extragear/kde3/graphics/digikam/digikam/digikamview.h:
+	* branches/extragear/trinity/graphics/digikam/digikam/digikamapp.cpp,
+	  branches/extragear/trinity/graphics/digikam/digikam/digikamapp.h,
+	  branches/extragear/trinity/graphics/digikam/digikam/digikamview.cpp,
+	  branches/extragear/trinity/graphics/digikam/digikam/digikamview.h:
 	  digiKam from KDE3 branch : Use camera gui to import new images in
 	  digiKam album library.
 	  The current menu option which use it is "Album/Import/Add
@@ -11246,102 +11246,102 @@ v0.9.3-beta1 - 2007-010-08
 
 2007-08-29 07:37  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/utilities/cameragui/cameraui.cpp:
+	* branches/extragear/trinity/graphics/digikam/utilities/cameragui/cameraui.cpp:
 	  fix size
 
 2007-08-29 07:11  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/utilities/cameragui/animwidget.cpp,
-	  branches/extragear/kde3/graphics/digikam/utilities/cameragui/cameraui.cpp:
+	* branches/extragear/trinity/graphics/digikam/utilities/cameragui/animwidget.cpp,
+	  branches/extragear/trinity/graphics/digikam/utilities/cameragui/cameraui.cpp:
 	  render logo like others digiKam part : without color background
 	  and frame. Do not give focus.
 
 2007-08-28 20:18  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/utilities/cameragui/cameraui.cpp:
+	* branches/extragear/trinity/graphics/digikam/utilities/cameragui/cameraui.cpp:
 	  fix wrong slot to use
 
 2007-08-28 14:00  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/libs/widgets/common/statusprogressbar.h:
+	* branches/extragear/trinity/graphics/digikam/libs/widgets/common/statusprogressbar.h:
 	  polish
 
 2007-08-28 13:06  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/libs/widgets/common/statusprogressbar.cpp,
-	  branches/extragear/kde3/graphics/digikam/libs/widgets/common/statusprogressbar.h:
+	* branches/extragear/trinity/graphics/digikam/libs/widgets/common/statusprogressbar.cpp,
+	  branches/extragear/trinity/graphics/digikam/libs/widgets/common/statusprogressbar.h:
 	  new methods to get progress and total steps values
 
 2007-08-28 12:58  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/libs/widgets/common/statusprogressbar.h:
+	* branches/extragear/trinity/graphics/digikam/libs/widgets/common/statusprogressbar.h:
 	  polish
 
 2007-08-28 12:54  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/libs/widgets/common/statusprogressbar.cpp,
-	  branches/extragear/kde3/graphics/digikam/libs/widgets/common/statusprogressbar.h:
+	* branches/extragear/trinity/graphics/digikam/libs/widgets/common/statusprogressbar.cpp,
+	  branches/extragear/trinity/graphics/digikam/libs/widgets/common/statusprogressbar.h:
 	  new method to set total progress value
 
 2007-08-28 11:37  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/utilities/cameragui/Makefile.am:
+	* branches/extragear/trinity/graphics/digikam/utilities/cameragui/Makefile.am:
 	  polish
 
 2007-08-28 09:01  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/utilities/lighttable/lighttablewindow.cpp,
-	  branches/extragear/kde3/graphics/digikam/utilities/lighttable/lighttablewindowui.rc:
+	* branches/extragear/trinity/graphics/digikam/utilities/lighttable/lighttablewindow.cpp,
+	  branches/extragear/trinity/graphics/digikam/utilities/lighttable/lighttablewindowui.rc:
 	  add logo on light table
 
 2007-08-28 08:56  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/utilities/imageeditor/editor/digikamimagewindowui.rc,
-	  branches/extragear/kde3/graphics/digikam/utilities/imageeditor/editor/imagewindow.cpp:
+	* branches/extragear/trinity/graphics/digikam/utilities/imageeditor/editor/digikamimagewindowui.rc,
+	  branches/extragear/trinity/graphics/digikam/utilities/imageeditor/editor/imagewindow.cpp:
 	  digiKam from KDE3 branch : added logo on editor
 
 2007-08-28 08:47  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/libs/widgets/common/dlogoaction.cpp:
+	* branches/extragear/trinity/graphics/digikam/libs/widgets/common/dlogoaction.cpp:
 	  no focus
 
 2007-08-28 07:35  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/libs/widgets/common/dlogoaction.h:
+	* branches/extragear/trinity/graphics/digikam/libs/widgets/common/dlogoaction.h:
 	  polish
 
 2007-08-27 19:37  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/data/pics/logo-digikam.png,
-	  branches/extragear/kde3/graphics/digikam/digikam/digikamapp.cpp,
-	  branches/extragear/kde3/graphics/digikam/digikam/digikamui.rc,
-	  branches/extragear/kde3/graphics/digikam/libs/widgets/common/Makefile.am,
-	  branches/extragear/kde3/graphics/digikam/libs/widgets/common/dlogoaction.cpp,
-	  branches/extragear/kde3/graphics/digikam/libs/widgets/common/dlogoaction.h:
+	* branches/extragear/trinity/graphics/digikam/data/pics/logo-digikam.png,
+	  branches/extragear/trinity/graphics/digikam/digikam/digikamapp.cpp,
+	  branches/extragear/trinity/graphics/digikam/digikam/digikamui.rc,
+	  branches/extragear/trinity/graphics/digikam/libs/widgets/common/Makefile.am,
+	  branches/extragear/trinity/graphics/digikam/libs/widgets/common/dlogoaction.cpp,
+	  branches/extragear/trinity/graphics/digikam/libs/widgets/common/dlogoaction.h:
 	  digiKam from KDE3 branch : just fun : added digiKam logo on the
 	  right corner of Album Gui toolbar like konqueror
 
 2007-08-27 10:54  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/utilities/cameragui/cameraui.h:
+	* branches/extragear/trinity/graphics/digikam/utilities/cameragui/cameraui.h:
 	  polish
 
 2007-08-27 10:38  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/digikam/albumfolderview.cpp:
+	* branches/extragear/trinity/graphics/digikam/digikam/albumfolderview.cpp:
 	  polish
 
 2007-08-27 10:32  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/NEWS: update
+	* branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2007-08-27 09:28  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/digikam/albumfolderview.cpp,
-	  branches/extragear/kde3/graphics/digikam/digikam/albumiconview.cpp,
-	  branches/extragear/kde3/graphics/digikam/utilities/cameragui/cameraiconview.cpp,
-	  branches/extragear/kde3/graphics/digikam/utilities/cameragui/cameraui.cpp,
-	  branches/extragear/kde3/graphics/digikam/utilities/cameragui/cameraui.h:
+	* branches/extragear/trinity/graphics/digikam/digikam/albumfolderview.cpp,
+	  branches/extragear/trinity/graphics/digikam/digikam/albumiconview.cpp,
+	  branches/extragear/trinity/graphics/digikam/utilities/cameragui/cameraiconview.cpp,
+	  branches/extragear/trinity/graphics/digikam/utilities/cameragui/cameraui.cpp,
+	  branches/extragear/trinity/graphics/digikam/utilities/cameragui/cameraui.h:
 	  digiKam from KDE3 branch : Camera Gui improvements. Implement
 	  Drag & Drop between Camera Gui and Album Gui to Download pictures
 	  from camera to a physical album. Before, only inverse function
@@ -11352,21 +11352,21 @@ v0.9.3-beta1 - 2007-010-08
 
 2007-08-27 08:07  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/digikam/dragobjects.cpp,
-	  branches/extragear/kde3/graphics/digikam/digikam/dragobjects.h:
+	* branches/extragear/trinity/graphics/digikam/digikam/dragobjects.cpp,
+	  branches/extragear/trinity/graphics/digikam/digikam/dragobjects.h:
 	  add CameraItemsList class to host camera items dropped by
 	  drag&drop action
 
 2007-08-27 03:45  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/NEWS: update
+	* branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2007-08-26 20:30  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/utilities/cameragui/cameraiconview.cpp,
-	  branches/extragear/kde3/graphics/digikam/utilities/cameragui/cameraiconview.h,
-	  branches/extragear/kde3/graphics/digikam/utilities/cameragui/cameraui.cpp,
-	  branches/extragear/kde3/graphics/digikam/utilities/cameragui/cameraui.h:
+	* branches/extragear/trinity/graphics/digikam/utilities/cameragui/cameraiconview.cpp,
+	  branches/extragear/trinity/graphics/digikam/utilities/cameragui/cameraiconview.h,
+	  branches/extragear/trinity/graphics/digikam/utilities/cameragui/cameraui.cpp,
+	  branches/extragear/trinity/graphics/digikam/utilities/cameragui/cameraui.h:
 	  digiKam from KDE3 branch : Camera Gui improvements : New options
 	  to Download pictures and Delete it from camera at the same time.
 	  2 options have been added : "Download/Delete Selected" and
@@ -11375,11 +11375,11 @@ v0.9.3-beta1 - 2007-010-08
 
 2007-08-24 20:11  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/NEWS: update
+	* branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2007-08-24 19:55  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/utilities/imageeditor/editor/editorwindow.cpp:
+	* branches/extragear/trinity/graphics/digikam/utilities/imageeditor/editor/editorwindow.cpp:
 	  digiKam from KDE3 branch : ask confirmation from user to
 	  overwrite picture with File/Save action from Image Editor and
 	  Showfoto
@@ -11387,13 +11387,13 @@ v0.9.3-beta1 - 2007-010-08
 
 2007-08-22 17:00  gkulzer
 
-	* branches/extragear/kde3/graphics/digikam/digikam/welcomepageview.cpp:
+	* branches/extragear/trinity/graphics/digikam/digikam/welcomepageview.cpp:
 	  English polish
 
 2007-08-22 13:27  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/utilities/imageeditor/editor/editorwindow.cpp,
-	  branches/extragear/kde3/graphics/digikam/utilities/setup/setupdcraw.cpp:
+	* branches/extragear/trinity/graphics/digikam/utilities/imageeditor/editor/editorwindow.cpp,
+	  branches/extragear/trinity/graphics/digikam/utilities/setup/setupdcraw.cpp:
 	  digiKam from KDE3 branch : patch from Guillaume Castagnino about
 	  to support new chromatic aberration reduction options provided by
 	  dcraw 8.77
@@ -11402,7 +11402,7 @@ v0.9.3-beta1 - 2007-010-08
 
 2007-08-22 08:14  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/utilities/cameragui/gpcamera.cpp:
+	* branches/extragear/trinity/graphics/digikam/utilities/cameragui/gpcamera.cpp:
 	  digiKam from KDE3 branch : patch from Marcus Meissner about to
 	  handle properlly the file names from camera reported by
 	  libgphoto2 using system char encoding.
@@ -11415,15 +11415,15 @@ v0.9.3-beta1 - 2007-010-08
 
 2007-08-22 07:33  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/NEWS: update
+	* branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2007-08-22 07:04  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/NEWS: update
+	* branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2007-08-22 07:03  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/libs/lprof/lcmsprf.h:
+	* branches/extragear/trinity/graphics/digikam/libs/lprof/lcmsprf.h:
 	  digiKam from KDE3 branch : patch from Angelo Naselli about to
 	  compile digiKam with lcms 1.17. Tested under Mandriva 2007.1 and
 	  2008.0 (cooker)
@@ -11431,45 +11431,45 @@ v0.9.3-beta1 - 2007-010-08
 
 2007-08-22 04:41  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/configure.in.bot,
-	  branches/extragear/kde3/graphics/digikam/configure.in.in: update
+	* branches/extragear/trinity/graphics/digikam/configure.in.bot,
+	  branches/extragear/trinity/graphics/digikam/configure.in.in: update
 	  depency
 
 2007-08-22 04:40  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/README: update depency
+	* branches/extragear/trinity/graphics/digikam/README: update depency
 
 2007-08-22 04:39  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/libs/dmetadata/dmetadata.cpp:
+	* branches/extragear/trinity/graphics/digikam/libs/dmetadata/dmetadata.cpp:
 	  backport picture owner extraction code from KDE4
 
 2007-08-21 09:12  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/libs/widgets/metadata/exifwidget.cpp,
-	  branches/extragear/kde3/graphics/digikam/libs/widgets/metadata/iptcwidget.cpp,
-	  branches/extragear/kde3/graphics/digikam/libs/widgets/metadata/makernotewidget.cpp:
+	* branches/extragear/trinity/graphics/digikam/libs/widgets/metadata/exifwidget.cpp,
+	  branches/extragear/trinity/graphics/digikam/libs/widgets/metadata/iptcwidget.cpp,
+	  branches/extragear/trinity/graphics/digikam/libs/widgets/metadata/makernotewidget.cpp:
 	  digiKam from KDE3 branch : bugfix : enable tool buttons from
 	  metadata sidebar if IPTC contents exist
 
 2007-08-19 15:03  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/digikam/albumsettings.cpp:
+	* branches/extragear/trinity/graphics/digikam/digikam/albumsettings.cpp:
 	  digiKam from KDE3 branch : added .mp4 movies files to drive by
 	  default
 
 2007-08-19 08:04  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/NEWS: update
+	* branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2007-08-19 08:03  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/themedesigner/Makefile.am:
+	* branches/extragear/trinity/graphics/digikam/themedesigner/Makefile.am:
 	  no desktop file to install
 
 2007-08-19 07:58  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/themedesigner/digikamthemedesigner.desktop:
+	* branches/extragear/trinity/graphics/digikam/themedesigner/digikamthemedesigner.desktop:
 	  digiKam from KDE3 branch : no need a menu entry in desktop
 	  graphics menu category. Theme designer is not a graphics
 	  application, but a design tool for digiKam
@@ -11477,69 +11477,69 @@ v0.9.3-beta1 - 2007-010-08
 
 2007-08-19 07:56  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/NEWS: update
+	* branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2007-08-18 04:44  gkulzer
 
-	* branches/extragear/kde3/graphics/digikam/imageplugins/adjustlevels/adjustlevels.cpp:
+	* branches/extragear/trinity/graphics/digikam/imageplugins/adjustlevels/adjustlevels.cpp:
 	  i18n string improvement
 
 2007-08-18 04:40  gkulzer
 
-	* branches/extragear/kde3/graphics/digikam/imageplugins/adjustcurves/adjustcurves.cpp:
+	* branches/extragear/trinity/graphics/digikam/imageplugins/adjustcurves/adjustcurves.cpp:
 	  i18n string improvement
 
 2007-08-17 12:45  gkulzer
 
-	* branches/extragear/kde3/graphics/digikam/libs/thumbbar/thumbbar.cpp:
+	* branches/extragear/trinity/graphics/digikam/libs/thumbbar/thumbbar.cpp:
 	  CCBUG:148925 Light table updates correctly now
 
 2007-08-07 23:28  gkulzer
 
-	* branches/extragear/kde3/graphics/digikam/data/themes/Dark: update
+	* branches/extragear/trinity/graphics/digikam/data/themes/Dark: update
 	  to old look
 
 2007-07-26 19:22  mwiesweg
 
-	* branches/extragear/kde3/graphics/digikam/libs/threadimageio/previewtask.cpp:
+	* branches/extragear/trinity/graphics/digikam/libs/threadimageio/previewtask.cpp:
 	  Backport: Fix stupid copy-paste mistake
 
 2007-07-26 18:22  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/AUTHORS: update
+	* branches/extragear/trinity/graphics/digikam/AUTHORS: update
 
 2007-07-26 18:20  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/showfoto/pics/showfoto-splash.png,
-	  branches/extragear/kde3/graphics/digikam/showfoto/pics/showfoto-splash.xcf:
+	* branches/extragear/trinity/graphics/digikam/showfoto/pics/showfoto-splash.png,
+	  branches/extragear/trinity/graphics/digikam/showfoto/pics/showfoto-splash.xcf:
 	  digiKam from KDE3 branch : new Showfoto 0.7.0 splashscreen from
 	  Will Hardy taken in South Island of New Zealand.
 	  CCMAIL: will@zedat.fu-berlin.de
 
 2007-07-26 09:45  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/NEWS: update
+	* branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2007-07-26 06:27  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/NEWS: update
+	* branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2007-07-26 06:22  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/data/themes/Blue,
-	  branches/extragear/kde3/graphics/digikam/data/themes/Clean,
-	  branches/extragear/kde3/graphics/digikam/data/themes/DLR,
-	  branches/extragear/kde3/graphics/digikam/data/themes/Dark,
-	  branches/extragear/kde3/graphics/digikam/data/themes/Dessert,
-	  branches/extragear/kde3/graphics/digikam/data/themes/Digikasa,
-	  branches/extragear/kde3/graphics/digikam/data/themes/Dreary,
-	  branches/extragear/kde3/graphics/digikam/data/themes/Gray,
-	  branches/extragear/kde3/graphics/digikam/data/themes/Marine,
-	  branches/extragear/kde3/graphics/digikam/data/themes/OrangeCrush,
-	  branches/extragear/kde3/graphics/digikam/data/themes/Sandy,
-	  branches/extragear/kde3/graphics/digikam/libs/themeengine/themeengine.cpp,
-	  branches/extragear/kde3/graphics/digikam/libs/themeengine/themeengine.h,
-	  branches/extragear/kde3/graphics/digikam/themedesigner/mainwindow.cpp:
+	* branches/extragear/trinity/graphics/digikam/data/themes/Blue,
+	  branches/extragear/trinity/graphics/digikam/data/themes/Clean,
+	  branches/extragear/trinity/graphics/digikam/data/themes/DLR,
+	  branches/extragear/trinity/graphics/digikam/data/themes/Dark,
+	  branches/extragear/trinity/graphics/digikam/data/themes/Dessert,
+	  branches/extragear/trinity/graphics/digikam/data/themes/Digikasa,
+	  branches/extragear/trinity/graphics/digikam/data/themes/Dreary,
+	  branches/extragear/trinity/graphics/digikam/data/themes/Gray,
+	  branches/extragear/trinity/graphics/digikam/data/themes/Marine,
+	  branches/extragear/trinity/graphics/digikam/data/themes/OrangeCrush,
+	  branches/extragear/trinity/graphics/digikam/data/themes/Sandy,
+	  branches/extragear/trinity/graphics/digikam/libs/themeengine/themeengine.cpp,
+	  branches/extragear/trinity/graphics/digikam/libs/themeengine/themeengine.h,
+	  branches/extragear/trinity/graphics/digikam/themedesigner/mainwindow.cpp:
 	  digiKam from KDE3 branch : backport from trunk (KDE4)
 	  implementation of new color theme scheme engine using setting
 	  based on XML instead to use X11 ressource decoding...
@@ -11551,252 +11551,252 @@ v0.9.3-beta1 - 2007-010-08
 
 2007-07-25 07:01  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/themedesigner/mainwindow.cpp:
+	* branches/extragear/trinity/graphics/digikam/themedesigner/mainwindow.cpp:
 	  optimize layout
 
 2007-07-25 06:38  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/themedesigner/themedicongroupitem.cpp:
+	* branches/extragear/trinity/graphics/digikam/themedesigner/themedicongroupitem.cpp:
 	  compile
 
 2007-07-25 06:35  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/themedesigner/main.cpp:
+	* branches/extragear/trinity/graphics/digikam/themedesigner/main.cpp:
 	  use digiKam catalog
 
 2007-07-25 06:32  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/themedesigner/themediconitem.cpp:
+	* branches/extragear/trinity/graphics/digikam/themedesigner/themediconitem.cpp:
 	  fix i18n
 
 2007-07-25 06:31  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/themedesigner/themedicongroupitem.cpp:
+	* branches/extragear/trinity/graphics/digikam/themedesigner/themedicongroupitem.cpp:
 	  fix i18n
 
 2007-07-24 11:24  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/data/themes/Blue,
-	  branches/extragear/kde3/graphics/digikam/data/themes/Clean,
-	  branches/extragear/kde3/graphics/digikam/data/themes/DLR,
-	  branches/extragear/kde3/graphics/digikam/data/themes/Dark,
-	  branches/extragear/kde3/graphics/digikam/data/themes/Digikasa,
-	  branches/extragear/kde3/graphics/digikam/data/themes/Dreary,
-	  branches/extragear/kde3/graphics/digikam/data/themes/Gray,
-	  branches/extragear/kde3/graphics/digikam/data/themes/Marine,
-	  branches/extragear/kde3/graphics/digikam/data/themes/OrangeCrush,
-	  branches/extragear/kde3/graphics/digikam/data/themes/Sandy: to
+	* branches/extragear/trinity/graphics/digikam/data/themes/Blue,
+	  branches/extragear/trinity/graphics/digikam/data/themes/Clean,
+	  branches/extragear/trinity/graphics/digikam/data/themes/DLR,
+	  branches/extragear/trinity/graphics/digikam/data/themes/Dark,
+	  branches/extragear/trinity/graphics/digikam/data/themes/Digikasa,
+	  branches/extragear/trinity/graphics/digikam/data/themes/Dreary,
+	  branches/extragear/trinity/graphics/digikam/data/themes/Gray,
+	  branches/extragear/trinity/graphics/digikam/data/themes/Marine,
+	  branches/extragear/trinity/graphics/digikam/data/themes/OrangeCrush,
+	  branches/extragear/trinity/graphics/digikam/data/themes/Sandy: to
 	  upper
 
 2007-07-24 11:09  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/data/themes/Sandy:
+	* branches/extragear/trinity/graphics/digikam/data/themes/Sandy:
 	  polish
 
 2007-07-24 11:01  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/data/themes/Marine:
+	* branches/extragear/trinity/graphics/digikam/data/themes/Marine:
 	  polish
 
 2007-07-24 10:45  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/data/themes/Dreary:
+	* branches/extragear/trinity/graphics/digikam/data/themes/Dreary:
 	  polish
 
 2007-07-24 10:41  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/data/themes/Sandy:
+	* branches/extragear/trinity/graphics/digikam/data/themes/Sandy:
 	  polish
 
 2007-07-24 10:39  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/data/themes/OrangeCrush:
+	* branches/extragear/trinity/graphics/digikam/data/themes/OrangeCrush:
 	  polish
 
 2007-07-24 10:38  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/data/themes/Dreary:
+	* branches/extragear/trinity/graphics/digikam/data/themes/Dreary:
 	  polish
 
 2007-07-24 10:36  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/data/themes/DLR,
-	  branches/extragear/kde3/graphics/digikam/data/themes/Dark,
-	  branches/extragear/kde3/graphics/digikam/data/themes/Digikasa:
+	* branches/extragear/trinity/graphics/digikam/data/themes/DLR,
+	  branches/extragear/trinity/graphics/digikam/data/themes/Dark,
+	  branches/extragear/trinity/graphics/digikam/data/themes/Digikasa:
 	  polish
 
 2007-07-24 10:34  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/data/themes/Clean:
+	* branches/extragear/trinity/graphics/digikam/data/themes/Clean:
 	  polish
 
 2007-07-24 10:32  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/data/themes/DLR: polish
+	* branches/extragear/trinity/graphics/digikam/data/themes/DLR: polish
 
 2007-07-24 07:21  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/digikam/albumfiletip.cpp:
+	* branches/extragear/trinity/graphics/digikam/digikam/albumfiletip.cpp:
 	  X is more readable than *
 
 2007-07-24 06:51  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/libs/themeengine/themeengine.cpp:
+	* branches/extragear/trinity/graphics/digikam/libs/themeengine/themeengine.cpp:
 	  polish
 
 2007-07-23 12:56  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/utilities/lighttable/lighttablebar.cpp,
-	  branches/extragear/kde3/graphics/digikam/utilities/lighttable/lighttablebar.h:
+	* branches/extragear/trinity/graphics/digikam/utilities/lighttable/lighttablebar.cpp,
+	  branches/extragear/trinity/graphics/digikam/utilities/lighttable/lighttablebar.h:
 	  digiKam from KDE3 branch : backport patch from trunk (KDE4) about
 	  slotThemeChanged rule.
 
 2007-07-23 12:42  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/libs/thumbbar/thumbbar.h:
+	* branches/extragear/trinity/graphics/digikam/libs/thumbbar/thumbbar.h:
 	  private -> protected
 
 2007-07-21 19:25  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/NEWS: update
+	* branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2007-07-21 19:23  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/libs/widgets/common/dcursortracker.cpp:
+	* branches/extragear/trinity/graphics/digikam/libs/widgets/common/dcursortracker.cpp:
 	  digikam from KDE3 branch : fix cursor tracker tooltip position to
 	  be always visible with zoom slider.
 	  BUG: 147362
 
 2007-07-17 20:55  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/data/about/Makefile.am,
-	  branches/extragear/kde3/graphics/digikam/data/about/kde_infopage_rtl.css,
-	  branches/extragear/kde3/graphics/digikam/data/about/main.html,
-	  branches/extragear/kde3/graphics/digikam/digikam/welcomepageview.cpp,
-	  branches/extragear/kde3/graphics/digikam/project/project.kdevelop:
+	* branches/extragear/trinity/graphics/digikam/data/about/Makefile.am,
+	  branches/extragear/trinity/graphics/digikam/data/about/kde_infopage_rtl.css,
+	  branches/extragear/trinity/graphics/digikam/data/about/main.html,
+	  branches/extragear/trinity/graphics/digikam/digikam/welcomepageview.cpp,
+	  branches/extragear/trinity/graphics/digikam/project/project.kdevelop:
 	  digiKam from KDE3 branch : backport fix from trunk about welcome
 	  page view Right to Left language management
 
 2007-07-17 08:09  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/data/about/main.html:
+	* branches/extragear/trinity/graphics/digikam/data/about/main.html:
 	  polish
 
 2007-07-14 19:46  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/digikam/digikamapp.cpp:
+	* branches/extragear/trinity/graphics/digikam/digikam/digikamapp.cpp:
 	  polish
 
 2007-07-14 19:36  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/digikam/digikamapp.cpp:
+	* branches/extragear/trinity/graphics/digikam/digikam/digikamapp.cpp:
 	  digiKam from KDE3 branch : bugfix : Tool Bar Edit config will
 	  never saved in settings file...
 
 2007-07-14 17:15  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/digikam/digikamapp.cpp:
+	* branches/extragear/trinity/graphics/digikam/digikam/digikamapp.cpp:
 	  polish
 
 2007-07-14 06:36  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/digikam/digikamapp.cpp:
+	* branches/extragear/trinity/graphics/digikam/digikam/digikamapp.cpp:
 	  fix broken compil
 
 2007-07-13 21:43  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/digikam/digikamapp.cpp:
+	* branches/extragear/trinity/graphics/digikam/digikam/digikamapp.cpp:
 	  ALT+F6 ==> CTRL+F6
 
 2007-07-13 14:45  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/digikam/digikamappprivate.h:
+	* branches/extragear/trinity/graphics/digikam/digikam/digikamappprivate.h:
 	  polish
 
 2007-07-13 06:15  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/digikam/albumthumbnailloader.cpp:
+	* branches/extragear/trinity/graphics/digikam/digikam/albumthumbnailloader.cpp:
 	  polish
 
 2007-07-12 22:22  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/digikam/cameratype.cpp:
+	* branches/extragear/trinity/graphics/digikam/digikam/cameratype.cpp:
 	  polish
 
 2007-07-12 16:06  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/digikam/albumhistory.cpp:
+	* branches/extragear/trinity/graphics/digikam/digikam/albumhistory.cpp:
 	  polish
 
 2007-07-11 12:14  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/utilities/cameragui/cameraiconitem.cpp:
+	* branches/extragear/trinity/graphics/digikam/utilities/cameragui/cameraiconitem.cpp:
 	  polish
 
 2007-07-11 10:58  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/utilities/cameragui/albumselectdialog.h:
+	* branches/extragear/trinity/graphics/digikam/utilities/cameragui/albumselectdialog.h:
 	  polish
 
 2007-07-10 20:57  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/NEWS: update
+	* branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2007-07-10 20:56  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/libs/greycstoration/CImg.h,
-	  branches/extragear/kde3/graphics/digikam/libs/greycstoration/greycstorationiface.cpp:
+	* branches/extragear/trinity/graphics/digikam/libs/greycstoration/CImg.h,
+	  branches/extragear/trinity/graphics/digikam/libs/greycstoration/greycstorationiface.cpp:
 	  digiKam from KDE3 branch : fix NetBSD compatibilty tests
 	  BUG: 147670
 
 2007-07-10 20:49  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/NEWS: update
+	* branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2007-07-10 20:49  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/configure.in.in: fix
+	* branches/extragear/trinity/graphics/digikam/configure.in.in: fix
 	  automake syntax to be portable under NETBSD
 	  BUG: 147671
 
 2007-07-10 20:29  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/imageplugins/hotpixels/imageeffect_hotpixels.cpp:
+	* branches/extragear/trinity/graphics/digikam/imageplugins/hotpixels/imageeffect_hotpixels.cpp:
 	  polish
 
 2007-07-10 20:08  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/libs/jpegutils/jpegutils.cpp:
+	* branches/extragear/trinity/graphics/digikam/libs/jpegutils/jpegutils.cpp:
 	  compile
 
 2007-07-10 19:45  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/libs/jpegutils/jpegutils.cpp:
+	* branches/extragear/trinity/graphics/digikam/libs/jpegutils/jpegutils.cpp:
 	  using Qt api instead KDE api to check picture file type mime
 
 2007-07-08 16:48  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp:
+	* branches/extragear/trinity/graphics/digikam/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp:
 	  fix link to help
 
 2007-07-08 16:22  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/imageplugins/coreplugin/hsl/hspreviewwidget.cpp:
+	* branches/extragear/trinity/graphics/digikam/imageplugins/coreplugin/hsl/hspreviewwidget.cpp:
 	  missing .moc include
 
 2007-07-06 21:26  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/imageplugins/coreplugin/imageeffect_blur.cpp:
+	* branches/extragear/trinity/graphics/digikam/imageplugins/coreplugin/imageeffect_blur.cpp:
 	  fix link to handbook
 
 2007-07-06 07:36  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/NEWS: update
+	* branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2007-07-06 07:32  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/imageplugins/adjustlevels/adjustlevels.cpp,
-	  branches/extragear/kde3/graphics/digikam/imageplugins/adjustlevels/adjustlevels.h:
+	* branches/extragear/trinity/graphics/digikam/imageplugins/adjustlevels/adjustlevels.cpp,
+	  branches/extragear/trinity/graphics/digikam/imageplugins/adjustlevels/adjustlevels.h:
 	  digiKam from KDE3 branch : Adjust Levels image plugin : install
 	  an event filter on all levels slider to
 	  display a guide over levels histogram when user perform
@@ -11805,18 +11805,18 @@ v0.9.3-beta1 - 2007-010-08
 
 2007-07-05 11:17  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/imageplugins/infrared/infrared.cpp:
+	* branches/extragear/trinity/graphics/digikam/imageplugins/infrared/infrared.cpp:
 	  polish
 
 2007-07-03 09:29  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/imageplugins/whitebalance/imageplugin_whitebalance.cpp:
+	* branches/extragear/trinity/graphics/digikam/imageplugins/whitebalance/imageplugin_whitebalance.cpp:
 	  polish
 
 2007-07-02 16:48  mwiesweg
 
-	* branches/extragear/kde3/graphics/digikam/libs/threadimageio/loadsavethread.cpp,
-	  branches/extragear/kde3/graphics/digikam/libs/threadimageio/previewtask.cpp:
+	* branches/extragear/trinity/graphics/digikam/libs/threadimageio/loadsavethread.cpp,
+	  branches/extragear/trinity/graphics/digikam/libs/threadimageio/previewtask.cpp:
 	  Handle raw embedded preview differently than raw images loaded by
 	  dcraw
 	  (either in full or half size mode).
@@ -11826,73 +11826,73 @@ v0.9.3-beta1 - 2007-010-08
 
 2007-07-02 11:33  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/utilities/imageeditor/canvas/imagepluginloader.cpp:
+	* branches/extragear/trinity/graphics/digikam/utilities/imageeditor/canvas/imagepluginloader.cpp:
 	  polish
 
 2007-07-02 11:16  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/utilities/imageeditor/canvas/imagepluginloader.cpp:
+	* branches/extragear/trinity/graphics/digikam/utilities/imageeditor/canvas/imagepluginloader.cpp:
 	  polish
 
 2007-07-01 18:32  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/NEWS: update
+	* branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2007-07-01 18:30  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/imageplugins/adjustlevels/adjustlevels.cpp,
-	  branches/extragear/kde3/graphics/digikam/imageplugins/border/imageeffect_border.cpp,
-	  branches/extragear/kde3/graphics/digikam/imageplugins/texture/imageeffect_texture.cpp:
+	* branches/extragear/trinity/graphics/digikam/imageplugins/adjustlevels/adjustlevels.cpp,
+	  branches/extragear/trinity/graphics/digikam/imageplugins/border/imageeffect_border.cpp,
+	  branches/extragear/trinity/graphics/digikam/imageplugins/texture/imageeffect_texture.cpp:
 	  digikam from KDE3 branch : fix director which host shared image
 	  used by image plugins
 	  BUG: 147263
 
 2007-07-01 07:09  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/NEWS: update
+	* branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2007-06-30 20:55  ach
 
-	* branches/extragear/kde3/graphics/digikam/imageplugins/adjustcurves/Makefile.am,
-	  branches/extragear/kde3/graphics/digikam/imageplugins/adjustlevels/Makefile.am,
-	  branches/extragear/kde3/graphics/digikam/imageplugins/antivignetting/Makefile.am,
-	  branches/extragear/kde3/graphics/digikam/imageplugins/blurfx/Makefile.am,
-	  branches/extragear/kde3/graphics/digikam/imageplugins/border/Makefile.am,
-	  branches/extragear/kde3/graphics/digikam/imageplugins/channelmixer/Makefile.am,
-	  branches/extragear/kde3/graphics/digikam/imageplugins/charcoal/Makefile.am,
-	  branches/extragear/kde3/graphics/digikam/imageplugins/colorfx/Makefile.am,
-	  branches/extragear/kde3/graphics/digikam/imageplugins/coreplugin/Makefile.am,
-	  branches/extragear/kde3/graphics/digikam/imageplugins/coreplugin/hsl/Makefile.am,
-	  branches/extragear/kde3/graphics/digikam/imageplugins/coreplugin/ratiocrop/Makefile.am,
-	  branches/extragear/kde3/graphics/digikam/imageplugins/coreplugin/sharpnesseditor/Makefile.am,
-	  branches/extragear/kde3/graphics/digikam/imageplugins/distortionfx/Makefile.am,
-	  branches/extragear/kde3/graphics/digikam/imageplugins/emboss/Makefile.am,
-	  branches/extragear/kde3/graphics/digikam/imageplugins/filmgrain/Makefile.am,
-	  branches/extragear/kde3/graphics/digikam/imageplugins/freerotation/Makefile.am,
-	  branches/extragear/kde3/graphics/digikam/imageplugins/hotpixels/Makefile.am,
-	  branches/extragear/kde3/graphics/digikam/imageplugins/infrared/Makefile.am,
-	  branches/extragear/kde3/graphics/digikam/imageplugins/inpainting/Makefile.am,
-	  branches/extragear/kde3/graphics/digikam/imageplugins/inserttext/Makefile.am,
-	  branches/extragear/kde3/graphics/digikam/imageplugins/lensdistortion/Makefile.am,
-	  branches/extragear/kde3/graphics/digikam/imageplugins/noisereduction/Makefile.am,
-	  branches/extragear/kde3/graphics/digikam/imageplugins/oilpaint/Makefile.am,
-	  branches/extragear/kde3/graphics/digikam/imageplugins/perspective/Makefile.am,
-	  branches/extragear/kde3/graphics/digikam/imageplugins/raindrop/Makefile.am,
-	  branches/extragear/kde3/graphics/digikam/imageplugins/restoration/Makefile.am,
-	  branches/extragear/kde3/graphics/digikam/imageplugins/sheartool/Makefile.am,
-	  branches/extragear/kde3/graphics/digikam/imageplugins/superimpose/Makefile.am,
-	  branches/extragear/kde3/graphics/digikam/imageplugins/texture/Makefile.am,
-	  branches/extragear/kde3/graphics/digikam/imageplugins/whitebalance/Makefile.am,
-	  branches/extragear/kde3/graphics/digikam/libs/dialogs/Makefile.am,
-	  branches/extragear/kde3/graphics/digikam/libs/dimg/filters/Makefile.am,
-	  branches/extragear/kde3/graphics/digikam/libs/greycstoration/Makefile.am,
-	  branches/extragear/kde3/graphics/digikam/libs/histogram/Makefile.am,
-	  branches/extragear/kde3/graphics/digikam/libs/thumbbar/Makefile.am,
-	  branches/extragear/kde3/graphics/digikam/libs/widgets/common/Makefile.am,
-	  branches/extragear/kde3/graphics/digikam/libs/widgets/iccprofiles/Makefile.am,
-	  branches/extragear/kde3/graphics/digikam/libs/widgets/imageplugins/Makefile.am,
-	  branches/extragear/kde3/graphics/digikam/utilities/imageeditor/tools/Makefile.am,
-	  branches/extragear/kde3/graphics/digikam/utilities/slideshow/Makefile.am:
+	* branches/extragear/trinity/graphics/digikam/imageplugins/adjustcurves/Makefile.am,
+	  branches/extragear/trinity/graphics/digikam/imageplugins/adjustlevels/Makefile.am,
+	  branches/extragear/trinity/graphics/digikam/imageplugins/antivignetting/Makefile.am,
+	  branches/extragear/trinity/graphics/digikam/imageplugins/blurfx/Makefile.am,
+	  branches/extragear/trinity/graphics/digikam/imageplugins/border/Makefile.am,
+	  branches/extragear/trinity/graphics/digikam/imageplugins/channelmixer/Makefile.am,
+	  branches/extragear/trinity/graphics/digikam/imageplugins/charcoal/Makefile.am,
+	  branches/extragear/trinity/graphics/digikam/imageplugins/colorfx/Makefile.am,
+	  branches/extragear/trinity/graphics/digikam/imageplugins/coreplugin/Makefile.am,
+	  branches/extragear/trinity/graphics/digikam/imageplugins/coreplugin/hsl/Makefile.am,
+	  branches/extragear/trinity/graphics/digikam/imageplugins/coreplugin/ratiocrop/Makefile.am,
+	  branches/extragear/trinity/graphics/digikam/imageplugins/coreplugin/sharpnesseditor/Makefile.am,
+	  branches/extragear/trinity/graphics/digikam/imageplugins/distortionfx/Makefile.am,
+	  branches/extragear/trinity/graphics/digikam/imageplugins/emboss/Makefile.am,
+	  branches/extragear/trinity/graphics/digikam/imageplugins/filmgrain/Makefile.am,
+	  branches/extragear/trinity/graphics/digikam/imageplugins/freerotation/Makefile.am,
+	  branches/extragear/trinity/graphics/digikam/imageplugins/hotpixels/Makefile.am,
+	  branches/extragear/trinity/graphics/digikam/imageplugins/infrared/Makefile.am,
+	  branches/extragear/trinity/graphics/digikam/imageplugins/inpainting/Makefile.am,
+	  branches/extragear/trinity/graphics/digikam/imageplugins/inserttext/Makefile.am,
+	  branches/extragear/trinity/graphics/digikam/imageplugins/lensdistortion/Makefile.am,
+	  branches/extragear/trinity/graphics/digikam/imageplugins/noisereduction/Makefile.am,
+	  branches/extragear/trinity/graphics/digikam/imageplugins/oilpaint/Makefile.am,
+	  branches/extragear/trinity/graphics/digikam/imageplugins/perspective/Makefile.am,
+	  branches/extragear/trinity/graphics/digikam/imageplugins/raindrop/Makefile.am,
+	  branches/extragear/trinity/graphics/digikam/imageplugins/restoration/Makefile.am,
+	  branches/extragear/trinity/graphics/digikam/imageplugins/sheartool/Makefile.am,
+	  branches/extragear/trinity/graphics/digikam/imageplugins/superimpose/Makefile.am,
+	  branches/extragear/trinity/graphics/digikam/imageplugins/texture/Makefile.am,
+	  branches/extragear/trinity/graphics/digikam/imageplugins/whitebalance/Makefile.am,
+	  branches/extragear/trinity/graphics/digikam/libs/dialogs/Makefile.am,
+	  branches/extragear/trinity/graphics/digikam/libs/dimg/filters/Makefile.am,
+	  branches/extragear/trinity/graphics/digikam/libs/greycstoration/Makefile.am,
+	  branches/extragear/trinity/graphics/digikam/libs/histogram/Makefile.am,
+	  branches/extragear/trinity/graphics/digikam/libs/thumbbar/Makefile.am,
+	  branches/extragear/trinity/graphics/digikam/libs/widgets/common/Makefile.am,
+	  branches/extragear/trinity/graphics/digikam/libs/widgets/iccprofiles/Makefile.am,
+	  branches/extragear/trinity/graphics/digikam/libs/widgets/imageplugins/Makefile.am,
+	  branches/extragear/trinity/graphics/digikam/utilities/imageeditor/tools/Makefile.am,
+	  branches/extragear/trinity/graphics/digikam/utilities/slideshow/Makefile.am:
 	  build fix: make sure libkexiv2 and libkdcraw header files
 	  are found when install in a different location.
 
@@ -11900,20 +11900,20 @@ v0.9.3-beta1 - 2007-010-08
 
 2007-06-30 07:45  ach
 
-	* branches/extragear/kde3/graphics/digikam/utilities/hotplug/digikam-download.desktop.in,
-	  branches/extragear/kde3/graphics/digikam/utilities/hotplug/digikam-gphoto2-camera.desktop.in,
-	  branches/extragear/kde3/graphics/digikam/utilities/hotplug/digikam-mount-and-download.desktop.in:
+	* branches/extragear/trinity/graphics/digikam/utilities/hotplug/digikam-download.desktop.in,
+	  branches/extragear/trinity/graphics/digikam/utilities/hotplug/digikam-gphoto2-camera.desktop.in,
+	  branches/extragear/trinity/graphics/digikam/utilities/hotplug/digikam-mount-and-download.desktop.in:
 	  fix from encoding french translation in hotplug desktop files.
 	  Thx to Anthony Mercatante <tonio@ubuntu.com> for the patch.
 	  ( .desktop.in files are still not scanned by script )
 
 2007-06-29 08:45  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/NEWS: update
+	* branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2007-06-29 08:44  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/showfoto/showfoto.cpp:
+	* branches/extragear/trinity/graphics/digikam/showfoto/showfoto.cpp:
 	  digiKam from KDE3 branch : fix showfoto crash if File/Open action
 	  is invoqued multiple time.
 	  The current item instance is not reseted between file open
@@ -11924,26 +11924,26 @@ v0.9.3-beta1 - 2007-010-08
 
 2007-06-28 11:45  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/utilities/lighttable/lighttablepreview.cpp:
+	* branches/extragear/trinity/graphics/digikam/utilities/lighttable/lighttablepreview.cpp:
 	  polish
 
 2007-06-28 04:16  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/NEWS: update
+	* branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2007-06-27 13:27  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/libs/widgets/common/splashscreen.cpp,
-	  branches/extragear/kde3/graphics/digikam/libs/widgets/common/splashscreen.h:
+	* branches/extragear/trinity/graphics/digikam/libs/widgets/common/splashscreen.cpp,
+	  branches/extragear/trinity/graphics/digikam/libs/widgets/common/splashscreen.h:
 	  QSplashScreen ==> KSplashScreen
 
 2007-06-27 13:13  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/digikam/digikamapp.cpp,
-	  branches/extragear/kde3/graphics/digikam/libs/widgets/common/splashscreen.cpp,
-	  branches/extragear/kde3/graphics/digikam/libs/widgets/common/splashscreen.h,
-	  branches/extragear/kde3/graphics/digikam/project/project.kdevelop,
-	  branches/extragear/kde3/graphics/digikam/showfoto/showfoto.cpp:
+	* branches/extragear/trinity/graphics/digikam/digikam/digikamapp.cpp,
+	  branches/extragear/trinity/graphics/digikam/libs/widgets/common/splashscreen.cpp,
+	  branches/extragear/trinity/graphics/digikam/libs/widgets/common/splashscreen.h,
+	  branches/extragear/trinity/graphics/digikam/project/project.kdevelop,
+	  branches/extragear/trinity/graphics/digikam/showfoto/showfoto.cpp:
 	  digiKam from KDE3 branch : new splashscreen implemetation based
 	  on QSplashScreen. More portable. will be backported later on KDE4
 	  branch
@@ -11951,23 +11951,23 @@ v0.9.3-beta1 - 2007-010-08
 
 2007-06-27 12:06  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/digikam/Makefile.am,
-	  branches/extragear/kde3/graphics/digikam/libs/widgets/common/Makefile.am,
-	  branches/extragear/kde3/graphics/digikam/libs/widgets/common/splashscreen.cpp,
-	  branches/extragear/kde3/graphics/digikam/libs/widgets/common/splashscreen.h,
-	  branches/extragear/kde3/graphics/digikam/showfoto/Makefile.am,
-	  branches/extragear/kde3/graphics/digikam/utilities/Makefile.am,
-	  branches/extragear/kde3/graphics/digikam/utilities/splashscreen:
+	* branches/extragear/trinity/graphics/digikam/digikam/Makefile.am,
+	  branches/extragear/trinity/graphics/digikam/libs/widgets/common/Makefile.am,
+	  branches/extragear/trinity/graphics/digikam/libs/widgets/common/splashscreen.cpp,
+	  branches/extragear/trinity/graphics/digikam/libs/widgets/common/splashscreen.h,
+	  branches/extragear/trinity/graphics/digikam/showfoto/Makefile.am,
+	  branches/extragear/trinity/graphics/digikam/utilities/Makefile.am,
+	  branches/extragear/trinity/graphics/digikam/utilities/splashscreen:
 	  digikam from KDE3 branch : move splashscreen to
 	  libs/widgets/common
 
 2007-06-26 17:19  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/NEWS: update
+	* branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2007-06-26 17:16  mwiesweg
 
-	* branches/extragear/kde3/graphics/digikam/digikam/iconview.cpp:
+	* branches/extragear/trinity/graphics/digikam/digikam/iconview.cpp:
 	  Emit signalSelectionchanged after selecting all items under the
 	  rubber band.
 	  While selecting the individual items, signals are blocked.
@@ -11976,11 +11976,11 @@ v0.9.3-beta1 - 2007-010-08
 
 2007-06-26 16:53  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/NEWS: update
+	* branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2007-06-26 16:35  mwiesweg
 
-	* branches/extragear/kde3/graphics/digikam/utilities/imageeditor/editor/imagewindow.cpp:
+	* branches/extragear/trinity/graphics/digikam/utilities/imageeditor/editor/imagewindow.cpp:
 	  Applying the patch from Pawel Marciniak to fix copy-and-paste
 	  bug.
 	  Thank you very much for your patch.
@@ -11989,16 +11989,16 @@ v0.9.3-beta1 - 2007-010-08
 
 2007-06-26 13:43  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/showfoto/showfoto.cpp:
+	* branches/extragear/trinity/graphics/digikam/showfoto/showfoto.cpp:
 	  duplicate header
 
 2007-06-26 07:08  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/showfoto/showfotoui.rc,
-	  branches/extragear/kde3/graphics/digikam/utilities/imageeditor/editor/digikamimagewindowui.rc,
-	  branches/extragear/kde3/graphics/digikam/utilities/imageeditor/editor/editorwindow.cpp,
-	  branches/extragear/kde3/graphics/digikam/utilities/imageeditor/editor/editorwindow.h,
-	  branches/extragear/kde3/graphics/digikam/utilities/imageeditor/editor/editorwindowprivate.h:
+	* branches/extragear/trinity/graphics/digikam/showfoto/showfotoui.rc,
+	  branches/extragear/trinity/graphics/digikam/utilities/imageeditor/editor/digikamimagewindowui.rc,
+	  branches/extragear/trinity/graphics/digikam/utilities/imageeditor/editor/editorwindow.cpp,
+	  branches/extragear/trinity/graphics/digikam/utilities/imageeditor/editor/editorwindow.h,
+	  branches/extragear/trinity/graphics/digikam/utilities/imageeditor/editor/editorwindowprivate.h:
 	  digikam from KDE3 branch : since digiKam and DigikamImagePlugins
 	  project have been merged, Help/ImagePlugins Handbook menu action
 	  is obsolet
@@ -12006,55 +12006,55 @@ v0.9.3-beta1 - 2007-010-08
 
 2007-06-24 13:23  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/utilities/imageeditor/canvas/canvas.cpp:
+	* branches/extragear/trinity/graphics/digikam/utilities/imageeditor/canvas/canvas.cpp:
 	  polish
 
 2007-06-24 12:48  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/utilities/imageeditor/canvas/undomanager.cpp,
-	  branches/extragear/kde3/graphics/digikam/utilities/imageeditor/canvas/undomanager.h:
+	* branches/extragear/trinity/graphics/digikam/utilities/imageeditor/canvas/undomanager.cpp,
+	  branches/extragear/trinity/graphics/digikam/utilities/imageeditor/canvas/undomanager.h:
 	  polish
 
 2007-06-24 12:47  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/utilities/imageeditor/canvas/undomanager.cpp:
+	* branches/extragear/trinity/graphics/digikam/utilities/imageeditor/canvas/undomanager.cpp:
 	  fix possible broken compilation duing a missing C++ header
 
 2007-06-23 21:35  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/libs/widgets/metadata/mdkeylistviewitem.cpp,
-	  branches/extragear/kde3/graphics/digikam/libs/widgets/metadata/mdkeylistviewitem.h:
+	* branches/extragear/trinity/graphics/digikam/libs/widgets/metadata/mdkeylistviewitem.cpp,
+	  branches/extragear/trinity/graphics/digikam/libs/widgets/metadata/mdkeylistviewitem.h:
 	  polish
 
 2007-06-23 13:55  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/libs/widgets/imageplugins/imageregionwidget.cpp:
+	* branches/extragear/trinity/graphics/digikam/libs/widgets/imageplugins/imageregionwidget.cpp:
 	  polish
 
 2007-06-23 13:41  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/libs/widgets/imageplugins/imagepaniconwidget.cpp:
+	* branches/extragear/trinity/graphics/digikam/libs/widgets/imageplugins/imagepaniconwidget.cpp:
 	  polish
 
 2007-06-23 13:09  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/utilities/imageeditor/editor/imageiface.h:
+	* branches/extragear/trinity/graphics/digikam/utilities/imageeditor/editor/imageiface.h:
 	  polish
 
 2007-06-23 13:04  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/libs/widgets/imageplugins/listboxpreviewitem.h:
+	* branches/extragear/trinity/graphics/digikam/libs/widgets/imageplugins/listboxpreviewitem.h:
 	  polish
 
 2007-06-23 13:01  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/libs/widgets/imageplugins/listboxpreviewitem.cpp,
-	  branches/extragear/kde3/graphics/digikam/libs/widgets/imageplugins/listboxpreviewitem.h:
+	* branches/extragear/trinity/graphics/digikam/libs/widgets/imageplugins/listboxpreviewitem.cpp,
+	  branches/extragear/trinity/graphics/digikam/libs/widgets/imageplugins/listboxpreviewitem.h:
 	  polish
 
 2007-06-23 08:12  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/libs/widgets/iccprofiles/iccprofilewidget.cpp:
+	* branches/extragear/trinity/graphics/digikam/libs/widgets/iccprofiles/iccprofilewidget.cpp:
 	  --Cette ligpolishne, et les suivantes ci-dessous, seront
 	  ignorées--
 
@@ -12062,177 +12062,177 @@ v0.9.3-beta1 - 2007-010-08
 
 2007-06-22 12:25  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/libs/widgets/common/squeezedcombobox.cpp,
-	  branches/extragear/kde3/graphics/digikam/libs/widgets/common/squeezedcombobox.h:
+	* branches/extragear/trinity/graphics/digikam/libs/widgets/common/squeezedcombobox.cpp,
+	  branches/extragear/trinity/graphics/digikam/libs/widgets/common/squeezedcombobox.h:
 	  missing EXPORT rule
 
 2007-06-21 06:39  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/data/pics/digikam-splash.png,
-	  branches/extragear/kde3/graphics/digikam/data/pics/digikam-splash.xcf:
+	* branches/extragear/trinity/graphics/digikam/data/pics/digikam-splash.png,
+	  branches/extragear/trinity/graphics/digikam/data/pics/digikam-splash.xcf:
 	  fix release id
 
 2007-06-20 18:00  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/libs/dialogs/deletedialog.cpp,
-	  branches/extragear/kde3/graphics/digikam/libs/dialogs/deletedialog.h:
+	* branches/extragear/trinity/graphics/digikam/libs/dialogs/deletedialog.cpp,
+	  branches/extragear/trinity/graphics/digikam/libs/dialogs/deletedialog.h:
 	  compile
 
 2007-06-20 09:24  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/libs/dialogs/imagedlgbase.h:
+	* branches/extragear/trinity/graphics/digikam/libs/dialogs/imagedlgbase.h:
 	  fix header
 
 2007-06-20 09:20  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/libs/dialogs/deletedialog.cpp:
+	* branches/extragear/trinity/graphics/digikam/libs/dialogs/deletedialog.cpp:
 	  polish
 
 2007-06-20 09:18  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/libs/dialogs/deletedialog.cpp,
-	  branches/extragear/kde3/graphics/digikam/libs/dialogs/deletedialog.h:
+	* branches/extragear/trinity/graphics/digikam/libs/dialogs/deletedialog.cpp,
+	  branches/extragear/trinity/graphics/digikam/libs/dialogs/deletedialog.h:
 	  polish
 
 2007-06-20 08:55  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/libs/dialogs/dprogressdlg.cpp:
+	* branches/extragear/trinity/graphics/digikam/libs/dialogs/dprogressdlg.cpp:
 	  polish
 
 2007-06-19 20:35  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/utilities/setup/setupicc.cpp:
+	* branches/extragear/trinity/graphics/digikam/utilities/setup/setupicc.cpp:
 	  polish
 
 2007-06-19 14:04  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/utilities/setup/cameraselection.cpp:
+	* branches/extragear/trinity/graphics/digikam/utilities/setup/cameraselection.cpp:
 	  polish
 
 2007-06-19 13:30  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/utilities/setup/setupcollections.cpp:
+	* branches/extragear/trinity/graphics/digikam/utilities/setup/setupcollections.cpp:
 	  QListBox ==> KListBox
 
 2007-06-19 12:18  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/utilities/setup/setupgeneral.cpp:
+	* branches/extragear/trinity/graphics/digikam/utilities/setup/setupgeneral.cpp:
 	  polish
 
 2007-06-19 12:14  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/utilities/setup/setupgeneral.h:
+	* branches/extragear/trinity/graphics/digikam/utilities/setup/setupgeneral.h:
 	  polish
 
 2007-06-19 11:22  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/showfoto/setup/setup.cpp:
+	* branches/extragear/trinity/graphics/digikam/showfoto/setup/setup.cpp:
 	  fix i18n
 
 2007-06-19 10:02  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/utilities/setup/setupicc.h:
+	* branches/extragear/trinity/graphics/digikam/utilities/setup/setupicc.h:
 	  compile
 
 2007-06-19 09:24  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/utilities/setup/setupicc.h:
+	* branches/extragear/trinity/graphics/digikam/utilities/setup/setupicc.h:
 	  polish
 
 2007-06-19 07:57  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/showfoto/setup/setupeditor.cpp:
+	* branches/extragear/trinity/graphics/digikam/showfoto/setup/setupeditor.cpp:
 	  polish
 
 2007-06-19 07:23  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/showfoto/setup/setuptooltip.cpp:
+	* branches/extragear/trinity/graphics/digikam/showfoto/setup/setuptooltip.cpp:
 	  never use digiKam album settings with showfoto
 
 2007-06-19 07:21  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/showfoto/setup/setuptooltip.h:
+	* branches/extragear/trinity/graphics/digikam/showfoto/setup/setuptooltip.h:
 	  polish
 
 2007-06-19 07:19  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/showfoto/setup/Makefile.am:
+	* branches/extragear/trinity/graphics/digikam/showfoto/setup/Makefile.am:
 	  update
 
 2007-06-19 06:58  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/data/icons/hi128-app-dcraw.png:
+	* branches/extragear/trinity/graphics/digikam/data/icons/hi128-app-dcraw.png:
 	  obsolete
 
 2007-06-19 06:56  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/showfoto/icons/hi128-app-dcraw.png:
+	* branches/extragear/trinity/graphics/digikam/showfoto/icons/hi128-app-dcraw.png:
 	  obsolete
 
 2007-06-19 06:49  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/Makefile.am,
-	  branches/extragear/kde3/graphics/digikam/libs/Makefile.am:
+	* branches/extragear/trinity/graphics/digikam/Makefile.am,
+	  branches/extragear/trinity/graphics/digikam/libs/Makefile.am:
 	  compile
 
 2007-06-19 06:46  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/digikam/Makefile.am,
-	  branches/extragear/kde3/graphics/digikam/libs/Makefile.am,
-	  branches/extragear/kde3/graphics/digikam/libs/sqlite2,
-	  branches/extragear/kde3/graphics/digikam/sqlite: digikam from
+	* branches/extragear/trinity/graphics/digikam/digikam/Makefile.am,
+	  branches/extragear/trinity/graphics/digikam/libs/Makefile.am,
+	  branches/extragear/trinity/graphics/digikam/libs/sqlite2,
+	  branches/extragear/trinity/graphics/digikam/sqlite: digikam from
 	  KDE3 branch : move sqlite to libs/sqlite2
 
 2007-06-19 06:44  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/utilities/setup/setuptooltip.h:
+	* branches/extragear/trinity/graphics/digikam/utilities/setup/setuptooltip.h:
 	  polish
 
 2007-06-18 14:40  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/utilities/setup/setupeditor.cpp:
+	* branches/extragear/trinity/graphics/digikam/utilities/setup/setupeditor.cpp:
 	  polish
 
 2007-06-18 14:39  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/utilities/setup/setupeditor.h:
+	* branches/extragear/trinity/graphics/digikam/utilities/setup/setupeditor.h:
 	  polish
 
 2007-06-18 14:27  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/utilities/setup/setuplighttable.cpp:
+	* branches/extragear/trinity/graphics/digikam/utilities/setup/setuplighttable.cpp:
 	  compile
 
 2007-06-18 14:25  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/utilities/setup/setuplighttable.cpp:
+	* branches/extragear/trinity/graphics/digikam/utilities/setup/setuplighttable.cpp:
 	  polish
 
 2007-06-18 13:39  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/utilities/setup/setuplighttable.h:
+	* branches/extragear/trinity/graphics/digikam/utilities/setup/setuplighttable.h:
 	  polish
 
 2007-06-18 13:28  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/utilities/setup/setupplugins.cpp,
-	  branches/extragear/kde3/graphics/digikam/utilities/setup/setupplugins.h:
+	* branches/extragear/trinity/graphics/digikam/utilities/setup/setupplugins.cpp,
+	  branches/extragear/trinity/graphics/digikam/utilities/setup/setupplugins.h:
 	  polish
 
 2007-06-18 11:53  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/data/pics/Makefile.am,
-	  branches/extragear/kde3/graphics/digikam/data/pics/digikam-splash.png,
-	  branches/extragear/kde3/graphics/digikam/data/pics/digikam-splash.xcf,
-	  branches/extragear/kde3/graphics/digikam/utilities/splashscreen/Makefile.am,
-	  branches/extragear/kde3/graphics/digikam/utilities/splashscreen/digikam-splash.png,
-	  branches/extragear/kde3/graphics/digikam/utilities/splashscreen/digikam-splash.xcf:
+	* branches/extragear/trinity/graphics/digikam/data/pics/Makefile.am,
+	  branches/extragear/trinity/graphics/digikam/data/pics/digikam-splash.png,
+	  branches/extragear/trinity/graphics/digikam/data/pics/digikam-splash.xcf,
+	  branches/extragear/trinity/graphics/digikam/utilities/splashscreen/Makefile.am,
+	  branches/extragear/trinity/graphics/digikam/utilities/splashscreen/digikam-splash.png,
+	  branches/extragear/trinity/graphics/digikam/utilities/splashscreen/digikam-splash.xcf:
 	  move splash files to data/pics
 
 2007-06-18 11:53  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/libs/curves/imagecurves.cpp,
-	  branches/extragear/kde3/graphics/digikam/libs/curves/imagecurves.h:
+	* branches/extragear/trinity/graphics/digikam/libs/curves/imagecurves.cpp,
+	  branches/extragear/trinity/graphics/digikam/libs/curves/imagecurves.h:
 	  --Cettepolish ligne, et les suivantes ci-dessous, seront
 	  ignorées--
 
@@ -12241,95 +12241,95 @@ v0.9.3-beta1 - 2007-010-08
 
 2007-06-18 11:44  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/showfoto/pics/showfoto-splash.png,
-	  branches/extragear/kde3/graphics/digikam/showfoto/pics/showfoto-splash.xcf:
+	* branches/extragear/trinity/graphics/digikam/showfoto/pics/showfoto-splash.png,
+	  branches/extragear/trinity/graphics/digikam/showfoto/pics/showfoto-splash.xcf:
 	  fix release id
 
 2007-06-17 22:00  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/libs/imageproperties/Makefile.am:
+	* branches/extragear/trinity/graphics/digikam/libs/imageproperties/Makefile.am:
 	  polish
 
 2007-06-17 21:33  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/digikam/Makefile.am:
+	* branches/extragear/trinity/graphics/digikam/digikam/Makefile.am:
 	  polish
 
 2007-06-17 16:33  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/libs/dimg/loaders/jpegloader.cpp:
+	* branches/extragear/trinity/graphics/digikam/libs/dimg/loaders/jpegloader.cpp:
 	  digikam from KDE3 branch : backport commits #676719 from Marcel.
 	  CCMAIL: marcel.wiesweg@gmx.de
 
 2007-06-17 12:55  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/sqlite/Makefile.am:
+	* branches/extragear/trinity/graphics/digikam/sqlite/Makefile.am:
 	  libslite --> libsqlite2
 
 2007-06-17 12:55  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/digikam/Makefile.am:
+	* branches/extragear/trinity/graphics/digikam/digikam/Makefile.am:
 	  libsqlite --> libsqlite2
 
 2007-06-17 12:52  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/sqlite/README: add
+	* branches/extragear/trinity/graphics/digikam/sqlite/README: add
 
 2007-06-17 11:59  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/libs/thumbbar/thumbnailjob.cpp:
+	* branches/extragear/trinity/graphics/digikam/libs/thumbbar/thumbnailjob.cpp:
 	  polish
 
 2007-06-17 07:18  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/NEWS: update
+	* branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2007-06-17 07:17  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/imageplugins/coreplugin/ratiocrop/imageselectionwidget.cpp:
+	* branches/extragear/trinity/graphics/digikam/imageplugins/coreplugin/ratiocrop/imageselectionwidget.cpp:
 	  digikam from KDE3 branch : Ratio Crop Tool : patch from Arnd
 	  Beacker about to fix round off error in helper lines computation.
 	  BUG: 120450
 
 2007-06-15 21:21  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/libs/thumbbar/thumbbar.h:
+	* branches/extragear/trinity/graphics/digikam/libs/thumbbar/thumbbar.h:
 	  fix warnings
 
 2007-06-15 12:33  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/libs/dimg/filters/Makefile.am:
+	* branches/extragear/trinity/graphics/digikam/libs/dimg/filters/Makefile.am:
 	  polish
 
 2007-06-15 12:32  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/libs/dimg/filters/icctransform.cpp:
+	* branches/extragear/trinity/graphics/digikam/libs/dimg/filters/icctransform.cpp:
 	  fix warning
 
 2007-06-15 10:12  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/libs/dimg/loaders/Makefile.am:
+	* branches/extragear/trinity/graphics/digikam/libs/dimg/loaders/Makefile.am:
 	  polish
 
 2007-06-15 08:06  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/libs/dimg/loaders/Makefile.am:
+	* branches/extragear/trinity/graphics/digikam/libs/dimg/loaders/Makefile.am:
 	  polish
 
 2007-06-14 22:10  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/libs/dimg/loaders/dimgloaderobserver.h:
+	* branches/extragear/trinity/graphics/digikam/libs/dimg/loaders/dimgloaderobserver.h:
 	  polish
 
 2007-06-14 14:56  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/libs/dimg/dimg.h,
-	  branches/extragear/kde3/graphics/digikam/libs/dimg/dimgscale.cpp:
+	* branches/extragear/trinity/graphics/digikam/libs/dimg/dimg.h,
+	  branches/extragear/trinity/graphics/digikam/libs/dimg/dimgscale.cpp:
 	  revert
 
 2007-06-14 14:53  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/libs/dimg/dimg.h:
+	* branches/extragear/trinity/graphics/digikam/libs/dimg/dimg.h:
 	  compile--Cette ligne, et les suivantes ci-dessous, seront
 	  ignorées--
 
@@ -12337,106 +12337,106 @@ v0.9.3-beta1 - 2007-010-08
 
 2007-06-14 14:51  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/libs/dimg/dimg.h,
-	  branches/extragear/kde3/graphics/digikam/libs/dimg/dimgscale.cpp:
+	* branches/extragear/trinity/graphics/digikam/libs/dimg/dimg.h,
+	  branches/extragear/trinity/graphics/digikam/libs/dimg/dimgscale.cpp:
 	  compile
 
 2007-06-14 13:37  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/libs/jpegutils/jpegutils.cpp:
+	* branches/extragear/trinity/graphics/digikam/libs/jpegutils/jpegutils.cpp:
 	  polish
 
 2007-06-14 12:02  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/libs/histogram/imagehistogram.h:
+	* branches/extragear/trinity/graphics/digikam/libs/histogram/imagehistogram.h:
 	  polish
 
 2007-06-14 11:44  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/libs/dimg/dcolorcomposer.cpp,
-	  branches/extragear/kde3/graphics/digikam/libs/dimg/dcolorcomposer.h:
+	* branches/extragear/trinity/graphics/digikam/libs/dimg/dcolorcomposer.cpp,
+	  branches/extragear/trinity/graphics/digikam/libs/dimg/dcolorcomposer.h:
 	  polish
 
 2007-06-14 11:18  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/libs/dimg/dcolorcomposer.cpp:
+	* branches/extragear/trinity/graphics/digikam/libs/dimg/dcolorcomposer.cpp:
 	  use C++ header instead C Ansi
 
 2007-06-14 10:30  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/libs/levels/imagelevels.cpp,
-	  branches/extragear/kde3/graphics/digikam/libs/levels/imagelevels.h:
+	* branches/extragear/trinity/graphics/digikam/libs/levels/imagelevels.cpp,
+	  branches/extragear/trinity/graphics/digikam/libs/levels/imagelevels.h:
 	  polish
 
 2007-06-13 19:11  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/showfoto/pics/menusidepixmap.png:
+	* branches/extragear/trinity/graphics/digikam/showfoto/pics/menusidepixmap.png:
 	  update
 
 2007-06-13 19:10  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/data/pics/menusidepixmap.png,
-	  branches/extragear/kde3/graphics/digikam/data/pics/menusidepixmap.xcf,
-	  branches/extragear/kde3/graphics/digikam/showfoto/pics/menusidepixmap.xcf:
+	* branches/extragear/trinity/graphics/digikam/data/pics/menusidepixmap.png,
+	  branches/extragear/trinity/graphics/digikam/data/pics/menusidepixmap.xcf,
+	  branches/extragear/trinity/graphics/digikam/showfoto/pics/menusidepixmap.xcf:
 	  update menu pixmap
 
 2007-06-13 19:02  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/showfoto/main.cpp: fix
+	* branches/extragear/trinity/graphics/digikam/showfoto/main.cpp: fix
 	  release id
 
 2007-06-13 19:00  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/configure.in.in,
-	  branches/extragear/kde3/graphics/digikam/digikam.lsm,
-	  branches/extragear/kde3/graphics/digikam/digikam/version.h,
-	  branches/extragear/kde3/graphics/digikam/project/project.kdevelop:
+	* branches/extragear/trinity/graphics/digikam/configure.in.in,
+	  branches/extragear/trinity/graphics/digikam/digikam.lsm,
+	  branches/extragear/trinity/graphics/digikam/digikam/version.h,
+	  branches/extragear/trinity/graphics/digikam/project/project.kdevelop:
 	  0.9.2-final --> 0.9.3-svn
 
 2007-06-13 18:58  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/NEWS,
-	  branches/extragear/kde3/graphics/digikam/NEWS.0.9.2: update
+	* branches/extragear/trinity/graphics/digikam/NEWS,
+	  branches/extragear/trinity/graphics/digikam/NEWS.0.9.2: update
 
 2007-06-13 18:57  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/NEWS: update
+	* branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2007-06-13 18:13  gkulzer
 
-	* branches/extragear/kde3/graphics/digikam/NEWS: 0.9.2-final
+	* branches/extragear/trinity/graphics/digikam/NEWS: 0.9.2-final
 	  release
 
 2007-06-13 17:55  gkulzer
 
-	* branches/extragear/kde3/graphics/digikam/release_digikam_kde3.rb:
+	* branches/extragear/trinity/graphics/digikam/release_digikam_trinity.rb:
 	  0.9.2-final release
 
 2007-06-13 17:43  gkulzer
 
-	* branches/extragear/kde3/graphics/digikam/ChangeLog: 0.9.2-final
+	* branches/extragear/trinity/graphics/digikam/ChangeLog: 0.9.2-final
 	  release
 
 2007-06-13 17:28  gkulzer
 
-	* branches/extragear/kde3/graphics/digikam/digikam.lsm,
-	  branches/extragear/kde3/graphics/digikam/release_digikam_kde3.rb:
+	* branches/extragear/trinity/graphics/digikam/digikam.lsm,
+	  branches/extragear/trinity/graphics/digikam/release_digikam_trinity.rb:
 	  0.9.2-final release
 
 2007-06-13 17:28  gkulzer
 
-	* branches/extragear/kde3/graphics/digikam/digikam/version.h:
+	* branches/extragear/trinity/graphics/digikam/digikam/version.h:
 	  0.9.2-final release
 
 2007-06-13 17:19  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/digikam/tagspopupmenu.cpp:
+	* branches/extragear/trinity/graphics/digikam/digikam/tagspopupmenu.cpp:
 	  digiKam from KDE3 branch : fix "&" char on tag menus.
 	  BUG: 146744
 
 2007-06-13 10:35  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/NEWS: update
+	* branches/extragear/trinity/graphics/digikam/NEWS: update
 
 
 
@@ -12445,48 +12445,48 @@ v0.9.2-final - 2007-06-13
 
 2007-06-11 20:11  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/digikam/digikamview.cpp,
-	  branches/extragear/kde3/graphics/digikam/project/project.kdevelop,
-	  branches/extragear/kde3/graphics/digikam/showfoto/showfoto.cpp:
+	* branches/extragear/trinity/graphics/digikam/digikam/digikamview.cpp,
+	  branches/extragear/trinity/graphics/digikam/project/project.kdevelop,
+	  branches/extragear/trinity/graphics/digikam/showfoto/showfoto.cpp:
 	  add "JPE" and "TIF" type mime witch are not provide by KDE mime
 	  type by default
 
 2007-06-11 11:51  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/AUTHORS: add Arnd to
+	* branches/extragear/trinity/graphics/digikam/AUTHORS: add Arnd to
 	  contrib list
 
 2007-06-11 11:46  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/digikam.lsm: polish
+	* branches/extragear/trinity/graphics/digikam/digikam.lsm: polish
 
 2007-06-11 11:44  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/configure.in.bot: polish
+	* branches/extragear/trinity/graphics/digikam/configure.in.bot: polish
 
 2007-06-11 11:42  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/configure.in.in: fix
+	* branches/extragear/trinity/graphics/digikam/configure.in.in: fix
 	  likdcraw depency
 
 2007-06-11 11:41  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/README: update
+	* branches/extragear/trinity/graphics/digikam/README: update
 
 2007-06-11 10:33  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/themedesigner/mainwindow.h:
+	* branches/extragear/trinity/graphics/digikam/themedesigner/mainwindow.h:
 	  compile with enable-final option
 
 2007-06-07 17:07  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/NEWS: update
+	* branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2007-06-07 14:29  mwiesweg
 
-	* branches/extragear/kde3/graphics/digikam/libs/threadimageio/loadingdescription.cpp,
-	  branches/extragear/kde3/graphics/digikam/libs/threadimageio/loadingdescription.h,
-	  branches/extragear/kde3/graphics/digikam/libs/threadimageio/previewloadthread.cpp:
+	* branches/extragear/trinity/graphics/digikam/libs/threadimageio/loadingdescription.cpp,
+	  branches/extragear/trinity/graphics/digikam/libs/threadimageio/loadingdescription.h,
+	  branches/extragear/trinity/graphics/digikam/libs/threadimageio/previewloadthread.cpp:
 	  Apply patch from Jakob Oestergaard to reflect 8/16 bit loading
 	  in the cache key, needed to distinguish between lighttable,
 	  histogram
@@ -12502,91 +12502,91 @@ v0.9.2-final - 2007-06-13
 
 2007-06-07 08:59  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/digikam/main.cpp: add
+	* branches/extragear/trinity/graphics/digikam/digikam/main.cpp: add
 	  Angelo
 
 2007-06-07 08:59  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/showfoto/main.cpp: add
+	* branches/extragear/trinity/graphics/digikam/showfoto/main.cpp: add
 	  Angelo
 
 2007-06-07 08:57  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/AUTHORS: add Angelo in
+	* branches/extragear/trinity/graphics/digikam/AUTHORS: add Angelo in
 	  team
 
 2007-06-05 22:46  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/NEWS: update
+	* branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2007-06-05 22:45  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/libs/widgets/metadata/makernotewidget.cpp:
+	* branches/extragear/trinity/graphics/digikam/libs/widgets/metadata/makernotewidget.cpp:
 	  fix broken compilation duing obsolete Exiv2 depency
 	  BUG: 146436
 
 2007-06-05 17:08  mwiesweg
 
-	* branches/extragear/kde3/graphics/digikam/digikam/albumsettings.h,
-	  branches/extragear/kde3/graphics/digikam/digikam/folderitem.h,
-	  branches/extragear/kde3/graphics/digikam/digikam/folderview.h,
-	  branches/extragear/kde3/graphics/digikam/digikam/icongroupitem.h,
-	  branches/extragear/kde3/graphics/digikam/digikam/iconitem.h,
-	  branches/extragear/kde3/graphics/digikam/digikam/iconview.h: Fix
+	* branches/extragear/trinity/graphics/digikam/digikam/albumsettings.h,
+	  branches/extragear/trinity/graphics/digikam/digikam/folderitem.h,
+	  branches/extragear/trinity/graphics/digikam/digikam/folderview.h,
+	  branches/extragear/trinity/graphics/digikam/digikam/icongroupitem.h,
+	  branches/extragear/trinity/graphics/digikam/digikam/iconitem.h,
+	  branches/extragear/trinity/graphics/digikam/digikam/iconview.h: Fix
 	  compilation of themedesigner with gcc-hidden-visibility:
 	  Export those classes that are used by Themedesigner
 
 2007-06-05 16:36  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/TODO: update
+	* branches/extragear/trinity/graphics/digikam/TODO: update
 
 2007-06-05 12:49  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/TODO: link to KDE4
+	* branches/extragear/trinity/graphics/digikam/TODO: link to KDE4
 	  kdelibs port
 
 2007-06-04 16:13  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/TODO: CMake link
+	* branches/extragear/trinity/graphics/digikam/TODO: CMake link
 
 2007-06-04 07:12  gkulzer
 
-	* branches/extragear/kde3/graphics/digikam/imageplugins/coreplugin/imageeffect_redeye.cpp:
+	* branches/extragear/trinity/graphics/digikam/imageplugins/coreplugin/imageeffect_redeye.cpp:
 	  English polish and corections
 
 2007-06-04 07:04  gkulzer
 
-	* branches/extragear/kde3/graphics/digikam/imageplugins/colorfx/imageeffect_colorfx.cpp:
+	* branches/extragear/trinity/graphics/digikam/imageplugins/colorfx/imageeffect_colorfx.cpp:
 	  change negative Velvia to slide film
 
 2007-06-03 21:09  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/release_digikam.rb,
-	  branches/extragear/kde3/graphics/digikam/release_digikam_docs.rb,
-	  branches/extragear/kde3/graphics/digikam/release_digikam_kde3.rb:
+	* branches/extragear/trinity/graphics/digikam/release_digikam.rb,
+	  branches/extragear/trinity/graphics/digikam/release_digikam_docs.rb,
+	  branches/extragear/trinity/graphics/digikam/release_digikam_trinity.rb:
 	  update
 
 2007-06-03 21:08  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/digikam/version.h:
+	* branches/extragear/trinity/graphics/digikam/digikam/version.h:
 	  update
 
 2007-06-03 21:07  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/digikam.lsm: update
+	* branches/extragear/trinity/graphics/digikam/digikam.lsm: update
 
 2007-06-03 21:00  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/NEWS: update
+	* branches/extragear/trinity/graphics/digikam/NEWS: update
 
 2007-06-03 18:17  gkulzer
 
-	* branches/extragear/kde3/graphics/digikam/release_digikam_kde3.rb:
+	* branches/extragear/trinity/graphics/digikam/release_digikam_trinity.rb:
 	  takes new svn location into account
 
 2007-06-03 16:35  cgilles
 
-	* branches/extragear/kde3/graphics/digikam/digikam/digikamui.rc:
+	* branches/extragear/trinity/graphics/digikam/digikam/digikamui.rc:
 	  always increment version if something is changed into .rc file to
 	  prevent broken menu
 
@@ -12596,25 +12596,25 @@ v0.9.2-beta3 - 2007-06-03
 
 2007-06-03 13:46  gkulzer
 
-	* branches/extragear/kde3/graphics/digikam/PACKAGING: no extra
+	* branches/extragear/trinity/graphics/digikam/PACKAGING: no extra
 	  digikamimageplugins anymore
 
 2007-06-03 13:45  gkulzer
 
-	* branches/extragear/kde3/graphics/digikam/digikam/albumfolderview.cpp,
-	  branches/extragear/kde3/graphics/digikam/digikam/digikamui.rc,
-	  branches/extragear/kde3/graphics/digikam/utilities/setup/setupgeneral.cpp:
+	* branches/extragear/trinity/graphics/digikam/digikam/albumfolderview.cpp,
+	  branches/extragear/trinity/graphics/digikam/digikam/digikamui.rc,
+	  branches/extragear/trinity/graphics/digikam/utilities/setup/setupgeneral.cpp:
 	  i18n patch from Frank Siegert
 
 2007-06-02 22:15  mwiesweg
 
-	* branches/extragear/kde3/graphics/digikam/digikam/imagepreviewview.cpp,
-	  branches/extragear/kde3/graphics/digikam/libs/threadimageio/loadingdescription.h,
-	  branches/extragear/kde3/graphics/digikam/libs/threadimageio/loadsavethread.cpp,
-	  branches/extragear/kde3/graphics/digikam/libs/threadimageio/loadsavethread.h,
-	  branches/extragear/kde3/graphics/digikam/libs/threadimageio/previewtask.cpp,
-	  branches/extragear/kde3/graphics/digikam/libs/threadimageio/previewtask.h,
-	  branches/extragear/kde3/graphics/digikam/utilities/lighttable/lighttablepreview.cpp:
+	* branches/extragear/trinity/graphics/digikam/digikam/imagepreviewview.cpp,
+	  branches/extragear/trinity/graphics/digikam/libs/threadimageio/loadingdescription.h,
+	  branches/extragear/trinity/graphics/digikam/libs/threadimageio/loadsavethread.cpp,
+	  branches/extragear/trinity/graphics/digikam/libs/threadimageio/loadsavethread.h,
+	  branches/extragear/trinity/graphics/digikam/libs/threadimageio/previewtask.cpp,
+	  branches/extragear/trinity/graphics/digikam/libs/threadimageio/previewtask.h,
+	  branches/extragear/trinity/graphics/digikam/utilities/lighttable/lighttablepreview.cpp:
 	  Fix rotation in LightTable for high quality image.
 	  Move rotation method to a static method.
 	  Store the fact that an image is exif-rotated in the image object.
@@ -12629,7 +12629,7 @@ v0.9.2-beta3 - 2007-06-03
 
 2007-06-02 15:17  helio
 
-	* branches/extragear/kde3/graphics/digikam,
+	* branches/extragear/trinity/graphics/digikam,
 	  trunk/extragear/graphics/digikam: - Moving keg network app for
 	  branches...
 
diff --git a/acinclude.m4 b/acinclude.m4
index acb13ca0..330ecf5f 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -479,14 +479,14 @@ if test "$1" = "default"; then
     if test "$kde_qtver" = "2"; then
       kde_moduledir='\${libdir}/kde2'
     else
-      kde_moduledir='\${libdir}/kde3'
+      kde_moduledir='\${libdir}/trinity'
     fi
   fi
   if test -z "$kde_styledir"; then
-    kde_styledir='\${libdir}/kde3/plugins/styles'
+    kde_styledir='\${libdir}/trinity/plugins/styles'
   fi
   if test -z "$kde_widgetdir"; then
-    kde_widgetdir='\${libdir}/kde3/plugins/designer'
+    kde_widgetdir='\${libdir}/trinity/plugins/designer'
   fi
   if test -z "$xdg_appsdir"; then
     xdg_appsdir='\${datadir}/applications/kde'
@@ -546,7 +546,7 @@ Please check whether you installed aRts correctly or use
 
 AC_DEFUN([KDE_SET_DEFAULT_BINDIRS],
 [
-    kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
+    kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/trinity/bin /usr/kde/bin /usr/local/kde/bin"
     test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
     if test -n "$KDEDIRS"; then
        kde_save_IFS=$IFS
@@ -580,39 +580,39 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
         fi
         KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs])
 
-        kde32ornewer=1
-        kde33ornewer=1
+        trinity2ornewer=1
+        trinity3ornewer=1
         if test -n "$kde_qtver" && test "$kde_qtver" -lt 3; then
-            kde32ornewer=
-            kde33ornewer=
+            trinity2ornewer=
+            trinity3ornewer=
         else
             if test "$kde_qtver" = "3"; then
               if test "$kde_qtsubver" -le 1; then
-                kde32ornewer=
+                trinity2ornewer=
               fi
               if test "$kde_qtsubver" -le 2; then
-                kde33ornewer=
+                trinity3ornewer=
               fi
               if test "$KDECONFIG" != "compiled"; then
                 if test `$KDECONFIG --version | grep KDE | sed 's/KDE: \(...\).*/\1/'` = 3.2; then
-                  kde33ornewer=
+                  trinity3ornewer=
                 fi
               fi
             fi
         fi
 
-        if test -n "$kde32ornewer"; then
+        if test -n "$trinity2ornewer"; then
             KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
         fi
-        if test -n "$kde33ornewer"; then
+        if test -n "$trinity3ornewer"; then
             KDE_FIND_PATH(makekdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(makekdewidgets)])
             AC_SUBST(MAKEKDEWIDGETS)
         fi
         KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])
 
         if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then
- 	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
+ 	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/trinity/share /opt/kde/share $prefix/share"
             test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
             AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
 	    if test "$KDE_XSL_STYLESHEET" = "NO"; then
@@ -623,7 +623,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
         fi
 
         DCOP_DEPENDENCIES='$(DCOPIDL)'
-        if test -n "$kde32ornewer"; then
+        if test -n "$trinity2ornewer"; then
             KCFG_DEPENDENCIES='$(KCONFIG_COMPILER)'
             DCOP_DEPENDENCIES='$(DCOPIDL) $(DCOPIDLNG)'
             AC_SUBST(KCONFIG_COMPILER)
@@ -1817,7 +1817,7 @@ fi
 
 if test -z "$1"; then
 
-kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
+kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/trinity/include /opt/kde/include $x_includes $qt_includes"
 test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
 kde_incdirs="$ac_kde_includes $kde_incdirs"
 AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
@@ -1829,7 +1829,7 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail.
 So, check this please and use another prefix!])
 fi
 
-kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
+kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/trinity /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/trinity/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
 test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"
 kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
 AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
@@ -1837,7 +1837,7 @@ ac_kde_libraries="$kde_libdir"
 
 kde_widgetdir=NO
 dnl this might be somewhere else
-AC_FIND_FILE("kde3/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir)
+AC_FIND_FILE("trinity/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir)
 
 if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then
 AC_MSG_ERROR([
@@ -1845,14 +1845,14 @@ in the prefix, you've chosen, are no KDE libraries installed. This will fail.
 So, check this please and use another prefix!])
 fi
 
-if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then
+if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/trinity/plugins/designer/kdewidgets.la"; then
 AC_MSG_ERROR([
 I can't find the designer plugins. These are required and should have been installed
 by kdelibs])
 fi
 
 if test -n "$kde_widgetdir"; then
-    kde_widgetdir="$kde_widgetdir/kde3/plugins/designer"
+    kde_widgetdir="$kde_widgetdir/trinity/plugins/designer"
 fi
 
 
diff --git a/digikam/PACKAGING b/digikam/PACKAGING
index 3c69a2c0..c0704c57 100644
--- a/digikam/PACKAGING
+++ b/digikam/PACKAGING
@@ -79,7 +79,7 @@ You'll find the svn revision used in the tarball in the file RELEASE.rev. You ha
 For a X.Y.Z.UVW release
 
   svn copy -r{last-used-rev_number} \
-	https://{svn-user}@svn.kde.org/home/kde/branches/extragear/kde3/graphics/digikam \
+	https://{svn-user}@svn.kde.org/home/kde/branches/extragear/trinity/graphics/digikam \
 	https://{svn-user}@svn.kde.org/home/kde/tags/digikam/digikam_X_Y_Z_UVW
 
 You also can use svn+ssh://{svn-user... instead of password requiring interface https://
diff --git a/digikam/project/PACKAGING b/digikam/project/PACKAGING
index 076a55d9..c4df1c8c 100644
--- a/digikam/project/PACKAGING
+++ b/digikam/project/PACKAGING
@@ -79,7 +79,7 @@ You'll find the svn revision used in the tarball in the file RELEASE.rev. You ha
 For a X.Y.Z.UVW release
 
   svn copy -r{last-used-rev_number} \
-	https://{svn-user}@svn.kde.org/home/kde/branches/extragear/kde3/graphics/digikam \
+	https://{svn-user}@svn.kde.org/home/kde/branches/extragear/trinity/graphics/digikam \
 	https://{svn-user}@svn.kde.org/home/kde/tags/digikam/digikam_X_Y_Z_UVW
 
 You also can use svn+ssh://{svn-user... instead of password requiring interface https://
-- 
cgit v1.2.3

