← Back to branch summary

~ubuntu-branches/ubuntu/natty/digikam/natty

« back to all changes in this revision

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

  • Committer: Bazaar Package Importer
  • Author(s): Luka Renko
  • Date: 2009-11-12 18:02:13 UTC
  • mfrom: (1.2.24 upstream) (3.2.7 sid)
  • Revision ID: james.westby@ubuntu.com-20091112180213-8p63z8taug49ji3t
Tags: 2:1.0.0~beta6-1ubuntu1
* Merge with Debian, remaining changes:
  - Export .pot name and copy to plugins in debian/rules
  - Remove liblqr-1-0-dev from build-deps, not in main

Show diffs side-by-side

added added

removed removed

Lines of Context:
utilities/advancedrename/common/parseobject.cpp
66
66
           : QObject(0), d(new ParseObjectPriv)
67
67
{
68
68
    setObjectName(name);
69
 
    d->icon = icon;
 
69
    setIcon(icon);
70
70
}
71
71
 
72
72
ParseObject::~ParseObject()
76
76
        delete token;
77
77
    }
78
78
    d->tokens.clear();
 
79
 
 
80
    delete d;
 
81
}
 
82
 
 
83
void ParseObject::setIcon(const QIcon& icon)
 
84
{
 
85
    d->icon = icon;
 
86
}
 
87
 
 
88
QIcon ParseObject::icon() const
 
89
{
 
90
    return d->icon;
79
91
}
80
92
 
81
93
void ParseObject::setDescription(const QString& desc)