Followup e90ac56

Fix warnings, missing Q_OBJECT macro
qgis · Mar 21, 2018 · 2be1256 · 2be1256
1 parent e0255b3
commit 2be1256
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 21 deletions.
diff --git a/python/core/qgspluginlayer.sip.in b/python/core/qgspluginlayer.sip.in
@@ -59,6 +59,7 @@ Set source string. This is used for example in layer tree to show tooltip.
   protected:
 };
 
+
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *

diff --git a/src/core/qgspluginlayer.cpp b/src/core/qgspluginlayer.cpp
@@ -18,27 +18,6 @@
 #include "qgsmaplayerrenderer.h"
 
 
-/**
-  A minimal data provider for plugin layers
- */
-///@cond PRIVATE
-class QgsPluginLayerDataProvider : public QgsDataProvider
-{
-  public:
-    QgsPluginLayerDataProvider( const QString &layerType ) : mName( layerType ) {}
-    void setExtent( const QgsRectangle &extent ) { mExtent = extent; }
-    virtual QgsCoordinateReferenceSystem crs() const { return QgsCoordinateReferenceSystem(); }
-    virtual QString name() const override { return mName; }
-    QString description() const override { return ""; }
-    virtual QgsRectangle extent() const { return mExtent; }
-    virtual bool isValid() const { return true; }
-
-  private:
-    QString mName;
-    QgsRectangle mExtent;
-};
-///@endcond
-
 QgsPluginLayer::QgsPluginLayer( const QString &layerType, const QString &layerName )
   : QgsMapLayer( PluginLayer, layerName )
   , mPluginLayerType( layerType )
@@ -79,3 +58,37 @@ const QgsDataProvider *QgsPluginLayer::dataProvider() const
 {
   return mDataProvider;
 }
+
+//
+// QgsPluginLayerDataProvider
+//
+///@cond PRIVATE
+QgsPluginLayerDataProvider::QgsPluginLayerDataProvider( const QString &layerType )
+  : mName( layerType )
+{}
+
+QgsCoordinateReferenceSystem QgsPluginLayerDataProvider::crs() const
+{
+  return QgsCoordinateReferenceSystem();
+}
+
+QString QgsPluginLayerDataProvider::name() const
+{
+  return mName;
+}
+
+QString QgsPluginLayerDataProvider::description() const
+{
+  return QString();
+}
+
+QgsRectangle QgsPluginLayerDataProvider::extent() const
+{
+  return mExtent;
+}
+
+bool QgsPluginLayerDataProvider::isValid() const
+{
+  return true;
+}
+///@endcond
diff --git a/src/core/qgspluginlayer.h b/src/core/qgspluginlayer.h
@@ -63,4 +63,30 @@ class CORE_EXPORT QgsPluginLayer : public QgsMapLayer
     QgsDataProvider *mDataProvider;
 };
 
+#ifndef SIP_RUN
+///@cond PRIVATE
+
+/**
+ * A minimal data provider for plugin layers
+ */
+class QgsPluginLayerDataProvider : public QgsDataProvider
+{
+    Q_OBJECT
+
+  public:
+    QgsPluginLayerDataProvider( const QString &layerType );
+    void setExtent( const QgsRectangle &extent ) { mExtent = extent; }
+    virtual QgsCoordinateReferenceSystem crs() const override;
+    virtual QString name() const override;
+    QString description() const override;
+    virtual QgsRectangle extent() const override;
+    virtual bool isValid() const override;
+
+  private:
+    QString mName;
+    QgsRectangle mExtent;
+};
+///@endcond
+#endif
+
 #endif // QGSPLUGINLAYER_H