also install qgspointv2.h

jef-n · jef-n · commit 10d262f3f19d · 2015-07-27T10:31:09.000+02:00
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -707,6 +707,7 @@ SET(QGIS_CORE_HDRS
   geometry/qgsgeometry.h
   geometry/qgsabstractgeometryv2.h
   geometry/qgswkbtypes.h
+  geometry/qgspointv2.h
 )
 
 IF (QT_MOBILITY_LOCATION_FOUND OR Qt5Positioning_FOUND)
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -34,9 +34,7 @@
 #include <QVector>
 
 #include "qgsvectorlayer.h"
-
 #include "qgsattributeaction.h"
-
 #include "qgis.h" //for globals
 #include "qgsapplication.h"
 #include "qgsclipper.h"
@@ -71,7 +69,7 @@
 #include "qgsvectorlayerjoinbuffer.h"
 #include "qgsvectorlayerrenderer.h"
 #include "qgsvectorlayerundocommand.h"
-
+#include "qgspointv2.h"
 #include "qgsrendererv2.h"
 #include "qgssymbolv2.h"
 #include "qgssymbollayerv2.h"
@@ -2197,7 +2195,7 @@ bool QgsVectorLayer::deleteAttributes( QList<int> attrs )
 
   qSort( attrs.begin(), attrs.end(), qGreater<int>() );
 
-  Q_FOREACH( int attr, attrs )
+  Q_FOREACH ( int attr, attrs )
   {
     if ( deleteAttribute( attr ) )
     {
@@ -2971,7 +2969,7 @@ void QgsVectorLayer::uniqueValues( int index, QList<QVariant> &uniqueValues, int
     if ( mEditBuffer )
     {
       QSet<QString> vals;
-      Q_FOREACH( const QVariant& v, uniqueValues )
+      Q_FOREACH ( const QVariant& v, uniqueValues )
       {
         vals << v.toString();
       }
@@ -3779,7 +3777,7 @@ void QgsVectorLayer::invalidateSymbolCountedFlag()
 
 void QgsVectorLayer::onRelationsLoaded()
 {
-  Q_FOREACH( QgsAttributeEditorElement* elem, mAttributeEditorElements )
+  Q_FOREACH ( QgsAttributeEditorElement* elem, mAttributeEditorElements )
   {
     if ( elem->type() == QgsAttributeEditorElement::AeTypeContainer )
     {
@@ -3788,7 +3786,7 @@ void QgsVectorLayer::onRelationsLoaded()
         continue;
 
       QList<QgsAttributeEditorElement*> relations = cont->findElements( QgsAttributeEditorElement::AeTypeRelation );
-      Q_FOREACH( QgsAttributeEditorElement* relElem, relations )
+      Q_FOREACH ( QgsAttributeEditorElement* relElem, relations )
       {
         QgsAttributeEditorRelation* rel = dynamic_cast< QgsAttributeEditorRelation* >( relElem );
         if ( !rel )
@@ -3857,7 +3855,7 @@ QDomElement QgsAttributeEditorContainer::toDomElement( QDomDocument& doc ) const
   QDomElement elem = doc.createElement( "attributeEditorContainer" );
   elem.setAttribute( "name", mName );
 
-  Q_FOREACH( QgsAttributeEditorElement* child, mChildren )
+  Q_FOREACH ( QgsAttributeEditorElement* child, mChildren )
   {
     elem.appendChild( child->toDomElement( doc ) );
   }
@@ -3878,7 +3876,7 @@ QList<QgsAttributeEditorElement*> QgsAttributeEditorContainer::findElements( Qgs
 {
   QList<QgsAttributeEditorElement*> results;
 
-  Q_FOREACH( QgsAttributeEditorElement* elem, mChildren )
+  Q_FOREACH ( QgsAttributeEditorElement* elem, mChildren )
   {
     if ( elem->type() == type )
     {
diff --git a/src/core/qgsvectorlayer.h b/src/core/qgsvectorlayer.h
@@ -30,7 +30,6 @@
 #include "qgsfeatureiterator.h"
 #include "qgseditorwidgetconfig.h"
 #include "qgsfield.h"
-#include "qgspointv2.h"
 #include "qgssnapper.h"
 #include "qgsrelation.h"
 #include "qgsvectorsimplifymethod.h"
@@ -61,6 +60,7 @@ class QgsSymbolV2;
 class QgsVectorDataProvider;
 class QgsVectorLayerEditBuffer;
 class QgsVectorLayerJoinBuffer;
+class QgsPointV2;
 
 typedef QList<int> QgsAttributeList;
 typedef QSet<int> QgsAttributeIds;
diff --git a/src/core/qgsvectorlayereditutils.cpp b/src/core/qgsvectorlayereditutils.cpp
@@ -18,6 +18,7 @@
 #include "qgsgeometrycache.h"
 #include "qgsvectorlayereditbuffer.h"
 #include "qgslogger.h"
+#include "qgspointv2.h"
 
 #include <limits>
 

Original file line number	Diff line number	Diff line change
`@@ -707,6 +707,7 @@ SET(QGIS_CORE_HDRS`
`707`	`707`	`geometry/qgsgeometry.h`
`708`	`708`	`geometry/qgsabstractgeometryv2.h`
`709`	`709`	`geometry/qgswkbtypes.h`
	`710`	`+ geometry/qgspointv2.h`
`710`	`711`	`)`
`711`	`712`
`712`	`713`	`IF (QT_MOBILITY_LOCATION_FOUND OR Qt5Positioning_FOUND)`
Original file line number	Diff line number	Diff line change
`@@ -34,9 +34,7 @@`
`34`	`34`	`#include <QVector>`
`35`	`35`
`36`	`36`	`#include "qgsvectorlayer.h"`
`37`		`-`
`38`	`37`	`#include "qgsattributeaction.h"`
`39`		`-`
`40`	`38`	`#include "qgis.h" //for globals`
`41`	`39`	`#include "qgsapplication.h"`
`42`	`40`	`#include "qgsclipper.h"`
`@@ -71,7 +69,7 @@`
`71`	`69`	`#include "qgsvectorlayerjoinbuffer.h"`
`72`	`70`	`#include "qgsvectorlayerrenderer.h"`
`73`	`71`	`#include "qgsvectorlayerundocommand.h"`
`74`		`-`
	`72`	`+#include "qgspointv2.h"`
`75`	`73`	`#include "qgsrendererv2.h"`
`76`	`74`	`#include "qgssymbolv2.h"`
`77`	`75`	`#include "qgssymbollayerv2.h"`
`@@ -2197,7 +2195,7 @@ bool QgsVectorLayer::deleteAttributes( QList<int> attrs )`
`2197`	`2195`
`2198`	`2196`	`qSort( attrs.begin(), attrs.end(), qGreater<int>() );`
`2199`	`2197`
`2200`		`- Q_FOREACH( int attr, attrs )`
	`2198`	`+ Q_FOREACH ( int attr, attrs )`
`2201`	`2199`	`{`
`2202`	`2200`	`if ( deleteAttribute( attr ) )`
`2203`	`2201`	`{`
`@@ -2971,7 +2969,7 @@ void QgsVectorLayer::uniqueValues( int index, QList<QVariant> &uniqueValues, int`
`2971`	`2969`	`if ( mEditBuffer )`
`2972`	`2970`	`{`
`2973`	`2971`	`QSet<QString> vals;`
`2974`		`- Q_FOREACH( const QVariant& v, uniqueValues )`
	`2972`	`+ Q_FOREACH ( const QVariant& v, uniqueValues )`
`2975`	`2973`	`{`
`2976`	`2974`	`vals << v.toString();`
`2977`	`2975`	`}`
`@@ -3779,7 +3777,7 @@ void QgsVectorLayer::invalidateSymbolCountedFlag()`
`3779`	`3777`
`3780`	`3778`	`void QgsVectorLayer::onRelationsLoaded()`
`3781`	`3779`	`{`
`3782`		`- Q_FOREACH( QgsAttributeEditorElement* elem, mAttributeEditorElements )`
	`3780`	`+ Q_FOREACH ( QgsAttributeEditorElement* elem, mAttributeEditorElements )`
`3783`	`3781`	`{`
`3784`	`3782`	`if ( elem->type() == QgsAttributeEditorElement::AeTypeContainer )`
`3785`	`3783`	`{`
`@@ -3788,7 +3786,7 @@ void QgsVectorLayer::onRelationsLoaded()`
`3788`	`3786`	`continue;`
`3789`	`3787`
`3790`	`3788`	`QList<QgsAttributeEditorElement*> relations = cont->findElements( QgsAttributeEditorElement::AeTypeRelation );`
`3791`		`- Q_FOREACH( QgsAttributeEditorElement* relElem, relations )`
	`3789`	`+ Q_FOREACH ( QgsAttributeEditorElement* relElem, relations )`
`3792`	`3790`	`{`
`3793`	`3791`	`QgsAttributeEditorRelation* rel = dynamic_cast< QgsAttributeEditorRelation* >( relElem );`
`3794`	`3792`	`if ( !rel )`
`@@ -3857,7 +3855,7 @@ QDomElement QgsAttributeEditorContainer::toDomElement( QDomDocument& doc ) const`
`3857`	`3855`	`QDomElement elem = doc.createElement( "attributeEditorContainer" );`
`3858`	`3856`	`elem.setAttribute( "name", mName );`
`3859`	`3857`
`3860`		`- Q_FOREACH( QgsAttributeEditorElement* child, mChildren )`
	`3858`	`+ Q_FOREACH ( QgsAttributeEditorElement* child, mChildren )`
`3861`	`3859`	`{`
`3862`	`3860`	`elem.appendChild( child->toDomElement( doc ) );`
`3863`	`3861`	`}`
`@@ -3878,7 +3876,7 @@ QList<QgsAttributeEditorElement*> QgsAttributeEditorContainer::findElements( Qgs`
`3878`	`3876`	`{`
`3879`	`3877`	`QList<QgsAttributeEditorElement*> results;`
`3880`	`3878`
`3881`		`- Q_FOREACH( QgsAttributeEditorElement* elem, mChildren )`
	`3879`	`+ Q_FOREACH ( QgsAttributeEditorElement* elem, mChildren )`
`3882`	`3880`	`{`
`3883`	`3881`	`if ( elem->type() == type )`
`3884`	`3882`	`{`