[QGIS Commit] r15435 - in trunk/qgis/src: core gui
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Fri Mar 11 13:59:25 EST 2011
Author: jef
Date: 2011-03-11 10:59:25 -0800 (Fri, 11 Mar 2011)
New Revision: 15435
Modified:
trunk/qgis/src/core/qgsapplication.h
trunk/qgis/src/core/qgscoordinatereferencesystem.h
trunk/qgis/src/core/qgsdistancearea.h
trunk/qgis/src/core/qgslabel.h
trunk/qgis/src/core/qgsmaplayer.h
trunk/qgis/src/core/qgsmaprenderer.h
trunk/qgis/src/core/qgsoverlayobject.h
trunk/qgis/src/core/qgsrasterdataprovider.h
trunk/qgis/src/core/qgssearchtreenode.h
trunk/qgis/src/core/qgsvectordataprovider.h
trunk/qgis/src/core/qgsvectorfilewriter.h
trunk/qgis/src/core/qgsvectorlayer.h
trunk/qgis/src/gui/qgisinterface.h
trunk/qgis/src/gui/qgsgenericprojectionselector.h
trunk/qgis/src/gui/qgsmapcanvas.h
trunk/qgis/src/gui/qgsprojectionselector.h
Log:
replace our QGISDEPRECATED with Qt's Q_DECL_DEPRECATED
Modified: trunk/qgis/src/core/qgsapplication.h
===================================================================
--- trunk/qgis/src/core/qgsapplication.h 2011-03-11 16:05:40 UTC (rev 15434)
+++ trunk/qgis/src/core/qgsapplication.h 2011-03-11 18:59:25 UTC (rev 15435)
@@ -116,8 +116,8 @@
static const QStringList svgPaths();
//! Returns the paths to svg applications svg directory.
- //! @deprecated since 1.4
- QGISDEPRECATED static const QString svgPath();
+ //! @deprecated since 1.4 - use svgPaths()
+ Q_DECL_DEPRECATED static const QString svgPath();
//! Returns the path to the application prefix directory.
static const QString prefixPath();
Modified: trunk/qgis/src/core/qgscoordinatereferencesystem.h
===================================================================
--- trunk/qgis/src/core/qgscoordinatereferencesystem.h 2011-03-11 16:05:40 UTC (rev 15434)
+++ trunk/qgis/src/core/qgscoordinatereferencesystem.h 2011-03-11 18:59:25 UTC (rev 15435)
@@ -119,7 +119,7 @@
* @return bool TRUE if success else false
* @deprecated use createFromOgcWmsCrs()
*/
- QGISDEPRECATED bool createFromEpsg( const long theEpsg );
+ Q_DECL_DEPRECATED bool createFromEpsg( const long theEpsg );
/*! Set up this srs by fetching the appropriate information from the
* sqlite backend. If the srsid is < 100000, only the system srs.db
@@ -263,7 +263,7 @@
* @return long theEpsg the EPSG identifier for this srs (defaults to 0)
* @deprecated there are other authorities - use authid()
*/
- QGISDEPRECATED long epsg() const;
+ Q_DECL_DEPRECATED long epsg() const;
/*! Get the authority identifier for this srs
* @return QString the Authority identifier for this srs
Modified: trunk/qgis/src/core/qgsdistancearea.h
===================================================================
--- trunk/qgis/src/core/qgsdistancearea.h 2011-03-11 16:05:40 UTC (rev 15434)
+++ trunk/qgis/src/core/qgsdistancearea.h 2011-03-11 18:59:25 UTC (rev 15435)
@@ -51,7 +51,7 @@
void setSourceCrs( long srsid );
//! sets source spatial reference system (by EpsgCrsId)
- QGISDEPRECATED void setSourceEpsgCrsId( long epsgId );
+ Q_DECL_DEPRECATED void setSourceEpsgCrsId( long epsgId );
//! sets source spatial reference system by authid
void setSourceAuthId( QString authid );
Modified: trunk/qgis/src/core/qgslabel.h
===================================================================
--- trunk/qgis/src/core/qgslabel.h 2011-03-11 16:05:40 UTC (rev 15434)
+++ trunk/qgis/src/core/qgslabel.h 2011-03-11 18:59:25 UTC (rev 15435)
@@ -103,11 +103,11 @@
* \param rasterScaleFactor raster scale
* \deprecated
*/
- QGISDEPRECATED void renderLabel( QPainter* painter, const QgsRectangle& viewExtent,
- QgsCoordinateTransform* coordinateTransform,
- const QgsMapToPixel *transform,
- QgsFeature &feature, bool selected, QgsLabelAttributes *classAttributes = 0,
- double sizeScale = 1., double rasterScaleFactor = 1.0 )
+ Q_DECL_DEPRECATED void renderLabel( QPainter* painter, const QgsRectangle& viewExtent,
+ QgsCoordinateTransform* coordinateTransform,
+ const QgsMapToPixel *transform,
+ QgsFeature &feature, bool selected, QgsLabelAttributes *classAttributes = 0,
+ double sizeScale = 1., double rasterScaleFactor = 1.0 )
{
QgsRenderContext r;
r.setExtent( viewExtent );
@@ -148,7 +148,7 @@
/** Pointer to default attributes.
* @deprecated in version 2 as it is badly named. Rather use attributes.
* @see labelAttributes method rather */
- QGISDEPRECATED QgsLabelAttributes *layerAttributes( void );
+ Q_DECL_DEPRECATED QgsLabelAttributes *layerAttributes( void );
/** Pointer to default attributes.
* @note this replaces the to-be-deprecated layerAttributes method.
Modified: trunk/qgis/src/core/qgsmaplayer.h
===================================================================
--- trunk/qgis/src/core/qgsmaplayer.h 2011-03-11 16:05:40 UTC (rev 15434)
+++ trunk/qgis/src/core/qgsmaplayer.h 2011-03-11 18:59:25 UTC (rev 15435)
@@ -76,7 +76,7 @@
/** Get this layer's unique ID, this ID is used to access this layer from map layer registry
* @deprecated use id()
**/
- QGISDEPRECATED QString getLayerID() const { return id(); }
+ Q_DECL_DEPRECATED QString getLayerID() const { return id(); }
/** Set the display name of the layer
* @param name New name for the layer
@@ -224,7 +224,7 @@
and will be deprecated in 2.0
@deprecated use crs()
*/
- QGISDEPRECATED const QgsCoordinateReferenceSystem& srs();
+ Q_DECL_DEPRECATED const QgsCoordinateReferenceSystem& srs();
/** Sets layer's spatial reference system
@note emitSignal added in 1.4 */
Modified: trunk/qgis/src/core/qgsmaprenderer.h
===================================================================
--- trunk/qgis/src/core/qgsmaprenderer.h 2011-03-11 16:05:40 UTC (rev 15434)
+++ trunk/qgis/src/core/qgsmaprenderer.h 2011-03-11 18:59:25 UTC (rev 15435)
@@ -135,7 +135,7 @@
//! Return the measuring object
//! @deprecated
- QGISDEPRECATED QgsDistanceArea *distanceArea() { return mDistArea; }
+ Q_DECL_DEPRECATED QgsDistanceArea *distanceArea() { return mDistArea; }
QGis::UnitType mapUnits() const;
void setMapUnits( QGis::UnitType u );
Modified: trunk/qgis/src/core/qgsoverlayobject.h
===================================================================
--- trunk/qgis/src/core/qgsoverlayobject.h 2011-03-11 16:05:40 UTC (rev 15434)
+++ trunk/qgis/src/core/qgsoverlayobject.h 2011-03-11 18:59:25 UTC (rev 15435)
@@ -43,11 +43,11 @@
/**Returns the feature geometry in geos format. The calling function does _not_ take
ownership of the generated object. The geometry is in map coordinates
@deprecated Please use geometry() and QgsGeometry::asGeos instead*/
- QGISDEPRECATED GEOSGeometry* getGeosGeometry();
+ Q_DECL_DEPRECATED GEOSGeometry* getGeosGeometry();
/**Feature geometry is released when object is destructed so this function is empty.
* @deprecated nop
*/
- QGISDEPRECATED void releaseGeosGeometry( GEOSGeometry *the_geom ) { Q_UNUSED( the_geom ); }
+ Q_DECL_DEPRECATED void releaseGeosGeometry( GEOSGeometry *the_geom ) { Q_UNUSED( the_geom ); }
//getters
int width() const {return mWidth;}
Modified: trunk/qgis/src/core/qgsrasterdataprovider.h
===================================================================
--- trunk/qgis/src/core/qgsrasterdataprovider.h 2011-03-11 16:05:40 UTC (rev 15434)
+++ trunk/qgis/src/core/qgsrasterdataprovider.h 2011-03-11 18:59:25 UTC (rev 15435)
@@ -458,7 +458,7 @@
static QString makeTableCells( QStringList const & values );
/** \brief Set null value in char */
- QByteArray noValueBytes(int theBandNo);
+ QByteArray noValueBytes( int theBandNo );
protected:
/**Dots per intch. Extended WMS (e.g. QGIS mapserver) support DPI dependent output and therefore
Modified: trunk/qgis/src/core/qgssearchtreenode.h
===================================================================
--- trunk/qgis/src/core/qgssearchtreenode.h 2011-03-11 16:05:40 UTC (rev 15434)
+++ trunk/qgis/src/core/qgssearchtreenode.h 2011-03-11 18:59:25 UTC (rev 15435)
@@ -161,7 +161,7 @@
bool checkAgainst( const QgsFieldMap& fields, QgsFeature &f );
//! @deprecated
- QGISDEPRECATED bool checkAgainst( const QgsFieldMap& fields, const QgsAttributeMap& attributes, QgsGeometry* geom = 0 );
+ Q_DECL_DEPRECATED bool checkAgainst( const QgsFieldMap& fields, const QgsAttributeMap& attributes, QgsGeometry* geom = 0 );
//! checks if there were errors during evaluation
bool hasError() { return ( !mError.isEmpty() ); }
@@ -177,11 +177,11 @@
QgsFeature &f );
//! @deprecated
- QGISDEPRECATED bool getValue( QgsSearchTreeValue& value,
- QgsSearchTreeNode* node,
- const QgsFieldMap &fields,
- const QgsAttributeMap &attributes,
- QgsGeometry* geom = 0 );
+ Q_DECL_DEPRECATED bool getValue( QgsSearchTreeValue& value,
+ QgsSearchTreeNode* node,
+ const QgsFieldMap &fields,
+ const QgsAttributeMap &attributes,
+ QgsGeometry* geom = 0 );
//! return a list of referenced columns in the tree
//! @note added in 1.5
@@ -217,7 +217,7 @@
QgsSearchTreeValue valueAgainst( const QgsFieldMap& fields, QgsFeature &f );
//! @deprecated
- QGISDEPRECATED QgsSearchTreeValue valueAgainst( const QgsFieldMap& fields, const QgsAttributeMap& attributes, QgsGeometry* geom = 0 );
+ Q_DECL_DEPRECATED QgsSearchTreeValue valueAgainst( const QgsFieldMap& fields, const QgsAttributeMap& attributes, QgsGeometry* geom = 0 );
//! strips mText when node is of string type
void stripText();
Modified: trunk/qgis/src/core/qgsvectordataprovider.h
===================================================================
--- trunk/qgis/src/core/qgsvectordataprovider.h 2011-03-11 16:05:40 UTC (rev 15434)
+++ trunk/qgis/src/core/qgsvectordataprovider.h 2011-03-11 18:59:25 UTC (rev 15435)
@@ -237,7 +237,7 @@
* @return true in case of success and false in case of failure
* @deprecated
*/
- QGISDEPRECATED virtual bool addAttributes( const QMap<QString, QString> &attributes );
+ Q_DECL_DEPRECATED virtual bool addAttributes( const QMap<QString, QString> &attributes );
/**
* Deletes existing attributes
@@ -347,7 +347,7 @@
* Returns the names of the supported types
* @deprecated use nativeTypes()
*/
- QGISDEPRECATED const QMap<QString, QVariant::Type> &supportedNativeTypes() const;
+ Q_DECL_DEPRECATED const QMap<QString, QVariant::Type> &supportedNativeTypes() const;
/** Returns true if the provider is strict about the type of inserted features
(e.g. no multipolygon in a polygon layer)
Modified: trunk/qgis/src/core/qgsvectorfilewriter.h
===================================================================
--- trunk/qgis/src/core/qgsvectorfilewriter.h 2011-03-11 16:05:40 UTC (rev 15434)
+++ trunk/qgis/src/core/qgsvectorfilewriter.h 2011-03-11 18:59:25 UTC (rev 15435)
@@ -58,7 +58,7 @@
/** Write contents of vector layer to a shapefile
@deprecated Use writeAsVectorFormat instead*/
- QGISDEPRECATED static WriterError writeAsShapefile( QgsVectorLayer* layer,
+ Q_DECL_DEPRECATED static WriterError writeAsShapefile( QgsVectorLayer* layer,
const QString& shapefileName,
const QString& fileEncoding,
const QgsCoordinateReferenceSystem *destCRS,
@@ -66,7 +66,7 @@
QString *errorMessage = 0,
const QStringList &datasourceOptions = QStringList(), // added in 1.6
const QStringList &layerOptions = QStringList() // added in 1.6
- );
+ );
/** Write contents of vector layer to an (OGR supported) vector formt
@note: this method was added in version 1.5*/
Modified: trunk/qgis/src/core/qgsvectorlayer.h
===================================================================
--- trunk/qgis/src/core/qgsvectorlayer.h 2011-03-11 16:05:40 UTC (rev 15434)
+++ trunk/qgis/src/core/qgsvectorlayer.h 2011-03-11 18:59:25 UTC (rev 15435)
@@ -499,7 +499,7 @@
/** add an attribute field (but does not commit it)
returns true if the field was added
@deprecated */
- QGISDEPRECATED bool addAttribute( QString name, QString type );
+ Q_DECL_DEPRECATED bool addAttribute( QString name, QString type );
/**Sets an alias (a display name) for attributes to display in dialogs
@note added in version 1.2*/
Modified: trunk/qgis/src/gui/qgisinterface.h
===================================================================
--- trunk/qgis/src/gui/qgisinterface.h 2011-03-11 16:05:40 UTC (rev 15434)
+++ trunk/qgis/src/gui/qgisinterface.h 2011-03-11 18:59:25 UTC (rev 15435)
@@ -154,7 +154,7 @@
\deprecated use QgsLegendInterface::refreshLayerSymbology
*/
#ifndef Q_MOC_RUN
- QGISDEPRECATED
+ Q_DECL_DEPRECATED
#endif
virtual void refreshLegend( QgsMapLayer *l ) = 0;
@@ -195,7 +195,7 @@
* url to the QGIS documentation directory path (prefix/share/doc)
*/
#ifndef Q_MOC_RUN
- QGISDEPRECATED
+ Q_DECL_DEPRECATED
#endif
virtual void openURL( QString url, bool useQgisDocDirectory = true ) = 0;
Modified: trunk/qgis/src/gui/qgsgenericprojectionselector.h
===================================================================
--- trunk/qgis/src/gui/qgsgenericprojectionselector.h 2011-03-11 16:05:40 UTC (rev 15434)
+++ trunk/qgis/src/gui/qgsgenericprojectionselector.h 2011-03-11 18:59:25 UTC (rev 15435)
@@ -64,24 +64,14 @@
long selectedCrsId();
QString selectedAuthId();
-#ifndef Q_MOC_RUN
- QGISDEPRECATED
-#endif
- QString selectedProj4String();
+ Q_DECL_DEPRECATED QString selectedProj4String();
+ Q_DECL_DEPRECATED long selectedEpsg();
-#ifndef Q_MOC_RUN
- QGISDEPRECATED
-#endif
- long selectedEpsg();
-
void setSelectedCrsName( QString theName );
void setSelectedCrsId( long theID );
void setSelectedAuthId( QString authId );
-#ifndef Q_MOC_RUN
- QGISDEPRECATED
-#endif
- void setSelectedEpsg( long theID );
+ Q_DECL_DEPRECATED void setSelectedEpsg( long theID );
/**
* \brief filters this dialog by the given CRSs
Modified: trunk/qgis/src/gui/qgsmapcanvas.h
===================================================================
--- trunk/qgis/src/gui/qgsmapcanvas.h 2011-03-11 16:05:40 UTC (rev 15434)
+++ trunk/qgis/src/gui/qgsmapcanvas.h 2011-03-11 18:59:25 UTC (rev 15435)
@@ -119,7 +119,7 @@
//! Accessor for the canvas pixmap
//! @deprecated use canvasPaintDevice()
- QGISDEPRECATED QPixmap& canvasPixmap();
+ Q_DECL_DEPRECATED QPixmap& canvasPixmap();
//! Accessor for the canvas paint device
QPaintDevice &canvasPaintDevice();
Modified: trunk/qgis/src/gui/qgsprojectionselector.h
===================================================================
--- trunk/qgis/src/gui/qgsprojectionselector.h 2011-03-11 16:05:40 UTC (rev 15434)
+++ trunk/qgis/src/gui/qgsprojectionselector.h 2011-03-11 18:59:25 UTC (rev 15435)
@@ -71,7 +71,7 @@
//! Gets the current EpsgCrsId-style projection identifier
// @deprecated there are other authorities - use selectedAuthId()
- QGISDEPRECATED long selectedEpsg();
+ Q_DECL_DEPRECATED long selectedEpsg();
//! Gets the current InternalCrsId-style projection identifier
long selectedSrsid();
@@ -90,10 +90,7 @@
//! Get the selected coordinate system
// @deprecated there are other authorities - so not always defined
-#ifndef Q_MOC_RUN
- QGISDEPRECATED
-#endif
- void setSelectedEpsg( long epsg );
+ Q_DECL_DEPRECATED void setSelectedEpsg( long epsg );
QString selectedProj4String();
More information about the QGIS-commit
mailing list