projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
binding/prop: Add a description field.
[pulseview.git]
/
pv
/
mainwindow.cpp
diff --git
a/pv/mainwindow.cpp
b/pv/mainwindow.cpp
index 7e48e5a9f96a21f7c64cd9fe5a6d049d826ad70f..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"