← Back to branch summary

~ubuntu-branches/ubuntu/vivid/digikam/vivid

« back to all changes in this revision

Viewing changes to core/libs/database/imagecopyright.cpp

  • Committer: Package Import Robot
  • Author(s): Philip Muškovac
  • Date: 2012-02-14 19:29:29 UTC
  • mfrom: (1.2.38) (3.1.16 experimental)
  • Revision ID: package-import@ubuntu.com-20120214192929-cx2zia3b2nt67lvz
Tags: 4:2.5.0-1ubuntu1
* Merge from debian unstable, remaining changes:
  - keep seperate binary packages:
    + libkface1, libkface-data, libkface-dev
    + libkgeomap1, libkgeomap-data, libkgeomap-dev
    + libvkontakte1, libkvkontakte-dev
    + libmediawiki1, libmediawiki-dev
  - keep patches:
    + kubuntu_mysqld_executable_name.diff
  - don't fail on missing files in dh_install
  - install oxygen icons for kipi-plugins
  - build-depend on mysql 5.5 instead of 5.1
  - update install files
* digikam breaks/replaces kipi-plugins-common << 4:2.5.0~
* digikam-doc breaks/replaces digikam-data << 4:2.5.0~
* digikam-data breaks/replaces kipi-plugins << 4:2.5.0~
* kipi-plugins-common breaks/replaces kipi-plugins << 4:2.5.0~

Show diffs side-by-side

added added

removed removed

Lines of Context:
core/libs/database/imagecopyright.cpp
111
111
    }
112
112
 
113
113
    QList<CopyrightInfo> infos = access.db()->getImageCopyright(source.m_id, QString());
114
 
    foreach (const CopyrightInfo& info, infos)
 
114
    foreach(const CopyrightInfo& info, infos)
115
115
    {
116
116
        access.db()->setImageCopyrightProperty(m_id, info.property, info.value,
117
117
                                               info.extraValue, AlbumDB::PropertyNoConstraint);
352
352
{
353
353
    if (m_cache)
354
354
    {
355
 
        foreach (const CopyrightInfo& info, m_cache->infos)
 
355
        foreach(const CopyrightInfo& info, m_cache->infos)
356
356
        {
357
357
            if (info.property == property)
358
358
            {
378
378
    if (m_cache)
379
379
    {
380
380
        QList<CopyrightInfo> infos;
381
 
        foreach (const CopyrightInfo& info, m_cache->infos)
 
381
        foreach(const CopyrightInfo& info, m_cache->infos)
382
382
        {
383
383
            if (info.property == property)
384
384
            {
422
422
{
423
423
    KExiv2Iface::KExiv2::AltLangMap map;
424
424
    QList<CopyrightInfo> infos = copyrightInfos(property);
425
 
    foreach (const CopyrightInfo& info, infos)
 
425
    foreach(const CopyrightInfo& info, infos)
426
426
    {
427
427
        map[info.extraValue] = info.value;
428
428
    }