Skip to content
Permalink
Browse files

Marked few drawing progress reporting signals as deprecated

  • Loading branch information
wonder-sk committed Nov 1, 2013
1 parent ccd40bf commit d9b95bcd423f02308a53c5fe73d1cba39e1ff143
@@ -1898,8 +1898,6 @@ void QgisApp::setupConnections()
mMapCanvas, SLOT( setRenderFlag( bool ) ) );

// connect renderer
connect( mMapCanvas->mapRenderer(), SIGNAL( drawingProgress( int, int ) ),
this, SLOT( showProgress( int, int ) ) );
connect( mMapCanvas->mapRenderer(), SIGNAL( hasCrsTransformEnabled( bool ) ),
this, SLOT( hasCrsTransformEnabled( bool ) ) );
connect( mMapCanvas->mapRenderer(), SIGNAL( destinationSrsChanged() ),
@@ -396,7 +396,7 @@ class CORE_EXPORT QgsMapLayer : public QObject

signals:

/** Emit a signal to notify of a progress event */
//! @deprecated in 2.1 - 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) */
@@ -713,9 +713,6 @@ void QgsMapRenderer::onDrawingProgress( int current, int total )
{
Q_UNUSED( current );
Q_UNUSED( total );
// TODO: emit signal with progress
// QgsDebugMsg(QString("onDrawingProgress: %1 / %2").arg(current).arg(total));
emit updateMap();
}

void QgsMapRenderer::setProjectionsEnabled( bool enabled )
@@ -291,12 +291,14 @@ class CORE_EXPORT QgsMapRenderer : public QObject

signals:

//! @deprecated in 2.1 - not emitted anymore
void drawingProgress( int current, int total );

void hasCrsTransformEnabled( bool flag );

void destinationSrsChanged();

//! @deprecated in 2.1 - not emitted anymore
void updateMap();

void mapUnitsChanged();
@@ -306,7 +308,7 @@ class CORE_EXPORT QgsMapRenderer : public QObject

public slots:

//! called by signal from layer current being drawn
//! @deprecated in 2.1 - does nothing
Q_DECL_DEPRECATED void onDrawingProgress( int current, int total );

protected:
@@ -1277,8 +1277,8 @@ void QgsRasterLayer::triggerRepaint()

void QgsRasterLayer::updateProgress( int theProgress, int theMax )
{
//simply propogate it on!
emit drawingProgress( theProgress, theMax );
Q_UNUSED( theProgress );
Q_UNUSED( theMax );
}

void QgsRasterLayer::onProgress( int theType, double theProgress, QString theMessage )
@@ -372,8 +372,8 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer
public slots:
void showStatusMessage( const QString & theMessage );

/** \brief Propagate progress updates from GDAL up to the parent app */
void updateProgress( int, int );
//! @deprecated in 2.1 - does nothing
Q_DECL_DEPRECATED void updateProgress( int, int );

/** \brief receive progress signal from provider */
void onProgress( int, double, QString );
@@ -299,8 +299,8 @@ class GUI_EXPORT QgsMapCanvas : public QGraphicsView
/** The map units may have changed, so cope with that */
void mapUnitsChanged();

//! \note Deprecated in 2.1 - does nothing - kept for API compatibility
void updateMap();
//! @deprecated in 2.1 - does nothing - kept for API compatibility
Q_DECL_DEPRECATED void updateMap();

//! show whatever error is exposed by the QgsMapLayer.
void showError( QgsMapLayer * mapLayer );

0 comments on commit d9b95bc

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