← Back to branch summary

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

« back to all changes in this revision

Viewing changes to utilities/advancedrename/common/parseable.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/parseable.cpp
57
57
};
58
58
 
59
59
Parseable::Parseable(const QString& name)
60
 
           : QObject(0), d(new ParseablePriv)
 
60
    : QObject(0), d(new ParseablePriv)
61
61
{
62
62
    setObjectName(name);
63
63
}
64
64
 
65
65
Parseable::Parseable(const QString& name, const QPixmap& icon)
66
 
           : QObject(0), d(new ParseablePriv)
 
66
    : QObject(0), d(new ParseablePriv)
67
67
{
68
68
    setObjectName(name);
69
69
    setIcon(icon);
146
146
                token, SLOT(slotTriggered()));
147
147
 
148
148
    }
 
149
 
149
150
    button->setParent(parent);
150
151
 
151
152
    return button;
154
155
QAction* Parseable::registerMenu(QMenu* parent)
155
156
{
156
157
    QAction* action = 0;
157
 
    QList<QAction*> actions;
158
158
 
159
159
    if (d->tokens.count() > 1 && d->useTokenMenu)
160
160
    {
161
161
        QMenu* menu = new QMenu(parent);
 
162
        QList<QAction*> actions;
162
163
 
163
164
        foreach (Token* token, d->tokens)
164
165
        {
191
192
    }
192
193
 
193
194
    Token* token = new Token(id, description);
 
195
 
194
196
    if (!token)
195
197
    {
196
198
        return false;
247
249
    {
248
250
        found = true;
249
251
    }
 
252
 
250
253
    return found;
251
254
}
252
255