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

Review IdleRegister (#4892)

Browse Source 
This turns `IdleRegister::add()` into a template function to make the
provided function pointers type safe. It also adds a `delete_data`
parameter to manage the provided data pointer even in `destroy()`.
This commit is contained in:
Flössie
2018-10-28 13:12:01 +01:00
parent 7038104a20
commit 5906329485
27 changed files with 708 additions and 697 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
rtgui/colorappearance.cc
View File

@@ -1452,63 +1452,63 @@ void ColorAppearance::setDefaults (const ProcParams* defParams, const ParamsEdit
void ColorAppearance::autoCamChanged (double ccam, double ccamout)
{
struct Data {
ColorAppearance *me;
ColorAppearance* me;
double ccam;
double ccamout;
};
const auto func = [](gpointer data) -> gboolean {
Data *d = static_cast<Data *>(data);
ColorAppearance *me = d->me;
me->disableListener();
me->degree->setValue(d->ccam);
me->degreeout->setValue(d->ccamout);
me->enableListener();
delete d;
return FALSE;
};
const auto func =
[](Data* data) -> bool
{
ColorAppearance* const self = data->me;
self->disableListener();
self->degree->setValue(data->ccam);
self->degreeout->setValue(data->ccamout);
self->enableListener();
return false;
};
idle_register.add(func, new Data { this, ccam, ccamout });
idle_register.add<Data>(func, new Data{this, ccam, ccamout}, true);
}
void ColorAppearance::adapCamChanged (double cadap)
{
struct Data {
ColorAppearance *me;
ColorAppearance* self;
double cadap;
};
const auto func = [](gpointer data) -> gboolean {
Data *d = static_cast<Data *>(data);
ColorAppearance *me = d->me;
me->disableListener();
me->adapscen->setValue(d->cadap);
me->enableListener();
delete d;
return FALSE;
};
const auto func =
[](Data* data) -> bool
{
ColorAppearance* const self = data->self;
self->disableListener();
self->adapscen->setValue(data->cadap);
self->enableListener();
return false;
};
idle_register.add(func, new Data { this, cadap });
idle_register.add<Data>(func, new Data{this, cadap}, true);
}
void ColorAppearance::ybCamChanged (int ybsc)
{
struct Data {
ColorAppearance *me;
ColorAppearance* self;
int ybsc;
};
const auto func = [](gpointer data) -> gboolean {
Data *d = static_cast<Data *>(data);
ColorAppearance *me = d->me;
me->disableListener();
me->ybscen->setValue(d->ybsc);
me->enableListener();
delete d;
return FALSE;
};
const auto func =
[](Data* data) -> bool
{
ColorAppearance* self = data->self;
self->disableListener();
self->ybscen->setValue(data->ybsc);
self->enableListener();
return false;
};
idle_register.add(func, new Data { this, ybsc });
idle_register.add<Data>(func, new Data{this, ybsc}, true);
}
void ColorAppearance::colorForValue (double valX, double valY, enum ColorCaller::ElemType elemType, int callerId, ColorCaller *caller)