diff options
| author | Andrew Branson <andrew.branson@cern.ch> | 2016-02-18 09:13:32 +0100 |
|---|---|---|
| committer | Andrew Branson <andrew.branson@cern.ch> | 2016-02-18 09:13:32 +0100 |
| commit | f4910b3ac84c72a7e17c99895a3b9abb0e9534fe (patch) | |
| tree | 91ae8cfd80dc3d7a2adedee9cab0d407c5c23c84 /rockworkd/libpebble/calendarevent.cpp | |
| parent | 7305ce8e080d0a6ee7505fe978a2e601b56a5ce8 (diff) | |
| parent | 8f014f0915c7bdc97573f953aa9a3ae25a5f953a (diff) | |
Merge branch 'rockwork'
Conflicts:
po/de.po
po/en_GB.po
po/eu.po
po/fr.po
po/hu.po
po/it.po
po/pt.po
po/rockwork.mzanetti.pot
po/ru.po
po/template.pot
rockwork/InfoPage.qml
rockwork/Main.qml
rockwork/NotificationsPage.qml
rockworkd/rockworkd.pro
version.pri
Diffstat (limited to 'rockworkd/libpebble/calendarevent.cpp')
| -rw-r--r-- | rockworkd/libpebble/calendarevent.cpp | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/rockworkd/libpebble/calendarevent.cpp b/rockworkd/libpebble/calendarevent.cpp index ea99b56..ea3a3a7 100644 --- a/rockworkd/libpebble/calendarevent.cpp +++ b/rockworkd/libpebble/calendarevent.cpp @@ -124,6 +124,16 @@ void CalendarEvent::setRecurring(bool recurring) m_recurring = recurring; } +bool CalendarEvent::isAllDay() const +{ + return m_isAllDay; +} + +void CalendarEvent::setIsAllDay(bool isAllDay) +{ + m_isAllDay = isAllDay; +} + bool CalendarEvent::operator==(const CalendarEvent &other) const { // Storing a QDateTime to QSettings seems to lose time zone information. Lets ignore the time zone when @@ -141,8 +151,8 @@ bool CalendarEvent::operator==(const CalendarEvent &other) const && m_calendar == other.calendar() && m_comment == other.comment() && m_guests == other.guests() - && m_recurring == other.recurring(); - + && m_recurring == other.recurring() + && m_isAllDay == other.isAllDay(); } void CalendarEvent::saveToCache(const QString &cachePath) const @@ -159,6 +169,7 @@ void CalendarEvent::saveToCache(const QString &cachePath) const s.setValue("comment", m_comment); s.setValue("guests", m_guests); s.setValue("recurring", m_recurring); + s.setValue("isAllDay", m_isAllDay); } void CalendarEvent::loadFromCache(const QString &cachePath, const QString &uuid) @@ -175,6 +186,7 @@ void CalendarEvent::loadFromCache(const QString &cachePath, const QString &uuid) m_comment = s.value("comment").toString(); m_guests = s.value("guests").toStringList(); m_recurring = s.value("recurring").toBool(); + m_isAllDay = s.value("isAllDay").toBool(); } void CalendarEvent::removeFromCache(const QString &cachePath) const |