Fix a few #include guard inconsistencies.

diff --git a/pv/binding/inputoutput.hpp b/pv/binding/inputoutput.hpp
index acfb61cb6b401ceaaa4b839088cb0b36803b6387..c77313aa605a6f6bb9749cf8eb5caf6266520082 100644 (file)
--- a/pv/binding/inputoutput.hpp
+++ b/pv/binding/inputoutput.hpp
@@ -81,4 +81,4 @@ private:
 }  // namespace binding
 }  // namespace pv
 
-#endif // PULSEVIEW_PV_BINDING_INPUTOUTPUT_H
+#endif // PULSEVIEW_PV_BINDING_INPUTOUTPUT_HPP

diff --git a/pv/data/decode/annotation.hpp b/pv/data/decode/annotation.hpp
index 717206a4b97b06b6f73eecb09b315002ebf6db0f..aab5119c4b94596071cc01a4c7ddeb4bf439c580 100644 (file)
--- a/pv/data/decode/annotation.hpp
+++ b/pv/data/decode/annotation.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEW_DECODE_ANNOTATION_HPP
-#define PULSEVIEW_PV_VIEW_DECODE_ANNOTATION_HPP
+#ifndef PULSEVIEW_PV_DATA_DECODE_ANNOTATION_HPP
+#define PULSEVIEW_PV_DATA_DECODE_ANNOTATION_HPP
 
 #include <cstdint>
 #include <vector>
@@ -80,4 +80,4 @@ private:
 } // namespace data
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_DECODE_ANNOTATION_HPP
+#endif // PULSEVIEW_PV_DATA_DECODE_ANNOTATION_HPP

diff --git a/pv/devices/inputfile.hpp b/pv/devices/inputfile.hpp
index e08832f608d6247e9febce369f32c3b8aea843e5..165010f717f3cffe067eac15c7a50bcd11d4aa1f 100644 (file)
--- a/pv/devices/inputfile.hpp
+++ b/pv/devices/inputfile.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_DEVICE_INPUTFILE_HPP
-#define PULSEVIEW_PV_DEVICE_INPUTFILE_HPP
+#ifndef PULSEVIEW_PV_DEVICES_INPUTFILE_HPP
+#define PULSEVIEW_PV_DEVICES_INPUTFILE_HPP
 
 #include <atomic>
 
@@ -81,5 +81,5 @@ private:
 } // namespace devices
 } // namespace pv
 
-#endif // PULSEVIEW_PV_SESSIONS_INPUTFILE_HPP
+#endif // PULSEVIEW_PV_DEVICES_INPUTFILE_HPP
 

diff --git a/pv/dialogs/connect.hpp b/pv/dialogs/connect.hpp
index f34268ddb6fde5a383cd56e42dd165da04b497e7..fe158740760c2e3964350b9990a95146ec81f86a 100644 (file)
--- a/pv/dialogs/connect.hpp
+++ b/pv/dialogs/connect.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_CONNECT_HPP
-#define PULSEVIEW_PV_CONNECT_HPP
+#ifndef PULSEVIEW_PV_DIALOGS_CONNECT_HPP
+#define PULSEVIEW_PV_DIALOGS_CONNECT_HPP
 
 #include <memory>
 
@@ -106,4 +106,4 @@ private:
 } // namespace dialogs
 } // namespace pv
 
-#endif // PULSEVIEW_PV_CONNECT_HPP
+#endif // PULSEVIEW_PV_DIALOGS_CONNECT_HPP

diff --git a/pv/dialogs/inputoutputoptions.hpp b/pv/dialogs/inputoutputoptions.hpp
index be6d33080f699a245355ebc92ee7b493aade746d..11c905a4ca61eef498b597f9f2afaf1724cb955b 100644 (file)
--- a/pv/dialogs/inputoutputoptions.hpp
+++ b/pv/dialogs/inputoutputoptions.hpp
@@ -70,4 +70,4 @@ private:
 } // namespace dialogs
 } // namespace pv
 
-#endif // PULSEVIEW_PV_INPUTOUTPUTOPTIONS_HPP
+#endif // PULSEVIEW_PV_DIALOGS_INPUTOUTPUTOPTIONS_HPP

diff --git a/pv/dialogs/settings.hpp b/pv/dialogs/settings.hpp
index 50f3be65c51fe9fb97569f917034c501c85f5220..157fa6ba1de7881a3c265ffa4b7790af957b56be 100644 (file)
--- a/pv/dialogs/settings.hpp
+++ b/pv/dialogs/settings.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_SETTINGS_HPP
-#define PULSEVIEW_PV_SETTINGS_HPP
+#ifndef PULSEVIEW_PV_DIALOGS_SETTINGS_HPP
+#define PULSEVIEW_PV_DIALOGS_SETTINGS_HPP
 
 #include <QCheckBox>
 #include <QColor>
@@ -102,4 +102,4 @@ private:
 } // namespace dialogs
 } // namespace pv
 
-#endif // PULSEVIEW_PV_SETTINGS_HPP
+#endif // PULSEVIEW_PV_DIALOGS_SETTINGS_HPP

diff --git a/pv/dialogs/storeprogress.hpp b/pv/dialogs/storeprogress.hpp
index c42566289f83e5e7ee4656a4f6f94b87e6c32f3a..fd3558993ced162e12f0505c2f3ab0abd8ee4796 100644 (file)
--- a/pv/dialogs/storeprogress.hpp
+++ b/pv/dialogs/storeprogress.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_DIALOGS_SAVEPROGRESS_HPP
-#define PULSEVIEW_PV_DIALOGS_SAVEPROGRESS_HPP
+#ifndef PULSEVIEW_PV_DIALOGS_STOREPROGRESS_HPP
+#define PULSEVIEW_PV_DIALOGS_STOREPROGRESS_HPP
 
 #include <memory>
 #include <set>
@@ -68,4 +68,4 @@ private:
 }  // namespace dialogs
 }  // namespace pv
 
-#endif // PULSEVIEW_PV_DIALOGS_SAVEPROGRESS_HPP
+#endif // PULSEVIEW_PV_DIALOGS_STOREPROGRESS_HPP

diff --git a/pv/globalsettings.hpp b/pv/globalsettings.hpp
index cf1921e89ea52b551f3ca46a85102b04a9dbf502..e41c2ea9ed6a8b8d88b537f7bbae33bcc07f418d 100644 (file)
--- a/pv/globalsettings.hpp
+++ b/pv/globalsettings.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_GLOBALSETTINGS_HPP
-#define PULSEVIEW_GLOBALSETTINGS_HPP
+#ifndef PULSEVIEW_PV_GLOBALSETTINGS_HPP
+#define PULSEVIEW_PV_GLOBALSETTINGS_HPP
 
 #include <map>
 
@@ -146,4 +146,4 @@ private:
 
 } // namespace pv
 
-#endif // PULSEVIEW_GLOBALSETTINGS_HPP
+#endif // PULSEVIEW_PV_GLOBALSETTINGS_HPP

diff --git a/pv/subwindows/subwindowbase.hpp b/pv/subwindows/subwindowbase.hpp
index ab3a08b412af72790fde7eed678030a8bdc4b91e..2688c2b3dcc1a5f6ba062b62b83030874079c21d 100644 (file)
--- a/pv/subwindows/subwindowbase.hpp
+++ b/pv/subwindows/subwindowbase.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_SUBWINDOWBASE_HPP
-#define PULSEVIEW_PV_SUBWINDOWBASE_HPP
+#ifndef PULSEVIEW_PV_SUBWINDOWS_SUBWINDOWBASE_HPP
+#define PULSEVIEW_PV_SUBWINDOWS_SUBWINDOWBASE_HPP
 
 #include <cstdint>
 #include <memory>
@@ -90,4 +90,4 @@ protected:
 } // namespace subwindows
 } // namespace pv
 
-#endif // PULSEVIEW_PV_SUBWINDOWBASE_HPP
+#endif // PULSEVIEW_PV_SUBWINDOWS_SUBWINDOWBASE_HPP

diff --git a/pv/util.hpp b/pv/util.hpp
index e1640c4a374d8a9aed51231ae03a6b1c895486b1..354013fe13e673ed3f82f4718505183c64b373b8 100644 (file)
--- a/pv/util.hpp
+++ b/pv/util.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_UTIL_HPP
-#define PULSEVIEW_UTIL_HPP
+#ifndef PULSEVIEW_PV_UTIL_HPP
+#define PULSEVIEW_PV_UTIL_HPP
 
 #include <cmath>
 #include <string>
@@ -143,4 +143,4 @@ vector<string> split_string(string text, string separator);
 
 Q_DECLARE_METATYPE(pv::util::Timestamp)
 
-#endif // PULSEVIEW_UTIL_HPP
+#endif // PULSEVIEW_PV_UTIL_HPP

diff --git a/pv/views/decoder_binary/QHexView.hpp b/pv/views/decoder_binary/QHexView.hpp
index 12729f80b28ddf86aa14fd48933d0da7c8da0549..5f46ba1cae72078a76ed1cbb49fd79719fa75475 100644 (file)
--- a/pv/views/decoder_binary/QHexView.hpp
+++ b/pv/views/decoder_binary/QHexView.hpp
@@ -27,8 +27,8 @@
  * SOFTWARE.
  */
 
-#ifndef PULSEVIEW_PV_VIEWS_DECODERBINARY_QHEXVIEW_H
-#define PULSEVIEW_PV_VIEWS_DECODERBINARY_QHEXVIEW_H
+#ifndef PULSEVIEW_PV_VIEWS_DECODER_BINARY_QHEXVIEW_HPP
+#define PULSEVIEW_PV_VIEWS_DECODER_BINARY_QHEXVIEW_HPP
 
 #include <QAbstractScrollArea>
 
@@ -99,4 +99,4 @@ private:
        vector<QColor> chunk_colors_;
 };
 
-#endif /* PULSEVIEW_PV_VIEWS_DECODERBINARY_QHEXVIEW_H */
+#endif // PULSEVIEW_PV_VIEWS_DECODER_BINARY_QHEXVIEW_HPP

diff --git a/pv/views/decoder_binary/view.hpp b/pv/views/decoder_binary/view.hpp
index c1d70b1bad77af47b5c1226b19e4921e9f1d6664..eea6666139a34b76685c36917de26f8d0a953837 100644 (file)
--- a/pv/views/decoder_binary/view.hpp
+++ b/pv/views/decoder_binary/view.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEWS_DECODERBINARY_VIEW_HPP
-#define PULSEVIEW_PV_VIEWS_DECODERBINARY_VIEW_HPP
+#ifndef PULSEVIEW_PV_VIEWS_DECODER_BINARY_VIEW_HPP
+#define PULSEVIEW_PV_VIEWS_DECODER_BINARY_VIEW_HPP
 
 #include <QAction>
 #include <QComboBox>
@@ -112,4 +112,4 @@ private:
 } // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWS_DECODERBINARY_VIEW_HPP
+#endif // PULSEVIEW_PV_VIEWS_DECODER_BINARY_VIEW_HPP

diff --git a/pv/views/tabular_decoder/view.hpp b/pv/views/tabular_decoder/view.hpp
index 534e3d9d99eb41cf87d80fc0f281fe1a72a2de4d..73fb30c4f0a1fb4a85b396c452b5d9b3b5cc9cf6 100644 (file)
--- a/pv/views/tabular_decoder/view.hpp
+++ b/pv/views/tabular_decoder/view.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEWS_TABULARDECODER_VIEW_HPP
-#define PULSEVIEW_PV_VIEWS_TABULARDECODER_VIEW_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TABULAR_DECODER_VIEW_HPP
+#define PULSEVIEW_PV_VIEWS_TABULAR_DECODER_VIEW_HPP
 
 #include <QAction>
 #include <QCheckBox>
@@ -208,4 +208,4 @@ private:
 } // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWS_TABULARDECODER_VIEW_HPP
+#endif // PULSEVIEW_PV_VIEWS_TABULAR_DECODER_VIEW_HPP

diff --git a/pv/views/trace/analogsignal.hpp b/pv/views/trace/analogsignal.hpp
index c588eb88bf26e33abb7e7a8ac0fc53e7dc30af47..b15c44342737222f715ade4e9a33e3530c2d9e04 100644 (file)
--- a/pv/views/trace/analogsignal.hpp
+++ b/pv/views/trace/analogsignal.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_ANALOGSIGNAL_HPP
-#define PULSEVIEW_PV_VIEWS_TRACEVIEW_ANALOGSIGNAL_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACE_ANALOGSIGNAL_HPP
+#define PULSEVIEW_PV_VIEWS_TRACE_ANALOGSIGNAL_HPP
 
 #include <memory>
 
@@ -213,4 +213,4 @@ private:
 } // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_ANALOGSIGNAL_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_ANALOGSIGNAL_HPP

diff --git a/pv/views/trace/cursor.hpp b/pv/views/trace/cursor.hpp
index 0da72e9fa5e3744b9d7c8f3ed2f1c84b3be02f71..73e84ee8d377fbb4ab006ff4ba5781bfd260c851 100644 (file)
--- a/pv/views/trace/cursor.hpp
+++ b/pv/views/trace/cursor.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_CURSOR_HPP
-#define PULSEVIEW_PV_VIEWS_TRACEVIEW_CURSOR_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACE_CURSOR_HPP
+#define PULSEVIEW_PV_VIEWS_TRACE_CURSOR_HPP
 
 #include "timemarker.hpp"
 
@@ -77,4 +77,4 @@ private:
 } // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_CURSOR_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_CURSOR_HPP

diff --git a/pv/views/trace/cursorpair.hpp b/pv/views/trace/cursorpair.hpp
index d59d9414d6ae5488896131ccf9c667716bd0737f..ba6b2a7097590120942ad530325bf48bb4321aa0 100644 (file)
--- a/pv/views/trace/cursorpair.hpp
+++ b/pv/views/trace/cursorpair.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_CURSORPAIR_HPP
-#define PULSEVIEW_PV_VIEWS_TRACEVIEW_CURSORPAIR_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACE_CURSORPAIR_HPP
+#define PULSEVIEW_PV_VIEWS_TRACE_CURSORPAIR_HPP
 
 #include "cursor.hpp"
 #include "pv/globalsettings.hpp"
@@ -135,4 +135,4 @@ private:
 } // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_CURSORPAIR_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_CURSORPAIR_HPP

diff --git a/pv/views/trace/decodetrace.hpp b/pv/views/trace/decodetrace.hpp
index 4a65d5ba24f53509c497fb9cd004dc3b814e3c02..1b79161dbdb8143328651baf3a0440283fe3e830 100644 (file)
--- a/pv/views/trace/decodetrace.hpp
+++ b/pv/views/trace/decodetrace.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_DECODETRACE_HPP
-#define PULSEVIEW_PV_VIEWS_TRACEVIEW_DECODETRACE_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACE_DECODETRACE_HPP
+#define PULSEVIEW_PV_VIEWS_TRACE_DECODETRACE_HPP
 
 #include <config.h>
 #include "trace.hpp"
@@ -335,4 +335,4 @@ private:
 } // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_DECODETRACE_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_DECODETRACE_HPP

diff --git a/pv/views/trace/flag.hpp b/pv/views/trace/flag.hpp
index e58771b81a4f4f603d8171fdfb8905d8a6edb6e1..4c4c977f0d19254bf17b199c6ede54e688a2d60a 100644 (file)
--- a/pv/views/trace/flag.hpp
+++ b/pv/views/trace/flag.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_FLAG_HPP
-#define PULSEVIEW_PV_VIEWS_TRACEVIEW_FLAG_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACE_FLAG_HPP
+#define PULSEVIEW_PV_VIEWS_TRACE_FLAG_HPP
 
 #include <memory>
 
@@ -93,4 +93,4 @@ private:
 } // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_FLAG_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_FLAG_HPP

diff --git a/pv/views/trace/header.hpp b/pv/views/trace/header.hpp
index 5d2ba4b7ce1c9e794a5ffa8f27cf1c8b4b02f04c..32b7e6128bddb4f4f82a88c241843fe87c32bec0 100644 (file)
--- a/pv/views/trace/header.hpp
+++ b/pv/views/trace/header.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_HEADER_HPP
-#define PULSEVIEW_PV_VIEWS_TRACEVIEW_HEADER_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACE_HEADER_HPP
+#define PULSEVIEW_PV_VIEWS_TRACE_HEADER_HPP
 
 #include <list>
 #include <memory>
@@ -94,4 +94,4 @@ private Q_SLOTS:
 } // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_HEADER_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_HEADER_HPP

diff --git a/pv/views/trace/logicsignal.hpp b/pv/views/trace/logicsignal.hpp
index b769ec55914cfea4af1d6a685e3a53a96528fe96..96e98b4b0e27cdb2105a1d6cdc94118376f92898 100644 (file)
--- a/pv/views/trace/logicsignal.hpp
+++ b/pv/views/trace/logicsignal.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_LOGICSIGNAL_HPP
-#define PULSEVIEW_PV_VIEWS_TRACEVIEW_LOGICSIGNAL_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACE_LOGICSIGNAL_HPP
+#define PULSEVIEW_PV_VIEWS_TRACE_LOGICSIGNAL_HPP
 
 #include <QCache>
 #include <QColor>
@@ -167,4 +167,4 @@ private:
 } // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_LOGICSIGNAL_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_LOGICSIGNAL_HPP

diff --git a/pv/views/trace/marginwidget.hpp b/pv/views/trace/marginwidget.hpp
index ef5e6350fe1cd1e4b1f6b9ba0ddfd01e4dc7ce6f..bedf8a92bea06051e69eea31d19d11a840894b10 100644 (file)
--- a/pv/views/trace/marginwidget.hpp
+++ b/pv/views/trace/marginwidget.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_MARGINWIDGET_HPP
-#define PULSEVIEW_PV_MARGINWIDGET_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACE_MARGINWIDGET_HPP
+#define PULSEVIEW_PV_VIEWS_TRACE_MARGINWIDGET_HPP
 
 #include <memory>
 
@@ -73,4 +73,4 @@ protected Q_SLOTS:
 } // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_MARGINWIDGET_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_MARGINWIDGET_HPP

diff --git a/pv/views/trace/ruler.hpp b/pv/views/trace/ruler.hpp
index 9d708ce027bc9bfaca3ed6610c81fb338ea5dae6..55c156f5942e34f8a97912322b25a3b2df4c669b 100644 (file)
--- a/pv/views/trace/ruler.hpp
+++ b/pv/views/trace/ruler.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_RULER_HPP
-#define PULSEVIEW_PV_VIEWS_TRACEVIEW_RULER_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACE_RULER_HPP
+#define PULSEVIEW_PV_VIEWS_TRACE_RULER_HPP
 
 #include <functional>
 #include <memory>
@@ -203,4 +203,4 @@ private:
 } // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_RULER_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_RULER_HPP

diff --git a/pv/views/trace/signal.hpp b/pv/views/trace/signal.hpp
index c9f38dd96107657d7e16fd6fb05b71a16488dfa2..0674209ec06eb6a96fa1af648d97ce4f582d6b4b 100644 (file)
--- a/pv/views/trace/signal.hpp
+++ b/pv/views/trace/signal.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_SIGNAL_HPP
-#define PULSEVIEW_PV_VIEWS_TRACEVIEW_SIGNAL_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACE_SIGNAL_HPP
+#define PULSEVIEW_PV_VIEWS_TRACE_SIGNAL_HPP
 
 #include <memory>
 
@@ -119,4 +119,4 @@ protected:
 } // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_SIGNAL_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_SIGNAL_HPP

diff --git a/pv/views/trace/timeitem.hpp b/pv/views/trace/timeitem.hpp
index 06d850505ce8ebde350ecfbcbaeecbd5b3a79c3a..acac3273955f49c862932fbfe4ad3654e6e0ac07 100644 (file)
--- a/pv/views/trace/timeitem.hpp
+++ b/pv/views/trace/timeitem.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_TIMEITEM_HPP
-#define PULSEVIEW_PV_VIEWS_TRACEVIEW_TIMEITEM_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACE_TIMEITEM_HPP
+#define PULSEVIEW_PV_VIEWS_TRACE_TIMEITEM_HPP
 
 #include "viewitem.hpp"
 
@@ -77,4 +77,4 @@ protected:
 } // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_TIMEITEM_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_TIMEITEM_HPP

diff --git a/pv/views/trace/timemarker.hpp b/pv/views/trace/timemarker.hpp
index cd7c84d279747cddf13fb0a6fd58c11af5292b3f..040a29ea78605fadcd5c2723ac37019b9691cca9 100644 (file)
--- a/pv/views/trace/timemarker.hpp
+++ b/pv/views/trace/timemarker.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_MARKER_HPP
-#define PULSEVIEW_PV_VIEWS_TRACEVIEW_MARKER_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACE_TIMEMARKER_HPP
+#define PULSEVIEW_PV_VIEWS_TRACE_TIMEMARKER_HPP
 
 #include <QColor>
 #include <QDoubleSpinBox>
@@ -139,4 +139,4 @@ protected:
 } // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_MARKER_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_TIMEMARKER_HPP

diff --git a/pv/views/trace/trace.hpp b/pv/views/trace/trace.hpp
index 2b98811b32ea3506865fc8db5e9e4924644539c7..3ea01d464830c6b758da424931cca85f105e414f 100644 (file)
--- a/pv/views/trace/trace.hpp
+++ b/pv/views/trace/trace.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACE_HPP
-#define PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACE_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACE_TRACE_HPP
+#define PULSEVIEW_PV_VIEWS_TRACE_TRACE_HPP
 
 #include <QColor>
 #include <QPainter>
@@ -217,4 +217,4 @@ private:
 } // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACE_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_TRACE_HPP

diff --git a/pv/views/trace/tracegroup.hpp b/pv/views/trace/tracegroup.hpp
index 4a793665886856971b52e56d8647a96ab6fc92af..b41db6bca2bcbf0f41f7e85a583f25e82a9522e9 100644 (file)
--- a/pv/views/trace/tracegroup.hpp
+++ b/pv/views/trace/tracegroup.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACEGROUP_HPP
-#define PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACEGROUP_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACE_TRACEGROUP_HPP
+#define PULSEVIEW_PV_VIEWS_TRACE_TRACEGROUP_HPP
 
 #include "tracetreeitem.hpp"
 #include "tracetreeitemowner.hpp"
@@ -131,4 +131,4 @@ private Q_SLOTS:
 } // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACEGROUP_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_TRACEGROUP_HPP

diff --git a/pv/views/trace/tracepalette.hpp b/pv/views/trace/tracepalette.hpp
index 7819ee6c44dcde4576ed0ed4fd81b561df40a014..6273605d83d84ed81b7911f538d53db838d5d3d7 100644 (file)
--- a/pv/views/trace/tracepalette.hpp
+++ b/pv/views/trace/tracepalette.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACEPALETTE_HPP
-#define PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACEPALETTE_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACE_TRACEPALETTE_HPP
+#define PULSEVIEW_PV_VIEWS_TRACE_TRACEPALETTE_HPP
 
 #include <QColor>
 
@@ -38,4 +38,4 @@ public:
 } // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACEPALETTE_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_TRACEPALETTE_HPP

diff --git a/pv/views/trace/tracetreeitem.hpp b/pv/views/trace/tracetreeitem.hpp
index 51e2ba42914741178f245d6b0c4a947b9c3e0b4a..e5ebbdd74dc40651d7531ec6f0ba539f0c15430f 100644 (file)
--- a/pv/views/trace/tracetreeitem.hpp
+++ b/pv/views/trace/tracetreeitem.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACETREEITEM_HPP
-#define PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACETREEITEM_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACE_TRACETREEITEM_HPP
+#define PULSEVIEW_PV_VIEWS_TRACE_TRACETREEITEM_HPP
 
 #include <memory>
 
@@ -133,4 +133,4 @@ private:
 } // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACETREEITEM_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_TRACETREEITEM_HPP

diff --git a/pv/views/trace/tracetreeitemowner.hpp b/pv/views/trace/tracetreeitemowner.hpp
index 571090072df8a123f5d29f7f06863e06685ec2fa..b7e95843485c9a2dea03c515e3a9e3c490ba99c7 100644 (file)
--- a/pv/views/trace/tracetreeitemowner.hpp
+++ b/pv/views/trace/tracetreeitemowner.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACETREEITEMOWNER_HPP
-#define PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACETREEITEMOWNER_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACE_TRACETREEITEMOWNER_HPP
+#define PULSEVIEW_PV_VIEWS_TRACE_TRACETREEITEMOWNER_HPP
 
 #include "viewitemowner.hpp"
 #include "tracetreeitem.hpp"
@@ -110,4 +110,4 @@ public:
 } // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACETREEITEMOWNER_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_TRACETREEITEMOWNER_HPP

diff --git a/pv/views/trace/triggermarker.hpp b/pv/views/trace/triggermarker.hpp
index 222d3fb9f78c76450d75f9dde25b32f6dc1240c0..40c096c0292fa32778c078f0a26bb5fbb1059789 100644 (file)
--- a/pv/views/trace/triggermarker.hpp
+++ b/pv/views/trace/triggermarker.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_TRIGGER_MARKER_HPP
-#define PULSEVIEW_PV_VIEWS_TRACEVIEW_TRIGGER_MARKER_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACE_TRIGGERMARKER_HPP
+#define PULSEVIEW_PV_VIEWS_TRACE_TRIGGERMARKER_HPP
 
 #include "timeitem.hpp"
 
@@ -92,4 +92,4 @@ private:
 } // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_TRIGGER_MARKER_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_TRIGGERMARKER_HPP

diff --git a/pv/views/trace/view.hpp b/pv/views/trace/view.hpp
index 1d630158401e2592c4754bfd7a8e11c787f246fe..63bafbfeac958f745241a6dbbb7678ae28ebd42c 100644 (file)
--- a/pv/views/trace/view.hpp
+++ b/pv/views/trace/view.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEW_HPP
-#define PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEW_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACE_VIEW_HPP
+#define PULSEVIEW_PV_VIEWS_TRACE_VIEW_HPP
 
 #include <cstdint>
 #include <list>
@@ -587,4 +587,4 @@ private:
 } // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEW_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_VIEW_HPP

diff --git a/pv/views/trace/viewitem.hpp b/pv/views/trace/viewitem.hpp
index 423e75d2f313e38ec7cd156831c1119edaea47f8..77c8665e17522a3d08c3e07f631b866078f21ed6 100644 (file)
--- a/pv/views/trace/viewitem.hpp
+++ b/pv/views/trace/viewitem.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEWITEM_HPP
-#define PULSEVIEW_PV_VIEWITEM_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACE_VIEWITEM_HPP
+#define PULSEVIEW_PV_VIEWS_TRACE_VIEWITEM_HPP
 
 #include <list>
 
@@ -191,4 +191,4 @@ private:
 } // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWITEM_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_VIEWITEM_HPP

diff --git a/pv/views/trace/viewitemiterator.hpp b/pv/views/trace/viewitemiterator.hpp
index 88600d08982660f2eb4ee99f52c59f5590228a91..f94efa90964ef376ca383a8741573a6bc8685015 100644 (file)
--- a/pv/views/trace/viewitemiterator.hpp
+++ b/pv/views/trace/viewitemiterator.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEWITEMITERATOR_HPP
-#define PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEWITEMITERATOR_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACE_VIEWITEMITERATOR_HPP
+#define PULSEVIEW_PV_VIEWS_TRACE_VIEWITEMITERATOR_HPP
 
 #include <algorithm>
 #include <cassert>
@@ -129,4 +129,4 @@ void swap(ViewItemIterator<Owner, Item>& a, ViewItemIterator<Owner, Item>& b)
 } // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEWITEMITERATOR_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_VIEWITEMITERATOR_HPP

diff --git a/pv/views/trace/viewitemowner.hpp b/pv/views/trace/viewitemowner.hpp
index 29f74b5aff7ddcdfb47cf2fad387ee98e2b11b55..9f4143cb366c973a6e5770c24bd271a0084f2c98 100644 (file)
--- a/pv/views/trace/viewitemowner.hpp
+++ b/pv/views/trace/viewitemowner.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEWITEMOWNER_HPP
-#define PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEWITEMOWNER_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACE_VIEWITEMOWNER_HPP
+#define PULSEVIEW_PV_VIEWS_TRACE_VIEWITEMOWNER_HPP
 
 #include <memory>
 #include <vector>
@@ -98,4 +98,4 @@ protected:
 } // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEWITEMOWNER_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_VIEWITEMOWNER_HPP

diff --git a/pv/views/trace/viewitempaintparams.hpp b/pv/views/trace/viewitempaintparams.hpp
index 725a4336bbcb4944d3ca09992ba9da293523ee6c..e52b92f18e3b020ce0a82405aea2f94a4e8bd570 100644 (file)
--- a/pv/views/trace/viewitempaintparams.hpp
+++ b/pv/views/trace/viewitempaintparams.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEWITEMPAINTPARAMS_HPP
-#define PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEWITEMPAINTPARAMS_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACE_VIEWITEMPAINTPARAMS_HPP
+#define PULSEVIEW_PV_VIEWS_TRACE_VIEWITEMPAINTPARAMS_HPP
 
 #include "pv/util.hpp"
 
@@ -97,4 +97,4 @@ private:
 } // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEWITEMPAINTPARAMS_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_VIEWITEMPAINTPARAMS_HPP

diff --git a/pv/views/trace/viewport.hpp b/pv/views/trace/viewport.hpp
index 1b77a0d0699e7264170f869f39097216d923103b..48f2d09c9d0c4c178535c089bdc86a7a064d26fc 100644 (file)
--- a/pv/views/trace/viewport.hpp
+++ b/pv/views/trace/viewport.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEWPORT_HPP
-#define PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEWPORT_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACE_VIEWPORT_HPP
+#define PULSEVIEW_PV_VIEWS_TRACE_VIEWPORT_HPP
 
 #include <boost/optional.hpp>
 
@@ -111,4 +111,4 @@ private:
 } // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEWPORT_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_VIEWPORT_HPP

diff --git a/pv/views/trace/viewwidget.hpp b/pv/views/trace/viewwidget.hpp
index 427a8994e60cbeadf91995ce5fc6c3bfda76137e..ef3cfa2fc303d9692d84e596d486191888cda143 100644 (file)
--- a/pv/views/trace/viewwidget.hpp
+++ b/pv/views/trace/viewwidget.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEWWIDGET_HPP
-#define PULSEVIEW_PV_VIEWWIDGET_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACE_VIEWWIDGET_HPP
+#define PULSEVIEW_PV_VIEWS_TRACE_VIEWWIDGET_HPP
 
 #include <memory>
 
@@ -161,4 +161,4 @@ protected:
 } // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWWIDGET_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_VIEWWIDGET_HPP

diff --git a/pv/widgets/flowlayout.hpp b/pv/widgets/flowlayout.hpp
index 81407d1b40972e7eb360d82def71c64d7108758a..c8ee094197ddaeacfa258ebb5389f3d12e583d72 100644 (file)
--- a/pv/widgets/flowlayout.hpp
+++ b/pv/widgets/flowlayout.hpp
@@ -38,8 +38,8 @@
  **
  ****************************************************************************/
 
-#ifndef FLOWLAYOUT_H
-#define FLOWLAYOUT_H
+#ifndef PULSEVIEW_PV_WIDGETS_FLOWLAYOUT_HPP
+#define PULSEVIEW_PV_WIDGETS_FLOWLAYOUT_HPP
 
 #include <QLayout>
 #include <QRect>
@@ -75,4 +75,4 @@ private:
        int m_hSpace, m_vSpace;
 };
 
-#endif
+#endif // PULSEVIEW_PV_WIDGETS_FLOWLAYOUT_HPP

diff --git a/pv/widgets/timestampspinbox.hpp b/pv/widgets/timestampspinbox.hpp
index 123ef876d7b19f205deea84c229fc7d97a5fc244..25e30ac5ed4a711a766d59dbce64b175c72b7464 100644 (file)
--- a/pv/widgets/timestampspinbox.hpp
+++ b/pv/widgets/timestampspinbox.hpp
@@ -89,4 +89,4 @@ private:
 }  // namespace widgets
 }  // namespace pv
 
-#endif
+#endif // PULSEVIEW_PV_WIDGETS_TIMESTAMPSPINBOX_HPP

diff --git a/signalhandler.hpp b/signalhandler.hpp
index a17b04b9eb885d8de55f5bc507d0974eae554668..fad3ac39814d8b674829469e171ae315c20d04dd 100644 (file)
--- a/signalhandler.hpp
+++ b/signalhandler.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_SIGNALHANDLER_HPP
-#define PULSEVIEW_PV_SIGNALHANDLER_HPP
+#ifndef PULSEVIEW_SIGNALHANDLER_HPP
+#define PULSEVIEW_SIGNALHANDLER_HPP
 
 #include <QObject>
 
@@ -51,4 +51,4 @@ private:
        static int sockets_[2];
 };
 
-#endif // PULSEVIEW_PV_SIGNALHANDLER_HPP
+#endif // PULSEVIEW_SIGNALHANDLER_HPP

diff --git a/test/test.hpp b/test/test.hpp
index 62e6cf0da4bddbaaa44f75c36770b76e33a97d4b..41e96accdfa49ad12d4f9dfb11b67e906f163686 100644 (file)
--- a/test/test.hpp
+++ b/test/test.hpp
@@ -26,4 +26,4 @@ using std::ostream;
 
 ostream& operator<<(ostream& stream, const QString& str);
 
-#endif
+#endif // PULSEVIEW_TEST_TEST_HPP