Diffstat (limited to 'pwmanager/pwmanager/serializer.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | pwmanager/pwmanager/serializer.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/pwmanager/pwmanager/serializer.cpp b/pwmanager/pwmanager/serializer.cpp index ed0f754..5753c1d 100644 --- a/pwmanager/pwmanager/serializer.cpp +++ b/pwmanager/pwmanager/serializer.cpp | |||
@@ -165,6 +165,8 @@ void Serializer::clear() | |||
165 | 165 | ||
166 | bool Serializer::parseXml(const QCString &buffer) | 166 | bool Serializer::parseXml(const QCString &buffer) |
167 | { | 167 | { |
168 | //abort(); | ||
169 | //qDebug("parse %s ", buffer.data()); | ||
168 | PWM_ASSERT(domDoc); | 170 | PWM_ASSERT(domDoc); |
169 | #ifndef PWM_EMBEDDED | 171 | #ifndef PWM_EMBEDDED |
170 | if (!domDoc->setContent(buffer, true)) | 172 | if (!domDoc->setContent(buffer, true)) |
@@ -356,6 +358,7 @@ bool Serializer::extractEntry(const QDomNode &n, | |||
356 | } | 358 | } |
357 | if (text == " ") | 359 | if (text == " ") |
358 | text = ""; // for backward compatibility. | 360 | text = ""; // for backward compatibility. |
361 | //qDebug("entry %s ",unescapeEntryData(text).latin1()); | ||
359 | if (name == ENTRY_DESC_NEW || | 362 | if (name == ENTRY_DESC_NEW || |
360 | name == ENTRY_DESC_OLD) { | 363 | name == ENTRY_DESC_OLD) { |
361 | dta->desc = unescapeEntryData(text).latin1(); | 364 | dta->desc = unescapeEntryData(text).latin1(); |
@@ -701,9 +704,14 @@ QString Serializer::unescapeEntryData(QString dta) | |||
701 | dta.replace("$>--endl--<$", "\n"); | 704 | dta.replace("$>--endl--<$", "\n"); |
702 | dta.replace("||>", "]]>"); | 705 | dta.replace("||>", "]]>"); |
703 | #else | 706 | #else |
707 | #ifdef DESKTOP_VERSION | ||
708 | dta.replace("$>--endl--<$", "\n"); | ||
709 | dta.replace("||>", "]]>"); | ||
710 | #else | ||
704 | dta.replace(QRegExp("\\$>--endl--<\\$"), "\n"); | 711 | dta.replace(QRegExp("\\$>--endl--<\\$"), "\n"); |
705 | dta.replace(QRegExp("||>"), "]]>"); | 712 | dta.replace(QRegExp("||>"), "]]>"); |
706 | #endif | 713 | #endif |
714 | #endif | ||
707 | return dta; | 715 | return dta; |
708 | } | 716 | } |
709 | 717 | ||