← Back to branch summary

~ubuntu-branches/ubuntu/trusty/digikam/trusty

« back to all changes in this revision

Viewing changes to utilities/advancedrename/parser/modifiers/trimmedmodifier.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Luka Renko
  • Date: 2010-02-04 07:46:57 UTC
  • mfrom: (3.2.10 sid)
  • Revision ID: james.westby@ubuntu.com-20100204074657-hqzwjn4timlfw265
Tags: 2:1.1.0-1ubuntu1
https://launchpad.net/bugs/501135
https://launchpad.net/bugs/500581
https://launchpad.net/bugs/350280
https://launchpad.net/bugs/510346
* New upstream release:
  - Rename in BQM fails with multi dot names (LP: #501135)
  - Add collection with similar name fails (LP: #500581)
  - Add SMB folder error message (LP: #350280)
  - Zoom indicators indicate wrong magnification (LP: #510346)
* Merge with Debian, remaining changes:
  - Export .pot name and copy to plugins in debian/rules
  - Build-depend on libkipi7-dev, libkexiv2-8-dev and 
    libkdcraw8-dev (KDE 4.3 -> 4.4)
  - Build-depend on libmarble-dev (was disabled temporarily 
    in Debian due to 4.3.4 regression)

Show diffs side-by-side

added added

removed removed

Lines of Context:
utilities/advancedrename/parser/modifiers/trimmedmodifier.cpp
35
35
               : Modifier(i18n("Trimmed"), i18n("Remove leading, trailing and extra whitespace"),
36
36
                          SmallIcon("edit-cut"))
37
37
{
38
 
    addToken("{trim}", description());
 
38
    QString token = "{trim}";
 
39
    addToken(token, description());
39
40
 
40
 
    QRegExp reg("\\{trim\\}");
 
41
    QRegExp reg(escapeToken(token));
41
42
    reg.setMinimal(true);
42
43
    setRegExp(reg);
43
44
}