← Back to branch summary

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

« back to all changes in this revision

Viewing changes to utilities/queuemanager/basetools/metadata/assigntemplate.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/queuemanager/basetools/metadata/assigntemplate.cpp
47
47
{
48
48
 
49
49
AssignTemplate::AssignTemplate(QObject* parent)
50
 
              : BatchTool("AssignTemplate", MetadataTool, parent)
 
50
    : BatchTool("AssignTemplate", MetadataTool, parent)
51
51
{
52
52
    setToolTitle(i18n("Apply Metadata Template"));
53
53
    setToolDescription(i18n("A tool to apply template metadata"));
78
78
    QString title = settings()["TemplateTitle"].toString();
79
79
 
80
80
    Template t;
 
81
 
81
82
    if (title == Template::removeTemplateTitle())
82
83
    {
83
84
        t.setTemplateTitle(Template::removeTemplateTitle());
104
105
 
105
106
bool AssignTemplate::toolOperations()
106
107
{
107
 
    if (!loadToDImg()) return false;
 
108
    if (!loadToDImg())
 
109
    {
 
110
        return false;
 
111
    }
108
112
 
109
113
    QString title = settings()["TemplateTitle"].toString();
110
114