sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-06-19 00:02:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

Change "added/deprecated in 2.1" notes to 2.4 for stuff related to threading

Browse Source
This commit is contained in:
Martin Dobias 2014-02-21 17:33:09 +07:00
parent bc07486982
commit 5a4f8d07a0
49 changed files with 182 additions and 182 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/core/composer/qgscomposermap.sip
View File

@ -154,7 +154,7 @@ class QgsComposerMap : QgsComposerItem
QgsRectangle extent() const;
//! @deprecated since 2.1 - use mapSettings() - may return 0 if not initialized with QgsMapRenderer
//! @deprecated since 2.4 - use mapSettings() - may return 0 if not initialized with QgsMapRenderer
const QgsMapRenderer* mapRenderer() const /Deprecated/;
/**Sets offset values to shift image (useful for live updates when moving item content)*/

6
python/core/composer/qgscomposition.sip
View File

@ -28,7 +28,7 @@ class QgsComposition : QGraphicsScene
Crosses
};
//! @deprecated since 2.1 - use the constructor with QgsMapSettings
//! @deprecated since 2.4 - use the constructor with QgsMapSettings
QgsComposition( QgsMapRenderer* mapRenderer ) /Deprecated/;
explicit QgsComposition( const QgsMapSettings& mapSettings );
@ -204,11 +204,11 @@ class QgsComposition : QGraphicsScene
void setUseAdvancedEffects( bool effectsEnabled );
/**Returns pointer to map renderer of qgis map canvas*/
//! @deprecated since 2.1 - use mapSettings() instead. May return null if not initialized with QgsMapRenderer
//! @deprecated since 2.4 - use mapSettings() instead. May return null if not initialized with QgsMapRenderer
QgsMapRenderer* mapRenderer() /Deprecated/;
//! Return setting of QGIS map canvas
//! @note added in 2.1
//! @note added in 2.4
const QgsMapSettings& mapSettings() const;
QgsComposition::PlotStyle plotStyle() const;

2
python/core/diagram/qgsdiagram.sip
View File

@ -6,7 +6,7 @@ class QgsDiagram
public:
virtual ~QgsDiagram();
/** Returns an instance that is equivalent to this one
* @note added in 2.1 */
* @note added in 2.4 */
virtual QgsDiagram* clone() const = 0;
void clearCache();

2
python/core/qgsdiagramrendererv2.sip
View File

@ -124,7 +124,7 @@ class QgsDiagramRendererV2
virtual ~QgsDiagramRendererV2();
/** Returns new instance that is equivalent to this one
* @note added in 2.1 */
* @note added in 2.4 */
virtual QgsDiagramRendererV2* clone() const = 0;
/**Returns size of the diagram for a feature in map units. Returns an invalid QSizeF in case of error*/

2
python/core/qgsfeaturerequest.sip
View File

@ -83,7 +83,7 @@ class QgsFeatureRequest
/** base class that can be used for any class that is capable of returning features
* @note added in 2.1
* @note added in 2.4
*/
class QgsAbstractFeatureSource
{

4
python/core/qgsfield.sip
View File

@ -160,11 +160,11 @@ class QgsFields
//! Get field at particular index (must be in range 0..N-1)
//! Look up field's index from name - case insensitive
//! TODO: sort out case sensitive (indexFromName()) vs insensitive (fieldNameIndex()) calls
//! @note added in 2.1
//! @note added in 2.4
int fieldNameIndex( const QString& fieldName ) const;
//! Utility function to get list of attribute indexes
//! @note added in 2.1
//! @note added in 2.4
QgsAttributeList allAttributesList() const;
QgsField& operator[](int i) /Factory/;

18
python/core/qgsmaplayer.sip
View File

@ -117,7 +117,7 @@ class QgsMapLayer : QObject
virtual void reload();
/** Return new instance of QgsMapLayerRenderer that will be used for rendering of given context
* @note added in 2.1
* @note added in 2.4
*/
virtual QgsMapLayerRenderer* createMapRenderer( QgsRenderContext& rendererContext ) /Factory/;
@ -215,10 +215,10 @@ class QgsMapLayer : QObject
void removeCustomProperty( const QString& key );
//! @deprecated since 2.1 - returns empty string
//! @deprecated since 2.4 - returns empty string
virtual QString lastErrorTitle() /Deprecated/;
//! @deprecated since 2.1 - returns empty string
//! @deprecated since 2.4 - returns empty string
virtual QString lastError() /Deprecated/;
/** Get current status error. This error describes some principal problem
@ -341,11 +341,11 @@ class QgsMapLayer : QObject
/** Return pointer to layer's undo stack */
QUndoStack *undoStack();
/** @deprecated since 2.1 - returns NULL */
/** @deprecated since 2.4 - returns NULL */
QImage *cacheImage() /Deprecated/;
/** @deprecated since 2.1 - does nothing */
/** @deprecated since 2.4 - does nothing */
void setCacheImage( QImage * thepImage /Transfer/ ) /Deprecated/;
/** @deprecated since 2.1 - does nothing */
/** @deprecated since 2.4 - does nothing */
virtual void onCacheImageDelete() /Deprecated/;
public slots:
@ -365,7 +365,7 @@ class QgsMapLayer : QObject
void toggleScaleBasedVisibility( bool theVisibilityFlag );
bool hasScaleBasedVisibility() const;
/** @deprecated since 2.1 - does nothing */
/** @deprecated since 2.4 - does nothing */
void clearCacheImage() /Deprecated/;
/** \brief Obtain Metadata for this layer */
@ -376,7 +376,7 @@ class QgsMapLayer : QObject
signals:
//! @deprecated in 2.1 - not emitted anymore
//! @deprecated in 2.4 - not emitted anymore
void drawingProgress( int theProgress, int theTotalSteps );
/** Emit a signal with status (e.g. to be caught by QgisApp and display a msg on status bar) */
@ -395,7 +395,7 @@ class QgsMapLayer : QObject
*/
void repaintRequested();
//! \note Deprecated in 2.1 and not emitted anymore
//! \note Deprecated in 2.4 and not emitted anymore
void screenUpdateRequested();
/** This is used to send a request that any mapcanvas using this layer update its extents */

2
python/core/qgsmaplayerregistry.sip
View File

@ -127,7 +127,7 @@ class QgsMapLayerRegistry : QObject
*
* @note Added in QGIS 1.4
*/
//! @deprecated since 2.1 - does nothing
//! @deprecated since 2.4 - does nothing
void clearAllLayerCaches() /Deprecated/;
/**

12
python/core/qgsmaprenderer.sip
View File

@ -36,7 +36,7 @@ class QgsLabelingEngineInterface
virtual ~QgsLabelingEngineInterface();
//! called when we're going to start with rendering
//! @deprecated since 2.1 - use override with QgsMapSettings
//! @deprecated since 2.4 - use override with QgsMapSettings
virtual void init( QgsMapRenderer* mp ) = 0 /Deprecated/;
//! called when we're going to start with rendering
virtual void init( const QgsMapSettings& mapSettings ) = 0;
@ -66,11 +66,11 @@ class QgsLabelingEngineInterface
virtual void exit() = 0;
//! return infos about labels at a given (map) position
//! @note: this method was added in version 1.7
//! @deprecated since 2.1 - use takeResults() and methods of QgsLabelingResults
//! @deprecated since 2.4 - use takeResults() and methods of QgsLabelingResults
virtual QList<QgsLabelPosition> labelsAtPosition( const QgsPoint& p ) = 0 /Deprecated/;
//! return infos about labels within a given (map) rectangle
//! @note: this method was added in version 1.9
//! @deprecated since 2.1 - use takeResults() and methods of QgsLabelingResults
//! @deprecated since 2.4 - use takeResults() and methods of QgsLabelingResults
virtual QList<QgsLabelPosition> labelsWithinRect( const QgsRectangle& r ) = 0 /Deprecated/;
//! called when passing engine among map renderers
@ -265,7 +265,7 @@ class QgsMapRenderer : QObject
static QgsMapRenderer::BlendMode getBlendModeEnum( const QPainter::CompositionMode blendMode );
//! bridge to QgsMapSettings
//! @note added in 2.1
//! @note added in 2.4
const QgsMapSettings& mapSettings();
void addLayerCoordinateTransform( const QString& layerId, const QString& srcAuthId, const QString& destAuthId, int srcDatumTransform = -1, int destDatumTransform = -1 );
@ -293,12 +293,12 @@ class QgsMapRenderer : QObject
void datumTransformInfoRequested( const QgsMapLayer* ml, const QString& srcAuthId, const QString& destAuthId ) const;
//! emitted when the current extent gets changed
//! @note added in 2.1
//! @note added in 2.4
void extentsChanged();
public slots:
//! @deprecated in 2.1 - does nothing
//! @deprecated in 2.4 - does nothing
void onDrawingProgress( int current, int total ) /Deprecated/;
protected:

12
python/core/qgspallabeling.sip
View File

@ -89,7 +89,7 @@ class QgsPalLayerSettings
QgsPalLayerSettings( const QgsPalLayerSettings& s );
~QgsPalLayerSettings();
//! @note added in 2.1
//! @note added in 2.4
static QgsPalLayerSettings fromLayer( QgsVectorLayer* layer );
enum Placement
@ -582,7 +582,7 @@ class QgsLabelComponent
/**
* Class that stores computed placement from labeling engine.
* @note added in 2.1
* @note added in 2.4
*/
class QgsLabelingResults
{
@ -645,7 +645,7 @@ class QgsPalLabeling : QgsLabelingEngineInterface
// implemented methods from labeling engine interface
//! called when we're going to start with rendering
//! @deprecated since 2.1 - use override with QgsMapSettings
//! @deprecated since 2.4 - use override with QgsMapSettings
virtual void init( QgsMapRenderer* mr ) /Deprecated/;
//! called when we're going to start with rendering
virtual void init( const QgsMapSettings& mapSettings );
@ -674,7 +674,7 @@ class QgsPalLabeling : QgsLabelingEngineInterface
virtual QList<QgsLabelPosition> labelsWithinRect( const QgsRectangle& r ) /Deprecated/;
//! Return pointer to recently computed results (in drawLabeling()) and pass the ownership of results to the caller
//! @note added in 2.1
//! @note added in 2.4
QgsLabelingResults* takeResults() /TransferBack/;
//! called when passing engine among map renderers
@ -703,8 +703,8 @@ class QgsPalLabeling : QgsLabelingEngineInterface
void loadEngineSettings();
void saveEngineSettings();
void clearEngineSettings();
//! @deprecated since 2.1 - settings are always stored in project
//! @deprecated since 2.4 - settings are always stored in project
bool isStoredWithProject() const /Deprecated/;
//! @deprecated since 2.1 - settings are always stored in project
//! @deprecated since 2.4 - settings are always stored in project
void setStoredWithProject( bool store ) /Deprecated/;
};

2
python/core/qgspluginlayer.sip
View File

@ -25,7 +25,7 @@ class QgsPluginLayer : QgsMapLayer
* conditions that may happen (e.g. something is changed in the layer while it is
* being rendered).
*
* @note added in 2.1
* @note added in 2.4
*/
virtual QgsMapLayerRenderer* createMapRenderer( QgsRenderContext& rendererContext ) /Factory/;
};

2
python/core/qgsrendercontext.sip
View File

@ -11,7 +11,7 @@ class QgsRenderContext
~QgsRenderContext();
//! create initialized QgsRenderContext instance from given QgsMapSettings
//! @note added in 2.1
//! @note added in 2.4
static QgsRenderContext fromMapSettings( const QgsMapSettings& mapSettings );
//getters

2
python/core/qgssnapper.sip
View File

@ -69,7 +69,7 @@ class QgsSnapper
QgsTolerance::UnitType mUnitType;
};
//!@ deprecated since 2.1 - use constructor with QgsMapSettings
//!@ deprecated since 2.4 - use constructor with QgsMapSettings
QgsSnapper( QgsMapRenderer* mapRender ) /Deprecated/;
explicit QgsSnapper( const QgsMapSettings& mapSettings );

6
python/core/qgstolerance.sip
View File

@ -27,7 +27,7 @@ class QgsTolerance
* The value is read from settings and transformed if necessary.
* @return value of vertex tolerance in map units
*/
//! @deprecated since 2.1 - use override with QgsMapSettings
//! @deprecated since 2.4 - use override with QgsMapSettings
static double vertexSearchRadius( QgsMapLayer* layer, QgsMapRenderer* renderer ) /Deprecated/;
/**
@ -42,7 +42,7 @@ class QgsTolerance
* The value is read from settings and transformed if necessary.
* @return value of default tolerance in map units
*/
//! @deprecated since 2.1 - use override with QgsMapSettings
//! @deprecated since 2.4 - use override with QgsMapSettings
static double defaultTolerance( QgsMapLayer* layer, QgsMapRenderer* renderer ) /Deprecated/;
/**
@ -63,6 +63,6 @@ class QgsTolerance
* @param units type of units to be translated
* @return value of tolerance in map units
*/
//! @deprecated since 2.1 - use the override with QgsMapSettings
//! @deprecated since 2.4 - use the override with QgsMapSettings
static double toleranceInMapUnits( double tolerance, QgsMapLayer* layer, QgsMapRenderer* renderer, UnitType units = MapUnits ) /Deprecated/;
};

2
python/core/qgsvectordataprovider.sip
View File

@ -75,7 +75,7 @@ class QgsVectorDataProvider : QgsDataProvider
* if it is possible that both feature source and provider may need reading/writing to some shared data at the
* same time, some synchronization mechanisms must be used (e.g. mutexes) to prevent data corruption.
*
* @note added in 2.1
* @note added in 2.4
* @return new instance of QgsAbstractFeatureSource (caller is responsible for deleting it)
*/
virtual QgsAbstractFeatureSource* featureSource() const /Factory/;

2
python/core/qgsvectorlayer.sip
View File

@ -672,7 +672,7 @@ class QgsVectorLayer : QgsMapLayer
virtual void reload();
/** Return new instance of QgsMapLayerRenderer that will be used for rendering of given context
* @note added in 2.1
* @note added in 2.4
*/
virtual QgsMapLayerRenderer* createMapRenderer( QgsRenderContext& rendererContext ) /Factory/;

8
python/core/raster/qgsrasterlayer.sip
View File

@ -125,7 +125,7 @@ class QgsRasterLayer : QgsMapLayer
virtual void reload();
/** Return new instance of QgsMapLayerRenderer that will be used for rendering of given context
* @note added in 2.1
* @note added in 2.4
*/
virtual QgsMapLayerRenderer* createMapRenderer( QgsRenderContext& rendererContext ) /Factory/;
@ -137,10 +137,10 @@ class QgsRasterLayer : QgsMapLayer
QgsRasterViewPort * myRasterViewPort,
const QgsMapToPixel* theQgsMapToPixel = 0 );
//! @deprecated since 2.1 - returns empty string
//! @deprecated since 2.4 - returns empty string
QString lastError() /Deprecated/;
//! @deprecated since 2.1 - returns empty string
//! @deprecated since 2.4 - returns empty string
QString lastErrorTitle() /Deprecated/;
/**Returns a list with classification items (Text and color)
@ -213,7 +213,7 @@ class QgsRasterLayer : QgsMapLayer
public slots:
void showStatusMessage( const QString & theMessage );
//! @deprecated since 2.1 - does nothing
//! @deprecated since 2.4 - does nothing
void updateProgress( int, int ) /Deprecated/;
/** \brief receive progress signal from provider */

2
python/core/symbology-ng/qgsrendererv2.sip
View File

@ -62,7 +62,7 @@ class QgsFeatureRendererV2
virtual void startRender( QgsRenderContext& context, const QgsFields& fields ) = 0;
//! @deprecated since 2.1 - not using QgsVectorLayer directly anymore
//! @deprecated since 2.4 - not using QgsVectorLayer directly anymore
virtual void startRender( QgsRenderContext& context, const QgsVectorLayer *vlayer ) /Deprecated/;
virtual void stopRender( QgsRenderContext& context ) = 0;

2
python/core/symbology-ng/qgssymbolv2.sip
View File

@ -157,7 +157,7 @@ class QgsSymbolV2RenderContext
//! Fields of the layer. Currently only available in startRender() calls
//! to allow symbols with data-defined properties prepare the expressions
//! (other times fields() returns null)
//! @note added in 2.1
//! @note added in 2.4
const QgsFields* fields() const;
double outputLineWidth( double width ) const;

58
python/gui/qgsmapcanvas.sip
View File

@ -55,66 +55,66 @@ class QgsMapCanvas : QGraphicsView
void enableOverviewMode( QgsMapOverviewCanvas* overview );
//! Get access to properties used for map rendering
//! @note added in 2.1
//! @note added in 2.4
const QgsMapSettings& mapSettings() const;
//! sets whether to use projections for this layer set
//! @note added in 2.1
//! @note added in 2.4
void setCrsTransformEnabled( bool enabled );
//! sets destination coordinate reference system
//! @note added in 2.1
//! @note added in 2.4
void setDestinationCrs( const QgsCoordinateReferenceSystem& crs );
//! Get access to the labeling results (may be null)
//! @note added in 2.1
//! @note added in 2.4
const QgsLabelingResults* labelingResults() const;
//! Set whether to cache images of rendered layers
//! @note added in 2.1
//! @note added in 2.4
void setCachingEnabled( bool enabled );
//! Check whether images of rendered layers are curerently being cached
//! @note added in 2.1
//! @note added in 2.4
bool isCachingEnabled() const;
//! Make sure to remove any rendered images from cache (does nothing if cache is not enabled)
//! @note added in 2.1
//! @note added in 2.4
void clearCache();
//! Set whether the layers are rendered in parallel or sequentially
//! @note added in 2.1
//! @note added in 2.4
void setParallelRenderingEnabled( bool enabled );
//! Check whether the layers are rendered in parallel or sequentially
//! @note added in 2.1
//! @note added in 2.4
bool isParallelRenderingEnabled() const;
//! Set how often map preview should be updated while it is being rendered (in miliseconds)
//! @note added in 2.1
//! @note added in 2.4
void setMapUpdateInterval( int timeMiliseconds );
//! Find out how often map preview should be updated while it is being rendered (in miliseconds)
//! @note added in 2.1
//! @note added in 2.4
int mapUpdateInterval() const;
//! @deprecated since 2.1 - there could be more than just one "map" items
//! @deprecated since 2.4 - there could be more than just one "map" items
QgsMapCanvasMap* map();
//! @deprecated since 2.1 - use mapRendererSettings() for anything related to current renderer settings
//! @deprecated since 2.4 - use mapRendererSettings() for anything related to current renderer settings
//// SIP: removed /Transfer/ because it crashes after few calls to iface.mapCanvas().mapRenderer().hasCrsTransformEnabled()
//// and in fact there is no transfer of ownership from c++ to python!
//// Actually the problem comes from the fact that "hasCrsTransformEnabled" is both a signal and a normal method
//// /KeepReference/ is necessary because otherwise mapRenderer().hasCrsTransformEnabled() was crashing
QgsMapRenderer* mapRenderer() /Deprecated, KeepReference/;
//! @deprecated since 2.1
//! @deprecated since 2.4
QPaintDevice &canvasPaintDevice() /Deprecated/;
//! Get the last reported scale of the canvas
double scale();
//! @deprecated since 2.1 - use refresh() - clear does the same thing
//! @deprecated since 2.4 - use refresh() - clear does the same thing
void clear() /Deprecated/;
//! Returns the mapUnitsPerPixel (map units per pixel) for the canvas
@ -168,13 +168,13 @@ class QgsMapCanvas : QGraphicsView
virtual QColor canvasColor() const;
/** Set color of selected vector features */
//! @note added in 2.1
//! @note added in 2.4
void setSelectionColor( const QColor& color );
/** Emits signal scaleChanged to update scale in main window */
void updateScale();
//! @deprecated since v2.1 - does nothing
//! @deprecated since v2.4 - does nothing
void updateFullExtent() /Deprecated/;
//! return the map layer at position index in the layer stack
@ -196,10 +196,10 @@ class QgsMapCanvas : QGraphicsView
/*! Accessor for frozen status of canvas */
bool isFrozen();
//! @deprecated since 2.1 - use refresh() to trigger a refresh (clients should not decide explicitly whether canvas is dirty or not)
//! @deprecated since 2.4 - use refresh() to trigger a refresh (clients should not decide explicitly whether canvas is dirty or not)
void setDirty( bool _dirty ) /Deprecated/;
//! @deprecated since 2.1 - dirty flag is not kept anymore - always returns false
//! @deprecated since 2.4 - dirty flag is not kept anymore - always returns false
bool isDirty() const /Deprecated/;
//! Set map units (needed by project properties dialog)
@ -242,7 +242,7 @@ class QgsMapCanvas : QGraphicsView
//! true if antialising is enabled
bool antiAliasingEnabled() const;
//! @deprecated since 2.1 - does nothing because now we always render to QImage
//! @deprecated since 2.4 - does nothing because now we always render to QImage
void useImageToRender( bool theFlag ) /Deprecated/;
// following 2 methods should be moved elsewhere or changed to private
@ -278,14 +278,14 @@ class QgsMapCanvas : QGraphicsView
/** A simple helper method to find out if on the fly projections are enabled or not */
bool hasCrsTransformEnabled();
//! @deprecated in 2.1 - does nothing - kept for API compatibility
//! @deprecated in 2.4 - does nothing - kept for API compatibility
void updateMap() /Deprecated/;
//! stop rendering (if there is any right now)
//! @note added in 2.1
//! @note added in 2.4
void stopRendering();
//! @deprecated since 2.1 - does nothing - errors are reported by different means
//! @deprecated since 2.4 - does nothing - errors are reported by different means
void showError( QgsMapLayer * mapLayer ) /Deprecated/;
//! called to read map canvas settings from project
@ -299,7 +299,7 @@ class QgsMapCanvas : QGraphicsView
signals:
/** Let the owner know how far we are with render operations */
//! @deprecated since 2.1 - already unused in 2.0 anyway
//! @deprecated since 2.4 - already unused in 2.0 anyway
void setProgress( int, int ) /Deprecated/;
/** emits current mouse position
@ -327,12 +327,12 @@ class QgsMapCanvas : QGraphicsView
/** Emitted when canvas finished a refresh request.
\note Added in 2.0 */
//! @deprecated since 2.1 - anything related to rendering progress is not visible outside of map canvas
//! @deprecated since 2.4 - anything related to rendering progress is not visible outside of map canvas
void mapCanvasRefreshed() /Deprecated/;
/** Emitted when the canvas is about to be rendered.
\note Added in 1.5 */
//! @deprecated since 2.1 - anything related to rendering progress is not visible outside of map canvas
//! @deprecated since 2.4 - anything related to rendering progress is not visible outside of map canvas
void renderStarting() /Deprecated/;
//! Emitted when a new set of layers has been received
@ -359,15 +359,15 @@ class QgsMapCanvas : QGraphicsView
void zoomNextStatusChanged( bool );
//! Emitted when on-the-fly projection has been turned on/off
//! @note added in 2.1
//! @note added in 2.4
void hasCrsTransformEnabledChanged( bool flag );
//! Emitted when map CRS has changed
//! @note added in 2.1
//! @note added in 2.4
void destinationCrsChanged();
//! Emmitted when map units are changed
//! @note added in 2.1
//! @note added in 2.4
void mapUnitsChanged();
protected:

2
python/gui/qgsmapcanvasitem.sip
View File

@ -39,7 +39,7 @@ class QgsMapCanvasItem : QGraphicsItem
virtual QRectF boundingRect() const;
//! sets current offset, to be called from QgsMapCanvas
//! @deprecated since v2.1 - not called by QgsMapCanvas anymore
//! @deprecated since v2.4 - not called by QgsMapCanvas anymore
void setPanningOffset( const QPoint& point ) /Deprecated/;
//! returns canvas item rectangle

18
python/gui/qgsmapcanvasmap.sip
View File

@ -28,32 +28,32 @@ class QgsMapCanvasMap : QgsMapCanvasItem
//! constructor
QgsMapCanvasMap( QgsMapCanvas* canvas /TransferThis/ );
//! @note added in 2.1
//! @note added in 2.4
void setContent( const QImage& image, const QgsRectangle& rect );
//! @note added in 2.1
//! @note added in 2.4
QImage contentImage() const;
virtual void paint( QPainter * painter );
//! @deprecated in 2.1 - does nothing. Kept for API compatibility
//! @deprecated in 2.4 - does nothing. Kept for API compatibility
void resize( QSize size ) /Deprecated/;
//! @deprecated in 2.1 - does nothing. Kept for API compatibility
//! @deprecated in 2.4 - does nothing. Kept for API compatibility
void enableAntiAliasing( bool flag ) /Deprecated/;
//! @deprecated in 2.1 - does nothing. Kept for API compatibility
//! @deprecated in 2.4 - does nothing. Kept for API compatibility
void render() /Deprecated/;
//! @deprecated in 2.1 - does nothing. Kept for API compatibility
//! @deprecated in 2.4 - does nothing. Kept for API compatibility
void setBackgroundColor( const QColor& color ) /Deprecated/;
//! @deprecated in 2.1 - does nothing. Kept for API compatibility
//! @deprecated in 2.4 - does nothing. Kept for API compatibility
void setPanningOffset( const QPoint& point ) /Deprecated/;
//! @deprecated in 2.1
//! @deprecated in 2.4
QPaintDevice& paintDevice() /Deprecated/;
//! @deprecated in 2.1 - does nothing. Kept for API compatibility
//! @deprecated in 2.4 - does nothing. Kept for API compatibility
void updateContents() /Deprecated/;
};

2
python/gui/qgsmaptool.sip
View File

@ -64,7 +64,7 @@ class QgsMapTool : QObject
%End
//! Called when rendering has finished. Default implementation does nothing.
//! @deprecated since 2.1 - not called anymore - map tools must not directly depend on rendering progress
//! @deprecated since 2.4 - not called anymore - map tools must not directly depend on rendering progress
virtual void renderComplete() /Deprecated/;

2
src/core/composer/qgscomposermap.h
View File

@ -189,7 +189,7 @@ class CORE_EXPORT QgsComposerMap : public QgsComposerItem
QgsRectangle extent() const {return mExtent;}
//! @deprecated since 2.1 - use mapSettings() - may return 0 if not initialized with QgsMapRenderer
//! @deprecated since 2.4 - use mapSettings() - may return 0 if not initialized with QgsMapRenderer
Q_DECL_DEPRECATED const QgsMapRenderer* mapRenderer() const;
/**Sets offset values to shift image (useful for live updates when moving item content)*/

6
src/core/composer/qgscomposition.h
View File

@ -90,7 +90,7 @@ class CORE_EXPORT QgsComposition : public QGraphicsScene
ZValueAbove
};
//! @deprecated since 2.1 - use the constructor with QgsMapSettings
//! @deprecated since 2.4 - use the constructor with QgsMapSettings
Q_DECL_DEPRECATED QgsComposition( QgsMapRenderer* mapRenderer );
explicit QgsComposition( const QgsMapSettings& mapSettings );
@ -260,11 +260,11 @@ class CORE_EXPORT QgsComposition : public QGraphicsScene
void setUseAdvancedEffects( bool effectsEnabled );
/**Returns pointer to map renderer of qgis map canvas*/
//! @deprecated since 2.1 - use mapSettings() instead. May return null if not initialized with QgsMapRenderer
//! @deprecated since 2.4 - use mapSettings() instead. May return null if not initialized with QgsMapRenderer
Q_DECL_DEPRECATED QgsMapRenderer* mapRenderer() {return mMapRenderer;}
//! Return setting of QGIS map canvas
//! @note added in 2.1
//! @note added in 2.4
const QgsMapSettings& mapSettings() const { return mMapSettings; }
QgsComposition::PlotStyle plotStyle() const {return mPlotStyle;}

2
src/core/diagram/qgsdiagram.h
View File

@ -36,7 +36,7 @@ class CORE_EXPORT QgsDiagram
public:
virtual ~QgsDiagram() { clearCache(); }
/** Returns an instance that is equivalent to this one
* @note added in 2.1 */
* @note added in 2.4 */
virtual QgsDiagram* clone() const = 0;
void clearCache();

2
src/core/qgsdiagramrendererv2.h
View File

@ -172,7 +172,7 @@ class CORE_EXPORT QgsDiagramRendererV2
virtual ~QgsDiagramRendererV2();
/** Returns new instance that is equivalent to this one
* @note added in 2.1 */
* @note added in 2.4 */
virtual QgsDiagramRendererV2* clone() const = 0;
/**Returns size of the diagram for a feature in map units. Returns an invalid QSizeF in case of error*/

2
src/core/qgsfeaturerequest.h
View File

@ -159,7 +159,7 @@ class QgsFeatureIterator;
class QgsAbstractFeatureIterator;
/** base class that can be used for any class that is capable of returning features
* @note added in 2.1
* @note added in 2.4
*/
class CORE_EXPORT QgsAbstractFeatureSource
{

4
src/core/qgsfield.h
View File

@ -224,11 +224,11 @@ class CORE_EXPORT QgsFields
//! Look up field's index from name - case insensitive
//! TODO: sort out case sensitive (indexFromName()) vs insensitive (fieldNameIndex()) calls
//! @note added in 2.1
//! @note added in 2.4
int fieldNameIndex( const QString& fieldName ) const;
//! Utility function to get list of attribute indexes
//! @note added in 2.1
//! @note added in 2.4
QgsAttributeList allAttributesList() const;
//! Utility function to return a list of QgsField instances

18
src/core/qgsmaplayer.h
View File

@ -130,7 +130,7 @@ class CORE_EXPORT QgsMapLayer : public QObject
virtual void reload() {}
/** Return new instance of QgsMapLayerRenderer that will be used for rendering of given context
* @note added in 2.1
* @note added in 2.4
*/
virtual QgsMapLayerRenderer* createMapRenderer( QgsRenderContext& rendererContext ) { Q_UNUSED( rendererContext ); return 0; }
@ -228,10 +228,10 @@ class CORE_EXPORT QgsMapLayer : public QObject
void removeCustomProperty( const QString& key );
//! @deprecated since 2.1 - returns empty string
//! @deprecated since 2.4 - returns empty string
Q_DECL_DEPRECATED virtual QString lastErrorTitle();
//! @deprecated since 2.1 - returns empty string
//! @deprecated since 2.4 - returns empty string
Q_DECL_DEPRECATED virtual QString lastError();
/** Get current status error. This error describes some principal problem
@ -356,11 +356,11 @@ class CORE_EXPORT QgsMapLayer : public QObject
/** Return pointer to layer's undo stack */
QUndoStack *undoStack();
/** @deprecated since 2.1 - returns NULL */
/** @deprecated since 2.4 - returns NULL */
Q_DECL_DEPRECATED QImage *cacheImage() { return 0; }
/** @deprecated since 2.1 - does nothing */
/** @deprecated since 2.4 - does nothing */
Q_DECL_DEPRECATED void setCacheImage( QImage * ) {}
/** @deprecated since 2.1 - does nothing */
/** @deprecated since 2.4 - does nothing */
Q_DECL_DEPRECATED virtual void onCacheImageDelete() {}
public slots:
@ -382,7 +382,7 @@ class CORE_EXPORT QgsMapLayer : public QObject
/** Clear cached image
* added in 1.5 */
//! @deprecated in 2.1 - does nothing
//! @deprecated in 2.4 - does nothing
Q_DECL_DEPRECATED void clearCacheImage();
/** \brief Obtain Metadata for this layer */
@ -393,7 +393,7 @@ class CORE_EXPORT QgsMapLayer : public QObject
signals:
//! @deprecated in 2.1 - not emitted anymore
//! @deprecated in 2.4 - not emitted anymore
void drawingProgress( int theProgress, int theTotalSteps );
/** Emit a signal with status (e.g. to be caught by QgisApp and display a msg on status bar) */
@ -412,7 +412,7 @@ class CORE_EXPORT QgsMapLayer : public QObject
*/
void repaintRequested();
//! \note Deprecated in 2.1 and not emitted anymore
//! \note Deprecated in 2.4 and not emitted anymore
void screenUpdateRequested();
/** This is used to send a request that any mapcanvas using this layer update its extents */

2
src/core/qgsmaplayerregistry.h
View File

@ -152,7 +152,7 @@ class CORE_EXPORT QgsMapLayerRegistry : public QObject
*
* @note Added in QGIS 1.4
*/
//! @deprecated since 2.1 - does nothing
//! @deprecated since 2.4 - does nothing
Q_DECL_DEPRECATED void clearAllLayerCaches();
/**

18
src/core/qgsmaprenderer.h
View File

@ -73,7 +73,7 @@ class CORE_EXPORT QgsLabelingEngineInterface
virtual ~QgsLabelingEngineInterface() {}
//! called when we're going to start with rendering
//! @deprecated since 2.1 - use override with QgsMapSettings
//! @deprecated since 2.4 - use override with QgsMapSettings
Q_DECL_DEPRECATED virtual void init( QgsMapRenderer* mp ) = 0;
//! called when we're going to start with rendering
virtual void init( const QgsMapSettings& mapSettings ) = 0;
@ -105,11 +105,11 @@ class CORE_EXPORT QgsLabelingEngineInterface
virtual void exit() = 0;
//! return infos about labels at a given (map) position
//! @note: this method was added in version 1.7
//! @deprecated since 2.1 - use takeResults() and methods of QgsLabelingResults
//! @deprecated since 2.4 - use takeResults() and methods of QgsLabelingResults
Q_DECL_DEPRECATED virtual QList<QgsLabelPosition> labelsAtPosition( const QgsPoint& p ) = 0;
//! return infos about labels within a given (map) rectangle
//! @note: this method was added in version 1.9
//! @deprecated since 2.1 - use takeResults() and methods of QgsLabelingResults
//! @deprecated since 2.4 - use takeResults() and methods of QgsLabelingResults
Q_DECL_DEPRECATED virtual QList<QgsLabelPosition> labelsWithinRect( const QgsRectangle& r ) = 0;
//! called when passing engine among map renderers
@ -309,12 +309,12 @@ class CORE_EXPORT QgsMapRenderer : public QObject
const QgsCoordinateTransform* transformation( const QgsMapLayer *layer ) const;
//! bridge to QgsMapSettings
//! @note added in 2.1
//! @note added in 2.4
const QgsMapSettings& mapSettings();
signals:
//! @deprecated in 2.1 - not emitted anymore
//! @deprecated in 2.4 - not emitted anymore
void drawingProgress( int current, int total );
/** This signal is emitted when CRS transformation is enabled/disabled.
@ -328,12 +328,12 @@ class CORE_EXPORT QgsMapRenderer : public QObject
/** This signal is emitted when CRS transformation is enabled/disabled.
* @param flag true if transformation is enabled.
* @note Added in 2.1 */
* @note Added in 2.4 */
void hasCrsTransformEnabledChanged( bool flag );
void destinationSrsChanged();
//! @deprecated in 2.1 - not emitted anymore
//! @deprecated in 2.4 - not emitted anymore
void updateMap();
void mapUnitsChanged();
@ -342,7 +342,7 @@ class CORE_EXPORT QgsMapRenderer : public QObject
void drawError( QgsMapLayer* );
//! emitted when the current extent gets changed
//! @note added in 2.1
//! @note added in 2.4
void extentsChanged();
//! Notifies higher level components to show the datum transform dialog and add a QgsLayerCoordinateTransformInfo for that layer
@ -351,7 +351,7 @@ class CORE_EXPORT QgsMapRenderer : public QObject
public slots:
//! @deprecated in 2.1 - does nothing
//! @deprecated in 2.4 - does nothing
Q_DECL_DEPRECATED void onDrawingProgress( int current, int total );
protected:

2
src/core/qgsmaprenderercache.h
View File

@ -13,7 +13,7 @@
*
* The class is thread-safe (multiple classes can access the same instance safely).
*
* @note added in 2.1
* @note added in 2.4
*/
class CORE_EXPORT QgsMapRendererCache : public QObject
{

18
src/core/qgspallabeling.h
View File

@ -67,7 +67,7 @@ class CORE_EXPORT QgsPalLayerSettings
QgsPalLayerSettings( const QgsPalLayerSettings& s );
~QgsPalLayerSettings();
//! @note added in 2.1
//! @note added in 2.4
static QgsPalLayerSettings fromLayer( QgsVectorLayer* layer );
enum Placement
@ -660,7 +660,7 @@ class CORE_EXPORT QgsLabelComponent
/**
* Class that stores computed placement from labeling engine.
* @note added in 2.1
* @note added in 2.4
*/
class CORE_EXPORT QgsLabelingResults
{
@ -723,7 +723,7 @@ class CORE_EXPORT QgsPalLabeling : public QgsLabelingEngineInterface
// implemented methods from labeling engine interface
//! called when we're going to start with rendering
//! @deprecated since 2.1 - use override with QgsMapSettings
//! @deprecated since 2.4 - use override with QgsMapSettings
Q_DECL_DEPRECATED virtual void init( QgsMapRenderer* mr );
//! called when we're going to start with rendering
virtual void init( const QgsMapSettings& mapSettings );
@ -731,7 +731,7 @@ class CORE_EXPORT QgsPalLabeling : public QgsLabelingEngineInterface
virtual bool willUseLayer( QgsVectorLayer* layer );
//! called to find out whether the layer is used for labeling
//! @note added in 2.1
//! @note added in 2.4
static bool staticWillUseLayer( QgsVectorLayer* layer );
static bool staticWillUseLayer( const QString& layerID );
@ -753,14 +753,14 @@ class CORE_EXPORT QgsPalLabeling : public QgsLabelingEngineInterface
//! called when we're done with rendering
virtual void exit();
//! return infos about labels at a given (map) position
//! @deprecated since 2.1 - use takeResults() and methods of QgsLabelingResults
//! @deprecated since 2.4 - use takeResults() and methods of QgsLabelingResults
Q_DECL_DEPRECATED virtual QList<QgsLabelPosition> labelsAtPosition( const QgsPoint& p );
//! return infos about labels within a given (map) rectangle
//! @deprecated since 2.1 - use takeResults() and methods of QgsLabelingResults
//! @deprecated since 2.4 - use takeResults() and methods of QgsLabelingResults
Q_DECL_DEPRECATED virtual QList<QgsLabelPosition> labelsWithinRect( const QgsRectangle& r );
//! Return pointer to recently computed results (in drawLabeling()) and pass the ownership of results to the caller
//! @note added in 2.1
//! @note added in 2.4
QgsLabelingResults* takeResults();
//! called when passing engine among map renderers
@ -789,9 +789,9 @@ class CORE_EXPORT QgsPalLabeling : public QgsLabelingEngineInterface
void loadEngineSettings();
void saveEngineSettings();
void clearEngineSettings();
//! @deprecated since 2.1 - settings are always stored in project
//! @deprecated since 2.4 - settings are always stored in project
Q_DECL_DEPRECATED bool isStoredWithProject() const { return true; }
//! @deprecated since 2.1 - settings are always stored in project
//! @deprecated since 2.4 - settings are always stored in project
Q_DECL_DEPRECATED void setStoredWithProject( bool store ) { Q_UNUSED( store ); }
protected:

2
src/core/qgspluginlayer.h
View File

@ -53,7 +53,7 @@ class CORE_EXPORT QgsPluginLayer : public QgsMapLayer
* conditions that may happen (e.g. something is changed in the layer while it is
* being rendered).
*
* @note added in 2.1
* @note added in 2.4
*/
virtual QgsMapLayerRenderer* createMapRenderer( QgsRenderContext& rendererContext );

4
src/core/qgsrenderchecker.h
View File

@ -68,10 +68,10 @@ class CORE_EXPORT QgsRenderChecker
QString imageToHash( QString theImageFile );
void setRenderedImage( QString theImageFileName ) { mRenderedImageFile = theImageFileName; }
//! @deprecated since 2.1 - use setMapSettings()
//! @deprecated since 2.4 - use setMapSettings()
Q_DECL_DEPRECATED void setMapRenderer( QgsMapRenderer * thepMapRenderer );
//! @note added in 2.1
//! @note added in 2.4
void setMapSettings( const QgsMapSettings& mapSettings );
/**

2
src/core/qgsrendercontext.h
View File

@ -42,7 +42,7 @@ class CORE_EXPORT QgsRenderContext
~QgsRenderContext();
//! create initialized QgsRenderContext instance from given QgsMapSettings
//! @note added in 2.1
//! @note added in 2.4
static QgsRenderContext fromMapSettings( const QgsMapSettings& mapSettings );
//getters

2
src/core/qgssnapper.h
View File

@ -94,7 +94,7 @@ class CORE_EXPORT QgsSnapper
QgsTolerance::UnitType mUnitType;
};
//!@ deprecated since 2.1 - use constructor with QgsMapSettings
//!@ deprecated since 2.4 - use constructor with QgsMapSettings
Q_DECL_DEPRECATED QgsSnapper( QgsMapRenderer* mapRender );
explicit QgsSnapper( const QgsMapSettings& mapSettings );

6
src/core/qgstolerance.h
View File

@ -50,7 +50,7 @@ class CORE_EXPORT QgsTolerance
* The value is read from settings and transformed if necessary.
* @return value of vertex tolerance in map units
*/
//! @deprecated since 2.1 - use override with QgsMapSettings
//! @deprecated since 2.4 - use override with QgsMapSettings
Q_DECL_DEPRECATED static double vertexSearchRadius( QgsMapLayer* layer, QgsMapRenderer* renderer );
/**
@ -65,7 +65,7 @@ class CORE_EXPORT QgsTolerance
* The value is read from settings and transformed if necessary.
* @return value of default tolerance in map units
*/
//! @deprecated since 2.1 - use override with QgsMapSettings
//! @deprecated since 2.4 - use override with QgsMapSettings
Q_DECL_DEPRECATED static double defaultTolerance( QgsMapLayer* layer, QgsMapRenderer* renderer );
/**
@ -86,7 +86,7 @@ class CORE_EXPORT QgsTolerance
* @param units type of units to be translated
* @return value of tolerance in map units
*/
//! @deprecated since 2.1 - use the override with QgsMapSettings
//! @deprecated since 2.4 - use the override with QgsMapSettings
Q_DECL_DEPRECATED static double toleranceInMapUnits( double tolerance, QgsMapLayer* layer, QgsMapRenderer* renderer, UnitType units = MapUnits );
private:

2
src/core/qgsvectordataprovider.h
View File

@ -120,7 +120,7 @@ class CORE_EXPORT QgsVectorDataProvider : public QgsDataProvider
* if it is possible that both feature source and provider may need reading/writing to some shared data at the
* same time, some synchronization mechanisms must be used (e.g. mutexes) to prevent data corruption.
*
* @note added in 2.1
* @note added in 2.4
* @return new instance of QgsAbstractFeatureSource (caller is responsible for deleting it)
*/
virtual QgsAbstractFeatureSource* featureSource() const { Q_ASSERT(0 && "All providers must support featureSource()"); return 0; }

2
src/core/qgsvectorlayer.h
View File

@ -1023,7 +1023,7 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer
virtual void reload();
/** Return new instance of QgsMapLayerRenderer that will be used for rendering of given context
* @note added in 2.1
* @note added in 2.4
*/
virtual QgsMapLayerRenderer* createMapRenderer( QgsRenderContext& rendererContext );

8
src/core/raster/qgsrasterlayer.h
View File

@ -283,7 +283,7 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer
virtual void reload();
/** Return new instance of QgsMapLayerRenderer that will be used for rendering of given context
* @note added in 2.1
* @note added in 2.4
*/
virtual QgsMapLayerRenderer* createMapRenderer( QgsRenderContext& rendererContext );
@ -295,10 +295,10 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer
QgsRasterViewPort * myRasterViewPort,
const QgsMapToPixel* theQgsMapToPixel = 0 );
//! @deprecated since 2.1 - returns empty string
//! @deprecated since 2.4 - returns empty string
Q_DECL_DEPRECATED QString lastError();
//! @deprecated since 2.1 - returns empty string
//! @deprecated since 2.4 - returns empty string
Q_DECL_DEPRECATED QString lastErrorTitle();
/**Returns a list with classification items (Text and color)
@ -371,7 +371,7 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer
public slots:
void showStatusMessage( const QString & theMessage );
//! @deprecated in 2.1 - does nothing
//! @deprecated in 2.4 - does nothing
Q_DECL_DEPRECATED void updateProgress( int, int );
/** \brief receive progress signal from provider */

2
src/core/symbology-ng/qgspointdisplacementrenderer.h
View File

@ -67,7 +67,7 @@ class CORE_EXPORT QgsPointDisplacementRenderer: public QgsFeatureRendererV2
QgsFeatureRendererV2* embeddedRenderer() { return mRenderer;}
//! not available in python bindings
//! @deprecated since 2.1
//! @deprecated since 2.4
Q_DECL_DEPRECATED void setDisplacementGroups( const QList<QMap<QgsFeatureId, QgsFeature> >& list ) { Q_UNUSED( list ); }
void setLabelFont( const QFont& f ) { mLabelFont = f; }

2
src/core/symbology-ng/qgsrendererv2.h
View File

@ -84,7 +84,7 @@ class CORE_EXPORT QgsFeatureRendererV2
virtual void startRender( QgsRenderContext& context, const QgsFields& fields ) = 0;
//! @deprecated since 2.1 - not using QgsVectorLayer directly anymore
//! @deprecated since 2.4 - not using QgsVectorLayer directly anymore
Q_DECL_DEPRECATED virtual void startRender( QgsRenderContext& context, const QgsVectorLayer* vlayer );
virtual void stopRender( QgsRenderContext& context ) = 0;

2
src/core/symbology-ng/qgssymbolv2.h
View File

@ -188,7 +188,7 @@ class CORE_EXPORT QgsSymbolV2RenderContext
//! Fields of the layer. Currently only available in startRender() calls
//! to allow symbols with data-defined properties prepare the expressions
//! (other times fields() returns null)
//! @note added in 2.1
//! @note added in 2.4
const QgsFields* fields() const { return mFields; }
double outputLineWidth( double width ) const;

60
src/gui/qgsmapcanvas.h
View File

@ -127,64 +127,64 @@ class GUI_EXPORT QgsMapCanvas : public QGraphicsView
void enableOverviewMode( QgsMapOverviewCanvas* overview );
//! Get access to properties used for map rendering
//! @note added in 2.1
//! @note added in 2.4
const QgsMapSettings& mapSettings() const;
//! sets whether to use projections for this layer set
//! @note added in 2.1
//! @note added in 2.4
void setCrsTransformEnabled( bool enabled );
//! sets destination coordinate reference system
//! @note added in 2.1
//! @note added in 2.4
void setDestinationCrs( const QgsCoordinateReferenceSystem& crs );
//! Get access to the labeling results (may be null)
//! @note added in 2.1
//! @note added in 2.4
const QgsLabelingResults* labelingResults() const;
//! Set whether to cache images of rendered layers
//! @note added in 2.1
//! @note added in 2.4
void setCachingEnabled( bool enabled );
//! Check whether images of rendered layers are curerently being cached
//! @note added in 2.1
//! @note added in 2.4
bool isCachingEnabled() const;
//! Make sure to remove any rendered images from cache (does nothing if cache is not enabled)
//! @note added in 2.1
//! @note added in 2.4
void clearCache();
//! Set whether the layers are rendered in parallel or sequentially
//! @note added in 2.1
//! @note added in 2.4
void setParallelRenderingEnabled( bool enabled );
//! Check whether the layers are rendered in parallel or sequentially
//! @note added in 2.1
//! @note added in 2.4
bool isParallelRenderingEnabled() const;
//! Set how often map preview should be updated while it is being rendered (in miliseconds)
//! @note added in 2.1
//! @note added in 2.4
void setMapUpdateInterval( int timeMiliseconds );
//! Find out how often map preview should be updated while it is being rendered (in miliseconds)
//! @note added in 2.1
//! @note added in 2.4
int mapUpdateInterval() const;
//! @deprecated since 2.1 - there could be more than just one "map" items
//! @deprecated since 2.4 - there could be more than just one "map" items
QgsMapCanvasMap* map();
//! @deprecated since 2.1 - use mapRendererSettings() for anything related to current renderer settings
//! @deprecated since 2.4 - use mapRendererSettings() for anything related to current renderer settings
Q_DECL_DEPRECATED QgsMapRenderer* mapRenderer();
//! Accessor for the canvas paint device
//! @deprecated since 2.1
//! @deprecated since 2.4
Q_DECL_DEPRECATED QPaintDevice &canvasPaintDevice();
//! Get the last reported scale of the canvas
double scale();
//! Clear the map canvas
//! @deprecated since 2.1 - use refresh() - clear does the same thing
//! @deprecated since 2.4 - use refresh() - clear does the same thing
Q_DECL_DEPRECATED void clear();
//! Returns the mapUnitsPerPixel (map units per pixel) for the canvas
@ -238,14 +238,14 @@ class GUI_EXPORT QgsMapCanvas : public QGraphicsView
virtual QColor canvasColor() const;
/** Set color of selected vector features */
//! @note added in 2.1
//! @note added in 2.4
void setSelectionColor( const QColor& color );
/** Emits signal scaleChanged to update scale in main window */
void updateScale();
/** Updates the full extent */
//! @deprecated since v2.1 - does nothing
//! @deprecated since v2.4 - does nothing
Q_DECL_DEPRECATED void updateFullExtent() {}
//! return the map layer at position index in the layer stack
@ -268,11 +268,11 @@ class GUI_EXPORT QgsMapCanvas : public QGraphicsView
bool isFrozen();
//! Flag the canvas as dirty and needed a refresh
//! @deprecated since 2.1 - use refresh() to trigger a refresh (clients should not decide explicitly whether canvas is dirty or not)
//! @deprecated since 2.4 - use refresh() to trigger a refresh (clients should not decide explicitly whether canvas is dirty or not)
Q_DECL_DEPRECATED void setDirty( bool _dirty );
//! Return the state of the canvas (dirty or not)
//! @deprecated since 2.1 - dirty flag is not kept anymore - always returns false
//! @deprecated since 2.4 - dirty flag is not kept anymore - always returns false
Q_DECL_DEPRECATED bool isDirty() const;
//! Set map units (needed by project properties dialog)
@ -316,7 +316,7 @@ class GUI_EXPORT QgsMapCanvas : public QGraphicsView
bool antiAliasingEnabled() const { return mSettings.testFlag( QgsMapSettings::Antialiasing ); }
//! Select which Qt class to render with
//! @deprecated since 2.1 - does nothing because now we always render to QImage
//! @deprecated since 2.4 - does nothing because now we always render to QImage
Q_DECL_DEPRECATED void useImageToRender( bool theFlag );
// following 2 methods should be moved elsewhere or changed to private
@ -352,14 +352,14 @@ class GUI_EXPORT QgsMapCanvas : public QGraphicsView
/** A simple helper method to find out if on the fly projections are enabled or not */
bool hasCrsTransformEnabled();
//! @deprecated in 2.1 - does nothing - kept for API compatibility
//! @deprecated in 2.4 - does nothing - kept for API compatibility
Q_DECL_DEPRECATED void updateMap();
//! stop rendering (if there is any right now)
//! @note added in 2.1
//! @note added in 2.4
void stopRendering();
//! @deprecated since 2.1 - does nothing - errors are reported by different means
//! @deprecated since 2.4 - does nothing - errors are reported by different means
Q_DECL_DEPRECATED void showError( QgsMapLayer * mapLayer );
//! called to read map canvas settings from project
@ -387,7 +387,7 @@ class GUI_EXPORT QgsMapCanvas : public QGraphicsView
signals:
/** Let the owner know how far we are with render operations */
//! @deprecated since 2.1 - already unused in 2.0 anyway
//! @deprecated since 2.4 - already unused in 2.0 anyway
Q_DECL_DEPRECATED void setProgress( int, int );
/** emits current mouse position
@ -415,12 +415,12 @@ class GUI_EXPORT QgsMapCanvas : public QGraphicsView
/** Emitted when canvas finished a refresh request.
\note Added in 2.0 */
//! @deprecated since 2.1 - anything related to rendering progress is not visible outside of map canvas
//! @deprecated since 2.4 - anything related to rendering progress is not visible outside of map canvas
Q_DECL_DEPRECATED void mapCanvasRefreshed();
/** Emitted when the canvas is about to be rendered.
\note Added in 1.5 */
//! @deprecated since 2.1 - anything related to rendering progress is not visible outside of map canvas
//! @deprecated since 2.4 - anything related to rendering progress is not visible outside of map canvas
Q_DECL_DEPRECATED void renderStarting();
//! Emitted when a new set of layers has been received
@ -448,15 +448,15 @@ class GUI_EXPORT QgsMapCanvas : public QGraphicsView
void zoomNextStatusChanged( bool );
//! Emitted when on-the-fly projection has been turned on/off
//! @note added in 2.1
//! @note added in 2.4
void hasCrsTransformEnabledChanged( bool flag );
//! Emitted when map CRS has changed
//! @note added in 2.1
//! @note added in 2.4
void destinationCrsChanged();
//! Emmitted when map units are changed
//! @note added in 2.1
//! @note added in 2.4
void mapUnitsChanged();
protected:
@ -598,7 +598,7 @@ class GUI_EXPORT QgsMapCanvas : public QGraphicsView
* - changes done in map renderer are pushed to map canvas settings
*
* This class can be removed within API cleanup when QgsMapRenderer will not be accessible from canvas API anymore.
* Added in 2.1. This class is not a part of public API!
* Added in 2.4. This class is not a part of public API!
*/
class QgsMapCanvasRendererSync : public QObject
{

2
src/gui/qgsmapcanvasitem.h
View File

@ -63,7 +63,7 @@ class GUI_EXPORT QgsMapCanvasItem : public QGraphicsItem
virtual QRectF boundingRect() const;
//! sets current offset, to be called from QgsMapCanvas
//! @deprecated since v2.1 - not called by QgsMapCanvas anymore
//! @deprecated since v2.4 - not called by QgsMapCanvas anymore
Q_DECL_DEPRECATED void setPanningOffset( const QPoint& point );
//! returns canvas item rectangle

20
src/gui/qgsmapcanvasmap.h
View File

@ -40,36 +40,36 @@ class GUI_EXPORT QgsMapCanvasMap : public QgsMapCanvasItem // public QObject, p
~QgsMapCanvasMap();
//! @note added in 2.1
//! @note added in 2.4
void setContent( const QImage& image, const QgsRectangle& rect );
//! @note added in 2.1
//! @note added in 2.4
QImage contentImage() const { return mImage; }
virtual void paint( QPainter * painter );
//! @deprecated in 2.1 - does nothing. Kept for API compatibility
//! @deprecated in 2.4 - does nothing. Kept for API compatibility
Q_DECL_DEPRECATED void refresh() {}
//! @deprecated in 2.1 - does nothing. Kept for API compatibility
//! @deprecated in 2.4 - does nothing. Kept for API compatibility
Q_DECL_DEPRECATED void resize( QSize size ) { Q_UNUSED( size ); }
//! @deprecated in 2.1 - does nothing. Kept for API compatibility
//! @deprecated in 2.4 - does nothing. Kept for API compatibility
Q_DECL_DEPRECATED void enableAntiAliasing( bool flag ) { Q_UNUSED( flag ); }
//! @deprecated in 2.1 - does nothing. Kept for API compatibility
//! @deprecated in 2.4 - does nothing. Kept for API compatibility
Q_DECL_DEPRECATED void render() {}
//! @deprecated in 2.1 - does nothing. Kept for API compatibility
//! @deprecated in 2.4 - does nothing. Kept for API compatibility
Q_DECL_DEPRECATED void setBackgroundColor( const QColor& color ) { Q_UNUSED( color ); }
//! @deprecated in 2.1 - not called by QgsMapCanvas anymore
//! @deprecated in 2.4 - not called by QgsMapCanvas anymore
Q_DECL_DEPRECATED void setPanningOffset( const QPoint& point ) { Q_UNUSED( point ); }
//! @deprecated in 2.1
//! @deprecated in 2.4
Q_DECL_DEPRECATED QPaintDevice& paintDevice();
//! @deprecated in 2.1 - does nothing. Kept for API compatibility
//! @deprecated in 2.4 - does nothing. Kept for API compatibility
Q_DECL_DEPRECATED void updateContents() {}
private:

2
src/gui/qgsmaptool.h
View File

@ -79,7 +79,7 @@ class GUI_EXPORT QgsMapTool : public QObject
#endif
//! Called when rendering has finished. Default implementation does nothing.
//! @deprecated since 2.1 - not called anymore - map tools must not directly depend on rendering progress
//! @deprecated since 2.4 - not called anymore - map tools must not directly depend on rendering progress
Q_DECL_DEPRECATED virtual void renderComplete();