[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [plasma-framework] src/declarativeimports/calendar: [calendar] Move the plugin library to KDeclarati
From: Martin Klapetek <mklapetek () kde ! org>
Date: 2015-11-16 19:26:50
Message-ID: E1ZyPQQ-0005mk-2U () scm ! kde ! org
[Download RAW message or body]
Git commit 520837a07c5e19b8c13f7db5c08ccf13a0722110 by Martin Klapetek.
Committed on 16/11/2015 at 19:26.
Pushed by mklapetek into branch 'master'.
[calendar] Move the plugin library to KDeclarative
Marco is not happy with the plugin being here and having a Plasma
namespace, so after some discussion it was decided to move it to
KDeclarative and change to CalendarEvents namespace.
M +1 -3 src/declarativeimports/calendar/CMakeLists.txt
M +5 -5 src/declarativeimports/calendar/daysmodel.cpp
M +5 -5 src/declarativeimports/calendar/daysmodel.h
M +4 -4 src/declarativeimports/calendar/eventdatadecorator.cpp
M +3 -3 src/declarativeimports/calendar/eventdatadecorator.h
M +7 -6 src/declarativeimports/calendar/eventpluginsmanager.cpp
M +5 -5 src/declarativeimports/calendar/eventpluginsmanager.h
D +0 -58 src/declarativeimports/calendar/plasmacalendarintegration/CMakeLists.txt
D +0 -5 src/declarativeimports/calendar/plasmacalendarintegration/PlasmaCalendarIntegrationConfig.cmake.in
D +0 -35 src/declarativeimports/calendar/plasmacalendarintegration/calendareventsplugin.cpp
D +0 -233 src/declarativeimports/calendar/plasmacalendarintegration/calendareventsplugin.h
D +0 -170 src/declarativeimports/calendar/plasmacalendarintegration/eventdata_p.cpp
D +0 -37 src/declarativeimports/calendar/plasmacalendarintegration/plasmacalendarintegration_export.h
http://commits.kde.org/plasma-framework/520837a07c5e19b8c13f7db5c08ccf13a0722110
diff --git a/src/declarativeimports/calendar/CMakeLists.txt \
b/src/declarativeimports/calendar/CMakeLists.txt index 4aac02d..93d9c14 100644
--- a/src/declarativeimports/calendar/CMakeLists.txt
+++ b/src/declarativeimports/calendar/CMakeLists.txt
@@ -19,10 +19,8 @@ target_link_libraries(calendarplugin
Qt5::Qml
Qt5::Gui
KF5::I18n
- plasmacalendarintegration
+ KF5::CalendarEvents
)
install(TARGETS calendarplugin DESTINATION \
${KDE_INSTALL_QMLDIR}/org/kde/plasma/calendar) install(DIRECTORY qml/ DESTINATION \
${KDE_INSTALL_QMLDIR}/org/kde/plasma/calendar)
-
-add_subdirectory(plasmacalendarintegration)
diff --git a/src/declarativeimports/calendar/daysmodel.cpp \
b/src/declarativeimports/calendar/daysmodel.cpp index 8500b1f..8d9f998 100644
--- a/src/declarativeimports/calendar/daysmodel.cpp
+++ b/src/declarativeimports/calendar/daysmodel.cpp
@@ -101,20 +101,20 @@ void DaysModel::update()
const QDate modelFirstDay(m_data->at(0).yearNumber, m_data->at(0).monthNumber, \
m_data->at(0).dayNumber);
if (m_pluginsManager) {
- Q_FOREACH (Plasma::CalendarEventsPlugin *eventsPlugin, \
m_pluginsManager->plugins()) { + Q_FOREACH \
(CalendarEvents::CalendarEventsPlugin *eventsPlugin, \
m_pluginsManager->plugins()) {
eventsPlugin->loadEventsForDateRange(modelFirstDay, \
modelFirstDay.addDays(42)); }
}
}
-void DaysModel::onDataReady(const QMultiHash<QDate, Plasma::EventData> &data)
+void DaysModel::onDataReady(const QMultiHash<QDate, CalendarEvents::EventData> \
&data) {
m_eventsData.reserve(m_eventsData.size() + data.size());
m_eventsData += data;
layoutChanged();
}
-void DaysModel::onEventModified(const Plasma::EventData &data)
+void DaysModel::onEventModified(const CalendarEvents::EventData &data)
{
QList<QDate> updatesList;
auto i = m_eventsData.begin();
@@ -176,10 +176,10 @@ QList<QObject*> DaysModel::eventsForDate(const QDate &date)
qDeleteAll(m_qmlData);
m_qmlData.clear();
- const QList<Plasma::EventData> events = m_eventsData.values(date);
+ const QList<CalendarEvents::EventData> events = m_eventsData.values(date);
m_qmlData.reserve(events.size());
- Q_FOREACH (const Plasma::EventData &event, events) {
+ Q_FOREACH (const CalendarEvents::EventData &event, events) {
m_qmlData << new EventDataDecorator(event, this);
}
diff --git a/src/declarativeimports/calendar/daysmodel.h \
b/src/declarativeimports/calendar/daysmodel.h index 9f44390..6e9282c 100644
--- a/src/declarativeimports/calendar/daysmodel.h
+++ b/src/declarativeimports/calendar/daysmodel.h
@@ -23,7 +23,7 @@
#include <QAbstractListModel>
#include "daydata.h"
-#include "plasmacalendarintegration/calendareventsplugin.h"
+#include <CalendarEvents/CalendarEventsPlugin>
class EventPluginsManager;
@@ -58,8 +58,8 @@ Q_SIGNALS:
void agendaUpdated(const QDate &updatedDate);
private Q_SLOTS:
- void onDataReady(const QMultiHash<QDate, Plasma::EventData> &data);
- void onEventModified(const Plasma::EventData &data);
+ void onDataReady(const QMultiHash<QDate, CalendarEvents::EventData> &data);
+ void onEventModified(const CalendarEvents::EventData &data);
void onEventRemoved(const QString &uid);
private:
@@ -69,8 +69,8 @@ private:
QList<DayData> *m_data;
QList<QObject*> m_qmlData;
QDate m_lastRequestedAgendaDate;
- QList<Plasma::CalendarEventsPlugin*> m_eventPlugins;
- QMultiHash<QDate, Plasma::EventData> m_eventsData;
+ QList<CalendarEvents::CalendarEventsPlugin*> m_eventPlugins;
+ QMultiHash<QDate, CalendarEvents::EventData> m_eventsData;
bool m_agendaNeedsUpdate;
};
diff --git a/src/declarativeimports/calendar/eventdatadecorator.cpp \
b/src/declarativeimports/calendar/eventdatadecorator.cpp index ac450f2..421f4a3 \
100644
--- a/src/declarativeimports/calendar/eventdatadecorator.cpp
+++ b/src/declarativeimports/calendar/eventdatadecorator.cpp
@@ -21,7 +21,7 @@
#include <KLocalizedString>
-EventDataDecorator::EventDataDecorator(const Plasma::EventData &data, QObject \
*parent) +EventDataDecorator::EventDataDecorator(const CalendarEvents::EventData \
&data, QObject *parent) : QObject(parent),
m_data(data)
{
@@ -60,11 +60,11 @@ QString EventDataDecorator::description() const
QString EventDataDecorator::eventType() const
{
switch (m_data.type()) {
- case Plasma::EventData::Holiday:
+ case CalendarEvents::EventData::Holiday:
return i18nc("Agenda listview section title", "Holidays");
- case Plasma::EventData::Event:
+ case CalendarEvents::EventData::Event:
return i18nc("Agenda listview section title", "Events");
- case Plasma::EventData::Todo:
+ case CalendarEvents::EventData::Todo:
return i18nc("Agenda listview section title", "Todo");
}
return i18nc("Means 'Other calendar items'", "Other");
diff --git a/src/declarativeimports/calendar/eventdatadecorator.h \
b/src/declarativeimports/calendar/eventdatadecorator.h index 622c697..de492ed 100644
--- a/src/declarativeimports/calendar/eventdatadecorator.h
+++ b/src/declarativeimports/calendar/eventdatadecorator.h
@@ -24,7 +24,7 @@
#include <QDateTime>
#include <QString>
-#include "plasmacalendarintegration/calendareventsplugin.h"
+#include <CalendarEvents/CalendarEventsPlugin>
class EventDataDecorator : public QObject
{
@@ -39,7 +39,7 @@ class EventDataDecorator : public QObject
Q_PROPERTY(QString eventType READ eventType NOTIFY eventDataChanged)
public:
- EventDataDecorator(const Plasma::EventData &data, QObject *parent = Q_NULLPTR);
+ EventDataDecorator(const CalendarEvents::EventData &data, QObject *parent = \
Q_NULLPTR);
QDateTime startDateTime() const;
QDateTime endDateTime() const;
@@ -54,7 +54,7 @@ Q_SIGNALS:
void eventDataChanged();
private:
- Plasma::EventData m_data;
+ CalendarEvents::EventData m_data;
};
#endif
diff --git a/src/declarativeimports/calendar/eventpluginsmanager.cpp \
b/src/declarativeimports/calendar/eventpluginsmanager.cpp index 20f648f..7cf2532 \
100644
--- a/src/declarativeimports/calendar/eventpluginsmanager.cpp
+++ b/src/declarativeimports/calendar/eventpluginsmanager.cpp
@@ -18,7 +18,8 @@
*/
#include "eventpluginsmanager.h"
-#include "plasmacalendarintegration/calendareventsplugin.h"
+
+#include <CalendarEvents/CalendarEventsPlugin>
#include <QCoreApplication>
#include <QAbstractListModel>
@@ -213,18 +214,18 @@ void EventPluginsManager::loadPlugin(const QString \
&absolutePath)
QObject *obj = loader.instance();
if (obj) {
- Plasma::CalendarEventsPlugin *eventsPlugin = \
qobject_cast<Plasma::CalendarEventsPlugin*>(obj); + \
CalendarEvents::CalendarEventsPlugin *eventsPlugin = \
qobject_cast<CalendarEvents::CalendarEventsPlugin*>(obj); if (eventsPlugin) {
qDebug() << "Loading Calendar plugin" << eventsPlugin;
eventsPlugin->setProperty("pluginPath", absolutePath);
m_plugins << eventsPlugin;
// Connect the relay signals
- connect(eventsPlugin, &Plasma::CalendarEventsPlugin::dataReady,
+ connect(eventsPlugin, &CalendarEvents::CalendarEventsPlugin::dataReady,
this, &EventPluginsManager::dataReady);
- connect(eventsPlugin, &Plasma::CalendarEventsPlugin::eventModified,
+ connect(eventsPlugin, \
&CalendarEvents::CalendarEventsPlugin::eventModified, this, \
&EventPluginsManager::eventModified);
- connect(eventsPlugin, &Plasma::CalendarEventsPlugin::eventRemoved,
+ connect(eventsPlugin, \
&CalendarEvents::CalendarEventsPlugin::eventRemoved, this, \
&EventPluginsManager::eventRemoved); } else {
// not our/valid plugin, so unload it
@@ -235,7 +236,7 @@ void EventPluginsManager::loadPlugin(const QString &absolutePath)
}
}
-QList<Plasma::CalendarEventsPlugin*> EventPluginsManager::plugins() const
+QList<CalendarEvents::CalendarEventsPlugin*> EventPluginsManager::plugins() const
{
return m_plugins;
}
diff --git a/src/declarativeimports/calendar/eventpluginsmanager.h \
b/src/declarativeimports/calendar/eventpluginsmanager.h index 546d9ec..aba0fcf 100644
--- a/src/declarativeimports/calendar/eventpluginsmanager.h
+++ b/src/declarativeimports/calendar/eventpluginsmanager.h
@@ -24,7 +24,7 @@
#include <QMap>
#include <QStringList>
-namespace Plasma {
+namespace CalendarEvents {
class CalendarEventsPlugin;
class EventData;
}
@@ -41,7 +41,7 @@ public:
EventPluginsManager(QObject *parent = 0);
~EventPluginsManager();
- QList<Plasma::CalendarEventsPlugin*> plugins() const;
+ QList<CalendarEvents::CalendarEventsPlugin*> plugins() const;
QAbstractListModel* pluginsModel() const;
// This is a helper function to set which plugins
@@ -59,8 +59,8 @@ Q_SIGNALS:
// These three signals below are used for relaying the
// plugin signals so that the EventPluginsManager don't
// have to worry about connecting to newly loaded plugins
- void dataReady(const QMultiHash<QDate, Plasma::EventData> &data);
- void eventModified(const Plasma::EventData &modifiedEvent);
+ void dataReady(const QMultiHash<QDate, CalendarEvents::EventData> &data);
+ void eventModified(const CalendarEvents::EventData &modifiedEvent);
void eventRemoved(const QString &uid);
private:
@@ -68,7 +68,7 @@ private:
friend class EventPluginsModel;
EventPluginsModel *m_model;
- QList<Plasma::CalendarEventsPlugin*> m_plugins;
+ QList<CalendarEvents::CalendarEventsPlugin*> m_plugins;
QMap<QString, QJsonObject> m_availablePlugins;
QStringList m_enabledPlugins;
};
diff --git a/src/declarativeimports/calendar/plasmacalendarintegration/CMakeLists.txt \
b/src/declarativeimports/calendar/plasmacalendarintegration/CMakeLists.txt deleted \
file mode 100644 index aab860c..0000000
--- a/src/declarativeimports/calendar/plasmacalendarintegration/CMakeLists.txt
+++ /dev/null
@@ -1,58 +0,0 @@
-project(plasma-calendar-integration)
-
-set(CMAKECONFIG_INSTALL_DIR \
"${CMAKECONFIG_INSTALL_PREFIX}/PlasmaCalendarIntegration")
-
-set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
-
-include(ECMPackageConfigHelpers)
-include(ECMSetupVersion)
-include(CMakePackageConfigHelpers)
-include(WriteBasicConfigVersionFile)
-include(KDECMakeSettings)
-
-ecm_setup_version(${PROJECT_VERSION}
- VARIABLE_PREFIX PLASMACALENDARINTEGRATION
- VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/plasmacalendarintegration_version.h"
- PACKAGE_VERSION_FILE \
"${CMAKE_CURRENT_BINARY_DIR}/PlasmaCalendarIntegrationConfigVersion.cmake"
- SOVERSION 1)
-
-set(calendar-integration_SRCS
- calendareventsplugin.cpp
- eventdata_p.cpp
-)
-
-add_library(plasmacalendarintegration SHARED ${calendar-integration_SRCS})
-
-target_link_libraries(plasmacalendarintegration
- Qt5::Core
-)
-
-target_include_directories(plasmacalendarintegration INTERFACE \
"$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}/PlasmaCalendarIntegration>")
-set_target_properties(plasmacalendarintegration PROPERTIES VERSION \
${PROJECT_VERSION}
- SOVERSION 1
- EXPORT_NAME \
PlasmaCalendarIntegration
-)
-
-ecm_configure_package_config_file(
- "${CMAKE_CURRENT_SOURCE_DIR}/PlasmaCalendarIntegrationConfig.cmake.in"
- "${CMAKE_CURRENT_BINARY_DIR}/PlasmaCalendarIntegrationConfig.cmake"
- INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
-)
-
-install(FILES
- "${CMAKE_CURRENT_BINARY_DIR}/PlasmaCalendarIntegrationConfig.cmake"
- "${CMAKE_CURRENT_BINARY_DIR}/PlasmaCalendarIntegrationConfigVersion.cmake"
- DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
- COMPONENT Devel
-)
-
-install(TARGETS plasmacalendarintegration EXPORT PlasmaCalendarIntegrationTargets \
${INSTALL_TARGETS_DEFAULT_ARGS})
-
-install(EXPORT PlasmaCalendarIntegrationTargets DESTINATION \
"${CMAKECONFIG_INSTALL_DIR}" FILE \
PlasmaCalendarIntegrationTargets.cmake)
-
-install (FILES
- calendareventsplugin.h
- plasmacalendarintegration_export.h
- ${CMAKE_CURRENT_BINARY_DIR}/plasmacalendarintegration_version.h
- DESTINATION ${INCLUDE_INSTALL_DIR}/PlasmaCalendarIntegration COMPONENT Devel
-)
diff --git a/src/declarativeimports/calendar/plasmacalendarintegration/PlasmaCalendarIntegrationConfig.cmake.in \
b/src/declarativeimports/calendar/plasmacalendarintegration/PlasmaCalendarIntegrationConfig.cmake.in
deleted file mode 100644
index 55813ad..0000000
--- a/src/declarativeimports/calendar/plasmacalendarintegration/PlasmaCalendarIntegrationConfig.cmake.in
+++ /dev/null
@@ -1,5 +0,0 @@
-@PACKAGE_INIT@
-
-find_dependency(Qt5Core @REQUIRED_QT_VERSION@)
-
-include("${CMAKE_CURRENT_LIST_DIR}/PlasmaCalendarIntegrationTargets.cmake")
diff --git a/src/declarativeimports/calendar/plasmacalendarintegration/calendareventsplugin.cpp \
b/src/declarativeimports/calendar/plasmacalendarintegration/calendareventsplugin.cpp \
deleted file mode 100644 index 39a026f..0000000
--- a/src/declarativeimports/calendar/plasmacalendarintegration/calendareventsplugin.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- Copyright (C) 2015 Martin Klapetek <mklapetek@kde.org>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-*/
-
-#include "calendareventsplugin.h"
-
-namespace Plasma {
-
-CalendarEventsPlugin::CalendarEventsPlugin(QObject *parent)
- : QObject(parent)
-{
-
-}
-
-CalendarEventsPlugin::~CalendarEventsPlugin()
-{
-
-}
-
-}
diff --git a/src/declarativeimports/calendar/plasmacalendarintegration/calendareventsplugin.h \
b/src/declarativeimports/calendar/plasmacalendarintegration/calendareventsplugin.h \
deleted file mode 100644 index f73f3a9..0000000
--- a/src/declarativeimports/calendar/plasmacalendarintegration/calendareventsplugin.h
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
- Copyright (C) 2015 Martin Klapetek <mklapetek@kde.org>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-*/
-
-#ifndef CALENDAREVENTSPLUGIN_H
-#define CALENDAREVENTSPLUGIN_H
-
-#include <QObject>
-#include <QDateTime>
-#include <QMultiHash>
-#include <QSharedDataPointer>
-
-#include "plasmacalendarintegration_export.h"
-
-namespace Plasma {
-
-class PLASMACALENDARINTEGRATION_EXPORT EventData
-{
-public:
- enum EventType {
- Holiday, // Any holiday
- Event, // General event
- Todo // A Todo item
- };
-
- EventData();
- EventData(const EventData &other);
- ~EventData();
-
- EventData &operator=(const EventData &other);
-
- /**
- * The start date and time of this event
- */
- QDateTime startDateTime() const;
-
- /**
- * Set the start date-time of this event
- *
- * @param startDateTime the date-time of when the event is starting
- */
- void setStartDateTime(const QDateTime &startDateTime);
-
- /**
- * The end date and time of this event
- */
- QDateTime endDateTime() const;
-
- /**
- * Set the end date-time of this event
- *
- * @param endDateTime the date-time of when the event is ending
- */
- void setEndDateTime(const QDateTime &endDateTime);
-
- /**
- * If true, this event goes on the whole day (eg. a holiday)
- */
- bool isAllDay() const;
-
- /**
- * If set to true, it will be displayed in the Calendar agenda
- * without any time besides it, marked as "going on all day"
- *
- * This is useful for single-day events only, for multiple-day
- * events, leave to false (default)
- *
- * @param isAllDay set to true if the event takes all day, false otherwise
- * (defaults to false)
- */
- void setIsAllDay(bool isAllDay);
-
- /**
- * If true, this event won't mark the day in the calendar grid
- * The main purpose for this flag is to support
- * namedays, where in some countries the calendars have
- * different name in them every day. This is just a minor holiday
- * and as such should not mark the calendar grid, otherwise
- * the whole grid would be in a different color.
- */
- bool isMinor() const;
-
- /**
- * If set to true, it won't be marked in the calendar grid
- *
- * @param isMinor true if it's a minor event (like a nameday holiday),
- * false otherwise (defaults to false)
- */
- void setIsMinor(bool isMinor);
-
- /**
- * Event title
- */
- QString title() const;
-
- /**
- * Sets the title of the event
- *
- * @param title The event title
- */
- void setTitle(const QString &title);
-
- /**
- * Event description, can provide more details about the event
- */
- QString description() const;
-
- /**
- * Sets the event description, which allows to add more details
- * about this event
- *
- * @param description The description
- */
- void setDescription(const QString &description);
-
- /**
- * Type of the current event, eg. a holiday, an event or a todo item
- */
- EventType type() const;
-
- /**
- * Sets the event type, eg. a holiday, an event or a todo item
- *
- * @param type The event type,
- */
- void setEventType(EventType type);
-
- /**
- * The color that should be used to mark this event with
- * It comes in the HTML hex format, eg. #AARRGGBB or #RRGGBB
- */
- QString eventColor() const;
-
- /**
- * This is to support various calendar colors the user might
- * have configured elsewhere
- *
- * @param color The color for this event in the HTML hex format
- * eg. #AARRGGBB or #RRGGBB (this is passed directly
- * to QML)
- */
- void setEventColor(const QString &color);
-
- /**
- * Unique ID of the event
- */
- QString uid() const;
-
- /**
- * Sets the uid of the event
- *
- * This is a mandatory field only if you want to use
- * the eventModified/eventRemoved signals, otherwise
- * setting it is optional
- *
- * @param uid A unique id, recommended is to use the plugin name as prefix (to \
keep it unique)
- */
- void setUid(const QString &uid);
-
-private:
- class Private;
- QSharedDataPointer<Private> d;
-};
-
-class PLASMACALENDARINTEGRATION_EXPORT CalendarEventsPlugin : public QObject
-{
- Q_OBJECT
-
-public:
- explicit CalendarEventsPlugin(QObject *parent = Q_NULLPTR);
- virtual ~CalendarEventsPlugin();
-
- /**
- * When this is called, the plugin should load all events data
- * between those two date ranges. Once the data are ready, it should
- * just emit the dataReady() signal. The range is usually one month
- *
- * @param startDate the start of the range
- * @param endDate the end of the range
- */
- virtual void loadEventsForDateRange(const QDate &startDate, const QDate \
&endDate) = 0;
-
-Q_SIGNALS:
- /**
- * Emitted when the plugin has loaded the events data
- *
- * @param data A hash containing a QDate key for the event
- * in the value, Plasma::EventData, which holds all
- * the details for the given event
- * It's a multihash as there can be multiple events
- * in the same day
- * For multi-day events, insert just one with the key
- * being the startdate of the event
- */
- void dataReady(const QMultiHash<QDate, Plasma::EventData> &data);
-
- /**
- * Should be emitted when there is a modification of an event
- * that was previously returned via the dataReady() signal
- *
- * @param event The modified event data
- */
- void eventModified(const Plasma::EventData &modifiedEvent);
-
- /**
- * Should be emitted when the plugin removes some event
- * from its collection
- *
- * @param uid The uid of the event that was removed
- */
- void eventRemoved(const QString &uid);
-};
-
-}
-
-Q_DECLARE_INTERFACE(Plasma::CalendarEventsPlugin, \
"org.kde.plasma.CalendarEventsPlugin")
-
-#endif
diff --git a/src/declarativeimports/calendar/plasmacalendarintegration/eventdata_p.cpp \
b/src/declarativeimports/calendar/plasmacalendarintegration/eventdata_p.cpp deleted \
file mode 100644 index 04e398a..0000000
--- a/src/declarativeimports/calendar/plasmacalendarintegration/eventdata_p.cpp
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- Copyright (C) 2015 Martin Klapetek <mklapetek@kde.org>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-*/
-
-#include "calendareventsplugin.h"
-
-#include <QSharedData>
-
-class Plasma::EventData::Private : public QSharedData {
-public:
- Private() : isAllDay(false), isMinor(false) {};
- Private(const Private &other)
- : QSharedData(other)
- {
- startDateTime = other.startDateTime;
- endDateTime = other.endDateTime;
- title = other.title;
- description = other.description;
- uid = other.uid;
- eventColor = other.eventColor;
- type = other.type;
- isAllDay = other.isAllDay;
- isMinor = other.isMinor;
- };
- ~Private() {};
- QDateTime startDateTime; // Start of the event
- QDateTime endDateTime; // End of the event
- QString title; // Title of the event
- QString description; // Additional info of the event
- QString uid; // An internal event id, useful mostly just for the \
eventModified/Removed signals
- QString eventColor; // Optional color of the event in the HTML hex \
format, eg. #AARRGGBB or #RRGGBB
- EventType type; // Type of the event
- bool isAllDay; // True if the event takes all day, then it won't be \
displayed with any time
- bool isMinor; // A minor holiday that will not create a colored \
entry in the calendar
-};
-
-//---------------------------------------------------
-
-namespace Plasma {
-
-EventData::EventData()
- : d(new Private())
-{
-}
-
-EventData::EventData(const EventData &other)
- : d(other.d)
-{
-}
-
-EventData::~EventData()
-{
-}
-
-EventData& EventData::operator=(const EventData &other)
-{
- if (this == &other) {
- return *this;
- }
-
- d = other.d;
- return *this;
-}
-
-QDateTime EventData::startDateTime() const
-{
- return d->startDateTime;
-}
-
-void EventData::setStartDateTime(const QDateTime &startDateTime)
-{
- d->startDateTime = startDateTime;
-}
-
-QDateTime EventData::endDateTime() const
-{
- return d->endDateTime;
-}
-
-void EventData::setEndDateTime(const QDateTime &endDateTime)
-{
- d->endDateTime = endDateTime;
-}
-
-bool EventData::isAllDay() const
-{
- return d->isAllDay;
-}
-
-void EventData::setIsAllDay(bool isAllDay)
-{
- d->isAllDay = isAllDay;
-}
-
-bool EventData::isMinor() const
-{
- return d->isMinor;
-}
-
-void EventData::setIsMinor(bool isMinor)
-{
- d->isMinor = isMinor;
-}
-
-QString EventData::title() const
-{
- return d->title;
-}
-
-void EventData::setTitle(const QString &title)
-{
- d->title = title;
-}
-
-QString EventData::description() const
-{
- return d->description;
-}
-
-void EventData::setDescription(const QString &description)
-{
- d->description = description;
-}
-
-QString EventData::uid() const
-{
- return d->uid;
-}
-
-void EventData::setUid(const QString &uid)
-{
- d->uid = uid;
-}
-
-EventData::EventType EventData::type() const
-{
- return d->type;
-}
-
-void EventData::setEventType(EventData::EventType type)
-{
- d->type = type;
-}
-
-QString EventData::eventColor() const
-{
- return d->eventColor;
-}
-
-void EventData::setEventColor(const QString &color)
-{
- d->eventColor = color;
-}
-
-}
diff --git a/src/declarativeimports/calendar/plasmacalendarintegration/plasmacalendarintegration_export.h \
b/src/declarativeimports/calendar/plasmacalendarintegration/plasmacalendarintegration_export.h
deleted file mode 100644
index acb66d1..0000000
--- a/src/declarativeimports/calendar/plasmacalendarintegration/plasmacalendarintegration_export.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* This file is part of the KDE project
- * Copyright (C) 2007 David Faure <faure@kde.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef PLASMACALENDARINTEGRATION_EXPORT_H
-#define PLASMACALENDARINTEGRATION_EXPORT_H
-
-#include <QtCore/QtGlobal>
-
-#ifndef PLASMACALENDARINTEGRATION_EXPORT
-/* We are building this library */
-# define PLASMACALENDARINTEGRATION_EXPORT __attribute__((visibility("default")))
-# else
-/* We are using this library */
-# define PLASMACALENDARINTEGRATION_EXPORT __attribute__((visibility("default")))
-#endif
-
-# ifndef PLASMACALENDARINTEGRATION_EXPORT_DEPRECATED
-# define PLASMACALENDARINTEGRATION_EXPORT_DEPRECATED Q_DECL_DEPRECATED \
PLASMACALENDARINTEGRATION_EXPORT
-# endif
-
-#endif
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic