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

39
rtgui/filecatalog.cc
View File

@@ -873,13 +873,14 @@ void FileCatalog::previewsFinished (int dir_id)
currentEFS = dirEFS;
}
const auto func = [](gpointer data) -> gboolean {
static_cast<FileCatalog*>(data)->previewsFinishedUI();
const auto func =
[](FileCatalog* self) -> bool
{
self->previewsFinishedUI();
return false;
};
return FALSE;
};
idle_register.add(func, this);
idle_register.add<FileCatalog>(func, this, false);
}
void FileCatalog::setEnabled (bool e)
@@ -941,24 +942,22 @@ struct FCOIParams {
std::vector<Thumbnail*> tmb;
};
int openRequestedUI (void* p)
bool openRequestedUI(FCOIParams* params)
{
FCOIParams* params = static_cast<FCOIParams*>(p);
params->catalog->_openImage (params->tmb);
delete params;
return 0;
return false;
}
void FileCatalog::filterApplied()
{
const auto func = [](gpointer data) -> gboolean {
static_cast<FileCatalog*>(data)->_refreshProgressBar();
const auto func =
[](FileCatalog* self) -> bool
{
self->_refreshProgressBar();
return false;
};
return FALSE;
};
idle_register.add(func, this);
idle_register.add<FileCatalog>(func, this, false);
}
void FileCatalog::openRequested(const std::vector<Thumbnail*>& tmb)
@@ -971,7 +970,7 @@ void FileCatalog::openRequested(const std::vector<Thumbnail*>& tmb)
tmb[i]->increaseRef ();
}
idle_register.add(openRequestedUI, params);
idle_register.add<FCOIParams>(openRequestedUI, params, true);
}
void FileCatalog::deleteRequested(const std::vector<FileBrowserEntry*>& tbe, bool inclBatchProcessed)
@@ -1229,7 +1228,7 @@ void FileCatalog::developRequested(const std::vector<FileBrowserEntry*>& tbe, bo
params.resize.width = options.fastexport_resize_width;
params.resize.height = options.fastexport_resize_height;
}
params.resize.enabled = options.fastexport_resize_enabled;
params.resize.scale = options.fastexport_resize_scale;
params.resize.appliesTo = options.fastexport_resize_appliesTo;
@@ -1903,7 +1902,7 @@ void FileCatalog::addAndOpenFile (const Glib::ustring& fname)
params->catalog = this;
params->tmb.push_back (tmb);
tmb->increaseRef ();
idle_register.add(openRequestedUI, params);
idle_register.add<FCOIParams>(openRequestedUI, params, true);
} catch(Gio::Error&) {}
}