Fem: modernize C++11
* use nullptr
This commit is contained in:
@@ -67,11 +67,11 @@ bool ViewProviderFemConstraintFixed::setEdit(int ModNum)
|
||||
Gui::TaskView::TaskDialog *dlg = Gui::Control().activeDialog();
|
||||
TaskDlgFemConstraintFixed *constrDlg = qobject_cast<TaskDlgFemConstraintFixed *>(dlg);
|
||||
if (constrDlg && constrDlg->getConstraintView() != this)
|
||||
constrDlg = 0; // another constraint left open its task panel
|
||||
constrDlg = nullptr; // another constraint left open its task panel
|
||||
if (dlg && !constrDlg) {
|
||||
// This case will occur in the ShaftWizard application
|
||||
checkForWizard();
|
||||
if ((wizardWidget == NULL) || (wizardSubLayout == NULL)) {
|
||||
if ((wizardWidget == nullptr) || (wizardSubLayout == nullptr)) {
|
||||
// No shaft wizard is running
|
||||
QMessageBox msgBox;
|
||||
msgBox.setText(QObject::tr("A dialog is already open in the task panel"));
|
||||
@@ -83,7 +83,7 @@ bool ViewProviderFemConstraintFixed::setEdit(int ModNum)
|
||||
Gui::Control().reject();
|
||||
else
|
||||
return false;
|
||||
} else if (constraintDialog != NULL) {
|
||||
} else if (constraintDialog != nullptr) {
|
||||
// Another FemConstraint* dialog is already open inside the Shaft Wizard
|
||||
// Ignore the request to open another dialog
|
||||
return false;
|
||||
|
||||
Reference in New Issue
Block a user