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

10
rtgui/thresholdadjuster.cc
View File

@@ -71,7 +71,7 @@ ThresholdAdjuster::ThresholdAdjuster (Glib::ustring label, double minValue, doub
void ThresholdAdjuster::initObject (Glib::ustring label, bool editedcb)
{
adjusterListener = NULL;
adjusterListener = nullptr;
afterReset = false;
blocked = false;
@@ -90,7 +90,7 @@ void ThresholdAdjuster::initObject (Glib::ustring label, bool editedcb)
editedChange = editedCheckBox->signal_toggled().connect( sigc::mem_fun(*this, &ThresholdAdjuster::editedToggled) );
hbox->pack_start (*editedCheckBox);
} else {
editedCheckBox = NULL;
editedCheckBox = nullptr;
}
hbox->pack_start (*this->label);
@@ -120,7 +120,7 @@ ThresholdAdjuster::~ThresholdAdjuster ()
selectorChange.disconnect();
delayConnection.block(true);
adjusterListener = NULL;
adjusterListener = nullptr;
}
void ThresholdAdjuster::setDefault (double bottom, double top)
@@ -162,7 +162,7 @@ void ThresholdAdjuster::resetPressed (GdkEventButton* event)
afterReset = true;
if ((event != NULL) && (event->state & GDK_CONTROL_MASK) && (event->button == 1))
if ((event != nullptr) && (event->state & GDK_CONTROL_MASK) && (event->button == 1))
// CTRL pressed : resetting to current default value
{
tSelector.reset();
@@ -259,7 +259,7 @@ void ThresholdAdjuster::getValue (Glib::ustring& bottomLeft, Glib::ustring& topL
bool ThresholdAdjuster::notifyListener ()
{
if (adjusterListener != NULL && !blocked) {
if (adjusterListener != nullptr && !blocked) {
GThreadLock lock;
sendToListener();
}