From b5f57ed2f00828af89166b5a559409bf21de0fa1 Mon Sep 17 00:00:00 2001 From: donovaly Date: Tue, 19 Jan 2021 03:37:09 +0100 Subject: [PATCH] [TD] make pointers to the UI std::unique_ptr 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 TD dialogs that don't already use a unique_ptr. --- src/Mod/TechDraw/Gui/TaskActiveView.cpp | 1 - src/Mod/TechDraw/Gui/TaskActiveView.h | 2 +- src/Mod/TechDraw/Gui/TaskBalloon.cpp | 1 - src/Mod/TechDraw/Gui/TaskBalloon.h | 2 +- src/Mod/TechDraw/Gui/TaskCenterLine.cpp | 1 - src/Mod/TechDraw/Gui/TaskCenterLine.h | 2 +- src/Mod/TechDraw/Gui/TaskCosVertex.cpp | 1 - src/Mod/TechDraw/Gui/TaskCosVertex.h | 2 +- src/Mod/TechDraw/Gui/TaskCosmeticLine.cpp | 1 - src/Mod/TechDraw/Gui/TaskCosmeticLine.h | 2 +- src/Mod/TechDraw/Gui/TaskDetail.cpp | 1 - src/Mod/TechDraw/Gui/TaskDetail.h | 2 +- src/Mod/TechDraw/Gui/TaskGeomHatch.cpp | 1 - src/Mod/TechDraw/Gui/TaskGeomHatch.h | 2 +- src/Mod/TechDraw/Gui/TaskHatch.cpp | 1 - src/Mod/TechDraw/Gui/TaskHatch.h | 2 +- src/Mod/TechDraw/Gui/TaskLeaderLine.cpp | 1 - src/Mod/TechDraw/Gui/TaskLeaderLine.h | 2 +- src/Mod/TechDraw/Gui/TaskLineDecor.cpp | 1 - src/Mod/TechDraw/Gui/TaskLineDecor.h | 2 +- src/Mod/TechDraw/Gui/TaskLinkDim.cpp | 1 - src/Mod/TechDraw/Gui/TaskLinkDim.h | 2 +- src/Mod/TechDraw/Gui/TaskProjGroup.cpp | 1 - src/Mod/TechDraw/Gui/TaskProjGroup.h | 2 +- src/Mod/TechDraw/Gui/TaskRichAnno.cpp | 1 - src/Mod/TechDraw/Gui/TaskRichAnno.h | 2 +- src/Mod/TechDraw/Gui/TaskSectionView.cpp | 1 - src/Mod/TechDraw/Gui/TaskSectionView.h | 2 +- src/Mod/TechDraw/Gui/TaskWeldingSymbol.cpp | 1 - src/Mod/TechDraw/Gui/TaskWeldingSymbol.h | 2 +- 30 files changed, 15 insertions(+), 30 deletions(-) diff --git a/src/Mod/TechDraw/Gui/TaskActiveView.cpp b/src/Mod/TechDraw/Gui/TaskActiveView.cpp index d871bd8240..ecffa22108 100644 --- a/src/Mod/TechDraw/Gui/TaskActiveView.cpp +++ b/src/Mod/TechDraw/Gui/TaskActiveView.cpp @@ -89,7 +89,6 @@ TaskActiveView::TaskActiveView(TechDraw::DrawPage* pageFeat) : TaskActiveView::~TaskActiveView() { - delete ui; } void TaskActiveView::updateTask() diff --git a/src/Mod/TechDraw/Gui/TaskActiveView.h b/src/Mod/TechDraw/Gui/TaskActiveView.h index c6391f1d8b..550d842d70 100644 --- a/src/Mod/TechDraw/Gui/TaskActiveView.h +++ b/src/Mod/TechDraw/Gui/TaskActiveView.h @@ -80,7 +80,7 @@ protected: TechDraw::DrawViewSymbol* createActiveView(void); private: - Ui_TaskActiveView* ui; + std::unique_ptr ui; TechDraw::DrawPage* m_pageFeat; TechDraw::DrawViewSymbol* m_symbolFeat; diff --git a/src/Mod/TechDraw/Gui/TaskBalloon.cpp b/src/Mod/TechDraw/Gui/TaskBalloon.cpp index 1077466951..3f0c26667a 100644 --- a/src/Mod/TechDraw/Gui/TaskBalloon.cpp +++ b/src/Mod/TechDraw/Gui/TaskBalloon.cpp @@ -111,7 +111,6 @@ TaskBalloon::TaskBalloon(QGIViewBalloon *parent, ViewProviderBalloon *balloonVP) TaskBalloon::~TaskBalloon() { - delete ui; } bool TaskBalloon::accept() diff --git a/src/Mod/TechDraw/Gui/TaskBalloon.h b/src/Mod/TechDraw/Gui/TaskBalloon.h index 6a3b01567d..7d31713e76 100644 --- a/src/Mod/TechDraw/Gui/TaskBalloon.h +++ b/src/Mod/TechDraw/Gui/TaskBalloon.h @@ -63,7 +63,7 @@ private Q_SLOTS: void onKinkLengthChanged(); private: - Ui_TaskBalloon *ui; + std::unique_ptr ui; QGIViewBalloon *m_parent; ViewProviderBalloon* m_balloonVP; }; diff --git a/src/Mod/TechDraw/Gui/TaskCenterLine.cpp b/src/Mod/TechDraw/Gui/TaskCenterLine.cpp index 2906108dc2..ab959eecbb 100644 --- a/src/Mod/TechDraw/Gui/TaskCenterLine.cpp +++ b/src/Mod/TechDraw/Gui/TaskCenterLine.cpp @@ -156,7 +156,6 @@ TaskCenterLine::TaskCenterLine(TechDraw::DrawViewPart* partFeat, TaskCenterLine::~TaskCenterLine() { - delete ui; } void TaskCenterLine::updateTask() diff --git a/src/Mod/TechDraw/Gui/TaskCenterLine.h b/src/Mod/TechDraw/Gui/TaskCenterLine.h index 43f6fdb0dc..668a8afac6 100644 --- a/src/Mod/TechDraw/Gui/TaskCenterLine.h +++ b/src/Mod/TechDraw/Gui/TaskCenterLine.h @@ -130,7 +130,7 @@ private Q_SLOTS: void onFlipChanged(); private: - Ui_TaskCenterLine * ui; + std::unique_ptr ui; TechDraw::DrawViewPart* m_partFeat; TechDraw::DrawPage* m_basePage; diff --git a/src/Mod/TechDraw/Gui/TaskCosVertex.cpp b/src/Mod/TechDraw/Gui/TaskCosVertex.cpp index ad40355311..bc2eaec6fe 100644 --- a/src/Mod/TechDraw/Gui/TaskCosVertex.cpp +++ b/src/Mod/TechDraw/Gui/TaskCosVertex.cpp @@ -115,7 +115,6 @@ TaskCosVertex::TaskCosVertex(TechDraw::DrawViewPart* baseFeat, TaskCosVertex::~TaskCosVertex() { - delete ui; } void TaskCosVertex::updateTask() diff --git a/src/Mod/TechDraw/Gui/TaskCosVertex.h b/src/Mod/TechDraw/Gui/TaskCosVertex.h index d045bd596f..42d2da85d0 100644 --- a/src/Mod/TechDraw/Gui/TaskCosVertex.h +++ b/src/Mod/TechDraw/Gui/TaskCosVertex.h @@ -100,7 +100,7 @@ protected: QGIView* findParentQGIV(); private: - Ui_TaskCosVertex * ui; + std::unique_ptr ui; bool blockUpdate; QGTracker* m_tracker; diff --git a/src/Mod/TechDraw/Gui/TaskCosmeticLine.cpp b/src/Mod/TechDraw/Gui/TaskCosmeticLine.cpp index b9dceb9bda..b439ab4972 100644 --- a/src/Mod/TechDraw/Gui/TaskCosmeticLine.cpp +++ b/src/Mod/TechDraw/Gui/TaskCosmeticLine.cpp @@ -126,7 +126,6 @@ TaskCosmeticLine::TaskCosmeticLine(TechDraw::DrawViewPart* partFeat, TaskCosmeticLine::~TaskCosmeticLine() { - delete ui; if (m_saveCE != nullptr) { delete m_saveCE; } diff --git a/src/Mod/TechDraw/Gui/TaskCosmeticLine.h b/src/Mod/TechDraw/Gui/TaskCosmeticLine.h index 90e1d4fb3d..76dd6d6d18 100644 --- a/src/Mod/TechDraw/Gui/TaskCosmeticLine.h +++ b/src/Mod/TechDraw/Gui/TaskCosmeticLine.h @@ -91,7 +91,7 @@ protected: void updateCosmeticLine(void); private: - Ui_TaskCosmeticLine * ui; + std::unique_ptr ui; TechDraw::DrawViewPart* m_partFeat; diff --git a/src/Mod/TechDraw/Gui/TaskDetail.cpp b/src/Mod/TechDraw/Gui/TaskDetail.cpp index 95e18826d9..361705c1e1 100644 --- a/src/Mod/TechDraw/Gui/TaskDetail.cpp +++ b/src/Mod/TechDraw/Gui/TaskDetail.cpp @@ -238,7 +238,6 @@ TaskDetail::TaskDetail(TechDraw::DrawViewDetail* detailFeat): TaskDetail::~TaskDetail() { m_ghost->deleteLater(); //this might not exist if scene is destroyed before TaskDetail is deleted? - delete ui; } void TaskDetail::updateTask() diff --git a/src/Mod/TechDraw/Gui/TaskDetail.h b/src/Mod/TechDraw/Gui/TaskDetail.h index 8a7f208a5e..310ab8e021 100644 --- a/src/Mod/TechDraw/Gui/TaskDetail.h +++ b/src/Mod/TechDraw/Gui/TaskDetail.h @@ -110,7 +110,7 @@ protected: TechDraw::DrawViewDetail* getDetailFeat(); private: - Ui_TaskDetail * ui; + std::unique_ptr ui; bool blockUpdate; QGIGhostHighlight* m_ghost; diff --git a/src/Mod/TechDraw/Gui/TaskGeomHatch.cpp b/src/Mod/TechDraw/Gui/TaskGeomHatch.cpp index def79cfdd2..6eb851bfbf 100644 --- a/src/Mod/TechDraw/Gui/TaskGeomHatch.cpp +++ b/src/Mod/TechDraw/Gui/TaskGeomHatch.cpp @@ -68,7 +68,6 @@ TaskGeomHatch::TaskGeomHatch(TechDraw::DrawGeomHatch* inHatch,TechDrawGui::ViewP TaskGeomHatch::~TaskGeomHatch() { - delete ui; } diff --git a/src/Mod/TechDraw/Gui/TaskGeomHatch.h b/src/Mod/TechDraw/Gui/TaskGeomHatch.h index 6c2b135fe9..de19c84137 100644 --- a/src/Mod/TechDraw/Gui/TaskGeomHatch.h +++ b/src/Mod/TechDraw/Gui/TaskGeomHatch.h @@ -76,7 +76,7 @@ private Q_SLOTS: void onColorChanged(); private: - Ui_TaskGeomHatch * ui; + std::unique_ptr ui; TechDraw::DrawGeomHatch* m_hatch; TechDrawGui::ViewProviderGeomHatch* m_Vp; App::DocumentObject* m_source; diff --git a/src/Mod/TechDraw/Gui/TaskHatch.cpp b/src/Mod/TechDraw/Gui/TaskHatch.cpp index 532feb9c2f..6286b3f8e1 100644 --- a/src/Mod/TechDraw/Gui/TaskHatch.cpp +++ b/src/Mod/TechDraw/Gui/TaskHatch.cpp @@ -68,7 +68,6 @@ TaskHatch::TaskHatch(TechDraw::DrawHatch* inHatch, TechDrawGui::ViewProviderHatc TaskHatch::~TaskHatch() { - delete ui; } void TaskHatch::initUi() diff --git a/src/Mod/TechDraw/Gui/TaskHatch.h b/src/Mod/TechDraw/Gui/TaskHatch.h index e541f0ff9c..4a21ad2260 100644 --- a/src/Mod/TechDraw/Gui/TaskHatch.h +++ b/src/Mod/TechDraw/Gui/TaskHatch.h @@ -73,7 +73,7 @@ private Q_SLOTS: void onColorChanged(); private: - Ui_TaskHatch * ui; + std::unique_ptr ui; TechDraw::DrawHatch* m_hatch; TechDrawGui::ViewProviderHatch* m_Vp; App::DocumentObject* m_source; diff --git a/src/Mod/TechDraw/Gui/TaskLeaderLine.cpp b/src/Mod/TechDraw/Gui/TaskLeaderLine.cpp index b44943ab08..9c79ba7c79 100644 --- a/src/Mod/TechDraw/Gui/TaskLeaderLine.cpp +++ b/src/Mod/TechDraw/Gui/TaskLeaderLine.cpp @@ -233,7 +233,6 @@ TaskLeaderLine::TaskLeaderLine(TechDraw::DrawView* baseFeat, TaskLeaderLine::~TaskLeaderLine() { - delete ui; } void TaskLeaderLine::saveState() diff --git a/src/Mod/TechDraw/Gui/TaskLeaderLine.h b/src/Mod/TechDraw/Gui/TaskLeaderLine.h index 3341d1def7..e063167905 100644 --- a/src/Mod/TechDraw/Gui/TaskLeaderLine.h +++ b/src/Mod/TechDraw/Gui/TaskLeaderLine.h @@ -130,7 +130,7 @@ private Q_SLOTS: void onLineStyleChanged(); private: - Ui_TaskLeaderLine * ui; + std::unique_ptr ui; bool blockUpdate; QGTracker* m_tracker; diff --git a/src/Mod/TechDraw/Gui/TaskLineDecor.cpp b/src/Mod/TechDraw/Gui/TaskLineDecor.cpp index 7dc10302ba..789be010c8 100644 --- a/src/Mod/TechDraw/Gui/TaskLineDecor.cpp +++ b/src/Mod/TechDraw/Gui/TaskLineDecor.cpp @@ -280,7 +280,6 @@ TaskRestoreLines::TaskRestoreLines(TechDraw::DrawViewPart* partFeat, TaskRestoreLines::~TaskRestoreLines() { - delete ui; } void TaskRestoreLines::initUi() diff --git a/src/Mod/TechDraw/Gui/TaskLineDecor.h b/src/Mod/TechDraw/Gui/TaskLineDecor.h index 30d612a053..c5205a754f 100644 --- a/src/Mod/TechDraw/Gui/TaskLineDecor.h +++ b/src/Mod/TechDraw/Gui/TaskLineDecor.h @@ -112,7 +112,7 @@ protected: void restoreInvisibleCenters(void); private: - Ui_TaskRestoreLines* ui; + std::unique_ptr ui; TechDraw::DrawViewPart* m_partFeat; TaskLineDecor* m_parent; }; diff --git a/src/Mod/TechDraw/Gui/TaskLinkDim.cpp b/src/Mod/TechDraw/Gui/TaskLinkDim.cpp index 19339bbff7..560a214212 100644 --- a/src/Mod/TechDraw/Gui/TaskLinkDim.cpp +++ b/src/Mod/TechDraw/Gui/TaskLinkDim.cpp @@ -86,7 +86,6 @@ TaskLinkDim::TaskLinkDim(std::vector parts, std::vector ui; const std::vector m_parts; const std::vector m_subs; TechDraw::DrawPage* m_page; diff --git a/src/Mod/TechDraw/Gui/TaskProjGroup.cpp b/src/Mod/TechDraw/Gui/TaskProjGroup.cpp index cdfe743492..82c96dbd42 100644 --- a/src/Mod/TechDraw/Gui/TaskProjGroup.cpp +++ b/src/Mod/TechDraw/Gui/TaskProjGroup.cpp @@ -138,7 +138,6 @@ TaskProjGroup::TaskProjGroup(TechDraw::DrawProjGroup* featView, bool mode) : TaskProjGroup::~TaskProjGroup() { - delete ui; } void TaskProjGroup::saveGroupState() diff --git a/src/Mod/TechDraw/Gui/TaskProjGroup.h b/src/Mod/TechDraw/Gui/TaskProjGroup.h index f38103b185..19f1c88fb6 100644 --- a/src/Mod/TechDraw/Gui/TaskProjGroup.h +++ b/src/Mod/TechDraw/Gui/TaskProjGroup.h @@ -109,7 +109,7 @@ protected: MDIViewPage* m_mdi; private: - Ui_TaskProjGroup * ui; + std::unique_ptr ui; TechDraw::DrawProjGroup* multiView; bool m_createMode; diff --git a/src/Mod/TechDraw/Gui/TaskRichAnno.cpp b/src/Mod/TechDraw/Gui/TaskRichAnno.cpp index 313a8e71fb..62d0d30e27 100644 --- a/src/Mod/TechDraw/Gui/TaskRichAnno.cpp +++ b/src/Mod/TechDraw/Gui/TaskRichAnno.cpp @@ -202,7 +202,6 @@ TaskRichAnno::TaskRichAnno(TechDraw::DrawView* baseFeat, TaskRichAnno::~TaskRichAnno() { - delete ui; } void TaskRichAnno::updateTask() diff --git a/src/Mod/TechDraw/Gui/TaskRichAnno.h b/src/Mod/TechDraw/Gui/TaskRichAnno.h index a453a6d6ab..f450be630b 100644 --- a/src/Mod/TechDraw/Gui/TaskRichAnno.h +++ b/src/Mod/TechDraw/Gui/TaskRichAnno.h @@ -103,7 +103,7 @@ protected: App::Color prefLineColor(void); private: - Ui_TaskRichAnno * ui; + std::unique_ptr ui; bool blockUpdate; MDIViewPage* m_mdi; diff --git a/src/Mod/TechDraw/Gui/TaskSectionView.cpp b/src/Mod/TechDraw/Gui/TaskSectionView.cpp index 33b09df208..a98ff6b3e0 100644 --- a/src/Mod/TechDraw/Gui/TaskSectionView.cpp +++ b/src/Mod/TechDraw/Gui/TaskSectionView.cpp @@ -152,7 +152,6 @@ TaskSectionView::TaskSectionView(TechDraw::DrawViewSection* section) : TaskSectionView::~TaskSectionView() { - delete ui; } void TaskSectionView::setUiPrimary() diff --git a/src/Mod/TechDraw/Gui/TaskSectionView.h b/src/Mod/TechDraw/Gui/TaskSectionView.h index 955df54a1d..687c3d56ae 100644 --- a/src/Mod/TechDraw/Gui/TaskSectionView.h +++ b/src/Mod/TechDraw/Gui/TaskSectionView.h @@ -84,7 +84,7 @@ protected: bool isSectionValid(void); private: - Ui_TaskSectionView * ui; + std::unique_ptr ui; TechDraw::DrawViewPart* m_base; TechDraw::DrawViewSection* m_section; std::string m_symbol; diff --git a/src/Mod/TechDraw/Gui/TaskWeldingSymbol.cpp b/src/Mod/TechDraw/Gui/TaskWeldingSymbol.cpp index 9952a12bdf..4e8b5ce3b6 100644 --- a/src/Mod/TechDraw/Gui/TaskWeldingSymbol.cpp +++ b/src/Mod/TechDraw/Gui/TaskWeldingSymbol.cpp @@ -184,7 +184,6 @@ TaskWeldingSymbol::TaskWeldingSymbol(TechDraw::DrawWeldSymbol* weld) : TaskWeldingSymbol::~TaskWeldingSymbol() { - delete ui; } void TaskWeldingSymbol::updateTask() diff --git a/src/Mod/TechDraw/Gui/TaskWeldingSymbol.h b/src/Mod/TechDraw/Gui/TaskWeldingSymbol.h index 8e62e9c9f3..9ba9de62d0 100644 --- a/src/Mod/TechDraw/Gui/TaskWeldingSymbol.h +++ b/src/Mod/TechDraw/Gui/TaskWeldingSymbol.h @@ -146,7 +146,7 @@ protected: QString m_currDir; private: - Ui_TaskWeldingSymbol* ui; + std::unique_ptr ui; TechDraw::DrawLeaderLine* m_leadFeat; TechDraw::DrawWeldSymbol* m_weldFeat;