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

22
rtgui/toolpanel.h
View File

@@ -75,17 +75,17 @@ protected:
public:
ToolPanel (Glib::ustring toolName = "", bool need11 = false) : toolName(toolName), listener(NULL), tmp(NULL), batchMode(false), multiImage(false), need100Percent(need11) {}
ToolPanel (Glib::ustring toolName = "", bool need11 = false) : toolName(toolName), listener(nullptr), tmp(nullptr), batchMode(false), multiImage(false), need100Percent(need11) {}
virtual ~ToolPanel() {}
virtual void setParent (Gtk::Box* parent) {}
virtual Gtk::Box* getParent ()
{
return NULL;
return nullptr;
}
virtual MyExpander* getExpander ()
{
return NULL;
return nullptr;
}
virtual void setExpanded (bool expanded) {}
virtual bool getExpanded ()
@@ -101,13 +101,13 @@ public:
listener = tpl;
}
virtual void setEditProvider (EditDataProvider *provider) {}
virtual void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = NULL) {}
virtual void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = NULL) {}
virtual void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) {}
virtual void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) {}
virtual void trimValues (rtengine::procparams::ProcParams* pp)
{
return;
}
virtual void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = NULL) {}
virtual void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) {}
virtual void autoOpenCurve () {}
/** @brief Disable the event broadcasting mechanism
@@ -116,12 +116,12 @@ public:
*/
bool disableListener ()
{
if (tmp == NULL) {
if (tmp == nullptr) {
tmp = listener;
}
bool prevState = listener != NULL;
listener = NULL;
bool prevState = listener != nullptr;
listener = nullptr;
return prevState;
}
@@ -129,11 +129,11 @@ public:
*/
void enableListener ()
{
if (tmp != NULL) {
if (tmp != nullptr) {
listener = tmp;
}
tmp = NULL;
tmp = nullptr;
}
virtual void setBatchMode (bool batchMode)