[Sketcher] make pointers to the UI std::unique_ptr

Same as PR #4293, just for Sketcher

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 Sketcher dialogs that don't already use a unique_ptr.
This commit is contained in:
donovaly
2021-02-04 04:41:06 +01:00
committed by wwmayer
parent 6db7737547
commit 28c66fc501
10 changed files with 17 additions and 22 deletions

View File

@@ -634,13 +634,13 @@ void ConstraintView::swapNamedOfSelectedItems()
// ----------------------------------------------------------------------------
TaskSketcherConstrains::TaskSketcherConstrains(ViewProviderSketch *sketchView)
: TaskBox(Gui::BitmapFactory().pixmap("document-new"),tr("Constraints"),true, 0)
, sketchView(sketchView), inEditMode(false)
TaskSketcherConstrains::TaskSketcherConstrains(ViewProviderSketch *sketchView) :
TaskBox(Gui::BitmapFactory().pixmap("document-new"), tr("Constraints"), true, 0),
sketchView(sketchView), inEditMode(false),
ui(new Ui_TaskSketcherConstrains)
{
// we need a separate container widget to add all controls to
proxy = new QWidget(this);
ui = new Ui_TaskSketcherConstrains();
ui->setupUi(proxy);
ui->listWidgetConstraints->setSelectionMode(QAbstractItemView::ExtendedSelection);
ui->listWidgetConstraints->setEditTriggers(QListWidget::EditKeyPressed);
@@ -700,7 +700,6 @@ TaskSketcherConstrains::~TaskSketcherConstrains()
this->ui->filterInternalAlignment->onSave();
this->ui->extendedInformation->onSave();
connectionConstraintsChanged.disconnect();
delete ui;
}
void TaskSketcherConstrains::onSelectionChanged(const Gui::SelectionChanges& msg)

View File

@@ -101,7 +101,7 @@ protected:
private:
QWidget* proxy;
bool inEditMode;
Ui_TaskSketcherConstrains* ui;
std::unique_ptr<Ui_TaskSketcherConstrains> ui;
};
} //namespace SketcherGui

View File

@@ -342,7 +342,6 @@ TaskSketcherElements::~TaskSketcherElements()
}
connectionElementsChanged.disconnect();
delete ui;
}
void TaskSketcherElements::onSelectionChanged(const Gui::SelectionChanges& msg)

View File

@@ -139,7 +139,7 @@ protected:
private:
QWidget* proxy;
Ui_TaskSketcherElements* ui;
std::unique_ptr<Ui_TaskSketcherElements> ui;
int focusItemIndex;
int previouslySelectedItemIndex;

View File

@@ -69,7 +69,6 @@ SketcherGeneralWidget::SketcherGeneralWidget(QWidget *parent)
SketcherGeneralWidget::~SketcherGeneralWidget()
{
delete ui;
}
bool SketcherGeneralWidget::eventFilter(QObject *object, QEvent *event)

View File

@@ -75,7 +75,7 @@ protected:
void changeEvent(QEvent *e);
private:
Ui_TaskSketcherGeneral* ui;
std::unique_ptr<Ui_TaskSketcherGeneral> ui;
};
class TaskSketcherGeneral : public Gui::TaskView::TaskBox,

View File

@@ -47,13 +47,13 @@ using namespace SketcherGui;
using namespace Gui::TaskView;
namespace bp = boost::placeholders;
TaskSketcherMessages::TaskSketcherMessages(ViewProviderSketch *sketchView)
: TaskBox(Gui::BitmapFactory().pixmap("document-new"),tr("Solver messages"),true, 0)
, sketchView(sketchView)
TaskSketcherMessages::TaskSketcherMessages(ViewProviderSketch *sketchView) :
TaskBox(Gui::BitmapFactory().pixmap("document-new"), tr("Solver messages"), true, 0),
sketchView(sketchView),
ui(new Ui_TaskSketcherMessages)
{
// we need a separate container widget to add all controls to
proxy = new QWidget(this);
ui = new Ui_TaskSketcherMessages();
ui->setupUi(proxy);
QMetaObject::connectSlotsByName(this);
@@ -90,7 +90,6 @@ TaskSketcherMessages::~TaskSketcherMessages()
{
connectionSetUp.disconnect();
connectionSolved.disconnect();
delete ui;
}
void TaskSketcherMessages::slotSetUp(QString msg)

View File

@@ -63,7 +63,7 @@ protected:
private:
QWidget* proxy;
Ui_TaskSketcherMessages* ui;
std::unique_ptr<Ui_TaskSketcherMessages> ui;
};
} //namespace SketcherGui

View File

@@ -60,13 +60,13 @@
using namespace SketcherGui;
using namespace Gui::TaskView;
TaskSketcherSolverAdvanced::TaskSketcherSolverAdvanced(ViewProviderSketch *sketchView)
: TaskBox(Gui::BitmapFactory().pixmap("document-new"),tr("Advanced solver control"),true, 0)
, sketchView(sketchView)
TaskSketcherSolverAdvanced::TaskSketcherSolverAdvanced(ViewProviderSketch *sketchView) :
TaskBox(Gui::BitmapFactory().pixmap("document-new"), tr("Advanced solver control"), true, 0),
sketchView(sketchView),
ui(new Ui_TaskSketcherSolverAdvanced)
{
// we need a separate container widget to add all controls to
proxy = new QWidget(this);
ui = new Ui_TaskSketcherSolverAdvanced();
ui->setupUi(proxy);
QMetaObject::connectSlotsByName(this);
@@ -90,7 +90,6 @@ TaskSketcherSolverAdvanced::TaskSketcherSolverAdvanced(ViewProviderSketch *sketc
TaskSketcherSolverAdvanced::~TaskSketcherSolverAdvanced()
{
delete ui;
}
void TaskSketcherSolverAdvanced::updateDefaultMethodParameters(void)

View File

@@ -76,7 +76,7 @@ protected:
private:
QWidget* proxy;
Ui_TaskSketcherSolverAdvanced* ui;
std::unique_ptr<Ui_TaskSketcherSolverAdvanced> ui;
};
} //namespace SketcherGui