Import: modernize C++: use default member init
This commit is contained in:
@@ -70,7 +70,6 @@ using namespace Import;
|
||||
ExportOCAF::ExportOCAF(Handle(TDocStd_Document) h, bool explicitPlacement)
|
||||
: pDoc(h)
|
||||
, keepExplicitPlacement(explicitPlacement)
|
||||
, filterBaseFeature(true)
|
||||
{
|
||||
aShapeTool = XCAFDoc_DocumentTool::ShapeTool(pDoc->Main());
|
||||
aColorTool = XCAFDoc_DocumentTool::ColorTool(pDoc->Main());
|
||||
|
||||
@@ -92,7 +92,7 @@ private:
|
||||
Handle(XCAFDoc_ColorTool) aColorTool;
|
||||
TDF_Label rootLabel;
|
||||
bool keepExplicitPlacement;
|
||||
bool filterBaseFeature;
|
||||
bool filterBaseFeature{true};
|
||||
};
|
||||
|
||||
class ImportExport ExportOCAFCmd : public ExportOCAF
|
||||
|
||||
@@ -84,7 +84,7 @@ static inline App::Color convertColor(const Quantity_ColorRGBA &c)
|
||||
#define OCAF_KEEP_PLACEMENT
|
||||
|
||||
ImportOCAF::ImportOCAF(Handle(TDocStd_Document) h, App::Document* d, const std::string& name)
|
||||
: pDoc(h), doc(d), merge(true), default_name(name)
|
||||
: pDoc(h), doc(d), default_name(name)
|
||||
{
|
||||
aShapeTool = XCAFDoc_DocumentTool::ShapeTool (pDoc->Main());
|
||||
aColorTool = XCAFDoc_DocumentTool::ColorTool(pDoc->Main());
|
||||
|
||||
@@ -75,7 +75,7 @@ private:
|
||||
App::Document* doc;
|
||||
Handle(XCAFDoc_ShapeTool) aShapeTool;
|
||||
Handle(XCAFDoc_ColorTool) aColorTool;
|
||||
bool merge;
|
||||
bool merge{true};
|
||||
std::string default_name;
|
||||
std::set<int> myRefShapes;
|
||||
static const int HashUpper = INT_MAX;
|
||||
|
||||
@@ -172,7 +172,7 @@ ImportOCAFOptions::ImportOCAFOptions()
|
||||
}
|
||||
|
||||
ImportOCAF2::ImportOCAF2(Handle(TDocStd_Document) h, App::Document* d, const std::string& name)
|
||||
: pDoc(h), pDocument(d), default_name(name), sequencer(nullptr)
|
||||
: pDoc(h), pDocument(d), default_name(name)
|
||||
{
|
||||
aShapeTool = XCAFDoc_DocumentTool::ShapeTool (pDoc->Main());
|
||||
aColorTool = XCAFDoc_DocumentTool::ColorTool(pDoc->Main());
|
||||
|
||||
@@ -187,7 +187,7 @@ private:
|
||||
std::unordered_map<TDF_Label, std::string, LabelHasher> myNames;
|
||||
std::unordered_map<App::DocumentObject*, App::PropertyPlacement*> myCollapsedObjects;
|
||||
|
||||
Base::SequencerLauncher *sequencer;
|
||||
Base::SequencerLauncher *sequencer{nullptr};
|
||||
};
|
||||
|
||||
struct ImportExport ExportOCAFOptions
|
||||
|
||||
Reference in New Issue
Block a user