Skip to content

Commit

Permalink
also install qgspointv2.h
Browse files Browse the repository at this point in the history
  • Loading branch information
jef-n committed Jul 27, 2015
1 parent 70fe622 commit 10d262f
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
1 change: 1 addition & 0 deletions src/core/CMakeLists.txt
Expand Up @@ -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)
Expand Down
16 changes: 7 additions & 9 deletions src/core/qgsvectorlayer.cpp
Expand Up @@ -34,9 +34,7 @@
#include <QVector>

#include "qgsvectorlayer.h"

#include "qgsattributeaction.h"

#include "qgis.h" //for globals
#include "qgsapplication.h"
#include "qgsclipper.h"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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 ) )
{
Expand Down Expand Up @@ -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();
}
Expand Down Expand Up @@ -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 )
{
Expand All @@ -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 )
Expand Down Expand Up @@ -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 ) );
}
Expand All @@ -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 )
{
Expand Down
2 changes: 1 addition & 1 deletion src/core/qgsvectorlayer.h
Expand Up @@ -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"
Expand Down Expand Up @@ -61,6 +60,7 @@ class QgsSymbolV2;
class QgsVectorDataProvider;
class QgsVectorLayerEditBuffer;
class QgsVectorLayerJoinBuffer;
class QgsPointV2;

typedef QList<int> QgsAttributeList;
typedef QSet<int> QgsAttributeIds;
Expand Down
1 change: 1 addition & 0 deletions src/core/qgsvectorlayereditutils.cpp
Expand Up @@ -18,6 +18,7 @@
#include "qgsgeometrycache.h"
#include "qgsvectorlayereditbuffer.h"
#include "qgslogger.h"
#include "qgspointv2.h"

#include <limits>

Expand Down

0 comments on commit 10d262f

Please sign in to comment.