[Digikam-devel] extragear/graphics/digikam

[Johannes Wienke]

Hi Holger,

unfortunately this commit breaks compiling the albummodeltest. Because
AlbumManager now depends on DigikamApp, we would have to compile the
_whole_ digikam code for the test again. Is there any way to encapsulate
the the functionality of DigikamApp that you are using in AlbumManager
behind an interface that can be replaced with a stub in the tests. This
is really an odd dependency. The database and album management code
should not depend on any gui stuff to my mind and there is already a lot
of these dependencies simply to compile the model tests. Dependency hell...

Anyway, great work with the branch.

Johannes

Am 30.03.2010 20:33 schrieb Holger Foerster:
> SVN commit 1109189 by foerster:
> 
> Merged branch Digikam-DatabaseExt into trunk.
> 
> Happy easter holidays :)
> 
>  M  +25 -5     CMakeLists.txt  
>  M  +1 -0      data/CMakeLists.txt  
>  A             data/database (directory)  
>  AM            data/database/CMakeLists.txt  
>  A             data/database/dbconfig.xml.cmake  
>  A             data/database/mysql-global.conf  
>  A             databaseserver (directory)  
>  AM            databaseserver/CMakeLists.txt  
>  AM            databaseserver/databaseserver.cpp   [License: GPL (v2+)]
>  AM            databaseserver/databaseserver.h   [License: GPL (v2+)]
>  AM            databaseserver/main.cpp   [License: GPL (v2+)]
>  AM            databaseserver/org.kde.digikam.DatabaseServer.xml  
>  AM            databaseserver/pollthread.cpp   [License: GPL (v2+)]
>  AM            databaseserver/pollthread.h   [License: GPL (v2+)]
>  M  +1 -1      digikam/CMakeLists.txt  
>  M  +230 -95   digikam/albummanager.cpp  
>  M  +3 -3      digikam/albummanager.h  
>  M  +179 -7    digikam/albumsettings.cpp  
>  M  +28 -0     digikam/albumsettings.h  
>  AM            digikam/databaseerrorhandler.cpp   [License: GPL (v2+)]
>  AM            digikam/databaseerrorhandler.h   [License: GPL (v2+)]
>  M  +44 -8     digikam/digikamapp.cpp  
>  M  +4 -0      digikam/digikamapp.h  
>  M  +2 -1      digikam/digikamui.rc  
>  M  +17 -17    digikam/main.cpp  
>  M  +2 -0      kioslave/digikamalbums.cpp  
>  M  +2 -1      kioslave/digikamdates.cpp  
>  M  +2 -1      kioslave/digikamsearch.cpp  
>  M  +2 -1      kioslave/digikamtags.cpp  
>  M  +71 -64    libs/database/albumdb.cpp  
>  M  +2 -1      libs/database/albumdb.h  
>  M  +44 -25    libs/database/databaseaccess.cpp  
>  M  +3 -0      libs/database/databaseaccess.h  
>  M  +2 -2      libs/database/databasebackend.cpp  
>  M  +1 -1      libs/database/databasebackend.h  
>  AM            libs/database/databaseconfigelement.cpp   [License: GPL (v2+)]
>  AM            libs/database/databaseconfigelement.h   [License: GPL (v2+)]
>  AM            libs/database/databasecopymanager.cpp   [License: GPL (v2+)]
>  AM            libs/database/databasecopymanager.h   [License: GPL (v2+)]
>  M  +622 -133  libs/database/databasecorebackend.cpp  
>  M  +141 -20   libs/database/databasecorebackend.h  
>  M  +30 -2     libs/database/databasecorebackend_p.h  
>  M  +233 -0    libs/database/databaseparameters.cpp  
>  M  +21 -0     libs/database/databaseparameters.h  
>  AM            libs/database/databaseserverstarter.cpp   [License: GPL (v2+)]
>  AM            libs/database/databaseserverstarter.h   [License: GPL (v2+)]
>  M  +3 -2      libs/database/haar/haariface.cpp  
>  M  +9 -18     libs/database/imagelister.cpp  
>  M  +133 -421  libs/database/schemaupdater.cpp  
>  M  +17 -3     libs/database/schemaupdater.h  
>  AM            libs/database/sqlquery.cpp   [License: GPL (v2+)]
>  AM            libs/database/sqlquery.h   [License: GPL (v2+)]
>  M  +26 -14    libs/database/thumbnaildatabaseaccess.cpp  
>  M  +3 -1      libs/database/thumbnaildatabaseaccess.h  
>  M  +28 -23    libs/database/thumbnaildb.cpp  
>  M  +8 -7      libs/database/thumbnaildb.h  
>  M  +25 -9     libs/database/thumbnailschemaupdater.cpp  
>  M  +62 -62    libs/database/upgradedb_sqlite2tosqlite3.cpp  
>  M  +1 -1      libs/database/upgradedb_sqlite2tosqlite3.h  
>  AM            libs/dialogs/migrationdlg.cpp   [License: GPL (v2+)]
>  AM            libs/dialogs/migrationdlg.h   [License: GPL (v2+)]
>  M  +86 -19    libs/threadimageio/thumbnailcreator.cpp  
>  M  +9 -3      libs/threadimageio/thumbnailloadthread.cpp  
>  M  +4 -1      libs/threadimageio/thumbnailloadthread.h  
>  AM            libs/widgets/common/databasewidget.cpp   [License: GPL (v2+)]
>  AM            libs/widgets/common/databasewidget.h   [License: GPL (v2+)]
>  M  +3 -0      tests/CMakeLists.txt  
>  M  +4 -2      tests/albummodeltest.cpp  
>  AM            utilities/setup/databaseconnectionwidget.h   [License: GPL (v2+)]
>  M  +16 -1     utilities/setup/setup.cpp  
>  M  +1 -0      utilities/setup/setup.h  
>  M  +20 -121   utilities/setup/setupcollections.cpp  
>  M  +0 -4      utilities/setup/setupcollections.h  
>  AM            utilities/setup/setupdatabase.cpp   [License: GPL (v2+)]
>  AM            utilities/setup/setupdatabase.h   [License: GPL (v2+)]
> 
> 
> http://websvn.kde.org/?view=rev&revision=1109189


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 262 bytes
Desc: OpenPGP digital signature
URL: <http://mail.kde.org/pipermail/digikam-devel/attachments/20100330/52901706/attachment.sig>