-rw-r--r-- | kabc/vcard/VCardv.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kabc/vcard/VCardv.cpp b/kabc/vcard/VCardv.cpp index 49bfe43..1166aac 100644 --- a/kabc/vcard/VCardv.cpp +++ b/kabc/vcard/VCardv.cpp | |||
@@ -76,97 +76,97 @@ VCard::operator = (VCard & x) | |||
76 | 76 | ||
77 | Entity::operator = (x); | 77 | Entity::operator = (x); |
78 | return *this; | 78 | return *this; |
79 | } | 79 | } |
80 | 80 | ||
81 | VCard & | 81 | VCard & |
82 | VCard::operator = (const QCString & s) | 82 | VCard::operator = (const QCString & s) |
83 | { | 83 | { |
84 | Entity::operator = (s); | 84 | Entity::operator = (s); |
85 | return *this; | 85 | return *this; |
86 | } | 86 | } |
87 | 87 | ||
88 | bool | 88 | bool |
89 | VCard::operator == (VCard & x) | 89 | VCard::operator == (VCard & x) |
90 | { | 90 | { |
91 | x.parse(); | 91 | x.parse(); |
92 | return false; | 92 | return false; |
93 | } | 93 | } |
94 | 94 | ||
95 | VCard::~VCard() | 95 | VCard::~VCard() |
96 | { | 96 | { |
97 | } | 97 | } |
98 | 98 | ||
99 | void | 99 | void |
100 | VCard::_parse() | 100 | VCard::_parse() |
101 | { | 101 | { |
102 | 102 | ||
103 | QStringList l; | 103 | QStringList l; |
104 | QStrList sl; | 104 | QStrList sl; |
105 | 105 | ||
106 | RTokenise(strRep_, "\r\n", sl); | 106 | RTokenise(strRep_, "\r\n", sl); |
107 | 107 | ||
108 | if (sl.count() < 3) { // Invalid VCARD ! | 108 | if (sl.count() < 3) { // Invalid VCARD ! |
109 | //qDebug("invalid vcard "); | 109 | //qDebug("invalid vcard "); |
110 | return; | 110 | return; |
111 | } | 111 | } |
112 | l = QStringList::fromStrList( sl ); | 112 | l = QStringList::fromStrList( sl ); |
113 | // Get the first line | 113 | // Get the first line |
114 | QString beginLine = l[0].stripWhiteSpace(); | 114 | QString beginLine = l[0].stripWhiteSpace(); |
115 | 115 | ||
116 | // Remove extra blank lines | 116 | // Remove extra blank lines |
117 | while (l.last().isEmpty()) | 117 | while (l.last().isEmpty()) |
118 | l.remove(l.last()); | 118 | l.remove(l.last()); |
119 | 119 | ||
120 | // Now we know this is the last line | 120 | // Now we know this is the last line |
121 | QString endLine = l.last(); | 121 | QString endLine = l.last(); |
122 | 122 | ||
123 | // Trash the first and last lines as we have seen them. | 123 | // Trash the first and last lines as we have seen them. |
124 | l.remove(l.first()); | 124 | l.remove(l.begin()); |
125 | l.remove(l.last()); | 125 | l.remove(l.last()); |
126 | 126 | ||
127 | /////////////////////////////////////////////////////////////// | 127 | /////////////////////////////////////////////////////////////// |
128 | // FIRST LINE | 128 | // FIRST LINE |
129 | 129 | ||
130 | int split = beginLine.find(':'); | 130 | int split = beginLine.find(':'); |
131 | 131 | ||
132 | if (split == -1) { // invalid, no BEGIN | 132 | if (split == -1) { // invalid, no BEGIN |
133 | vDebug("No split"); | 133 | vDebug("No split"); |
134 | return; | 134 | return; |
135 | } | 135 | } |
136 | 136 | ||
137 | QString firstPart(beginLine.left(split)); | 137 | QString firstPart(beginLine.left(split)); |
138 | QString valuePart(beginLine.mid(split + 1)); | 138 | QString valuePart(beginLine.mid(split + 1)); |
139 | 139 | ||
140 | split = firstPart.find('.'); | 140 | split = firstPart.find('.'); |
141 | 141 | ||
142 | if (split != -1) { | 142 | if (split != -1) { |
143 | group_ = firstPart.left(split); | 143 | group_ = firstPart.left(split); |
144 | firstPart= firstPart.right(firstPart.length() - split - 1); | 144 | firstPart= firstPart.right(firstPart.length() - split - 1); |
145 | } | 145 | } |
146 | 146 | ||
147 | if (firstPart.left(5) != "BEGIN" ) { // No BEGIN ! | 147 | if (firstPart.left(5) != "BEGIN" ) { // No BEGIN ! |
148 | qDebug("no BEGIN in vcard "); | 148 | qDebug("no BEGIN in vcard "); |
149 | return; | 149 | return; |
150 | } | 150 | } |
151 | 151 | ||
152 | if (valuePart.left(5) != "VCARD") { // Not a vcard ! | 152 | if (valuePart.left(5) != "VCARD") { // Not a vcard ! |
153 | qDebug("not a VCARD "); | 153 | qDebug("not a VCARD "); |
154 | return; | 154 | return; |
155 | } | 155 | } |
156 | 156 | ||
157 | /////////////////////////////////////////////////////////////// | 157 | /////////////////////////////////////////////////////////////// |
158 | // CONTENT LINES | 158 | // CONTENT LINES |
159 | // | 159 | // |
160 | vDebug("Content lines"); | 160 | vDebug("Content lines"); |
161 | 161 | ||
162 | // Handle folded lines. | 162 | // Handle folded lines. |
163 | 163 | ||
164 | QStringList refolded; | 164 | QStringList refolded; |
165 | 165 | ||
166 | 166 | ||
167 | QStringList::Iterator it = l.begin(); | 167 | QStringList::Iterator it = l.begin(); |
168 | 168 | ||
169 | QString cur; | 169 | QString cur; |
170 | 170 | ||
171 | for (; it != l.end(); ++it) { | 171 | for (; it != l.end(); ++it) { |
172 | cur = (*it); | 172 | cur = (*it); |