[Digikam-devel] Fwd: extragear/graphics/digikam/libs/database

[Gilles Caulier]

2009/7/1 Andi Clemens <andi.clemens at gmx.net>:
> Hi Marcel,
>
> this commit broke the displaying of images in the iconview.
> Nothing is displayed, slave is broken.
> I double checked with git bisect, even restarted, it is definitely this
> commit.

kioslave are re-installed (:=)) ?

>
> Andi
>
>
>
> ---------- Message transféré ----------
> From: Marcel Wiesweg <marcel.wiesweg at gmx.de>
> To: kde-commits at kde.org
> Date: Wed, 01 Jul 2009 11:12:54 +0000
> Subject: extragear/graphics/digikam/libs/database
> SVN commit 989986 by mwiesweg:
>
> Reset collections as soon as parameters have changed
>
>  M  +14 -12    collectionmanager.cpp
>  M  +1 -0      collectionmanager.h
>  M  +1 -0      databaseaccess.cpp
>
>
> --- trunk/extragear/graphics/digikam/libs/database/collectionmanager.cpp #989985:989986
> @@ -596,22 +596,24 @@
>     delete d;
>  }
>
> -void CollectionManager::refresh()
> +void CollectionManager::clear()
>  {
> +    DatabaseAccess access;
> +
> +    // clear list
> +    foreach (AlbumRootLocation *location, d->locations)
>     {
> -        DatabaseAccess access;
> -
> -        // clear list
> -        foreach (AlbumRootLocation *location, d->locations)
> -        {
> -            CollectionLocation::Status oldStatus = location->status();
> -            location->setStatus(CollectionLocation::LocationDeleted);
> -            emit locationStatusChanged(*location, oldStatus);
> -            delete location;
> -        }
> -        d->locations.clear();
> +        CollectionLocation::Status oldStatus = location->status();
> +        location->setStatus(CollectionLocation::LocationDeleted);
> +        emit locationStatusChanged(*location, oldStatus);
> +        delete location;
>     }
> +    d->locations.clear();
> +}
>
> +void CollectionManager::refresh()
> +{
> +    clear();
>     updateLocations();
>  }
>
> --- trunk/extragear/graphics/digikam/libs/database/collectionmanager.h #989985:989986
> @@ -57,6 +57,7 @@
>     /**
>      * Clears all locations and re-reads the lists of collection locations
>      */
> +    void clear();
>     void refresh();
>
>     /** CollectionLocation objects returned are simple data containers.
> --- trunk/extragear/graphics/digikam/libs/database/databaseaccess.cpp #989985:989986
> @@ -202,6 +202,7 @@
>     delete d->infoCache;
>     d->infoCache = new ImageInfoCache();
>     d->databaseWatch->setDatabaseIdentifier(QString());
> +    CollectionManager::instance()->clear();
>  }
>
>  bool DatabaseAccess::checkReadyForUse(InitializationObserver *observer)
>
> _______________________________________________
> Digikam-devel mailing list
> Digikam-devel at kde.org
> https://mail.kde.org/mailman/listinfo/digikam-devel
>
>