From 2ac84872ecd8f820b644cbe442648ccc7ff270bf Mon Sep 17 00:00:00 2001 From: donovaly Date: Fri, 5 Feb 2021 02:45:37 +0100 Subject: [PATCH] [PD] make pointers to the UI std::unique_ptr Same as PR #4293, just for PartDesign as noted in https://github.com/FreeCAD/FreeCAD/pull/4271#discussion_r554673632 the pointer to the UI should be a unique pointer. This PR does this for all PartDesign dialogs that don't already use a unique_ptr. --- src/Mod/PartDesign/Gui/TaskBooleanParameters.cpp | 6 +++--- src/Mod/PartDesign/Gui/TaskBooleanParameters.h | 2 +- src/Mod/PartDesign/Gui/TaskChamferParameters.cpp | 4 +--- src/Mod/PartDesign/Gui/TaskChamferParameters.h | 2 +- src/Mod/PartDesign/Gui/TaskDraftParameters.cpp | 4 +--- src/Mod/PartDesign/Gui/TaskDraftParameters.h | 2 +- src/Mod/PartDesign/Gui/TaskFeaturePick.h | 2 +- src/Mod/PartDesign/Gui/TaskFilletParameters.cpp | 4 +--- src/Mod/PartDesign/Gui/TaskFilletParameters.h | 2 +- src/Mod/PartDesign/Gui/TaskHelixParameters.cpp | 2 +- src/Mod/PartDesign/Gui/TaskHelixParameters.h | 2 +- src/Mod/PartDesign/Gui/TaskHoleParameters.cpp | 5 ++--- src/Mod/PartDesign/Gui/TaskHoleParameters.h | 4 ++-- .../Gui/TaskLinearPatternParameters.cpp | 8 +++----- .../PartDesign/Gui/TaskLinearPatternParameters.h | 2 +- src/Mod/PartDesign/Gui/TaskLoftParameters.cpp | 5 ++--- src/Mod/PartDesign/Gui/TaskLoftParameters.h | 2 +- .../PartDesign/Gui/TaskMirroredParameters.cpp | 8 +++----- src/Mod/PartDesign/Gui/TaskMirroredParameters.h | 2 +- .../Gui/TaskMultiTransformParameters.cpp | 7 ++++--- .../Gui/TaskMultiTransformParameters.h | 2 +- src/Mod/PartDesign/Gui/TaskPadParameters.cpp | 5 ++--- src/Mod/PartDesign/Gui/TaskPadParameters.h | 2 +- src/Mod/PartDesign/Gui/TaskPipeParameters.cpp | 16 +++++++--------- src/Mod/PartDesign/Gui/TaskPipeParameters.h | 6 +++--- src/Mod/PartDesign/Gui/TaskPocketParameters.cpp | 5 ++--- src/Mod/PartDesign/Gui/TaskPocketParameters.h | 2 +- .../Gui/TaskPolarPatternParameters.cpp | 8 +++----- .../PartDesign/Gui/TaskPolarPatternParameters.h | 2 +- .../PartDesign/Gui/TaskRevolutionParameters.cpp | 6 ++---- .../PartDesign/Gui/TaskRevolutionParameters.h | 2 +- src/Mod/PartDesign/Gui/TaskScaledParameters.cpp | 8 +++----- src/Mod/PartDesign/Gui/TaskScaledParameters.h | 2 +- src/Mod/PartDesign/Gui/TaskShapeBinder.cpp | 3 +-- src/Mod/PartDesign/Gui/TaskShapeBinder.h | 2 +- .../PartDesign/Gui/TaskThicknessParameters.cpp | 4 +--- src/Mod/PartDesign/Gui/TaskThicknessParameters.h | 2 +- .../PartDesign/Gui/TaskTransformedMessages.cpp | 7 +++---- src/Mod/PartDesign/Gui/TaskTransformedMessages.h | 2 +- .../PartDesign/Gui/TaskTransformedParameters.cpp | 14 ++++++-------- 40 files changed, 74 insertions(+), 101 deletions(-) diff --git a/src/Mod/PartDesign/Gui/TaskBooleanParameters.cpp b/src/Mod/PartDesign/Gui/TaskBooleanParameters.cpp index 056aa99434..c72e241686 100644 --- a/src/Mod/PartDesign/Gui/TaskBooleanParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskBooleanParameters.cpp @@ -53,13 +53,14 @@ using namespace Gui; /* TRANSLATOR PartDesignGui::TaskBooleanParameters */ TaskBooleanParameters::TaskBooleanParameters(ViewProviderBoolean *BooleanView,QWidget *parent) - : TaskBox(Gui::BitmapFactory().pixmap("PartDesign_Boolean"),tr("Boolean parameters"),true, parent),BooleanView(BooleanView) + : TaskBox(Gui::BitmapFactory().pixmap("PartDesign_Boolean"), tr("Boolean parameters"), true, parent) + , ui(new Ui_TaskBooleanParameters) + , BooleanView(BooleanView) { selectionMode = none; // we need a separate container widget to add all controls to proxy = new QWidget(this); - ui = new Ui_TaskBooleanParameters(); ui->setupUi(proxy); QMetaObject::connectSlotsByName(this); @@ -289,7 +290,6 @@ void TaskBooleanParameters::onBodyDeleted(void) TaskBooleanParameters::~TaskBooleanParameters() { - delete ui; } void TaskBooleanParameters::changeEvent(QEvent *e) diff --git a/src/Mod/PartDesign/Gui/TaskBooleanParameters.h b/src/Mod/PartDesign/Gui/TaskBooleanParameters.h index 6020dd850e..6f9739ce55 100644 --- a/src/Mod/PartDesign/Gui/TaskBooleanParameters.h +++ b/src/Mod/PartDesign/Gui/TaskBooleanParameters.h @@ -70,7 +70,7 @@ protected: private: QWidget* proxy; - Ui_TaskBooleanParameters* ui; + std::unique_ptr ui; ViewProviderBoolean *BooleanView; enum selectionModes { none, bodyAdd, bodyRemove }; diff --git a/src/Mod/PartDesign/Gui/TaskChamferParameters.cpp b/src/Mod/PartDesign/Gui/TaskChamferParameters.cpp index 31e84795c8..75745dc5fb 100644 --- a/src/Mod/PartDesign/Gui/TaskChamferParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskChamferParameters.cpp @@ -57,10 +57,10 @@ using namespace Gui; TaskChamferParameters::TaskChamferParameters(ViewProviderDressUp *DressUpView, QWidget *parent) : TaskDressUpParameters(DressUpView, true, true, parent) + , ui(new Ui_TaskChamferParameters) { // we need a separate container widget to add all controls to proxy = new QWidget(this); - ui = new Ui_TaskChamferParameters(); ui->setupUi(proxy); this->groupLayout()->addWidget(proxy); @@ -311,8 +311,6 @@ TaskChamferParameters::~TaskChamferParameters() { Gui::Selection().clearSelection(); Gui::Selection().rmvSelectionGate(); - - delete ui; } bool TaskChamferParameters::event(QEvent *e) diff --git a/src/Mod/PartDesign/Gui/TaskChamferParameters.h b/src/Mod/PartDesign/Gui/TaskChamferParameters.h index c33c47c14f..436c879c0c 100644 --- a/src/Mod/PartDesign/Gui/TaskChamferParameters.h +++ b/src/Mod/PartDesign/Gui/TaskChamferParameters.h @@ -67,7 +67,7 @@ protected: private: void setUpUI(PartDesign::Chamfer* pcChamfer); - Ui_TaskChamferParameters* ui; + std::unique_ptr ui; }; /// simulation dialog for the TaskView diff --git a/src/Mod/PartDesign/Gui/TaskDraftParameters.cpp b/src/Mod/PartDesign/Gui/TaskDraftParameters.cpp index 3429c99be6..3a9298fc13 100644 --- a/src/Mod/PartDesign/Gui/TaskDraftParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskDraftParameters.cpp @@ -56,10 +56,10 @@ using namespace Gui; TaskDraftParameters::TaskDraftParameters(ViewProviderDressUp *DressUpView, QWidget *parent) : TaskDressUpParameters(DressUpView, false, true, parent) + , ui(new Ui_TaskDraftParameters) { // we need a separate container widget to add all controls to proxy = new QWidget(this); - ui = new Ui_TaskDraftParameters(); ui->setupUi(proxy); this->groupLayout()->addWidget(proxy); @@ -319,8 +319,6 @@ TaskDraftParameters::~TaskDraftParameters() { Gui::Selection().clearSelection(); Gui::Selection().rmvSelectionGate(); - - delete ui; } bool TaskDraftParameters::event(QEvent *e) diff --git a/src/Mod/PartDesign/Gui/TaskDraftParameters.h b/src/Mod/PartDesign/Gui/TaskDraftParameters.h index dcff0bbdaf..390e9c278c 100644 --- a/src/Mod/PartDesign/Gui/TaskDraftParameters.h +++ b/src/Mod/PartDesign/Gui/TaskDraftParameters.h @@ -60,7 +60,7 @@ protected: virtual void onSelectionChanged(const Gui::SelectionChanges& msg); private: - Ui_TaskDraftParameters* ui; + std::unique_ptr ui; }; /// simulation dialog for the TaskView diff --git a/src/Mod/PartDesign/Gui/TaskFeaturePick.h b/src/Mod/PartDesign/Gui/TaskFeaturePick.h index fa8ff1a1a9..3f1ed083f6 100644 --- a/src/Mod/PartDesign/Gui/TaskFeaturePick.h +++ b/src/Mod/PartDesign/Gui/TaskFeaturePick.h @@ -84,7 +84,7 @@ protected: virtual void slotDeleteDocument(const Gui::Document& Doc); private: - Ui_TaskFeaturePick* ui; + std::unique_ptr ui; QWidget* proxy; std::vector origins; bool doSelection; diff --git a/src/Mod/PartDesign/Gui/TaskFilletParameters.cpp b/src/Mod/PartDesign/Gui/TaskFilletParameters.cpp index 1749edbb8d..0e8b8e424b 100644 --- a/src/Mod/PartDesign/Gui/TaskFilletParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskFilletParameters.cpp @@ -54,10 +54,10 @@ using namespace Gui; TaskFilletParameters::TaskFilletParameters(ViewProviderDressUp *DressUpView, QWidget *parent) : TaskDressUpParameters(DressUpView, true, true, parent) + , ui(new Ui_TaskFilletParameters) { // we need a separate container widget to add all controls to proxy = new QWidget(this); - ui = new Ui_TaskFilletParameters(); ui->setupUi(proxy); this->groupLayout()->addWidget(proxy); @@ -214,8 +214,6 @@ TaskFilletParameters::~TaskFilletParameters() { Gui::Selection().clearSelection(); Gui::Selection().rmvSelectionGate(); - - delete ui; } bool TaskFilletParameters::event(QEvent *e) diff --git a/src/Mod/PartDesign/Gui/TaskFilletParameters.h b/src/Mod/PartDesign/Gui/TaskFilletParameters.h index ea4fb684e6..e4eeb57ab0 100644 --- a/src/Mod/PartDesign/Gui/TaskFilletParameters.h +++ b/src/Mod/PartDesign/Gui/TaskFilletParameters.h @@ -53,7 +53,7 @@ protected: virtual void onSelectionChanged(const Gui::SelectionChanges& msg); private: - Ui_TaskFilletParameters* ui; + std::unique_ptr ui; }; /// simulation dialog for the TaskView diff --git a/src/Mod/PartDesign/Gui/TaskHelixParameters.cpp b/src/Mod/PartDesign/Gui/TaskHelixParameters.cpp index 2fa03e580c..ca17897522 100644 --- a/src/Mod/PartDesign/Gui/TaskHelixParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskHelixParameters.cpp @@ -61,7 +61,7 @@ using namespace Gui; /* TRANSLATOR PartDesignGui::TaskHelixParameters */ TaskHelixParameters::TaskHelixParameters(PartDesignGui::ViewProviderHelix *HelixView, QWidget *parent) - : TaskSketchBasedParameters(HelixView, parent, "PartDesign_Additive_Helix",tr("Helix parameters")), + : TaskSketchBasedParameters(HelixView, parent, "PartDesign_Additive_Helix", tr("Helix parameters")), ui (new Ui_TaskHelixParameters) { // we need a separate container widget to add all controls to diff --git a/src/Mod/PartDesign/Gui/TaskHelixParameters.h b/src/Mod/PartDesign/Gui/TaskHelixParameters.h index 442c8376e6..aaa1c7ed7b 100644 --- a/src/Mod/PartDesign/Gui/TaskHelixParameters.h +++ b/src/Mod/PartDesign/Gui/TaskHelixParameters.h @@ -101,7 +101,7 @@ private: private: QWidget* proxy; - Ui_TaskHelixParameters* ui; + std::unique_ptr ui; /** * @brief axesInList is the list of links corresponding to axis combo; must diff --git a/src/Mod/PartDesign/Gui/TaskHoleParameters.cpp b/src/Mod/PartDesign/Gui/TaskHoleParameters.cpp index 6dc77ad8ef..dbd5a866bd 100644 --- a/src/Mod/PartDesign/Gui/TaskHoleParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskHoleParameters.cpp @@ -57,13 +57,13 @@ namespace bp = boost::placeholders; #endif TaskHoleParameters::TaskHoleParameters(ViewProviderHole *HoleView, QWidget *parent) - : TaskSketchBasedParameters(HoleView, parent, "PartDesign_Hole",tr("Hole parameters")) + : TaskSketchBasedParameters(HoleView, parent, "PartDesign_Hole", tr("Hole parameters")) , observer(new Observer(this, static_cast(vp->getObject()))) , isApplying(false) + , ui(new Ui_TaskHoleParameters) { // we need a separate container widget to add all controls to proxy = new QWidget(this); - ui = new Ui_TaskHoleParameters(); ui->setupUi(proxy); QMetaObject::connectSlotsByName(this); @@ -203,7 +203,6 @@ TaskHoleParameters::TaskHoleParameters(ViewProviderHole *HoleView, QWidget *pare TaskHoleParameters::~TaskHoleParameters() { - delete ui; } void TaskHoleParameters::threadedChanged() diff --git a/src/Mod/PartDesign/Gui/TaskHoleParameters.h b/src/Mod/PartDesign/Gui/TaskHoleParameters.h index 2ec266cac8..dc366dc55e 100644 --- a/src/Mod/PartDesign/Gui/TaskHoleParameters.h +++ b/src/Mod/PartDesign/Gui/TaskHoleParameters.h @@ -130,9 +130,9 @@ private: Connection connectPropChanged; std::unique_ptr observer; - QWidget* proxy; - Ui_TaskHoleParameters* ui; bool isApplying; + QWidget* proxy; + std::unique_ptr ui; }; /// simulation dialog for the TaskView diff --git a/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.cpp b/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.cpp index a1fa891a12..2be4b8cdc6 100644 --- a/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.cpp @@ -63,11 +63,11 @@ using namespace Gui; /* TRANSLATOR PartDesignGui::TaskLinearPatternParameters */ TaskLinearPatternParameters::TaskLinearPatternParameters(ViewProviderTransformed *TransformedView,QWidget *parent) - : TaskTransformedParameters(TransformedView, parent) + : TaskTransformedParameters(TransformedView, parent) + , ui(new Ui_TaskLinearPatternParameters) { // we need a separate container widget to add all controls to proxy = new QWidget(this); - ui = new Ui_TaskLinearPatternParameters(); ui->setupUi(proxy); QMetaObject::connectSlotsByName(this); @@ -83,10 +83,9 @@ TaskLinearPatternParameters::TaskLinearPatternParameters(ViewProviderTransformed } TaskLinearPatternParameters::TaskLinearPatternParameters(TaskMultiTransformParameters *parentTask, QLayout *layout) - : TaskTransformedParameters(parentTask) + : TaskTransformedParameters(parentTask), ui(new Ui_TaskLinearPatternParameters) { proxy = new QWidget(parentTask); - ui = new Ui_TaskLinearPatternParameters(); ui->setupUi(proxy); connect(ui->buttonOK, SIGNAL(pressed()), parentTask, SLOT(onSubTaskButtonOK())); @@ -415,7 +414,6 @@ TaskLinearPatternParameters::~TaskLinearPatternParameters() Base::Console().Error ("%s\n", ex.what () ); } - delete ui; if (proxy) delete proxy; } diff --git a/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.h b/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.h index b492c965cd..d48dbeb67a 100644 --- a/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.h +++ b/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.h @@ -85,7 +85,7 @@ private: void kickUpdateViewTimer() const; private: - Ui_TaskLinearPatternParameters* ui; + std::unique_ptr ui; QTimer* updateViewTimer; ComboLinks dirLinks; diff --git a/src/Mod/PartDesign/Gui/TaskLoftParameters.cpp b/src/Mod/PartDesign/Gui/TaskLoftParameters.cpp index 2106604e87..33040229c1 100644 --- a/src/Mod/PartDesign/Gui/TaskLoftParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskLoftParameters.cpp @@ -56,11 +56,11 @@ using namespace Gui; /* TRANSLATOR PartDesignGui::TaskLoftParameters */ TaskLoftParameters::TaskLoftParameters(ViewProviderLoft *LoftView,bool /*newObj*/, QWidget *parent) - : TaskSketchBasedParameters(LoftView, parent, "PartDesign_Additive_Loft",tr("Loft parameters")) + : TaskSketchBasedParameters(LoftView, parent, "PartDesign_Additive_Loft", tr("Loft parameters")) + , ui(new Ui_TaskLoftParameters) { // we need a separate container widget to add all controls to proxy = new QWidget(this); - ui = new Ui_TaskLoftParameters(); ui->setupUi(proxy); QMetaObject::connectSlotsByName(this); @@ -134,7 +134,6 @@ TaskLoftParameters::TaskLoftParameters(ViewProviderLoft *LoftView,bool /*newObj* TaskLoftParameters::~TaskLoftParameters() { - delete ui; } void TaskLoftParameters::updateUI(int index) diff --git a/src/Mod/PartDesign/Gui/TaskLoftParameters.h b/src/Mod/PartDesign/Gui/TaskLoftParameters.h index 4e5d276c49..b99a771edf 100644 --- a/src/Mod/PartDesign/Gui/TaskLoftParameters.h +++ b/src/Mod/PartDesign/Gui/TaskLoftParameters.h @@ -75,7 +75,7 @@ private: private: QWidget* proxy; - Ui_TaskLoftParameters* ui; + std::unique_ptr ui; enum selectionModes { none, refAdd, refRemove, refProfile }; selectionModes selectionMode = none; diff --git a/src/Mod/PartDesign/Gui/TaskMirroredParameters.cpp b/src/Mod/PartDesign/Gui/TaskMirroredParameters.cpp index 74533f9efa..4f1bfce4ef 100644 --- a/src/Mod/PartDesign/Gui/TaskMirroredParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskMirroredParameters.cpp @@ -60,11 +60,11 @@ using namespace Gui; /* TRANSLATOR PartDesignGui::TaskMirroredParameters */ TaskMirroredParameters::TaskMirroredParameters(ViewProviderTransformed *TransformedView, QWidget *parent) - : TaskTransformedParameters(TransformedView, parent) + : TaskTransformedParameters(TransformedView, parent) + , ui(new Ui_TaskMirroredParameters) { // we need a separate container widget to add all controls to proxy = new QWidget(this); - ui = new Ui_TaskMirroredParameters(); ui->setupUi(proxy); QMetaObject::connectSlotsByName(this); @@ -80,10 +80,9 @@ TaskMirroredParameters::TaskMirroredParameters(ViewProviderTransformed *Transfor } TaskMirroredParameters::TaskMirroredParameters(TaskMultiTransformParameters *parentTask, QLayout *layout) - : TaskTransformedParameters(parentTask) + : TaskTransformedParameters(parentTask), ui(new Ui_TaskMirroredParameters) { proxy = new QWidget(parentTask); - ui = new Ui_TaskMirroredParameters(); ui->setupUi(proxy); connect(ui->buttonOK, SIGNAL(pressed()), parentTask, SLOT(onSubTaskButtonOK())); @@ -318,7 +317,6 @@ TaskMirroredParameters::~TaskMirroredParameters() Base::Console().Error ("%s\n", ex.what () ); } - delete ui; if (proxy) delete proxy; } diff --git a/src/Mod/PartDesign/Gui/TaskMirroredParameters.h b/src/Mod/PartDesign/Gui/TaskMirroredParameters.h index 906c0d4516..297b572391 100644 --- a/src/Mod/PartDesign/Gui/TaskMirroredParameters.h +++ b/src/Mod/PartDesign/Gui/TaskMirroredParameters.h @@ -79,7 +79,7 @@ private: ComboLinks planeLinks; private: - Ui_TaskMirroredParameters* ui; + std::unique_ptr ui; }; diff --git a/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.cpp b/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.cpp index 48ff9329f9..a5f4616615 100644 --- a/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.cpp @@ -61,11 +61,13 @@ using namespace Gui; /* TRANSLATOR PartDesignGui::TaskMultiTransformParameters */ TaskMultiTransformParameters::TaskMultiTransformParameters(ViewProviderTransformed *TransformedView,QWidget *parent) - : TaskTransformedParameters(TransformedView, parent), subTask(nullptr), subFeature(nullptr) + : TaskTransformedParameters(TransformedView, parent) + , ui(new Ui_TaskMultiTransformParameters) + , subTask(nullptr) + , subFeature(nullptr) { // we need a separate container widget to add all controls to proxy = new QWidget(this); - ui = new Ui_TaskMultiTransformParameters(); ui->setupUi(proxy); QMetaObject::connectSlotsByName(this); this->groupLayout()->addWidget(proxy); @@ -484,7 +486,6 @@ void TaskMultiTransformParameters::apply() TaskMultiTransformParameters::~TaskMultiTransformParameters() { closeSubTask(); - delete ui; if (proxy) delete proxy; } diff --git a/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.h b/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.h index f309247fb1..57188b73d6 100644 --- a/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.h +++ b/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.h @@ -100,7 +100,7 @@ private: void finishAdd(std::string &newFeatName); private: - Ui_TaskMultiTransformParameters* ui; + std::unique_ptr ui; /// The subTask and subFeature currently active in the UI TaskTransformedParameters* subTask; PartDesign::Transformed* subFeature; diff --git a/src/Mod/PartDesign/Gui/TaskPadParameters.cpp b/src/Mod/PartDesign/Gui/TaskPadParameters.cpp index 539c33fc85..2604b60aad 100644 --- a/src/Mod/PartDesign/Gui/TaskPadParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskPadParameters.cpp @@ -54,11 +54,11 @@ using namespace Gui; /* TRANSLATOR PartDesignGui::TaskPadParameters */ TaskPadParameters::TaskPadParameters(ViewProviderPad *PadView, QWidget *parent, bool newObj) - : TaskSketchBasedParameters(PadView, parent, "PartDesign_Pad",tr("Pad parameters")) + : TaskSketchBasedParameters(PadView, parent, "PartDesign_Pad", tr("Pad parameters")) + , ui(new Ui_TaskPadParameters) { // we need a separate container widget to add all controls to proxy = new QWidget(this); - ui = new Ui_TaskPadParameters(); ui->setupUi(proxy); #if QT_VERSION >= 0x040700 ui->lineFaceName->setPlaceholderText(tr("No face selected")); @@ -487,7 +487,6 @@ QString TaskPadParameters::getFaceName(void) const TaskPadParameters::~TaskPadParameters() { - delete ui; } void TaskPadParameters::changeEvent(QEvent *e) diff --git a/src/Mod/PartDesign/Gui/TaskPadParameters.h b/src/Mod/PartDesign/Gui/TaskPadParameters.h index 6a0f64f796..17172344ed 100644 --- a/src/Mod/PartDesign/Gui/TaskPadParameters.h +++ b/src/Mod/PartDesign/Gui/TaskPadParameters.h @@ -90,7 +90,7 @@ private: private: QWidget* proxy; - Ui_TaskPadParameters* ui; + std::unique_ptr ui; }; /// simulation dialog for the TaskView diff --git a/src/Mod/PartDesign/Gui/TaskPipeParameters.cpp b/src/Mod/PartDesign/Gui/TaskPipeParameters.cpp index 62312c1d95..bfea0fd500 100644 --- a/src/Mod/PartDesign/Gui/TaskPipeParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskPipeParameters.cpp @@ -72,11 +72,11 @@ using namespace Gui; //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ TaskPipeParameters::TaskPipeParameters(ViewProviderPipe *PipeView, bool /*newObj*/, QWidget *parent) - : TaskSketchBasedParameters(PipeView, parent, "PartDesign_Additive_Pipe",tr("Pipe parameters")) + : TaskSketchBasedParameters(PipeView, parent, "PartDesign_Additive_Pipe", tr("Pipe parameters")) + , ui(new Ui_TaskPipeParameters) { // we need a separate container widget to add all controls to proxy = new QWidget(this); - ui = new Ui_TaskPipeParameters(); ui->setupUi(proxy); QMetaObject::connectSlotsByName(this); @@ -163,8 +163,6 @@ TaskPipeParameters::~TaskPipeParameters() // getDocument() may raise an exception e.ReportException(); } - - delete ui; } void TaskPipeParameters::updateUI() @@ -441,11 +439,11 @@ void TaskPipeParameters::exitSelectionMode() { //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ TaskPipeOrientation::TaskPipeOrientation(ViewProviderPipe* PipeView, bool /*newObj*/, QWidget* parent) - : TaskSketchBasedParameters(PipeView, parent, "PartDesign_Additive_Pipe", tr("Section orientation")) { - + : TaskSketchBasedParameters(PipeView, parent, "PartDesign_Additive_Pipe", tr("Section orientation")), + ui(new Ui_TaskPipeOrientation) +{ // we need a separate container widget to add all controls to proxy = new QWidget(this); - ui = new Ui_TaskPipeOrientation(); ui->setupUi(proxy); QMetaObject::connectSlotsByName(this); @@ -768,11 +766,11 @@ void TaskPipeOrientation::updateUI(int idx) { // Task Scaling //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ TaskPipeScaling::TaskPipeScaling(ViewProviderPipe* PipeView, bool /*newObj*/, QWidget* parent) - : TaskSketchBasedParameters(PipeView, parent, "PartDesign_Additive_Pipe", tr("Section transformation")) + : TaskSketchBasedParameters(PipeView, parent, "PartDesign_Additive_Pipe", tr("Section transformation")), + ui(new Ui_TaskPipeScaling) { // we need a separate container widget to add all controls to proxy = new QWidget(this); - ui = new Ui_TaskPipeScaling(); ui->setupUi(proxy); QMetaObject::connectSlotsByName(this); diff --git a/src/Mod/PartDesign/Gui/TaskPipeParameters.h b/src/Mod/PartDesign/Gui/TaskPipeParameters.h index cd4ad127b2..5d1f95b0ed 100644 --- a/src/Mod/PartDesign/Gui/TaskPipeParameters.h +++ b/src/Mod/PartDesign/Gui/TaskPipeParameters.h @@ -84,7 +84,7 @@ private: private: QWidget* proxy; - Ui_TaskPipeParameters* ui; + std::unique_ptr ui; }; class TaskPipeOrientation : public TaskSketchBasedParameters @@ -123,7 +123,7 @@ private: private: QWidget* proxy; - Ui_TaskPipeOrientation* ui; + std::unique_ptr ui; }; @@ -157,7 +157,7 @@ private: private: QWidget* proxy; - Ui_TaskPipeScaling* ui; + std::unique_ptr ui; }; diff --git a/src/Mod/PartDesign/Gui/TaskPocketParameters.cpp b/src/Mod/PartDesign/Gui/TaskPocketParameters.cpp index a163f4c048..6f491c5d15 100644 --- a/src/Mod/PartDesign/Gui/TaskPocketParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskPocketParameters.cpp @@ -53,12 +53,12 @@ using namespace Gui; /* TRANSLATOR PartDesignGui::TaskPocketParameters */ TaskPocketParameters::TaskPocketParameters(ViewProviderPocket *PocketView,QWidget *parent, bool newObj) - : TaskSketchBasedParameters(PocketView, parent, "PartDesign_Pocket",tr("Pocket parameters")) + : TaskSketchBasedParameters(PocketView, parent, "PartDesign_Pocket", tr("Pocket parameters")) + , ui(new Ui_TaskPocketParameters) , oldLength(0) { // we need a separate container widget to add all controls to proxy = new QWidget(this); - ui = new Ui_TaskPocketParameters(); ui->setupUi(proxy); #if QT_VERSION >= 0x040700 ui->lineFaceName->setPlaceholderText(tr("No face selected")); @@ -422,7 +422,6 @@ QString TaskPocketParameters::getFaceName(void) const TaskPocketParameters::~TaskPocketParameters() { - delete ui; } void TaskPocketParameters::changeEvent(QEvent *e) diff --git a/src/Mod/PartDesign/Gui/TaskPocketParameters.h b/src/Mod/PartDesign/Gui/TaskPocketParameters.h index 1925b5b69f..397b545d16 100644 --- a/src/Mod/PartDesign/Gui/TaskPocketParameters.h +++ b/src/Mod/PartDesign/Gui/TaskPocketParameters.h @@ -82,7 +82,7 @@ private: private: QWidget* proxy; - Ui_TaskPocketParameters* ui; + std::unique_ptr ui; double oldLength; }; diff --git a/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.cpp b/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.cpp index 1812549652..2e4272d389 100644 --- a/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.cpp @@ -61,11 +61,11 @@ using namespace Gui; /* TRANSLATOR PartDesignGui::TaskPolarPatternParameters */ TaskPolarPatternParameters::TaskPolarPatternParameters(ViewProviderTransformed *TransformedView,QWidget *parent) - : TaskTransformedParameters(TransformedView, parent) + : TaskTransformedParameters(TransformedView, parent) + , ui(new Ui_TaskPolarPatternParameters) { // we need a separate container widget to add all controls to proxy = new QWidget(this); - ui = new Ui_TaskPolarPatternParameters(); ui->setupUi(proxy); QMetaObject::connectSlotsByName(this); @@ -81,10 +81,9 @@ TaskPolarPatternParameters::TaskPolarPatternParameters(ViewProviderTransformed * } TaskPolarPatternParameters::TaskPolarPatternParameters(TaskMultiTransformParameters *parentTask, QLayout *layout) - : TaskTransformedParameters(parentTask) + : TaskTransformedParameters(parentTask), ui(new Ui_TaskPolarPatternParameters) { proxy = new QWidget(parentTask); - ui = new Ui_TaskPolarPatternParameters(); ui->setupUi(proxy); connect(ui->buttonOK, SIGNAL(pressed()), parentTask, SLOT(onSubTaskButtonOK())); @@ -406,7 +405,6 @@ TaskPolarPatternParameters::~TaskPolarPatternParameters() Base::Console().Error ("%s\n", ex.what () ); } - delete ui; if (proxy) delete proxy; } diff --git a/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.h b/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.h index 3cbb777a7b..d9864cee4a 100644 --- a/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.h +++ b/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.h @@ -87,7 +87,7 @@ private: void kickUpdateViewTimer() const; private: - Ui_TaskPolarPatternParameters* ui; + std::unique_ptr ui; QTimer* updateViewTimer; ComboLinks axesLinks; diff --git a/src/Mod/PartDesign/Gui/TaskRevolutionParameters.cpp b/src/Mod/PartDesign/Gui/TaskRevolutionParameters.cpp index bc1326b71b..7da3ea44a4 100644 --- a/src/Mod/PartDesign/Gui/TaskRevolutionParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskRevolutionParameters.cpp @@ -58,11 +58,11 @@ using namespace Gui; /* TRANSLATOR PartDesignGui::TaskRevolutionParameters */ TaskRevolutionParameters::TaskRevolutionParameters(PartDesignGui::ViewProvider* RevolutionView, QWidget *parent) - : TaskSketchBasedParameters(RevolutionView, parent, "PartDesign_Revolution",tr("Revolution parameters")) + : TaskSketchBasedParameters(RevolutionView, parent, "PartDesign_Revolution", tr("Revolution parameters")) + , ui(new Ui_TaskRevolutionParameters) { // we need a separate container widget to add all controls to proxy = new QWidget(this); - ui = new Ui_TaskRevolutionParameters(); ui->setupUi(proxy); QMetaObject::connectSlotsByName(this); @@ -379,8 +379,6 @@ TaskRevolutionParameters::~TaskRevolutionParameters() ex.ReportException(); } - delete ui; - for (size_t i = 0; i < axesInList.size(); i++) { delete axesInList[i]; } diff --git a/src/Mod/PartDesign/Gui/TaskRevolutionParameters.h b/src/Mod/PartDesign/Gui/TaskRevolutionParameters.h index bc810e4d34..1f28cf8657 100644 --- a/src/Mod/PartDesign/Gui/TaskRevolutionParameters.h +++ b/src/Mod/PartDesign/Gui/TaskRevolutionParameters.h @@ -92,7 +92,7 @@ private: private: QWidget* proxy; - Ui_TaskRevolutionParameters* ui; + std::unique_ptr ui; /** * @brief axesInList is the list of links corresponding to axis combo; must diff --git a/src/Mod/PartDesign/Gui/TaskScaledParameters.cpp b/src/Mod/PartDesign/Gui/TaskScaledParameters.cpp index 3bd6bb84c4..dcf82058b8 100644 --- a/src/Mod/PartDesign/Gui/TaskScaledParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskScaledParameters.cpp @@ -51,11 +51,11 @@ using namespace Gui; /* TRANSLATOR PartDesignGui::TaskScaledParameters */ TaskScaledParameters::TaskScaledParameters(ViewProviderTransformed *TransformedView,QWidget *parent) - : TaskTransformedParameters(TransformedView, parent) + : TaskTransformedParameters(TransformedView, parent) + , ui(new Ui_TaskScaledParameters) { // we need a separate container widget to add all controls to proxy = new QWidget(this); - ui = new Ui_TaskScaledParameters(); ui->setupUi(proxy); QMetaObject::connectSlotsByName(this); @@ -69,10 +69,9 @@ TaskScaledParameters::TaskScaledParameters(ViewProviderTransformed *TransformedV } TaskScaledParameters::TaskScaledParameters(TaskMultiTransformParameters *parentTask, QLayout *layout) - : TaskTransformedParameters(parentTask) + : TaskTransformedParameters(parentTask), ui(new Ui_TaskScaledParameters) { proxy = new QWidget(parentTask); - ui = new Ui_TaskScaledParameters(); ui->setupUi(proxy); connect(ui->buttonOK, SIGNAL(pressed()), parentTask, SLOT(onSubTaskButtonOK())); @@ -242,7 +241,6 @@ unsigned TaskScaledParameters::getOccurrences(void) const TaskScaledParameters::~TaskScaledParameters() { - delete ui; if (proxy) delete proxy; } diff --git a/src/Mod/PartDesign/Gui/TaskScaledParameters.h b/src/Mod/PartDesign/Gui/TaskScaledParameters.h index 2e21501503..7fc844ff18 100644 --- a/src/Mod/PartDesign/Gui/TaskScaledParameters.h +++ b/src/Mod/PartDesign/Gui/TaskScaledParameters.h @@ -76,7 +76,7 @@ private: void updateUI(); private: - Ui_TaskScaledParameters* ui; + std::unique_ptr ui; }; diff --git a/src/Mod/PartDesign/Gui/TaskShapeBinder.cpp b/src/Mod/PartDesign/Gui/TaskShapeBinder.cpp index 7a556afd29..ff869fdba5 100644 --- a/src/Mod/PartDesign/Gui/TaskShapeBinder.cpp +++ b/src/Mod/PartDesign/Gui/TaskShapeBinder.cpp @@ -60,10 +60,10 @@ TaskShapeBinder::TaskShapeBinder(ViewProviderShapeBinder *view, bool /*newObj*/, : Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("PartDesign_ShapeBinder"), tr("Datum shape parameters"), true, parent) , SelectionObserver(view) + , ui(new Ui_TaskShapeBinder) { // we need a separate container widget to add all controls to proxy = new QWidget(this); - ui = new Ui_TaskShapeBinder(); ui->setupUi(proxy); QMetaObject::connectSlotsByName(this); @@ -159,7 +159,6 @@ TaskShapeBinder::~TaskShapeBinder() } static_cast(vp)->highlightReferences(false, false); */ - delete ui; } void TaskShapeBinder::changeEvent(QEvent *) diff --git a/src/Mod/PartDesign/Gui/TaskShapeBinder.h b/src/Mod/PartDesign/Gui/TaskShapeBinder.h index a886961759..fdf1364a0d 100644 --- a/src/Mod/PartDesign/Gui/TaskShapeBinder.h +++ b/src/Mod/PartDesign/Gui/TaskShapeBinder.h @@ -76,7 +76,7 @@ private: private: QWidget* proxy; - Ui_TaskShapeBinder* ui; + std::unique_ptr ui; ViewProviderShapeBinder* vp; }; diff --git a/src/Mod/PartDesign/Gui/TaskThicknessParameters.cpp b/src/Mod/PartDesign/Gui/TaskThicknessParameters.cpp index f752dc91e5..44b3424da4 100644 --- a/src/Mod/PartDesign/Gui/TaskThicknessParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskThicknessParameters.cpp @@ -54,10 +54,10 @@ using namespace Gui; TaskThicknessParameters::TaskThicknessParameters(ViewProviderDressUp *DressUpView, QWidget *parent) : TaskDressUpParameters(DressUpView, false, true, parent) + , ui(new Ui_TaskThicknessParameters) { // we need a separate container widget to add all controls to proxy = new QWidget(this); - ui = new Ui_TaskThicknessParameters(); ui->setupUi(proxy); this->groupLayout()->addWidget(proxy); @@ -290,8 +290,6 @@ TaskThicknessParameters::~TaskThicknessParameters() { Gui::Selection().clearSelection(); Gui::Selection().rmvSelectionGate(); - - delete ui; } bool TaskThicknessParameters::event(QEvent *e) diff --git a/src/Mod/PartDesign/Gui/TaskThicknessParameters.h b/src/Mod/PartDesign/Gui/TaskThicknessParameters.h index bf5aed26e7..d2ad5490ba 100644 --- a/src/Mod/PartDesign/Gui/TaskThicknessParameters.h +++ b/src/Mod/PartDesign/Gui/TaskThicknessParameters.h @@ -60,7 +60,7 @@ protected: virtual void onSelectionChanged(const Gui::SelectionChanges& msg); private: - Ui_TaskThicknessParameters* ui; + std::unique_ptr ui; }; /// simulation dialog for the TaskView diff --git a/src/Mod/PartDesign/Gui/TaskTransformedMessages.cpp b/src/Mod/PartDesign/Gui/TaskTransformedMessages.cpp index 5d3290d78d..0674829203 100644 --- a/src/Mod/PartDesign/Gui/TaskTransformedMessages.cpp +++ b/src/Mod/PartDesign/Gui/TaskTransformedMessages.cpp @@ -40,12 +40,12 @@ using namespace Gui::TaskView; namespace bp = boost::placeholders; TaskTransformedMessages::TaskTransformedMessages(ViewProviderTransformed *transformedView_) - : TaskBox(Gui::BitmapFactory().pixmap("document-new"),tr("Transformed feature messages"),true, 0), - transformedView(transformedView_) + : TaskBox(Gui::BitmapFactory().pixmap("document-new"), tr("Transformed feature messages"), true, 0) + , transformedView(transformedView_) + , ui(new Ui_TaskTransformedMessages) { // we need a separate container widget to add all controls to proxy = new QWidget(this); - ui = new Ui_TaskTransformedMessages(); ui->setupUi(proxy); // set a minimum height to avoid a sudden resize and to // lose focus of the currently used spin boxes @@ -61,7 +61,6 @@ TaskTransformedMessages::TaskTransformedMessages(ViewProviderTransformed *transf TaskTransformedMessages::~TaskTransformedMessages() { connectionDiagnosis.disconnect(); - delete ui; } void TaskTransformedMessages::slotDiagnosis(QString msg) diff --git a/src/Mod/PartDesign/Gui/TaskTransformedMessages.h b/src/Mod/PartDesign/Gui/TaskTransformedMessages.h index ad1b349488..3445dfdd06 100644 --- a/src/Mod/PartDesign/Gui/TaskTransformedMessages.h +++ b/src/Mod/PartDesign/Gui/TaskTransformedMessages.h @@ -56,7 +56,7 @@ protected: private: QWidget* proxy; - Ui_TaskTransformedMessages* ui; + std::unique_ptr ui; }; } //namespace PartDesignGui diff --git a/src/Mod/PartDesign/Gui/TaskTransformedParameters.cpp b/src/Mod/PartDesign/Gui/TaskTransformedParameters.cpp index 7c43fe671d..fa5b10a5cf 100644 --- a/src/Mod/PartDesign/Gui/TaskTransformedParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskTransformedParameters.cpp @@ -65,14 +65,12 @@ using namespace Gui; TaskTransformedParameters::TaskTransformedParameters(ViewProviderTransformed *TransformedView, QWidget *parent) : TaskBox(Gui::BitmapFactory().pixmap((std::string("PartDesign_") + TransformedView->featureName).c_str()), - QString::fromLatin1((TransformedView->featureName + " parameters").c_str()), - true, - parent), - proxy(nullptr), - TransformedView(TransformedView), - parentTask(nullptr), - insideMultiTransform(false), - blockUpdate(false) + QString::fromLatin1((TransformedView->featureName + " parameters").c_str()), true, parent) + , proxy(nullptr) + , TransformedView(TransformedView) + , parentTask(nullptr) + , insideMultiTransform(false) + , blockUpdate(false) { selectionMode = none;