← Back to branch summary

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

« back to all changes in this revision

Viewing changes to core/utilities/cameragui/widgets/filtercombo.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/cameragui/widgets/filtercombo.cpp
178
178
        removeItem(0);
179
179
    }
180
180
 
181
 
    foreach (Filter* f, d->filters)
 
181
    foreach(Filter* f, d->filters)
182
182
    {
183
183
        addItem(f->name);
184
184
    }
219
219
{
220
220
    bool match = false;
221
221
 
222
 
    foreach (const QString& wildcard, wildcards)
 
222
    foreach(const QString& wildcard, wildcards)
223
223
    {
224
224
        match = regexp(wildcard).exactMatch(name);
225
225
        //kDebug() << "**" << wildcard << name << match;
238
238
    {
239
239
        QStringList& wc  = d->mimeHash[mime];
240
240
        QStringList list = mime.split(';');
241
 
        foreach (const QString& m, list)
 
241
        foreach(const QString& m, list)
242
242
        {
243
243
            KMimeType::Ptr mime = KMimeType::mimeType(m);
244
 
            foreach (const QString& pattern, mime->patterns())
 
244
            foreach(const QString& pattern, mime->patterns())
245
245
            {
246
246
                wc.append(pattern);
247
247
            }