[QGIS Commit] r15209 - in trunk/qgis/python: core gui
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Sat Feb 19 08:24:24 EST 2011
Author: jef
Date: 2011-02-19 05:24:24 -0800 (Sat, 19 Feb 2011)
New Revision: 15209
Modified:
trunk/qgis/python/core/qgsapplication.sip
trunk/qgis/python/core/qgslabel.sip
trunk/qgis/python/core/qgsmaplayer.sip
trunk/qgis/python/core/qgsmaprenderer.sip
trunk/qgis/python/core/qgssearchtreenode.sip
trunk/qgis/python/core/qgsvectordataprovider.sip
trunk/qgis/python/core/qgsvectorfilewriter.sip
trunk/qgis/python/core/qgsvectorlayer.sip
trunk/qgis/python/gui/qgisinterface.sip
Log:
add 'deprecated' annotation to SIP bindings
Modified: trunk/qgis/python/core/qgsapplication.sip
===================================================================
--- trunk/qgis/python/core/qgsapplication.sip 2011-02-19 13:21:34 UTC (rev 15208)
+++ trunk/qgis/python/core/qgsapplication.sip 2011-02-19 13:24:24 UTC (rev 15209)
@@ -159,8 +159,8 @@
static const QStringList svgPaths();
//! Returns the path to the applications svg paths
- //! @deprecated
- static const QString svgPath();
+ //! @deprecated use svgPaths()
+ static const QString svgPath() /Deprecated/;
//! Returns the path to the application prefix directory.
static const QString prefixPath();
Modified: trunk/qgis/python/core/qgslabel.sip
===================================================================
--- trunk/qgis/python/core/qgslabel.sip 2011-02-19 13:21:34 UTC (rev 15208)
+++ trunk/qgis/python/core/qgslabel.sip 2011-02-19 13:24:24 UTC (rev 15209)
@@ -54,7 +54,7 @@
void renderLabel ( QPainter* painter, QgsRectangle& viewExtent,
QgsCoordinateTransform* coordinateTransform,
QgsMapToPixel *transform,
- QgsFeature &feature, bool selected, QgsLabelAttributes *classAttributes=0, double sizeScale = 1, double rasterScaleFactor = 1);
+ QgsFeature &feature, bool selected, QgsLabelAttributes *classAttributes=0, double sizeScale = 1, double rasterScaleFactor = 1) /Deprecated/;
/** \brief render label
* \param renderContext renderer context
@@ -85,7 +85,7 @@
/** Pointer to default attributes.
* @deprecated in version 2 badly named. Rather use attributes.
* @see labelAttributes method rather */
- QgsLabelAttributes *layerAttributes( );
+ QgsLabelAttributes *layerAttributes( ) /Deprecated/;
/** Pointer to default attributes.
* @note this replaces the to-be-deprecated layerAttributes method.
Modified: trunk/qgis/python/core/qgsmaplayer.sip
===================================================================
--- trunk/qgis/python/core/qgsmaplayer.sip 2011-02-19 13:21:34 UTC (rev 15208)
+++ trunk/qgis/python/core/qgsmaplayer.sip 2011-02-19 13:24:24 UTC (rev 15209)
@@ -65,7 +65,7 @@
/** Get this layer's unique ID, this ID is used to access this layer from map layer registry
* @deprecated in 1.7
*/
- QString getLayerID() const;
+ QString getLayerID() const /Deprecated/;
/** Set the display name of the layer
* @param name New name for the layer
Modified: trunk/qgis/python/core/qgsmaprenderer.sip
===================================================================
--- trunk/qgis/python/core/qgsmaprenderer.sip 2011-02-19 13:21:34 UTC (rev 15208)
+++ trunk/qgis/python/core/qgsmaprenderer.sip 2011-02-19 13:24:24 UTC (rev 15209)
@@ -104,7 +104,7 @@
//! Recalculate the map scale
void updateScale();
- QgsDistanceArea* distanceArea();
+ QgsDistanceArea* distanceArea() /Deprecated/;
QGis::UnitType mapUnits() const;
void setMapUnits(QGis::UnitType u);
Modified: trunk/qgis/python/core/qgssearchtreenode.sip
===================================================================
--- trunk/qgis/python/core/qgssearchtreenode.sip 2011-02-19 13:21:34 UTC (rev 15208)
+++ trunk/qgis/python/core/qgssearchtreenode.sip 2011-02-19 13:24:24 UTC (rev 15209)
@@ -105,7 +105,7 @@
bool checkAgainst( const QMap<int,QgsField>& fields, QgsFeature &f );
//! @deprecated
- bool checkAgainst( const QMap<int,QgsField>& fields, const QMap<int, QVariant>& attributes, QgsGeometry* geom = 0 );
+ bool checkAgainst( const QMap<int,QgsField>& fields, const QMap<int, QVariant>& attributes, QgsGeometry* geom = 0 ) /Deprecated/;
//! checks if there were errors during evaluation
bool hasError();
@@ -121,7 +121,7 @@
//! @deprecated
bool getValue( QgsSearchTreeValue& value /Out/, QgsSearchTreeNode* node,
- const QMap<int,QgsField>& fields, const QMap<int,QVariant>& attributes, QgsGeometry* geom = 0 );
+ const QMap<int,QgsField>& fields, const QMap<int,QVariant>& attributes, QgsGeometry* geom = 0 ) /Deprecated/;
//! return a list of referenced columns in the tree
//! @note added in 1.5
@@ -150,7 +150,7 @@
QgsSearchTreeValue valueAgainst( const QMap<int,QgsField>& fields, QgsFeature &f );
//! @deprecated
- QgsSearchTreeValue valueAgainst( const QMap<int,QgsField>& fields, const QMap<int,QVariant>& attributes, QgsGeometry* geom = 0 );
+ QgsSearchTreeValue valueAgainst( const QMap<int,QgsField>& fields, const QMap<int,QVariant>& attributes, QgsGeometry* geom = 0 ) /Deprecated/;
//! strips mText when node is of string type
void stripText();
Modified: trunk/qgis/python/core/qgsvectordataprovider.sip
===================================================================
--- trunk/qgis/python/core/qgsvectordataprovider.sip 2011-02-19 13:21:34 UTC (rev 15208)
+++ trunk/qgis/python/core/qgsvectordataprovider.sip 2011-02-19 13:24:24 UTC (rev 15209)
@@ -198,7 +198,7 @@
* @return true in case of success and false in case of failure
* @deprecated
*/
- virtual bool addAttributes(const QMap<QString, QString> &attributes);
+ virtual bool addAttributes(const QMap<QString, QString> &attributes) /Deprecated/;
/**
* Deletes existing attributes
@@ -284,7 +284,7 @@
/**Returns the names of the numerical types
@deprecated */
- const QMap<QString,QVariant::Type> &supportedNativeTypes() const;
+ const QMap<QString,QVariant::Type> &supportedNativeTypes() const /Deprecated/;
/**
* Set whether provider should return also features that don't have
Modified: trunk/qgis/python/core/qgsvectorfilewriter.sip
===================================================================
--- trunk/qgis/python/core/qgsvectorfilewriter.sip 2011-02-19 13:21:34 UTC (rev 15208)
+++ trunk/qgis/python/core/qgsvectorfilewriter.sip 2011-02-19 13:24:24 UTC (rev 15209)
@@ -24,7 +24,9 @@
ErrCreateLayer
};
- /** Write contents of vector layer to a shapefile */
+ /** Write contents of vector layer to a shapefile
+ @deprecated use writeAsVectorFormat instead
+ */
static WriterError writeAsShapefile(QgsVectorLayer* layer,
const QString& shapefileName,
const QString& fileEncoding,
@@ -32,7 +34,7 @@
bool onlySelected = FALSE,
QString *errorMessage = 0,
const QStringList &datasourceOptions = QStringList(),
- const QStringList &layerOptions = QStringList() );
+ const QStringList &layerOptions = QStringList() ) /Deprecated/;
/** Write contents of vector layer to an (OGR supported) vector formt
@note: this method was added in version 1.5*/
Modified: trunk/qgis/python/core/qgsvectorlayer.sip
===================================================================
--- trunk/qgis/python/core/qgsvectorlayer.sip 2011-02-19 13:21:34 UTC (rev 15208)
+++ trunk/qgis/python/core/qgsvectorlayer.sip 2011-02-19 13:24:24 UTC (rev 15209)
@@ -396,11 +396,11 @@
returns true in case of success
@deprecated
*/
- bool addAttribute( QString name, QString type );
+ bool addAttribute( QString name, QString type ) /Deprecated/;
/**Sets an alias (a display name) for attributes to display in dialogs
@note added in version 1.2*/
- void addAttributeAlias( int attIndex, QString aliasString );
+ void addAttributeAlias( int attIndex, QString aliasString );
/**Returns the alias of an attribute name or an empty string if there is no alias
@note added in version 1.2*/
Modified: trunk/qgis/python/gui/qgisinterface.sip
===================================================================
--- trunk/qgis/python/gui/qgisinterface.sip 2011-02-19 13:21:34 UTC (rev 15208)
+++ trunk/qgis/python/gui/qgisinterface.sip 2011-02-19 13:24:24 UTC (rev 15209)
@@ -74,8 +74,9 @@
* @param url URL to open
* @param useQgisDocDirectory If true, the URL will be formed by concatenating
* url to the QGIS documentation directory path (<prefix>/share/doc)
+ * @deprecated
*/
- virtual void openURL(QString url, bool useQgisDocDirectory=true)=0;
+ virtual void openURL(QString url, bool useQgisDocDirectory=true)=0 /Deprecated/;
/** Return a pointer to the map canvas */
virtual QgsMapCanvas * mapCanvas()=0;
@@ -110,7 +111,7 @@
/** refresh legend of a layer
\note deprecated - use QgsLegendInterface::refreshLayerSymbology()
*/
- virtual void refreshLegend( QgsMapLayer * layer )=0;
+ virtual void refreshLegend( QgsMapLayer * layer )=0 /Deprecated/;
/** open layer properties
\note added in 1.5
More information about the QGIS-commit
mailing list