Skip to content
Permalink
Browse files

fix windows build

  • Loading branch information
jef-n committed Jun 17, 2011
1 parent 7a72e78 commit bb9e992699ee5669ce9922739ed1bc21a0da2e5e
@@ -23,14 +23,14 @@
#include <QUndoStack>
#include <QVariant>
#include <QImage>
#include <QDomNode>

#include "qgis.h"
#include "qgsrectangle.h"

class QgsRenderContext;
class QgsCoordinateReferenceSystem;

class QDomNode;
class QDomDocument;
class QKeyEvent;
class QPainter;
@@ -23,6 +23,7 @@
#include "qgis.h"
#include "qgsrectangle.h"
#include "qgsrendercontext.h"
#include "qgsfeature.h"

class QDomDocument;
class QDomNode;
@@ -36,7 +37,6 @@ class QgsCoordinateReferenceSystem;
class QgsDistanceArea;
class QgsOverlayObjectPositionManager;
class QgsVectorLayer;
class QgsFeature;

struct QgsDiagramLayerSettings;

@@ -24,11 +24,11 @@

#include <QHash>
#include <QVariant>
#include <QStringList>

class QDomNode;
class QDomElement;
class QDomDocument;
class QStringList;


/** \ingroup core
@@ -28,12 +28,12 @@
#include "qgscolorrampshader.h"
#include "qgsrasterpyramid.h"
#include "qgscoordinatereferencesystem.h"
#include "qgsrasterbandstats.h"

#include <cmath>

class QImage;
class QgsPoint;
class QgsRasterBandStats;
class QByteArray;

#define TINY_VALUE std::numeric_limits<double>::epsilon() * 20
@@ -21,13 +21,13 @@ class QgsFeature;
class QgsVectorLayer;
class QPainter;
class QImage;
class QDomNode;
class QDomDocument;
class QColor;

#include "qgis.h"
#include "qgsrendercontext.h"
#include <QList>
#include <QDomNode>

class QgsSymbol;
class QBrush;
@@ -17,10 +17,13 @@

#include "qgsmslayerbuilder.h"
#include "qgsrasterlayer.h"

#include <QDir>
#include <QFileInfo>
#include <QStringList>

#include <ctime>

QgsMSLayerBuilder::QgsMSLayerBuilder()
{

@@ -35,6 +35,7 @@
#include "qgssldrule.h"
#include "qgscoordinatereferencesystem.h"
#include "qgslabelattributes.h"

#include <QDomDocument>
#include <QDomElement>
#include <QBrush>
@@ -17,6 +17,8 @@
***************************************************************************/

#include "qgsrenderer.h"
#include "qgsvectorlayer.h"

#include <QPixmap>

class QgsSLDRule;
@@ -17,6 +17,7 @@
#define QGSGRASSEDITTOOLS_H

#include "qgsmaptool.h"
#include "qgspoint.h"

class QgsGrassEdit;

@@ -454,14 +454,14 @@ void QgsOgrProvider::setRelevantFields( bool fetchGeometry, const QgsAttributeLi
#endif
}

bool QgsOgrProvider::featureAtId( int featureId,
bool QgsOgrProvider::featureAtId( QgsFeatureId featureId,
QgsFeature& feature,
bool fetchGeometry,
QgsAttributeList fetchAttributes )
{
setRelevantFields( fetchGeometry, fetchAttributes );

OGRFeatureH fet = OGR_L_GetFeature( ogrLayer, featureId );
OGRFeatureH fet = OGR_L_GetFeature( ogrLayer, FID_TO_NUMBER( featureId ) );
if ( !fet )
return false;

@@ -87,7 +87,7 @@ class QgsOgrProvider : public QgsVectorDataProvider
* @param fetchAttributes a list containing the indexes of the attribute fields to copy
* @return True when feature was found, otherwise false
*/
virtual bool featureAtId( int featureId,
virtual bool featureAtId( QgsFeatureId featureId,
QgsFeature& feature,
bool fetchGeometry = true,
QgsAttributeList fetchAttributes = QgsAttributeList() );
@@ -566,15 +566,15 @@ bool QgsOSMDataProvider::nextFeature( QgsFeature& feature )
}


bool QgsOSMDataProvider::featureAtId( int featureId,
bool QgsOSMDataProvider::featureAtId( QgsFeatureId featureId,
QgsFeature& feature,
bool fetchGeometry,
QgsAttributeList fetchAttributes )
{
// load exact feature from sqlite3 database
if ( mFeatureType == PointType )
{
sqlite3_bind_int( mNodeStmt, 1, featureId );
sqlite3_bind_int64( mNodeStmt, 1, featureId );

if ( sqlite3_step( mNodeStmt ) != SQLITE_ROW )
{
@@ -590,7 +590,7 @@ bool QgsOSMDataProvider::featureAtId( int featureId,
}
else if (( mFeatureType == LineType ) || ( mFeatureType == PolygonType ) )
{
sqlite3_bind_int( mWayStmt, 1, featureId );
sqlite3_bind_int64( mWayStmt, 1, featureId );

if ( sqlite3_step( mWayStmt ) != SQLITE_ROW )
{
@@ -160,7 +160,7 @@ class QgsOSMDataProvider: public QgsVectorDataProvider
* @param fetchAttributes a list containing the indexes of the attribute fields to copy
* @return True when feature was found, otherwise false
*/
virtual bool featureAtId( int featureId,
virtual bool featureAtId( QgsFeatureId featureId,
QgsFeature& feature,
bool fetchGeometry = true,
QgsAttributeList fetchAttributes = QgsAttributeList() );
@@ -17,6 +17,7 @@
#include "qgslogger.h"
#include "qgsapplication.h"
#include "qgsgeometry.h"
#include "qgsvectorlayer.h"

#include <QtXml/QXmlSimpleReader>
#include <QtXml/QXmlInputSource>
@@ -759,7 +759,7 @@ QString QgsPostgresProvider::whereClause( QgsFeatureId featureId ) const
return whereClause;
}

bool QgsPostgresProvider::featureAtId( int featureId, QgsFeature& feature, bool fetchGeometry, QgsAttributeList fetchAttributes )
bool QgsPostgresProvider::featureAtId( QgsFeatureId featureId, QgsFeature& feature, bool fetchGeometry, QgsAttributeList fetchAttributes )
{
feature.setValid( false );
QString cursorName = QString( "qgisfid%1" ).arg( providerId );
@@ -98,7 +98,7 @@ class QgsPostgresProvider : public QgsVectorDataProvider
* @param fetchAttributes a list containing the indexes of the attribute fields to copy
* @return True when feature was found, otherwise false
*/
virtual bool featureAtId( int featureId,
virtual bool featureAtId( QgsFeatureId featureId,
QgsFeature& feature,
bool fetchGeometry = true,
QgsAttributeList fetchAttributes = QgsAttributeList() );
@@ -292,7 +292,7 @@ QString QgsSpatiaLiteProvider::storageType() const
}


bool QgsSpatiaLiteProvider::featureAtId( int featureId, QgsFeature & feature, bool fetchGeometry, QgsAttributeList fetchAttributes )
bool QgsSpatiaLiteProvider::featureAtId( QgsFeatureId featureId, QgsFeature & feature, bool fetchGeometry, QgsAttributeList fetchAttributes )
{
sqlite3_stmt *stmt = NULL;

@@ -73,7 +73,7 @@ class QgsSpatiaLiteProvider: public QgsVectorDataProvider
* @param useIntersect true if an accurate intersection test should be used,
* false if a test based on bounding box is sufficient
*/
virtual bool featureAtId( int featureId,
virtual bool featureAtId( QgsFeatureId featureId,
QgsFeature & feature, bool fetchGeometry = true, QgsAttributeList fetchAttributes = QgsAttributeList() );

/** Accessor for sql where clause used to limit dataset */
@@ -710,7 +710,7 @@ QgsSqlAnywhereProvider::findKeyColumn()


bool
QgsSqlAnywhereProvider::featureAtId( int featureId, QgsFeature & feature, bool fetchGeometry, QgsAttributeList fetchAttributes )
QgsSqlAnywhereProvider::featureAtId( QgsFeatureId featureId, QgsFeature & feature, bool fetchGeometry, QgsAttributeList fetchAttributes )
{
a_sqlany_bind_param idParam;
size_t idLen = sizeof( int );
@@ -69,7 +69,7 @@ class QgsSqlAnywhereProvider: public QgsVectorDataProvider
* @param fetchGeometry true if the feature geometry should be fetched
* @param fetchAttributes list of attributes which should be fetched
*/
virtual bool featureAtId( int featureId,
virtual bool featureAtId( QgsFeatureId featureId,
QgsFeature & feature, bool fetchGeometry = true, QgsAttributeList fetchAttributes = QgsAttributeList() );

/** Accessor for sql where clause used to limit dataset */

0 comments on commit bb9e992

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