← Back to branch summary

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

« back to all changes in this revision

Viewing changes to core/utilities/imageeditor/editor/imagewindow.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/utilities/imageeditor/editor/imagewindow.cpp
1124
1124
    // copy the metadata of the original file to the new file
1125
1125
    if (m_savingContext.executedOperation == SavingContextContainer::SavingStateVersion)
1126
1126
    {
1127
 
        foreach (const QString& path, m_savingContext.versionFileOperation.allFilePaths())
 
1127
        foreach(const QString& path, m_savingContext.versionFileOperation.allFilePaths())
1128
1128
        {
1129
1129
            ScanController::instance()->scanFileDirectlyCopyAttributes(path, d->currentImageInfo.id());
1130
1130
        }
1502
1502
 
1503
1503
        cnt = (float)d->imageInfoModel->rowCount();
1504
1504
 
1505
 
        foreach (const ImageInfo& info, d->imageInfoModel->imageInfos())
 
1505
        foreach(const ImageInfo& info, d->imageInfoModel->imageInfos())
1506
1506
        {
1507
1507
            SlidePictureInfo pictInfo;
1508
1508
            pictInfo.comment    = info.comment();
1722
1722
    }
1723
1723
 
1724
1724
    QList<ImageInfo> imageInfos;
1725
 
    foreach (const HistoryImageId& id, originals)
 
1725
    foreach(const HistoryImageId& id, originals)
1726
1726
    {
1727
1727
        KUrl url;
1728
1728
        url.addPath(id.m_filePath);