Skip to content
Permalink
Browse files

fix 3.0 version attribution

  • Loading branch information
jef-n committed Sep 14, 2016
1 parent 3d514db commit 0cfeef09cba09ad662bd20c00bfb826aa8b3d2ec
Showing with 96 additions and 95 deletions.
  1. +2 −2 python/core/composer/qgscomposerlegend.sip
  2. +1 −1 python/core/composer/qgscomposition.sip
  3. +1 −1 python/core/geometry/qgsabstractgeometryv2.sip
  4. +5 −4 python/core/geometry/qgsgeometry.sip
  5. +1 −1 python/core/qgsannotation.sip
  6. +2 −2 python/core/qgsapplication.sip
  7. +1 −1 python/core/qgscolorscheme.sip
  8. +1 −1 python/core/qgsexpressioncontext.sip
  9. +5 −5 python/core/qgsfield.sip
  10. +6 −6 python/core/qgsoptionalexpression.sip
  11. +2 −2 python/core/qgsproject.sip
  12. +2 −2 python/core/qgsstringutils.sip
  13. +3 −3 python/core/qgsvectorlayer.sip
  14. +1 −1 python/gui/editorwidgets/core/qgseditorconfigwidget.sip
  15. +1 −1 python/gui/qgscolorschemelist.sip
  16. +1 −1 python/gui/qgsexpressionlineedit.sip
  17. +7 −7 python/gui/qgsfilterlineedit.sip
  18. +1 −1 python/gui/qgspanelwidget.sip
  19. +1 −1 src/app/qgssubstitutionlistwidget.h
  20. +2 −2 src/core/composer/qgscomposerlegend.h
  21. +1 −1 src/core/composer/qgscomposition.h
  22. +1 −1 src/core/geometry/qgsabstractgeometryv2.h
  23. +4 −4 src/core/geometry/qgsgeometry.h
  24. +1 −1 src/core/geometry/qgsgeometryutils.h
  25. +1 −1 src/core/geometry/qgsgeos.h
  26. +1 −1 src/core/qgsannotation.h
  27. +2 −2 src/core/qgsapplication.h
  28. +1 −1 src/core/qgscolorscheme.h
  29. +1 −1 src/core/qgsexpression.h
  30. +1 −1 src/core/qgsexpressioncontext.h
  31. +5 −5 src/core/qgsfield.h
  32. +3 −3 src/core/qgslabelfeature.h
  33. +7 −7 src/core/qgsoptional.h
  34. +1 −1 src/core/qgsoptionalexpression.h
  35. +2 −2 src/core/qgsproject.h
  36. +2 −2 src/core/qgsstringutils.h
  37. +3 −3 src/core/qgsvectorlayer.h
  38. +1 −1 src/gui/editorwidgets/core/qgseditorconfigwidget.h
  39. +1 −1 src/gui/qgscolorschemelist.h
  40. +1 −1 src/gui/qgsexpressionlineedit.h
  41. +2 −2 src/gui/qgsfieldexpressionwidget.h
  42. +7 −7 src/gui/qgsfilterlineedit.h
  43. +1 −1 src/gui/qgspanelwidget.h
@@ -50,13 +50,13 @@ class QgsComposerLegend : QgsComposerItem
* @param enabled set to false to disable automatic resizing. The legend frame will not
* be expanded to fit legend items, and items may be cropped from display.
* @see resizeToContents()
* @note added in QGIS 3.0
* @note added in QGIS 2.18
*/
void setResizeToContents( bool enabled );

/** Returns whether the legend should automatically resize to fit its contents.
* @see setResizeToContents()
* @note added in QGIS 3.0
* @note added in QGIS 2.18
*/
bool resizeToContents() const;

@@ -902,7 +902,7 @@ class QgsComposition : QGraphicsScene
void statusMsgChanged( QString message );

/** Emitted whenever the expression variables stored in the composition have been changed.
* @note added in QGIS 3.0
* @note added in QGIS 2.18
*/
void variablesChanged();
};
@@ -133,7 +133,7 @@ class QgsAbstractGeometryV2
/** Returns the closure of the combinatorial boundary of the geometry (ie the topological boundary of the geometry).
* For instance, a polygon geometry will have a boundary consisting of the linestrings for each ring in the polygon.
* @returns boundary for geometry. May be null for some geometry types.
* @note added in QGIS 3.0
* @note added in QGIS 2.18
*/
virtual QgsAbstractGeometryV2* boundary() const = 0;

@@ -196,7 +196,7 @@ class QgsGeometry
* Returns the bisector angle for this geometry at the specified vertex.
* @param vertex vertex index to calculate bisector angle at
* @returns bisector angle, in radians clockwise from north
* @note added in QGIS 3.0
* @note added in QGIS 2.18
* @see interpolateAngle()
*/
double angleAtVertex( int vertex ) const;
@@ -482,6 +482,7 @@ class QgsGeometry
/**
* Return interpolated point on line at distance
* @note added in 1.9
* @see lineLocatePoint()
*/
QgsGeometry* interpolate( double distance ) /Factory/;

@@ -493,7 +494,7 @@ class QgsGeometry
* @return distance along line, or -1 on error
* @note only valid for linestring geometries
* @see interpolate()
* @note added in QGIS 3.0
* @note added in QGIS 2.18
*/
double lineLocatePoint( const QgsGeometry& point ) const;

@@ -502,7 +503,7 @@ class QgsGeometry
* If the distance coincides precisely at a node then the average angle from the segment either side
* of the node is returned.
* @param distance distance along geometry
* @note added in QGIS 3.0
* @note added in QGIS 2.18
* @see angleAtVertex()
*/
double interpolateAngle( double distance ) const;
@@ -521,7 +522,7 @@ class QgsGeometry
* @returns a LineString or MultiLineString geometry, with any connected lines
* joined. An empty geometry will be returned if the input geometry was not a
* MultiLineString geometry.
* @note added in QGIS 3.0
* @note added in QGIS 2.18
*/
QgsGeometry mergeLines() const;

@@ -1,6 +1,6 @@
/** \ingroup core
* \class QgsAnnotation
* \note added in QGIS 3.0
* \note added in QGIS 2.18
*
* \brief An interface for annotation items which are drawn over a map.
*
@@ -385,7 +385,7 @@ static void qtgui_UpdatePyArgv(PyObject *argvlist, int argc, char **argv)
* be called whenever global, application-wide settings are altered to advise listeners
* that they may need to update their state.
* @see settingsChanged()
* @note added in QGIS 3.0
* @note added in QGIS 2.18
*/
void emitSettingsChanged();

@@ -394,7 +394,7 @@ static void qtgui_UpdatePyArgv(PyObject *argvlist, int argc, char **argv)
// void preNotify( QObject * receiver, QEvent * event, bool * done );

/** Emitted whenever any global, application-wide settings are changed.
* @note added in QGIS 3.0
* @note added in QGIS 2.18
* @see emitSettingsChanged()
*/
void settingsChanged();
@@ -165,7 +165,7 @@ class QgsUserColorScheme : QgsGplColorScheme

/** Sets whether a this scheme should be shown in color button menus.
* @param show set to true to show in color button menus, or false to hide from menus
* @note added in QGIS 3.0
* @note added in QGIS 2.18
*/
void setShowSchemeInMenu( bool show );

@@ -299,7 +299,7 @@ class QgsExpressionContext
/** Returns the index of the first scope with a matching name within the context.
* @param scopeName name of scope to find
* @returns index of scope, or -1 if scope was not found within the context.
* @note added in QGIS 3.0
* @note added in QGIS 2.18
*/
int indexOfScope( const QString& scopeName ) const;

@@ -52,7 +52,7 @@ class QgsField
* field alias if set, otherwise the field name.
* @see name()
* @see alias()
* @note added in QGIS 3.0
* @note added in QGIS 2.18
*/
QString displayName() const;

@@ -129,30 +129,30 @@ class QgsField
/** Returns the expression used when calculating the default value for the field.
* @returns expression evaluated when calculating default values for field, or an
* empty string if no default is set
* @note added in QGIS 3.0
* @note added in QGIS 2.18
* @see setDefaultValueExpression()
*/
QString defaultValueExpression() const;

/** Sets an expression to use when calculating the default value for the field.
* @param expression expression to evaluate when calculating default values for field. Pass
* an empty expression to clear the default.
* @note added in QGIS 3.0
* @note added in QGIS 2.18
* @see defaultValueExpression()
*/
void setDefaultValueExpression( const QString& expression );

/** Returns the alias for the field (the friendly displayed name of the field ),
* or an empty string if there is no alias.
* @see setAlias()
* @note added in QGIS 3.0
* @note added in QGIS 2.18
*/
QString alias() const;

/** Sets the alias for the field (the friendly displayed name of the field ).
* @param alias field alias, or empty string to remove an existing alias
* @see alias()
* @note added in QGIS 3.0
* @note added in QGIS 2.18
*/
void setAlias( const QString& alias );

@@ -19,7 +19,7 @@
*
* QgsOptionalExpression is a container for an expression with an additional enabled/disabled flag.
*
* @note Added in QGIS 3.0
* @note Added in QGIS 2.18
*/
class QgsOptionalExpression
{
@@ -48,36 +48,36 @@ class QgsOptionalExpression
* This will compare the enabled flag and call the == operator
* of the contained class.
*
* @note Added in QGIS 3.0
* @note Added in QGIS 2.18
*/
bool operator== ( const QgsOptionalExpression& other ) const;
operator bool () const;

/**
* Check if this optional is enabled
*
* @note Added in QGIS 3.0
* @note Added in QGIS 2.18
*/
bool enabled() const;

/**
* Set if this optional is enabled
*
* @note Added in QGIS 3.0
* @note Added in QGIS 2.18
*/
void setEnabled( bool enabled );

/**
* Access the payload data
*
* @note Added in QGIS 3.0
* @note Added in QGIS 2.18
*/
QgsExpression data() const;

/**
* Set the payload data
*
* @note Added in QGIS 3.0
* @note Added in QGIS 2.18
*/
void setData( const QgsExpression& data );

@@ -398,7 +398,7 @@ class QgsProject : QObject
void homePathChanged();

/** Emitted whenever the expression variables stored in the project have been changed.
* @note added in QGIS 3.0
* @note added in QGIS 2.18
*/
void variablesChanged();

@@ -416,7 +416,7 @@ class QgsProject : QObject
/** Causes the project to emit the variablesChanged() signal. This should
* be called whenever expression variables related to the project are changed.
* @see variablesChanged()
* @note added in QGIS 3.0
* @note added in QGIS 2.18
*/
void emitVariablesChanged();

@@ -137,7 +137,7 @@ class QgsStringUtils
* @param string input string
* @param capitalization capitalization type to apply
* @return capitalized string
* @note added in QGIS 3.0
* @note added in QGIS 2.18
*/
static QString capitalize( const QString& string, Capitalization capitalization );

@@ -183,7 +183,7 @@ class QgsStringUtils
* @param string string to insert links into
* @param foundLinks if specified, will be set to true if any links were inserted into the string
* @returns string with inserted links
* @note added in QGIS 3.0
* @note added in QGIS 2.18
*/
static QString insertLinks( const QString& string, bool* foundLinks = nullptr );
};
@@ -1327,7 +1327,7 @@ class QgsVectorLayer : QgsMapLayer
* @param context optional expression context to evaluate expressions again. If not
* specified, a default context will be created
* @return calculated default value
* @note added in QGIS 3.0
* @note added in QGIS 2.18
* @see setDefaultValueExpression()
*/
QVariant defaultValue( int index, const QgsFeature& feature = QgsFeature(),
@@ -1337,7 +1337,7 @@ class QgsVectorLayer : QgsMapLayer
* @param index field index
* @param expression expression to evaluate when calculating default values for field. Pass
* an empty expression to clear the default.
* @note added in QGIS 3.0
* @note added in QGIS 2.18
* @see defaultValue()
* @see defaultValueExpression()
*/
@@ -1347,7 +1347,7 @@ class QgsVectorLayer : QgsMapLayer
* @param index field index
* @returns expression evaluated when calculating default values for field, or an
* empty string if no default is set
* @note added in QGIS 3.0
* @note added in QGIS 2.18
* @see defaultValue()
* @see setDefaultValueExpression()
*/
@@ -42,7 +42,7 @@ class QgsEditorConfigWidget : QWidget
signals:

/** Emitted when the configuration of the widget is changed.
* @note added in QGIS 3.0
* @note added in QGIS 2.18
*/
void changed();
};
@@ -143,7 +143,7 @@ class QgsColorSchemeList: QTreeView
bool isDirty() const;

/** Returns the scheme currently selected in the list.
* @note added in QGIS 3.0
* @note added in QGIS 2.18
* @see setScheme()
*/
QgsColorScheme* scheme();
@@ -7,7 +7,7 @@
* use in an expression. In contexts where the expression is directly associated with
* a layer and fields can be used, then QgsFieldExpressionWidget is a more appropriate
* choice as it gives users direct access to select fields from a drop down list.
* @note added in QGIS 3.0
* @note added in QGIS 2.18
*/

class QgsExpressionLineEdit : QWidget
@@ -29,28 +29,28 @@ class QgsFilterLineEdit : QLineEdit

/** Returns true if the widget's clear button is visible.
* @see setShowClearButton()
* @note added in QGIS 3.0
* @note added in QGIS 2.18
*/
bool showClearButton() const;

/** Sets whether the widget's clear button is visible.
* @param visible set to false to hide the clear button
* @see showClearButton()
* @note added in QGIS 3.0
* @note added in QGIS 2.18
*/
void setShowClearButton( bool visible );

/** Returns the clear mode for the widget. The clear mode defines the behaviour of the
* widget when its value is cleared. This defaults to ClearToNull.
* @see setClearMode()
* @note added in QGIS 3.0
* @note added in QGIS 2.18
*/
ClearMode clearMode() const;

/** Sets the clear mode for the widget. The clear mode defines the behaviour of the
* widget when its value is cleared. This defaults to ClearToNull.
* @see clearMode()
* @note added in QGIS 3.0
* @note added in QGIS 2.18
*/
void setClearMode( ClearMode mode );

@@ -74,7 +74,7 @@ class QgsFilterLineEdit : QLineEdit
* @param defaultValue default value
* @see defaultValue()
* @see clearMode()
* @note added in QGIS 3.0
* @note added in QGIS 2.18
*/
void setDefaultValue( const QString& defaultValue );

@@ -83,7 +83,7 @@ class QgsFilterLineEdit : QLineEdit
* is equal to ClearToDefault.
* @see setDefaultValue()
* @see clearMode()
* @note added in QGIS 3.0
* @note added in QGIS 2.18
*/
QString defaultValue() const;

@@ -118,7 +118,7 @@ class QgsFilterLineEdit : QLineEdit

/** Clears the widget and resets it to the null value.
* @see nullValue()
* @note added in QGIS 3.0
* @note added in QGIS 2.18
*/
virtual void clearValue();

@@ -78,7 +78,7 @@ class QgsPanelWidget : public QWidget
* widget.
* @param widget widget which may be contained within a panel widget
* @returns parent panel widget if found, otherwise nullptr
* @note added in QGIS 3.0
* @note added in QGIS 2.18
*/
static QgsPanelWidget* findParentPanel( QWidget* widget );

@@ -27,7 +27,7 @@
* \ingroup app
* A widget which allows users to specify a list of substitutions to apply to a string, with
* options for exporting and importing substitution lists.
* \note added in QGIS 3.0
* \note added in QGIS 2.18
* \see QgsSubstitutionListDialog
*/
class APP_EXPORT QgsSubstitutionListWidget : public QgsPanelWidget, private Ui::QgsSubstitutionListWidgetBase

0 comments on commit 0cfeef0

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