Add missing Q_OBJECT macros and enable clazy check missing-qobject-macro

qgis · Jul 12, 2022 · d5505e3 · d5505e3
1 parent ea13e0c
commit d5505e3
Show file tree

Hide file tree

Showing 76 changed files with 388 additions and 258 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -887,7 +887,7 @@ if (WITH_CORE)
   if (WITH_CLAZY)
     set(CMAKE_CXX_BASE_FLAGS "${CMAKE_CXX_FLAGS}")
     #  qcolor-from-literal crashes clang with clazy 1.11
-    set(CLAZY_BASE_CHECKS "connect-3arg-lambda,lambda-unique-connection,empty-qstringliteral,fully-qualified-moc-types,lowercase-qml-type-name,qfileinfo-exists,qmap-with-pointer-key,unused-non-trivial-variable,overridden-signal,qdeleteall,qstring-left,skipped-base-method,isempty-vs-count")
+    set(CLAZY_BASE_CHECKS "connect-3arg-lambda,lambda-unique-connection,empty-qstringliteral,fully-qualified-moc-types,lowercase-qml-type-name,qfileinfo-exists,qmap-with-pointer-key,unused-non-trivial-variable,overridden-signal,qdeleteall,qstring-left,skipped-base-method,isempty-vs-count,missing-qobject-macro")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_BASE_FLAGS} -Xclang -plugin-arg-clazy -Xclang ${CLAZY_BASE_CHECKS}")
 
     if (WERROR AND NOT ${QGISDEBUG})

diff --git a/python/gui/auto_generated/processing/qgsprocessingaggregatewidgets.sip.in b/python/gui/auto_generated/processing/qgsprocessingaggregatewidgets.sip.in
@@ -224,10 +224,11 @@ Moves up currently selected field
 Moves down currently selected field
 %End
 
-      public:
 };
 
 
+
+
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *

diff --git a/python/gui/auto_generated/qgsfieldmappingwidget.sip.in b/python/gui/auto_generated/qgsfieldmappingwidget.sip.in
@@ -146,11 +146,11 @@ Moves up currently selected field
 Moves down the currently selected field
 %End
 
-      public:
-      public:
 };
 
 
+
+
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *

diff --git a/src/app/devtools/networklogger/qgsnetworklogger.h b/src/app/devtools/networklogger/qgsnetworklogger.h
@@ -131,6 +131,7 @@ class QgsNetworkLogger : public QAbstractItemModel
  */
 class QgsNetworkLoggerProxyModel : public QSortFilterProxyModel
 {
+    Q_OBJECT
   public:
 
     /**

diff --git a/src/app/devtools/querylogger/qgsappquerylogger.h b/src/app/devtools/querylogger/qgsappquerylogger.h
@@ -112,6 +112,7 @@ class QgsAppQueryLogger : public QAbstractItemModel
  */
 class QgsDatabaseQueryLoggerProxyModel : public QSortFilterProxyModel
 {
+    Q_OBJECT
   public:
 
     /**

diff --git a/src/app/maptools/qgsmaptoolshapecircle2points.h b/src/app/maptools/qgsmaptoolshapecircle2points.h
@@ -40,6 +40,7 @@ class APP_EXPORT QgsMapToolShapeCircle2PointsMetadata : public QgsMapToolShapeMe
 
 class APP_EXPORT QgsMapToolShapeCircle2Points : public QgsMapToolShapeCircleAbstract
 {
+    Q_OBJECT
   public:
     QgsMapToolShapeCircle2Points( QgsMapToolCapture *parentTool )
       : QgsMapToolShapeCircleAbstract( QgsMapToolShapeCircle2PointsMetadata::TOOL_ID, parentTool )

diff --git a/src/app/qgsrelationmanagerdialog.cpp b/src/app/qgsrelationmanagerdialog.cpp
@@ -22,27 +22,6 @@
 #include "qgsvectorlayer.h"
 
 
-#ifndef SIP_RUN
-class RelationNameEditorDelegate: public QStyledItemDelegate
-{
-  public:
-    RelationNameEditorDelegate( const QList<int> &editableColumns, QObject *parent = nullptr )
-      : QStyledItemDelegate( parent )
-      , mEditableColumns( editableColumns )
-    {}
-
-    virtual QWidget *createEditor( QWidget *parentWidget, const QStyleOptionViewItem &option, const QModelIndex &index ) const
-    {
-      if ( mEditableColumns.contains( index.column() ) )
-        return QStyledItemDelegate::createEditor( parentWidget, option, index );
-
-      return nullptr;
-    }
-  private:
-    QList<int> mEditableColumns;
-};
-#endif
-
 QgsRelationManagerDialog::QgsRelationManagerDialog( QgsRelationManager *relationMgr, QWidget *parent )
   : QWidget( parent )
   , Ui::QgsRelationManagerDialogBase()

diff --git a/src/app/qgsrelationmanagerdialog.h b/src/app/qgsrelationmanagerdialog.h
@@ -56,4 +56,24 @@ class APP_EXPORT QgsRelationManagerDialog : public QWidget, private Ui::QgsRelat
     QString getUniqueId( const QString &idTmpl, const QString &ids ) const;
 };
 
+class RelationNameEditorDelegate: public QStyledItemDelegate
+{
+    Q_OBJECT
+  public:
+    RelationNameEditorDelegate( const QList<int> &editableColumns, QObject *parent = nullptr )
+      : QStyledItemDelegate( parent )
+      , mEditableColumns( editableColumns )
+    {}
+
+    virtual QWidget *createEditor( QWidget *parentWidget, const QStyleOptionViewItem &option, const QModelIndex &index ) const
+    {
+      if ( mEditableColumns.contains( index.column() ) )
+        return QStyledItemDelegate::createEditor( parentWidget, option, index );
+
+      return nullptr;
+    }
+  private:
+    QList<int> mEditableColumns;
+};
+
 #endif // QGSRELATIONMANAGERDIALOG_H
diff --git a/src/app/qgssnappinglayertreemodel.cpp b/src/app/qgssnappinglayertreemodel.cpp
@@ -29,30 +29,6 @@
 #include "qgsapplication.h"
 #include "qgsscalewidget.h"
 
-class SnapTypeMenu: public QMenu
-{
-  public:
-    SnapTypeMenu( const QString &title, QWidget *parent = nullptr )
-      : QMenu( title, parent ) {}
-
-    void mouseReleaseEvent( QMouseEvent *e )
-    {
-      QAction *action = activeAction();
-      if ( action )
-        action->trigger();
-      else
-        QMenu::mouseReleaseEvent( e );
-    }
-
-    // set focus to parent so that mTypeButton is not displayed
-    void hideEvent( QHideEvent *e )
-    {
-      qobject_cast<QWidget *>( parent() )->setFocus();
-      QMenu::hideEvent( e );
-    }
-};
-
-
 QgsSnappingLayerDelegate::QgsSnappingLayerDelegate( QgsMapCanvas *canvas, QObject *parent )
   : QItemDelegate( parent )
   , mCanvas( canvas )
@@ -70,7 +46,7 @@ QWidget *QgsSnappingLayerDelegate::createEditor( QWidget *parent, const QStyleOp
     QToolButton *mTypeButton = new QToolButton( parent );
     mTypeButton->setToolTip( tr( "Snapping Type" ) );
     mTypeButton->setPopupMode( QToolButton::InstantPopup );
-    SnapTypeMenu *typeMenu = new SnapTypeMenu( tr( "Set Snapping Mode" ), parent );
+    SnappingLayerDelegateTypeMenu *typeMenu = new SnappingLayerDelegateTypeMenu( tr( "Set Snapping Mode" ), parent );
 
     for ( Qgis::SnappingType type : qgsEnumList<Qgis::SnappingType>() )
     {

diff --git a/src/app/qgssnappinglayertreemodel.h b/src/app/qgssnappinglayertreemodel.h
@@ -102,4 +102,29 @@ class APP_EXPORT QgsSnappingLayerTreeModel : public QSortFilterProxyModel
     void hasRowchanged( QgsLayerTreeNode *node, const QHash<QgsVectorLayer *, QgsSnappingConfig::IndividualLayerSettings> &oldSettings );
 };
 
+class SnappingLayerDelegateTypeMenu: public QMenu
+{
+    Q_OBJECT
+
+  public:
+    SnappingLayerDelegateTypeMenu( const QString &title, QWidget *parent = nullptr )
+      : QMenu( title, parent ) {}
+
+    void mouseReleaseEvent( QMouseEvent *e )
+    {
+      QAction *action = activeAction();
+      if ( action )
+        action->trigger();
+      else
+        QMenu::mouseReleaseEvent( e );
+    }
+
+    // set focus to parent so that mTypeButton is not displayed
+    void hideEvent( QHideEvent *e )
+    {
+      qobject_cast<QWidget *>( parent() )->setFocus();
+      QMenu::hideEvent( e );
+    }
+};
+
 #endif // QGSSNAPPINGLAYERTREEVIEW_H
diff --git a/src/app/qgssnappingwidget.cpp b/src/app/qgssnappingwidget.cpp
@@ -47,22 +47,6 @@
 #include "modeltest.h"
 #endif
 
-class SnapTypeMenu: public QMenu
-{
-  public:
-    SnapTypeMenu( const QString &title, QWidget *parent = nullptr )
-      : QMenu( title, parent ) {}
-
-    void mouseReleaseEvent( QMouseEvent *e )
-    {
-      QAction *action = activeAction();
-      if ( action )
-        action->trigger();
-      else
-        QMenu::mouseReleaseEvent( e );
-    }
-};
-
 QgsSnappingWidget::QgsSnappingWidget( QgsProject *project, QgsMapCanvas *canvas, QWidget *parent )
   : QWidget( parent )
   , mProject( project )

diff --git a/src/app/qgssnappingwidget.h b/src/app/qgssnappingwidget.h
@@ -182,4 +182,21 @@ class APP_EXPORT QgsSnappingWidget : public QWidget
     void cleanGroup( QgsLayerTreeNode *node );
 };
 
+class SnapTypeMenu: public QMenu
+{
+    Q_OBJECT
+  public:
+    SnapTypeMenu( const QString &title, QWidget *parent = nullptr )
+      : QMenu( title, parent ) {}
+
+    void mouseReleaseEvent( QMouseEvent *e )
+    {
+      QAction *action = activeAction();
+      if ( action )
+        action->trigger();
+      else
+        QMenu::mouseReleaseEvent( e );
+    }
+};
+
 #endif
diff --git a/src/core/layertree/qgslayertreemodellegendnode.h b/src/core/layertree/qgslayertreemodellegendnode.h
@@ -730,6 +730,7 @@ class CORE_EXPORT QgsDataDefinedSizeLegendNode : public QgsLayerTreeModelLegendN
  */
 class CORE_EXPORT QgsVectorLabelLegendNode : public QgsLayerTreeModelLegendNode
 {
+    Q_OBJECT
   public:
 
     /**

diff --git a/src/core/providers/copc/qgscopcprovider.h b/src/core/providers/copc/qgscopcprovider.h
@@ -66,6 +66,7 @@ class QgsCopcProvider: public QgsPointCloudDataProvider
 
 class QgsCopcProviderMetadata : public QgsProviderMetadata
 {
+    Q_OBJECT
   public:
     QgsCopcProviderMetadata();
     QIcon icon() const override;

diff --git a/src/core/providers/ept/qgseptprovider.h b/src/core/providers/ept/qgseptprovider.h
@@ -62,6 +62,7 @@ class QgsEptProvider: public QgsPointCloudDataProvider
 
 class QgsEptProviderMetadata : public QgsProviderMetadata
 {
+    Q_OBJECT
   public:
     QgsEptProviderMetadata();
     QIcon icon() const override;

diff --git a/src/core/providers/gdal/qgsgdalprovider.h b/src/core/providers/gdal/qgsgdalprovider.h
@@ -370,6 +370,7 @@ class QgsGdalProvider final: public QgsRasterDataProvider, QgsGdalProviderBase
  */
 class QgsGdalProviderMetadata final: public QgsProviderMetadata
 {
+    Q_OBJECT
   public:
     QgsGdalProviderMetadata();
     QIcon icon() const override;

diff --git a/src/core/providers/memory/qgsmemoryprovider.h b/src/core/providers/memory/qgsmemoryprovider.h
@@ -101,6 +101,8 @@ class QgsMemoryProvider final: public QgsVectorDataProvider
 
 class QgsMemoryProviderMetadata final: public QgsProviderMetadata
 {
+    Q_OBJECT
+
   public:
     QgsMemoryProviderMetadata();
     QIcon icon() const override;

diff --git a/src/core/providers/meshmemory/qgsmeshmemorydataprovider.h b/src/core/providers/meshmemory/qgsmeshmemorydataprovider.h
@@ -189,6 +189,8 @@ class CORE_EXPORT QgsMeshMemoryDataProvider final: public QgsMeshDataProvider
 
 class QgsMeshMemoryProviderMetadata final: public QgsProviderMetadata
 {
+    Q_OBJECT
+
   public:
     QgsMeshMemoryProviderMetadata();
     QIcon icon() const override;

diff --git a/src/core/providers/ogr/qgsogrprovidermetadata.h b/src/core/providers/ogr/qgsogrprovidermetadata.h
@@ -28,6 +28,7 @@ email                : nyall dot dawson at gmail dot com
  */
 class QgsOgrProviderMetadata final: public QgsProviderMetadata
 {
+    Q_OBJECT
   public:
 
     QgsOgrProviderMetadata();

diff --git a/src/core/vectortile/qgsvectortileprovidermetadata.h b/src/core/vectortile/qgsvectortileprovidermetadata.h
@@ -29,6 +29,7 @@
  */
 class QgsVectorTileProviderMetadata : public QgsProviderMetadata
 {
+    Q_OBJECT
   public:
     QgsVectorTileProviderMetadata();
     QIcon icon() const override;

diff --git a/src/gui/layout/qgsgeopdflayertreemodel.h b/src/gui/layout/qgsgeopdflayertreemodel.h
@@ -75,6 +75,7 @@ class GUI_EXPORT QgsGeoPdfLayerTreeModel : public QgsMapLayerModel
 ///@cond PRIVATE
 class GUI_EXPORT QgsGeoPdfLayerFilteredTreeModel : public QSortFilterProxyModel
 {
+    Q_OBJECT
   public:
 
     QgsGeoPdfLayerFilteredTreeModel( QgsGeoPdfLayerTreeModel *sourceModel, QObject *parent = nullptr );

diff --git a/src/gui/maptools/qgsmaptoolcapturelayergeometry.h b/src/gui/maptools/qgsmaptoolcapturelayergeometry.h
@@ -29,6 +29,7 @@ class QgsMapCanvas;
  */
 class GUI_EXPORT QgsMapToolCaptureLayerGeometry : public QgsMapToolCapture
 {
+    Q_OBJECT
   public:
     //! Constructor
     QgsMapToolCaptureLayerGeometry( QgsMapCanvas *canvas, QgsAdvancedDigitizingDockWidget *cadDockWidget, CaptureMode mode )

diff --git a/src/gui/mesh/qgsmeshdatasetgrouptreeview.h b/src/gui/mesh/qgsmeshdatasetgrouptreeview.h
@@ -126,6 +126,7 @@ class QgsMeshDatasetGroupTreeModel : public QAbstractItemModel
  */
 class QgsMeshAvailableDatasetGroupTreeModel: public QgsMeshDatasetGroupTreeModel
 {
+    Q_OBJECT
   public:
     QgsMeshAvailableDatasetGroupTreeModel( QObject *parent = nullptr );
 
@@ -146,6 +147,7 @@ class QgsMeshAvailableDatasetGroupTreeModel: public QgsMeshDatasetGroupTreeModel
  */
 class  QgsMeshDatasetGroupProxyModel: public QSortFilterProxyModel
 {
+    Q_OBJECT
   public:
     QgsMeshDatasetGroupProxyModel( QAbstractItemModel *sourceModel );
 
@@ -301,6 +303,7 @@ class GUI_EXPORT QgsMeshActiveDatasetGroupTreeView : public QTreeView
  */
 class GUI_EXPORT QgsMeshDatasetGroupListModel: public QAbstractListModel
 {
+    Q_OBJECT
   public:
     explicit QgsMeshDatasetGroupListModel( QObject *parent );
 

diff --git a/src/gui/mesh/qgsmeshstaticdatasetwidget.h b/src/gui/mesh/qgsmeshstaticdatasetwidget.h
@@ -35,6 +35,7 @@ class QgsMeshDataProvider;
  */
 class QgsMeshDatasetListModel: public QAbstractListModel
 {
+    Q_OBJECT
   public:
     //! Constructor
     QgsMeshDatasetListModel( QObject *parent );

diff --git a/src/gui/processing/models/qgsmodeldesignerinputstreewidget.h b/src/gui/processing/models/qgsmodeldesignerinputstreewidget.h
@@ -34,6 +34,7 @@ class QMimeData;
  */
 class QgsModelDesignerInputsTreeWidget : public QTreeWidget
 {
+    Q_OBJECT
   public:
 
     /**

diff --git a/src/gui/processing/models/qgsmodelinputreorderwidget.h b/src/gui/processing/models/qgsmodelinputreorderwidget.h
@@ -72,6 +72,7 @@ class GUI_EXPORT QgsModelInputReorderWidget : public QWidget, private Ui::QgsMod
  */
 class GUI_EXPORT QgsModelInputReorderDialog : public QDialog
 {
+    Q_OBJECT
 
   public: