← Back to branch summary

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

« back to all changes in this revision

Viewing changes to utilities/queuemanager/basetools/color/convert16to8.h

  • 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/color/convert16to8.h
40
40
    Convert16to8(QObject* parent=0);
41
41
    ~Convert16to8();
42
42
 
43
 
    BatchToolSettings defaultSettings(){ return BatchToolSettings(); };
 
43
    BatchToolSettings defaultSettings()
 
44
    {
 
45
        return BatchToolSettings();
 
46
    };
44
47
 
45
48
private:
46
49
 
48
51
 
49
52
private Q_SLOTS:
50
53
 
51
 
    void slotAssignSettings2Widget(){};
52
 
    void slotSettingsChanged(){};
 
54
    void slotAssignSettings2Widget() {};
 
55
    void slotSettingsChanged() {};
53
56
};
54
57
 
55
58
}  // namespace Digikam