Use alphabetical order for #includes.

This patch was generated using clang-tidy:

  clang-tidy -checks="-*,llvm-include-order" -fix

diff --git a/android/assetreader.cpp b/android/assetreader.cpp
index 05160d6e41ea609d21b83444a31a1336c94322d7..71aafae5c46d784de3451f164b26f0775cc1beff 100644 (file)
--- a/android/assetreader.cpp
+++ b/android/assetreader.cpp
@@ -18,12 +18,15 @@
  */
 
 #include "assetreader.hpp"
  */
 
 #include "assetreader.hpp"

-#include <libsigrok/libsigrok.h>
+

 #include <memory>
 #include <memory>

+

 #include <QtCore/QDebug>
 #include <QtCore/QFile>
 #include <QtCore/QStandardPaths>
 
 #include <QtCore/QDebug>
 #include <QtCore/QFile>
 #include <QtCore/QStandardPaths>
 

+#include <libsigrok/libsigrok.h>
+

 using namespace pv;
 
 using std::string;
 using namespace pv;
 
 using std::string;

diff --git a/pv/binding/binding.hpp b/pv/binding/binding.hpp
index c4b1e9ddfd6d59ab2bb614b7fb19b154a085e9fe..e672ff176f24a5301026e519057b47b0db0b263f 100644 (file)
--- a/pv/binding/binding.hpp
+++ b/pv/binding/binding.hpp
@@ -26,8 +26,8 @@ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 #include <glibmm.h>
 G_GNUC_END_IGNORE_DEPRECATIONS
 
 #include <glibmm.h>
 G_GNUC_END_IGNORE_DEPRECATIONS
 

-#include <vector>

 #include <memory>
 #include <memory>

+#include <vector>

 
 #include <QString>
 
 
 #include <QString>
 

diff --git a/pv/binding/decoder.cpp b/pv/binding/decoder.cpp
index 39bff52bf0cb55f3ee29aba01995a275769ab2c4..b2b4e4f7e6728198713a67e8042b71b5e4ce0c8f 100644 (file)
--- a/pv/binding/decoder.cpp
+++ b/pv/binding/decoder.cpp
@@ -23,8 +23,8 @@
 
 #include <boost/none_t.hpp>
 
 
 #include <boost/none_t.hpp>
 

-#include <pv/data/decoderstack.hpp>

 #include <pv/data/decode/decoder.hpp>
 #include <pv/data/decode/decoder.hpp>

+#include <pv/data/decoderstack.hpp>

 #include <pv/prop/double.hpp>
 #include <pv/prop/enum.hpp>
 #include <pv/prop/int.hpp>
 #include <pv/prop/double.hpp>
 #include <pv/prop/enum.hpp>
 #include <pv/prop/int.hpp>

diff --git a/pv/data/analogsegment.cpp b/pv/data/analogsegment.cpp
index fb34cffcebe1e4786345f9e928e34e9dbd48ad4e..1bd33876cc21ac99b455f356cf8993a2aedda42e 100644 (file)
--- a/pv/data/analogsegment.cpp
+++ b/pv/data/analogsegment.cpp
@@ -20,9 +20,9 @@
 #include <extdef.h>
 
 #include <cassert>
 #include <extdef.h>
 
 #include <cassert>

-#include <cstring>
-#include <cstdlib>

 #include <cmath>
 #include <cmath>

+#include <cstdlib>
+#include <cstring>

 
 #include <algorithm>
 
 
 #include <algorithm>
 

diff --git a/pv/data/decoderstack.cpp b/pv/data/decoderstack.cpp
index 8fc3242392bd2642f36a2e093010d8a8c146df38..561e229dda8ec647f13238978b0c212cac3af480 100644 (file)
--- a/pv/data/decoderstack.cpp
+++ b/pv/data/decoderstack.cpp
@@ -25,10 +25,10 @@
 
 #include "decoderstack.hpp"
 
 
 #include "decoderstack.hpp"
 

+#include <pv/data/decode/annotation.hpp>
+#include <pv/data/decode/decoder.hpp>

 #include <pv/data/logic.hpp>
 #include <pv/data/logicsegment.hpp>
 #include <pv/data/logic.hpp>
 #include <pv/data/logicsegment.hpp>

-#include <pv/data/decode/decoder.hpp>
-#include <pv/data/decode/annotation.hpp>

 #include <pv/session.hpp>
 #include <pv/view/logicsignal.hpp>
 
 #include <pv/session.hpp>
 #include <pv/view/logicsignal.hpp>
 

diff --git a/pv/data/logicsegment.cpp b/pv/data/logicsegment.cpp
index cbaf54a47c132a3d192e530e59e5ee1f6efda586..b648f5d1c302af35c22c7c1dec35eaf08dee923e 100644 (file)
--- a/pv/data/logicsegment.cpp
+++ b/pv/data/logicsegment.cpp
@@ -20,9 +20,9 @@
 #include <extdef.h>
 
 #include <cassert>
 #include <extdef.h>
 
 #include <cassert>

-#include <cstring>
-#include <cstdlib>

 #include <cmath>
 #include <cmath>

+#include <cstdlib>
+#include <cstring>

 
 #include "logic.hpp"
 #include "logicsegment.hpp"
 
 #include "logic.hpp"
 #include "logicsegment.hpp"

diff --git a/pv/data/segment.hpp b/pv/data/segment.hpp
index 0cc7e6f85821bf9146f59c623af1935a896b8a3a..3305f4c8d3033b7ce05f0b06cfcd98cd4549ae82 100644 (file)
--- a/pv/data/segment.hpp
+++ b/pv/data/segment.hpp
@@ -23,8 +23,8 @@
 
 #include "pv/util.hpp"
 
 
 #include "pv/util.hpp"
 

-#include <thread>

 #include <mutex>
 #include <mutex>

+#include <thread>

 #include <vector>
 
 using std::recursive_mutex;
 #include <vector>
 
 using std::recursive_mutex;

diff --git a/pv/data/signalbase.cpp b/pv/data/signalbase.cpp
index 9894fdb4b1473eea638ef29da7e4c47145f45ebb..6bcacd734a94f7e15e91d46fc285c6a2424f68d3 100644 (file)
--- a/pv/data/signalbase.cpp
+++ b/pv/data/signalbase.cpp
@@ -20,14 +20,14 @@
 
 #include "analog.hpp"
 #include "analogsegment.hpp"
 
 #include "analog.hpp"
 #include "analogsegment.hpp"

+#include "decode/row.hpp"

 #include "logic.hpp"
 #include "logicsegment.hpp"
 #include "signalbase.hpp"
 #include "signaldata.hpp"
 #include "logic.hpp"
 #include "logicsegment.hpp"
 #include "signalbase.hpp"
 #include "signaldata.hpp"

-#include "decode/row.hpp"

 
 

-#include <pv/session.hpp>

 #include <pv/binding/decoder.hpp>
 #include <pv/binding/decoder.hpp>

+#include <pv/session.hpp>

 
 using std::dynamic_pointer_cast;
 using std::make_shared;
 
 using std::dynamic_pointer_cast;
 using std::make_shared;

diff --git a/pv/devicemanager.cpp b/pv/devicemanager.cpp
index 883175c7752eb8cf27767a254d285da3760eb539..a51148b1d3ad2851a55888749312cb12b837e523 100644 (file)
--- a/pv/devicemanager.cpp
+++ b/pv/devicemanager.cpp
@@ -22,8 +22,8 @@
 
 #include <cassert>
 #include <functional>
 
 #include <cassert>
 #include <functional>

-#include <stdexcept>

 #include <sstream>
 #include <sstream>

+#include <stdexcept>

 #include <string>
 
 #include <libsigrokcxx/libsigrokcxx.hpp>
 #include <string>
 
 #include <libsigrokcxx/libsigrokcxx.hpp>

diff --git a/pv/dialogs/connect.cpp b/pv/dialogs/connect.cpp
index 7a680cf73fb48efaf817738c18c54ab399f12f03..911956af73fab4b856e8c09a1b57421439e3cc12 100644 (file)
--- a/pv/dialogs/connect.cpp
+++ b/pv/dialogs/connect.cpp
@@ -21,8 +21,8 @@
 
 #include <libsigrokcxx/libsigrokcxx.hpp>
 
 
 #include <libsigrokcxx/libsigrokcxx.hpp>
 

-#include <QLabel>

 #include <QGroupBox>
 #include <QGroupBox>

+#include <QLabel>

 #include <QRadioButton>
 
 #include "connect.hpp"
 #include <QRadioButton>
 
 #include "connect.hpp"

diff --git a/pv/dialogs/connect.hpp b/pv/dialogs/connect.hpp
index b35f5899f502d0419f87a456d0cabe8f5485a53b..d9cf0a53cfc689b3142b64ae4d078b2a3b0ed7fc 100644 (file)
--- a/pv/dialogs/connect.hpp
+++ b/pv/dialogs/connect.hpp
@@ -29,9 +29,9 @@
 #include <QFormLayout>
 #include <QHBoxLayout>
 #include <QLineEdit>
 #include <QFormLayout>
 #include <QHBoxLayout>
 #include <QLineEdit>

-#include <QSpinBox>

 #include <QListWidget>
 #include <QPushButton>
 #include <QListWidget>
 #include <QPushButton>

+#include <QSpinBox>

 #include <QVBoxLayout>
 
 using std::shared_ptr;
 #include <QVBoxLayout>
 
 using std::shared_ptr;

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"
 

diff --git a/pv/mainwindow.hpp b/pv/mainwindow.hpp
index e3e98e36b6daa6a0b6432f5b78f10d69e6fcf2af..a0a6d3375b0f5225b97ced6c27b8a0fe1c12bd01 100644 (file)
--- a/pv/mainwindow.hpp
+++ b/pv/mainwindow.hpp
@@ -25,10 +25,10 @@
 #include <memory>
 
 #include <QMainWindow>
 #include <memory>
 
 #include <QMainWindow>

+#include <QShortcut>

 #include <QSignalMapper>
 #include <QSignalMapper>

-#include <QToolButton>

 #include <QTabWidget>
 #include <QTabWidget>

-#include <QShortcut>
+#include <QToolButton>

 
 #include "session.hpp"
 #include "views/viewbase.hpp"
 
 #include "session.hpp"
 #include "views/viewbase.hpp"

diff --git a/pv/prop/int.cpp b/pv/prop/int.cpp
index 415ee866f6f764df6b02761d6c337a05cdd13a85..f53d09666daf90f23e3d14e5a5f286946eb4ec2f 100644 (file)
--- a/pv/prop/int.cpp
+++ b/pv/prop/int.cpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 

-#include <cstdint>

 #include <cassert>
 #include <cassert>

+#include <cstdint>

 
 #include <QSpinBox>
 
 
 #include <QSpinBox>
 

diff --git a/pv/prop/property.hpp b/pv/prop/property.hpp
index 7e547dec5a43444a9a5751b39ea9178b1a12a29a..765cbb50d8bb7e629a6ee1164507ccd9cd9b1ae3 100644 (file)
--- a/pv/prop/property.hpp
+++ b/pv/prop/property.hpp
@@ -27,6 +27,7 @@ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 G_GNUC_END_IGNORE_DEPRECATIONS
 
 #include <functional>
 G_GNUC_END_IGNORE_DEPRECATIONS
 
 #include <functional>

+

 #include <QString>
 #include <QWidget>
 
 #include <QString>
 #include <QWidget>
 

diff --git a/pv/session.cpp b/pv/session.cpp
index d00ff97a0bbe78ae7a9e55a82e2913b36c602807..d7041d8ba2bea774e01cde16aabbd6e8b987f53b 100644 (file)
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -31,16 +31,16 @@
 
 #include <sys/stat.h>
 
 
 #include <sys/stat.h>
 

-#include "session.hpp"

 #include "devicemanager.hpp"
 #include "devicemanager.hpp"

+#include "session.hpp"

 
 #include "data/analog.hpp"
 #include "data/analogsegment.hpp"
 
 #include "data/analog.hpp"
 #include "data/analogsegment.hpp"

+#include "data/decode/decoder.hpp"

 #include "data/decoderstack.hpp"
 #include "data/logic.hpp"
 #include "data/logicsegment.hpp"
 #include "data/signalbase.hpp"
 #include "data/decoderstack.hpp"
 #include "data/logic.hpp"
 #include "data/logicsegment.hpp"
 #include "data/signalbase.hpp"

-#include "data/decode/decoder.hpp"

 
 #include "devices/hardwaredevice.hpp"
 #include "devices/inputfile.hpp"
 
 #include "devices/hardwaredevice.hpp"
 #include "devices/inputfile.hpp"

diff --git a/pv/storesession.cpp b/pv/storesession.cpp
index a5850060ec284e02c6ec1c4d0f2673c612d67b32..db766179e61f0c5b2d267221c809db8c2bb724c5 100644 (file)
--- a/pv/storesession.cpp
+++ b/pv/storesession.cpp
@@ -27,14 +27,14 @@
 
 #include "storesession.hpp"
 
 
 #include "storesession.hpp"
 

-#include <pv/devicemanager.hpp>
-#include <pv/session.hpp>

 #include <pv/data/analog.hpp>
 #include <pv/data/analogsegment.hpp>
 #include <pv/data/logic.hpp>
 #include <pv/data/logicsegment.hpp>
 #include <pv/data/signalbase.hpp>
 #include <pv/data/analog.hpp>
 #include <pv/data/analogsegment.hpp>
 #include <pv/data/logic.hpp>
 #include <pv/data/logicsegment.hpp>
 #include <pv/data/signalbase.hpp>

+#include <pv/devicemanager.hpp>

 #include <pv/devices/device.hpp>
 #include <pv/devices/device.hpp>

+#include <pv/session.hpp>

 
 #include <libsigrokcxx/libsigrokcxx.hpp>
 
 
 #include <libsigrokcxx/libsigrokcxx.hpp>
 

diff --git a/pv/storesession.hpp b/pv/storesession.hpp
index b6ead66df6822ee72833a6c3d4a300744ae70e84..f0c8de778d5723e957a7035f19f8bf21e66511f7 100644 (file)
--- a/pv/storesession.hpp
+++ b/pv/storesession.hpp
@@ -20,8 +20,8 @@
 #ifndef PULSEVIEW_PV_STORESESSION_HPP
 #define PULSEVIEW_PV_STORESESSION_HPP
 
 #ifndef PULSEVIEW_PV_STORESESSION_HPP
 #define PULSEVIEW_PV_STORESESSION_HPP
 

-#include <cstdint>

 #include <atomic>
 #include <atomic>

+#include <cstdint>

 #include <fstream>
 #include <map>
 #include <memory>
 #include <fstream>
 #include <map>
 #include <memory>

diff --git a/pv/strnatcmp.hpp b/pv/strnatcmp.hpp
index 1d8f5a244939b7ca8ba8eb35550f1a8b424c43d1..eaa73608e956aedadc198bd05b51b42a3a4eb400 100644 (file)
--- a/pv/strnatcmp.hpp
+++ b/pv/strnatcmp.hpp
@@ -27,8 +27,8 @@
 #ifndef PULSEVIEW_PV_STRNATCMP_HPP
 #define PULSEVIEW_PV_STRNATCMP_HPP
 
 #ifndef PULSEVIEW_PV_STRNATCMP_HPP
 #define PULSEVIEW_PV_STRNATCMP_HPP
 

-#include <cstddef>     /* size_t */

 #include <cctype>
 #include <cctype>

+#include <cstddef>     /* size_t */

 #include <string>
 
 using std::string;
 #include <string>
 
 using std::string;

diff --git a/pv/toolbars/mainbar.cpp b/pv/toolbars/mainbar.cpp
index 838fefcaaa101f5612f6d57ee1170a0f6d5b5f2d..333f222a3d03998b514187c4eb22b13564af5a77 100644 (file)
--- a/pv/toolbars/mainbar.cpp
+++ b/pv/toolbars/mainbar.cpp
@@ -43,8 +43,8 @@
 #include <pv/dialogs/inputoutputoptions.hpp>
 #include <pv/dialogs/storeprogress.hpp>
 #include <pv/mainwindow.hpp>
 #include <pv/dialogs/inputoutputoptions.hpp>
 #include <pv/dialogs/storeprogress.hpp>
 #include <pv/mainwindow.hpp>

-#include <pv/popups/deviceoptions.hpp>

 #include <pv/popups/channels.hpp>
 #include <pv/popups/channels.hpp>

+#include <pv/popups/deviceoptions.hpp>

 #include <pv/util.hpp>
 #include <pv/view/view.hpp>
 #include <pv/widgets/exportmenu.hpp>
 #include <pv/util.hpp>
 #include <pv/view/view.hpp>
 #include <pv/widgets/exportmenu.hpp>

diff --git a/pv/util.cpp b/pv/util.cpp
index 7d711f197013e65dcccca8172e14b9b29239bca6..8f2d7d2544cd8e30301a28c56f6537269dbe759a 100644 (file)
--- a/pv/util.cpp
+++ b/pv/util.cpp
@@ -21,12 +21,12 @@
 
 #include <extdef.h>
 
 
 #include <extdef.h>
 

-#include <cassert>

 #include <algorithm>
 #include <algorithm>

+#include <cassert>

 #include <sstream>
 
 #include <sstream>
 

-#include <QTextStream>

 #include <QDebug>
 #include <QDebug>

+#include <QTextStream>

 
 using std::fixed;
 using std::max;
 
 using std::fixed;
 using std::max;

diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp
index 4479885da72589eb678b45ad7f45d16830b8fc18..a15861c88d0ecfd8e4649389762dea8312dae754 100644 (file)
--- a/pv/view/analogsignal.cpp
+++ b/pv/view/analogsignal.cpp
@@ -40,9 +40,9 @@
 #include "pv/data/logic.hpp"
 #include "pv/data/logicsegment.hpp"
 #include "pv/data/signalbase.hpp"
 #include "pv/data/logic.hpp"
 #include "pv/data/logicsegment.hpp"
 #include "pv/data/signalbase.hpp"

-#include "pv/view/view.hpp"
-#include "pv/view/logicsignal.hpp"

 #include "pv/globalsettings.hpp"
 #include "pv/globalsettings.hpp"

+#include "pv/view/logicsignal.hpp"
+#include "pv/view/view.hpp"

 
 #include <libsigrokcxx/libsigrokcxx.hpp>
 
 
 #include <libsigrokcxx/libsigrokcxx.hpp>
 

diff --git a/pv/view/cursor.cpp b/pv/view/cursor.cpp
index d845817de8fcd53898c9d3248497128220ef4041..408eb311e9a57a15c2432ee3307207e8fce779e3 100644 (file)
--- a/pv/view/cursor.cpp
+++ b/pv/view/cursor.cpp
@@ -19,9 +19,9 @@
 
 #include "cursor.hpp"
 
 
 #include "cursor.hpp"
 

+#include "pv/util.hpp"

 #include "ruler.hpp"
 #include "view.hpp"
 #include "ruler.hpp"
 #include "view.hpp"

-#include "pv/util.hpp"

 
 #include <QApplication>
 #include <QBrush>
 
 #include <QApplication>
 #include <QBrush>

diff --git a/pv/view/cursorpair.cpp b/pv/view/cursorpair.cpp
index e0e3de65f3c9adc427f0ae877e79f0fcb4b0de1e..3259524c754acbf151dc7755146b220a347eaa31 100644 (file)
--- a/pv/view/cursorpair.cpp
+++ b/pv/view/cursorpair.cpp
@@ -19,12 +19,12 @@
 
 #include "cursorpair.hpp"
 
 
 #include "cursorpair.hpp"
 

+#include "pv/util.hpp"

 #include "ruler.hpp"
 #include "view.hpp"
 #include "ruler.hpp"
 #include "view.hpp"

-#include "pv/util.hpp"

 
 

-#include <cassert>

 #include <algorithm>
 #include <algorithm>

+#include <cassert>

 
 using std::max;
 using std::make_pair;
 
 using std::max;
 using std::make_pair;

diff --git a/pv/view/decodetrace.cpp b/pv/view/decodetrace.cpp
index 55b5f5754ab52edcf179978e4babd6ac185dd83e..0a624c311d9df9693ee0e5482957ec20fd3b2275 100644 (file)
--- a/pv/view/decodetrace.cpp
+++ b/pv/view/decodetrace.cpp
@@ -40,13 +40,13 @@ extern "C" {
 
 #include "decodetrace.hpp"
 
 
 #include "decodetrace.hpp"
 

-#include <pv/session.hpp>
-#include <pv/strnatcmp.hpp>
-#include <pv/data/decoderstack.hpp>
+#include <pv/data/decode/annotation.hpp>

 #include <pv/data/decode/decoder.hpp>
 #include <pv/data/decode/decoder.hpp>

+#include <pv/data/decoderstack.hpp>

 #include <pv/data/logic.hpp>
 #include <pv/data/logicsegment.hpp>
 #include <pv/data/logic.hpp>
 #include <pv/data/logicsegment.hpp>

-#include <pv/data/decode/annotation.hpp>
+#include <pv/session.hpp>
+#include <pv/strnatcmp.hpp>

 #include <pv/view/view.hpp>
 #include <pv/view/viewport.hpp>
 #include <pv/widgets/decodergroupbox.hpp>
 #include <pv/view/view.hpp>
 #include <pv/view/viewport.hpp>
 #include <pv/widgets/decodergroupbox.hpp>

diff --git a/pv/view/decodetrace.hpp b/pv/view/decodetrace.hpp
index 9f5755244bd61cc738a5930734f41a15b22b168d..648bb04ae2f9b2391cfa8d6ac1a7c798549d5695 100644 (file)
--- a/pv/view/decodetrace.hpp
+++ b/pv/view/decodetrace.hpp
@@ -30,8 +30,8 @@
 #include <QSignalMapper>
 
 #include <pv/binding/decoder.hpp>
 #include <QSignalMapper>
 
 #include <pv/binding/decoder.hpp>

-#include <pv/data/signalbase.hpp>

 #include <pv/data/decode/row.hpp>
 #include <pv/data/decode/row.hpp>

+#include <pv/data/signalbase.hpp>

 
 using std::list;
 using std::map;
 
 using std::list;
 using std::map;

diff --git a/pv/view/header.cpp b/pv/view/header.cpp
index 0e9445ea239e7a9879e1b88f24e1610b6a09b591..e2ccfedc4e4d53cdb68d8897edaa1ec7f1622b24 100644 (file)
--- a/pv/view/header.cpp
+++ b/pv/view/header.cpp
@@ -23,8 +23,8 @@
 #include "signal.hpp"
 #include "tracegroup.hpp"
 
 #include "signal.hpp"
 #include "tracegroup.hpp"
 

-#include <cassert>

 #include <algorithm>
 #include <algorithm>

+#include <cassert>

 
 #include <boost/iterator/filter_iterator.hpp>
 
 
 #include <boost/iterator/filter_iterator.hpp>
 

diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index 9c8f6b319cf7fbd1699b0810dea5ba17fe3bc753..86d45a4319013536ed12664ab49deda7e427d543 100644 (file)
--- a/pv/view/logicsignal.cpp
+++ b/pv/view/logicsignal.cpp
@@ -31,14 +31,14 @@
 #include "logicsignal.hpp"
 #include "view.hpp"
 
 #include "logicsignal.hpp"
 #include "view.hpp"
 

-#include <pv/session.hpp>
-#include <pv/devicemanager.hpp>
-#include <pv/devices/device.hpp>

 #include <pv/data/logic.hpp>
 #include <pv/data/logicsegment.hpp>
 #include <pv/data/signalbase.hpp>
 #include <pv/data/logic.hpp>
 #include <pv/data/logicsegment.hpp>
 #include <pv/data/signalbase.hpp>

-#include <pv/view/view.hpp>
+#include <pv/devicemanager.hpp>
+#include <pv/devices/device.hpp>

 #include <pv/globalsettings.hpp>
 #include <pv/globalsettings.hpp>

+#include <pv/session.hpp>
+#include <pv/view/view.hpp>

 
 #include <libsigrokcxx/libsigrokcxx.hpp>
 
 
 #include <libsigrokcxx/libsigrokcxx.hpp>
 

diff --git a/pv/view/timemarker.cpp b/pv/view/timemarker.cpp
index 3014b4a65a8e6d67adbfaa12d685766d4035302f..4874eb233c7ebf7d9fe5e282883dc93a1efbc8a7 100644 (file)
--- a/pv/view/timemarker.cpp
+++ b/pv/view/timemarker.cpp
@@ -23,12 +23,12 @@
 
 #include "timemarker.hpp"
 
 
 #include "timemarker.hpp"
 

-#include "view.hpp"

 #include "pv/widgets/timestampspinbox.hpp"
 #include "pv/widgets/timestampspinbox.hpp"

+#include "view.hpp"

 
 #include <QApplication>
 
 #include <QApplication>

-#include <QFormLayout>

 #include <QFontMetrics>
 #include <QFontMetrics>

+#include <QFormLayout>

 #include <QPainter>
 
 #include <pv/widgets/popup.hpp>
 #include <QPainter>
 
 #include <pv/widgets/popup.hpp>

diff --git a/pv/view/tracegroup.cpp b/pv/view/tracegroup.cpp
index 5b59eab94e8d3c3851ebac36f9e01e795d78a707..265bc27547c6c525607860a79707509ae12d490f 100644 (file)
--- a/pv/view/tracegroup.cpp
+++ b/pv/view/tracegroup.cpp
@@ -19,8 +19,8 @@
 
 #include <extdef.h>
 
 
 #include <extdef.h>
 

-#include <cassert>

 #include <algorithm>
 #include <algorithm>

+#include <cassert>

 
 #include <QMenu>
 #include <QPainter>
 
 #include <QMenu>
 #include <QPainter>

diff --git a/pv/view/tracetreeitemowner.cpp b/pv/view/tracetreeitemowner.cpp
index 31f4cb8331927133bca9073a34d16b24ac9fecbb..e62608851b4e76121b8d21791128a4c3341ac24f 100644 (file)
--- a/pv/view/tracetreeitemowner.cpp
+++ b/pv/view/tracetreeitemowner.cpp
@@ -20,8 +20,8 @@
 #include <cassert>
 
 #include "tracetreeitem.hpp"
 #include <cassert>
 
 #include "tracetreeitem.hpp"

-#include "tracetreeitemowner.hpp"

 #include "trace.hpp"
 #include "trace.hpp"

+#include "tracetreeitemowner.hpp"

 
 using std::find;
 using std::make_pair;
 
 using std::find;
 using std::make_pair;

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index dc545babf4d0147f87d6519498c6ea314339dfe1..0e3fa98fffc4b91b8f94af291c179ed20314724c 100644 (file)
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -36,9 +36,9 @@
 #include <boost/serialization/serialization.hpp>
 
 #include <QApplication>
 #include <boost/serialization/serialization.hpp>
 
 #include <QApplication>

-#include <QHBoxLayout>

 #include <QEvent>
 #include <QFontMetrics>
 #include <QEvent>
 #include <QFontMetrics>

+#include <QHBoxLayout>

 #include <QMouseEvent>
 #include <QScrollBar>
 
 #include <QMouseEvent>
 #include <QScrollBar>
 


@@ -54,11 +54,11 @@
 #include "view.hpp"
 #include "viewport.hpp"
 
 #include "view.hpp"
 #include "viewport.hpp"
 

-#include "pv/session.hpp"
-#include "pv/globalsettings.hpp"
-#include "pv/devices/device.hpp"

 #include "pv/data/logic.hpp"
 #include "pv/data/logicsegment.hpp"
 #include "pv/data/logic.hpp"
 #include "pv/data/logicsegment.hpp"

+#include "pv/devices/device.hpp"
+#include "pv/globalsettings.hpp"
+#include "pv/session.hpp"

 #include "pv/util.hpp"
 
 #ifdef ENABLE_DECODE
 #include "pv/util.hpp"
 
 #ifdef ENABLE_DECODE

diff --git a/pv/view/view.hpp b/pv/view/view.hpp
index ee62d11369b373ddd60d5b26820944ed7012f0b2..05d9d60193a00c2b7120f4a8dca1b4719c9d63a4 100644 (file)
--- a/pv/view/view.hpp
+++ b/pv/view/view.hpp
@@ -32,8 +32,8 @@
 #include <QTimer>
 
 #include <pv/data/signaldata.hpp>
 #include <QTimer>
 
 #include <pv/data/signaldata.hpp>

-#include <pv/views/viewbase.hpp>

 #include <pv/util.hpp>
 #include <pv/util.hpp>

+#include <pv/views/viewbase.hpp>

 
 #include "cursorpair.hpp"
 #include "flag.hpp"
 
 #include "cursorpair.hpp"
 #include "flag.hpp"

diff --git a/pv/view/viewitemowner.cpp b/pv/view/viewitemowner.cpp
index 7b32d92cc6ef5c1af93522b2013226a8fe4ba847..9487659006468dba0eee3198eb1002e28a80062e 100644 (file)
--- a/pv/view/viewitemowner.cpp
+++ b/pv/view/viewitemowner.cpp
@@ -20,8 +20,8 @@
 #include <cassert>
 
 #include "tracetreeitem.hpp"
 #include <cassert>
 
 #include "tracetreeitem.hpp"

-#include "tracetreeitemowner.hpp"

 #include "trace.hpp"
 #include "trace.hpp"

+#include "tracetreeitemowner.hpp"

 
 namespace pv {
 namespace views {
 
 namespace pv {
 namespace views {

diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index 4b5fe245e0c11a9c6af77fdd038201d4427e997e..d81befae9cb69522ea3a52f82f6b85540bfa6d19 100644 (file)
--- a/pv/view/viewport.cpp
+++ b/pv/view/viewport.cpp
@@ -17,9 +17,9 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 

+#include <algorithm>

 #include <cassert>
 #include <cmath>
 #include <cassert>
 #include <cmath>

-#include <algorithm>

 #include <limits>
 
 #include "signal.hpp"
 #include <limits>
 
 #include "signal.hpp"

diff --git a/pv/widgets/popup.cpp b/pv/widgets/popup.cpp
index 6d211c9887e2d3c4d20b794d97ec91ec53bd0da6..f1486e0089ac7f8a392baf58ce438d493338cbe9 100644 (file)
--- a/pv/widgets/popup.cpp
+++ b/pv/widgets/popup.cpp
@@ -20,10 +20,10 @@
 #include <algorithm>
 #include <cassert>
 
 #include <algorithm>
 #include <cassert>
 

-#include <QtGui>

 #include <QApplication>
 #include <QDesktopWidget>
 #include <QLineEdit>
 #include <QApplication>
 #include <QDesktopWidget>
 #include <QLineEdit>

+#include <QtGui>

 
 #include "popup.hpp"
 
 
 #include "popup.hpp"
 

diff --git a/pv/widgets/sweeptimingwidget.cpp b/pv/widgets/sweeptimingwidget.cpp
index ea77c0fee867a0a42e645ad13e1df31939a0186a..b4943225dd8d44ddae54fad59b7231e70a8c6e3f 100644 (file)
--- a/pv/widgets/sweeptimingwidget.cpp
+++ b/pv/widgets/sweeptimingwidget.cpp
@@ -19,9 +19,9 @@
 
 #include "sweeptimingwidget.hpp"
 
 
 #include "sweeptimingwidget.hpp"
 

+#include <cassert>

 #include <cstdlib>
 #include <vector>
 #include <cstdlib>
 #include <vector>

-#include <cassert>

 
 #include <extdef.h>
 
 
 #include <extdef.h>
 

diff --git a/pv/widgets/wellarray.cpp b/pv/widgets/wellarray.cpp
index 4e3382ba9153c90a2bcc962f03bdd7872e22a39a..433a7f5ec60c0f27e25e6e8245c5a6049c96c1e0 100644 (file)
--- a/pv/widgets/wellarray.cpp
+++ b/pv/widgets/wellarray.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
 **
 ****************************************************************************/
 

-#include <QPainter>

 #include <QPaintEvent>
 #include <QPaintEvent>

+#include <QPainter>

 #include <QStyle>
 #include <QStyleOptionFrame>
 
 #include <QStyle>
 #include <QStyleOptionFrame>
 

diff --git a/test/test.cpp b/test/test.cpp
index c2a50313ef4d7ab920fa72dc44b772fe7a288146..1f078ab4f8a3104a1a118caabe8027fcdd2961cc 100644 (file)
--- a/test/test.cpp
+++ b/test/test.cpp
@@ -18,8 +18,8 @@
  */
 
 #define BOOST_TEST_MAIN
  */
 
 #define BOOST_TEST_MAIN

-#include <boost/test/unit_test.hpp>

 #include "test/test.hpp"
 #include "test/test.hpp"

+#include <boost/test/unit_test.hpp>

 
 using std::ostream;
 
 
 using std::ostream;
 

diff --git a/test/view/ruler.cpp b/test/view/ruler.cpp
index 34bf20b72820e54b6d99d38338e8775aa3a138ac..5230e240dd9450f16757480e9e8de9b7cd89eb63 100644 (file)
--- a/test/view/ruler.cpp
+++ b/test/view/ruler.cpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 

-#include <boost/test/unit_test.hpp>

 #include <boost/test/floating_point_comparison.hpp>
 #include <boost/test/floating_point_comparison.hpp>

+#include <boost/test/unit_test.hpp>

 
 #include "pv/view/ruler.hpp"
 #include "test/test.hpp"
 
 #include "pv/view/ruler.hpp"
 #include "test/test.hpp"