fix warnings

Author: jef-n

CMakeLists.txt

@@ -310,11 +310,15 @@ IF (PEDANTIC)
     # disable warnings
     ADD_DEFINITIONS( /wd4100 )  # unused formal parameters
     ADD_DEFINITIONS( /wd4127 )  # constant conditional expressions (used in Qt template classes)
+    ADD_DEFINITIONS( /wd4231 )  # nonstandard extension used : 'identifier' before template explicit instantiation (used in Qt template classes)
+    ADD_DEFINITIONS( /wd4251 )  # needs to have dll-interface to be used by clients of class (occurs in Qt template classes)
+    ADD_DEFINITIONS( /wd4275 )  # non dll-interface class '...' used as base for dll-interface class '...'
     ADD_DEFINITIONS( /wd4505 )  # unreferenced local function has been removed (QgsRasterDataProvider::extent)
     ADD_DEFINITIONS( /wd4510 )  # default constructor could not be generated (sqlite3_index_info, QMap)
     ADD_DEFINITIONS( /wd4512 )  # assignment operator could not be generated (sqlite3_index_info)
     ADD_DEFINITIONS( /wd4610 )  # user defined constructor required (sqlite3_index_info)
     ADD_DEFINITIONS( /wd4706 )  # assignment within conditional expression (pal)
+    ADD_DEFINITIONS( /wd4800 )  # 'int' : forcing value to bool 'true' or 'false' (performance warning)
   ELSE (MSVC)
     # add warnings via flags (not as definitions as on Mac -Wall can not be overridden per language )
     SET(_warnings "-Wall -Wextra -Wno-long-long -Wformat-security -Wno-strict-aliasing")

python/core/qgsexpression.sip

@@ -39,6 +39,11 @@ class QgsExpression
     //! @note this method does not expect that prepare() has been called on this instance
     QVariant evaluate( const QgsFeature* f, const QgsFields& fields );
 
+    //! Evaluate the feature and return the result
+    //! @note this method does not expect that prepare() has been called on this instance
+    //! @note not available in python bindings
+    // inline QVariant evaluate( const QgsFeature& f, const QgsFields& fields ) { return evaluate( &f, fields ); }
+
     //! Returns true if an error occurred when evaluating last input
     bool hasEvalError() const;
     //! Returns evaluation error
@@ -63,7 +68,7 @@ class QgsExpression
 
     void setScale( double scale );
 
-    int scale();
+    double scale();
 
     //! Return the expression string that was given when created.
     const QString expression() const;

python/core/qgspallabeling.sip

@@ -693,6 +693,7 @@ class QgsPalLabeling : QgsLabelingEngineInterface
     virtual void drawLabeling( QgsRenderContext& context );
     //! called when we're done with rendering
     virtual void exit();
+
     //! return infos about labels at a given (map) position
     //! @deprecated since 2.4 - use takeResults() and methods of QgsLabelingResults
     virtual QList<QgsLabelPosition> labelsAtPosition( const QgsPoint& p ) /Deprecated/;

src/app/composer/qgscomposermapwidget.cpp

@@ -250,7 +250,7 @@ void QgsComposerMapWidget::on_mAtlasPredefinedScaleRadio_toggled( bool checked )
   {
     // restore to fixed scale if no predefined scales exist
     mAtlasFixedScaleRadio->blockSignals( true );
-    mAtlasFixedScaleRadio->setChecked( Qt::Checked );
+    mAtlasFixedScaleRadio->setChecked( true );
     mAtlasFixedScaleRadio->blockSignals( false );
     mComposerMap->setAtlasScalingMode( QgsComposerMap::Fixed );
   }

src/app/legend/qgsapplegendinterface.h

@@ -30,6 +30,7 @@ class QgsMapLayer;
  * QgsLegendInterface
  * Abstract base class to make QgsLegend available to plugins.
  */
+Q_NOWARN_DEPRECATED_PUSH
 class QgsAppLegendInterface : public QgsLegendInterface
 {
     Q_OBJECT
@@ -117,5 +118,6 @@ class QgsAppLegendInterface : public QgsLegendInterface
     int groupNodeToIndex( QgsLayerTreeGroup* group );
     void setExpanded( QgsLayerTreeNode *node, bool expand );
 };
+Q_NOWARN_DEPRECATED_POP
 
 #endif //QGSLEGENDAPPIFACE_H

src/app/qgisappinterface.h

@@ -32,6 +32,7 @@ class QgisApp;
  * Only those functions "exposed" by QgisInterface can be called from within a
  * plugin.
  */
+Q_NOWARN_DEPRECATED_PUSH
 class APP_EXPORT QgisAppInterface : public QgisInterface
 {
     Q_OBJECT
@@ -508,5 +509,6 @@ class APP_EXPORT QgisAppInterface : public QgisInterface
     //! Pointer to the PluginManagerInterface object
     QgsAppPluginManagerInterface pluginManagerIface;
 };
+Q_NOWARN_DEPRECATED_POP
 
 #endif //#define QGISAPPINTERFACE_H

src/app/qgsmaptooldeletepart.cpp

@@ -111,7 +111,7 @@ void QgsMapToolDeletePart::canvasReleaseEvent( QMouseEvent *e )
   return;
 }
 
-QgsGeometry* QgsMapToolDeletePart::partUnderPoint( QPoint point, int& fid, int& partNum )
+QgsGeometry* QgsMapToolDeletePart::partUnderPoint( QPoint point, QgsFeatureId& fid, int& partNum )
 {
   QgsFeature f;
   QgsGeometry* geomPart = new QgsGeometry();

src/app/qgsmaptooldeletepart.h

@@ -43,14 +43,14 @@ class APP_EXPORT QgsMapToolDeletePart: public QgsMapToolEdit
     QgsVectorLayer* vlayer;
     QList<QgsSnappingResult> mRecentSnappingResults;
 
-    QgsGeometry* partUnderPoint( QPoint p, int &fid, int &partNum );
+    QgsGeometry* partUnderPoint( QPoint p, QgsFeatureId &fid, int &partNum );
 
     /* Rubberband that shows the part being deleted*/
     QgsRubberBand* mRubberBand;
 
     //The feature and part where the mouse cursor was pressed
     //This is used to check whether we are still in the same part at cursor release
-    int mPressedFid;
+    QgsFeatureId mPressedFid;
     int mPressedPartNum;
 };
 

src/app/qgsmaptooldeletering.cpp

@@ -111,7 +111,7 @@ void QgsMapToolDeleteRing::canvasReleaseEvent( QMouseEvent *e )
   }
 }
 
-QgsGeometry* QgsMapToolDeleteRing::ringUnderPoint( QgsPoint p, int& fid, int& partNum, int& ringNum )
+QgsGeometry* QgsMapToolDeleteRing::ringUnderPoint( QgsPoint p, QgsFeatureId& fid, int& partNum, int& ringNum )
 {
   //There is no clean way to find if we are inside the ring of a feature,
   //so we iterate over all the features visible in the canvas
@@ -120,7 +120,7 @@ QgsGeometry* QgsMapToolDeleteRing::ringUnderPoint( QgsPoint p, int& fid, int& pa
   QgsFeatureIterator fit = vlayer->getFeatures( QgsFeatureRequest().setFilterRect( mCanvas->extent() ) );
   QgsFeature f;
   QgsGeometry* g;
-  QgsGeometry* ringGeom;
+  QgsGeometry* ringGeom = 0;
   QgsMultiPolygon pol;
   QgsPolygon tempPol;
   QgsGeometry* tempGeom;

src/app/qgsmaptooldeletering.h

@@ -54,13 +54,13 @@ class APP_EXPORT QgsMapToolDeleteRing : public QgsMapToolVertexEdit
     /*! return the geometry of the ring under the point p and sets fid to the feature id,
      * partNum to the part number in the feature and ringNum to the ring number in the part
      */
-    QgsGeometry* ringUnderPoint( QgsPoint p, int& fid, int& partNum, int& ringNum );
+    QgsGeometry* ringUnderPoint( QgsPoint p, QgsFeatureId& fid, int& partNum, int& ringNum );
 
     /* Rubberband that shows the ring being deleted*/
     QgsRubberBand* mRubberBand;
 
     //The feature, part and ring the mouse was pressed in, to  check we are still in the same ring at release
-    int mPressedFid;
+    QgsFeatureId mPressedFid;
     int mPressedPartNum;
     int mPressedRingNum;
 };