Skip to content
Permalink
Browse files
Fix some QgsMapLayer getters which are incorrectly marked as slots
  • Loading branch information
nyalldawson committed Apr 10, 2017
1 parent 1128373 commit de62c4e6430d3e86ba4d0bb11b33e610a33ad9ac
Showing with 38 additions and 38 deletions.
  1. +23 −23 python/core/qgsmaplayer.sip
  2. +15 −15 src/core/qgsmaplayer.h
@@ -807,6 +807,29 @@ Return pointer to layer's undo stack
\see setAutoRefreshInterval()
%End

virtual QString metadata() const;
%Docstring
Obtain Metadata for this layer

:rtype: str
%End

virtual QDateTime timestamp() const;
%Docstring
Time stamp of data source in the moment when data/metadata were loaded by provider
:rtype: QDateTime
%End

virtual QSet<QgsMapLayerDependency> dependencies() const;
%Docstring
Gets the list of dependencies. This includes data dependencies set by the user (\see setDataDependencies)
as well as dependencies given by the provider

:return: a set of QgsMapLayerDependency
.. versionadded:: 3.0
:rtype: set of QgsMapLayerDependency
%End

public slots:

void setMinimumScale( double scale );
@@ -850,19 +873,6 @@ Return pointer to layer's undo stack
in 2.6 function moved from vector/raster subclasses to QgsMapLayer
%End

virtual QString metadata() const;
%Docstring
Obtain Metadata for this layer

:rtype: str
%End

virtual QDateTime timestamp() const;
%Docstring
Time stamp of data source in the moment when data/metadata were loaded by provider
:rtype: QDateTime
%End

void emitStyleChanged();
%Docstring
Triggers an emission of the styleChanged() signal.
@@ -880,16 +890,6 @@ Time stamp of data source in the moment when data/metadata were loaded by provid
:rtype: bool
%End

virtual QSet<QgsMapLayerDependency> dependencies() const;
%Docstring
Gets the list of dependencies. This includes data dependencies set by the user (\see setDataDependencies)
as well as dependencies given by the provider

:return: a set of QgsMapLayerDependency
.. versionadded:: 3.0
:rtype: set of QgsMapLayerDependency
%End

signals:

void statusChanged( const QString &status );
@@ -720,6 +720,21 @@ class CORE_EXPORT QgsMapLayer : public QObject
*/
void setAutoRefreshEnabled( bool enabled );

//! \brief Obtain Metadata for this layer
virtual QString metadata() const;

//! Time stamp of data source in the moment when data/metadata were loaded by provider
virtual QDateTime timestamp() const { return QDateTime() ; }

/**
* Gets the list of dependencies. This includes data dependencies set by the user (\see setDataDependencies)
* as well as dependencies given by the provider
*
* \returns a set of QgsMapLayerDependency
* \since QGIS 3.0
*/
virtual QSet<QgsMapLayerDependency> dependencies() const;

public slots:

/** Sets the minimum scale denominator at which the layer will be visible.
@@ -758,12 +773,6 @@ class CORE_EXPORT QgsMapLayer : public QObject
*/
void triggerRepaint( bool deferredUpdate = false );

//! \brief Obtain Metadata for this layer
virtual QString metadata() const;

//! Time stamp of data source in the moment when data/metadata were loaded by provider
virtual QDateTime timestamp() const { return QDateTime() ; }

/** Triggers an emission of the styleChanged() signal.
* \since QGIS 2.16
*/
@@ -779,15 +788,6 @@ class CORE_EXPORT QgsMapLayer : public QObject
*/
virtual bool setDependencies( const QSet<QgsMapLayerDependency> &layers );

/**
* Gets the list of dependencies. This includes data dependencies set by the user (\see setDataDependencies)
* as well as dependencies given by the provider
*
* \returns a set of QgsMapLayerDependency
* \since QGIS 3.0
*/
virtual QSet<QgsMapLayerDependency> dependencies() const;

signals:

//! Emit a signal with status (e.g. to be caught by QgisApp and display a msg on status bar)

0 comments on commit de62c4e

Please sign in to comment.