extragear/graphics/digikam

SVN commit 1198777 by aclemens:

Adapt digiKam coding style guides:
This is a huge patch to finally have a common coding style in the source code.
This patch adds:
- curly brackets to all single line statements
- left pointer / reference operator style (char* bla)
- indent 4 spaces
- convert tab -> spaces

I did not change the libs from 3rdparty and the ones from libs/jpegutils.
Code compiles fine under Linux, there shouldn't be code breakage because we
only reformat the code and add missing brackets. If code is broken now (logic
errors due to missing brackets), it was broken before.

I add this as one single patch so we can easily revert it, if needed.
I think it is really important to have one common style in the code, and that
we don't mix it.

I will also add some comments to the HACKING file later on.

Gilles,
if all compiles fine under Windows and Mac, I'd like to do the same for the
GSoC branch, so that changes from trunk are easier to apply to the branch.

Andi

CCMAIL:[hidden email]

 M  +30 -2     databaseserver/databaseserver.cpp  
 U             databaseserver/databaseserver.h  
 M  +1 -0      databaseserver/pollthread.cpp  
 M  +43 -3     digikam/addtagslineedit.cpp  
 M  +28 -7     digikam/addtagslineedit.h  
 M  +54 -1     digikam/album.cpp  
 M  +4 -1      digikam/album.h  
 M  +66 -0     digikam/albumdragdrop.cpp  
 M  +4 -1      digikam/albumdragdrop.h  
 M  +61 -0     digikam/albumhistory.cpp  
 U             digikam/albumhistory.h  
 M  +13 -0     digikam/albumiconviewfilter.cpp  
 U             digikam/albumiconviewfilter.h  
 M  +126 -0    digikam/albumlister.cpp  
 U             digikam/albumlister.h  
 M  +198 -3    digikam/albummanager.cpp  
 M  +21 -6     digikam/albummanager.h  
 M  +15 -0     digikam/albummodificationhelper.cpp  
 U             digikam/albummodificationhelper.h  
 M  +5 -0      digikam/albumpropsedit.cpp  
 U             digikam/albumselectcombobox.cpp  
 U             digikam/albumselectcombobox.h  
 M  +4 -0      digikam/albumselectdialog.cpp  
 M  +8 -0      digikam/albumselectiontreeview.cpp  
 M  +2 -1      digikam/albumselectiontreeview.h  
 M  +12 -1     digikam/albumselectwidget.cpp  
 U             digikam/albumselectwidget.h  
 M  +20 -1     digikam/albumsettings.cpp  
 U             digikam/albumsettings.h  
 M  +43 -1     digikam/albumthumbnailloader.cpp  
 U             digikam/albumthumbnailloader.h  
 M  +104 -2    digikam/albumtreeview.cpp  
 U             digikam/albumtreeview.h  
 M  +14 -0     digikam/albumwidgetstack.cpp  
 U             digikam/albumwidgetstack.h  
 M  +30 -0     digikam/contextmenuhelper.cpp  
 M  +5 -0      digikam/databaseguierrorhandler.cpp  
 M  +10 -2     digikam/datefolderview.cpp  
 U             digikam/datefolderview.h  
 U             digikam/dbstatdlg.cpp  
 M  +20 -0     digikam/ddragobjects.cpp  
 U             digikam/ddragobjects.h  
 U             digikam/digikam_export.h  
 M  +263 -20   digikam/digikamapp.cpp  
 M  +4 -1      digikam/digikamapp.h  
 M  +1 -0      digikam/digikamimagedelegate.cpp  
 U             digikam/digikamimagedelegate.h  
 M  +23 -0     digikam/digikamimageview.cpp  
 U             digikam/digikamimageview.h  
 U             digikam/digikamimageview_p.cpp  
 U             digikam/digikamimageview_p.h  
 U             digikam/digikammodelcollection.cpp  
 U             digikam/digikammodelcollection.h  
 M  +100 -0    digikam/digikamview.cpp  
 M  +3 -0      digikam/dio.cpp  
 U             digikam/dio.h  
 M  +1 -0      digikam/editablesearchtreeview.cpp  
 M  +50 -0     digikam/icongroupitem.cpp  
 U             digikam/icongroupitem.h  
 M  +16 -1     digikam/iconitem.cpp  
 U             digikam/iconitem.h  
 M  +180 -1    digikam/iconview.cpp  
 U             digikam/iconview.h  
 M  +13 -0     digikam/imageattributeswatch.cpp  
 U             digikam/imageattributeswatch.h  
 M  +53 -1     digikam/imagecategorizedview.cpp  
 M  +8 -2      digikam/imagecategorizedview.h  
 M  +43 -0     digikam/imagecategorydrawer.cpp  
 M  +47 -0     digikam/imagedelegate.cpp  
 M  +76 -0     digikam/imagedragdrop.cpp  
 M  +4 -1      digikam/imagedragdrop.h  
 M  +81 -10    digikam/imagepreviewbar.cpp  
 U             digikam/imagepreviewbar.h  
 M  +44 -1     digikam/imagepreviewview.cpp  
 M  +15 -0     digikam/imageratingoverlay.cpp  
 U             digikam/imageratingoverlay.h  
 M  +2 -0      digikam/imagerotationoverlay.cpp  
 U             digikam/imagerotationoverlay.h  
 M  +8 -0      digikam/imageselectionoverlay.cpp  
 U             digikam/imageselectionoverlay.h  
 M  +10 -0     digikam/imagethumbnailbar.cpp  
 U             digikam/imagethumbnailbar.h  
 M  +6 -0      digikam/imagethumbnaildelegate.cpp  
 U             digikam/imagethumbnaildelegate.h  
 M  +35 -0     digikam/imageviewutilities.cpp  
 U             digikam/imageviewutilities.h  
 M  +60 -0     digikam/kdateedit.cpp  
 U             digikam/kdateedit.h  
 M  +18 -1     digikam/kdatepickerpopup.cpp  
 M  +4 -1      digikam/kdatepickerpopup.h  
 U             digikam/kdatetimeedit.cpp  
 U             digikam/kdatetimeedit.h  
 M  +14 -0     digikam/leftsidebarwidgets.cpp  
 U             digikam/leftsidebarwidgets.h  
 M  +3 -0      digikam/main.cpp  
 M  +9 -0      digikam/mediaplayerview.cpp  
 U             digikam/mediaplayerview.h  
 M  +77 -0     digikam/metadatahub.cpp  
 M  +4 -1      digikam/metadatahub.h  
 M  +38 -1     digikam/metadatamanager.cpp  
 U             digikam/metadatamanager.h  
 M  +19 -6     digikam/metadatamanager_p.h  
 U             digikam/mimefilter.cpp  
 M  +41 -0     digikam/monthwidget.cpp  
 U             digikam/monthwidget.h  
 M  +8 -0      digikam/ratingfilter.cpp  
 U             digikam/ratingpopupmenu.cpp  
 U             digikam/ratingpopupmenu.h  
 M  +107 -2    digikam/scancontroller.cpp  
 U             digikam/scancontroller.h  
 M  +7 -0      digikam/searchmodificationhelper.cpp  
 U             digikam/searchmodificationhelper.h  
 U             digikam/sidebarwidget.cpp  
 U             digikam/sidebarwidget.h  
 M  +7 -0      digikam/syncjob.cpp  
 M  +4 -1      digikam/syncjob.h  
 M  +8 -0      digikam/tagcheckview.cpp  
 U             digikam/tagcheckview.h  
 M  +37 -0     digikam/tagdragdrop.cpp  
 M  +4 -1      digikam/tagdragdrop.h  
 M  +46 -3     digikam/tageditdlg.cpp  
 U             digikam/tageditdlg.h  
 M  +3 -0      digikam/tagfiltersidebarwidget.cpp  
 U             digikam/tagfiltersidebarwidget.h  
 M  +5 -0      digikam/tagfolderview.cpp  
 U             digikam/tagfolderview.h  
 M  +13 -0     digikam/tagmodificationhelper.cpp  
 U             digikam/tagmodificationhelper.h  
 M  +54 -0     digikam/tagspopupmenu.cpp  
 U             digikam/tagspopupmenu.h  
 M  +95 -11    digikam/tooltipfiller.cpp  
 U             digikam/tooltipfiller.h  
 M  +15 -0     digikam/uifilevalidator.cpp  
 M  +27 -0     digikam/welcomepageview.cpp  
 M  +8 -1      imageplugins/color/adjustcurvestool.cpp  
 M  +22 -1     imageplugins/color/adjustlevelstool.cpp  
 M  +5 -0      imageplugins/color/autocorrectiontool.cpp  
 M  +4 -0      imageplugins/color/bcgtool.cpp  
 M  +4 -0      imageplugins/color/bwsepiatool.cpp  
 M  +4 -0      imageplugins/color/cbtool.cpp  
 M  +6 -0      imageplugins/color/channelmixertool.cpp  
 M  +4 -0      imageplugins/color/hsltool.cpp  
 M  +2 -0      imageplugins/color/imageplugin_color.cpp  
 U             imageplugins/color/imageplugin_color.h  
 M  +4 -0      imageplugins/color/profileconversiontool.cpp  
 M  +4 -0      imageplugins/color/whitebalancetool.cpp  
 U             imageplugins/decorate/bordertool.cpp  
 U             imageplugins/decorate/imageplugin_decorate.cpp  
 M  +8 -2      imageplugins/decorate/inserttexttool.cpp  
 M  +25 -0     imageplugins/decorate/inserttextwidget.cpp  
 M  +14 -0     imageplugins/decorate/superimpose/dirselectwidget.cpp  
 U             imageplugins/decorate/superimpose/dirselectwidget.h  
 M  +5 -0      imageplugins/decorate/superimpose/superimpose.cpp  
 M  +4 -1      imageplugins/decorate/superimpose/superimpose.h  
 M  +7 -0      imageplugins/decorate/superimpose/superimposetool.cpp  
 M  +46 -0     imageplugins/decorate/superimpose/superimposewidget.cpp  
 U             imageplugins/decorate/superimpose/superimposewidget.h  
 U             imageplugins/decorate/texturetool.cpp  
 U             imageplugins/enhance/antivignettingtool.cpp  
 U             imageplugins/enhance/blurtool.cpp  
 M  +4 -0      imageplugins/enhance/hotpixels/blackframelistview.cpp  
 U             imageplugins/enhance/hotpixels/blackframelistview.h  
 M  +19 -3     imageplugins/enhance/hotpixels/blackframeparser.cpp  
 M  +4 -1      imageplugins/enhance/hotpixels/blackframeparser.h  
 M  +16 -4     imageplugins/enhance/hotpixels/hotpixel.h  
 M  +51 -9     imageplugins/enhance/hotpixels/hotpixelfixer.cpp  
 M  +3 -0      imageplugins/enhance/hotpixels/hotpixelstool.cpp  
 M  +16 -1     imageplugins/enhance/hotpixels/weights.cpp  
 M  +55 -13    imageplugins/enhance/hotpixels/weights.h  
 U             imageplugins/enhance/imageplugin_enhance.cpp  
 M  +40 -4     imageplugins/enhance/inpaintingtool.cpp  
 M  +4 -1      imageplugins/enhance/inpaintingtool.h  
 U             imageplugins/enhance/lensautofixtool.cpp  
 U             imageplugins/enhance/lensdistortiontool.cpp  
 M  +4 -0      imageplugins/enhance/localcontrasttool.cpp  
 U             imageplugins/enhance/noisereductiontool.cpp  
 M  +4 -0      imageplugins/enhance/redeyetool.cpp  
 M  +19 -0     imageplugins/enhance/restorationtool.cpp  
 M  +16 -4     imageplugins/enhance/sharpentool.cpp  
 U             imageplugins/filters/blurfxtool.cpp  
 U             imageplugins/filters/charcoaltool.cpp  
 M  +34 -1     imageplugins/filters/colorfxtool.cpp  
 U             imageplugins/filters/distortionfxtool.cpp  
 U             imageplugins/filters/embosstool.cpp  
 U             imageplugins/filters/filmgraintool.cpp  
 U             imageplugins/filters/imageplugin_fxfilters.cpp  
 U             imageplugins/filters/oilpainttool.cpp  
 U             imageplugins/filters/raindroptool.cpp  
 M  +20 -0     imageplugins/transform/contentawareresizetool.cpp  
 M  +27 -3     imageplugins/transform/freerotationtool.cpp  
 U             imageplugins/transform/imageplugin_transform.cpp  
 M  +96 -2     imageplugins/transform/imageselectionwidget.cpp  
 U             imageplugins/transform/imageselectionwidget.h  
 M  +8 -1      imageplugins/transform/matrix.cpp  
 U             imageplugins/transform/perspectivetool.cpp  
 M  +45 -0     imageplugins/transform/perspectivewidget.cpp  
 M  +11 -2     imageplugins/transform/ratiocroptool.cpp  
 M  +14 -0     imageplugins/transform/resizetool.cpp  
 U             imageplugins/transform/sheartool.cpp  
 U             imageplugins/transform/triangle.h  
 M  +39 -1     kioslave/digikamalbums.cpp  
 U             kioslave/digikamalbums.h  
 M  +3 -1      kioslave/digikamdates.cpp  
 U             kioslave/digikamdates.h  
 M  +24 -0     kioslave/digikamsearch.cpp  
 M  +3 -1      kioslave/digikamtags.cpp  
 U             kioslave/digikamtags.h  
 M  +429 -0    libs/database/albumdb.cpp  
 U             libs/database/albumdb.h  
 M  +9 -0      libs/database/albumdb_sqlite2.cpp  
 M  +4 -1      libs/database/albumdb_sqlite2.h  
 M  +36 -9     libs/database/albuminfo.h  
 U             libs/database/collectionlocation.cpp  
 M  +16 -4     libs/database/collectionlocation.h  
 M  +222 -1    libs/database/collectionmanager.cpp  
 U             libs/database/collectionmanager.h  
 M  +56 -2     libs/database/collectionscanner.cpp  
 U             libs/database/collectionscanner.h  
 M  +3 -0      libs/database/collectionscannerhints.cpp  
 M  +60 -15    libs/database/collectionscannerhints.h  
 U             libs/database/collectionscannerobserver.h  
 M  +41 -1     libs/database/databaseaccess.cpp  
 U             libs/database/databaseaccess.h  
 M  +8 -0      libs/database/databasebackend.cpp  
 U             libs/database/databasebackend.h  
 M  +21 -7     libs/database/databasebackend_p.h  
 M  +4 -0      libs/database/databasechangesets.cpp  
 M  +6 -2      libs/database/databasechangesets.h  
 M  +34 -2     libs/database/databaseconfigelement.cpp  
 M  +10 -1     libs/database/databasecopymanager.cpp  
 M  +137 -8    libs/database/databasecorebackend.cpp  
 M  +16 -4     libs/database/databasecorebackend.h  
 U             libs/database/databasecorebackend_p.h  
 U             libs/database/databaseerrorhandler.h  
 M  +55 -15    libs/database/databasefields.h  
 M  +78 -0     libs/database/databaseparameters.cpp  
 U             libs/database/databaseparameters.h  
 U             libs/database/databaseservererror.cpp  
 U             libs/database/databaseservererror.h  
 M  +10 -0     libs/database/databaseserverstarter.cpp  
 U             libs/database/databaseserverstarter.h  
 M  +7 -0      libs/database/databasethumbnailinfoprovider.cpp  
 U             libs/database/databasetransaction.cpp  
 U             libs/database/databasetransaction.h  
 M  +17 -0     libs/database/databaseurl.cpp  
 M  +14 -0     libs/database/databasewatch.cpp  
 U             libs/database/databasewatch.h  
 U             libs/database/databasewatchadaptor.h  
 U             libs/database/dbactiontype.cpp  
 U             libs/database/dbactiontype.h  
 M  +4 -0      libs/database/downloadhistory.cpp  
 U             libs/database/downloadhistory.h  
 M  +10 -0     libs/database/haar/haar.cpp  
 M  +21 -6     libs/database/haar/haar.h  
 M  +89 -0     libs/database/haar/haariface.cpp  
 U             libs/database/haar/haariface.h  
 M  +106 -0    libs/database/imagecomments.cpp  
 U             libs/database/imagecomments.h  
 M  +51 -0     libs/database/imagecopyright.cpp  
 M  +47 -12    libs/database/imagecopyright.h  
 M  +8 -0      libs/database/imageextendedproperties.cpp  
 U             libs/database/imageextendedproperties.h  
 M  +138 -0    libs/database/imageinfo.cpp  
 M  +8 -2      libs/database/imageinfo.h  
 M  +36 -0     libs/database/imageinfocache.cpp  
 U             libs/database/imageinfocache.h  
 M  +58 -0     libs/database/imagelister.cpp  
 U             libs/database/imagelister.h  
 M  +1 -0      libs/database/imagelisterreceiver.cpp  
 U             libs/database/imagelisterreceiver.h  
 M  +102 -0    libs/database/imageposition.cpp  
 U             libs/database/imageposition.h  
 M  +162 -1    libs/database/imagequerybuilder.cpp  
 U             libs/database/imagequerybuilder.h  
 M  +84 -0     libs/database/imagescanner.cpp  
 U             libs/database/imagescanner.h  
 M  +15 -2     libs/database/namefilter.cpp  
 M  +162 -0    libs/database/schemaupdater.cpp  
 U             libs/database/schemaupdater.h  
 M  +142 -0    libs/database/searchxml.cpp  
 M  +25 -3     libs/database/searchxml.h  
 U             libs/database/sqlquery.cpp  
 M  +59 -1     libs/database/tagscache.cpp  
 M  +18 -0     libs/database/thumbnaildatabaseaccess.cpp  
 U             libs/database/thumbnaildatabaseaccess.h  
 M  +12 -1     libs/database/thumbnaildb.cpp  
 U             libs/database/thumbnaildb.h  
 M  +17 -0     libs/database/thumbnailschemaupdater.cpp  
 U             libs/database/thumbnailschemaupdater.h  
 M  +21 -0     libs/database/upgradedb_sqlite2tosqlite3.cpp  
 U             libs/database/upgradedb_sqlite2tosqlite3.h  
 M  +1 -0      libs/dialogs/dbusydlg.cpp  
 U             libs/dialogs/dbusydlg.h  
 M  +20 -0     libs/dialogs/deletedialog.cpp  
 U             libs/dialogs/deletedialog.h  
 M  +1 -0      libs/dialogs/dprogressdlg.cpp  
 U             libs/dialogs/filesaveoptionsdlg.cpp  
 M  +4 -0      libs/dialogs/iccprofileinfodlg.cpp  
 U             libs/dialogs/iccprofileinfodlg.h  
 M  +92 -18    libs/dialogs/imagedialog.cpp  
 U             libs/dialogs/imagedialog.h  
 M  +4 -0      libs/dialogs/infodlg.cpp  
 U             libs/dialogs/libsinfodlg.cpp  
 M  +6 -3      libs/dialogs/migrationdlg.cpp  
 M  +3 -0      libs/dialogs/rawcameradlg.cpp  
 M  +92 -0     libs/dimg/dcolor.cpp  
 M  +51 -13    libs/dimg/dcolor.h  
 M  +42 -8     libs/dimg/dcolorblend.h  
 M  +14 -0     libs/dimg/dcolorcomposer.cpp  
 U             libs/dimg/dcolorcomposer.h  
 U             libs/dimg/dcolorpixelaccess.h  
 M  +236 -0    libs/dimg/dimg.cpp  
 U             libs/dimg/dimg.h  
 M  +154 -5    libs/dimg/dimgscale.cpp  
 U             libs/dimg/drawdecoding.h  
 M  +94 -19    libs/dimg/dshareddata.h  
 U             libs/dimg/exposurecontainer.h  
 U             libs/dimg/filters/auto/autoexpofilter.cpp  
 M  +10 -0     libs/dimg/filters/auto/autolevelsfilter.cpp  
 M  +28 -0     libs/dimg/filters/auto/equalizefilter.cpp  
 M  +62 -12    libs/dimg/filters/auto/normalizefilter.cpp  
 M  +74 -0     libs/dimg/filters/auto/stretchfilter.cpp  
 M  +30 -2     libs/dimg/filters/bcg/bcgfilter.cpp  
 U             libs/dimg/filters/bcg/bcgfilter.h  
 U             libs/dimg/filters/bcg/bcgsettings.cpp  
 U             libs/dimg/filters/bw/bwsepiafilter.cpp  
 U             libs/dimg/filters/bw/bwsepiafilter.h  
 M  +35 -4     libs/dimg/filters/bw/bwsepiasettings.cpp  
 M  +23 -4     libs/dimg/filters/bw/infraredfilter.cpp  
 U             libs/dimg/filters/bw/infraredfilter.h  
 M  +8 -0      libs/dimg/filters/bw/mixerfilter.cpp  
 U             libs/dimg/filters/bw/mixerfilter.h  
 M  +23 -0     libs/dimg/filters/bw/mixersettings.cpp  
 M  +6 -0      libs/dimg/filters/bw/tonalityfilter.cpp  
 U             libs/dimg/filters/bw/tonalityfilter.h  
 M  +54 -0     libs/dimg/filters/cb/cbfilter.cpp  
 U             libs/dimg/filters/cb/cbfilter.h  
 U             libs/dimg/filters/cb/cbsettings.cpp  
 M  +3 -0      libs/dimg/filters/curves/curvesbox.cpp  
 U             libs/dimg/filters/curves/curvesbox.h  
 U             libs/dimg/filters/curves/curvesfilter.cpp  
 U             libs/dimg/filters/curves/curvesfilter.h  
 M  +8 -0      libs/dimg/filters/curves/curvessettings.cpp  
 M  +46 -3     libs/dimg/filters/curves/curveswidget.cpp  
 U             libs/dimg/filters/curves/curveswidget.h  
 M  +114 -8    libs/dimg/filters/curves/imagecurves.cpp  
 M  +42 -1     libs/dimg/filters/decorate/borderfilter.cpp  
 U             libs/dimg/filters/decorate/borderfilter.h  
 U             libs/dimg/filters/decorate/bordersettings.cpp  
 M  +15 -1     libs/dimg/filters/decorate/texturefilter.cpp  
 M  +11 -0     libs/dimg/filters/dimgthreadedfilter.cpp  
 M  +8 -2      libs/dimg/filters/dimgthreadedfilter.h  
 M  +38 -6     libs/dimg/filters/fx/blurfilter.cpp  
 M  +4 -0      libs/dimg/filters/fx/blurfilter.h  
 M  +121 -15   libs/dimg/filters/fx/blurfxfilter.cpp  
 M  +32 -5     libs/dimg/filters/fx/blurfxfilter.h  
 M  +20 -0     libs/dimg/filters/fx/charcoalfilter.cpp  
 M  +105 -11   libs/dimg/filters/fx/distortionfxfilter.cpp  
 M  +6 -1      libs/dimg/filters/fx/distortionfxfilter.h  
 M  +7 -0      libs/dimg/filters/fx/embossfilter.cpp  
 M  +18 -0     libs/dimg/filters/fx/filmgrainfilter.cpp  
 U             libs/dimg/filters/fx/filmgrainfilter.h  
 U             libs/dimg/filters/fx/filmgrainsettings.cpp  
 U             libs/dimg/filters/fx/invertfilter.cpp  
 M  +3 -0      libs/dimg/filters/fx/oilpaintfilter.cpp  
 M  +16 -0     libs/dimg/filters/fx/pixelsaliasfilter.cpp  
 U             libs/dimg/filters/fx/pixelsaliasfilter.h  
 M  +51 -0     libs/dimg/filters/fx/raindropfilter.cpp  
 M  +20 -4     libs/dimg/filters/fx/raindropfilter.h  
 M  +12 -0     libs/dimg/filters/greycstoration/greycstorationfilter.cpp  
 U             libs/dimg/filters/greycstoration/greycstorationfilter.h  
 M  +2 -0      libs/dimg/filters/greycstoration/greycstorationsettings.cpp  
 M  +20 -0     libs/dimg/filters/hsl/hslfilter.cpp  
 U             libs/dimg/filters/hsl/hslfilter.h  
 M  +6 -0      libs/dimg/filters/hsl/hslsettings.cpp  
 U             libs/dimg/filters/hsl/hspreviewwidget.cpp  
 U             libs/dimg/filters/hsl/hspreviewwidget.h  
 M  +76 -0     libs/dimg/filters/icc/iccprofile.cpp  
 M  +8 -2      libs/dimg/filters/icc/iccprofile.h  
 U             libs/dimg/filters/icc/iccprofilesettings.cpp  
 U             libs/dimg/filters/icc/iccprofilesettings.h  
 M  +45 -1     libs/dimg/filters/icc/iccsettings.cpp  
 U             libs/dimg/filters/icc/iccsettings.h  
 M  +2 -0      libs/dimg/filters/icc/iccsettingscontainer.cpp  
 U             libs/dimg/filters/icc/iccsettingscontainer.h  
 M  +77 -0     libs/dimg/filters/icc/icctransform.cpp  
 M  +8 -2      libs/dimg/filters/icc/icctransform.h  
 U             libs/dimg/filters/icc/icctransformfilter.cpp  
 M  +93 -19    libs/dimg/filters/lc/localcontrastfilter.cpp  
 M  +8 -0      libs/dimg/filters/lc/localcontrastsettings.cpp  
 M  +25 -0     libs/dimg/filters/lens/antivignettingfilter.cpp  
 U             libs/dimg/filters/lens/antivignettingfilter.h  
 U             libs/dimg/filters/lens/antivignettingsettings.cpp  
 M  +3 -0      libs/dimg/filters/lens/lensdistortionfilter.cpp  
 M  +95 -16    libs/dimg/filters/lens/lensfuncameraselector.cpp  
 M  +32 -1     libs/dimg/filters/lens/lensfunfilter.cpp  
 U             libs/dimg/filters/lens/lensfunfilter.h  
 M  +54 -6     libs/dimg/filters/lens/lensfuniface.cpp  
 M  +25 -5     libs/dimg/filters/lens/lensfunsettings.cpp  
 M  +27 -4     libs/dimg/filters/lens/pixelaccess.cpp  
 M  +1 -0      libs/dimg/filters/lens/testlensfuniface.cpp  
 U             libs/dimg/filters/levels/histogrambox.cpp  
 U             libs/dimg/filters/levels/histogrambox.h  
 M  +24 -1     libs/dimg/filters/levels/histogrampainter.cpp  
 M  +65 -1     libs/dimg/filters/levels/histogramwidget.cpp  
 U             libs/dimg/filters/levels/histogramwidget.h  
 M  +143 -5    libs/dimg/filters/levels/imagehistogram.cpp  
 M  +103 -8    libs/dimg/filters/levels/imagelevels.cpp  
 U             libs/dimg/filters/levels/levelsfilter.cpp  
 U             libs/dimg/filters/levels/levelsfilter.h  
 M  +42 -0     libs/dimg/filters/nr/nrfilter.cpp  
 U             libs/dimg/filters/nr/nrfilter.h  
 M  +7 -0      libs/dimg/filters/nr/nrsettings.cpp  
 M  +2 -0      libs/dimg/filters/sharp/matrix.cpp  
 U             libs/dimg/filters/sharp/matrix.h  
 M  +5 -0      libs/dimg/filters/sharp/refocusfilter.cpp  
 M  +22 -0     libs/dimg/filters/sharp/sharpenfilter.cpp  
 M  +7 -0      libs/dimg/filters/sharp/sharpsettings.cpp  
 U             libs/dimg/filters/sharp/sharpsettings.h  
 M  +19 -0     libs/dimg/filters/sharp/unsharpmaskfilter.cpp  
 U             libs/dimg/filters/sharp/unsharpmaskfilter.h  
 M  +43 -3     libs/dimg/filters/transform/contentawarefilter.cpp  
 U             libs/dimg/filters/transform/contentawarefilter.h  
 M  +17 -0     libs/dimg/filters/transform/freerotationfilter.cpp  
 U             libs/dimg/filters/transform/freerotationfilter.h  
 U             libs/dimg/filters/transform/freerotationsettings.cpp  
 M  +7 -0      libs/dimg/filters/transform/shearfilter.cpp  
 M  +4 -1      libs/dimg/filters/transform/shearfilter.h  
 M  +49 -5     libs/dimg/filters/wb/wbfilter.cpp  
 U             libs/dimg/filters/wb/wbfilter.h  
 M  +11 -0     libs/dimg/filters/wb/wbsettings.cpp  
 M  +12 -0     libs/dimg/loaders/dimgloader.cpp  
 U             libs/dimg/loaders/dimgloader.h  
 M  +6 -2      libs/dimg/loaders/dimgloaderobserver.h  
 U             libs/dimg/loaders/iccjpeg.h  
 M  +94 -0     libs/dimg/loaders/jp2kloader.cpp  
 M  +4 -1      libs/dimg/loaders/jp2kloader.h  
 U             libs/dimg/loaders/jp2ksettings.cpp  
 U             libs/dimg/loaders/jp2ksettings.h  
 M  +108 -12   libs/dimg/loaders/jpegloader.cpp  
 M  +12 -3     libs/dimg/loaders/jpegloader.h  
 U             libs/dimg/loaders/jpegsettings.cpp  
 U             libs/dimg/loaders/jpegsettings.h  
 M  +42 -3     libs/dimg/loaders/pgfloader.cpp  
 M  +4 -1      libs/dimg/loaders/pgfloader.h  
 U             libs/dimg/loaders/pgfsettings.cpp  
 U             libs/dimg/loaders/pgfsettings.h  
 M  +156 -9    libs/dimg/loaders/pngloader.cpp  
 M  +4 -1      libs/dimg/loaders/pngloader.h  
 U             libs/dimg/loaders/pngsettings.cpp  
 U             libs/dimg/loaders/pngsettings.h  
 M  +8 -0      libs/dimg/loaders/ppmloader.cpp  
 M  +12 -3     libs/dimg/loaders/ppmloader.h  
 M  +17 -0     libs/dimg/loaders/qimageloader.cpp  
 M  +8 -2      libs/dimg/loaders/qimageloader.h  
 M  +40 -3     libs/dimg/loaders/rawloader.cpp  
 M  +16 -4     libs/dimg/loaders/rawloader.h  
 M  +45 -0     libs/dimg/loaders/tiffloader.cpp  
 M  +4 -1      libs/dimg/loaders/tiffloader.h  
 U             libs/dimg/loaders/tiffsettings.cpp  
 U             libs/dimg/loaders/tiffsettings.h  
 M  +13 -0     libs/dmetadata/captionvalues.cpp  
 U             libs/dmetadata/captionvalues.h  
 M  +494 -16   libs/dmetadata/dmetadata.cpp  
 M  +4 -1      libs/dmetadata/dmetadata.h  
 M  +45 -0     libs/dmetadata/geodetictools.cpp  
 U             libs/dmetadata/geodetictools.h  
 M  +4 -0      libs/dmetadata/photoinfocontainer.h  
 U             libs/dmetadata/template.cpp  
 M  +4 -1      libs/dmetadata/template.h  
 M  +43 -0     libs/imageproperties/cameraitempropertiestab.cpp  
 M  +2 -0      libs/imageproperties/captionedit.cpp  
 M  +92 -1     libs/imageproperties/imagedescedittab.cpp  
 U             libs/imageproperties/imagedescedittab.h  
 M  +21 -0     libs/imageproperties/imagepropertiescolorstab.cpp  
 U             libs/imageproperties/imagepropertiescolorstab.h  
 M  +3 -0      libs/imageproperties/imagepropertiesgpstab.cpp  
 M  +5 -0      libs/imageproperties/imagepropertiesmetadatatab.cpp  
 U             libs/imageproperties/imagepropertiesmetadatatab.h  
 M  +30 -0     libs/imageproperties/imagepropertiessidebar.cpp  
 U             libs/imageproperties/imagepropertiessidebar.h  
 M  +4 -0      libs/imageproperties/imagepropertiessidebarcamgui.cpp  
 U             libs/imageproperties/imagepropertiessidebarcamgui.h  
 M  +40 -1     libs/imageproperties/imagepropertiessidebardb.cpp  
 U             libs/imageproperties/imagepropertiessidebardb.h  
 M  +4 -0      libs/imageproperties/imagepropertiestab.cpp  
 U             libs/imageproperties/imagepropertiestxtlabel.h  
 M  +136 -0    libs/imageproperties/markerclusterholder.cpp  
 U             libs/imageproperties/markerclusterholder.h  
 U             libs/imageproperties/markerclusterholderplugin/externaldraw.h  
 M  +46 -0     libs/imageproperties/worldmapwidget.cpp  
 U             libs/imageproperties/worldmapwidget.h  
 M  +52 -3     libs/jpegutils/jpegutils.cpp  
 U             libs/jpegutils/jpegutils.h  
 M  +1 -0      libs/jpegutils/jpegwin.cpp  
 U             libs/jpegutils/jpegwin.h  
 M  +82 -0     libs/models/abstractalbummodel.cpp  
 U             libs/models/abstractalbummodel.h  
 M  +20 -0     libs/models/abstractalbummodelpriv.h  
 M  +39 -0     libs/models/albumfiltermodel.cpp  
 U             libs/models/albumfiltermodel.h  
 M  +21 -1     libs/models/albummodel.cpp  
 U             libs/models/albummodel.h  
 M  +4 -0      libs/models/albummodeldragdrophandler.cpp  
 U             libs/models/albummodeldragdrophandler.h  
 M  +24 -0     libs/models/imagealbumfiltermodel.cpp  
 U             libs/models/imagealbumfiltermodel.h  
 M  +52 -0     libs/models/imagealbummodel.cpp  
 M  +4 -1      libs/models/imagealbummodel.h  
 M  +75 -0     libs/models/imagefiltermodel.cpp  
 U             libs/models/imagefiltermodel.h  
 U             libs/models/imagefiltermodelpriv.h  
 M  +12 -3     libs/models/imagefiltermodelthreads.h  
 M  +15 -0     libs/models/imagefiltersettings.cpp  
 M  +4 -1      libs/models/imagefiltersettings.h  
 M  +108 -0    libs/models/imagemodel.cpp  
 M  +4 -1      libs/models/imagemodel.h  
 M  +4 -0      libs/models/imagemodeldragdrophandler.cpp  
 U             libs/models/imagemodeldragdrophandler.h  
 M  +45 -0     libs/models/imagesortsettings.cpp  
 M  +19 -1     libs/models/imagesortsettings.h  
 M  +14 -0     libs/models/imagethumbnailmodel.cpp  
 U             libs/models/imagethumbnailmodel.h  
 M  +4 -1      libs/template/subjectedit.cpp  
 M  +14 -0     libs/template/templatelist.cpp  
 M  +75 -9     libs/template/templatemanager.cpp  
 U             libs/template/templatepanel.cpp  
 M  +12 -0     libs/template/templateselector.cpp  
 U             libs/template/templateviewer.cpp  
 M  +160 -24   libs/themeengine/texture.cpp  
 M  +1 -0      libs/themeengine/theme.cpp  
 M  +219 -0    libs/themeengine/themeengine.cpp  
 M  +35 -0     libs/threadimageio/loadingcache.cpp  
 U             libs/threadimageio/loadingcache.h  
 M  +1 -0      libs/threadimageio/loadingcacheinterface.cpp  
 U             libs/threadimageio/loadingcacheinterface.h  
 M  +33 -0     libs/threadimageio/loadingdescription.cpp  
 M  +3 -1      libs/threadimageio/loadingdescription.h  
 M  +43 -1     libs/threadimageio/loadsavetask.cpp  
 U             libs/threadimageio/loadsavetask.h  
 M  +24 -0     libs/threadimageio/loadsavethread.cpp  
 U             libs/threadimageio/loadsavethread.h  
 M  +103 -0    libs/threadimageio/managedloadsavethread.cpp  
 U             libs/threadimageio/managedloadsavethread.h  
 M  +33 -4     libs/threadimageio/pgfutils.cpp  
 U             libs/threadimageio/pgfutils.h  
 M  +2 -0      libs/threadimageio/previewloadthread.cpp  
 U             libs/threadimageio/previewloadthread.h  
 M  +63 -1     libs/threadimageio/previewtask.cpp  
 U             libs/threadimageio/previewtask.h  
 M  +6 -0      libs/threadimageio/sharedloadsavethread.cpp  
 M  +28 -0     libs/threadimageio/thumbnailbasic.cpp  
 M  +89 -0     libs/threadimageio/thumbnailcreator.cpp  
 U             libs/threadimageio/thumbnailcreator.h  
 M  +4 -1      libs/threadimageio/thumbnailcreator_p.h  
 M  +57 -0     libs/threadimageio/thumbnailloadthread.cpp  
 M  +5 -0      libs/threadimageio/thumbnailsize.h  
 M  +24 -0     libs/threadimageio/thumbnailtask.cpp  
 U             libs/threadimageio/thumbnailtask.h  
 M  +29 -0     libs/threads/dynamicthread.cpp  
 M  +16 -1     libs/threads/threadmanager.cpp  
 M  +19 -0     libs/threads/workerobject.cpp  
 U             libs/threads/workerobject.h  
 U             libs/widgets/common/buttonicondisabler.cpp  
 M  +7 -0      libs/widgets/common/colorgradientwidget.cpp  
 U             libs/widgets/common/colorgradientwidget.h  
 M  +13 -0     libs/widgets/common/comboboxutilities.cpp  
 U             libs/widgets/common/comboboxutilities.h  
 M  +4 -0      libs/widgets/common/databasewidget.cpp  
 U             libs/widgets/common/databasewidget.h  
 M  +152 -2    libs/widgets/common/dcategorizedview.cpp  
 U             libs/widgets/common/dcategorizedview.h  
 M  +7 -0      libs/widgets/common/dcursortracker.cpp  
 U             libs/widgets/common/dcursortracker.h  
 M  +8 -0      libs/widgets/common/dfontselect.cpp  
 M  +5 -0      libs/widgets/common/dgradientslider.cpp  
 M  +10 -0     libs/widgets/common/dhistoryview.cpp  
 U             libs/widgets/common/dhistoryview.h  
 M  +10 -1     libs/widgets/common/ditemdelegate.cpp  
 U             libs/widgets/common/ditemdelegate.h  
 M  +22 -0     libs/widgets/common/ditemtooltip.cpp  
 U             libs/widgets/common/ditemtooltip.h  
 M  +13 -1     libs/widgets/common/dlogoaction.cpp  
 U             libs/widgets/common/dlogoaction.h  
 M  +6 -0      libs/widgets/common/dpopupmenu.cpp  
 M  +11 -0     libs/widgets/common/drubberband.cpp  
 U             libs/widgets/common/drubberband.h  
 M  +32 -4     libs/widgets/common/dzoombar.cpp  
 U             libs/widgets/common/dzoombar.h  
 M  +12 -0     libs/widgets/common/filesaveoptionsbox.cpp  
 U             libs/widgets/common/filesaveoptionsbox.h  
 M  +33 -4     libs/widgets/common/imagedelegateoverlay.cpp  
 U             libs/widgets/common/imagedelegateoverlay.h  
 M  +7 -0      libs/widgets/common/itemviewhoverbutton.cpp  
 U             libs/widgets/common/itemviewhoverbutton.h  
 M  +38 -0     libs/widgets/common/itemviewimagedelegate.cpp  
 U             libs/widgets/common/itemviewimagedelegate.h  
 U             libs/widgets/common/itemviewimagedelegatepriv.h  
 M  +19 -0     libs/widgets/common/itemviewtooltip.cpp  
 U             libs/widgets/common/itemviewtooltip.h  
 M  +208 -19   libs/widgets/common/kcategorizedview.cpp  
 U             libs/widgets/common/kcategorizedview.h  
 M  +8 -1      libs/widgets/common/kcategorizedview_p.h  
 M  +5 -0      libs/widgets/common/knotificationwrapper.cpp  
 U             libs/widgets/common/knotificationwrapper.h  
 M  +7 -0      libs/widgets/common/modelcompletion.cpp  
 U             libs/widgets/common/modelcompletion.h  
 M  +47 -5     libs/widgets/common/paniconwidget.cpp  
 U             libs/widgets/common/paniconwidget.h  
 M  +71 -6     libs/widgets/common/previewwidget.cpp  
 U             libs/widgets/common/previewwidget.h  
 M  +55 -6     libs/widgets/common/ratingwidget.cpp  
 M  +7 -1      libs/widgets/common/rexpanderboxexclusive.cpp  
 U             libs/widgets/common/rexpanderboxexclusive.h  
 M  +9 -0      libs/widgets/common/searchtextbar.cpp  
 U             libs/widgets/common/searchtextbar.h  
 M  +59 -0     libs/widgets/common/sidebar.cpp  
 U             libs/widgets/common/sidebar.h  
 M  +5 -0      libs/widgets/common/splashscreen.cpp  
 M  +5 -0      libs/widgets/common/statesavingobject.cpp  
 U             libs/widgets/common/statesavingobject.h  
 M  +1 -0      libs/widgets/common/statusled.cpp  
 U             libs/widgets/common/statusled.h  
 M  +8 -0      libs/widgets/common/statusnavigatebar.cpp  
 U             libs/widgets/common/statusnavigatebar.h  
 U             libs/widgets/common/statusprogressbar.cpp  
 U             libs/widgets/common/statusprogressbar.h  
 M  +151 -9    libs/widgets/common/thumbbar.cpp  
 U             libs/widgets/common/thumbbar.h  
 M  +35 -6     libs/widgets/common/thumbbardock.cpp  
 U             libs/widgets/common/thumbbardock.h  
 M  +62 -9     libs/widgets/common/thumbbartooltip.cpp  
 U             libs/widgets/common/thumbbartooltip.h  
 M  +26 -0     libs/widgets/common/visibilitycontroller.cpp  
 U             libs/widgets/common/visibilitycontroller.h  
 M  +9 -3      libs/widgets/iccprofiles/cietonguewidget.cpp  
 U             libs/widgets/iccprofiles/cietonguewidget.h  
 U             libs/widgets/iccprofiles/iccpreviewwidget.cpp  
 U             libs/widgets/iccprofiles/iccpreviewwidget.h  
 M  +29 -0     libs/widgets/iccprofiles/iccprofilescombobox.cpp  
 M  +43 -2     libs/widgets/iccprofiles/iccprofilewidget.cpp  
 M  +11 -0     libs/widgets/metadata/exifwidget.cpp  
 M  +11 -0     libs/widgets/metadata/iptcwidget.cpp  
 M  +11 -0     libs/widgets/metadata/makernotewidget.cpp  
 M  +100 -25   libs/widgets/metadata/mdkeylistviewitem.cpp  
 U             libs/widgets/metadata/mdkeylistviewitem.h  
 M  +49 -1     libs/widgets/metadata/metadatalistview.cpp  
 U             libs/widgets/metadata/metadatalistview.h  
 M  +1 -0      libs/widgets/metadata/metadatalistviewitem.cpp  
 U             libs/widgets/metadata/metadatalistviewitem.h  
 M  +12 -0     libs/widgets/metadata/metadatapanel.cpp  
 M  +44 -0     libs/widgets/metadata/metadataselector.cpp  
 M  +25 -0     libs/widgets/metadata/metadatawidget.cpp  
 M  +11 -0     libs/widgets/metadata/xmpwidget.cpp  
 M  +2 -0      showfoto/main.cpp  
 M  +42 -7     showfoto/setup/setup.cpp  
 U             showfoto/setup/setupmetadata.cpp  
 U             showfoto/setup/setupmisc.cpp  
 U             showfoto/setup/setuptooltip.cpp  
 M  +59 -1     showfoto/showfoto.cpp  
 U             tests/advancedrenametest.cpp  
 U             tests/advancedrenametest.h  
 M  +16 -1     tests/albummodeltest.cpp  
 U             tests/albummodeltest.h  
 U             tests/filesaveoptionsboxtest.cpp  
 U             tests/filesaveoptionsboxtest.h  
 M  +83 -18    tests/modeltest/modeltest.cpp  
 U             tests/modeltest/modeltest.h  
 M  +2 -0      tests/pgfscaled.cpp  
 M  +12 -0     tests/qtpgftest.cpp  
 U             tests/searchtextbartest.cpp  
 U             tests/searchtextbartest.h  
 U             tests/statesavingobjecttest.cpp  
 U             tests/statesavingobjecttest.h  
 M  +6 -0      tests/uifilevalidatortest.cpp  
 U             themedesigner/main.cpp  
 M  +14 -0     themedesigner/mainwindow.cpp  
 M  +5 -0      themedesigner/themedicongroupitem.cpp  
 M  +7 -0      themedesigner/themediconitem.cpp  
 U             themedesigner/themediconitem.h  
 M  +12 -0     themedesigner/themediconview.cpp  
 M  +10 -0     utilities/advancedrename/advancedrenamedialog.cpp  
 M  +3 -2      utilities/advancedrename/advancedrenameinput.cpp  
 M  +13 -0     utilities/advancedrename/advancedrenamemanager.cpp  
 U             utilities/advancedrename/advancedrenameprocessdialog.cpp  
 M  +5 -0      utilities/advancedrename/advancedrenamewidget.cpp  
 M  +4 -0      utilities/advancedrename/common/dynamiclayout.cpp  
 M  +8 -1      utilities/advancedrename/common/highlighter.cpp  
 M  +3 -0      utilities/advancedrename/common/modifier.cpp  
 M  +2 -0      utilities/advancedrename/common/option.cpp  
 M  +5 -0      utilities/advancedrename/common/parseable.cpp  
 U             utilities/advancedrename/common/parseabledialog.cpp  
 M  +11 -0     utilities/advancedrename/common/parser.cpp  
 U             utilities/advancedrename/common/parser.h  
 M  +5 -0      utilities/advancedrename/common/parseresults.cpp  
 U             utilities/advancedrename/common/token.cpp  
 M  +12 -3     utilities/advancedrename/common/token.h  
 M  +2 -1      utilities/advancedrename/common/tooltipcreator.cpp  
 U             utilities/advancedrename/common/tooltipcreator.h  
 U             utilities/advancedrename/common/tooltipdialog.cpp  
 U             utilities/advancedrename/parser/defaultrenameparser.cpp  
 M  +1 -0      utilities/advancedrename/parser/importrenameparser.cpp  
 M  +7 -3      utilities/advancedrename/parser/modifiers/casemodifier.cpp  
 M  +5 -0      utilities/advancedrename/parser/modifiers/defaultvaluemodifier.cpp  
 M  +7 -0      utilities/advancedrename/parser/modifiers/rangemodifier.cpp  
 U             utilities/advancedrename/parser/modifiers/rangemodifier.h  
 U             utilities/advancedrename/parser/modifiers/removedoublesmodifier.cpp  
 M  +4 -0      utilities/advancedrename/parser/modifiers/replacemodifier.cpp  
 U             utilities/advancedrename/parser/modifiers/replacemodifier.h  
 U             utilities/advancedrename/parser/modifiers/trimmedmodifier.cpp  
 M  +1 -0      utilities/advancedrename/parser/modifiers/uniquemodifier.cpp  
 U             utilities/advancedrename/parser/modifiers/uniquemodifier.h  
 M  +2 -0      utilities/advancedrename/parser/options/cameranameoption.cpp  
 M  +2 -0      utilities/advancedrename/parser/options/database/databaseoption.cpp  
 U             utilities/advancedrename/parser/options/database/dbheaderlistitem.cpp  
 U             utilities/advancedrename/parser/options/database/dbheaderlistitem.h  
 M  +1 -0      utilities/advancedrename/parser/options/database/dbkeyscollection.cpp  
 M  +19 -0     utilities/advancedrename/parser/options/database/dbkeyselector.cpp  
 M  +24 -5     utilities/advancedrename/parser/options/database/keys/commonkeys.cpp  
 M  +64 -16    utilities/advancedrename/parser/options/database/keys/metadatakeys.cpp  
 M  +52 -13    utilities/advancedrename/parser/options/database/keys/positionkeys.cpp  
 M  +4 -0      utilities/advancedrename/parser/options/dateoption.cpp  
 M  +4 -1      utilities/advancedrename/parser/options/dateoption.h  
 U             utilities/advancedrename/parser/options/directorynameoption.cpp  
 U             utilities/advancedrename/parser/options/filepropertiesoption.cpp  
 M  +6 -0      utilities/advancedrename/parser/options/metadataoption.cpp  
 M  +2 -0      utilities/advancedrename/parser/options/sequencenumberoption.cpp  
 U             utilities/advancedrename/parser/options/sequencenumberoption.h  
 M  +1 -0      utilities/batch/batchalbumssyncmetadata.cpp  
 U             utilities/batch/batchalbumssyncmetadata.h  
 M  +16 -2     utilities/batch/batchsyncmetadata.cpp  
 U             utilities/batch/batchsyncmetadata.h  
 M  +19 -2     utilities/batch/batchthumbsgenerator.cpp  
 U             utilities/batch/batchthumbsgenerator.h  
 M  +18 -1     utilities/batch/fingerprintsgenerator.cpp  
 U             utilities/batch/fingerprintsgenerator.h  
 M  +3 -0      utilities/batch/imageinfoalbumsjob.cpp  
 M  +7 -0      utilities/batch/imageinfojob.cpp  
 U             utilities/batch/imageinfojob.h  
 M  +105 -11   utilities/cameragui/cameracontroller.cpp  
 U             utilities/cameragui/cameracontroller.h  
 M  +18 -2     utilities/cameragui/camerafolderdialog.cpp  
 U             utilities/cameragui/camerafolderdialog.h  
 U             utilities/cameragui/camerafolderitem.cpp  
 U             utilities/cameragui/camerafolderitem.h  
 M  +12 -0     utilities/cameragui/camerafolderview.cpp  
 M  +9 -1      utilities/cameragui/camerahistoryupdater.cpp  
 U             utilities/cameragui/camerahistoryupdater.h  
 M  +23 -1     utilities/cameragui/cameraiconitem.cpp  
 U             utilities/cameragui/cameraiconitem.h  
 M  +74 -4     utilities/cameragui/cameraiconview.cpp  
 U             utilities/cameragui/cameraiconview.h  
 M  +67 -9     utilities/cameragui/cameraiconviewtooltip.cpp  
 U             utilities/cameragui/camerainfodialog.cpp  
 U             utilities/cameragui/camerainfodialog.h  
 M  +18 -0     utilities/cameragui/cameranamehelper.cpp  
 M  +200 -8    utilities/cameragui/cameraui.cpp  
 U             utilities/cameragui/cameraui.h  
 M  +3 -0      utilities/cameragui/capturedlg.cpp  
 U             utilities/cameragui/capturedlg.h  
 U             utilities/cameragui/capturewidget.cpp  
 U             utilities/cameragui/capturewidget.h  
 M  +8 -1      utilities/cameragui/dkcamera.cpp  
 U             utilities/cameragui/dkcamera.h  
 U             utilities/cameragui/downloadsettingscontainer.h  
 M  +7 -1      utilities/cameragui/freespacetooltip.cpp  
 U             utilities/cameragui/freespacetooltip.h  
 M  +18 -3     utilities/cameragui/freespacewidget.cpp  
 M  +145 -0    utilities/cameragui/gpcamera.cpp  
 M  +4 -1      utilities/cameragui/gpcamera.h  
 M  +26 -0     utilities/cameragui/gpconfigdlg.cpp  
 U             utilities/cameragui/gpconfigdlg.h  
 M  +10 -0     utilities/cameragui/renamecustomizer.cpp  
 M  +57 -0     utilities/cameragui/umscamera.cpp  
 M  +12 -3     utilities/cameragui/umscamera.h  
 M  +3 -0      utilities/firstrun/assistantdlg.cpp  
 U             utilities/firstrun/assistantdlgpage.cpp  
 M  +13 -0     utilities/firstrun/collectionpage.cpp  
 U             utilities/firstrun/metadatapage.cpp  
 U             utilities/firstrun/openfilepage.cpp  
 U             utilities/firstrun/previewpage.cpp  
 U             utilities/firstrun/rawpage.cpp  
 U             utilities/firstrun/startscanpage.cpp  
 U             utilities/firstrun/tooltipspage.cpp  
 U             utilities/firstrun/welcomepage.cpp  
 M  +4 -0      utilities/fuzzysearch/findduplicatesalbumitem.cpp  
 M  +41 -0     utilities/fuzzysearch/findduplicatesview.cpp  
 U             utilities/fuzzysearch/findduplicatesview.h  
 M  +21 -0     utilities/fuzzysearch/fuzzysearchview.cpp  
 U             utilities/fuzzysearch/fuzzysearchview.h  
 M  +43 -2     utilities/fuzzysearch/sketchwidget.cpp  
 M  +28 -1     utilities/gpssearch/gpssearchview.cpp  
 U             utilities/gpssearch/gpssearchview.h  
 M  +2 -0      utilities/gpssearch/gpssearchwidget.cpp  
 U             utilities/gpssearch/gpssearchwidget.h  
 M  +127 -2    utilities/imageeditor/canvas/canvas.cpp  
 U             utilities/imageeditor/canvas/canvas.h  
 M  +104 -0    utilities/imageeditor/canvas/colorcorrectiondlg.cpp  
 U             utilities/imageeditor/canvas/colorcorrectiondlg.h  
 M  +63 -0     utilities/imageeditor/canvas/dimginterface.cpp  
 U             utilities/imageeditor/canvas/dimginterface.h  
 M  +81 -0     utilities/imageeditor/canvas/iccmanager.cpp  
 U             utilities/imageeditor/canvas/iccmanager.h  
 M  +1 -0      utilities/imageeditor/canvas/imageplugin.cpp  
 U             utilities/imageeditor/canvas/imageplugin.h  
 M  +11 -0     utilities/imageeditor/canvas/imagepluginloader.cpp  
 U             utilities/imageeditor/canvas/iofilesettingscontainer.h  
 U             utilities/imageeditor/canvas/softproofdialog.cpp  
 U             utilities/imageeditor/canvas/softproofdialog.h  
 M  +4 -0      utilities/imageeditor/canvas/undoaction.cpp  
 U             utilities/imageeditor/canvas/undoaction.h  
 M  +10 -0     utilities/imageeditor/canvas/undocache.cpp  
 U             utilities/imageeditor/canvas/undocache.h  
 M  +19 -0     utilities/imageeditor/canvas/undomanager.cpp  
 M  +49 -2     utilities/imageeditor/editor/editorstackview.cpp  
 M  +24 -0     utilities/imageeditor/editor/editortool.cpp  
 U             utilities/imageeditor/editor/editortool.h  
 M  +51 -7     utilities/imageeditor/editor/editortooliface.cpp  
 M  +17 -1     utilities/imageeditor/editor/editortoolsettings.cpp  
 M  +138 -1    utilities/imageeditor/editor/editorwindow.cpp  
 M  +20 -5     utilities/imageeditor/editor/editorwindow.h  
 M  +2 -0      utilities/imageeditor/editor/editorwindow_p.h  
 M  +18 -0     utilities/imageeditor/editor/imageiface.cpp  
 M  +148 -4    utilities/imageeditor/editor/imagewindow.cpp  
 U             utilities/imageeditor/editor/imagewindow.h  
 M  +3 -0      utilities/imageeditor/printiface/printhelper.cpp  
 U             utilities/imageeditor/printiface/printhelper.h  
 M  +7 -0      utilities/imageeditor/printiface/printoptionspage.cpp  
 U             utilities/imageeditor/printiface/printoptionspage.h  
 M  +11 -2     utilities/imageeditor/rawimport/rawimport.cpp  
 U             utilities/imageeditor/rawimport/rawpostprocessing.cpp  
 M  +9 -1      utilities/imageeditor/rawimport/rawpreview.cpp  
 M  +2 -0      utilities/imageeditor/rawimport/rawsettingsbox.cpp  
 M  +31 -2     utilities/imageeditor/widgets/imageguidewidget.cpp  
 U             utilities/imageeditor/widgets/imageguidewidget.h  
 M  +36 -1     utilities/imageeditor/widgets/imageregionwidget.cpp  
 U             utilities/imageeditor/widgets/imageregionwidget.h  
 M  +48 -7     utilities/imageeditor/widgets/previewlist.cpp  
 M  +7 -1      utilities/imageeditor/widgets/previewtoolbar.cpp  
 U             utilities/imageeditor/widgets/previewtoolbar.h  
 M  +17 -0     utilities/kipiiface/kipiimagecollection.cpp  
 U             utilities/kipiiface/kipiimagecollection.h  
 U             utilities/kipiiface/kipiimagecollectionselector.cpp  
 U             utilities/kipiiface/kipiimagecollectionselector.h  
 M  +11 -0     utilities/kipiiface/kipiimageinfo.cpp  
 M  +15 -0     utilities/kipiiface/kipiinterface.cpp  
 U             utilities/kipiiface/kipiinterface.h  
 M  +3 -0      utilities/kipiiface/kipiuploadwidget.cpp  
 U             utilities/kipiiface/kipiuploadwidget.h  
 M  +56 -8     utilities/lighttable/lighttablebar.cpp  
 M  +64 -7     utilities/lighttable/lighttablepreview.cpp  
 U             utilities/lighttable/lighttablepreview.h  
 M  +2 -0      utilities/lighttable/lighttableview.cpp  
 U             utilities/lighttable/lighttableview.h  
 M  +101 -7    utilities/lighttable/lighttablewindow.cpp  
 U             utilities/lighttable/lighttablewindow.h  
 U             utilities/lighttable/lighttablewindow_p.h  
 M  +150 -2    utilities/nepomuk/digikamnepomukservice.cpp  
 U             utilities/nepomuk/digikamnepomukservice.h  
 M  +16 -2     utilities/queuemanager/actionthread.cpp  
 M  +89 -9     utilities/queuemanager/assignedlist.cpp  
 M  +4 -1      utilities/queuemanager/basetools/color/autocorrection.cpp  
 M  +4 -1      utilities/queuemanager/basetools/color/bcgcorrection.cpp  
 M  +4 -1      utilities/queuemanager/basetools/color/bwconvert.cpp  
 U             utilities/queuemanager/basetools/color/bwconvert.h  
 M  +4 -1      utilities/queuemanager/basetools/color/channelmixer.cpp  
 U             utilities/queuemanager/basetools/color/channelmixer.h  
 M  +4 -1      utilities/queuemanager/basetools/color/colorbalance.cpp  
 M  +4 -1      utilities/queuemanager/basetools/color/convert16to8.cpp  
 M  +4 -1      utilities/queuemanager/basetools/color/convert16to8.h  
 M  +4 -1      utilities/queuemanager/basetools/color/convert8to16.cpp  
 M  +4 -1      utilities/queuemanager/basetools/color/convert8to16.h  
 M  +4 -1      utilities/queuemanager/basetools/color/curvesadjust.cpp  
 U             utilities/queuemanager/basetools/color/curvesadjust.h  
 M  +4 -1      utilities/queuemanager/basetools/color/hslcorrection.cpp  
 M  +4 -1      utilities/queuemanager/basetools/color/iccconvert.cpp  
 M  +4 -1      utilities/queuemanager/basetools/color/invert.cpp  
 M  +4 -1      utilities/queuemanager/basetools/color/invert.h  
 M  +4 -1      utilities/queuemanager/basetools/color/whitebalance.cpp  
 M  +4 -1      utilities/queuemanager/basetools/convert/convert2jp2.cpp  
 M  +4 -1      utilities/queuemanager/basetools/convert/convert2jpeg.cpp  
 M  +4 -1      utilities/queuemanager/basetools/convert/convert2pgf.cpp  
 M  +4 -1      utilities/queuemanager/basetools/convert/convert2png.cpp  
 M  +4 -1      utilities/queuemanager/basetools/convert/convert2tiff.cpp  
 M  +4 -1      utilities/queuemanager/basetools/decorate/border.cpp  
 M  +30 -5     utilities/queuemanager/basetools/decorate/watermark.cpp  
 M  +4 -1      utilities/queuemanager/basetools/enhance/antivignetting.cpp  
 M  +2 -0      utilities/queuemanager/basetools/enhance/blur.cpp  
 M  +4 -0      utilities/queuemanager/basetools/enhance/lensautofix.cpp  
 M  +4 -1      utilities/queuemanager/basetools/enhance/localcontrast.cpp  
 M  +4 -1      utilities/queuemanager/basetools/enhance/noisereduction.cpp  
 M  +11 -2     utilities/queuemanager/basetools/enhance/restoration.cpp  
 M  +6 -0      utilities/queuemanager/basetools/enhance/sharpen.cpp  
 M  +2 -0      utilities/queuemanager/basetools/filters/filmgrain.cpp  
 M  +5 -1      utilities/queuemanager/basetools/metadata/assigntemplate.cpp  
 M  +16 -4     utilities/queuemanager/basetools/metadata/removemetadata.cpp  
 M  +4 -1      utilities/queuemanager/basetools/transform/flip.cpp  
 M  +10 -1     utilities/queuemanager/basetools/transform/resize.cpp  
 M  +12 -2     utilities/queuemanager/basetools/transform/rotate.cpp  
 U             utilities/queuemanager/basetools/transform/rotate.h  
 M  +10 -2     utilities/queuemanager/batchtool.cpp  
 M  +3 -0      utilities/queuemanager/batchtool.h  
 M  +6 -0      utilities/queuemanager/batchtoolsmanager.cpp  
 U             utilities/queuemanager/iteminfoset.h  
 M  +91 -3     utilities/queuemanager/queuelist.cpp  
 M  +60 -5     utilities/queuemanager/queuemgrwindow.cpp  
 M  +72 -8     utilities/queuemanager/queuepool.cpp  
 U             utilities/queuemanager/queuepool.h  
 M  +2 -0      utilities/queuemanager/queuesettingsview.cpp  
 M  +12 -2     utilities/queuemanager/queuetooltip.cpp  
 M  +15 -2     utilities/queuemanager/toolsettingsview.cpp  
 M  +35 -1     utilities/queuemanager/toolslistview.cpp  
 M  +9 -1      utilities/queuemanager/toolsview.cpp  
 M  +24 -0     utilities/searchwindow/choicesearchutilities.cpp  
 M  +7 -0      utilities/searchwindow/choicesearchutilities.h  
 M  +44 -0     utilities/searchwindow/ratingsearchutilities.cpp  
 U             utilities/searchwindow/ratingsearchutilities.h  
 M  +17 -1     utilities/searchwindow/searchfieldgroup.cpp  
 U             utilities/searchwindow/searchfieldgroup.h  
 M  +216 -19   utilities/searchwindow/searchfields.cpp  
 U             utilities/searchwindow/searchfields.h  
 U             utilities/searchwindow/searchfolderview.cpp  
 U             utilities/searchwindow/searchfolderview.h  
 M  +53 -0     utilities/searchwindow/searchgroup.cpp  
 U             utilities/searchwindow/searchgroup.h  
 M  +34 -0     utilities/searchwindow/searchtabheader.cpp  
 U             utilities/searchwindow/searchtabheader.h  
 M  +85 -0     utilities/searchwindow/searchutilities.cpp  
 U             utilities/searchwindow/searchutilities.h  
 M  +27 -0     utilities/searchwindow/searchview.cpp  
 U             utilities/searchwindow/searchview.h  
 M  +1 -0      utilities/searchwindow/searchwindow.cpp  
 M  +59 -6     utilities/setup/cameralist.cpp  
 U             utilities/setup/cameralist.h  
 M  +31 -2     utilities/setup/cameraselection.cpp  
 M  +1 -0      utilities/setup/cameratype.cpp  
 U             utilities/setup/cameratype.h  
 M  +101 -16   utilities/setup/setup.cpp  
 M  +18 -2     utilities/setup/setupalbumview.cpp  
 M  +28 -3     utilities/setup/setupcamera.cpp  
 U             utilities/setup/setupcamera.h  
 M  +27 -5     utilities/setup/setupcategory.cpp  
 U             utilities/setup/setupcollections.cpp  
 M  +139 -16   utilities/setup/setupcollectionview.cpp  
 M  +3 -1      utilities/setup/setupcollectionview.h  
 M  +11 -2     utilities/setup/setupdatabase.cpp  
 U             utilities/setup/setupdcraw.cpp  
 U             utilities/setup/setupeditor.cpp  
 M  +61 -0     utilities/setup/setupicc.cpp  
 U             utilities/setup/setupiofiles.cpp  
 U             utilities/setup/setuplighttable.cpp  
 M  +18 -2     utilities/setup/setupmetadata.cpp  
 M  +5 -0      utilities/setup/setupmime.cpp  
 U             utilities/setup/setupmisc.cpp  
 M  +3 -0      utilities/setup/setupplugins.cpp  
 M  +2 -0      utilities/setup/setupslideshow.cpp  
 M  +12 -2     utilities/setup/setuptemplate.cpp  
 M  +9 -2      utilities/setup/setuptooltip.cpp  
 M  +50 -0     utilities/slideshow/slideshow.cpp  
 U             utilities/slideshow/slideshow.h  
 U             utilities/slideshow/slideshowsettings.h  
 M  +15 -0     utilities/slideshow/toolbar.cpp  
 M  +233 -9    utilities/timeline/timelinewidget.cpp  
 U             utilities/timeline/timelinewidget.h  


http://websvn.kde.org/?view=rev&revision=1198777
_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

[Gilles Caulier-4]

andi,
i cannot test this week end. i out of home without computer ( i use my
n900 to write this mail).
i go back at home monday, and 1.6.0 will be packaged monday morning by
nicolas...
gilles
_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

Ok, I will revert the patch then.
It can be applied later on.

Andi Clemens
-----------------
www.digikam.org

On Friday 19 November 2010 22:04:22 Gilles Caulier wrote:

> andi,
> i cannot test this week end. i out of home without computer ( i use my
> n900 to write this mail).
> i go back at home monday, and 1.6.0 will be packaged monday morning by
> nicolas...
> gilles
> _______________________________________________
> Digikam-devel mailing list
> [hidden email]
> https://mail.kde.org/mailman/listinfo/digikam-devel

_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

[Marcel Wiesweg]

> Gilles,
> if all compiles fine under Windows and Mac,
> I'd like to do the same for the
> GSoC branch, so that changes from trunk are easier to apply to the branch.

Does that mean the changes are automatic, so we can skip merging this patch
and do it again in the branch? (hopeful not to have to manually fix too many
conflicts ;-) )
_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

Yes, it is automatic, so we can simply run it on the branch.
We could also wait until we apply the patch, after GSoC has been merged with
trunk.

I use astyle for formatting, I will add it to the HACKING file.

astyle: http://astyle.sourceforge.net/

Andi Clemens
-----------------
www.digikam.org

On Saturday 20 November 2010 14:16:46 Marcel Wiesweg wrote:

> > Gilles,
> > if all compiles fine under Windows and Mac,
> > I'd like to do the same for the
> > GSoC branch, so that changes from trunk are easier to apply to the
> > branch.
>
> Does that mean the changes are automatic, so we can skip merging this patch
> and do it again in the branch? (hopeful not to have to manually fix too
> many conflicts ;-) )
> _______________________________________________
> Digikam-devel mailing list
> [hidden email]
> https://mail.kde.org/mailman/listinfo/digikam-devel

_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

[Marcel Wiesweg]

> Yes, it is automatic, so we can simply run it on the branch.
> We could also wait until we apply the patch, after GSoC has been merged
> with trunk.
>
> I use astyle for formatting, I will add it to the HACKING file.

Then I would ask Gilles to omit the big patch from merging, I have quite
extensive local changes in branch.
No problem to run it on the branch later, to make further merging the easier.

Marcel
_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

[Gilles Caulier-4]

can you merge trunk to  branch yourself just after 1.6.0 planed monday morning ?
gilles

2010/11/20, Marcel Wiesweg <[hidden email]>:

>
>> Yes, it is automatic, so we can simply run it on the branch.
>> We could also wait until we apply the patch, after GSoC has been merged
>> with trunk.
>>
>> I use astyle for formatting, I will add it to the HACKING file.
>
> Then I would ask Gilles to omit the big patch from merging, I have quite
> extensive local changes in branch.
> No problem to run it on the branch later, to make further merging the
> easier.
>
> Marcel
> _______________________________________________
> Digikam-devel mailing list
> [hidden email]
> https://mail.kde.org/mailman/listinfo/digikam-devel
>

_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel