5 files changed, 45 insertions, 11 deletions

diff --git a/common/domain/mail.cpp b/common/domain/mail.cpp
index 59b75ea..0170357 100644
--- a/common/domain/mail.cpp
+++ b/common/domain/mail.cpp
@@ -73,10 +73,10 @@ QSharedPointer<ReadPropertyMapper<TypeImplementation<Mail>::Buffer> > TypeImplem
     propertyMapper->addMapping<QString, Buffer>("sender", &Buffer::sender);
     propertyMapper->addMapping<QString, Buffer>("senderName", &Buffer::senderName);
     propertyMapper->addMapping<QString, Buffer>("subject", &Buffer::subject);
-    propertyMapper->addMapping<QString, Buffer>("date", &Buffer::date);
+    propertyMapper->addMapping<QDateTime, Buffer>("date", &Buffer::date);
     propertyMapper->addMapping<bool, Buffer>("unread", &Buffer::unread);
     propertyMapper->addMapping<bool, Buffer>("important", &Buffer::important);
-    propertyMapper->addMapping<QString, Buffer>("folder", &Buffer::folder);
+    propertyMapper->addMapping<QByteArray, Buffer>("folder", &Buffer::folder);
     return propertyMapper;
 }
 
@@ -87,9 +87,9 @@ QSharedPointer<WritePropertyMapper<TypeImplementation<Mail>::BufferBuilder> > Ty
     propertyMapper->addMapping<QString>("sender", &BufferBuilder::add_sender);
     propertyMapper->addMapping<QString>("senderName", &BufferBuilder::add_senderName);
     propertyMapper->addMapping<QString>("subject", &BufferBuilder::add_subject);
-    propertyMapper->addMapping<QString>("date", &BufferBuilder::add_date);
-    // propertyMapper->addMapping<bool>("unread", &BufferBuilder::add_unread);
-    // propertyMapper->addMapping<bool>("important", &BufferBuilder::add_important);
+    propertyMapper->addMapping<QDateTime>("date", &BufferBuilder::add_date);
+    propertyMapper->addMapping<bool>("unread", &BufferBuilder::add_unread);
+    propertyMapper->addMapping<bool>("important", &BufferBuilder::add_important);
     propertyMapper->addMapping<QString>("folder", &BufferBuilder::add_folder);
     return propertyMapper;
 }
diff --git a/common/propertymapper.cpp b/common/propertymapper.cpp
index 60f7dd5..17a73cb 100644
--- a/common/propertymapper.cpp
+++ b/common/propertymapper.cpp
@@ -18,6 +18,7 @@
  */
 
 #include "propertymapper.h"
+#include <QDateTime>
 
 template <>
 flatbuffers::uoffset_t variantToProperty<QString>(const QVariant &property, flatbuffers::FlatBufferBuilder &fbb)
@@ -38,6 +39,15 @@ flatbuffers::uoffset_t variantToProperty<QByteArray>(const QVariant &property, f
 }
 
 template <>
+flatbuffers::uoffset_t variantToProperty<QDateTime>(const QVariant &property, flatbuffers::FlatBufferBuilder &fbb)
+{
+    if (property.isValid()) {
+        return fbb.CreateString(property.toDateTime().toString().toStdString()).o;
+    }
+    return 0;
+}
+
+template <>
 QVariant propertyToVariant<QString>(const flatbuffers::String *property)
 {
     if (property) {
@@ -62,3 +72,13 @@ QVariant propertyToVariant<bool>(uint8_t property)
 {
     return static_cast<bool>(property);
 }
+
+template <>
+QVariant propertyToVariant<QDateTime>(const flatbuffers::String *property)
+{
+    if (property) {
+        //We have to copy the memory, otherwise it would become eventually invalid
+        return QDateTime::fromString(QString::fromStdString(property->c_str()));
+    }
+    return QVariant();
+}
diff --git a/common/propertymapper.h b/common/propertymapper.h
index 98ad397..fbde2d9 100644
--- a/common/propertymapper.h
+++ b/common/propertymapper.h
@@ -100,6 +100,16 @@ public:
     }
 
     template <typename T>
+    void addMapping(const QByteArray &name, void (BufferBuilder::*f)(uint8_t))
+    {
+        addMapping(name, [f](const QVariant &value, flatbuffers::FlatBufferBuilder &fbb) -> std::function<void(BufferBuilder &)> {
+            return [value, f](BufferBuilder &builder) {
+                (builder.*f)(value.value<T>());
+            };
+        });
+    }
+
+    template <typename T>
     void addMapping(const QByteArray &name, void (BufferBuilder::*f)(flatbuffers::Offset<flatbuffers::String>))
     {
         addMapping(name, [f](const QVariant &value, flatbuffers::FlatBufferBuilder &fbb) -> std::function<void(BufferBuilder &)> {
diff --git a/examples/client/main.cpp b/examples/client/main.cpp
index 31947e8..8e1cc80 100644
--- a/examples/client/main.cpp
+++ b/examples/client/main.cpp
@@ -115,7 +115,7 @@ static QSharedPointer<QAbstractItemModel> loadModel(const QString &type, Akonadi
         query.requestedProperties << "name" << "parent";
         model = Akonadi2::Store::loadModel<Akonadi2::ApplicationDomain::Folder>(query);
     } else if (type == "mail") {
-        query.requestedProperties << "subject" << "folder";
+        query.requestedProperties << "subject" << "folder" << "date";
         model = Akonadi2::Store::loadModel<Akonadi2::ApplicationDomain::Mail>(query);
     } else if (type == "event") {
         query.requestedProperties << "summary";
@@ -133,15 +133,19 @@ int main(int argc, char *argv[])
     QCommandLineParser cliOptions;
     cliOptions.addPositionalArgument(QObject::tr("[resource]"),
                                      QObject::tr("A resource to connect to"));
+    cliOptions.addPositionalArgument(QObject::tr("[type]"),
+                                     QObject::tr("A type to work with"));
     cliOptions.addOption(QCommandLineOption("clear"));
     cliOptions.addOption(QCommandLineOption("debuglevel"));
-    cliOptions.addOption(QCommandLineOption("type", "type to list", "type"));
+    // cliOptions.addOption(QCommandLineOption("type", "type to list", "type"));
     cliOptions.addOption(QCommandLineOption("list"));
     cliOptions.addOption(QCommandLineOption("count"));
     cliOptions.addOption(QCommandLineOption("synchronize"));
     cliOptions.addHelpOption();
     cliOptions.process(app);
-    QStringList resources = cliOptions.positionalArguments();
+    QStringList args = cliOptions.positionalArguments();
+    auto type = args.takeLast();
+    auto resources = args;
     if (resources.isEmpty()) {
         resources << "org.kde.dummy.instance1";
     }
@@ -172,7 +176,6 @@ int main(int argc, char *argv[])
     query.processAll = false;
     query.liveQuery = true;
 
-    const auto type = cliOptions.value("type");
     qDebug() << "Type: " << type;
 
     if (cliOptions.isSet("list")) {
@@ -181,8 +184,9 @@ int main(int argc, char *argv[])
         qDebug() << "Listing";
         std::cout << "\tColumn\t ";
         for (int i = 0; i < model->columnCount(QModelIndex()); i++) {
-            std::cout << "\t" << model->headerData(i, Qt::Horizontal).toString().toStdString() << std::endl;
+            std::cout << "\t" << model->headerData(i, Qt::Horizontal).toString().toStdString();
         }
+        std::cout << std::endl;
         QObject::connect(model.data(), &QAbstractItemModel::rowsInserted, [model](const QModelIndex &index, int start, int end) {
             for (int i = start; i <= end; i++) {
                 std::cout << "\tRow " << model->rowCount() << ":\t ";
diff --git a/examples/dummyresource/resourcefactory.cpp b/examples/dummyresource/resourcefactory.cpp
index a084c19..91a1229 100644
--- a/examples/dummyresource/resourcefactory.cpp
+++ b/examples/dummyresource/resourcefactory.cpp
@@ -179,7 +179,7 @@ void DummyResource::createMail(const QByteArray &ridBuffer, const QMap<QString,
     auto subject = m_fbb.CreateString(data.value("subject").toString().toStdString());
     auto sender = m_fbb.CreateString(data.value("senderEmail").toString().toStdString());
     auto senderName = m_fbb.CreateString(data.value("senderName").toString().toStdString());
-    auto date = m_fbb.CreateString(data.value("date").toDate().toString().toStdString());
+    auto date = m_fbb.CreateString(data.value("date").toDateTime().toString().toStdString());
     auto folder = m_fbb.CreateString(resolveRemoteId(ENTITY_TYPE_MAIL, data.value("parentFolder").toString(), transaction).toStdString());
 
     auto builder = Akonadi2::ApplicationDomain::Buffer::MailBuilder(m_fbb);