Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/qgis/QGIS into better-rpm
Browse files Browse the repository at this point in the history
  • Loading branch information
daniviga committed Oct 9, 2017
2 parents 19ee74b + 8759e7c commit d939e31
Show file tree
Hide file tree
Showing 173 changed files with 5,629 additions and 575 deletions.
1 change: 1 addition & 0 deletions images/images.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
280 changes: 280 additions & 0 deletions images/themes/default/mIconAuxiliaryStorage.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion python/analysis/network/qgsgraphbuilderinterface.sip
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ class QgsGraphBuilderInterface
%TypeHeaderCode
#include "qgsgraphbuilderinterface.h"
%End

%ConvertToSubClassCode
if ( dynamic_cast< QgsGraphBuilder * >( sipCpp ) != NULL )
sipType = sipType_QgsGraphBuilder;
Expand Down
1 change: 0 additions & 1 deletion python/analysis/network/qgsgraphdirector.sip
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ class QgsGraphDirector : QObject
%TypeHeaderCode
#include "qgsgraphdirector.h"
%End

%ConvertToSubClassCode
if ( dynamic_cast< QgsVectorLayerDirector * >( sipCpp ) != NULL )
sipType = sipType_QgsVectorLayerDirector;
Expand Down
1 change: 0 additions & 1 deletion python/analysis/network/qgsnetworkstrategy.sip
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ class QgsNetworkStrategy
%TypeHeaderCode
#include "qgsnetworkstrategy.h"
%End

%ConvertToSubClassCode
if ( dynamic_cast< QgsNetworkDistanceStrategy * >( sipCpp ) != NULL )
sipType = sipType_QgsNetworkDistanceStrategy;
Expand Down
1 change: 0 additions & 1 deletion python/analysis/raster/qgsalignraster.sip
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ class QgsAlignRaster

%TypeHeaderCode
#include "qgsalignraster.h"

#include <gdal_version.h>
%End
public:
Expand Down
1 change: 0 additions & 1 deletion python/core/annotations/qgsannotation.sip
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ class QgsAnnotation : QObject
%TypeHeaderCode
#include "qgsannotation.h"
%End

%ConvertToSubClassCode
if ( dynamic_cast< QgsTextAnnotation * >( sipCpp ) )
sipType = sipType_QgsTextAnnotation;
Expand Down
2 changes: 0 additions & 2 deletions python/core/composer/qgscomposeritem.sip
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ class QgsComposerItem: QgsComposerObject, QGraphicsRectItem

%TypeHeaderCode
#include "qgscomposeritem.h"

#include <qgscomposerarrow.h>
#include <qgscomposerframe.h>
#include <qgscomposeritemgroup.h>
Expand All @@ -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)
Expand Down
1 change: 0 additions & 1 deletion python/core/composer/qgscomposermultiframe.sip
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ class QgsComposerMultiFrame: QgsComposerObject
%TypeHeaderCode
#include "qgscomposermultiframe.h"
%End

%ConvertToSubClassCode
if ( dynamic_cast<QgsComposerHtml *>( sipCpp ) != NULL )
sipType = sipType_QgsComposerHtml;
Expand Down
1 change: 1 addition & 0 deletions python/core/core_auto.sip
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion python/core/effects/qgspainteffect.sip
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ class QgsPaintEffect
%TypeHeaderCode
#include "qgspainteffect.h"
%End

%ConvertToSubClassCode
if ( sipCpp->type() == "drawSource" && dynamic_cast<QgsDrawSourceEffect *>( sipCpp ) != NULL )
{
Expand Down
1 change: 0 additions & 1 deletion python/core/expression/qgsexpressionnode.sip
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ class QgsExpressionNode /Abstract/
%TypeHeaderCode
#include "qgsexpressionnode.h"
%End

%ConvertToSubClassCode
switch ( sipCpp->nodeType() )
{
Expand Down
3 changes: 1 addition & 2 deletions python/core/geometry/qgsabstractgeometry.sip
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ class QgsAbstractGeometry
%TypeHeaderCode
#include "qgsabstractgeometry.h"
%End

%ConvertToSubClassCode
if ( qgsgeometry_cast<QgsPoint *>( sipCpp ) != nullptr )
sipType = sipType_QgsPoint;
Expand Down Expand Up @@ -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

Expand Down
Loading

0 comments on commit d939e31

Please sign in to comment.