Fix #include guards.

 - Add missing #include guards.

 - Fix incorrect #endif comments for some #include guards.

 - Use consistent naming for them, as per HACKING.

diff --git a/extdef.h b/extdef.h
index c2a0f16ce46094a5eff1d849d58410eea434b217..8af615c0b443eadb36acecc9d9eaead37280283d 100644 (file)
--- a/extdef.h
+++ b/extdef.h
@@ -18,12 +18,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef _EXTDEF_H
-#define _EXTDEF_H
+#ifndef PULSEVIEW_EXTDEF_H
+#define PULSEVIEW_EXTDEF_H
 
 #define countof(x) (sizeof(x)/sizeof(x[0]))
 
 #define begin_element(x) (&x[0])
 #define end_element(x) (&x[countof(x)])
 
-#endif /* _EXTDEF_H */
+#endif // PULSEVIEW_EXTDEF_H

diff --git a/pv/about.h b/pv/about.h
index 31392b2b77ec0ff34edaca9a0b89905bdc3e67b6..5b845cb43043adaef98e0194107245f9eb3ff127 100644 (file)
--- a/pv/about.h
+++ b/pv/about.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef ABOUT_H
-#define ABOUT_H
+#ifndef PULSEVIEW_PV_ABOUT_H
+#define PULSEVIEW_PV_ABOUT_H
 
 #include <QDialog>
 
@@ -48,4 +48,4 @@ private:
 
 } // namespace pv
 
-#endif // ABOUT_H
+#endif // PULSEVIEW_PV_ABOUT_H

diff --git a/pv/datasnapshot.h b/pv/datasnapshot.h
index 221ebcd369ad1af839d4f2ffb0f6161035779f8f..9c0866d48f0eb56a382558b7d2d8092d33841d51 100644 (file)
--- a/pv/datasnapshot.h
+++ b/pv/datasnapshot.h
@@ -18,6 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#ifndef PULSEVIEW_PV_DATASNAPSHOT_H
+#define PULSEVIEW_PV_DATASNAPSHOT_H
+
 extern "C" {
 #include <libsigrok/libsigrok.h>
 }
@@ -43,3 +46,5 @@ protected:
 };
 
 } // namespace pv
+
+#endif // PULSEVIEW_PV_DATASNAPSHOT_H

diff --git a/pv/logicdata.h b/pv/logicdata.h
index b21d50ad3163879116cff1849f414390c8af7b11..11e5f9a30bd75aad3194bd34cf7ecb3bade1554c 100644 (file)
--- a/pv/logicdata.h
+++ b/pv/logicdata.h
@@ -18,6 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#ifndef PULSEVIEW_PV_LOGICDATA_H
+#define PULSEVIEW_PV_LOGICDATA_H
+
 #include "signaldata.h"
 
 #include <boost/shared_ptr.hpp>
@@ -51,3 +54,5 @@ private:
 };
 
 } // namespace pv
+
+#endif // PULSEVIEW_PV_LOGICDATA_H

diff --git a/pv/logicdatasnapshot.h b/pv/logicdatasnapshot.h
index 8e494bedccc916d64f883363a59f7e2c1f0ccaf0..2a18835fe01eb441b98f2314276b67bca898e20b 100644 (file)
--- a/pv/logicdatasnapshot.h
+++ b/pv/logicdatasnapshot.h
@@ -18,6 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#ifndef PULSEVIEW_PV_LOGICDATASNAPSHOT_H
+#define PULSEVIEW_PV_LOGICDATASNAPSHOT_H
+
 #include "datasnapshot.h"
 
 #include <utility>
@@ -99,3 +102,5 @@ private:
 };
 
 } // namespace pv
+
+#endif // PULSEVIEW_PV_LOGICDATASNAPSHOT_H

diff --git a/pv/logicsignal.h b/pv/logicsignal.h
index 42acee8314685ae39fda03f01f53f84feee45e03..54145a8c231d0e6632b7426773dba244886c695e 100644 (file)
--- a/pv/logicsignal.h
+++ b/pv/logicsignal.h
@@ -18,6 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#ifndef PULSEVIEW_PV_LOGICSIGNAL_H
+#define PULSEVIEW_PV_LOGICSIGNAL_H
+
 #include "signal.h"
 
 #include <boost/shared_ptr.hpp>
@@ -77,3 +80,5 @@ private:
 };
 
 } // namespace pv
+
+#endif // PULSEVIEW_PV_LOGICSIGNAL_H

diff --git a/pv/mainwindow.h b/pv/mainwindow.h
index 88cbd6fd8f6492e4870d6263b77525402b76a581..8b813afb8179cde371e5b21e296c10b97bd47804 100644 (file)
--- a/pv/mainwindow.h
+++ b/pv/mainwindow.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef MAINWINDOW_H
-#define MAINWINDOW_H
+#ifndef PULSEVIEW_PV_MAINWINDOW_H
+#define PULSEVIEW_PV_MAINWINDOW_H
 
 #include <QMainWindow>
 
@@ -88,4 +88,4 @@ private slots:
 
 } // namespace pv
 
-#endif // MAINWINDOW_H
+#endif // PULSEVIEW_PV_MAINWINDOW_H

diff --git a/pv/samplingbar.h b/pv/samplingbar.h
index 170379e0ce37c4b957f7ad75f239a96cd9abc282..e6204dfa5a67c65d13e398728eae2c414b24e062 100644 (file)
--- a/pv/samplingbar.h
+++ b/pv/samplingbar.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef SAMPLINGBAR_H
-#define SAMPLINGBAR_H
+#ifndef PULSEVIEW_PV_SAMPLINGBAR_H
+#define PULSEVIEW_PV_SAMPLINGBAR_H
 
 #include <stdint.h>
 
@@ -71,4 +71,4 @@ private:
 
 } // namespace pv
 
-#endif // SAMPLINGBAR_H
+#endif // PULSEVIEW_PV_SAMPLINGBAR_H

diff --git a/pv/signal.h b/pv/signal.h
index 18ff4b4d619239b233bc3bbad5f92b67efc0874a..789b43601deff51dbe36c477a24b0c79f3df7b15 100644 (file)
--- a/pv/signal.h
+++ b/pv/signal.h
@@ -18,6 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#ifndef PULSEVIEW_PV_SIGNAL_H
+#define PULSEVIEW_PV_SIGNAL_H
+
 #include <boost/shared_ptr.hpp>
 
 #include <QPainter>
@@ -111,3 +114,5 @@ protected:
 };
 
 } // namespace pv
+
+#endif // PULSEVIEW_PV_SIGNAL_H

diff --git a/pv/signaldata.h b/pv/signaldata.h
index 57cd543b9d18cff9dec3b20b77ac220710129ead..94268aec927456e8d0fe37dd3d6d33d672c4310e 100644 (file)
--- a/pv/signaldata.h
+++ b/pv/signaldata.h
@@ -18,6 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#ifndef PULSEVIEW_PV_SIGNALDATA_H
+#define PULSEVIEW_PV_SIGNALDATA_H
+
 #include <stdint.h>
 
 namespace pv {
@@ -37,3 +40,5 @@ protected:
 };
 
 } // namespace pv
+
+#endif // PULSEVIEW_PV_SIGNALDATA_H

diff --git a/pv/sigsession.h b/pv/sigsession.h
index 40fce89fdb7660bce2b276e1dd4bcac2f27148d7..b6e5a56842c5c79def1356532001823e3eb3cd69 100644 (file)
--- a/pv/sigsession.h
+++ b/pv/sigsession.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef SIGSESSION_H
-#define SIGSESSION_H
+#ifndef PULSEVIEW_PV_SIGSESSION_H
+#define PULSEVIEW_PV_SIGSESSION_H
 
 #include <boost/shared_ptr.hpp>
 
@@ -81,4 +81,4 @@ private:
 
 } // namespace pv
 
-#endif // SIGSESSION_H
+#endif // PULSEVIEW_PV_SIGSESSION_H

diff --git a/pv/view/header.h b/pv/view/header.h
index a92d11737873806f61f3092858ee9afc1cf619c1..6b97c4af307df7b362e022262a9679d2cafe9bab 100644 (file)
--- a/pv/view/header.h
+++ b/pv/view/header.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PV_VIEW_HEADER_H
-#define PV_VIEW_HEADER_H
+#ifndef PULSEVIEW_PV_VIEW_HEADER_H
+#define PULSEVIEW_PV_VIEW_HEADER_H
 
 #include <boost/shared_ptr.hpp>
 
@@ -65,4 +65,4 @@ private:
 } // namespace view
 } // namespace pv
 
-#endif // PV_VIEW_HEADER_H
+#endif // PULSEVIEW_PV_VIEW_HEADER_H

diff --git a/pv/view/ruler.h b/pv/view/ruler.h
index 18b565eb1b48374b85391ce7122a527c5fb7112c..f855185b904a75209ce521ec12c4399913bd6d5e 100644 (file)
--- a/pv/view/ruler.h
+++ b/pv/view/ruler.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PV_VIEW_RULER_H
-#define PV_VIEW_RULER_H
+#ifndef PULSEVIEW_PV_VIEW_RULER_H
+#define PULSEVIEW_PV_VIEW_RULER_H
 
 #include <QWidget>
 
@@ -52,4 +52,4 @@ private:
 } // namespace view
 } // namespace pv
 
-#endif // PV_VIEW_HEADER_H
+#endif // PULSEVIEW_PV_VIEW_RULER_H

diff --git a/pv/view/view.h b/pv/view/view.h
index d2abbf002c2f69a958df0cefef3465d098cb05e5..c87be36913e368c68bbd334a8d304b99c93a9849 100644 (file)
--- a/pv/view/view.h
+++ b/pv/view/view.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PV_VIEW_VIEW_H
-#define PV_VIEW_VIEW_H
+#ifndef PULSEVIEW_PV_VIEW_VIEW_H
+#define PULSEVIEW_PV_VIEW_VIEW_H
 
 #include <stdint.h>
 
@@ -98,4 +98,4 @@ private:
 } // namespace view
 } // namespace pv
 
-#endif // PV_VIEW_VIEW_H
+#endif // PULSEVIEW_PV_VIEW_VIEW_H

diff --git a/pv/view/viewport.h b/pv/view/viewport.h
index e2517fa776156f1ef28e6c80e04914658855ba75..a33d4045178628b4de8c2173e549efd21e3fc2df 100644 (file)
--- a/pv/view/viewport.h
+++ b/pv/view/viewport.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PV_VIEW_VIEWPORT_H
-#define PV_VIEW_VIEWPORT_H
+#ifndef PULSEVIEW_PV_VIEW_VIEWPORT_H
+#define PULSEVIEW_PV_VIEW_VIEWPORT_H
 
 #include <QTimer>
 #include <QWidget>
@@ -61,4 +61,4 @@ private:
 } // namespace view
 } // namespace pv
 
-#endif // PV_VIEW_VIEWPORT_H
+#endif // PULSEVIEW_PV_VIEW_VIEWPORT_H