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

Gui: fix some clang-tidy warnings:

Browse Source 
* readability-braces-around-statements
This commit is contained in:
wmayer
2022-11-13 17:42:08 +01:00
parent 904f92d747
commit 756e081a78
3 changed files with 167 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
src/Gui/Workbench.cpp
View File

@@ -238,8 +238,9 @@ void Workbench::setupCustomToolbars(ToolBarItem* root, const char* toolbar) cons
}
// for this workbench global toolbars are not allowed
if (getTypeId() == NoneWorkbench::getClassTypeId())
if (getTypeId() == NoneWorkbench::getClassTypeId()) {
return;
}
// application-wide custom toolbars
hGrp = App::GetApplication().GetUserParameter().GetGroup("BaseApp")
@@ -260,8 +261,11 @@ void Workbench::setupCustomToolbars(ToolBarItem* root, const Base::Reference<Par
std::string separator = "Separator";
for (const auto & it : hGrps) {
bool active = it->GetBool("Active", true);
if (!active) // ignore this toolbar
if (!active) {
// ignore this toolbar
continue;
}
auto bar = new ToolBarItem(root);
bar->setCommand("Custom");
@@ -325,8 +329,10 @@ void Workbench::createMainWindowPopupMenu(MenuItem*) const
}
void Workbench::createLinkMenu(MenuItem *item) {
if(!item || !App::GetApplication().getActiveDocument())
if(!item || !App::GetApplication().getActiveDocument()) {
return;
}
auto linkMenu = new MenuItem;
linkMenu->setCommand("Link actions");
*linkMenu << "Std_LinkMakeGroup" << "Std_LinkMake";
@@ -366,8 +372,9 @@ void Workbench::removePermanentMenuItem(const std::string& cmd)
return (pmi.first == cmd);
});
if (it != staticMenuItems.end())
if (it != staticMenuItems.end()) {
staticMenuItems.erase(it);
}
}
void Workbench::addPermanentMenuItems(MenuItem* mb) const
@@ -435,15 +442,17 @@ PyObject* Workbench::getPyObject()
void Workbench::addTaskWatcher(const std::vector<Gui::TaskView::TaskWatcher*> &Watcher)
{
Gui::TaskView::TaskView* taskView = Control().taskPanel();
if (taskView)
if (taskView) {
taskView->addTaskWatcher(Watcher);
}
}
void Workbench::removeTaskWatcher()
{
Gui::TaskView::TaskView* taskView = Control().taskPanel();
if (taskView)
if (taskView) {
taskView->clearTaskWatcher();
}
}
std::list<std::string> Workbench::listToolbars() const
@@ -451,8 +460,9 @@ std::list<std::string> Workbench::listToolbars() const
std::unique_ptr<ToolBarItem> tb(setupToolBars());
std::list<std::string> bars;
QList<ToolBarItem*> items = tb->getItems();
for (const auto & item : items)
for (const auto & item : items) {
bars.push_back(item->command());
}
return bars;
}
@@ -479,8 +489,9 @@ std::list<std::string> Workbench::listMenus() const
std::unique_ptr<MenuItem> mb(setupMenuBar());
std::list<std::string> menus;
QList<MenuItem*> items = mb->getItems();
for (const auto & item : items)
for (const auto & item : items) {
menus.push_back(item->command());
}
return menus;
}
@@ -489,8 +500,9 @@ std::list<std::string> Workbench::listCommandbars() const
std::unique_ptr<ToolBarItem> cb(setupCommandBars());
std::list<std::string> bars;
QList<ToolBarItem*> items = cb->getItems();
for (const auto & item : items)
for (const auto & item : items) {
bars.push_back(item->command());
}
return bars;
}
@@ -817,8 +829,9 @@ DockWindowItems* StdWorkbench::setupDockWindows() const
GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("DockWindows")->GetGroup("DAGView");
bool enabled = group->GetBool("Enabled", false);
if (enabled)
if (enabled) {
root->addDockWidget("Std_DAGView", Qt::RightDockWidgetArea, false, false);
}
return root;
}
@@ -839,8 +852,9 @@ BlankWorkbench::~BlankWorkbench()
void BlankWorkbench::activated()
{
QList<QDockWidget*> dw = getMainWindow()->findChildren<QDockWidget*>();
for (auto & it : dw)
for (auto & it : dw) {
it->toggleViewAction()->setVisible(false);
}
getMainWindow()->statusBar()->hide();
}
@@ -1057,20 +1071,22 @@ void PythonBaseWorkbench::setupContextMenu(const char* recipient, MenuItem* item
void PythonBaseWorkbench::appendMenu(const std::list<std::string>& menu, const std::list<std::string>& items) const
{
if ( menu.empty() || items.empty() )
if ( menu.empty() || items.empty() ) {
return;
}
auto jt=menu.begin();
MenuItem* item = _menuBar->findItem( *jt );
if (!item)
{
if (!item) {
item = new MenuItem;
item->setCommand( *jt );
Gui::MenuItem* wnd = _menuBar->findItem( "&Windows" );
if (wnd)
if (wnd) {
_menuBar->insertItem(wnd, item);
else
}
else {
_menuBar->appendItem(item);
}
}
// create sub menus
@@ -1085,8 +1101,9 @@ void PythonBaseWorkbench::appendMenu(const std::list<std::string>& menu, const s
item = subitem;
}
for (const auto & it : items)
for (const auto & it : items) {
*item << it;
}
}
void PythonBaseWorkbench::removeMenu(const std::string& menu) const
@@ -1110,8 +1127,9 @@ void PythonBaseWorkbench::appendContextMenu(const std::list<std::string>& menu,
item = subitem;
}
for (const auto & it : items)
for (const auto & it : items) {
*item << it;
}
}
void PythonBaseWorkbench::removeContextMenu(const std::string& menu) const
@@ -1131,14 +1149,14 @@ void PythonBaseWorkbench::clearContextMenu()
void PythonBaseWorkbench::appendToolbar(const std::string& bar, const std::list<std::string>& items) const
{
ToolBarItem* item = _toolBar->findItem(bar);
if (!item)
{
if (!item) {
item = new ToolBarItem(_toolBar);
item->setCommand(bar);
}
for (const auto & it : items)
for (const auto & it : items) {
*item << it;
}
}
void PythonBaseWorkbench::removeToolbar(const std::string& bar) const
@@ -1153,20 +1171,20 @@ void PythonBaseWorkbench::removeToolbar(const std::string& bar) const
void PythonBaseWorkbench::appendCommandbar(const std::string& bar, const std::list<std::string>& items) const
{
ToolBarItem* item = _commandBar->findItem( bar );
if ( !item )
{
if (!item) {
item = new ToolBarItem(_commandBar);
item->setCommand(bar);
}
for (const auto & it : items)
for (const auto & it : items) {
*item << it;
}
}
void PythonBaseWorkbench::removeCommandbar(const std::string& bar) const
{
ToolBarItem* item = _commandBar->findItem(bar);
if ( item ) {
if (item) {
_commandBar->removeItem(item);
delete item;
}