From 317d149c89d36dfc723b2140eefc8dc75c00816c Mon Sep 17 00:00:00 2001 From: xavier Date: Sun, 1 Jul 2012 21:54:06 +0000 Subject: [PATCH] Updated the TitleBlockProperties class following DiagramContext improvements. git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@1891 bfdf4180-ca20-0410-9c96-a3a8aa849046 --- sources/titleblockproperties.cpp | 34 +++++--------------------------- 1 file changed, 5 insertions(+), 29 deletions(-) diff --git a/sources/titleblockproperties.cpp b/sources/titleblockproperties.cpp index c339a4da0..68e71ea87 100644 --- a/sources/titleblockproperties.cpp +++ b/sources/titleblockproperties.cpp @@ -75,13 +75,7 @@ void TitleBlockProperties::toXml(QDomElement &e) const { if (context.keys().count()) { QDomElement properties = e.ownerDocument().createElement("properties"); - foreach (QString key, context.keys()) { - QDomElement property = e.ownerDocument().createElement("property"); - property.setAttribute("name", key); - QDomText value = e.ownerDocument().createTextNode(context[key].toString()); - property.appendChild(value); - properties.appendChild(property); - } + context.toXml(properties); e.appendChild(properties); } } @@ -103,9 +97,8 @@ void TitleBlockProperties::fromXml(const QDomElement &e) { // reads the additional fields used to fill the title block context.clear(); - foreach (QDomElement property, QET::findInDomElement(e, "properties", "property")) { - if (!property.hasAttribute("name")) continue; - context.addValue(property.attribute("name"), QVariant(property.text())); + foreach (QDomElement e, QET::findInDomElement(e, "properties")) { + context.fromXml(e); } } @@ -120,16 +113,7 @@ void TitleBlockProperties::toSettings(QSettings &settings, const QString &prefix settings.setValue(prefix + "filename", filename); settings.setValue(prefix + "folio", folio); settings.setValue(prefix + "date", exportDate()); - - settings.beginWriteArray(prefix + "properties"); - int i = 0; - foreach (QString key, context.keys()) { - settings.setArrayIndex(i); - settings.setValue("name", key); - settings.setValue("value", context[key].toString()); - ++ i; - } - settings.endArray(); + context.toSettings(settings, prefix + "properties"); } /** @@ -143,15 +127,7 @@ void TitleBlockProperties::fromSettings(QSettings &settings, const QString &pref filename = settings.value(prefix + "filename").toString(); folio = settings.value(prefix + "folio", "%id/%total").toString(); setDateFromString(settings.value(prefix + "date").toString()); - - int size = settings.beginReadArray(prefix + "properties"); - for (int i = 0 ; i < size; ++ i) { - settings.setArrayIndex(i); - QString key = settings.value("name").toString(); - if (key.isEmpty()) continue; - context.addValue(key, settings.value("value").toString()); - } - settings.endArray(); + context.fromSettings(settings, prefix + "properties"); } /**