Skip to content
Permalink
Browse files

update v2 header guards

  • Loading branch information
jef-n committed Nov 27, 2018
1 parent 6e7d56c commit 06312f0ec26e5473d0697933eabd9e6396391dba
@@ -15,8 +15,8 @@
* *
***************************************************************************/

#ifndef QGSCOMPOUNDCURVEV2_H
#define QGSCOMPOUNDCURVEV2_H
#ifndef QGSCOMPOUNDCURVE_H
#define QGSCOMPOUNDCURVE_H

#include "qgis_core.h"
#include "qgis.h"
@@ -173,4 +173,4 @@ class CORE_EXPORT QgsCompoundCurve: public QgsCurve

// clazy:excludeall=qstring-allocations

#endif // QGSCOMPOUNDCURVEV2_H
#endif // QGSCOMPOUNDCURVE_H
@@ -15,8 +15,8 @@
* *
***************************************************************************/

#ifndef QGSCURVEV2_H
#define QGSCURVEV2_H
#ifndef QGSCURVE_H
#define QGSCURVE_H

#include "qgis_core.h"
#include "qgis.h"
@@ -292,4 +292,4 @@ class CORE_EXPORT QgsCurve: public QgsAbstractGeometry
mutable QgsRectangle mBoundingBox;
};

#endif // QGSCURVEV2_H
#endif // QGSCURVE_H
@@ -15,8 +15,8 @@
* *
***************************************************************************/

#ifndef QGSCURVEPOLYGONV2_H
#define QGSCURVEPOLYGONV2_H
#ifndef QGSCURVEPOLYGON_H
#define QGSCURVEPOLYGON_H

#include "qgis_core.h"
#include "qgis.h"
@@ -239,4 +239,4 @@ class CORE_EXPORT QgsCurvePolygon: public QgsSurface

// clazy:excludeall=qstring-allocations

#endif // QGSCURVEPOLYGONV2_H
#endif // QGSCURVEPOLYGON_H
@@ -13,8 +13,8 @@ email : marco.hugentobler at sourcepole dot com
* *
***************************************************************************/

#ifndef QGSGEOMETRYCOLLECTIONV2_H
#define QGSGEOMETRYCOLLECTIONV2_H
#ifndef QGSGEOMETRYCOLLECTION_H
#define QGSGEOMETRYCOLLECTION_H

#include <QVector>

@@ -232,4 +232,4 @@ class CORE_EXPORT QgsGeometryCollection: public QgsAbstractGeometry

// clazy:excludeall=qstring-allocations

#endif // QGSGEOMETRYCOLLECTIONV2_H
#endif // QGSGEOMETRYCOLLECTION_H
@@ -15,8 +15,8 @@
* *
***************************************************************************/

#ifndef QGSLINESTRINGV2_H
#define QGSLINESTRINGV2_H
#ifndef QGSLINESTRING_H
#define QGSLINESTRING_H


#include <QPolygonF>
@@ -750,4 +750,4 @@ class CORE_EXPORT QgsLineString: public QgsCurve

// clazy:excludeall=qstring-allocations

#endif // QGSLINESTRINGV2_H
#endif // QGSLINESTRING_H
@@ -13,8 +13,8 @@ email : marco.hugentobler at sourcepole dot com
* *
***************************************************************************/

#ifndef QGSMULTICURVEV2_H
#define QGSMULTICURVEV2_H
#ifndef QGSMULTICURVE_H
#define QGSMULTICURVE_H

#include "qgis_core.h"
#include "qgis.h"
@@ -85,4 +85,4 @@ class CORE_EXPORT QgsMultiCurve: public QgsGeometryCollection

// clazy:excludeall=qstring-allocations

#endif // QGSMULTICURVEV2_H
#endif // QGSMULTICURVE_H
@@ -13,8 +13,8 @@ email : marco.hugentobler at sourcepole dot com
* *
***************************************************************************/

#ifndef QGSMULTILINESTRINGV2_H
#define QGSMULTILINESTRINGV2_H
#ifndef QGSMULTILINESTRING_H
#define QGSMULTILINESTRING_H

#include "qgis_core.h"
#include "qgis.h"
@@ -80,4 +80,4 @@ class CORE_EXPORT QgsMultiLineString: public QgsMultiCurve

// clazy:excludeall=qstring-allocations

#endif // QGSMULTILINESTRINGV2_H
#endif // QGSMULTILINESTRING_H
@@ -13,8 +13,8 @@ email : marco.hugentobler at sourcepole dot com
* *
***************************************************************************/

#ifndef QGSMULTIPOINTV2_H
#define QGSMULTIPOINTV2_H
#ifndef QGSMULTIPOINT_H
#define QGSMULTIPOINT_H

#include "qgis_core.h"
#include "qgis.h"
@@ -82,4 +82,4 @@ class CORE_EXPORT QgsMultiPoint: public QgsGeometryCollection

// clazy:excludeall=qstring-allocations

#endif // QGSMULTIPOINTV2_H
#endif // QGSMULTIPOINT_H
@@ -13,8 +13,8 @@ email : marco.hugentobler at sourcepole dot com
* *
***************************************************************************/

#ifndef QGSMULTIPOLYGONV2_H
#define QGSMULTIPOLYGONV2_H
#ifndef QGSMULTIPOLYGON_H
#define QGSMULTIPOLYGON_H

#include "qgis_core.h"
#include "qgis.h"
@@ -80,4 +80,4 @@ class CORE_EXPORT QgsMultiPolygon: public QgsMultiSurface

// clazy:excludeall=qstring-allocations

#endif // QGSMULTIPOLYGONV2_H
#endif // QGSMULTIPOLYGON_H
@@ -13,8 +13,8 @@ email : marco.hugentobler at sourcepole dot com
* *
***************************************************************************/

#ifndef QGSMULTISURFACEV2_H
#define QGSMULTISURFACEV2_H
#ifndef QGSMULTISURFACE_H
#define QGSMULTISURFACE_H

#include "qgis_core.h"
#include "qgis.h"
@@ -71,4 +71,4 @@ class CORE_EXPORT QgsMultiSurface: public QgsGeometryCollection

// clazy:excludeall=qstring-allocations

#endif // QGSMULTISURFACEV2_H
#endif // QGSMULTISURFACE_H
@@ -15,8 +15,8 @@
* *
***************************************************************************/

#ifndef QGSPOINTV2_H
#define QGSPOINTV2_H
#ifndef QGSPOINT_H
#define QGSPOINT_H

#include "qgis_core.h"
#include "qgis.h"
@@ -518,4 +518,4 @@ class CORE_EXPORT QgsPoint: public QgsAbstractGeometry

// clazy:excludeall=qstring-allocations

#endif // QGSPOINTV2_H
#endif // QGSPOINT_H
@@ -15,8 +15,8 @@
* *
***************************************************************************/

#ifndef QGSPOLYGONV2_H
#define QGSPOLYGONV2_H
#ifndef QGSPOLYGON_H
#define QGSPOLYGON_H

#include "qgis_core.h"
#include "qgis.h"
@@ -97,4 +97,4 @@ class CORE_EXPORT QgsPolygon: public QgsCurvePolygon
friend class QgsCurvePolygon;

};
#endif // QGSPOLYGONV2_H
#endif // QGSPOLYGON_H
@@ -15,8 +15,8 @@
* *
***************************************************************************/

#ifndef QGSSURFACEV2_H
#define QGSSURFACEV2_H
#ifndef QGSSURFACE_H
#define QGSSURFACE_H

#include "qgis_core.h"
#include "qgis.h"
@@ -80,4 +80,4 @@ class CORE_EXPORT QgsSurface: public QgsAbstractGeometry
mutable QgsRectangle mBoundingBox;
};

#endif // QGSSURFACEV2_H
#endif // QGSSURFACE_H
@@ -13,8 +13,8 @@
* *
***************************************************************************/

#ifndef QGSLABELINGENGINEV2_H
#define QGSLABELINGENGINEV2_H
#ifndef QGSLABELINGENGINE_H
#define QGSLABELINGENGINE_H

#define SIP_NO_FILE

@@ -257,4 +257,4 @@ class CORE_EXPORT QgsLabelingUtils

};

#endif // QGSLABELINGENGINEV2_H
#endif // QGSLABELINGENGINE_H
@@ -15,8 +15,8 @@
* *
***************************************************************************/

#ifndef QGSPOINT_H
#define QGSPOINT_H
#ifndef QGSPOINTXY_H
#define QGSPOINTXY_H

#include "qgis_core.h"
#include "qgsvector.h"
@@ -369,4 +369,4 @@ inline uint qHash( const QgsPointXY &p ) SIP_SKIP
}


#endif //QGSPOINT_H
#endif //QGSPOINTXY_H
@@ -13,8 +13,8 @@
* *
***************************************************************************/

#ifndef QGSARROWSYMBOLLAYERV2_H
#define QGSARROWSYMBOLLAYERV2_H
#ifndef QGSARROWSYMBOLLAYER_H
#define QGSARROWSYMBOLLAYER_H

#include "qgis_core.h"
#include "qgis.h"
@@ -12,8 +12,8 @@
* (at your option) any later version. *
* *
***************************************************************************/
#ifndef QGSELLIPSESYMBOLLAYERV2_H
#define QGSELLIPSESYMBOLLAYERV2_H
#ifndef QGSELLIPSESYMBOLLAYER_H
#define QGSELLIPSESYMBOLLAYER_H

#define DEFAULT_ELLIPSE_JOINSTYLE Qt::MiterJoin

@@ -173,6 +173,6 @@ class CORE_EXPORT QgsEllipseSymbolLayer: public QgsMarkerSymbolLayer

// clazy:excludeall=qstring-allocations

#endif // QGSELLIPSESYMBOLLAYERV2_H
#endif // QGSELLIPSESYMBOLLAYER_H


@@ -13,8 +13,8 @@
* *
***************************************************************************/

#ifndef QGSFILLSYMBOLLAYERV2_H
#define QGSFILLSYMBOLLAYERV2_H
#ifndef QGSFILLSYMBOLLAYER_H
#define QGSFILLSYMBOLLAYER_H

#include "qgis_core.h"
#include "qgis.h"
@@ -13,8 +13,8 @@
* *
***************************************************************************/

#ifndef QGSGEOMETRYGENERATORSYMBOLLAYERV2_H
#define QGSGEOMETRYGENERATORSYMBOLLAYERV2_H
#ifndef QGSGEOMETRYGENERATORSYMBOLLAYER_H
#define QGSGEOMETRYGENERATORSYMBOLLAYER_H

#include "qgis_core.h"
#include "qgssymbollayer.h"
@@ -114,4 +114,4 @@ class CORE_EXPORT QgsGeometryGeneratorSymbolLayer : public QgsSymbolLayer
QgsSymbol::SymbolType mSymbolType;
};

#endif // QGSGEOMETRYGENERATORSYMBOLLAYERV2_H
#endif // QGSGEOMETRYGENERATORSYMBOLLAYER_H
@@ -13,8 +13,8 @@
* *
***************************************************************************/

#ifndef QGSLEGENDSYMBOLITEMV2_H
#define QGSLEGENDSYMBOLITEMV2_H
#ifndef QGSLEGENDSYMBOLITEM_H
#define QGSLEGENDSYMBOLITEM_H

#include <memory>
#include <QString>
@@ -141,7 +141,6 @@ class CORE_EXPORT QgsLegendSymbolItem
QString mParentKey;
};


typedef QList< QgsLegendSymbolItem > QgsLegendSymbolList;

#endif // QGSLEGENDSYMBOLITEMV2_H
#endif // QGSLEGENDSYMBOLITEM_H
@@ -13,8 +13,8 @@
* *
***************************************************************************/

#ifndef QGSLINESYMBOLLAYERV2_H
#define QGSLINESYMBOLLAYERV2_H
#ifndef QGSLINESYMBOLLAYER_H
#define QGSLINESYMBOLLAYER_H

#include "qgis_core.h"
#include "qgis.h"
@@ -13,8 +13,8 @@
* *
***************************************************************************/

#ifndef QGSMARKERSYMBOLLAYERV2_H
#define QGSMARKERSYMBOLLAYERV2_H
#ifndef QGSMARKERSYMBOLLAYER_H
#define QGSMARKERSYMBOLLAYER_H

#include "qgis_core.h"
#include "qgis_sip.h"
@@ -13,8 +13,8 @@
* *
***************************************************************************/

#ifndef QGSSTYLEV2_H
#define QGSSTYLEV2_H
#ifndef QGSSTYLE_H
#define QGSSTYLE_H

#include "qgis_core.h"
#include "qgis.h"

0 comments on commit 06312f0

Please sign in to comment.
You can’t perform that action at this time.