← Back to branch summary

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

« back to all changes in this revision

Viewing changes to imageplugins/filters/imageplugin_fxfilters.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:
imageplugins/filters/imageplugin_fxfilters.cpp
53
53
{
54
54
public:
55
55
 
56
 
    ImagePlugin_FxFiltersPriv()
 
56
    ImagePlugin_FxFiltersPriv() :
 
57
        filmgrainAction(0),
 
58
        raindropAction(0),
 
59
        distortionfxAction(0),
 
60
        blurfxAction(0),
 
61
        oilpaintAction(0),
 
62
        embossAction(0),
 
63
        charcoalAction(0),
 
64
        colorEffectsAction(0)
57
65
    {
58
 
        filmgrainAction    = 0;
59
 
        raindropAction     = 0;
60
 
        distortionfxAction = 0;
61
 
        blurfxAction       = 0;
62
 
        oilpaintAction     = 0;
63
 
        embossAction       = 0;
64
 
        charcoalAction     = 0;
65
 
        colorEffectsAction = 0;
66
66
    }
67
67
 
68
68
    KAction* filmgrainAction;
76
76
};
77
77
 
78
78
ImagePlugin_FxFilters::ImagePlugin_FxFilters(QObject* parent, const QVariantList&)
79
 
                     : ImagePlugin(parent, "ImagePlugin_FxFilters"),
80
 
                       d(new ImagePlugin_FxFiltersPriv)
 
79
    : ImagePlugin(parent, "ImagePlugin_FxFilters"),
 
80
      d(new ImagePlugin_FxFiltersPriv)
81
81
{
82
82
    d->colorEffectsAction = new KAction(KIcon("colorfx"), i18n("Color Effects..."), this);
83
83
    actionCollection()->addAction("imageplugin_colorfx", d->colorEffectsAction);
117
117
    d->filmgrainAction  = new KAction(KIcon("filmgrain"), i18n("Add Film Grain..."), this);
118
118
    actionCollection()->addAction("imageplugin_filmgrain", d->filmgrainAction);
119
119
    connect(d->filmgrainAction, SIGNAL(triggered(bool)),
120
 
            this, SLOT(slotFilmGrain()));            
 
120
            this, SLOT(slotFilmGrain()));
121
121
 
122
122
    setXMLFile( "digikamimageplugin_fxfilters_ui.rc" );
123
123