← Back to branch summary

~ubuntu-branches/ubuntu/trusty/digikam/trusty

« back to all changes in this revision

Viewing changes to core/libs/dimg/filters/dimgthreadedfilter.h

  • Committer: Package Import Robot
  • Author(s): Rohan Garg
  • Date: 2012-11-26 18:24:20 UTC
  • mfrom: (1.9.1) (3.1.23 experimental)
  • Revision ID: package-import@ubuntu.com-20121126182420-qoy6z0nx4ai0wzcl
Tags: 4:3.0.0~beta3-0ubuntu1
https://launchpad.net/bugs/890059
https://launchpad.net/bugs/1011211
https://launchpad.net/bugs/658047
* New upstream release
  - Add build-deps :  libhupnp-dev, libqtgstreamer-dev, libmagickcore-dev
* Merge from debian, remaining changes:
  - Make sure libqt4-opengl-dev, libgl1-mesa-dev and libglu1-mesa-dev only
    install on i386,amd64 and powerpc
  - Depend on libtiff-dev instead of libtiff4-dev
  - Drop digikam breaks/replaces kipi-plugins-common since we're past the
    LTS release now
  - digikam to recommend mplayerthumbs | ffmpegthumbs. We currently only
    have latter in the archives, even though former is also supposed to
    be part of kdemultimedia. (LP: #890059)
  - kipi-plugins to recommend www-browser rather than konqueror directly
    since 2.8 no direct usage of konqueror is present in the flickr
    plugin anymore (LP: #1011211)
  - Keep kubuntu_mysqld_executable_name.diff
  - Don't install libkipi translations
  - Keep deps on libcv-dev, libcvaux-dev
  - Keep split packaging of libraries
  - Replace icons from KDE 3 time in debian/xpm.d/*.xpm with the new
    versions (LP: #658047)
* Update debian/not-installed

Show diffs side-by-side

added added

removed removed

Lines of Context:
core/libs/dimg/filters/dimgthreadedfilter.h
203
203
    class DefaultFilterAction : public FilterAction
204
204
    {
205
205
    public:
206
 
        DefaultFilterAction(FilterAction::Category category = FilterAction::ReproducibleFilter)
 
206
        explicit DefaultFilterAction(FilterAction::Category category = FilterAction::ReproducibleFilter)
207
207
            : FilterAction(Filter::FilterIdentifier(), Filter::CurrentVersion(), category)
208
208
        {
209
209
            setDisplayableName(Filter::DisplayableName());
210
210
        }
211
211
 
212
 
        DefaultFilterAction(bool isReproducible)
 
212
        explicit DefaultFilterAction(bool isReproducible)
213
213
            : FilterAction(Filter::FilterIdentifier(), Filter::CurrentVersion(),
214
214
                           isReproducible ? FilterAction::ReproducibleFilter : FilterAction::ComplexFilter)
215
215
        {