X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=5c399e43c38d1523abe748e52cb9c0d44039d792;hb=894c4b52fe140cf30a839cf3c7583fea04602683;hp=46f8a123ae8907b7d3793dd0b47eac9d3ba3bf1f;hpb=6f925ba9d6faf1077b73c5a5808259576081716a;p=pulseview.git diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp index 46f8a12..5c399e4 100644 --- a/pv/mainwindow.cpp +++ b/pv/mainwindow.cpp @@ -21,11 +21,11 @@ #include #endif -#include #include -#include -#include +#include #include +#include +#include #include #include @@ -34,17 +34,17 @@ #include #include #include -#include #include +#include #include "mainwindow.hpp" #include "devicemanager.hpp" -#include "globalsettings.hpp" -#include "util.hpp" #include "devices/hardwaredevice.hpp" #include "dialogs/settings.hpp" +#include "globalsettings.hpp" #include "toolbars/mainbar.hpp" +#include "util.hpp" #include "view/view.hpp" #include "views/trace/standardbar.hpp" @@ -52,7 +52,6 @@ using std::bind; using std::dynamic_pointer_cast; -using std::list; using std::make_shared; using std::map; using std::placeholders::_1; @@ -135,10 +134,10 @@ shared_ptr MainWindow::get_active_view() const QDockWidget *dock = nullptr; while (w) { - dock = qobject_cast(w); - if (dock) - break; - w = w->parent(); + dock = qobject_cast(w); + if (dock) + break; + w = w->parent(); } // Get the view contained in the dock widget