Project-wide consistent naming for #include guards.

Document the naming scheme in HACKING.

diff --git a/channelform.h b/channelform.h
index 7cfd730e88bdd4e7191836e95dac7975ad3d72b0..ae4c4959a6b28cd47ebac7edf0357fd5c661a753 100644 (file)
--- a/channelform.h
+++ b/channelform.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef SIGROK_CHANNELFORM_H
-#define SIGROK_CHANNELFORM_H
+#ifndef SIGROK_QT_CHANNELFORM_H
+#define SIGROK_QT_CHANNELFORM_H
 
 #include <QtGui/QWidget>
 #include <QPainter>

diff --git a/configform.h b/configform.h
index 1295a63bf142489fb22f308c3f9be021135a343e..b1631db6aac97522d019fab8ab0d4d593cd13488 100644 (file)
--- a/configform.h
+++ b/configform.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef SIGROK_CONFIGFORM_H
-#define SIGROK_CONFIGFORM_H
+#ifndef SIGROK_QT_CONFIGFORM_H
+#define SIGROK_QT_CONFIGFORM_H
 
 #include <QtGui/QWidget>
 #include <QListWidgetItem>

diff --git a/decodersform.h b/decodersform.h
index 23148794115032e401d2d9524686517425a4118d..c64f7c634c64a5e0df26d2cf9d2e0a8ff194a8c9 100644 (file)
--- a/decodersform.h
+++ b/decodersform.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef DECODERSFORM_H
-#define DECODERSFORM_H
+#ifndef SIGROK_QT_DECODERSFORM_H
+#define SIGROK_QT_DECODERSFORM_H
 
 #include <QDialog>
 #include <QListWidgetItem>

diff --git a/decoderstackform.h b/decoderstackform.h
index c0cc99aa6aee30d37f334e97a1c95c91f391f312..69f9fce063377e69e752bff72f995a99077143a6 100644 (file)
--- a/decoderstackform.h
+++ b/decoderstackform.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef DECODERSTACKFORM_H
-#define DECODERSTACKFORM_H
+#ifndef SIGROK_QT_DECODERSTACKFORM_H
+#define SIGROK_QT_DECODERSTACKFORM_H
 
 #include <QDialog>
 

diff --git a/mainwindow.h b/mainwindow.h
index 99e977de4b2be623a53316efd94a55aceb47d5af..5a441dd7f29700ae8a551d0041291f508037d2f1 100644 (file)
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef SIGROK_MAINWINDOW_H
-#define SIGROK_MAINWINDOW_H
+#ifndef SIGROK_QT_MAINWINDOW_H
+#define SIGROK_QT_MAINWINDOW_H
 
 #include <QtGui/QMainWindow>
 #include <QLineEdit>

diff --git a/sampleiodevice.h b/sampleiodevice.h
index 6107821d82799fee077255c4e21d6924f2e34d98..3c79a61b7e84e1368ae767ddde0a4f4537115a56 100644 (file)
--- a/sampleiodevice.h
+++ b/sampleiodevice.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef SIGROK_SAMPLEIODEVICE_H
-#define SIGROK_SAMPLEIODEVICE_H
+#ifndef SIGROK_QT_SAMPLEIODEVICE_H
+#define SIGROK_QT_SAMPLEIODEVICE_H
 
 #include <QIODevice>