fix windows build

qgis · Jun 17, 2011 · bb9e992 · bb9e992
1 parent 7a72e78
commit bb9e992
Show file tree

Hide file tree

Showing 20 changed files with 26 additions and 18 deletions.
diff --git a/src/core/qgsmaplayer.h b/src/core/qgsmaplayer.h
@@ -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;

diff --git a/src/core/qgsmaprenderer.h b/src/core/qgsmaprenderer.h
@@ -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;
 

diff --git a/src/core/qgsprojectproperty.h b/src/core/qgsprojectproperty.h
@@ -24,11 +24,11 @@
 
 #include <QHash>
 #include <QVariant>
+#include <QStringList>
 
 class QDomNode;
 class QDomElement;
 class QDomDocument;
-class QStringList;
 
 
 /** \ingroup core

diff --git a/src/core/qgsrasterdataprovider.h b/src/core/qgsrasterdataprovider.h
@@ -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

diff --git a/src/core/renderer/qgsrenderer.h b/src/core/renderer/qgsrenderer.h
@@ -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;

diff --git a/src/mapserver/qgsmslayerbuilder.cpp b/src/mapserver/qgsmslayerbuilder.cpp
@@ -17,10 +17,13 @@
 
 #include "qgsmslayerbuilder.h"
 #include "qgsrasterlayer.h"
+
 #include <QDir>
 #include <QFileInfo>
 #include <QStringList>
 
+#include <ctime>
+
 QgsMSLayerBuilder::QgsMSLayerBuilder()
 {
 

diff --git a/src/mapserver/qgssldparser.cpp b/src/mapserver/qgssldparser.cpp
@@ -35,6 +35,7 @@
 #include "qgssldrule.h"
 #include "qgscoordinatereferencesystem.h"
 #include "qgslabelattributes.h"
+
 #include <QDomDocument>
 #include <QDomElement>
 #include <QBrush>

diff --git a/src/mapserver/qgssldrenderer.h b/src/mapserver/qgssldrenderer.h
@@ -17,6 +17,8 @@
  ***************************************************************************/
 
 #include "qgsrenderer.h"
+#include "qgsvectorlayer.h"
+
 #include <QPixmap>
 
 class QgsSLDRule;

diff --git a/src/plugins/grass/qgsgrassedittools.h b/src/plugins/grass/qgsgrassedittools.h
@@ -17,6 +17,7 @@
 #define QGSGRASSEDITTOOLS_H
 
 #include "qgsmaptool.h"
+#include "qgspoint.h"
 
 class QgsGrassEdit;
 

diff --git a/src/providers/ogr/qgsogrprovider.cpp b/src/providers/ogr/qgsogrprovider.cpp
@@ -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;
 

diff --git a/src/providers/ogr/qgsogrprovider.h b/src/providers/ogr/qgsogrprovider.h
@@ -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() );

diff --git a/src/providers/osm/osmprovider.cpp b/src/providers/osm/osmprovider.cpp
@@ -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 )
     {

diff --git a/src/providers/osm/osmprovider.h b/src/providers/osm/osmprovider.h
@@ -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() );

diff --git a/src/providers/osm/osmrenderer.cpp b/src/providers/osm/osmrenderer.cpp
@@ -17,6 +17,7 @@
 #include "qgslogger.h"
 #include "qgsapplication.h"
 #include "qgsgeometry.h"
+#include "qgsvectorlayer.h"
 
 #include <QtXml/QXmlSimpleReader>
 #include <QtXml/QXmlInputSource>

diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
@@ -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 );

diff --git a/src/providers/postgres/qgspostgresprovider.h b/src/providers/postgres/qgspostgresprovider.h
@@ -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() );

diff --git a/src/providers/spatialite/qgsspatialiteprovider.cpp b/src/providers/spatialite/qgsspatialiteprovider.cpp
@@ -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;
 

diff --git a/src/providers/spatialite/qgsspatialiteprovider.h b/src/providers/spatialite/qgsspatialiteprovider.h
@@ -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 */

diff --git a/src/providers/sqlanywhere/qgssqlanywhereprovider.cpp b/src/providers/sqlanywhere/qgssqlanywhereprovider.cpp
@@ -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 );

diff --git a/src/providers/sqlanywhere/qgssqlanywhereprovider.h b/src/providers/sqlanywhere/qgssqlanywhereprovider.h
@@ -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 */