diff options
Diffstat (limited to 'src/format/KdbxXmlWriter.cpp')
| -rw-r--r-- | src/format/KdbxXmlWriter.cpp | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/src/format/KdbxXmlWriter.cpp b/src/format/KdbxXmlWriter.cpp index 7aa79c47d..701c246bd 100644 --- a/src/format/KdbxXmlWriter.cpp +++ b/src/format/KdbxXmlWriter.cpp @@ -111,10 +111,10 @@ void KdbxXmlWriter::writeMetadata() writeString("DefaultUserName", m_meta->defaultUserName()); writeDateTime("DefaultUserNameChanged", m_meta->defaultUserNameChanged()); writeNumber("MaintenanceHistoryDays", m_meta->maintenanceHistoryDays()); - writeColor("Color", m_meta->color()); - writeDateTime("MasterKeyChanged", m_meta->masterKeyChanged()); - writeNumber("MasterKeyChangeRec", m_meta->masterKeyChangeRec()); - writeNumber("MasterKeyChangeForce", m_meta->masterKeyChangeForce()); + writeString("Color", m_meta->color()); + writeDateTime("MasterKeyChanged", m_meta->databaseKeyChanged()); + writeNumber("MasterKeyChangeRec", m_meta->databaseKeyChangeRec()); + writeNumber("MasterKeyChangeForce", m_meta->databaseKeyChangeForce()); writeMemoryProtection(); writeCustomIcons(); writeBool("RecycleBinEnabled", m_meta->recycleBinEnabled()); @@ -346,8 +346,8 @@ void KdbxXmlWriter::writeEntry(const Entry* entry) if (!entry->iconUuid().isNull()) { writeUuid("CustomIconUUID", entry->iconUuid()); } - writeColor("ForegroundColor", entry->foregroundColor()); - writeColor("BackgroundColor", entry->backgroundColor()); + writeString("ForegroundColor", entry->foregroundColor()); + writeString("BackgroundColor", entry->backgroundColor()); writeString("OverrideURL", entry->overrideUrl()); writeString("Tags", entry->tags()); writeTimes(entry->timeInfo()); @@ -532,18 +532,6 @@ void KdbxXmlWriter::writeBinary(const QString& qualifiedName, const QByteArray& writeString(qualifiedName, QString::fromLatin1(ba.toBase64())); } -void KdbxXmlWriter::writeColor(const QString& qualifiedName, const QColor& color) -{ - QString colorStr; - - if (color.isValid()) { - colorStr = QString("#%1%2%3").arg( - colorPartToString(color.red()), colorPartToString(color.green()), colorPartToString(color.blue())); - } - - writeString(qualifiedName, colorStr); -} - void KdbxXmlWriter::writeTriState(const QString& qualifiedName, Group::TriState triState) { QString value; |