Skip to content
Permalink
Browse files

scripts/replacev2.sh run

  • Loading branch information
jef-n committed Aug 6, 2016
1 parent 8a45744 commit 06886210465c1b037692ac0bf97829bf17077df0
Showing 508 changed files with 6,947 additions and 6,947 deletions.
@@ -149,14 +149,14 @@ class QgsComposerArrow: QgsComposerItem
* @see lineSymbol
* @note added in 2.5
*/
void setLineSymbol( QgsLineSymbolV2* symbol /Transfer/ );
void setLineSymbol( QgsLineSymbol* symbol /Transfer/ );

/** Returns the line symbol used for drawing the line portion of the arrow
* @returns line symbol
* @see setLineSymbol
* @note added in 2.5
*/
QgsLineSymbolV2* lineSymbol();
QgsLineSymbol* lineSymbol();

/** Returns marker mode, which controls how the arrow endpoints are drawn
* @returns marker mode
@@ -41,17 +41,17 @@ class QgsComposerLegendItem : QStandardItem
};


class QgsComposerSymbolV2Item: QgsComposerLegendItem
class QgsComposerSymbolItem: QgsComposerLegendItem
{
%TypeHeaderCode
#include <qgscomposerlegenditem.h>
%End

public:
QgsComposerSymbolV2Item();
QgsComposerSymbolV2Item( const QString& text );
QgsComposerSymbolV2Item( const QIcon& icon, const QString& text );
virtual ~QgsComposerSymbolV2Item();
QgsComposerSymbolItem();
QgsComposerSymbolItem( const QString& text );
QgsComposerSymbolItem( const QIcon& icon, const QString& text );
virtual ~QgsComposerSymbolItem();

virtual QStandardItem* clone() const /Factory/;

@@ -510,12 +510,12 @@ class QgsComposerMap : QgsComposerItem
/**
* @deprecated use grid()->setLineSymbol() or grids() instead
*/
void setGridLineSymbol( QgsLineSymbolV2* symbol /Transfer/) /Deprecated/;
void setGridLineSymbol( QgsLineSymbol* symbol /Transfer/) /Deprecated/;

/**
* @deprecated use grid()->lineSymbol() or grids() instead
*/
QgsLineSymbolV2* gridLineSymbol() /Deprecated/;
QgsLineSymbol* gridLineSymbol() /Deprecated/;

/** Returns the grid's blending mode
* @deprecated use grid()->blendMode() or grids() instead
@@ -612,12 +612,12 @@ class QgsComposerMap : QgsComposerItem
/**
* @deprecated use overview()->setFrameSymbol() or overviews() instead
*/
void setOverviewFrameMapSymbol( QgsFillSymbolV2* symbol /Transfer/ ) /Deprecated/;
void setOverviewFrameMapSymbol( QgsFillSymbol* symbol /Transfer/ ) /Deprecated/;

/**
* @deprecated use overview()->frameSymbol() or overviews() instead
*/
QgsFillSymbolV2* overviewFrameMapSymbol() /Deprecated/;
QgsFillSymbol* overviewFrameMapSymbol() /Deprecated/;

/** Returns the overview's blending mode
* @deprecated use overview()->blendMode() or overviews() instead
@@ -451,7 +451,7 @@ class QgsComposerMapGrid : QgsComposerMapItem
* @see setMarkerSymbol
* @see setStyle
*/
void setLineSymbol( QgsLineSymbolV2* symbol /Transfer/ );
void setLineSymbol( QgsLineSymbol* symbol /Transfer/ );

/** Gets the line symbol used for drawing grid lines. This is only used for grids with
* QgsComposerMapGrid::Solid or QgsComposerMapGrid::Cross styles.
@@ -461,7 +461,7 @@ class QgsComposerMapGrid : QgsComposerMapItem
* @see style
* @note not available in python bindings
*/
// const QgsLineSymbolV2* lineSymbol() const { return mGridLineSymbol; }
// const QgsLineSymbol* lineSymbol() const { return mGridLineSymbol; }

/** Gets the line symbol used for drawing grid lines. This is only used for grids with
* QgsComposerMapGrid::Solid or QgsComposerMapGrid::Cross styles.
@@ -470,7 +470,7 @@ class QgsComposerMapGrid : QgsComposerMapItem
* @see markerSymbol
* @see style
*/
QgsLineSymbolV2* lineSymbol();
QgsLineSymbol* lineSymbol();

/** Sets the marker symbol used for drawing grid points. This is only used for grids with a
* QgsComposerMapGrid::Markers style.
@@ -479,7 +479,7 @@ class QgsComposerMapGrid : QgsComposerMapItem
* @see setLineSymbol
* @see setStyle
*/
void setMarkerSymbol( QgsMarkerSymbolV2* symbol /Transfer/);
void setMarkerSymbol( QgsMarkerSymbol* symbol /Transfer/);

/** Gets the marker symbol used for drawing grid points. This is only used for grids with a
* QgsComposerMapGrid::Markers style.
@@ -489,7 +489,7 @@ class QgsComposerMapGrid : QgsComposerMapItem
* @see style
* @note not available in python bindings
*/
// const QgsMarkerSymbolV2* markerSymbol() const { return mGridMarkerSymbol; }
// const QgsMarkerSymbol* markerSymbol() const { return mGridMarkerSymbol; }

/** Gets the marker symbol used for drawing grid points. This is only used for grids with a
* QgsComposerMapGrid::Markers style.
@@ -498,7 +498,7 @@ class QgsComposerMapGrid : QgsComposerMapItem
* @see lineSymbol
* @see style
*/
QgsMarkerSymbolV2* markerSymbol();
QgsMarkerSymbol* markerSymbol();

//
// ANNOTATIONS
@@ -157,20 +157,20 @@ class QgsComposerMapOverview : QgsComposerMapItem
* @param symbol fill symbol for overview
* @see frameSymbol
*/
void setFrameSymbol( QgsFillSymbolV2* symbol /Transfer/ );
void setFrameSymbol( QgsFillSymbol* symbol /Transfer/ );

/** Gets the fill symbol used for drawing the overview extent.
* @returns fill symbol for overview
* @see setFrameSymbol
*/
QgsFillSymbolV2* frameSymbol();
QgsFillSymbol* frameSymbol();

/** Gets the fill symbol used for drawing the overview extent.
* @returns fill symbol for overview
* @see setFrameSymbol
* @note not available in python bindings
*/
// const QgsFillSymbolV2* frameSymbol() const { return mFrameSymbol; }
// const QgsFillSymbol* frameSymbol() const { return mFrameSymbol; }

/** Retrieves the blending mode used for drawing the overview.
* @returns blending mode for overview
@@ -13,10 +13,10 @@ class QgsComposerPolygon: QgsComposerNodesItem
virtual QString displayName() const;

/** Returns the QgsSymbol used to draw the shape. */
QgsFillSymbolV2* polygonStyleSymbol();
QgsFillSymbol* polygonStyleSymbol();

/** Set the QgsSymbol used to draw the shape. */
void setPolygonStyleSymbol( QgsFillSymbolV2* symbol );
void setPolygonStyleSymbol( QgsFillSymbol* symbol );

/** Return correct graphics item type. */
virtual int type() const;
@@ -13,10 +13,10 @@ class QgsComposerPolyline: QgsComposerNodesItem
virtual QString displayName() const;

/** Returns the QgsSymbol used to draw the shape. */
QgsLineSymbolV2* polylineStyleSymbol();
QgsLineSymbol* polylineStyleSymbol();

/** Set the QgsSymbol used to draw the shape. */
void setPolylineStyleSymbol( QgsLineSymbolV2* symbol );
void setPolylineStyleSymbol( QgsLineSymbol* symbol );

/** Overridden to return shape type */
virtual int type() const;
@@ -44,17 +44,17 @@ class QgsComposerShape: QgsComposerItem
/** Returns the radius for rounded rectangle corners*/
double cornerRadius() const;

/** Sets the QgsFillSymbolV2 used to draw the shape. Must also call setUseSymbolV2( true ) to
/** Sets the QgsFillSymbol used to draw the shape. Must also call setUseSymbol( true ) to
* enable drawing with a symbol.
* Note: added in version 2.1*/
void setShapeStyleSymbol( QgsFillSymbolV2* symbol );
/** Returns the QgsFillSymbolV2 used to draw the shape.
void setShapeStyleSymbol( QgsFillSymbol* symbol );
/** Returns the QgsFillSymbol used to draw the shape.
* Note: added in version 2.1*/
QgsFillSymbolV2* shapeStyleSymbol();
QgsFillSymbol* shapeStyleSymbol();

/** Controls whether the shape should be drawn using a QgsFillSymbolV2.
/** Controls whether the shape should be drawn using a QgsFillSymbol.
* Note: Added in v2.1 */
void setUseSymbolV2( bool useSymbolV2 );
void setUseSymbol( bool useSymbolV2 );

/** Depending on the symbol style, the bounding rectangle can be larger than the shape
@note this function was added in version 2.3*/
@@ -157,9 +157,9 @@ class QgsComposition : QGraphicsScene
bool shouldExportPage( const int page ) const;

/** Note: added in version 2.1*/
void setPageStyleSymbol( QgsFillSymbolV2* symbol );
void setPageStyleSymbol( QgsFillSymbol* symbol );
/** Note: added in version 2.1*/
QgsFillSymbolV2* pageStyleSymbol();
QgsFillSymbol* pageStyleSymbol();

/** Returns the position within a page of a point in the composition
@note Added in QGIS 2.1
@@ -240,15 +240,15 @@ class QgsDxfExport
* @note not available in Python bindings
* @note added in 2.15
*/
// void writePolyline( const QgsPointSequenceV2 &line, const QString &layer, const QString &lineStyleName, const QColor& color, double width = -1 );
// void writePolyline( const QgsPointSequence &line, const QString &layer, const QString &lineStyleName, const QColor& color, double width = -1 );

/**
* Draw dxf filled polygon (HATCH)
* @param polygon polygon
* @param layer layer name to use
* @param hatchPattern hatchPattern to use
* @param color color to use
* @deprecated use version with QgsRingSequenceV2
* @deprecated use version with QgsRingSequence
*/
void writePolygon( const QgsPolygon &polygon, const QString &layer, const QString &hatchPattern, const QColor& color ) /Deprecated/;

@@ -261,7 +261,7 @@ class QgsDxfExport
* @note not available in Python bindings
* @note added in 2.15
*/
// void writePolygon( const QgsRingSequenceV2 &polygon, const QString &layer, const QString &hatchPattern, const QColor& color );
// void writePolygon( const QgsRingSequence &polygon, const QString &layer, const QString &hatchPattern, const QColor& color );

/**
* Draw dxf filled polygon (SOLID)
@@ -129,15 +129,15 @@ class QgsGlowEffect : QgsPaintEffect
* @see ramp
* @see setColorType
*/
void setRamp( QgsVectorColorRampV2* ramp /Transfer/ );
void setRamp( QgsVectorColorRamp* ramp /Transfer/ );

/** Returns the color ramp used for the glow. This only applies if the @link colorType @endlink
* is set to ColorRamp. The glow will utilise colors from the ramp.
* @returns color ramp for glow
* @see setRamp
* @see colorType
*/
QgsVectorColorRampV2* ramp() const;
QgsVectorColorRamp* ramp() const;

/** Sets the blend mode for the effect
* @param mode blend mode used for drawing the effect on to a destination
@@ -153,7 +153,7 @@ class QgsGlowEffect : QgsPaintEffect
*/
QPainter::CompositionMode blendMode() const;

/** Sets the color mode to use for the glow. The glow can either be drawn using a QgsVectorColorRampV2
/** Sets the color mode to use for the glow. The glow can either be drawn using a QgsVectorColorRamp
* color ramp or by simply specificing a single color. setColorType is used to specify which mode to use
* for the glow.
* @param colorType color type to use for glow
@@ -163,7 +163,7 @@ class QgsGlowEffect : QgsPaintEffect
*/
void setColorType( GlowColorType colorType );

/** Returns the color mode used for the glow. The glow can either be drawn using a QgsVectorColorRampV2
/** Returns the color mode used for the glow. The glow can either be drawn using a QgsVectorColorRamp
* color ramp or by specificing a single color.
* @returns current color mode used for the glow
* @see setColorType
@@ -96,7 +96,7 @@ class QgsImageOperation
double spread;
/** Color ramp to use for shading the distance transform
*/
QgsVectorColorRampV2* ramp;
QgsVectorColorRamp* ramp;
};

/** Performs a distance transform on the source image and shades the result

0 comments on commit 0688621

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