Merge lp:~abranson/rockwork/trunk into lp:rockwork

[Andrew Branson]

More changes to libpebble that shouldn't break RockWork. Removing orphan dependencies on Qt5Organizer, moving the UUID generation to the Notification constructor, and setting the correct parentId on Notifications. The latter should result in dismiss notifications calling back RockWork, but I don't think that will have any effect.

=== modified file 'rockworkd/libpebble/blobdb.cpp'
--- rockworkd/libpebble/blobdb.cpp	2016-02-27 22:39:19 +0000
+++ rockworkd/libpebble/blobdb.cpp	2016-03-18 11:46:49 +0000
@@ -4,7 +4,6 @@
 #include "watchdatawriter.h"
 
 #include <QDebug>
-#include <QOrganizerRecurrenceRule>
 #include <QDir>
 #include <QSettings>
 
@@ -110,10 +109,12 @@
         iconId = TimelineAttribute::IconIDNotificationGeneric;
     }
 
-    QUuid itemUuid = QUuid::createUuid();
+    QUuid itemUuid = notification.uuid();
     TimelineItem timelineItem(itemUuid, TimelineItem::TypeNotification);
     timelineItem.setFlags(TimelineItem::FlagSingleEvent);
 
+    timelineItem.setParentId(QUuid("ed429c16-f674-4220-95da-454f303f15e2"));
+
     TimelineAttribute titleAttribute(TimelineAttribute::TypeTitle, notification.sender().remove(QRegExp("<[^>]*>")).left(64).toUtf8());
     timelineItem.appendAttribute(titleAttribute);
 
@@ -153,7 +154,7 @@
     m_notificationSources.insert(itemUuid, notification);
 }
 
-void BlobDB::insertTimelinePin(const QUuid &uuid, TimelineItem::Layout layout, bool isAllDay, const QDateTime &startTime, const QDateTime &endTime, const QString &title, const QString &desctiption, const QMap<QString, QString> fields, bool recurring)
+void BlobDB::insertTimelinePin(const QUuid &uuid, TimelineItem::Layout layout, bool isAllDay, const QDateTime &startTime, const QDateTime &endTime, const QString &title, const QString &description, const QMap<QString, QString> fields, bool recurring)
 {
 //    TimelineItem item(TimelineItem::TypePin, TimelineItem::FlagSingleEvent, QDateTime::currentDateTime().addMSecs(1000 * 60 * 2), 60);
 
@@ -166,8 +167,8 @@
     TimelineAttribute titleAttribute(TimelineAttribute::TypeTitle, title.toUtf8());
     item.appendAttribute(titleAttribute);
 
-    if (!desctiption.isEmpty()) {
-        TimelineAttribute bodyAttribute(TimelineAttribute::TypeBody, desctiption.left(128).toUtf8());
+    if (!description.isEmpty()) {
+        TimelineAttribute bodyAttribute(TimelineAttribute::TypeBody, description.left(128).toUtf8());
         item.appendAttribute(bodyAttribute);
     }
 

=== modified file 'rockworkd/libpebble/blobdb.h'
--- rockworkd/libpebble/blobdb.h	2016-02-11 23:54:34 +0000
+++ rockworkd/libpebble/blobdb.h	2016-03-18 11:46:49 +0000
@@ -9,10 +9,6 @@
 
 #include <QObject>
 #include <QDateTime>
-#include <QOrganizerEvent>
-
-QTORGANIZER_USE_NAMESPACE
-
 
 class BlobDB : public QObject
 {
@@ -42,7 +38,7 @@
     explicit BlobDB(Pebble *pebble, WatchConnection *connection);
 
     void insertNotification(const Notification &notification);
-    void insertTimelinePin(const QUuid &uuid, TimelineItem::Layout layout, bool isAllDay, const QDateTime &startTime, const QDateTime &endTime, const QString &title, const QString &desctiption, const QMap<QString, QString> fields, bool recurring);
+    void insertTimelinePin(const QUuid &uuid, TimelineItem::Layout layout, bool isAllDay, const QDateTime &startTime, const QDateTime &endTime, const QString &title, const QString &description, const QMap<QString, QString> fields, bool recurring);
     void removeTimelinePin(const QUuid &uuid);
     void insertReminder();
     void clearTimeline();

=== modified file 'rockworkd/libpebble/notification.cpp'
--- rockworkd/libpebble/notification.cpp	2015-12-11 22:22:51 +0000
+++ rockworkd/libpebble/notification.cpp	2016-03-18 11:46:49 +0000
@@ -3,7 +3,17 @@
 Notification::Notification(const QString &sourceId) :
     m_sourceId(sourceId)
 {
-
+    m_uuid = QUuid::createUuid();
+}
+
+QUuid Notification::uuid() const
+{
+    return m_uuid;
+}
+
+void Notification::setUuid(QUuid uuid)
+{
+    m_uuid = uuid;
 }
 
 QString Notification::sourceId() const

=== modified file 'rockworkd/libpebble/notification.h'
--- rockworkd/libpebble/notification.h	2016-02-27 22:39:19 +0000
+++ rockworkd/libpebble/notification.h	2016-03-18 11:46:49 +0000
@@ -2,6 +2,7 @@
 #define NOTIFICATION_H
 
 #include <QString>
+#include <QUuid>
 
 class Notification
 {
@@ -26,6 +27,9 @@
 
     Notification(const QString &sourceId = QString());
 
+    QUuid uuid() const;
+    void setUuid(const QUuid id);
+
     QString sourceId() const;
     void setSourceId(const QString &sourceId);
 
@@ -48,6 +52,7 @@
     void setActToken(QString actToken);
 
 private:
+    QUuid   m_uuid;
     QString m_sourceId;
     QString m_sourceName;
     QString m_sender;

=== modified file 'rockworkd/libpebble/platforminterface.h'
--- rockworkd/libpebble/platforminterface.h	2015-12-21 03:46:24 +0000
+++ rockworkd/libpebble/platforminterface.h	2016-03-18 11:46:49 +0000
@@ -5,7 +5,6 @@
 #include "libpebble/musicmetadata.h"
 
 #include <QObject>
-#include <QOrganizerItem>
 
 class PlatformInterface: public QObject
 {

=== modified file 'rockworkd/libpebble/timelineitem.cpp'
--- rockworkd/libpebble/timelineitem.cpp	2015-12-12 23:25:54 +0000
+++ rockworkd/libpebble/timelineitem.cpp	2016-03-18 11:46:49 +0000
@@ -22,6 +22,10 @@
     return m_itemId;
 }
 
+void TimelineItem::setParentId(QUuid parentId) {
+    m_parentId = parentId;
+}
+
 void TimelineItem::setLayout(quint8 layout)
 {
     m_layout = layout;

=== modified file 'rockworkd/libpebble/timelineitem.h'
--- rockworkd/libpebble/timelineitem.h	2016-02-27 22:39:19 +0000
+++ rockworkd/libpebble/timelineitem.h	2016-03-18 11:46:49 +0000
@@ -246,6 +246,7 @@
 
     QUuid itemId() const;
 
+    void setParentId(QUuid parentId);
     void setLayout(quint8 layout);
     void setFlags(Flags flags);