← Back to branch summary

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

« back to all changes in this revision

Viewing changes to extra/kipi-plugins/photolayoutseditor/borders/BorderDrawersLoader.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:
extra/kipi-plugins/photolayoutseditor/borders/BorderDrawersLoader.cpp
71
71
{
72
72
    factory->setParent(instance());
73
73
    QStringList names = factory->drawersNames().split(';', QString::SkipEmptyParts);
74
 
    foreach (QString name, names)
 
74
    foreach(QString name, names)
75
75
        instance()->d->factories.insert(name, factory);
76
76
}
77
77
 
236
236
                    }
237
237
                    property = variantManager->addProperty(metaProperty.type(), propertyName);
238
238
                    variantManager->setValue(property, metaProperty.read(drawer));
239
 
                    foreach (QtProperty * p, property->subProperties())
 
239
                    foreach(QtProperty* p, property->subProperties())
240
240
                        p->setEnabled(false);
241
241
                }
242
242
        }