Gui: modernize C++11
* use nullptr
This commit is contained in:
@@ -159,7 +159,7 @@ void AlignmentGroup::setRandomColor()
|
||||
Gui::Document* AlignmentGroup::getDocument() const
|
||||
{
|
||||
if (this->_views.empty())
|
||||
return 0;
|
||||
return nullptr;
|
||||
App::DocumentObject* pView = this->_views[0]->getObject();
|
||||
if (pView) {
|
||||
App::Document* rDoc = pView->getDocument();
|
||||
@@ -167,7 +167,7 @@ Gui::Document* AlignmentGroup::getDocument() const
|
||||
return pDoc;
|
||||
}
|
||||
|
||||
return 0;
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
void AlignmentGroup::addPoint(const PickedPoint& pnt)
|
||||
@@ -377,7 +377,7 @@ public:
|
||||
smoothing = true;
|
||||
}
|
||||
|
||||
QSplitter* mainSplitter=0;
|
||||
QSplitter* mainSplitter=nullptr;
|
||||
mainSplitter = new QSplitter(Qt::Horizontal, this);
|
||||
if (glformat) {
|
||||
_viewer.push_back(new View3DInventorViewer(f, mainSplitter));
|
||||
@@ -498,7 +498,7 @@ public:
|
||||
SbVec3f pos_cam1, pos_cam2;
|
||||
|
||||
Private()
|
||||
: sensorCam1(0), sensorCam2(0)
|
||||
: sensorCam1(nullptr), sensorCam2(nullptr)
|
||||
{
|
||||
// left view
|
||||
picksepLeft = new SoSeparator;
|
||||
@@ -518,7 +518,7 @@ public:
|
||||
static
|
||||
void reorientCamera(SoCamera * cam, const SbRotation & rot)
|
||||
{
|
||||
if (cam == NULL) return;
|
||||
if (cam == nullptr) return;
|
||||
|
||||
// Find global coordinates of focal point.
|
||||
SbVec3f direction;
|
||||
@@ -648,13 +648,13 @@ public:
|
||||
|
||||
/* TRANSLATOR Gui::ManualAlignment */
|
||||
|
||||
ManualAlignment* ManualAlignment::_instance = 0;
|
||||
ManualAlignment* ManualAlignment::_instance = nullptr;
|
||||
|
||||
/**
|
||||
* Construction.
|
||||
*/
|
||||
ManualAlignment::ManualAlignment()
|
||||
: myViewer(0), myDocument(0), myPickPoints(3), d(new Private)
|
||||
: myViewer(nullptr), myDocument(nullptr), myPickPoints(3), d(new Private)
|
||||
{
|
||||
// connect with the application's signal for deletion of documents
|
||||
this->connectApplicationDeletedDocument = Gui::Application::Instance->signalDeleteDocument
|
||||
@@ -674,7 +674,7 @@ ManualAlignment::~ManualAlignment()
|
||||
this->connectApplicationDeletedDocument.disconnect();
|
||||
closeViewer();
|
||||
delete d;
|
||||
_instance = 0;
|
||||
_instance = nullptr;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -695,7 +695,7 @@ void ManualAlignment::destruct()
|
||||
{
|
||||
if (_instance) {
|
||||
ManualAlignment* tmp = _instance;
|
||||
_instance = 0;
|
||||
_instance = nullptr;
|
||||
delete tmp;
|
||||
}
|
||||
}
|
||||
@@ -705,7 +705,7 @@ void ManualAlignment::destruct()
|
||||
*/
|
||||
bool ManualAlignment::hasInstance()
|
||||
{
|
||||
return _instance != 0;
|
||||
return _instance != nullptr;
|
||||
}
|
||||
|
||||
void ManualAlignment::setMinPoints(int minPoints)
|
||||
@@ -729,7 +729,7 @@ void ManualAlignment::clearAll()
|
||||
{
|
||||
myFixedGroup.clear();
|
||||
myAlignModel.clear();
|
||||
myDocument = 0;
|
||||
myDocument = nullptr;
|
||||
}
|
||||
|
||||
void ManualAlignment::setViewingDirections(const Base::Vector3d& view1, const Base::Vector3d& up1,
|
||||
@@ -889,7 +889,7 @@ void ManualAlignment::closeViewer()
|
||||
// Close the viewer
|
||||
if (myViewer->parentWidget())
|
||||
myViewer->parentWidget()->deleteLater();
|
||||
myViewer = 0;
|
||||
myViewer = nullptr;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -911,7 +911,7 @@ void ManualAlignment::reset()
|
||||
|
||||
if (myDocument) {
|
||||
this->connectDocumentDeletedObject.disconnect();
|
||||
myDocument = 0;
|
||||
myDocument = nullptr;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user