Merge branch 'master' of https://github.com/qgis/QGIS into better-rpm

qgis · Oct 9, 2017 · d939e31 · d939e31
2 parents 19ee74b + 8759e7c
commit d939e31
Show file tree

Hide file tree

Showing 173 changed files with 5,629 additions and 575 deletions.
diff --git a/images/images.qrc b/images/images.qrc
@@ -485,6 +485,7 @@
         <file>themes/default/unlocked.svg</file>
         <file>themes/default/unlockedGray.svg</file>
         <file>themes/default/user.svg</file>
+        <file>themes/default/mIconAuxiliaryStorage.svg</file>
         <file>flags/eu.png</file>
         <file>flags/bn.png</file>
         <file>flags/gl.png</file>

diff --git a/images/themes/default/mIconAuxiliaryStorage.svg b/images/themes/default/mIconAuxiliaryStorage.svg
diff --git a/python/analysis/network/qgsgraphbuilderinterface.sip b/python/analysis/network/qgsgraphbuilderinterface.sip
@@ -23,7 +23,6 @@ class QgsGraphBuilderInterface
 %TypeHeaderCode
 #include "qgsgraphbuilderinterface.h"
 %End
-
 %ConvertToSubClassCode
     if ( dynamic_cast< QgsGraphBuilder * >( sipCpp ) != NULL )
       sipType = sipType_QgsGraphBuilder;

diff --git a/python/analysis/network/qgsgraphdirector.sip b/python/analysis/network/qgsgraphdirector.sip
@@ -24,7 +24,6 @@ class QgsGraphDirector : QObject
 %TypeHeaderCode
 #include "qgsgraphdirector.h"
 %End
-
 %ConvertToSubClassCode
     if ( dynamic_cast< QgsVectorLayerDirector * >( sipCpp ) != NULL )
       sipType = sipType_QgsVectorLayerDirector;

diff --git a/python/analysis/network/qgsnetworkstrategy.sip b/python/analysis/network/qgsnetworkstrategy.sip
@@ -28,7 +28,6 @@ class QgsNetworkStrategy
 %TypeHeaderCode
 #include "qgsnetworkstrategy.h"
 %End
-
 %ConvertToSubClassCode
     if ( dynamic_cast< QgsNetworkDistanceStrategy * >( sipCpp ) != NULL )
       sipType = sipType_QgsNetworkDistanceStrategy;

diff --git a/python/analysis/raster/qgsalignraster.sip b/python/analysis/raster/qgsalignraster.sip
@@ -25,7 +25,6 @@ class QgsAlignRaster
 
 %TypeHeaderCode
 #include "qgsalignraster.h"
-
 #include <gdal_version.h>
 %End
   public:

diff --git a/python/core/annotations/qgsannotation.sip b/python/core/annotations/qgsannotation.sip
@@ -30,7 +30,6 @@ class QgsAnnotation : QObject
 %TypeHeaderCode
 #include "qgsannotation.h"
 %End
-
 %ConvertToSubClassCode
     if ( dynamic_cast< QgsTextAnnotation * >( sipCpp ) )
       sipType = sipType_QgsTextAnnotation;

diff --git a/python/core/composer/qgscomposeritem.sip b/python/core/composer/qgscomposeritem.sip
@@ -17,7 +17,6 @@ class QgsComposerItem: QgsComposerObject, QGraphicsRectItem
 
 %TypeHeaderCode
 #include "qgscomposeritem.h"
-
 #include <qgscomposerarrow.h>
 #include <qgscomposerframe.h>
 #include <qgscomposeritemgroup.h>
@@ -34,7 +33,6 @@ class QgsComposerItem: QgsComposerObject, QGraphicsRectItem
 #include <qgslayoutitemshape.h>
 #include <qgslayoutitempage.h>
 %End
-
 %ConvertToSubClassCode
     // the conversions have to be static, because they're using multiple inheritance
     // (seen in PyQt4 .sip files for some QGraphicsItem classes)

diff --git a/python/core/composer/qgscomposermultiframe.sip b/python/core/composer/qgscomposermultiframe.sip
@@ -27,7 +27,6 @@ class QgsComposerMultiFrame: QgsComposerObject
 %TypeHeaderCode
 #include "qgscomposermultiframe.h"
 %End
-
 %ConvertToSubClassCode
     if ( dynamic_cast<QgsComposerHtml *>( sipCpp ) != NULL )
       sipType = sipType_QgsComposerHtml;

diff --git a/python/core/core_auto.sip b/python/core/core_auto.sip
@@ -297,6 +297,7 @@
 %Include qgsapplication.sip
 %Include qgsactionscoperegistry.sip
 %Include qgsanimatedicon.sip
+%Include qgsauxiliarystorage.sip
 %Include qgsbrowsermodel.sip
 %Include qgscoordinatereferencesystem.sip
 %Include qgscredentials.sip

diff --git a/python/core/effects/qgspainteffect.sip b/python/core/effects/qgspainteffect.sip
@@ -37,7 +37,6 @@ class QgsPaintEffect
 %TypeHeaderCode
 #include "qgspainteffect.h"
 %End
-
 %ConvertToSubClassCode
     if ( sipCpp->type() == "drawSource" && dynamic_cast<QgsDrawSourceEffect *>( sipCpp ) != NULL )
     {

diff --git a/python/core/expression/qgsexpressionnode.sip b/python/core/expression/qgsexpressionnode.sip
@@ -21,7 +21,6 @@ class QgsExpressionNode /Abstract/
 %TypeHeaderCode
 #include "qgsexpressionnode.h"
 %End
-
 %ConvertToSubClassCode
     switch ( sipCpp->nodeType() )
     {

diff --git a/python/core/geometry/qgsabstractgeometry.sip b/python/core/geometry/qgsabstractgeometry.sip
@@ -24,7 +24,6 @@ class QgsAbstractGeometry
 %TypeHeaderCode
 #include "qgsabstractgeometry.h"
 %End
-
 %ConvertToSubClassCode
     if ( qgsgeometry_cast<QgsPoint *>( sipCpp ) != nullptr )
       sipType = sipType_QgsPoint;
@@ -396,7 +395,7 @@ Returns the centroid of the geometry
 
     virtual int vertexCount( int part = 0, int ring = 0 ) const = 0;
 %Docstring
- Returns the number of vertexes of which this geometry is built.
+ Returns the number of vertices of which this geometry is built.
  :rtype: int
 %End