-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 | |||
@@ -21,45 +21,48 @@ | |||
21 | WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | 21 | WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. |
22 | */ | 22 | */ |
23 | 23 | ||
24 | #include <VCardRToken.h> | 24 | #include <VCardRToken.h> |
25 | 25 | ||
26 | #include <VCardLangValue.h> | 26 | #include <VCardLangValue.h> |
27 | 27 | ||
28 | #include <VCardValue.h> | 28 | #include <VCardValue.h> |
29 | //Added by qt3to4: | ||
30 | #include <Q3CString> | ||
31 | #include <Q3StrList> | ||
29 | 32 | ||
30 | using namespace VCARD; | 33 | using namespace VCARD; |
31 | 34 | ||
32 | LangValue::LangValue() | 35 | LangValue::LangValue() |
33 | :Value() | 36 | :Value() |
34 | { | 37 | { |
35 | } | 38 | } |
36 | 39 | ||
37 | LangValue::LangValue(const LangValue & x) | 40 | LangValue::LangValue(const LangValue & x) |
38 | :Value(x) | 41 | :Value(x) |
39 | { | 42 | { |
40 | } | 43 | } |
41 | 44 | ||
42 | LangValue::LangValue(const QCString & s) | 45 | LangValue::LangValue(const Q3CString & s) |
43 | :Value(s) | 46 | :Value(s) |
44 | { | 47 | { |
45 | } | 48 | } |
46 | 49 | ||
47 | LangValue & | 50 | LangValue & |
48 | LangValue::operator = (LangValue & x) | 51 | LangValue::operator = (LangValue & x) |
49 | { | 52 | { |
50 | if (*this == x) return *this; | 53 | if (*this == x) return *this; |
51 | 54 | ||
52 | Value::operator = (x); | 55 | Value::operator = (x); |
53 | return *this; | 56 | return *this; |
54 | } | 57 | } |
55 | 58 | ||
56 | LangValue & | 59 | LangValue & |
57 | LangValue::operator = (const QCString & s) | 60 | LangValue::operator = (const Q3CString & s) |
58 | { | 61 | { |
59 | Value::operator = (s); | 62 | Value::operator = (s); |
60 | return *this; | 63 | return *this; |
61 | } | 64 | } |
62 | 65 | ||
63 | bool | 66 | bool |
64 | LangValue::operator == (LangValue & x) | 67 | LangValue::operator == (LangValue & x) |
65 | { | 68 | { |
@@ -69,59 +72,60 @@ LangValue::operator == (LangValue & x) | |||
69 | 72 | ||
70 | LangValue::~LangValue() | 73 | LangValue::~LangValue() |
71 | { | 74 | { |
72 | } | 75 | } |
73 | 76 | ||
74 | void | 77 | void |
75 | LangValue::_parse() | 78 | LangValue::_parse() |
76 | { | 79 | { |
77 | QStrList l; | 80 | Q3StrList l; |
78 | RTokenise(strRep_, "-", l); | 81 | RTokenise(strRep_, "-", l); |
79 | 82 | ||
80 | if (l.count() == 0) return; | 83 | if (l.count() == 0) return; |
81 | 84 | ||
82 | primary_ = l.at(0); | 85 | primary_ = l.at(0); |
83 | 86 | ||
84 | l.remove(0u); | 87 | l.remove(0u); |
85 | 88 | ||
86 | subtags_ = l; | 89 | subtags_ = l; |
87 | } | 90 | } |
88 | 91 | ||
89 | void | 92 | void |
90 | LangValue::_assemble() | 93 | LangValue::_assemble() |
91 | { | 94 | { |
92 | strRep_ = primary_; | 95 | strRep_ = primary_; |
93 | 96 | ||
94 | QStrListIterator it(subtags_); | 97 | Q3StrListIterator it(subtags_); |
95 | 98 | ||
96 | for (; it.current(); ++it) | 99 | for (; it.current(); ++it) { |
97 | strRep_ += QCString('-') + it.current(); | 100 | strRep_ += Q3CString('-'); strRep_ += it.current(); |
101 | } | ||
98 | } | 102 | } |
99 | 103 | ||
100 | QCString | 104 | Q3CString |
101 | LangValue::primary() | 105 | LangValue::primary() |
102 | { | 106 | { |
103 | parse(); | 107 | parse(); |
104 | return primary_; | 108 | return primary_; |
105 | } | 109 | } |
106 | 110 | ||
107 | QStrList | 111 | Q3StrList |
108 | LangValue::subtags() | 112 | LangValue::subtags() |
109 | { | 113 | { |
110 | parse(); | 114 | parse(); |
111 | return subtags_; | 115 | return subtags_; |
112 | } | 116 | } |
113 | 117 | ||
114 | void | 118 | void |
115 | LangValue::setPrimary(const QCString & s) | 119 | LangValue::setPrimary(const Q3CString & s) |
116 | { | 120 | { |
117 | parse(); | 121 | parse(); |
118 | primary_ = s; | 122 | primary_ = s; |
119 | } | 123 | } |
120 | 124 | ||
121 | void | 125 | void |
122 | LangValue::setSubTags(const QStrList & l) | 126 | LangValue::setSubTags(const Q3StrList & l) |
123 | { | 127 | { |
124 | parse(); | 128 | parse(); |
125 | subtags_ = l; | 129 | subtags_ = l; |
126 | } | 130 | } |
127 | 131 | ||