summaryrefslogtreecommitdiffabout
path: root/kabc
Unidiff
Diffstat (limited to 'kabc') (more/less context) (ignore whitespace changes)
-rw-r--r--kabc/phonenumber.cpp34
1 files changed, 15 insertions, 19 deletions
diff --git a/kabc/phonenumber.cpp b/kabc/phonenumber.cpp
index abb3b3b..041effc 100644
--- a/kabc/phonenumber.cpp
+++ b/kabc/phonenumber.cpp
@@ -181,53 +181,49 @@ QString PhoneNumber::typeLabel( int type )
181 typeString += i18n("Home"); 181 typeString += i18n("Home");
182 else if ((type & Work) == Work) 182 else if ((type & Work) == Work)
183 typeString += i18n("Work"); 183 typeString += i18n("Work");
184 184
185 if (!typeString.isEmpty()) 185 if (!typeString.isEmpty())
186 typeString += " "; 186 typeString += " ";
187
188 if ((type & Cell) == Cell) 187 if ((type & Cell) == Cell)
189 typeString += i18n("Mobile"); 188 typeString += i18n("Mobile") +" ";
190 else if ((type & Fax) == Fax) 189 if ((type & Sip) == Sip)
190 typeString += i18n("SIP")+" ";
191 if ((type & Car) == Car)
192 typeString += i18n("Car")+" ";
193
194 if ((type & Fax) == Fax)
191 typeString += i18n("Fax"); 195 typeString += i18n("Fax");
192 else if ((type & Msg) == Msg) 196 else if ((type & Msg) == Msg)
193 typeString += i18n("Messenger"); 197 typeString += i18n("Messenger");
194 else if ((type & Voice) == Voice) {
195// add nothing in case of the Voice flag
196// typeString += i18n("Voice");
197 }
198 else if ((type & Video) == Video) 198 else if ((type & Video) == Video)
199 typeString += i18n("Video"); 199 typeString += i18n("Video");
200 else if ((type & Bbs) == Bbs) 200 else if ((type & Bbs) == Bbs)
201 typeString += i18n("Mailbox"); 201 typeString += i18n("Mailbox");
202 else if ((type & Modem) == Modem) 202 else if ((type & Modem) == Modem)
203 typeString += i18n("Modem"); 203 typeString += i18n("Modem");
204 else if ((type & Car) == Car)
205 typeString += i18n("Car");
206 else if ((type & Isdn) == Isdn) 204 else if ((type & Isdn) == Isdn)
207 typeString += i18n("ISDN"); 205 typeString += i18n("ISDN");
208 else if ((type & Pcs) == Pcs) 206 else if ((type & Pcs) == Pcs)
209 typeString += i18n("PCS"); 207 typeString += i18n("PCS");
210 else if ((type & Pager) == Pager) 208 else if ((type & Pager) == Pager)
211 typeString += i18n("Pager"); 209 typeString += i18n("Pager");
212 else if ((type & Sip) == Sip)
213 typeString += i18n("SIP");
214
215 // add the prefered flag 210 // add the prefered flag
216 if (!typeString.isEmpty())
217 typeString += " ";
218 /* 211 /*
219 if ((type & Pref) == Pref) 212 if ((type & Pref) == Pref)
220 typeString += i18n("(p)"); 213 typeString += i18n("(p)");
221 */ 214 */
222 //if we still have no match, return "other" 215 //if we still have no match, return "other"
223 if (typeString.isEmpty()) 216 if (typeString.isEmpty()) {
224 return i18n("Other"); 217 if ((type & Voice) == Voice)
225 218 return i18n("Voice");
226 219 else
227 return typeString; 220 return i18n("Other");
221 }
222
223 return typeString.stripWhiteSpace();
228} 224}
229 225
230QDataStream &KABC::operator<<( QDataStream &s, const PhoneNumber &phone ) 226QDataStream &KABC::operator<<( QDataStream &s, const PhoneNumber &phone )
231{ 227{
232 return s << phone.mId << phone.mType << phone.mNumber; 228 return s << phone.mId << phone.mType << phone.mNumber;
233} 229}