diff --git a/components/calendar/CMakeLists.txt b/components/calendar/CMakeLists.txt index 5c9bc8e57..53c61725d 100644 --- a/components/calendar/CMakeLists.txt +++ b/components/calendar/CMakeLists.txt @@ -3,7 +3,6 @@ add_library(calendarplugin SHARED) target_sources(calendarplugin PRIVATE calendarplugin.cpp calendar.cpp - calendardata.cpp daysmodel.cpp eventdatadecorator.cpp eventpluginsmanager.cpp diff --git a/components/calendar/calendardata.cpp b/components/calendar/calendardata.cpp deleted file mode 100644 index 51d0b8014..000000000 --- a/components/calendar/calendardata.cpp +++ /dev/null @@ -1,76 +0,0 @@ -/* - SPDX-FileCopyrightText: 2013 Mark Gaiser - - SPDX-License-Identifier: GPL-2.0-or-later -*/ - -#include "calendardata.h" - -CalendarData::CalendarData(QObject *parent) - : QObject(parent) - , m_types(Holiday | Event | Todo | Journal) -{ - // m_etmCalendar = new ETMCalendar(); - // m_etmCalendar->setParent(this); //TODO: hit sergio - - // EntityTreeModel *model = m_etmCalendar->entityTreeModel(); - // model->setCollectionFetchStrategy(EntityTreeModel::InvisibleCollectionFetch); - - // m_itemList = new EntityMimeTypeFilterModel(this); - // m_itemList->setSourceModel(model); - - // CalendarRoleProxyModel *roleModel = new CalendarRoleProxyModel(this); - // roleModel->setSourceModel(m_itemList); - - // m_filteredList = new DateTimeRangeFilterModel(this); - // m_filteredList->setSourceModel(roleModel); - - // updateTypes(); -} - -QDate CalendarData::startDate() const -{ - return m_startDate; -} - -void CalendarData::setStartDate(const QDate &dateTime) -{ - if (m_startDate == dateTime) { - return; - } - - m_startDate = dateTime; - // m_filteredList->setStartDate(m_startDate); - Q_EMIT startDateChanged(); -} - -QDate CalendarData::endDate() const -{ - return m_endDate; -} - -void CalendarData::setEndDate(const QDate &dateTime) -{ - if (m_endDate == dateTime) { - return; - } - - m_endDate = dateTime; - // m_filteredList->setEndDate(m_endDate); - Q_EMIT endDateChanged(); -} - -int CalendarData::types() const -{ - return m_types; -} - -QString CalendarData::errorMessage() const -{ - return QString(); -} - -bool CalendarData::loading() const -{ - return false; -} diff --git a/components/calendar/calendardata.h b/components/calendar/calendardata.h deleted file mode 100644 index 756c7e6e3..000000000 --- a/components/calendar/calendardata.h +++ /dev/null @@ -1,68 +0,0 @@ -/* - SPDX-FileCopyrightText: 2013 Mark Gaiser - - SPDX-License-Identifier: GPL-2.0-or-later -*/ - -#ifndef CALENDARDATA_H -#define CALENDARDATA_H - -#include -#include -#include - -class QAbstractItemModel; - -class CalendarData : public QObject -{ - Q_OBJECT - - Q_PROPERTY(QDate startDate READ startDate WRITE setStartDate NOTIFY startDateChanged) - Q_PROPERTY(QDate endDate READ endDate WRITE setEndDate NOTIFY endDateChanged) - // Q_PROPERTY(int types READ types WRITE setTypes NOTIFY typesChanged) - Q_PROPERTY(QString errorMessage READ errorMessage NOTIFY errorMessageChanged) - Q_PROPERTY(bool loading READ loading NOTIFY loadingChanged) - // Q_PROPERTY(QAbstractItemModel* model READ model CONSTANT) - -public: - enum Type { - Holiday = 1, - Event = 2, - Todo = 4, - Journal = 8, - }; - Q_ENUM(Type) - Q_DECLARE_FLAGS(Types, Type) - - explicit CalendarData(QObject *parent = nullptr); - -Q_SIGNALS: - void startDateChanged(); - void endDateChanged(); - void typesChanged(); - void errorMessageChanged(); - void loadingChanged(); - -private: - QDate startDate() const; - void setStartDate(const QDate &dateTime); - QDate endDate() const; - void setEndDate(const QDate &dateTime); - int types() const; - // void setTypes(int types); - QString errorMessage() const; - bool loading() const; - // QAbstractItemModel* model() const; - - // void updateTypes(); - - QDate m_startDate; - QDate m_endDate; - Types m_types; - - // Akonadi::ETMCalendar *m_etmCalendar; - // Akonadi::EntityMimeTypeFilterModel *m_itemList; - // DateTimeRangeFilterModel *m_filteredList; -}; - -#endif // CALENDARDATA_H diff --git a/components/calendar/calendarplugin.cpp b/components/calendar/calendarplugin.cpp index 1694b4f66..369199498 100644 --- a/components/calendar/calendarplugin.cpp +++ b/components/calendar/calendarplugin.cpp @@ -6,7 +6,6 @@ #include "calendarplugin.h" #include "calendar.h" -#include "calendardata.h" #include "eventdatadecorator.h" #include "eventpluginsmanager.h" @@ -25,7 +24,6 @@ static QObject *event_plugins_manager_provider(QQmlEngine *engine, QJSEngine *sc void CalendarPlugin::registerTypes(const char *uri) { Q_ASSERT(uri == QByteArray("org.kde.plasma.workspace.calendar")); - qmlRegisterType(uri, 2, 0, "CalendarData"); qmlRegisterType(uri, 2, 0, "Calendar"); qmlRegisterAnonymousType(uri, 1); qmlRegisterAnonymousType(uri, 1);