Move some invokables to properties

qgis · Apr 17, 2024 · 37af25e · 37af25e
1 parent 5d796e9
commit 37af25e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/core/qgsfields.h b/src/core/qgsfields.h
@@ -45,6 +45,10 @@ class CORE_EXPORT  QgsFields
 {
     Q_GADGET
 
+    Q_PROPERTY( bool isEmpty READ isEmpty )
+    Q_PROPERTY( int count READ count )
+    Q_PROPERTY( QStringList names READ names )
+
   public:
 
     enum FieldOrigin
@@ -144,10 +148,10 @@ class CORE_EXPORT  QgsFields
     void extend( const QgsFields &other );
 
     //! Checks whether the container is empty
-    Q_INVOKABLE bool isEmpty() const;
+    bool isEmpty() const;
 
     //! Returns number of items
-    Q_INVOKABLE int count() const;
+    int count() const;
 
 #ifdef SIP_RUN
     int __len__() const;
@@ -163,12 +167,12 @@ class CORE_EXPORT  QgsFields
 #endif
 
     //! Returns number of items
-    Q_INVOKABLE int size() const;
+    int size() const;
 
     /**
      * Returns a list with field names
      */
-    Q_INVOKABLE QStringList names() const;
+    QStringList names() const;
 
     /**
      * Returns if a field index is valid

diff --git a/src/core/vector/qgsvectorlayer.h b/src/core/vector/qgsvectorlayer.h
@@ -405,6 +405,7 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer, public QgsExpressionConte
     Q_PROPERTY( QgsEditFormConfig editFormConfig READ editFormConfig WRITE setEditFormConfig NOTIFY editFormConfigChanged )
     Q_PROPERTY( bool readOnly READ isReadOnly WRITE setReadOnly NOTIFY readOnlyChanged )
     Q_PROPERTY( bool supportsEditing READ supportsEditing NOTIFY supportsEditingChanged )
+    Q_PROPERTY( QgsFields fields READ fields NOTIFY updatedFields )
 
   public:
 
@@ -1660,7 +1661,7 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer, public QgsExpressionConte
      *
      * \returns A list of fields
      */
-    Q_INVOKABLE QgsFields fields() const FINAL;
+    QgsFields fields() const FINAL;
 
     /**
      * Returns list of attribute indexes. i.e. a list from 0 ... fieldCount()