Merge branch 'release-3_0' of github.com:qgis/QGIS into release-3_0

qgis · Apr 16, 2018 · 6e3d879 · 6e3d879
2 parents 9e88665 + a0ff64d
commit 6e3d879
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 7 deletions.
diff --git a/python/gui/editorwidgets/core/qgseditorwidgetautoconf.sip.in b/python/gui/editorwidgets/core/qgseditorwidgetautoconf.sip.in
@@ -20,6 +20,7 @@ Base class for plugins allowing to pick automatically a widget type for editing
 #include "qgseditorwidgetautoconf.h"
 %End
   public:
+    virtual ~QgsEditorWidgetAutoConfPlugin();
 
     virtual QgsEditorWidgetSetup editorWidgetSetup( const QgsVectorLayer *vl, const QString &fieldName, int &score /Out/ ) const = 0;
 %Docstring

diff --git a/src/core/qgserror.h b/src/core/qgserror.h
@@ -69,9 +69,6 @@ class CORE_EXPORT QgsErrorMessage
     QString mFile;
     QString mFunction;
     int mLine = 0;
-
-    //! Message format
-    Format mFormat = Text;
 };
 
 /**

diff --git a/src/core/raster/qgsrasterfilewriter.cpp b/src/core/raster/qgsrasterfilewriter.cpp
@@ -497,7 +497,6 @@ QgsRasterFileWriter::WriterError QgsRasterFileWriter::writeImageRaster( QgsRaste
   void *greenData = qgsMalloc( mMaxTileWidth * mMaxTileHeight );
   void *blueData = qgsMalloc( mMaxTileWidth * mMaxTileHeight );
   void *alphaData = qgsMalloc( mMaxTileWidth * mMaxTileHeight );
-  QgsRectangle mapRect;
   int iterLeft = 0, iterTop = 0, iterCols = 0, iterRows = 0;
   int fileIndex = 0;
 

diff --git a/src/core/symbology/qgssymbollayerutils.cpp b/src/core/symbology/qgssymbollayerutils.cpp
@@ -1477,7 +1477,7 @@ bool QgsSymbolLayerUtils::convertPolygonSymbolizerToPointMarker( QDomElement &el
     int markIndex = -1;
     QColor fillColor, strokeColor;
     double strokeWidth = 1.0, size = 0.0, angle = 0.0;
-    QPointF anchor, offset;
+    QPointF offset;
 
     // Fill element can contain a GraphicFill element
     QDomElement graphicFillElem = fillElem.firstChildElement( QStringLiteral( "GraphicFill" ) );

diff --git a/src/gui/editorwidgets/core/qgseditorwidgetautoconf.h b/src/gui/editorwidgets/core/qgseditorwidgetautoconf.h
@@ -32,6 +32,7 @@ class QgsEditorWidgetSetup;
 class GUI_EXPORT QgsEditorWidgetAutoConfPlugin
 {
   public:
+    virtual ~QgsEditorWidgetAutoConfPlugin() = default;
 
     /**
      * Typical scores are:

diff --git a/src/gui/editorwidgets/qgsrelationreferencewidgetwrapper.cpp b/src/gui/editorwidgets/qgsrelationreferencewidgetwrapper.cpp
@@ -76,7 +76,7 @@ void QgsRelationReferenceWidgetWrapper::initWidget( QWidget *editor )
   // If this widget is already embedded by the same relation, reduce functionality
   do
   {
-    if ( ctx->relation().name() == relation.name() )
+    if ( ctx->relation().id() == relation.id() )
     {
       mWidget->setEmbedForm( false );
       mWidget->setReadOnlySelector( true );

diff --git a/src/providers/gpx/qgsgpxprovider.cpp b/src/providers/gpx/qgsgpxprovider.cpp
@@ -216,7 +216,6 @@ bool QgsGPXProvider::addFeature( QgsFeature &f, Flags )
   bool success = false;
   QgsGpsObject *obj = nullptr;
   QgsAttributes attrs = f.attributes();
-  QgsAttributeMap::const_iterator it;
 
   // is it a waypoint?
   if ( mFeatureType == WaypointType && geo && wkbType == QgsWkbTypes::Point )