← Back to branch summary

~ubuntu-branches/ubuntu/saucy/digikam/saucy

« back to all changes in this revision

Viewing changes to utilities/advancedrename/common/modifier.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Scott Kitterman
  • Date: 2010-12-21 23:19:11 UTC
  • mfrom: (1.2.33 upstream) (3.1.7 experimental)
  • Revision ID: james.westby@ubuntu.com-20101221231911-z9jip7s5aht1jqn9
Tags: 2:1.7.0-1ubuntu1
* Merge from Debian Experimental. Remaining Ubuntu changes:
  - Export .pot name and copy to plugins in debian/rules
  - Version build-depends on kipi-plugins-dev to ensure build is against the
    same version on all archs
* Drop debian/patches/kubuntu_01_linker.diff, incoporated upstream
* Remove patches directory and unused patches

Show diffs side-by-side

added added

removed removed

Lines of Context:
utilities/advancedrename/common/modifier.cpp
37
37
};
38
38
 
39
39
Modifier::Modifier(const QString& name, const QString& description)
40
 
        : Parseable(name), d(new ModifierPriv)
 
40
    : Parseable(name), d(new ModifierPriv)
41
41
{
42
42
    setDescription(description);
43
43
}
44
44
 
45
45
Modifier::Modifier(const QString& name, const QString& description, const QPixmap& icon)
46
 
        : Parseable(name, icon), d(new ModifierPriv)
 
46
    : Parseable(name, icon), d(new ModifierPriv)
47
47
{
48
48
    setDescription(description);
49
49
}
63
63
    }
64
64
 
65
65
    const QRegExp& reg         = regExp();
 
66
 
66
67
    const QString& parseString = settings.parseString;
67
68
 
68
69
    int pos = 0;
 
70
 
69
71
    pos = reg.indexIn(parseString, pos);
 
72
 
70
73
    if (pos > -1)
71
74
    {
72
75
        QString result = parseOperation(settings);