Commit 6b0f16c9 authored by Shawn Waldon's avatar Shawn Waldon Committed by Kitware Robot
Browse files

Merge topic 'remove-use-of-nullptr'

45536646

 Remove use of nullptr
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Reviewed-by: Utkarsh Ayachit's avatarUtkarsh Ayachit <utkarsh.ayachit@kitware.com>
Merge-request: !463
parents b7666333 45536646
......@@ -74,7 +74,7 @@ struct QVTKWidgetInsideQWidgets
//delete widget2;
}
QVTKWidget* spawnSubwidget( QTabWidget* tabWidget,QVTKWidget* qvtk=nullptr)
QVTKWidget* spawnSubwidget( QTabWidget* tabWidget,QVTKWidget* qvtk=NULL)
{
if(!mainWindow)
mainWindow = new QMainWindow();
......@@ -88,7 +88,7 @@ struct QVTKWidgetInsideQWidgets
return qvtk;
}
QVTKWidget* spawnSubwidget(QMainWindow* mainWin,QVTKWidget* qvtk = nullptr)
QVTKWidget* spawnSubwidget(QMainWindow* mainWin,QVTKWidget* qvtk = NULL)
{
mainWindow = mainWin;
if (!qvtk)
......@@ -99,7 +99,7 @@ struct QVTKWidgetInsideQWidgets
return qvtk;
}
QVTKWidget* spawnSubwidget(QDockWidget* dock,QVTKWidget* qvtk = nullptr)
QVTKWidget* spawnSubwidget(QDockWidget* dock,QVTKWidget* qvtk = NULL)
{
if (!mainWindow)
mainWindow = new QMainWindow();
......@@ -156,4 +156,4 @@ int TestWin32QVTKWidget(int argc, char* argv[])
return EXIT_FAILURE;
return EXIT_SUCCESS;
}
\ No newline at end of file
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment