Added Q_OBJECT

qgis · May 14, 2020 · 91152ee · 91152ee
1 parent 5d59048
commit 91152ee
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 53 deletions.
diff --git a/src/gui/vectortile/qgsvectortilebasiclabelingwidget.cpp b/src/gui/vectortile/qgsvectortilebasiclabelingwidget.cpp
@@ -25,33 +25,6 @@
 ///@cond PRIVATE
 
 
-class QgsVectorTileBasicLabelingListModel : public QAbstractListModel
-{
-  public:
-    QgsVectorTileBasicLabelingListModel( QgsVectorTileBasicLabeling *r, QObject *parent = nullptr );
-
-    int rowCount( const QModelIndex &parent = QModelIndex() ) const override;
-    int columnCount( const QModelIndex &parent = QModelIndex() ) const override;
-    QVariant data( const QModelIndex &index, int role = Qt::DisplayRole ) const override;
-    QVariant headerData( int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const override;
-    Qt::ItemFlags flags( const QModelIndex &index ) const override;
-    bool setData( const QModelIndex &index, const QVariant &value, int role ) override;
-
-    bool removeRows( int row, int count, const QModelIndex &parent = QModelIndex() ) override;
-
-    void insertStyle( int row, const QgsVectorTileBasicLabelingStyle &style );
-
-    // drag'n'drop support
-    Qt::DropActions supportedDropActions() const override;
-    QStringList mimeTypes() const override;
-    QMimeData *mimeData( const QModelIndexList &indexes ) const override;
-    bool dropMimeData( const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent ) override;
-
-  private:
-    QgsVectorTileBasicLabeling *mLabeling = nullptr;
-};
-
-
 QgsVectorTileBasicLabelingListModel::QgsVectorTileBasicLabelingListModel( QgsVectorTileBasicLabeling *l, QObject *parent )
   : QAbstractListModel( parent )
   , mLabeling( l )

diff --git a/src/gui/vectortile/qgsvectortilebasiclabelingwidget.h b/src/gui/vectortile/qgsvectortilebasiclabelingwidget.h
@@ -93,6 +93,36 @@ class QgsLabelingPanelWidget : public QgsPanelWidget
     QgsLabelingGui *mLabelingGui = nullptr;
 };
 
+
+class QgsVectorTileBasicLabelingStyle;
+
+class QgsVectorTileBasicLabelingListModel : public QAbstractListModel
+{
+    Q_OBJECT
+  public:
+    QgsVectorTileBasicLabelingListModel( QgsVectorTileBasicLabeling *r, QObject *parent = nullptr );
+
+    int rowCount( const QModelIndex &parent = QModelIndex() ) const override;
+    int columnCount( const QModelIndex &parent = QModelIndex() ) const override;
+    QVariant data( const QModelIndex &index, int role = Qt::DisplayRole ) const override;
+    QVariant headerData( int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const override;
+    Qt::ItemFlags flags( const QModelIndex &index ) const override;
+    bool setData( const QModelIndex &index, const QVariant &value, int role ) override;
+
+    bool removeRows( int row, int count, const QModelIndex &parent = QModelIndex() ) override;
+
+    void insertStyle( int row, const QgsVectorTileBasicLabelingStyle &style );
+
+    // drag'n'drop support
+    Qt::DropActions supportedDropActions() const override;
+    QStringList mimeTypes() const override;
+    QMimeData *mimeData( const QModelIndexList &indexes ) const override;
+    bool dropMimeData( const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent ) override;
+
+  private:
+    QgsVectorTileBasicLabeling *mLabeling = nullptr;
+};
+
 ///@endcond
 
 #endif // QGSVECTORTILEBASICLABELINGWIDGET_H
diff --git a/src/gui/vectortile/qgsvectortilebasicrendererwidget.cpp b/src/gui/vectortile/qgsvectortilebasicrendererwidget.cpp
@@ -29,32 +29,6 @@
 
 ///@cond PRIVATE
 
-class QgsVectorTileBasicRendererListModel : public QAbstractListModel
-{
-  public:
-    QgsVectorTileBasicRendererListModel( QgsVectorTileBasicRenderer *r, QObject *parent = nullptr );
-
-    int rowCount( const QModelIndex &parent = QModelIndex() ) const override;
-    int columnCount( const QModelIndex &parent = QModelIndex() ) const override;
-    QVariant data( const QModelIndex &index, int role = Qt::DisplayRole ) const override;
-    QVariant headerData( int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const override;
-    Qt::ItemFlags flags( const QModelIndex &index ) const override;
-    bool setData( const QModelIndex &index, const QVariant &value, int role ) override;
-
-    bool removeRows( int row, int count, const QModelIndex &parent = QModelIndex() ) override;
-
-    void insertStyle( int row, const QgsVectorTileBasicRendererStyle &style );
-
-    // drag'n'drop support
-    Qt::DropActions supportedDropActions() const override;
-    QStringList mimeTypes() const override;
-    QMimeData *mimeData( const QModelIndexList &indexes ) const override;
-    bool dropMimeData( const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent ) override;
-
-  private:
-    QgsVectorTileBasicRenderer *mRenderer = nullptr;
-};
-
 
 QgsVectorTileBasicRendererListModel::QgsVectorTileBasicRendererListModel( QgsVectorTileBasicRenderer *r, QObject *parent )
   : QAbstractListModel( parent )

diff --git a/src/gui/vectortile/qgsvectortilebasicrendererwidget.h b/src/gui/vectortile/qgsvectortilebasicrendererwidget.h
@@ -66,6 +66,36 @@ class GUI_EXPORT QgsVectorTileBasicRendererWidget : public QgsMapLayerConfigWidg
     QgsMessageBar *mMessageBar = nullptr;
 };
 
+
+class QgsVectorTileBasicRendererStyle;
+
+class QgsVectorTileBasicRendererListModel : public QAbstractListModel
+{
+    Q_OBJECT
+  public:
+    QgsVectorTileBasicRendererListModel( QgsVectorTileBasicRenderer *r, QObject *parent = nullptr );
+
+    int rowCount( const QModelIndex &parent = QModelIndex() ) const override;
+    int columnCount( const QModelIndex &parent = QModelIndex() ) const override;
+    QVariant data( const QModelIndex &index, int role = Qt::DisplayRole ) const override;
+    QVariant headerData( int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const override;
+    Qt::ItemFlags flags( const QModelIndex &index ) const override;
+    bool setData( const QModelIndex &index, const QVariant &value, int role ) override;
+
+    bool removeRows( int row, int count, const QModelIndex &parent = QModelIndex() ) override;
+
+    void insertStyle( int row, const QgsVectorTileBasicRendererStyle &style );
+
+    // drag'n'drop support
+    Qt::DropActions supportedDropActions() const override;
+    QStringList mimeTypes() const override;
+    QMimeData *mimeData( const QModelIndexList &indexes ) const override;
+    bool dropMimeData( const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent ) override;
+
+  private:
+    QgsVectorTileBasicRenderer *mRenderer = nullptr;
+};
+
 ///@endcond
 
 #endif // QGSVECTORTILEBASICRENDERERWIDGET_H