Replace NULL by nullptr
This commit is contained in:
@@ -78,9 +78,9 @@ PRIVATE_NODE_TYPESYSTEM_SOURCE(_class_); \
|
||||
SO_NODE_SOURCE_TEMPLATE \
|
||||
unsigned int _class_::classinstances = 0; \
|
||||
SO_NODE_SOURCE_TEMPLATE \
|
||||
const SoFieldData ** _class_::parentFieldData = NULL; \
|
||||
const SoFieldData ** _class_::parentFieldData = nullptr; \
|
||||
SO_NODE_SOURCE_TEMPLATE \
|
||||
SoFieldData * _class_::fieldData = NULL; \
|
||||
SoFieldData * _class_::fieldData = nullptr; \
|
||||
\
|
||||
SO_NODE_SOURCE_TEMPLATE \
|
||||
const SoFieldData ** \
|
||||
|
||||
@@ -78,7 +78,7 @@ int main(int argc, char **argv)
|
||||
|
||||
if ( !QGLFormat::hasOpenGL() ) {
|
||||
QString msg = "System has no OpenGL support!";
|
||||
QMessageBox::critical( NULL, "OpenGL", msg + argv[1], 0 );
|
||||
QMessageBox::critical( nullptr, "OpenGL", msg + argv[1], 0 );
|
||||
return -1;
|
||||
}
|
||||
|
||||
@@ -115,7 +115,7 @@ int main(int argc, char **argv)
|
||||
QString msg = "Cannot read mesh from file:\n '";
|
||||
msg += argv[optind];
|
||||
msg += "'";
|
||||
QMessageBox::critical( NULL, w->caption(), msg, 0 );
|
||||
QMessageBox::critical( nullptr, w->caption(), msg, 0 );
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
@@ -130,7 +130,7 @@ int main(int argc, char **argv)
|
||||
msg += "- Mesh file didn't provide texture coordinates\n";
|
||||
msg += "- Texture file does not exist\n";
|
||||
msg += "- Texture file is not accessible.\n";
|
||||
QMessageBox::warning( NULL, w->caption(), msg, 0 );
|
||||
QMessageBox::warning( nullptr, w->caption(), msg, 0 );
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -325,7 +325,7 @@ void mouse(int button, int state, int x, int y)
|
||||
{
|
||||
g.mgr->mouseButtonRelease(button, x, y);
|
||||
// if ( g.mode & FLYMODE )
|
||||
// glutIdleFunc(NULL);
|
||||
// glutIdleFunc(nullptr);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@@ -64,7 +64,7 @@ set_vdpm(const char _vdpm_name[256])
|
||||
}
|
||||
#endif
|
||||
vdpm_ = ((VDPMServerViewerWidget *) ((VDPMServerSocket *) parent())->parent())->get_vdpm(_vdpm_name);
|
||||
if (vdpm_ == NULL)
|
||||
if (vdpm_ == nullptr)
|
||||
return false;
|
||||
|
||||
vhierarchy_ = &vdpm_->vhierarchy();
|
||||
|
||||
@@ -72,7 +72,7 @@ get_vdpm(const char _vdpm_name[256])
|
||||
}
|
||||
}
|
||||
|
||||
return NULL;
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
void
|
||||
|
||||
@@ -64,7 +64,7 @@ set_vdpm(const char _vdpm_name[256])
|
||||
}
|
||||
#endif
|
||||
vdpm_ = ((VDPMServerViewerWidget *) ((VDPMServerSocket *) parent())->parent())->get_vdpm(_vdpm_name);
|
||||
if (vdpm_ == NULL)
|
||||
if (vdpm_ == nullptr)
|
||||
return false;
|
||||
|
||||
vhierarchy_ = &vdpm_->vhierarchy();
|
||||
|
||||
@@ -71,7 +71,7 @@ get_vdpm(const char _vdpm_name[256])
|
||||
}
|
||||
}
|
||||
|
||||
return NULL;
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
void
|
||||
|
||||
Reference in New Issue
Block a user