Fix some reserved identifier macro names

qgis · Nov 2, 2015 · c968031 · c968031
1 parent b7e1cae
commit c968031
Show file tree

Hide file tree

Showing 22 changed files with 52 additions and 52 deletions.
diff --git a/src/core/gps/config.h b/src/core/gps/config.h
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef __NMEA_CONFIG_H__
-#define __NMEA_CONFIG_H__
+#ifndef NMEA_CONFIG_H
+#define NMEA_CONFIG_H
 
 #define NMEA_VERSION        ("0.5.3")
 #define NMEA_VERSION_MAJOR  (0)
@@ -60,4 +60,4 @@
 #   define NMEA_ASSERT(x)
 #endif
 
-#endif /* __NMEA_CONFIG_H__ */
+#endif /* NMEA_CONFIG_H */
diff --git a/src/core/gps/gmath.h b/src/core/gps/gmath.h
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef __NMEA_GMATH_H__
-#define __NMEA_GMATH_H__
+#ifndef NMEA_GMATH_H
+#define NMEA_GMATH_H
 
 #include "info.h"
 
@@ -106,4 +106,4 @@ extern "C"
 }
 #endif
 
-#endif /* __NMEA_GMATH_H__ */
+#endif /* NMEA_GMATH_H */
diff --git a/src/core/gps/info.h b/src/core/gps/info.h
@@ -26,8 +26,8 @@
 
 /** \file */
 
-#ifndef __NMEA_INFO_H__
-#define __NMEA_INFO_H__
+#ifndef NMEA_INFO_H
+#define NMEA_INFO_H
 
 #include "nmeatime.h"
 
@@ -126,4 +126,4 @@ extern "C"
 }
 #endif
 
-#endif /* __NMEA_INFO_H__ */
+#endif /* NMEA_INFO_H */
diff --git a/src/core/gps/nmeatime.h b/src/core/gps/nmeatime.h
@@ -26,8 +26,8 @@
 
 /** \file */
 
-#ifndef __NMEA_TIME_H__
-#define __NMEA_TIME_H__
+#ifndef NMEA_TIME_H
+#define NMEA_TIME_H
 
 #include "config.h"
 
@@ -61,4 +61,4 @@ extern "C"
 }
 #endif
 
-#endif /* __NMEA_TIME_H__ */
+#endif /* NMEA_TIME_H */
diff --git a/src/core/gps/parse.h b/src/core/gps/parse.h
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef __NMEA_PARSE_H__
-#define __NMEA_PARSE_H__
+#ifndef NMEA_PARSE_H
+#define NMEA_PARSE_H
 
 #include "sentence.h"
 
@@ -53,4 +53,4 @@ extern "C"
 }
 #endif
 
-#endif /* __NMEA_PARSE_H__ */
+#endif /* NMEA_PARSE_H */
diff --git a/src/core/gps/qextserialport/qextserialenumerator.h b/src/core/gps/qextserialport/qextserialenumerator.h
@@ -4,8 +4,8 @@
  * \see QextSerialEnumerator
  */
 
-#ifndef _QEXTSERIALENUMERATOR_H_
-#define _QEXTSERIALENUMERATOR_H_
+#ifndef QEXTSERIALENUMERATOR_H
+#define QEXTSERIALENUMERATOR_H
 
 #include <QString>
 #include <QList>
@@ -205,4 +205,4 @@ Q_OBJECT
         void deviceRemoved( const QextPortInfo & info );
 };
 
-#endif /*_QEXTSERIALENUMERATOR_H_*/
+#endif /*QEXTSERIALENUMERATOR_H*/
diff --git a/src/core/gps/qextserialport/qextserialport.h b/src/core/gps/qextserialport/qextserialport.h
@@ -1,6 +1,6 @@
 
-#ifndef _QEXTSERIALPORT_H_
-#define _QEXTSERIALPORT_H_
+#ifndef QEXTSERIALPORT_H
+#define QEXTSERIALPORT_H
 
 
 /*if all warning messages are turned off, flag portability warnings to be turned off as well*/

diff --git a/src/core/gps/sentence.h b/src/core/gps/sentence.h
@@ -10,8 +10,8 @@
 
 /** \file */
 
-#ifndef __NMEA_SENTENCE_H__
-#define __NMEA_SENTENCE_H__
+#ifndef NMEA_SENTENCE_H
+#define NMEA_SENTENCE_H
 
 #include "info.h"
 
@@ -126,4 +126,4 @@ extern "C"
 }
 #endif
 
-#endif /* __NMEA_SENTENCE_H__ */
+#endif /* NMEA_SENTENCE_H */
diff --git a/src/core/pal/feature.h b/src/core/pal/feature.h
@@ -27,8 +27,8 @@
  *
  */
 
-#ifndef _FEATURE_H
-#define _FEATURE_H
+#ifndef FEATURE_H
+#define FEATURE_H
 
 #include "qgsgeometry.h"
 #include "pointset.h"

diff --git a/src/core/pal/geomfunction.h b/src/core/pal/geomfunction.h
@@ -27,8 +27,8 @@
  *
  */
 
-#ifndef _GEOM_FUNCTION_
-#define _GEOM_FUNCTION_
+#ifndef PAL_GEOM_FUNCTION
+#define PAL_GEOM_FUNCTION
 
 #include "util.h"
 

diff --git a/src/core/pal/labelposition.h b/src/core/pal/labelposition.h
@@ -27,8 +27,8 @@
  *
  */
 
-#ifndef _LABELPOSITION_H
-#define _LABELPOSITION_H
+#ifndef LABELPOSITION_H
+#define LABELPOSITION_H
 
 #include "pointset.h"
 #include "rtree.hpp"

diff --git a/src/core/pal/layer.h b/src/core/pal/layer.h
@@ -27,8 +27,8 @@
  *
  */
 
-#ifndef _LAYER_H_
-#define _LAYER_H_
+#ifndef PAL_LAYER_H_
+#define PAL_LAYER_H_
 
 #include "pal.h"
 #include <QMutex>

diff --git a/src/core/pal/pal.h b/src/core/pal/pal.h
@@ -27,8 +27,8 @@
  *
  */
 
-#ifndef _PAL_H
-#define _PAL_H
+#ifndef PAL_H
+#define PAL_H
 
 #include "qgsgeometry.h"
 #include <QList>

diff --git a/src/core/pal/palstat.h b/src/core/pal/palstat.h
@@ -27,8 +27,8 @@
  *
  */
 
-#ifndef _PALSTAT_H_
-#define _PALSTAT_H_
+#ifndef PALSTAT_H
+#define PALSTAT_H
 
 #include <QStringList>
 

diff --git a/src/core/pal/pointset.cpp b/src/core/pal/pointset.cpp
@@ -27,8 +27,8 @@
  *
  */
 
-#ifndef _POINT_SET_H_
-#define _POINT_SET_H_
+#ifndef POINT_SET_H
+#define POINT_SET_H
 
 #if defined(_VERBOSE_) || (_DEBUG_) || (_DEBUG_FULL_)
 #include <iostream>

diff --git a/src/core/pal/pointset.h b/src/core/pal/pointset.h
@@ -27,8 +27,8 @@
  *
  */
 
-#ifndef _POINTSET_H
-#define _POINTSET_H
+#ifndef POINTSET_H
+#define POINTSET_H
 
 #include "qgsgeometry.h"
 #include "rtree.hpp"

diff --git a/src/core/pal/priorityqueue.h b/src/core/pal/priorityqueue.h
@@ -27,8 +27,8 @@
  *
  */
 
-#ifndef _PRIORITYQUEUE_H
-#define _PRIORITYQUEUE_H
+#ifndef PAL_PRIORITYQUEUE_H
+#define PAL_PRIORITYQUEUE_H
 
 #include <iostream>
 

diff --git a/src/core/pal/problem.h b/src/core/pal/problem.h
@@ -27,8 +27,8 @@
  *
  */
 
-#ifndef _PROBLEM_H
-#define _PROBLEM_H
+#ifndef PAL_PROBLEM_H
+#define PAL_PROBLEM_H
 
 #include "pal.h"
 #include "rtree.hpp"

diff --git a/src/core/pal/util.h b/src/core/pal/util.h
@@ -27,8 +27,8 @@
  *
  */
 
-#ifndef _UTIL_H
-#define _UTIL_H
+#ifndef PAL_UTIL_H
+#define PAL_UTIL_H
 
 #include "pal.h"
 #include "rtree.hpp"

diff --git a/src/core/qgsvectorfilewriter.h b/src/core/qgsvectorfilewriter.h
@@ -16,8 +16,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef _QGSVECTORFILEWRITER_H_
-#define _QGSVECTORFILEWRITER_H_
+#ifndef QGSVECTORFILEWRITER_H
+#define QGSVECTORFILEWRITER_H
 
 #include "qgsvectorlayer.h"
 #include "qgsfield.h"

diff --git a/src/core/qgsvectorlayerimport.h b/src/core/qgsvectorlayerimport.h
@@ -16,8 +16,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef _QGSVECTORLAYERIMPORT_H_
-#define _QGSVECTORLAYERIMPORT_H_
+#ifndef QGSVECTORLAYERIMPORT_H
+#define QGSVECTORLAYERIMPORT_H
 
 #include "qgsvectordataprovider.h"
 #include "qgsvectorlayer.h"

diff --git a/src/gui/qgsmaptip.h b/src/gui/qgsmaptip.h
@@ -12,8 +12,8 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#ifndef _QGSMAPTIP_H_
-#define _QGSMAPTIP_H_
+#ifndef QGSMAPTIP_H
+#define QGSMAPTIP_H
 
 class QgsMapLayer;
 class QgsMapCanvas;
@@ -68,4 +68,4 @@ class GUI_EXPORT QgsMapTip
     QPoint mLastPosition;
 
 };
-#endif // _QGSMAPTIP_H_
+#endif // QGSMAPTIP_H