App: modernize C++11
* use nullptr
This commit is contained in:
@@ -123,7 +123,7 @@ private:
|
||||
};
|
||||
}
|
||||
|
||||
MergeDocuments::MergeDocuments(App::Document* doc) : guiup(false), verbose(true), stream(0), appdoc(doc)
|
||||
MergeDocuments::MergeDocuments(App::Document* doc) : guiup(false), verbose(true), stream(nullptr), appdoc(doc)
|
||||
{
|
||||
connectExport = doc->signalExportObjects.connect
|
||||
(boost::bind(&MergeDocuments::exportObject, this, bp::_1, bp::_2));
|
||||
@@ -157,7 +157,7 @@ MergeDocuments::importObjects(std::istream& input)
|
||||
std::vector<App::DocumentObject*> objs = appdoc->importObjects(reader);
|
||||
|
||||
delete this->stream;
|
||||
this->stream = 0;
|
||||
this->stream = nullptr;
|
||||
|
||||
return objs;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user