Skip to content
Permalink
Browse files

another scripts/replacev2.sh with minor manual fixes

  • Loading branch information
jef-n committed Aug 10, 2016
1 parent f2d6209 commit 3f22a7a77fa8b438c21e48169afdf763545718f8
Showing 320 changed files with 891 additions and 892 deletions.
@@ -216,7 +216,7 @@
%Include diagram/qgshistogramdiagram.sip
%Include diagram/qgspiediagram.sip
%Include diagram/qgstextdiagram.sip
%Include qgsdiagramrendererv2.sip
%Include qgsdiagramrenderer.sip

%Include effects/qgsblureffect.sip
%Include effects/qgscoloreffect.sip
@@ -287,29 +287,29 @@

%Include symbology-ng/qgscolorbrewerpalette.sip
%Include symbology-ng/qgscptcityarchive.sip
%Include symbology-ng/qgsstylev2.sip
%Include symbology-ng/qgsstyle.sip
%Include symbology-ng/qgssvgcache.sip
%Include symbology-ng/qgssymbol.sip
%Include symbology-ng/qgsvectorcolorrampv2.sip
%Include symbology-ng/qgsvectorcolorramp.sip

%Include symbology-ng/qgs25drenderer.sip
%Include symbology-ng/qgscategorizedsymbolrendererv2.sip
%Include symbology-ng/qgsgraduatedsymbolrendererv2.sip
%Include symbology-ng/qgscategorizedsymbolrenderer.sip
%Include symbology-ng/qgsgraduatedsymbolrenderer.sip
%Include symbology-ng/qgsheatmaprenderer.sip
%Include symbology-ng/qgsinvertedpolygonrenderer.sip
%Include symbology-ng/qgslegendsymbolitemv2.sip
%Include symbology-ng/qgslegendsymbolitem.sip
%Include symbology-ng/qgsnullsymbolrenderer.sip
%Include symbology-ng/qgspointdisplacementrenderer.sip
%Include symbology-ng/qgsrendererv2.sip
%Include symbology-ng/qgsrendererv2registry.sip
%Include symbology-ng/qgsrulebasedrendererv2.sip
%Include symbology-ng/qgssinglesymbolrendererv2.sip
%Include symbology-ng/qgsrenderer.sip
%Include symbology-ng/qgsrendererregistry.sip
%Include symbology-ng/qgsrulebasedrenderer.sip
%Include symbology-ng/qgssinglesymbolrenderer.sip

%Include symbology-ng/qgsellipsesymbollayerv2.sip
%Include symbology-ng/qgsfillsymbollayerv2.sip
%Include symbology-ng/qgsgeometrygeneratorsymbollayerv2.sip
%Include symbology-ng/qgslinesymbollayerv2.sip
%Include symbology-ng/qgsmarkersymbollayerv2.sip
%Include symbology-ng/qgsellipsesymbollayer.sip
%Include symbology-ng/qgsfillsymbollayer.sip
%Include symbology-ng/qgsgeometrygeneratorsymbollayer.sip
%Include symbology-ng/qgslinesymbollayer.sip
%Include symbology-ng/qgsmarkersymbollayer.sip
%Include symbology-ng/qgssymbollayer.sip
%Include symbology-ng/qgssymbollayerregistry.sip
%Include symbology-ng/qgssymbollayerutils.sip
@@ -320,22 +320,22 @@

%Include dxf/qgsdxfexport.sip

%Include geometry/qgsabstractgeometryv2.sip
%Include geometry/qgscircularstringv2.sip
%Include geometry/qgscompoundcurvev2.sip
%Include geometry/qgscurvepolygonv2.sip
%Include geometry/qgscurvev2.sip
%Include geometry/qgsabstractgeometry.sip
%Include geometry/qgscircularstring.sip
%Include geometry/qgscompoundcurve.sip
%Include geometry/qgscurvepolygon.sip
%Include geometry/qgscurve.sip
%Include geometry/qgsgeometry.sip
%Include geometry/qgsgeometrycollectionv2.sip
%Include geometry/qgsgeometrycollection.sip
%Include geometry/qgsgeometryengine.sip
%Include geometry/qgslinestringv2.sip
%Include geometry/qgsmulticurvev2.sip
%Include geometry/qgsmultilinestringv2.sip
%Include geometry/qgsmultipointv2.sip
%Include geometry/qgsmultipolygonv2.sip
%Include geometry/qgsmultisurfacev2.sip
%Include geometry/qgslinestring.sip
%Include geometry/qgsmulticurve.sip
%Include geometry/qgsmultilinestring.sip
%Include geometry/qgsmultipoint.sip
%Include geometry/qgsmultipolygon.sip
%Include geometry/qgsmultisurface.sip
%Include geometry/qgspointv2.sip
%Include geometry/qgspolygonv2.sip
%Include geometry/qgssurfacev2.sip
%Include geometry/qgspolygon.sip
%Include geometry/qgssurface.sip
%Include geometry/qgswkbtypes.sip
%Include geometry/qgswkbptr.sip
@@ -1,7 +1,7 @@
struct QgsVertexId
{
%TypeHeaderCode
#include <qgsabstractgeometryv2.h>
#include <qgsabstractgeometry.h>
%End

enum VertexType
@@ -35,8 +35,8 @@ struct QgsVertexId
class QgsAbstractGeometry
{
%TypeHeaderCode
#include <qgsabstractgeometryv2.h>
#include <qgslinestringv2.h>
#include <qgsabstractgeometry.h>
#include <qgslinestring.h>
%End

%ConvertToSubClassCode
@@ -1,7 +1,7 @@
class QgsCircularString: public QgsCurve
{
%TypeHeaderCode
#include <qgscircularstringv2.h>
#include <qgscircularstring.h>
%End

public:
@@ -1,7 +1,7 @@
class QgsCompoundCurve: public QgsCurve
{
%TypeHeaderCode
#include <qgscompoundcurvev2.h>
#include <qgscompoundcurve.h>
%End

public:
@@ -1,7 +1,7 @@
class QgsCurve: public QgsAbstractGeometry
{
%TypeHeaderCode
#include <qgscurvev2.h>
#include <qgscurve.h>
%End
public:
QgsCurve();
@@ -1,7 +1,7 @@
class QgsCurvePolygon: public QgsSurface
{
%TypeHeaderCode
#include <qgscurvepolygonv2.h>
#include <qgscurvepolygon.h>
%End

public:
@@ -1,7 +1,7 @@
class QgsGeometryCollection: public QgsAbstractGeometry
{
%TypeHeaderCode
#include <qgsgeometrycollectionv2.h>
#include <qgsgeometrycollection.h>
%End

public:
@@ -6,7 +6,7 @@
class QgsLineString: public QgsCurve
{
%TypeHeaderCode
#include <qgslinestringv2.h>
#include <qgslinestring.h>
%End

public:
@@ -1,7 +1,7 @@
class QgsMultiCurve: public QgsGeometryCollection
{
%TypeHeaderCode
#include <qgsmulticurvev2.h>
#include <qgsmulticurve.h>
%End

public:
@@ -1,7 +1,7 @@
class QgsMultiLineString: public QgsMultiCurve
{
%TypeHeaderCode
#include <qgsmultilinestringv2.h>
#include <qgsmultilinestring.h>
%End

public:
@@ -1,7 +1,7 @@
class QgsMultiPointV2: public QgsGeometryCollection
{
%TypeHeaderCode
#include <qgsmultipointv2.h>
#include <qgsmultipoint.h>
%End
public:
virtual QString geometryType() const;
@@ -1,7 +1,7 @@
class QgsMultiPolygonV2: public QgsMultiSurface
{
%TypeHeaderCode
#include <qgsmultipolygonv2.h>
#include <qgsmultipolygon.h>
%End
public:
virtual QString geometryType() const;
@@ -1,7 +1,7 @@
class QgsMultiSurface: public QgsGeometryCollection
{
%TypeHeaderCode
#include <qgsmultisurfacev2.h>
#include <qgsmultisurface.h>
%End
public:
virtual QString geometryType() const;
@@ -1,7 +1,7 @@
class QgsPolygonV2: public QgsCurvePolygon
{
%TypeHeaderCode
#include <qgspolygonv2.h>
#include <qgspolygon.h>
%End

public:
@@ -1,7 +1,7 @@
class QgsSurface: public QgsAbstractGeometry
{
%TypeHeaderCode
#include <qgssurfacev2.h>
#include <qgssurface.h>
%End

public:
@@ -9,7 +9,7 @@
class QgsDiagramLayerSettings
{
%TypeHeaderCode
#include <qgsdiagramrendererv2.h>
#include <qgsdiagramrenderer.h>
%End

public:
@@ -248,7 +248,7 @@ class QgsDiagramLayerSettings
class QgsDiagramSettings
{
%TypeHeaderCode
#include <qgsdiagramrendererv2.h>
#include <qgsdiagramrenderer.h>
%End
public:

@@ -335,7 +335,7 @@ class QgsDiagramSettings
class QgsDiagramInterpolationSettings
{
%TypeHeaderCode
#include <qgsdiagramrendererv2.h>
#include <qgsdiagramrenderer.h>
%End
public:
QSizeF lowerSize;
@@ -357,7 +357,7 @@ class QgsDiagramInterpolationSettings
class QgsDiagramRenderer
{
%TypeHeaderCode
#include <qgsdiagramrendererv2.h>
#include <qgsdiagramrenderer.h>
%End
public:

@@ -477,7 +477,7 @@ class QgsDiagramRenderer
class QgsSingleCategoryDiagramRenderer : QgsDiagramRenderer
{
%TypeHeaderCode
#include <qgsdiagramrendererv2.h>
#include <qgsdiagramrenderer.h>
%End

public:
@@ -508,7 +508,7 @@ class QgsSingleCategoryDiagramRenderer : QgsDiagramRenderer
class QgsLinearlyInterpolatedDiagramRenderer : QgsDiagramRenderer
{
%TypeHeaderCode
#include <qgsdiagramrendererv2.h>
#include <qgsdiagramrenderer.h>
%End

public:
@@ -157,7 +157,7 @@ class QgsPalLayerSettings
{
%TypeHeaderCode
#include <qgspallabeling.h>
#include <qgsdiagramrendererv2.h>
#include <qgsdiagramrenderer.h>
%End
public:
QgsPalLayerSettings();
@@ -1,7 +1,7 @@
class QgsRendererCategory
{
%TypeHeaderCode
#include <qgscategorizedsymbolrendererv2.h>
#include <qgscategorizedsymbolrenderer.h>
%End
public:

@@ -40,7 +40,7 @@ typedef QList<QgsRendererCategory> QgsCategoryList;
class QgsCategorizedSymbolRenderer : QgsFeatureRenderer
{
%TypeHeaderCode
#include <qgscategorizedsymbolrendererv2.h>
#include <qgscategorizedsymbolrenderer.h>
%End

public:
@@ -1,7 +1,7 @@
class QgsEllipseSymbolLayer : QgsMarkerSymbolLayer
{
%TypeHeaderCode
#include <qgsellipsesymbollayerv2.h>
#include <qgsellipsesymbollayer.h>
%End

public:
@@ -1,7 +1,7 @@
class QgsSimpleFillSymbolLayer : QgsFillSymbolLayer
{
%TypeHeaderCode
#include <qgsfillsymbollayerv2.h>
#include <qgsfillsymbollayer.h>
%End

public:
@@ -114,7 +114,7 @@ class QgsSimpleFillSymbolLayer : QgsFillSymbolLayer
class QgsGradientFillSymbolLayer : QgsFillSymbolLayer
{
%TypeHeaderCode
#include <qgsfillsymbollayerv2.h>
#include <qgsfillsymbollayer.h>
%End
public:

@@ -236,7 +236,7 @@ class QgsGradientFillSymbolLayer : QgsFillSymbolLayer
class QgsShapeburstFillSymbolLayer : QgsFillSymbolLayer
{
%TypeHeaderCode
#include <qgsfillsymbollayerv2.h>
#include <qgsfillsymbollayer.h>
%End
public:

@@ -445,7 +445,7 @@ class QgsShapeburstFillSymbolLayer : QgsFillSymbolLayer
class QgsImageFillSymbolLayer: QgsFillSymbolLayer
{
%TypeHeaderCode
#include <qgsfillsymbollayerv2.h>
#include <qgsfillsymbollayer.h>
%End

public:
@@ -497,7 +497,7 @@ class QgsImageFillSymbolLayer: QgsFillSymbolLayer
class QgsRasterFillSymbolLayer: QgsImageFillSymbolLayer
{
%TypeHeaderCode
#include <qgsfillsymbollayerv2.h>
#include <qgsfillsymbollayer.h>
%End
public:

@@ -663,7 +663,7 @@ class QgsRasterFillSymbolLayer: QgsImageFillSymbolLayer
class QgsSVGFillSymbolLayer: QgsImageFillSymbolLayer
{
%TypeHeaderCode
#include <qgsfillsymbollayerv2.h>
#include <qgsfillsymbollayer.h>
%End

public:
@@ -741,7 +741,7 @@ class QgsSVGFillSymbolLayer: QgsImageFillSymbolLayer
class QgsLinePatternFillSymbolLayer: QgsImageFillSymbolLayer
{
%TypeHeaderCode
#include <qgsfillsymbollayerv2.h>
#include <qgsfillsymbollayer.h>
%End
public:
QgsLinePatternFillSymbolLayer();
@@ -849,7 +849,7 @@ class QgsLinePatternFillSymbolLayer: QgsImageFillSymbolLayer
class QgsPointPatternFillSymbolLayer : QgsImageFillSymbolLayer
{
%TypeHeaderCode
#include <qgsfillsymbollayerv2.h>
#include <qgsfillsymbollayer.h>
%End
public:
QgsPointPatternFillSymbolLayer();
@@ -950,7 +950,7 @@ class QgsPointPatternFillSymbolLayer : QgsImageFillSymbolLayer
class QgsCentroidFillSymbolLayer : QgsFillSymbolLayer
{
%TypeHeaderCode
#include <qgsfillsymbollayerv2.h>
#include <qgsfillsymbollayer.h>
%End

public:

0 comments on commit 3f22a7a

Please sign in to comment.
You can’t perform that action at this time.