From f82663cfb0fdb8751b508fb010cf5648a8bdc82b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Althaus?= Date: Sat, 17 Feb 2024 12:17:38 +0100 Subject: [PATCH] Refactor: add default member initializers --- .../Gui/TaskLinearPatternParameters.h | 2 +- .../Gui/TaskMultiTransformParameters.cpp | 2 -- .../Gui/TaskMultiTransformParameters.h | 6 ++--- .../Gui/TaskPolarPatternParameters.h | 2 +- .../Gui/TaskTransformedParameters.cpp | 14 +++--------- .../Gui/TaskTransformedParameters.h | 22 ++++++++++--------- 6 files changed, 20 insertions(+), 28 deletions(-) diff --git a/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.h b/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.h index cce38910e3..f870edf64a 100644 --- a/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.h +++ b/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.h @@ -84,7 +84,7 @@ private: private: std::unique_ptr ui; - QTimer* updateViewTimer; + QTimer* updateViewTimer = nullptr; ComboLinks dirLinks; }; diff --git a/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.cpp b/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.cpp index c8f3c1622d..12f467e465 100644 --- a/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.cpp @@ -57,8 +57,6 @@ using namespace Gui; TaskMultiTransformParameters::TaskMultiTransformParameters(ViewProviderTransformed *TransformedView,QWidget *parent) : TaskTransformedParameters(TransformedView, parent) , ui(new Ui_TaskMultiTransformParameters) - , subTask(nullptr) - , subFeature(nullptr) { setupUI(); } diff --git a/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.h b/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.h index d61a0bb949..37bab1dc51 100644 --- a/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.h +++ b/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.h @@ -94,9 +94,9 @@ private: private: std::unique_ptr ui; /// The subTask and subFeature currently active in the UI - TaskTransformedParameters* subTask; - PartDesign::Transformed* subFeature; - bool editHint; + TaskTransformedParameters* subTask = nullptr; + PartDesign::Transformed* subFeature = nullptr; + bool editHint = false; }; diff --git a/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.h b/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.h index 520eb614fd..18a5c213bc 100644 --- a/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.h +++ b/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.h @@ -84,7 +84,7 @@ private: private: std::unique_ptr ui; - QTimer* updateViewTimer; + QTimer* updateViewTimer = nullptr; ComboLinks axesLinks; }; diff --git a/src/Mod/PartDesign/Gui/TaskTransformedParameters.cpp b/src/Mod/PartDesign/Gui/TaskTransformedParameters.cpp index 3ff597c14c..a68c19f7de 100644 --- a/src/Mod/PartDesign/Gui/TaskTransformedParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskTransformedParameters.cpp @@ -57,11 +57,7 @@ using namespace Gui; TaskTransformedParameters::TaskTransformedParameters(ViewProviderTransformed *TransformedView, QWidget *parent) : TaskBox(Gui::BitmapFactory().pixmap(TransformedView->featureIcon().c_str()), TransformedView->menuName, true, parent) - , proxy(nullptr) , TransformedView(TransformedView) - , parentTask(nullptr) - , insideMultiTransform(false) - , blockUpdate(false) , ui(new Ui_TaskTransformedParameters) { Gui::Document* doc = TransformedView->getDocument(); @@ -73,11 +69,8 @@ TaskTransformedParameters::TaskTransformedParameters(ViewProviderTransformed *Tr TaskTransformedParameters::TaskTransformedParameters(TaskMultiTransformParameters *parentTask) : TaskBox(QPixmap(), tr(""), true, parentTask), - proxy(nullptr), - TransformedView(nullptr), parentTask(parentTask), - insideMultiTransform(true), - blockUpdate(false) + insideMultiTransform(true) { } @@ -553,7 +546,7 @@ void TaskTransformedParameters::indexesMoved() //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ TaskDlgTransformedParameters::TaskDlgTransformedParameters(ViewProviderTransformed *TransformedView_) - : TaskDlgFeatureParameters(TransformedView_), parameter(nullptr) + : TaskDlgFeatureParameters(TransformedView_) { assert(vp); message = new TaskTransformedMessages(getTransformedView()); @@ -583,9 +576,8 @@ bool TaskDlgTransformedParameters::reject() ComboLinks::ComboLinks(QComboBox &combo) - : doc(nullptr) + : _combo(&combo) { - this->_combo = &combo; _combo->clear(); } diff --git a/src/Mod/PartDesign/Gui/TaskTransformedParameters.h b/src/Mod/PartDesign/Gui/TaskTransformedParameters.h index ae433343fe..d8c995f199 100644 --- a/src/Mod/PartDesign/Gui/TaskTransformedParameters.h +++ b/src/Mod/PartDesign/Gui/TaskTransformedParameters.h @@ -67,7 +67,8 @@ public: * will go out of sync, and crashes may result. */ explicit ComboLinks(QComboBox &combo); - ComboLinks() {_combo = nullptr; doc = nullptr;} + ComboLinks() = default; + void setCombo(QComboBox &combo) {assert(!_combo); this->_combo = &combo; _combo->clear();} /** @@ -104,8 +105,8 @@ public: ~ComboLinks() {_combo = nullptr; clear();} private: - QComboBox* _combo; - App::Document* doc; + QComboBox* _combo = nullptr; + App::Document* doc = nullptr; std::vector linksInList; }; @@ -227,8 +228,8 @@ protected: void fillPlanesCombo(ComboLinks &combolinks, Part::Part2DObject *sketch); protected: - QWidget* proxy; - ViewProviderTransformed *TransformedView; + QWidget* proxy = nullptr; + ViewProviderTransformed *TransformedView = nullptr; int transactionID = 0; bool enableTransaction = true; @@ -241,11 +242,11 @@ protected: SelectionMode selectionMode = SelectionMode::None; /// The MultiTransform parent task of this task - TaskMultiTransformParameters* parentTask; + TaskMultiTransformParameters* parentTask = nullptr; /// Flag indicating whether this object is a container for MultiTransform - bool insideMultiTransform; + bool insideMultiTransform = false; /// Lock updateUI(), applying changes to the underlying feature and calling recomputeFeature() - bool blockUpdate; + bool blockUpdate = false; private: std::unique_ptr ui; @@ -268,9 +269,10 @@ public: bool accept() override; /// is called by the framework if the dialog is rejected (Cancel) bool reject() override; + protected: - TaskTransformedParameters *parameter; - TaskTransformedMessages *message; + TaskTransformedParameters *parameter = nullptr; + TaskTransformedMessages *message = nullptr; }; } //namespace PartDesignGui