projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use alphabetical order for #includes.
[pulseview.git]
/
pv
/
mainwindow.cpp
diff --git
a/pv/mainwindow.cpp
b/pv/mainwindow.cpp
index 46f8a123ae8907b7d3793dd0b47eac9d3ba3bf1f..5c399e43c38d1523abe748e52cb9c0d44039d792 100644
(file)
--- a/
pv/mainwindow.cpp
+++ b/
pv/mainwindow.cpp
@@
-21,11
+21,11
@@
#include <libsigrokdecode/libsigrokdecode.h>
#endif
#include <libsigrokdecode/libsigrokdecode.h>
#endif
-#include <cassert>
#include <algorithm>
#include <algorithm>
-#include <iterator>
-#include <cstdint>
+#include <cassert>
#include <cstdarg>
#include <cstdarg>
+#include <cstdint>
+#include <iterator>
#include <QAction>
#include <QApplication>
#include <QAction>
#include <QApplication>
@@
-34,17
+34,17
@@
#include <QHBoxLayout>
#include <QMessageBox>
#include <QSettings>
#include <QHBoxLayout>
#include <QMessageBox>
#include <QSettings>
-#include <QWidget>
#include <QShortcut>
#include <QShortcut>
+#include <QWidget>
#include "mainwindow.hpp"
#include "devicemanager.hpp"
#include "mainwindow.hpp"
#include "devicemanager.hpp"
-#include "globalsettings.hpp"
-#include "util.hpp"
#include "devices/hardwaredevice.hpp"
#include "dialogs/settings.hpp"
#include "devices/hardwaredevice.hpp"
#include "dialogs/settings.hpp"
+#include "globalsettings.hpp"
#include "toolbars/mainbar.hpp"
#include "toolbars/mainbar.hpp"
+#include "util.hpp"
#include "view/view.hpp"
#include "views/trace/standardbar.hpp"
#include "view/view.hpp"
#include "views/trace/standardbar.hpp"
@@
-52,7
+52,6
@@
using std::bind;
using std::dynamic_pointer_cast;
using std::bind;
using std::dynamic_pointer_cast;
-using std::list;
using std::make_shared;
using std::map;
using std::placeholders::_1;
using std::make_shared;
using std::map;
using std::placeholders::_1;
@@
-135,10
+134,10
@@
shared_ptr<views::ViewBase> MainWindow::get_active_view() const
QDockWidget *dock = nullptr;
while (w) {
QDockWidget *dock = nullptr;
while (w) {
- dock = qobject_cast<QDockWidget*>(w);
- if (dock)
- break;
- w = w->parent();
+
dock = qobject_cast<QDockWidget*>(w);
+
if (dock)
+
break;
+
w = w->parent();
}
// Get the view contained in the dock widget
}
// Get the view contained in the dock widget