Since the refactoring this is no longer an QAbstractTableModel

Author: TheOneRing

src/gui/folderstatusmodel.cpp

@@ -181,7 +181,7 @@ namespace {
 
 
 FolderStatusModel::FolderStatusModel(QObject *parent)
-    : QAbstractTableModel(parent)
+    : QAbstractListModel(parent)
     , _accountState(nullptr)
 {
 }
@@ -342,11 +342,6 @@ Folder *FolderStatusModel::folder(const QModelIndex &index) const
     return _folders.at(index.row())->_folder;
 }
 
-int FolderStatusModel::columnCount(const QModelIndex &) const
-{
-    return 1;
-}
-
 int FolderStatusModel::rowCount(const QModelIndex &parent) const
 {
     Q_ASSERT(!parent.isValid());

src/gui/folderstatusmodel.h

@@ -40,7 +40,7 @@ namespace {
  * @brief The FolderStatusModel class
  * @ingroup gui
  */
-class FolderStatusModel : public QAbstractTableModel
+class FolderStatusModel : public QAbstractListModel
 {
     Q_OBJECT
     QML_ELEMENT
@@ -65,11 +65,10 @@ class FolderStatusModel : public QAbstractTableModel
     ~FolderStatusModel() override;
     void setAccountState(const AccountStatePtr &accountState);
 
-    QVariant data(const QModelIndex &index, int role) const override;
     Folder *folder(const QModelIndex &index) const;
-    int columnCount(const QModelIndex &parent = QModelIndex()) const override;
-    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
 
+    QVariant data(const QModelIndex &index, int role) const override;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
     QHash<int, QByteArray> roleNames() const override;
 
 public Q_SLOTS:

src/gui/spaces/spacesmodel.cpp

@@ -22,7 +22,7 @@
 using namespace OCC::Spaces;
 
 SpacesModel::SpacesModel(QObject *parent)
-    : QAbstractTableModel(parent)
+    : QAbstractListModel(parent)
 {
 }
 
@@ -34,15 +34,6 @@ int SpacesModel::rowCount(const QModelIndex &parent) const
     return static_cast<int>(_spacesList.size());
 }
 
-int SpacesModel::columnCount(const QModelIndex &parent) const
-{
-    Q_ASSERT(checkIndex(parent));
-    if (parent.isValid()) {
-        return 0;
-    }
-    return 1;
-}
-
 QVariant SpacesModel::data(const QModelIndex &index, int role) const
 {
     Q_ASSERT(checkIndex(index, QAbstractItemModel::CheckIndexOption::IndexIsValid));

src/gui/spaces/spacesmodel.h

@@ -23,7 +23,7 @@ class Space;
 };
 
 namespace OCC::Spaces {
-class SpacesModel : public QAbstractTableModel
+class SpacesModel : public QAbstractListModel
 {
     Q_OBJECT
 
@@ -43,14 +43,11 @@ class SpacesModel : public QAbstractTableModel
     explicit SpacesModel(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;
+    QHash<int, QByteArray> roleNames() const override;
 
     void setSpacesManager(GraphApi::SpacesManager *spacesManager);
 
-    QHash<int, QByteArray> roleNames() const override;
-
 private:
     GraphApi::SpacesManager *_spacesManager = nullptr;
     QVector<GraphApi::Space *> _spacesList;