fix warnings and windows build

jef · jef · commit a459295d9c51 · 2011-03-15T17:38:26.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@15504 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/qgsvectorlayerproperties.cpp b/src/app/qgsvectorlayerproperties.cpp
@@ -735,7 +735,6 @@ void QgsVectorLayerProperties::apply()
       ds.maxScaleDenominator = -1;
     }
 
-    QgsDiagramRendererV2* r = 0;
     if ( mFixedSizeCheckBox->isChecked() )
     {
       QgsSingleCategoryDiagramRenderer* dr = new QgsSingleCategoryDiagramRenderer();
diff --git a/src/core/qgsclipper.h b/src/core/qgsclipper.h
@@ -291,7 +291,7 @@ inline void QgsClipper::trimFeatureToBoundary(
   unsigned int i1 = inPts.size() - 1; // start with last point
 
   // and compare to the first point initially.
-  for ( unsigned int i2 = 0; i2 < inPts.size() ; ++i2 )
+  for ( int i2 = 0; i2 < inPts.size() ; ++i2 )
   { // look at each edge of the polygon in turn
     if ( inside( inPts[i2], b ) ) // end point of edge is inside boundary
     {
diff --git a/src/core/qgsdiagram.h b/src/core/qgsdiagram.h
@@ -11,7 +11,7 @@ struct QgsDiagramSettings;
 class QgsRenderContext;
 
 /**Base class for all diagram types*/
-class QgsDiagram
+class CORE_EXPORT QgsDiagram
 {
   public:
     /**Draws the diagram at the given position (in pixel coordinates)*/
@@ -24,7 +24,7 @@ class QgsDiagram
     QFont scaledFont( const QgsDiagramSettings& s, const QgsRenderContext& c );
 };
 
-class QgsTextDiagram: public QgsDiagram
+class CORE_EXPORT QgsTextDiagram: public QgsDiagram
 {
   public:
     enum Shape
@@ -57,7 +57,7 @@ class QgsTextDiagram: public QgsDiagram
     void lineEllipseIntersection( const QPointF& lineStart, const QPointF& lineEnd, const QPointF& ellipseMid, double r1, double r2, QList<QPointF>& result ) const;
 };
 
-class QgsPieDiagram: public QgsDiagram
+class CORE_EXPORT QgsPieDiagram: public QgsDiagram
 {
   public:
     QgsPieDiagram();
diff --git a/src/core/qgsdiagramrendererv2.h b/src/core/qgsdiagramrendererv2.h
@@ -92,7 +92,7 @@ struct QgsDiagramSettings
 };
 
 /**Returns diagram settings for a feature*/
-class QgsDiagramRendererV2
+class CORE_EXPORT QgsDiagramRendererV2
 {
   public:
 
@@ -142,7 +142,7 @@ class QgsDiagramRendererV2
 };
 
 /**Renders the diagrams for all features with the same settings*/
-class QgsSingleCategoryDiagramRenderer: public QgsDiagramRendererV2
+class CORE_EXPORT QgsSingleCategoryDiagramRenderer: public QgsDiagramRendererV2
 {
   public:
     QgsSingleCategoryDiagramRenderer();
@@ -168,7 +168,7 @@ class QgsSingleCategoryDiagramRenderer: public QgsDiagramRendererV2
     QgsDiagramSettings mSettings;
 };
 
-class QgsLinearlyInterpolatedDiagramRenderer: public QgsDiagramRendererV2
+class CORE_EXPORT QgsLinearlyInterpolatedDiagramRenderer: public QgsDiagramRendererV2
 {
   public:
     QgsLinearlyInterpolatedDiagramRenderer();
diff --git a/src/core/qgsmaprenderer.h b/src/core/qgsmaprenderer.h
@@ -74,7 +74,7 @@ class QgsLabelingEngineInterface
     //! @note: this method was added in version 1.6
     virtual int prepareLayer( QgsVectorLayer* layer, QSet<int>& attrIndices, QgsRenderContext& ctx ) = 0;
     //! adds a diagram layer to the labeling engine
-    virtual int addDiagramLayer( QgsVectorLayer* layer, QgsDiagramLayerSettings& s ) {};
+    virtual int addDiagramLayer( QgsVectorLayer* layer, QgsDiagramLayerSettings& s ) { return 0; };
     //! called for every feature
     virtual void registerFeature( QgsVectorLayer* layer, QgsFeature& feat, const QgsRenderContext& context = QgsRenderContext() ) = 0;
     //! called for every diagram feature
diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp
@@ -760,7 +760,7 @@ int QgsPalLabeling::addDiagramLayer( QgsVectorLayer* layer, QgsDiagramLayerSetti
 
   s.palLayer = l;
   if ( mMapRenderer->hasCrsTransformEnabled() )
-    s.ct = new QgsCoordinateTransform( layer->srs(), mMapRenderer->destinationSrs() );
+    s.ct = new QgsCoordinateTransform( layer->crs(), mMapRenderer->destinationCrs() );
   else
     s.ct = NULL;
   s.xform = mMapRenderer->coordinateTransform();
diff --git a/src/mapserver/qgsfilter.cpp b/src/mapserver/qgsfilter.cpp
@@ -22,6 +22,7 @@
 #include "qgsvectordataprovider.h"
 #include <QDomElement>
 #include <QStringList>
+#include "qgsvectorlayer.h"
 
 QgsFilter::QgsFilter(): mPropertyIndex( -1 )
 {
diff --git a/src/plugins/dxf2shp_converter/CMakeLists.txt b/src/plugins/dxf2shp_converter/CMakeLists.txt
@@ -39,6 +39,7 @@ INCLUDE_DIRECTORIES(
      ../../core/symbology
      ../../gui
      ..
+     ${GEOS_INCLUDE_DIR}
 )
 
 TARGET_LINK_LIBRARIES(dxf2shpconverterplugin
diff --git a/src/plugins/sqlanywhere/CMakeLists.txt b/src/plugins/sqlanywhere/CMakeLists.txt
@@ -59,6 +59,7 @@ INCLUDE_DIRECTORIES(
      ../../app
      ..
      ../../providers/sqlanywhere/sqlanyconnection
+     ${GEOS_INCLUDE_DIR}
 )
 
 TARGET_LINK_LIBRARIES(sqlanywhereplugin

Original file line number	Diff line number	Diff line change
`@@ -735,7 +735,6 @@ void QgsVectorLayerProperties::apply()`
`735`	`735`	`ds.maxScaleDenominator = -1;`
`736`	`736`	`}`
`737`	`737`
`738`		`- QgsDiagramRendererV2* r = 0;`
`739`	`738`	`if ( mFixedSizeCheckBox->isChecked() )`
`740`	`739`	`{`
`741`	`740`	`QgsSingleCategoryDiagramRenderer* dr = new QgsSingleCategoryDiagramRenderer();`
Original file line number	Diff line number	Diff line change
`@@ -291,7 +291,7 @@ inline void QgsClipper::trimFeatureToBoundary(`
`291`	`291`	`unsigned int i1 = inPts.size() - 1; // start with last point`
`292`	`292`
`293`	`293`	`// and compare to the first point initially.`
`294`		`- for ( unsigned int i2 = 0; i2 < inPts.size() ; ++i2 )`
	`294`	`+ for ( int i2 = 0; i2 < inPts.size() ; ++i2 )`
`295`	`295`	`{ // look at each edge of the polygon in turn`
`296`	`296`	`if ( inside( inPts[i2], b ) ) // end point of edge is inside boundary`
`297`	`297`	`{`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@`
`22`	`22`	`#include "qgsvectordataprovider.h"`
`23`	`23`	`#include <QDomElement>`
`24`	`24`	`#include <QStringList>`
	`25`	`+#include "qgsvectorlayer.h"`
`25`	`26`
`26`	`27`	`QgsFilter::QgsFilter(): mPropertyIndex( -1 )`
`27`	`28`	`{`
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@ INCLUDE_DIRECTORIES(`
`39`	`39`	`../../core/symbology`
`40`	`40`	`../../gui`
`41`	`41`	`..`
	`42`	`+ ${GEOS_INCLUDE_DIR}`
`42`	`43`	`)`
`43`	`44`
`44`	`45`	`TARGET_LINK_LIBRARIES(dxf2shpconverterplugin`
Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,7 @@ INCLUDE_DIRECTORIES(`
`59`	`59`	`../../app`
`60`	`60`	`..`
`61`	`61`	`../../providers/sqlanywhere/sqlanyconnection`
	`62`	`+ ${GEOS_INCLUDE_DIR}`
`62`	`63`	`)`
`63`	`64`
`64`	`65`	`TARGET_LINK_LIBRARIES(sqlanywhereplugin`