← Back to branch summary

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

« back to all changes in this revision

Viewing changes to utilities/queuemanager/basetools/color/curvesadjust.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/color/curvesadjust.cpp
46
46
{
47
47
 
48
48
CurvesAdjust::CurvesAdjust(QObject* parent)
49
 
            : BatchTool("CurvesAdjust", ColorTool, parent)
 
49
    : BatchTool("CurvesAdjust", ColorTool, parent)
50
50
{
51
51
    setToolTitle(i18n("Curves Adjust"));
52
52
    setToolDescription(i18n("A tool to perform curves adjustments."));
88
88
 
89
89
void CurvesAdjust::slotResetSettingsToDefault()
90
90
{
91
 
    // We need to call this method there to reset all curves points. 
 
91
    // We need to call this method there to reset all curves points.
92
92
    // Curves values are cleaned with default settings passed after.
93
93
    m_settingsView->resetToDefault();
94
94
    BatchTool::slotResetSettingsToDefault();
139
139
 
140
140
bool CurvesAdjust::toolOperations()
141
141
{
142
 
    if (!loadToDImg()) return false;
 
142
    if (!loadToDImg())
 
143
    {
 
144
        return false;
 
145
    }
143
146
 
144
147
    CurvesContainer prm;
145
148