diff --git a/src/Gui/PythonWrapper.cpp b/src/Gui/PythonWrapper.cpp index abb418e11f..3e8610284a 100644 --- a/src/Gui/PythonWrapper.cpp +++ b/src/Gui/PythonWrapper.cpp @@ -588,7 +588,7 @@ qsizetype PythonWrapper::toEnum(PyObject* pyPtr) #if defined (HAVE_SHIBOKEN) && defined(HAVE_PYSIDE) return Shiboken::Enum::getValue(pyPtr); #else - return toEnum(Py::Object(pyPtr); + return toEnum(Py::Object(pyPtr)); #endif } diff --git a/src/Gui/ToolBarManager.cpp b/src/Gui/ToolBarManager.cpp index 4380ca927d..1d0fa87b65 100644 --- a/src/Gui/ToolBarManager.cpp +++ b/src/Gui/ToolBarManager.cpp @@ -809,7 +809,7 @@ bool ToolBarManager::addToolBarToArea(QObject *source, QMouseEvent *ev) } } else { tbIndex = idx; - QTimer::singleShot(10, tb, [tb,this]() { + QTimer::singleShot(10, tb, [tb]() { if (!lastArea) return; else { @@ -839,7 +839,7 @@ void ToolBarManager::populateUndockMenu(QMenu *menu, ToolBarArea *area) undockAction->setText(action->text()); undockAction->setToolTip(tooltip); menu->addAction(undockAction); - QObject::connect(undockAction, &QAction::triggered, [area, toolbar, this]() { + QObject::connect(undockAction, &QAction::triggered, [area, toolbar]() { if (toolbar->parentWidget() == getMainWindow()) { return; } @@ -856,8 +856,9 @@ void ToolBarManager::populateUndockMenu(QMenu *menu, ToolBarArea *area) toolbar->topLevelChanged(true); }); }; - if (area) + if (area) { area->foreachToolBar(addMenuUndockItem); + } else { statusBarArea->foreachToolBar(addMenuUndockItem); menuBarLeftArea->foreachToolBar(addMenuUndockItem); diff --git a/src/Gui/ToolBarManager.h b/src/Gui/ToolBarManager.h index 9cf705c7bd..91509ac25d 100644 --- a/src/Gui/ToolBarManager.h +++ b/src/Gui/ToolBarManager.h @@ -167,7 +167,6 @@ private: int _toolBarIconSize = 0; int _statusBarIconSize = 0; int _menuBarIconSize = 0; - mutable bool restored = false; }; } // namespace Gui