liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into gtk3

Browse Source
This commit is contained in:
heckflosse
2016-10-28 17:59:47 +02:00
parent 5244c44420 3a346d919d
commit b16ef8d1f5
259 changed files with 5061 additions and 3654 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
rtgui/curveeditorgroup.cc
View File

@@ -26,8 +26,8 @@
#include "multilangmgr.h"
#include "rtimage.h"
CurveEditorGroup::CurveEditorGroup (Glib::ustring& curveDir, Glib::ustring groupLabel) : curveDir(curveDir), curve_reset(NULL),
displayedCurve(0), flatSubGroup(0), diagonalSubGroup(0), cl(NULL), numberOfPackedCurve(0)
CurveEditorGroup::CurveEditorGroup (Glib::ustring& curveDir, Glib::ustring groupLabel) : curveDir(curveDir), curve_reset(nullptr),
displayedCurve(nullptr), flatSubGroup(nullptr), diagonalSubGroup(nullptr), cl(nullptr), numberOfPackedCurve(0)
{
// We set the label to the one provided as parameter, even if it's an empty string
@@ -101,11 +101,11 @@ CurveEditor* CurveEditorGroup::addCurve(CurveType cType, Glib::ustring curveLabe
}
default:
return (static_cast<CurveEditor*>(NULL));
return (static_cast<CurveEditor*>(nullptr));
break;
}
return NULL; // to avoid complains from Gcc
return nullptr; // to avoid complains from Gcc
}
/*
@@ -131,15 +131,8 @@ void CurveEditorGroup::newLine()
int j = numberOfPackedCurve;
/*
bool hasRelatedWidget = false;
for (int i = (int)(curveEditors.size())-1; i >= j; i--) {
if (curveEditors[i]->relatedWidget != NULL)
hasRelatedWidget = true;
}
*/
for (int i = (int)(curveEditors.size()) - 1; i >= j; --i) {
if (curveEditors[i]->relatedWidget != NULL) {
for (int i = (int)(curveEditors.size()) - 1; i >= j; i--) {
if (curveEditors[i]->relatedWidget != nullptr) {
headerBox->pack_end (*curveEditors[i]->relatedWidget, Gtk::PACK_EXPAND_WIDGET, 2);
}
@@ -256,7 +249,7 @@ void CurveEditorGroup::curveTypeToggled(CurveEditor* ce)
}
} else {
// The button is now released, so we have to hide this CurveEditor
displayedCurve = 0;
displayedCurve = nullptr;
}
ce->subGroup->switchGUI();
@@ -381,8 +374,8 @@ void CurveEditorGroup::setUnChanged (bool uc, CurveEditor* ce)
CurveEditorSubGroup::CurveEditorSubGroup(Glib::ustring& curveDir) : curveDir(curveDir), lastFilename("")
{
leftBar = NULL;
bottomBar = NULL;
leftBar = nullptr;
bottomBar = nullptr;
}
CurveEditorSubGroup::~CurveEditorSubGroup()