author | zautrix <zautrix> | 2004-10-23 09:04:58 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-23 09:04:58 (UTC) |
commit | ba2583db0431059cd7368be23c9653e81af16d29 (patch) (side-by-side diff) | |
tree | 75d4a662731651d391a5e5bb60e89d1245781593 /pwmanager/pwmanager/serializer.cpp | |
parent | eb0bc46bfbba45a84c7353f1c9c4dba27273f021 (diff) | |
download | kdepimpi-ba2583db0431059cd7368be23c9653e81af16d29.zip kdepimpi-ba2583db0431059cd7368be23c9653e81af16d29.tar.gz kdepimpi-ba2583db0431059cd7368be23c9653e81af16d29.tar.bz2 |
fixed desktop descape bug. added statusbar to embedded and desktop
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() bool Serializer::parseXml(const QCString &buffer) { + //abort(); + //qDebug("parse %s ", buffer.data()); PWM_ASSERT(domDoc); #ifndef PWM_EMBEDDED if (!domDoc->setContent(buffer, true)) @@ -356,6 +358,7 @@ bool Serializer::extractEntry(const QDomNode &n, } if (text == " ") text = ""; // for backward compatibility. + //qDebug("entry %s ",unescapeEntryData(text).latin1()); if (name == ENTRY_DESC_NEW || name == ENTRY_DESC_OLD) { dta->desc = unescapeEntryData(text).latin1(); @@ -701,9 +704,14 @@ QString Serializer::unescapeEntryData(QString dta) dta.replace("$>--endl--<$", "\n"); dta.replace("||>", "]]>"); #else +#ifdef DESKTOP_VERSION + dta.replace("$>--endl--<$", "\n"); + dta.replace("||>", "]]>"); +#else dta.replace(QRegExp("\\$>--endl--<\\$"), "\n"); dta.replace(QRegExp("||>"), "]]>"); #endif +#endif return dta; } |