Refactor: add default member initializers
This commit is contained in:
@@ -84,7 +84,7 @@ private:
|
||||
|
||||
private:
|
||||
std::unique_ptr<Ui_TaskLinearPatternParameters> ui;
|
||||
QTimer* updateViewTimer;
|
||||
QTimer* updateViewTimer = nullptr;
|
||||
|
||||
ComboLinks dirLinks;
|
||||
};
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
|
||||
@@ -94,9 +94,9 @@ private:
|
||||
private:
|
||||
std::unique_ptr<Ui_TaskMultiTransformParameters> 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;
|
||||
};
|
||||
|
||||
|
||||
|
||||
@@ -84,7 +84,7 @@ private:
|
||||
|
||||
private:
|
||||
std::unique_ptr<Ui_TaskPolarPatternParameters> ui;
|
||||
QTimer* updateViewTimer;
|
||||
QTimer* updateViewTimer = nullptr;
|
||||
|
||||
ComboLinks axesLinks;
|
||||
};
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
|
||||
|
||||
@@ -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<App::PropertyLinkSub*> 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_TaskTransformedParameters> 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
|
||||
|
||||
Reference in New Issue
Block a user