From 707cf1bbe8f7649a3cd733cf36ea1cd6ffc0064a Mon Sep 17 00:00:00 2001
From: Felix Geyer <debfx@fobos.de>
Date: Sun, 22 Aug 2010 16:01:09 +0200
Subject: [PATCH] Some Writer fixes and add methods to actually make it write.

---
 src/core/Writer.cpp | 33 ++++++++++++++++++++++++---------
 src/core/Writer.h   |  3 ++-
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/src/core/Writer.cpp b/src/core/Writer.cpp
index 746a2056..6adf0e28 100644
--- a/src/core/Writer.cpp
+++ b/src/core/Writer.cpp
@@ -18,6 +18,7 @@
 #include "Writer.h"
 
 #include <QtCore/QBuffer>
+#include <QtCore/QFile>
 
 #include "core/Database.h"
 #include "core/Metadata.h"
@@ -33,8 +34,10 @@ Writer::Writer(Database* db)
 
 }
 
-bool Writer::write(const QString& filename)
+void Writer::write(QIODevice* device)
 {
+    m_xml.setDevice(device);
+
     m_xml.writeStartDocument("1.0", true);
 
     m_xml.writeStartElement("KeePassFile");
@@ -45,8 +48,13 @@ bool Writer::write(const QString& filename)
     m_xml.writeEndElement();
 
     m_xml.writeEndDocument();
+}
 
-    return true; // TODO
+void Writer::write(const QString& filename)
+{
+    QFile file(filename);
+    file.open(QIODevice::WriteOnly);
+    write(&file);
 }
 
 void Writer::writeMetadata()
@@ -132,6 +140,8 @@ void Writer::writeRoot()
     m_xml.writeStartElement("Root");
 
     writeGroup(m_db->rootGroup());
+    m_xml.writeStartElement("DeletedObjects");
+    m_xml.writeEndElement();
 
     m_xml.writeEndElement();
 }
@@ -143,7 +153,10 @@ void Writer::writeGroup(const Group* group)
     writeUuid("UUID", group->uuid());
     writeString("Name", group->name());
     writeNumber("IconID", group->iconNumber());
-    writeUuid("CustomIconUUID", group->iconUuid());
+
+    if (!group->iconUuid().isNull()) {
+        writeUuid("CustomIconUUID", group->iconUuid());
+    }
     writeTimes(group->timeInfo());
     writeBool("IsExpanded", group->isExpanded());
     writeString("DefaultAutoTypeSequence", group->defaultAutoTypeSequence());
@@ -176,14 +189,14 @@ void Writer::writeGroup(const Group* group)
 
     writeUuid("LastTopVisibleEntry", group->lastTopVisibleEntry());
 
-    Q_FOREACH (const Group* child, group->children()) {
-        writeGroup(child);
-    }
-
     Q_FOREACH (const Entry* entry, group->entries()) {
         writeEntry(entry);
     }
 
+    Q_FOREACH (const Group* child, group->children()) {
+        writeGroup(child);
+    }
+
     m_xml.writeEndElement();
 }
 
@@ -208,7 +221,9 @@ void Writer::writeEntry(const Entry* entry)
 
     writeUuid("UUID", entry->uuid());
     writeNumber("IconID", entry->iconNumber());
-    writeUuid("CustomIconUUID", entry->iconUuid());
+    if (!entry->iconUuid().isNull()) {
+        writeUuid("CustomIconUUID", entry->iconUuid());
+    }
     writeColor("ForegroundColor", entry->foregroundColor());
     writeColor("BackgroundColor", entry->backgroundColor());
     writeString("OverrideURL", entry->overrideUrl());
@@ -291,7 +306,7 @@ void Writer::writeBool(const QString& qualifiedName, bool b)
 
 void Writer::writeDateTime(const QString& qualifiedName, const QDateTime& dateTime)
 {
-    writeString(qualifiedName, dateTime.toString(Qt::ISODate));
+    writeString(qualifiedName, dateTime.toUTC().toString(Qt::ISODate).append('Z'));
 }
 
 void Writer::writeUuid(const QString& qualifiedName, const Uuid& uuid)
diff --git a/src/core/Writer.h b/src/core/Writer.h
index b71f06af..a6056595 100644
--- a/src/core/Writer.h
+++ b/src/core/Writer.h
@@ -37,7 +37,8 @@ class Writer : public QObject
 
 public:
     Writer(Database* db);
-    bool write(const QString& filename);
+    void write(QIODevice* device);
+    void write(const QString& filename);
 
 private:
     void writeMetadata();