X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=2e08d6a471476d9785702c794816b908a89983b3;hb=13e475e412663ee904b94a6510b5628bdb8b84fa;hp=985f698f8127f1e6efb2cf5f31ed067ec318c132;hpb=2cca9ebfdc367aa8e4651cf063f0cdea8fccb798;p=pulseview.git diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp index 985f698f..2e08d6a4 100644 --- a/pv/mainwindow.cpp +++ b/pv/mainwindow.cpp @@ -138,7 +138,7 @@ shared_ptr MainWindow::get_active_view() const // ...otherwise find the dock widget the widget with focus is contained in QObject *w = QApplication::focusWidget(); - QDockWidget *dock = 0; + QDockWidget *dock = nullptr; while (w) { dock = qobject_cast(w); @@ -258,7 +258,7 @@ void MainWindow::remove_view(shared_ptr view) // call deleteLater() on it, which causes a double free // since the shared_ptr in view_docks_ doesn't know // that Qt keeps a pointer to the view around - view->setParent(0); + view->setParent(nullptr); // Delete the view's dock widget and all widgets inside it entry.first->deleteLater(); @@ -673,7 +673,7 @@ void MainWindow::on_view_close_clicked() { // Find the dock widget that contains the close button that was clicked QObject *w = QObject::sender(); - QDockWidget *dock = 0; + QDockWidget *dock = nullptr; while (w) { dock = qobject_cast(w);