fix warnings

qgis · Jun 2, 2016 · 006b581 · 006b581
1 parent f52c2b3
commit 006b581
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 10 deletions.
diff --git a/python/core/qgsvectordataprovider.sip b/python/core/qgsvectordataprovider.sip
@@ -89,7 +89,7 @@ class QgsVectorDataProvider : QgsDataProvider
      * @note added in 2.4
      * @return new instance of QgsAbstractFeatureSource (caller is responsible for deleting it)
      */
-    virtual QgsAbstractFeatureSource* featureSource() const /Factory/;
+    virtual QgsAbstractFeatureSource *featureSource() const = 0 /Factory/;
 
     /**
      * Returns the permanent storage type for this layer as a friendly name.
@@ -291,7 +291,7 @@ class QgsVectorDataProvider : QgsDataProvider
     /**
      * Return list of indexes to fetch all attributes in nextFeature()
      */
-    QList<int> attributeIndexes();
+    virtual QList<int> attributeIndexes();
 
     /**
      * Return list of indexes of fields that make up the primary key
@@ -330,7 +330,7 @@ class QgsVectorDataProvider : QgsDataProvider
      * Returns true if the provider is strict about the type of inserted features
      * (e.g. no multipolygon in a polygon layer)
      */
-    bool doesStrictFeatureTypeCheck() const;
+    virtual bool doesStrictFeatureTypeCheck() const;
 
     /** Returns a list of available encodings */
     static const QStringList &availableEncodings();

diff --git a/python/gui/editorwidgets/qgsrelationreferencewidgetwrapper.sip b/python/gui/editorwidgets/qgsrelationreferencewidgetwrapper.sip
@@ -34,5 +34,5 @@ class QgsRelationReferenceWidgetWrapper : QgsEditorWidgetWrapper
      * change the visual cue.
      * @note added in QGIS 2.16
      */
-    void updateConstraintWidgetStatus( bool constraintValid ) override;
+    void updateConstraintWidgetStatus( bool constraintValid );
 };
diff --git a/src/core/qgsvectordataprovider.h b/src/core/qgsvectordataprovider.h
@@ -139,7 +139,7 @@ class CORE_EXPORT QgsVectorDataProvider : public QgsDataProvider
      * @note added in 2.4
      * @return new instance of QgsAbstractFeatureSource (caller is responsible for deleting it)
      */
-    virtual QgsAbstractFeatureSource* featureSource() const { Q_ASSERT( 0 && "All providers must support featureSource()" ); return nullptr; }
+    virtual QgsAbstractFeatureSource *featureSource() const = 0;
 
     /**
      * Returns the permanent storage type for this layer as a friendly name.

diff --git a/src/plugins/globe/featuresource/qgsglobefeaturesource.h b/src/plugins/globe/featuresource/qgsglobefeaturesource.h
@@ -24,7 +24,7 @@ class QgsGlobeFeatureSource : public QObject, public osgEarth::Features::Feature
     const char* className() const override { return "QGISFeatureSource"; }
     const char* libraryName() const override { return "QGIS"; }
 
-    void initialize( const osgDB::Options* dbOptions );
+    void initialize( const osgDB::Options* dbOptions ) override;
 
   protected:
     const osgEarth::Features::FeatureProfile* createFeatureProfile() override { return mProfile; }

diff --git a/src/plugins/globe/qgsglobetilesource.h b/src/plugins/globe/qgsglobetilesource.h
@@ -112,13 +112,13 @@ class QgsGlobeTileSource : public osgEarth::TileSource
   public:
     QgsGlobeTileSource( QgsMapCanvas* canvas, const osgEarth::TileSourceOptions& options = osgEarth::TileSourceOptions() );
     Status initialize( const osgDB::Options *dbOptions ) override;
-    osg::Image* createImage( const osgEarth::TileKey& key, osgEarth::ProgressCallback* progress );
-    osg::HeightField* createHeightField( const osgEarth::TileKey &/*key*/, osgEarth::ProgressCallback* /*progress*/ ) { return 0; }
+    osg::Image* createImage( const osgEarth::TileKey& key, osgEarth::ProgressCallback* progress ) override;
+    osg::HeightField* createHeightField( const osgEarth::TileKey &/*key*/, osgEarth::ProgressCallback* /*progress*/ ) override { return 0; }
     bool hasDataInExtent( const osgEarth::GeoExtent &extent ) const override;
     bool hasData( const osgEarth::TileKey& key ) const override;
 
-    bool isDynamic() const { return true; }
-    osgEarth::TimeStamp getLastModifiedTime() const { return mLastModifiedTime; }
+    bool isDynamic() const override { return true; }
+    osgEarth::TimeStamp getLastModifiedTime() const override { return mLastModifiedTime; }
 
     void refresh( const QgsRectangle &updateExtent );
     void setLayerSet( const QStringList& layerSet );

diff --git a/src/plugins/globe/qgsglobevectorlayerproperties.cpp b/src/plugins/globe/qgsglobevectorlayerproperties.cpp
@@ -101,7 +101,11 @@ QgsGlobeVectorLayerPropertiesPage::QgsGlobeVectorLayerPropertiesPage( QgsVectorL
   groupBoxLabelingEnabled->setChecked( layerConfig->labelingEnabled );
   checkBoxLabelingDeclutter->setChecked( layerConfig->labelingDeclutter );
 #else
+#ifdef _MSC_VER
 #pragma message("TODO: labeling broken with osgEarth 2.7")
+#else
+#warning "TODO: labeling broken with osgEarth 2.7"
+#endif
   groupBoxLabelingEnabled->setChecked( false );
   checkBoxLabelingDeclutter->setChecked( false );
   groupBoxLabelingEnabled->setVisible( false );