| -rw-r--r-- | kabc/vcard/LangValue.cpp | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/kabc/vcard/LangValue.cpp b/kabc/vcard/LangValue.cpp index edf1804..52a0204 100644 --- a/kabc/vcard/LangValue.cpp +++ b/kabc/vcard/LangValue.cpp @@ -23,12 +23,15 @@ #include <VCardRToken.h> #include <VCardLangValue.h> #include <VCardValue.h> +//Added by qt3to4: +#include <Q3CString> +#include <Q3StrList> using namespace VCARD; LangValue::LangValue() : Value() { @@ -36,13 +39,13 @@ LangValue::LangValue() LangValue::LangValue(const LangValue & x) : Value(x) { } -LangValue::LangValue(const QCString & s) +LangValue::LangValue(const Q3CString & s) : Value(s) { } LangValue & LangValue::operator = (LangValue & x) @@ -51,13 +54,13 @@ LangValue::operator = (LangValue & x) Value::operator = (x); return *this; } LangValue & -LangValue::operator = (const QCString & s) +LangValue::operator = (const Q3CString & s) { Value::operator = (s); return *this; } bool @@ -71,13 +74,13 @@ LangValue::~LangValue() { } void LangValue::_parse() { - QStrList l; + Q3StrList l; RTokenise(strRep_, "-", l); if (l.count() == 0) return; primary_ = l.at(0); @@ -88,40 +91,41 @@ LangValue::_parse() void LangValue::_assemble() { strRep_ = primary_; - QStrListIterator it(subtags_); + Q3StrListIterator it(subtags_); - for (; it.current(); ++it) - strRep_ += QCString('-') + it.current(); + for (; it.current(); ++it) { + strRep_ += Q3CString('-'); strRep_ += it.current(); + } } - QCString + Q3CString LangValue::primary() { parse(); return primary_; } - QStrList + Q3StrList LangValue::subtags() { parse(); return subtags_; } void -LangValue::setPrimary(const QCString & s) +LangValue::setPrimary(const Q3CString & s) { parse(); primary_ = s; } void -LangValue::setSubTags(const QStrList & l) +LangValue::setSubTags(const Q3StrList & l) { parse(); subtags_ = l; } |