[libcommmhistory] Group Q_PROPERTIES the common way. Contributes to J…

…B#38781
sailfishos · Jun 26, 2020 · 0d665df · 0d665df
1 parent fb1fda5
commit 0d665df
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/src/draftsmodel.h b/src/draftsmodel.h
@@ -34,12 +34,12 @@ class LIBCOMMHISTORY_EXPORT DraftsModel : public EventModel
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(DraftsModel)
+    Q_PROPERTY(QList<int> filterGroups READ filterGroups WRITE setFilterGroups RESET clearFilterGroups NOTIFY filterGroupsChanged)
 
 public:
     DraftsModel(QObject *parent = 0);
     ~DraftsModel();
 
-    Q_PROPERTY(QList<int> filterGroups READ filterGroups WRITE setFilterGroups RESET clearFilterGroups NOTIFY filterGroupsChanged)
     QList<int> filterGroups() const;
     void setFilterGroups(const QList<int> &groupIds);
     void setFilterGroup(int groupId);

diff --git a/src/groupmanager.h b/src/groupmanager.h
@@ -48,6 +48,12 @@ class DatabaseIO;
 class LIBCOMMHISTORY_EXPORT GroupManager : public QObject
 {
     Q_OBJECT
+    Q_PROPERTY(CommHistory::EventModel::QueryMode queryMode READ queryMode WRITE setQueryMode)
+    Q_PROPERTY(int chunkSize READ chunkSize WRITE setChunkSize)
+    Q_PROPERTY(int firstChunkSize READ firstChunkSize WRITE setFirstChunkSize)
+    Q_PROPERTY(int limit READ limit WRITE setLimit)
+    Q_PROPERTY(int offset READ offset WRITE setOffset)
+    Q_PROPERTY(bool isReady READ isReady NOTIFY modelReady)
 
 public:
     enum ContactResolveType {
@@ -62,36 +68,31 @@ class LIBCOMMHISTORY_EXPORT GroupManager : public QObject
     /*!
      * Set query mode. See EventModel::setQueryMode().
      */
-    Q_PROPERTY(CommHistory::EventModel::QueryMode queryMode READ queryMode WRITE setQueryMode)
     EventModel::QueryMode queryMode() const;
     void setQueryMode(EventModel::QueryMode mode);
 
     /*!
      * Set chunk size (number of groups to fetch per request) for asynchronous
      * and streamed queries.
      */
-    Q_PROPERTY(int chunkSize READ chunkSize WRITE setChunkSize)
     int chunkSize() const;
     void setChunkSize(int size);
 
     /*!
      * Set the size of first chunk for asynchronous and streamed queries.
      */
-    Q_PROPERTY(int firstChunkSize READ firstChunkSize WRITE setFirstChunkSize)
     int firstChunkSize() const;
     void setFirstChunkSize(int size);
 
     /*!
      * Set number of groups to fetch in the next query.
      */
-    Q_PROPERTY(int limit READ limit WRITE setLimit)
     int limit() const;
     void setLimit(int limit);
 
     /*!
      * Set offset for the next query, usually used with limit
      */
-    Q_PROPERTY(int offset READ offset WRITE setOffset)
     int offset() const;
     void setOffset(int offset);
 
@@ -200,7 +201,6 @@ class LIBCOMMHISTORY_EXPORT GroupManager : public QObject
     /*!
      * True when data is loaded from the database
      */
-    Q_PROPERTY(bool isReady READ isReady NOTIFY modelReady)
     bool isReady() const;
 
     /*!

diff --git a/src/groupmodel.h b/src/groupmodel.h
@@ -50,6 +50,7 @@ class DatabaseIO;
 class LIBCOMMHISTORY_EXPORT GroupModel: public QAbstractTableModel
 {
     Q_OBJECT
+    Q_PROPERTY(QObject* manager READ manager WRITE setManager)
 
     Q_ENUMS(ColumnId)
 
@@ -101,7 +102,6 @@ class LIBCOMMHISTORY_EXPORT GroupModel: public QAbstractTableModel
      *
      * If not set, a manager will be created internally and settings copied to it.
      */
-    Q_PROPERTY(QObject* manager READ manager WRITE setManager)
     GroupManager *manager() const;
     void setManager(GroupManager *manager);
     void setManager(QObject *manager) { setManager(qobject_cast<GroupManager*>(manager)); }