← Back to branch summary

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

« back to all changes in this revision

Viewing changes to utilities/imageeditor/canvas/imageplugin.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/imageeditor/canvas/imageplugin.cpp
44
44
 
45
45
// --------------------------------------------------------
46
46
 
47
 
ImagePlugin::ImagePlugin(QObject *parent, const char* name)
48
 
           : QObject(parent), d(new ImagePluginPriv())
 
47
ImagePlugin::ImagePlugin(QObject* parent, const char* name)
 
48
    : QObject(parent), d(new ImagePluginPriv())
49
49
{
50
50
    setObjectName(name);
51
51
}
91
91
    {
92
92
        return QString("__INVALID__");
93
93
    }
 
94
 
94
95
    return d->actionCategory;
95
96
}
96
97