From f179abbb71ece440805cb5fd57b971c0feefc3eb Mon Sep 17 00:00:00 2001 From: Michael Bohlender Date: Wed, 7 Sep 2016 14:01:22 +0200 Subject: remove obsolete code from settings --- framework/settings/CMakeLists.txt | 3 --- framework/settings/maildir_resource.cpp | 32 ----------------------- framework/settings/maildir_resource.h | 29 --------------------- framework/settings/resourcelistmodel.cpp | 42 ------------------------------ framework/settings/resourcelistmodel.h | 26 ------------------ framework/settings/resourcescontroller.cpp | 12 --------- framework/settings/resourcescontroller.h | 20 -------------- 7 files changed, 164 deletions(-) delete mode 100644 framework/settings/maildir_resource.cpp delete mode 100644 framework/settings/maildir_resource.h delete mode 100644 framework/settings/resourcelistmodel.cpp delete mode 100644 framework/settings/resourcelistmodel.h delete mode 100644 framework/settings/resourcescontroller.cpp delete mode 100644 framework/settings/resourcescontroller.h (limited to 'framework/settings') diff --git a/framework/settings/CMakeLists.txt b/framework/settings/CMakeLists.txt index 9d876850..bf456138 100644 --- a/framework/settings/CMakeLists.txt +++ b/framework/settings/CMakeLists.txt @@ -1,8 +1,5 @@ set(settingsplugin_SRCS settingsplugin.cpp - # maildir_resource.cpp - # resourcelistmodel.cpp - # resourcescontroller.cpp settings.cpp ) diff --git a/framework/settings/maildir_resource.cpp b/framework/settings/maildir_resource.cpp deleted file mode 100644 index cb670295..00000000 --- a/framework/settings/maildir_resource.cpp +++ /dev/null @@ -1,32 +0,0 @@ -#include "maildir_resource.h" - -MaildirResouceController::MaildirResouceController(QObject *parent) : QObject(parent) -{ - -} - -QString MaildirResouceController::name() const -{ - return m_name; -} - -void MaildirResouceController::setName(const QString &name) -{ - if(m_name != name) { - m_name = name; - emit nameChanged(); - } -} - -QUrl MaildirResouceController::folderUrl() const -{ - return m_folderUrl; -} - -void MaildirResouceController::setFolderUrl(const QUrl &url) -{ - if(m_folderUrl != url) { - m_folderUrl = url; - emit folderUrlChanged(); - } -} diff --git a/framework/settings/maildir_resource.h b/framework/settings/maildir_resource.h deleted file mode 100644 index 1db1a1f8..00000000 --- a/framework/settings/maildir_resource.h +++ /dev/null @@ -1,29 +0,0 @@ -#pragma once - -#include -#include -#include - -class MaildirResouceController : public QObject -{ - Q_OBJECT - Q_PROPERTY (QString name READ name WRITE setName NOTIFY nameChanged) - Q_PROPERTY (QUrl folderUrl READ folderUrl WRITE setFolderUrl NOTIFY folderUrlChanged); - -public: - explicit MaildirResouceController(QObject *parent = Q_NULLPTR); - - QString name() const; - void setName(const QString &name); - - QUrl folderUrl() const; - void setFolderUrl(const QUrl &url); - -signals: - void nameChanged(); - void folderUrlChanged(); - -private: - QString m_name; - QUrl m_folderUrl; -}; \ No newline at end of file diff --git a/framework/settings/resourcelistmodel.cpp b/framework/settings/resourcelistmodel.cpp deleted file mode 100644 index 27063ebc..00000000 --- a/framework/settings/resourcelistmodel.cpp +++ /dev/null @@ -1,42 +0,0 @@ -#include "resourcelistmodel.h" - -#include - -ResourceListModel::ResourceListModel(QObject *parent) : QIdentityProxyModel() -{ - Sink::Query query; - query.syncOnDemand = false; - query.processAll = false; - query.liveQuery = true; - query.requestedProperties << "type"; - m_model = Sink::Store::loadModel(query); -} - -ResourceListModel::~ResourceListModel() -{ - -} - -QHash< int, QByteArray > ResourceListModel::roleNames() const -{ - QHash roles; - - roles[Type] = "type"; - roles[Id] = "id"; - - return roles; -} - -QVariant ResourceListModel::data(const QModelIndex& index, int role) const -{ - auto srcIdx = mapToSource(index); - switch (role) { - case Id: - return srcIdx.data(Sink::Store::DomainObjectBaseRole).value()->identifier(); - case Type: - return srcIdx.sibling(srcIdx.row(), 0).data(Qt::DisplayRole).toString(); - } - - return QIdentityProxyModel::data(index, role); -} - diff --git a/framework/settings/resourcelistmodel.h b/framework/settings/resourcelistmodel.h deleted file mode 100644 index de1b5a51..00000000 --- a/framework/settings/resourcelistmodel.h +++ /dev/null @@ -1,26 +0,0 @@ -#pragma once - -#include -#include -#include - -class ResourceListModel : public QIdentityProxyModel -{ - Q_OBJECT - -public: - ResourceListModel(QObject *parent = Q_NULLPTR); - ~ResourceListModel(); - - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; - - enum Roles { - Id = Qt::UserRole + 1, - Type - }; - - QHash roleNames() const; - -private: - QSharedPointer m_model; -}; diff --git a/framework/settings/resourcescontroller.cpp b/framework/settings/resourcescontroller.cpp deleted file mode 100644 index 03016b67..00000000 --- a/framework/settings/resourcescontroller.cpp +++ /dev/null @@ -1,12 +0,0 @@ -#include "resourcescontroller.h" - -ResourcesController::ResourcesController(QObject *parent) : QObject(parent), m_model(new ResourceListModel()) -{ - -} - - -ResourceListModel* ResourcesController::model() const -{ - return m_model.data(); -} diff --git a/framework/settings/resourcescontroller.h b/framework/settings/resourcescontroller.h deleted file mode 100644 index 0e2e89de..00000000 --- a/framework/settings/resourcescontroller.h +++ /dev/null @@ -1,20 +0,0 @@ -#pragma once - -#include "resourcelistmodel.h" - -#include -#include - -class ResourcesController : public QObject -{ - Q_OBJECT - Q_PROPERTY (ResourceListModel *model READ model CONSTANT) - -public: - explicit ResourcesController(QObject *parent = Q_NULLPTR); - - ResourceListModel *model() const; - -private: - QScopedPointer m_model; -}; -- cgit v1.2.3