From 81b096c4acb16939026d657adeeead6f6ef42299 Mon Sep 17 00:00:00 2001 From: lbartoletti Date: Tue, 3 Oct 2017 17:58:59 +0200 Subject: [PATCH] Move header and normalize space --- src/app/qgsmaptooladdcircle.h | 1 + src/app/qgsmaptooladdellipse.h | 1 + src/app/qgsmaptooladdrectangle.h | 1 + src/app/qgsmaptoolcircle2points.cpp | 1 + src/app/qgsmaptoolcircle2points.h | 1 + src/app/qgsmaptoolcircle3points.cpp | 1 + src/app/qgsmaptoolcircle3points.h | 1 + src/app/qgsmaptoolcirclecenterpoint.cpp | 1 + src/app/qgsmaptoolellipsecenter2points.cpp | 1 + src/app/qgsmaptoolellipsecenter2points.h | 1 + src/app/qgsmaptoolellipsecenterpoint.cpp | 1 + src/app/qgsmaptoolellipsecenterpoint.h | 1 + src/app/qgsmaptoolellipseextent.cpp | 1 + src/app/qgsmaptoolellipseextent.h | 1 + src/app/qgsmaptoolellipsefoci.cpp | 1 + src/app/qgsmaptoolellipsefoci.h | 1 + src/app/qgsmaptoolrectangle3points.cpp | 1 + src/app/qgsmaptoolrectangle3points.h | 1 + src/app/qgsmaptoolrectanglecenter.cpp | 1 + src/app/qgsmaptoolrectanglecenter.h | 1 + src/app/qgsmaptoolrectangleextent.cpp | 1 + src/app/qgsmaptoolrectangleextent.h | 1 + src/app/qgsmaptoolregularpolygon2points.cpp | 1 + src/app/qgsmaptoolregularpolygon2points.h | 6 +++--- src/app/qgsmaptoolregularpolygoncentercorner.cpp | 1 + src/app/qgsmaptoolregularpolygoncentercorner.h | 6 +++--- src/app/qgsmaptoolregularpolygoncenterpoint.cpp | 1 + src/app/qgsmaptoolregularpolygoncenterpoint.h | 6 +++--- src/app/qgsmaptoolsquarecenter.cpp | 1 + src/app/qgsmaptoolsquarecenter.h | 6 +++--- 30 files changed, 38 insertions(+), 12 deletions(-) diff --git a/src/app/qgsmaptooladdcircle.h b/src/app/qgsmaptooladdcircle.h index d100e453e9e..c1ea0d1850b 100644 --- a/src/app/qgsmaptooladdcircle.h +++ b/src/app/qgsmaptooladdcircle.h @@ -12,6 +12,7 @@ * (at your option) any later version. * * * ***************************************************************************/ + #ifndef QGSMAPTOOLADDCIRCLE_H #define QGSMAPTOOLADDCIRCLE_H diff --git a/src/app/qgsmaptooladdellipse.h b/src/app/qgsmaptooladdellipse.h index 8654da914d8..94d84b0f1ae 100644 --- a/src/app/qgsmaptooladdellipse.h +++ b/src/app/qgsmaptooladdellipse.h @@ -12,6 +12,7 @@ * (at your option) any later version. * * * ***************************************************************************/ + #ifndef QGSMAPTOOLADDELLIPSE_H #define QGSMAPTOOLADDELLIPSE_H diff --git a/src/app/qgsmaptooladdrectangle.h b/src/app/qgsmaptooladdrectangle.h index acce09a42aa..81292c06b30 100644 --- a/src/app/qgsmaptooladdrectangle.h +++ b/src/app/qgsmaptooladdrectangle.h @@ -12,6 +12,7 @@ * (at your option) any later version. * * * ***************************************************************************/ + #ifndef QGSMAPTOOLADDRECTANGLE_H #define QGSMAPTOOLADDRECTANGLE_H diff --git a/src/app/qgsmaptoolcircle2points.cpp b/src/app/qgsmaptoolcircle2points.cpp index 1827ed70355..a5707c82efd 100644 --- a/src/app/qgsmaptoolcircle2points.cpp +++ b/src/app/qgsmaptoolcircle2points.cpp @@ -13,6 +13,7 @@ * (at your option) any later version. * * * ***************************************************************************/ + #include "qgsmaptoolcircle2points.h" #include "qgsgeometryrubberband.h" #include "qgsmapcanvas.h" diff --git a/src/app/qgsmaptoolcircle2points.h b/src/app/qgsmaptoolcircle2points.h index 40025e22c7b..7a012740203 100644 --- a/src/app/qgsmaptoolcircle2points.h +++ b/src/app/qgsmaptoolcircle2points.h @@ -13,6 +13,7 @@ * (at your option) any later version. * * * ***************************************************************************/ + #ifndef QGSMAPTOOLCIRCLE2POINTS_H #define QGSMAPTOOLCIRCLE2POINTS_H diff --git a/src/app/qgsmaptoolcircle3points.cpp b/src/app/qgsmaptoolcircle3points.cpp index 1745b4aca53..1cb5c92e20b 100644 --- a/src/app/qgsmaptoolcircle3points.cpp +++ b/src/app/qgsmaptoolcircle3points.cpp @@ -13,6 +13,7 @@ * (at your option) any later version. * * * ***************************************************************************/ + #include "qgsmaptoolcircle3points.h" #include "qgsgeometryrubberband.h" #include "qgslinestring.h" diff --git a/src/app/qgsmaptoolcircle3points.h b/src/app/qgsmaptoolcircle3points.h index 08c1efc8bcc..516231041cf 100644 --- a/src/app/qgsmaptoolcircle3points.h +++ b/src/app/qgsmaptoolcircle3points.h @@ -13,6 +13,7 @@ * (at your option) any later version. * * * ***************************************************************************/ + #ifndef QGSMAPTOOLCIRCLE3POINTS_H #define QGSMAPTOOLCIRCLE3POINTS_H diff --git a/src/app/qgsmaptoolcirclecenterpoint.cpp b/src/app/qgsmaptoolcirclecenterpoint.cpp index 37e4216921f..d3151d82f3d 100644 --- a/src/app/qgsmaptoolcirclecenterpoint.cpp +++ b/src/app/qgsmaptoolcirclecenterpoint.cpp @@ -13,6 +13,7 @@ * (at your option) any later version. * * * ***************************************************************************/ + #include "qgsmaptoolcirclecenterpoint.h" #include "qgsgeometryrubberband.h" #include "qgsmapcanvas.h" diff --git a/src/app/qgsmaptoolellipsecenter2points.cpp b/src/app/qgsmaptoolellipsecenter2points.cpp index 40c0b674466..4bddb270ac2 100644 --- a/src/app/qgsmaptoolellipsecenter2points.cpp +++ b/src/app/qgsmaptoolellipsecenter2points.cpp @@ -13,6 +13,7 @@ * (at your option) any later version. * * * ***************************************************************************/ + #include "qgsmaptoolellipsecenter2points.h" #include "qgsgeometryrubberband.h" #include "qgslinestring.h" diff --git a/src/app/qgsmaptoolellipsecenter2points.h b/src/app/qgsmaptoolellipsecenter2points.h index 5ebb487ade8..b12f3fd501c 100644 --- a/src/app/qgsmaptoolellipsecenter2points.h +++ b/src/app/qgsmaptoolellipsecenter2points.h @@ -13,6 +13,7 @@ * (at your option) any later version. * * * ***************************************************************************/ + #ifndef QGSMAPTOOLELLIPSECENTER2POINTS_H #define QGSMAPTOOLELLIPSECENTER2POINTS_H diff --git a/src/app/qgsmaptoolellipsecenterpoint.cpp b/src/app/qgsmaptoolellipsecenterpoint.cpp index f89b940dff5..e6aca3867e2 100644 --- a/src/app/qgsmaptoolellipsecenterpoint.cpp +++ b/src/app/qgsmaptoolellipsecenterpoint.cpp @@ -13,6 +13,7 @@ * (at your option) any later version. * * * ***************************************************************************/ + #include "qgsmaptoolellipsecenterpoint.h" #include "qgsgeometryrubberband.h" #include "qgsmapcanvas.h" diff --git a/src/app/qgsmaptoolellipsecenterpoint.h b/src/app/qgsmaptoolellipsecenterpoint.h index 885d5f52687..cbde0d5ec13 100644 --- a/src/app/qgsmaptoolellipsecenterpoint.h +++ b/src/app/qgsmaptoolellipsecenterpoint.h @@ -13,6 +13,7 @@ * (at your option) any later version. * * * ***************************************************************************/ + #ifndef QGSMAPTOOLELLIPSECENTERPOINT_H #define QGSMAPTOOLELLIPSECENTERPOINT_H diff --git a/src/app/qgsmaptoolellipseextent.cpp b/src/app/qgsmaptoolellipseextent.cpp index 2a86c31aded..338fd45afee 100644 --- a/src/app/qgsmaptoolellipseextent.cpp +++ b/src/app/qgsmaptoolellipseextent.cpp @@ -13,6 +13,7 @@ * (at your option) any later version. * * * ***************************************************************************/ + #include "qgsmaptoolellipseextent.h" #include "qgsgeometryrubberband.h" #include "qgsmapcanvas.h" diff --git a/src/app/qgsmaptoolellipseextent.h b/src/app/qgsmaptoolellipseextent.h index 5fdfad564df..9114dec1f55 100644 --- a/src/app/qgsmaptoolellipseextent.h +++ b/src/app/qgsmaptoolellipseextent.h @@ -13,6 +13,7 @@ * (at your option) any later version. * * * ***************************************************************************/ + #ifndef QGSMAPTOOLELLIPSEEXTENT_H #define QGSMAPTOOLELLIPSEEXTENT_H diff --git a/src/app/qgsmaptoolellipsefoci.cpp b/src/app/qgsmaptoolellipsefoci.cpp index 691827497f1..7be0c467ebc 100644 --- a/src/app/qgsmaptoolellipsefoci.cpp +++ b/src/app/qgsmaptoolellipsefoci.cpp @@ -13,6 +13,7 @@ * (at your option) any later version. * * * ***************************************************************************/ + #include "qgsmaptoolellipsefoci.h" #include "qgsgeometryrubberband.h" #include "qgslinestring.h" diff --git a/src/app/qgsmaptoolellipsefoci.h b/src/app/qgsmaptoolellipsefoci.h index 4ce086275af..f80cc59898f 100644 --- a/src/app/qgsmaptoolellipsefoci.h +++ b/src/app/qgsmaptoolellipsefoci.h @@ -13,6 +13,7 @@ * (at your option) any later version. * * * ***************************************************************************/ + #ifndef QGSMAPTOOLELLIPSEFOCI_H #define QGSMAPTOOLELLIPSEFOCI_H diff --git a/src/app/qgsmaptoolrectangle3points.cpp b/src/app/qgsmaptoolrectangle3points.cpp index dad1e11ecb1..96b41f6d64c 100644 --- a/src/app/qgsmaptoolrectangle3points.cpp +++ b/src/app/qgsmaptoolrectangle3points.cpp @@ -13,6 +13,7 @@ * (at your option) any later version. * * * ***************************************************************************/ + #include "qgsmaptoolrectangle3points.h" #include "qgsgeometryrubberband.h" #include "qgsgeometryutils.h" diff --git a/src/app/qgsmaptoolrectangle3points.h b/src/app/qgsmaptoolrectangle3points.h index 734712183eb..9f65ac740ea 100644 --- a/src/app/qgsmaptoolrectangle3points.h +++ b/src/app/qgsmaptoolrectangle3points.h @@ -13,6 +13,7 @@ * (at your option) any later version. * * * ***************************************************************************/ + #ifndef QGSMAPTOOLRECTANGLE3POINTS_H #define QGSMAPTOOLRECTANGLE3POINTS_H diff --git a/src/app/qgsmaptoolrectanglecenter.cpp b/src/app/qgsmaptoolrectanglecenter.cpp index ab43286db73..222ebfcbf06 100644 --- a/src/app/qgsmaptoolrectanglecenter.cpp +++ b/src/app/qgsmaptoolrectanglecenter.cpp @@ -13,6 +13,7 @@ * (at your option) any later version. * * * ***************************************************************************/ + #include "qgsmaptoolrectanglecenter.h" #include "qgsgeometryrubberband.h" #include "qgsgeometryutils.h" diff --git a/src/app/qgsmaptoolrectanglecenter.h b/src/app/qgsmaptoolrectanglecenter.h index f19f69f68bb..7081cac5b63 100644 --- a/src/app/qgsmaptoolrectanglecenter.h +++ b/src/app/qgsmaptoolrectanglecenter.h @@ -13,6 +13,7 @@ * (at your option) any later version. * * * ***************************************************************************/ + #ifndef QGSMAPTOOLRECTANGLECENTER_H #define QGSMAPTOOLRECTANGLECENTER_H diff --git a/src/app/qgsmaptoolrectangleextent.cpp b/src/app/qgsmaptoolrectangleextent.cpp index 4a32749d499..5c9e78c1b26 100644 --- a/src/app/qgsmaptoolrectangleextent.cpp +++ b/src/app/qgsmaptoolrectangleextent.cpp @@ -13,6 +13,7 @@ * (at your option) any later version. * * * ***************************************************************************/ + #include "qgsmaptoolrectangleextent.h" #include "qgsgeometryrubberband.h" #include "qgsgeometryutils.h" diff --git a/src/app/qgsmaptoolrectangleextent.h b/src/app/qgsmaptoolrectangleextent.h index 5f1b62fc160..db9889919a8 100644 --- a/src/app/qgsmaptoolrectangleextent.h +++ b/src/app/qgsmaptoolrectangleextent.h @@ -13,6 +13,7 @@ * (at your option) any later version. * * * ***************************************************************************/ + #ifndef QGSMAPTOOLRECTANGLEEXTENT_H #define QGSMAPTOOLRECTANGLEEXTENT_H diff --git a/src/app/qgsmaptoolregularpolygon2points.cpp b/src/app/qgsmaptoolregularpolygon2points.cpp index 0d213a344d8..7554f1e0ced 100644 --- a/src/app/qgsmaptoolregularpolygon2points.cpp +++ b/src/app/qgsmaptoolregularpolygon2points.cpp @@ -13,6 +13,7 @@ * (at your option) any later version. * * * ***************************************************************************/ + #include "qgsmaptoolregularpolygon2points.h" #include "qgsgeometryrubberband.h" #include "qgsmapcanvas.h" diff --git a/src/app/qgsmaptoolregularpolygon2points.h b/src/app/qgsmaptoolregularpolygon2points.h index 6e44fc04ab9..2bb2510cf70 100644 --- a/src/app/qgsmaptoolregularpolygon2points.h +++ b/src/app/qgsmaptoolregularpolygon2points.h @@ -1,6 +1,3 @@ -#ifndef QGSMAPTOOLREGULARPOLYGON2POINTS_H -#define QGSMAPTOOLREGULARPOLYGON2POINTS_H - /*************************************************************************** qgmaptoolregularpolygon2points.h - map tool for adding regular polygon from 2 points @@ -17,6 +14,9 @@ * * ***************************************************************************/ +#ifndef QGSMAPTOOLREGULARPOLYGON2POINTS_H +#define QGSMAPTOOLREGULARPOLYGON2POINTS_H + #include "qgsmaptooladdregularpolygon.h" class QgsMapToolRegularPolygon2Points: public QgsMapToolAddRegularPolygon diff --git a/src/app/qgsmaptoolregularpolygoncentercorner.cpp b/src/app/qgsmaptoolregularpolygoncentercorner.cpp index 722fa167c4f..aec39ad4244 100644 --- a/src/app/qgsmaptoolregularpolygoncentercorner.cpp +++ b/src/app/qgsmaptoolregularpolygoncentercorner.cpp @@ -13,6 +13,7 @@ * (at your option) any later version. * * * ***************************************************************************/ + #include "qgsmaptoolregularpolygoncentercorner.h" #include "qgsgeometryrubberband.h" #include "qgsmapcanvas.h" diff --git a/src/app/qgsmaptoolregularpolygoncentercorner.h b/src/app/qgsmaptoolregularpolygoncentercorner.h index f3ebeef4686..fff612edcd2 100644 --- a/src/app/qgsmaptoolregularpolygoncentercorner.h +++ b/src/app/qgsmaptoolregularpolygoncentercorner.h @@ -1,6 +1,3 @@ -#ifndef QGSMAPTOOLREGULARPOLYGONCENTERCORNER_H -#define QGSMAPTOOLREGULARPOLYGONCENTERCORNER_H - /*************************************************************************** qgsmaptoolregularpolygoncentercorner.h - map tool for adding regular polygon from center and a corner @@ -17,6 +14,9 @@ * * ***************************************************************************/ +#ifndef QGSMAPTOOLREGULARPOLYGONCENTERCORNER_H +#define QGSMAPTOOLREGULARPOLYGONCENTERCORNER_H + #include "qgsmaptooladdregularpolygon.h" class QgsMapToolRegularPolygonCenterCorner: public QgsMapToolAddRegularPolygon diff --git a/src/app/qgsmaptoolregularpolygoncenterpoint.cpp b/src/app/qgsmaptoolregularpolygoncenterpoint.cpp index 82e46062c00..5af609598e7 100644 --- a/src/app/qgsmaptoolregularpolygoncenterpoint.cpp +++ b/src/app/qgsmaptoolregularpolygoncenterpoint.cpp @@ -13,6 +13,7 @@ * (at your option) any later version. * * * ***************************************************************************/ + #include "qgsmaptoolregularpolygoncenterpoint.h" #include "qgsgeometryrubberband.h" #include "qgsmapcanvas.h" diff --git a/src/app/qgsmaptoolregularpolygoncenterpoint.h b/src/app/qgsmaptoolregularpolygoncenterpoint.h index c4e6c7c32ea..faed8ccbc30 100644 --- a/src/app/qgsmaptoolregularpolygoncenterpoint.h +++ b/src/app/qgsmaptoolregularpolygoncenterpoint.h @@ -1,6 +1,3 @@ -#ifndef QGSMAPTOOLREGULARPOLYGONCENTERPOINT_H -#define QGSMAPTOOLREGULARPOLYGONCENTERPOINT_H - /*************************************************************************** qgsmaptoolregularpolygoncenterpoint.h - map tool for adding regular polygon from center and a point @@ -17,6 +14,9 @@ * * ***************************************************************************/ +#ifndef QGSMAPTOOLREGULARPOLYGONCENTERPOINT_H +#define QGSMAPTOOLREGULARPOLYGONCENTERPOINT_H + #include "qgsmaptooladdregularpolygon.h" class QgsMapToolRegularPolygonCenterPoint: public QgsMapToolAddRegularPolygon diff --git a/src/app/qgsmaptoolsquarecenter.cpp b/src/app/qgsmaptoolsquarecenter.cpp index 3d2a1df6912..c9e0b6d6efb 100644 --- a/src/app/qgsmaptoolsquarecenter.cpp +++ b/src/app/qgsmaptoolsquarecenter.cpp @@ -13,6 +13,7 @@ * (at your option) any later version. * * * ***************************************************************************/ + #include "qgsmaptoolsquarecenter.h" #include "qgsgeometryrubberband.h" #include "qgsgeometryutils.h" diff --git a/src/app/qgsmaptoolsquarecenter.h b/src/app/qgsmaptoolsquarecenter.h index 94a6b96c21b..dbe80cc03f6 100644 --- a/src/app/qgsmaptoolsquarecenter.h +++ b/src/app/qgsmaptoolsquarecenter.h @@ -1,6 +1,3 @@ -#ifndef QGSMAPTOOLSQUARECENTER_H -#define QGSMAPTOOLSQUARECENTER_H - /*************************************************************************** qgsmaptoolsquarecenter.h - map tool for adding square from center and a point @@ -17,6 +14,9 @@ * * ***************************************************************************/ +#ifndef QGSMAPTOOLSQUARECENTER_H +#define QGSMAPTOOLSQUARECENTER_H + #include "qgsmaptooladdregularpolygon.h" class QgsMapToolSquareCenter: public QgsMapToolAddRegularPolygon