kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Gui: Eliminate variable reuse

Browse Source 
Coverity complains about USE_AFTER_FREE here, and it was difficult to reason about the code. To help address this, use different variables for the different parameter groups.
This commit is contained in:
Chris Hennes
2023-02-25 16:57:30 -06:00
committed by wwmayer
parent c32bf8e99a
commit d26b84df3f
2 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/Gui/Workbench.cpp
View File

@@ -226,14 +226,15 @@ void Workbench::setName(const std::string& name)
void Workbench::setupCustomToolbars(ToolBarItem* root, const char* toolbar) const
{
std::string name = this->name();
ParameterGrp::handle hGrp = App::GetApplication().GetUserParameter().GetGroup("BaseApp")
->GetGroup("Workbench");
const auto workbenchGroup {
App::GetApplication().GetUserParameter().GetGroup("BaseApp")->GetGroup("Workbench")
};
// workbench specific custom toolbars
if (hGrp->HasGroup(name.c_str())) {
hGrp = hGrp->GetGroup(name.c_str());
if (hGrp->HasGroup(toolbar)) {
hGrp = hGrp->GetGroup(toolbar);
setupCustomToolbars(root, hGrp);
if (workbenchGroup->HasGroup(name.c_str())) {
const auto customGroup = workbenchGroup->GetGroup(name.c_str());
if (customGroup->HasGroup(toolbar)) {
const auto customToolbarGroup = customGroup->GetGroup(toolbar);
setupCustomToolbars(root, customToolbarGroup);
}
}
@@ -243,18 +244,16 @@ void Workbench::setupCustomToolbars(ToolBarItem* root, const char* toolbar) cons
}
// application-wide custom toolbars
hGrp = App::GetApplication().GetUserParameter().GetGroup("BaseApp")
->GetGroup("Workbench");
if (hGrp->HasGroup("Global")) {
hGrp = hGrp->GetGroup("Global");
if (hGrp->HasGroup(toolbar)) {
hGrp = hGrp->GetGroup(toolbar);
setupCustomToolbars(root, hGrp);
if (workbenchGroup->HasGroup("Global")) {
const auto globalGroup = workbenchGroup->GetGroup("Global");
if (globalGroup->HasGroup(toolbar)) {
const auto customToolbarGroup = globalGroup->GetGroup(toolbar);
setupCustomToolbars(root, customToolbarGroup);
}
}
}
void Workbench::setupCustomToolbars(ToolBarItem* root, const Base::Reference<ParameterGrp>& hGrp) const
void Workbench::setupCustomToolbars(ToolBarItem* root, const Base::Reference<ParameterGrp> hGrp) const
{
std::vector<Base::Reference<ParameterGrp> > hGrps = hGrp->GetGroups();
CommandManager& rMgr = Application::Instance->commandManager();

2
src/Gui/Workbench.h
View File

@@ -130,7 +130,7 @@ private:
* a ToolBarItem tree structure.
*/
void setupCustomToolbars(ToolBarItem* root, const char* toolbar) const;
void setupCustomToolbars(ToolBarItem* root, const Base::Reference<ParameterGrp>& hGrp) const;
void setupCustomToolbars(ToolBarItem* root, const Base::Reference<ParameterGrp> hGrp) const;
void setupCustomShortcuts() const;
private: