Corrected pv::view::Trace header gates

diff --git a/pv/view/analogsignal.h b/pv/view/analogsignal.h
index 0b6172f8144884d51b5ba2a918db6bf8106f7d86..35db2ddc83f52055a11612fe3234c0f596543de7 100644 (file)
--- a/pv/view/analogsignal.h
+++ b/pv/view/analogsignal.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_ANALOGSIGNAL_H
-#define PULSEVIEW_PV_ANALOGSIGNAL_H
+#ifndef PULSEVIEW_PV_VIEW_ANALOGSIGNAL_H
+#define PULSEVIEW_PV_VIEW_ANALOGSIGNAL_H
 
 #include "signal.h"
 
@@ -84,4 +84,4 @@ private:
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_ANALOGSIGNAL_H
+#endif // PULSEVIEW_PV_VIEW_ANALOGSIGNAL_H

diff --git a/pv/view/decodesignal.h b/pv/view/decodesignal.h
index 22e0f3d07c02b31bd6b4bf75da4e212eb31b7a79..ab1a1608c692e52976c5caaa982eab19340095f6 100644 (file)
--- a/pv/view/decodesignal.h
+++ b/pv/view/decodesignal.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_DECODESIGNAL_H
-#define PULSEVIEW_PV_DECODESIGNAL_H
+#ifndef PULSEVIEW_PV_VIEW_DECODESIGNAL_H
+#define PULSEVIEW_PV_VIEW_DECODESIGNAL_H
 
 #include "trace.h"
 
@@ -88,4 +88,4 @@ private:
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_DECODESIGNAL_H
+#endif // PULSEVIEW_PV_VIEW_DECODESIGNAL_H

diff --git a/pv/view/logicsignal.h b/pv/view/logicsignal.h
index 99e470dba6951b26e26f30f8128b9804fe3b3bfb..4dbd5e8389fe346d781e69c02317d4699766e217 100644 (file)
--- a/pv/view/logicsignal.h
+++ b/pv/view/logicsignal.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_LOGICSIGNAL_H
-#define PULSEVIEW_PV_LOGICSIGNAL_H
+#ifndef PULSEVIEW_PV_VIEW_LOGICSIGNAL_H
+#define PULSEVIEW_PV_VIEW_LOGICSIGNAL_H
 
 #include "signal.h"
 
@@ -113,4 +113,4 @@ private:
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_LOGICSIGNAL_H
+#endif // PULSEVIEW_PV_VIEW_LOGICSIGNAL_H

diff --git a/pv/view/signal.h b/pv/view/signal.h
index cdecd408a9f9c45e6de3f29f4a18004ff51db828..01f057fec47c2fbcf80575ccd622e35348dca304 100644 (file)
--- a/pv/view/signal.h
+++ b/pv/view/signal.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_SIGNAL_H
-#define PULSEVIEW_PV_SIGNAL_H
+#ifndef PULSEVIEW_PV_VIEW_SIGNAL_H
+#define PULSEVIEW_PV_VIEW_SIGNAL_H
 
 #include <QComboBox>
 #include <QWidgetAction>
@@ -70,4 +70,4 @@ protected:
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_SIGNAL_H
+#endif // PULSEVIEW_PV_VIEW_SIGNAL_H

diff --git a/pv/view/trace.h b/pv/view/trace.h
index 462e8094048830439690f8214b68857711e53a04..243bc2ad41c307799a32b81e03943e7d7db7c3f7 100644 (file)
--- a/pv/view/trace.h
+++ b/pv/view/trace.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_TRACE_H
-#define PULSEVIEW_PV_TRACE_H
+#ifndef PULSEVIEW_PV_VIEW_TRACE_H
+#define PULSEVIEW_PV_VIEW_TRACE_H
 
 #include <QColor>
 #include <QPainter>
@@ -200,4 +200,4 @@ protected:
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_TRACEL_H
+#endif // PULSEVIEW_PV_VIEW_TRACE_H