[QGIS Commit] r15504 - in trunk/qgis/src: app core mapserver plugins/dxf2shp_converter plugins/sqlanywhere

[svn_qgis at osgeo.org]

Author: jef
Date: 2011-03-15 10:38:26 -0700 (Tue, 15 Mar 2011)
New Revision: 15504

Modified:
   trunk/qgis/src/app/qgsvectorlayerproperties.cpp
   trunk/qgis/src/core/qgsclipper.h
   trunk/qgis/src/core/qgsdiagram.h
   trunk/qgis/src/core/qgsdiagramrendererv2.h
   trunk/qgis/src/core/qgsmaprenderer.h
   trunk/qgis/src/core/qgspallabeling.cpp
   trunk/qgis/src/mapserver/qgsfilter.cpp
   trunk/qgis/src/plugins/dxf2shp_converter/CMakeLists.txt
   trunk/qgis/src/plugins/sqlanywhere/CMakeLists.txt
Log:
fix warnings and windows build

Modified: trunk/qgis/src/app/qgsvectorlayerproperties.cpp
===================================================================
--- trunk/qgis/src/app/qgsvectorlayerproperties.cpp	2011-03-15 16:43:23 UTC (rev 15503)
+++ trunk/qgis/src/app/qgsvectorlayerproperties.cpp	2011-03-15 17:38:26 UTC (rev 15504)
@@ -735,7 +735,6 @@
       ds.maxScaleDenominator = -1;
     }
 
-    QgsDiagramRendererV2* r = 0;
     if ( mFixedSizeCheckBox->isChecked() )
     {
       QgsSingleCategoryDiagramRenderer* dr = new QgsSingleCategoryDiagramRenderer();

Modified: trunk/qgis/src/core/qgsclipper.h
===================================================================
--- trunk/qgis/src/core/qgsclipper.h	2011-03-15 16:43:23 UTC (rev 15503)
+++ trunk/qgis/src/core/qgsclipper.h	2011-03-15 17:38:26 UTC (rev 15504)
@@ -291,7 +291,7 @@
   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
     {

Modified: trunk/qgis/src/core/qgsdiagram.h
===================================================================
--- trunk/qgis/src/core/qgsdiagram.h	2011-03-15 16:43:23 UTC (rev 15503)
+++ trunk/qgis/src/core/qgsdiagram.h	2011-03-15 17:38:26 UTC (rev 15504)
@@ -11,7 +11,7 @@
 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 @@
     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 @@
     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();

Modified: trunk/qgis/src/core/qgsdiagramrendererv2.h
===================================================================
--- trunk/qgis/src/core/qgsdiagramrendererv2.h	2011-03-15 16:43:23 UTC (rev 15503)
+++ trunk/qgis/src/core/qgsdiagramrendererv2.h	2011-03-15 17:38:26 UTC (rev 15504)
@@ -92,7 +92,7 @@
 };
 
 /**Returns diagram settings for a feature*/
-class QgsDiagramRendererV2
+class CORE_EXPORT QgsDiagramRendererV2
 {
   public:
 
@@ -142,7 +142,7 @@
 };
 
 /**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 @@
     QgsDiagramSettings mSettings;
 };
 
-class QgsLinearlyInterpolatedDiagramRenderer: public QgsDiagramRendererV2
+class CORE_EXPORT QgsLinearlyInterpolatedDiagramRenderer: public QgsDiagramRendererV2
 {
   public:
     QgsLinearlyInterpolatedDiagramRenderer();

Modified: trunk/qgis/src/core/qgsmaprenderer.h
===================================================================
--- trunk/qgis/src/core/qgsmaprenderer.h	2011-03-15 16:43:23 UTC (rev 15503)
+++ trunk/qgis/src/core/qgsmaprenderer.h	2011-03-15 17:38:26 UTC (rev 15504)
@@ -74,7 +74,7 @@
     //! @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

Modified: trunk/qgis/src/core/qgspallabeling.cpp
===================================================================
--- trunk/qgis/src/core/qgspallabeling.cpp	2011-03-15 16:43:23 UTC (rev 15503)
+++ trunk/qgis/src/core/qgspallabeling.cpp	2011-03-15 17:38:26 UTC (rev 15504)
@@ -760,7 +760,7 @@
 
   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();

Modified: trunk/qgis/src/mapserver/qgsfilter.cpp
===================================================================
--- trunk/qgis/src/mapserver/qgsfilter.cpp	2011-03-15 16:43:23 UTC (rev 15503)
+++ trunk/qgis/src/mapserver/qgsfilter.cpp	2011-03-15 17:38:26 UTC (rev 15504)
@@ -22,6 +22,7 @@
 #include "qgsvectordataprovider.h"
 #include <QDomElement>
 #include <QStringList>
+#include "qgsvectorlayer.h"
 
 QgsFilter::QgsFilter(): mPropertyIndex( -1 )
 {

Modified: trunk/qgis/src/plugins/dxf2shp_converter/CMakeLists.txt
===================================================================
--- trunk/qgis/src/plugins/dxf2shp_converter/CMakeLists.txt	2011-03-15 16:43:23 UTC (rev 15503)
+++ trunk/qgis/src/plugins/dxf2shp_converter/CMakeLists.txt	2011-03-15 17:38:26 UTC (rev 15504)
@@ -39,6 +39,7 @@
      ../../core/symbology
      ../../gui
      ..
+     ${GEOS_INCLUDE_DIR}
 )
 
 TARGET_LINK_LIBRARIES(dxf2shpconverterplugin

Modified: trunk/qgis/src/plugins/sqlanywhere/CMakeLists.txt
===================================================================
--- trunk/qgis/src/plugins/sqlanywhere/CMakeLists.txt	2011-03-15 16:43:23 UTC (rev 15503)
+++ trunk/qgis/src/plugins/sqlanywhere/CMakeLists.txt	2011-03-15 17:38:26 UTC (rev 15504)
@@ -59,6 +59,7 @@
      ../../app
      ..
      ../../providers/sqlanywhere/sqlanyconnection
+     ${GEOS_INCLUDE_DIR}
 )
 
 TARGET_LINK_LIBRARIES(sqlanywhereplugin