X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=eaaea089964c9ba32c245e6d8641c6c592997a02;hb=eb8269e3b5eebdd77e6a82d42bcfdfbc3f7613a9;hp=985f698f8127f1e6efb2cf5f31ed067ec318c132;hpb=143d322d0c92ea5c2cc51facc37b68787362c244;p=pulseview.git diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp index 985f698f..eaaea089 100644 --- a/pv/mainwindow.cpp +++ b/pv/mainwindow.cpp @@ -17,14 +17,15 @@ * along with this program; if not, see . */ -#include - #ifdef ENABLE_DECODE #include #endif +#include #include #include +#include +#include #include #include @@ -48,8 +49,6 @@ #include "view/view.hpp" #include "views/trace/standardbar.hpp" -#include -#include #include using std::dynamic_pointer_cast; @@ -138,7 +137,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 +257,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 +672,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);