From e9586c4206318a31c833cd7edf5993b8efeaa02e Mon Sep 17 00:00:00 2001 From: wmayer Date: Fri, 20 Oct 2023 11:52:17 +0200 Subject: [PATCH] Sketch: fix several compiler and lint warnings * Remove private unused field 'sketchView' * Mark constructor with single argument as explicit * Mark virtual methods of base class as override * Fix clang code model parsing error * Avoid too short identifiers * Avoid redundant ternary operators * Avoid passing Base::Unit by value but by const reference --- src/Mod/Sketcher/Gui/CommandConstraints.cpp | 1 + .../Gui/SketcherToolDefaultWidget.cpp | 39 +++++++++---------- .../Sketcher/Gui/SketcherToolDefaultWidget.h | 27 ++++++------- 3 files changed, 34 insertions(+), 33 deletions(-) diff --git a/src/Mod/Sketcher/Gui/CommandConstraints.cpp b/src/Mod/Sketcher/Gui/CommandConstraints.cpp index 9eef58d5ae..526b5f8904 100644 --- a/src/Mod/Sketcher/Gui/CommandConstraints.cpp +++ b/src/Mod/Sketcher/Gui/CommandConstraints.cpp @@ -8745,6 +8745,7 @@ void CmdSketcherConstrainAngle::activated(int iMsg) else if (SubNames.size() < 3) { bool bothexternal = areBothPointsOrSegmentsFixed(Obj, GeoId1, GeoId2); + Q_UNUSED(bothexternal) if (isVertex(GeoId1, PosId1) && isEdge(GeoId2, PosId2)) { std::swap(GeoId1, GeoId2); diff --git a/src/Mod/Sketcher/Gui/SketcherToolDefaultWidget.cpp b/src/Mod/Sketcher/Gui/SketcherToolDefaultWidget.cpp index 1679abb88e..cd12389193 100644 --- a/src/Mod/Sketcher/Gui/SketcherToolDefaultWidget.cpp +++ b/src/Mod/Sketcher/Gui/SketcherToolDefaultWidget.cpp @@ -25,6 +25,8 @@ #ifndef _PreComp_ #include +#include +#include #include #include #endif @@ -42,7 +44,6 @@ #include #include -#include #include "ViewProviderSketch.h" @@ -92,9 +93,8 @@ bool SketcherToolDefaultWidget::KeyboardManager::handleKeyEvent(QKeyEvent* keyEv if (vpViewer && isMode(KeyboardEventHandlingMode::ViewProvider)) { return QApplication::sendEvent(vpViewer, keyEvent); } - else { - return false; // do not intercept the event and feed it to the widget - } + + return false; // do not intercept the event and feed it to the widget } void SketcherToolDefaultWidget::KeyboardManager::detectKeyboardEventHandlingMode( @@ -117,11 +117,9 @@ void SketcherToolDefaultWidget::KeyboardManager::onTimeOut() keyMode = KeyboardEventHandlingMode::ViewProvider; } -SketcherToolDefaultWidget::SketcherToolDefaultWidget(QWidget* parent, - ViewProviderSketch* sketchView) +SketcherToolDefaultWidget::SketcherToolDefaultWidget(QWidget* parent) : QWidget(parent) , ui(new Ui_SketcherToolDefaultWidget) - , sketchView(sketchView) , blockParameterSlots(false) { ui->setupUi(this); @@ -194,8 +192,7 @@ SketcherToolDefaultWidget::SketcherToolDefaultWidget(QWidget* parent, reset(); } -SketcherToolDefaultWidget::~SketcherToolDefaultWidget() -{} +SketcherToolDefaultWidget::~SketcherToolDefaultWidget() = default; // pre-select the number of the spinbox when it gets the focus. bool SketcherToolDefaultWidget::eventFilter(QObject* object, QEvent* event) @@ -216,7 +213,7 @@ bool SketcherToolDefaultWidget::eventFilter(QObject* object, QEvent* event) doesn't keep the keypress event for itself. Note if you want the event to be handled by the spinbox too, you can return false.*/ - QKeyEvent* keyEvent = static_cast(event); + auto keyEvent = static_cast(event); return keymanager.handleKeyEvent(keyEvent); } @@ -232,7 +229,7 @@ void SketcherToolDefaultWidget::reset() for (int i = 0; i < nParameters; i++) { setParameterVisible(i, false); - setParameter(i, 0.f); + setParameter(i, 0.F); } for (int i = 0; i < nCheckbox; i++) { @@ -354,8 +351,8 @@ void SketcherToolDefaultWidget::initNParameters(int nparameters) std::fill(isSet.begin(), isSet.end(), false); for (int i = 0; i < nParameters; i++) { - setParameterVisible(i, (i < nparameters) ? true : false); - setParameter(i, 0.f); + setParameterVisible(i, (i < nparameters)); + setParameter(i, 0.F); setParameterFontStyle(i, FontStyle::Italic); } @@ -395,7 +392,7 @@ void SketcherToolDefaultWidget::configureParameterInitialValue(int parameterinde setParameter(parameterindex, val); } -void SketcherToolDefaultWidget::configureParameterUnit(int parameterindex, Base::Unit unit) +void SketcherToolDefaultWidget::configureParameterUnit(int parameterindex, const Base::Unit& unit) { // For reference unit can be changed with : // setUnit(Base::Unit::Length); Base::Unit::Angle @@ -557,7 +554,9 @@ bool SketcherToolDefaultWidget::isParameterSet(int parameterindex) THROWM(Base::IndexError, "ToolWidget parameter index out of range"); } -void SketcherToolDefaultWidget::updateVisualValue(int parameterindex, double val, Base::Unit unit) +void SketcherToolDefaultWidget::updateVisualValue(int parameterindex, + double val, + const Base::Unit& unit) { if (parameterindex < nParameters) { Base::StateLocker lock(blockParameterSlots, true); @@ -620,7 +619,7 @@ void SketcherToolDefaultWidget::initNCheckboxes(int ncheckbox) Base::StateLocker lock(blockParameterSlots, true); for (int i = 0; i < nCheckbox; i++) { - setCheckboxVisible(i, (i < ncheckbox) ? true : false); + setCheckboxVisible(i, (i < ncheckbox)); setCheckboxChecked(i, false); } } @@ -747,7 +746,7 @@ void SketcherToolDefaultWidget::initNComboboxes(int ncombobox) Base::StateLocker lock(blockParameterSlots, true); for (int i = 0; i < nCombobox; i++) { - setComboboxVisible(i, (i < ncombobox) ? true : false); + setComboboxVisible(i, (i < ncombobox)); } } @@ -824,10 +823,10 @@ int SketcherToolDefaultWidget::getComboboxIndex(int comboboxindex) } -void SketcherToolDefaultWidget::changeEvent(QEvent* e) +void SketcherToolDefaultWidget::changeEvent(QEvent* ev) { - QWidget::changeEvent(e); - if (e->type() == QEvent::LanguageChange) { + QWidget::changeEvent(ev); + if (ev->type() == QEvent::LanguageChange) { ui->retranslateUi(this); } } diff --git a/src/Mod/Sketcher/Gui/SketcherToolDefaultWidget.h b/src/Mod/Sketcher/Gui/SketcherToolDefaultWidget.h index 260076fdd2..79f254e0da 100644 --- a/src/Mod/Sketcher/Gui/SketcherToolDefaultWidget.h +++ b/src/Mod/Sketcher/Gui/SketcherToolDefaultWidget.h @@ -24,6 +24,7 @@ #ifndef SketcherGui_SketcherToolDefaultWidget_H #define SketcherGui_SketcherToolDefaultWidget_H +#include #include #include #include @@ -136,18 +137,19 @@ public: nCombobox // Must Always be the last one }; - SketcherToolDefaultWidget(QWidget* parent = nullptr, ViewProviderSketch* sketchView = nullptr); - ~SketcherToolDefaultWidget(); + explicit SketcherToolDefaultWidget(QWidget* parent = nullptr); + ~SketcherToolDefaultWidget() override; - bool eventFilter(QObject* object, QEvent* event); + bool eventFilter(QObject* object, QEvent* event) override; // void keyPressEvent(QKeyEvent* event); void setParameter(int parameterindex, double val); void configureParameterInitialValue(int parameterindex, double value); - void configureParameterUnit(int parameterindex, Base::Unit unit); + void configureParameterUnit(int parameterindex, const Base::Unit& unit); double getParameter(int parameterindex); bool isParameterSet(int parameterindex); - void updateVisualValue(int parameterindex, double val, Base::Unit unit = Base::Unit::Length); + void + updateVisualValue(int parameterindex, double val, const Base::Unit& unit = Base::Unit::Length); void setParameterEnabled(int parameterindex, bool active = true); void setParameterFocus(int parameterindex); @@ -182,21 +184,21 @@ public: void restoreComboboxPref(int comboboxindex); template - boost::signals2::connection registerParameterValueChanged(F&& f) + boost::signals2::connection registerParameterValueChanged(F&& fn) { - return signalParameterValueChanged.connect(std::forward(f)); + return signalParameterValueChanged.connect(std::forward(fn)); } template - boost::signals2::connection registerCheckboxCheckedChanged(F&& f) + boost::signals2::connection registerCheckboxCheckedChanged(F&& fn) { - return signalCheckboxCheckedChanged.connect(std::forward(f)); + return signalCheckboxCheckedChanged.connect(std::forward(fn)); } template - boost::signals2::connection registerComboboxSelectionChanged(F&& f) + boost::signals2::connection registerComboboxSelectionChanged(F&& fn) { - return signalComboboxSelectionChanged.connect(std::forward(f)); + return signalComboboxSelectionChanged.connect(std::forward(fn)); } @@ -221,7 +223,7 @@ protected Q_SLOTS: void comboBox3_currentIndexChanged(int val); protected: - void changeEvent(QEvent* e); + void changeEvent(QEvent* ev) override; private: QLabel* getParameterLabel(int parameterindex); @@ -236,7 +238,6 @@ private: private: std::unique_ptr ui; - ViewProviderSketch* sketchView; boost::signals2::signal signalParameterValueChanged; boost::signals2::signal signalCheckboxCheckedChanged;