Review IdleRegister (#4892)

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

View File

@@ -888,22 +888,22 @@ void Wavelet::wavChanged (double nlevel)
{
if (!batchMode) {
struct Data {
Wavelet *me;
Wavelet *self;
double nlevel;
};
const auto func = [](gpointer data) -> gboolean {
Data *d = static_cast<Data *>(data);
Wavelet *me = d->me;
me->wavLabels->set_text(
Glib::ustring::compose(M("TP_WAVELET_LEVLABEL"),
Glib::ustring::format(std::fixed, std::setprecision(0), d->nlevel))
);
delete d;
return FALSE;
};
const auto func =
[](Data* data) -> bool
{
Wavelet* self = data->self;
self->wavLabels->set_text(
Glib::ustring::compose(M("TP_WAVELET_LEVLABEL"),
Glib::ustring::format(std::fixed, std::setprecision(0), data->nlevel))
);
return false;
};
idle_register.add(func, new Data { this, nlevel });
idle_register.add<Data>(func, new Data{this, nlevel}, true);
}
}