Move Models code to namespace

8 files changed, 28 insertions, 33 deletions

diff --git a/src/gui/activitywidget.cpp b/src/gui/activitywidget.cpp
index b6abe1263..c99cbc6ab 100644
--- a/src/gui/activitywidget.cpp
+++ b/src/gui/activitywidget.cpp
@@ -61,7 +61,7 @@ ActivityWidget::ActivityWidget(QWidget *parent)
     _ui->setupUi(this);
 
     _model = new ActivityListModel(this);
-    _sortModel = new SignalledQSortFilterProxyModel(this);
+    _sortModel = new Models::SignalledQSortFilterProxyModel(this);
     _sortModel->setSourceModel(_model);
     _ui->_activityList->setModel(_sortModel);
     _sortModel->setSortRole(Models::UnderlyingDataRole);
@@ -112,7 +112,7 @@ ActivityWidget::ActivityWidget(QWidget *parent)
     connect(_ui->_filterButton, &QAbstractButton::clicked, this, [this] {
         ProtocolWidget::showFilterMenu(_ui->_filterButton, _sortModel, static_cast<int>(ActivityListModel::ActivityRole::Account), tr("Account"));
     });
-    connect(_sortModel, &SignalledQSortFilterProxyModel::filterChanged, this, [this]() {
+    connect(_sortModel, &Models::SignalledQSortFilterProxyModel::filterChanged, this, [this]() {
         _ui->_filterButton->setText(CommonStrings::filterButtonText(_sortModel->filterRegExp().isEmpty() ? 0 : 1));
     });
 
diff --git a/src/gui/activitywidget.h b/src/gui/activitywidget.h
index dc3c146f3..a777c4634 100644
--- a/src/gui/activitywidget.h
+++ b/src/gui/activitywidget.h
@@ -113,7 +113,7 @@ private:
     int _notificationRequestsRunning;
 
     ActivityListModel *_model;
-    SignalledQSortFilterProxyModel *_sortModel;
+    Models::SignalledQSortFilterProxyModel *_sortModel;
     QVBoxLayout *_notificationsLayout;
 };
 
diff --git a/src/gui/issueswidget.cpp b/src/gui/issueswidget.cpp
index 10fdad7d5..41e4f30bf 100644
--- a/src/gui/issueswidget.cpp
+++ b/src/gui/issueswidget.cpp
@@ -50,13 +50,13 @@ bool persistsUntilLocalDiscovery(const OCC::ProtocolItem &data)
 }
 namespace OCC {
 
-class SyncFileItemStatusSetSortFilterProxyModel : public SignalledQSortFilterProxyModel
+class SyncFileItemStatusSetSortFilterProxyModel : public Models::SignalledQSortFilterProxyModel
 {
 public:
     using StatusSet = std::array<bool, SyncFileItem::StatusCount>;
 
     explicit SyncFileItemStatusSetSortFilterProxyModel(QObject *parent = nullptr)
-        : SignalledQSortFilterProxyModel(parent)
+        : Models::SignalledQSortFilterProxyModel(parent)
     {
         resetFilter();
     }
@@ -180,11 +180,11 @@ IssuesWidget::IssuesWidget(QWidget *parent)
     });
 
     _model = new ProtocolItemModel(20000, true, this);
-    _sortModel = new SignalledQSortFilterProxyModel(this);
-    connect(_sortModel, &SignalledQSortFilterProxyModel::filterChanged, this, &IssuesWidget::filterDidChange);
+    _sortModel = new Models::SignalledQSortFilterProxyModel(this);
+    connect(_sortModel, &Models::SignalledQSortFilterProxyModel::filterChanged, this, &IssuesWidget::filterDidChange);
     _sortModel->setSourceModel(_model);
     _statusSortModel = new SyncFileItemStatusSetSortFilterProxyModel(this);
-    connect(_statusSortModel, &SignalledQSortFilterProxyModel::filterChanged, this, &IssuesWidget::filterDidChange);
+    connect(_statusSortModel, &Models::SignalledQSortFilterProxyModel::filterChanged, this, &IssuesWidget::filterDidChange);
     _statusSortModel->setSourceModel(_sortModel);
     _statusSortModel->setSortRole(Qt::DisplayRole); // Sorting should be done based on the text in the column cells, but...
     _statusSortModel->setFilterRole(Models::UnderlyingDataRole); // ... filtering should be done on the underlying enum value.
diff --git a/src/gui/issueswidget.h b/src/gui/issueswidget.h
index e3f501a24..a93e97474 100644
--- a/src/gui/issueswidget.h
+++ b/src/gui/issueswidget.h
@@ -67,7 +67,7 @@ private:
     std::function<void()> addStatusFilter(QMenu *menu);
 
     ProtocolItemModel *_model;
-    SignalledQSortFilterProxyModel *_sortModel;
+    Models::SignalledQSortFilterProxyModel *_sortModel;
     SyncFileItemStatusSetSortFilterProxyModel *_statusSortModel;
 
     Ui::IssuesWidget *_ui;
diff --git a/src/gui/models/models.cpp b/src/gui/models/models.cpp
index 0199d5e9b..8321bb03e 100644
--- a/src/gui/models/models.cpp
+++ b/src/gui/models/models.cpp
@@ -22,12 +22,7 @@
 
 #include <functional>
 
-OCC::SignalledQSortFilterProxyModel::SignalledQSortFilterProxyModel(QObject *parent)
-    : QSortFilterProxyModel(parent)
-{
-}
-
-void OCC::SignalledQSortFilterProxyModel::setFilterFixedStringSignalled(const QString &pattern)
+void OCC::Models::SignalledQSortFilterProxyModel::setFilterFixedStringSignalled(const QString &pattern)
 {
     setFilterFixedString(pattern);
     emit filterChanged();
diff --git a/src/gui/models/models.h b/src/gui/models/models.h
index 6ba5e43a6..82c89e967 100644
--- a/src/gui/models/models.h
+++ b/src/gui/models/models.h
@@ -23,19 +23,6 @@ class QMenu;
 
 namespace OCC {
 
-class SignalledQSortFilterProxyModel : public QSortFilterProxyModel
-{
-    Q_OBJECT
-
-public:
-    SignalledQSortFilterProxyModel(QObject *parent = nullptr);
-
-    void setFilterFixedStringSignalled(const QString &pattern);
-
-signals:
-    void filterChanged();
-};
-
 namespace Models {
     Q_NAMESPACE
 
@@ -45,6 +32,19 @@ namespace Models {
     };
     Q_ENUM_NS(DataRoles)
 
+    class SignalledQSortFilterProxyModel : public QSortFilterProxyModel
+    {
+        Q_OBJECT
+
+    public:
+        using QSortFilterProxyModel::QSortFilterProxyModel;
+
+        void setFilterFixedStringSignalled(const QString &pattern);
+
+    signals:
+        void filterChanged();
+    };
+
     /**
      * Returns a cvs representation of a table
      */
diff --git a/src/gui/protocolwidget.cpp b/src/gui/protocolwidget.cpp
index 30af24c7a..e9ac4f95c 100644
--- a/src/gui/protocolwidget.cpp
+++ b/src/gui/protocolwidget.cpp
@@ -51,8 +51,8 @@ ProtocolWidget::ProtocolWidget(QWidget *parent)
     // Build the model-view "stack":
     //  _model <- _sortModel <- _statusSortModel <- _tableView
     _model = new ProtocolItemModel(2000, false, this);
-    _sortModel = new SignalledQSortFilterProxyModel(this);
-    connect(_sortModel, &SignalledQSortFilterProxyModel::filterChanged, this, &ProtocolWidget::filterDidChange);
+    _sortModel = new Models::SignalledQSortFilterProxyModel(this);
+    connect(_sortModel, &Models::SignalledQSortFilterProxyModel::filterChanged, this, &ProtocolWidget::filterDidChange);
     _sortModel->setSourceModel(_model);
     _sortModel->setSortRole(Models::UnderlyingDataRole);
     _ui->_tableView->setModel(_sortModel);
@@ -95,7 +95,7 @@ ProtocolWidget::~ProtocolWidget()
  * @param columnName the name column on which the filter is done
  * @return
  */
-QMenu *ProtocolWidget::showFilterMenu(QWidget *parent, SignalledQSortFilterProxyModel *model, int role, const QString &columnName)
+QMenu *ProtocolWidget::showFilterMenu(QWidget *parent, Models::SignalledQSortFilterProxyModel *model, int role, const QString &columnName)
 {
     auto menu = new QMenu(parent);
     menu->setAttribute(Qt::WA_DeleteOnClose);
diff --git a/src/gui/protocolwidget.h b/src/gui/protocolwidget.h
index ac2dd7795..224653b79 100644
--- a/src/gui/protocolwidget.h
+++ b/src/gui/protocolwidget.h
@@ -51,7 +51,7 @@ public:
     ~ProtocolWidget() override;
 
     static void showContextMenu(QWidget *parent, ProtocolItemModel *model, const QModelIndexList &items);
-    static QMenu *showFilterMenu(QWidget *parent, SignalledQSortFilterProxyModel *model, int role, const QString &columnName);
+    static QMenu *showFilterMenu(QWidget *parent, Models::SignalledQSortFilterProxyModel *model, int role, const QString &columnName);
 
 public slots:
     void slotItemCompleted(Folder *folder, const SyncFileItemPtr &item);
@@ -62,7 +62,7 @@ private slots:
 
 private:
     ProtocolItemModel *_model;
-    SignalledQSortFilterProxyModel *_sortModel;
+    Models::SignalledQSortFilterProxyModel *_sortModel;
     Ui::ProtocolWidget *_ui;
 };
 }