-rw-r--r-- | kabc/phonenumber.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kabc/phonenumber.cpp b/kabc/phonenumber.cpp index eee25a5..90cc4cf 100644 --- a/kabc/phonenumber.cpp +++ b/kabc/phonenumber.cpp | |||
@@ -197,72 +197,72 @@ QString PhoneNumber::typeLabel() const | |||
197 | TypeList list = typeList(); | 197 | TypeList list = typeList(); |
198 | 198 | ||
199 | TypeList::Iterator it; | 199 | TypeList::Iterator it; |
200 | for ( it = list.begin(); it != list.end(); ++it ) { | 200 | for ( it = list.begin(); it != list.end(); ++it ) { |
201 | if ( ( type() & (*it) ) && ( (*it) != Pref ) ) { | 201 | if ( ( type() & (*it) ) && ( (*it) != Pref ) ) { |
202 | label.append( ( first ? "" : "/" ) + typeLabel( *it ) ); | 202 | label.append( ( first ? "" : "/" ) + typeLabel( *it ) ); |
203 | if ( first ) | 203 | if ( first ) |
204 | first = false; | 204 | first = false; |
205 | } | 205 | } |
206 | } | 206 | } |
207 | 207 | ||
208 | return label; | 208 | return label; |
209 | } | 209 | } |
210 | 210 | ||
211 | QString PhoneNumber::label() const | 211 | QString PhoneNumber::label() const |
212 | { | 212 | { |
213 | return typeLabel( type() ); | 213 | return typeLabel( type() ); |
214 | } | 214 | } |
215 | 215 | ||
216 | PhoneNumber::TypeList PhoneNumber::typeList() | 216 | PhoneNumber::TypeList PhoneNumber::typeList() |
217 | { | 217 | { |
218 | TypeList list; | 218 | TypeList list; |
219 | 219 | ||
220 | list << Home << Work << Msg << Pref << Voice << Fax << Cell << Video | 220 | list << Home << Work << Msg << Pref << Voice << Fax << Cell << Video |
221 | << Bbs << Modem << Car << Isdn << Pcs << Pager; | 221 | << Bbs << Modem << Car << Isdn << Pcs << Pager; |
222 | 222 | ||
223 | return list; | 223 | return list; |
224 | } | 224 | } |
225 | PhoneNumber::TypeList PhoneNumber::supportedTypeList() | 225 | PhoneNumber::TypeList PhoneNumber::supportedTypeList() |
226 | { | 226 | { |
227 | static TypeList list; | 227 | static TypeList list; |
228 | if ( list.count() == 0 ) | 228 | if ( list.count() == 0 ) |
229 | list << (Home| Pref) << (Work| Pref) << Cell << Home << Work << Car << (Work| Msg | Voice) << (Work| Msg) << (Home | Fax) << (Work| Fax) << Fax<< (Pcs|Pref)<< Pcs<< Pager << Isdn << Video << Msg << Pref << Voice; | 229 | list << (Home| Pref) << (Work| Pref) << Cell <<(Pcs|Pref)<< Pcs<< Home << Work << Car << (Work| Msg | Voice) << (Work| Msg) << (Home | Fax) << (Work| Fax) << Fax<< Pager << Isdn << Video << Msg << Pref << Voice; |
230 | return list; | 230 | return list; |
231 | } | 231 | } |
232 | QStringList PhoneNumber::supportedTypeListNames() | 232 | QStringList PhoneNumber::supportedTypeListNames() |
233 | { | 233 | { |
234 | static QStringList list; | 234 | static QStringList list; |
235 | if ( list.count() == 0 ) | 235 | if ( list.count() == 0 ) |
236 | list << i18n("Home") << i18n("Work") << i18n("Mobile") << i18n("Home2")<< i18n("Work2") << i18n("Mobile2 (Work)") << i18n("Assistent") << i18n("Company") << i18n("Fax (Home)") << i18n("Fax (Work)") << i18n("Fax (Other)") << i18n("SIP") << i18n("VoIP") << i18n("Pager") << i18n("ISDN") << i18n("Video") << i18n("Callback") << i18n("Primary")<< i18n("Other"); | 236 | list << i18n("Home") << i18n("Work") << i18n("Mobile") << i18n("SIP") << i18n("VoIP") <<i18n("Home2")<< i18n("Work2") << i18n("Mobile2 (Work)") << i18n("Assistent") << i18n("Company") << i18n("Fax (Home)") << i18n("Fax (Work)") << i18n("Fax (Other)") << i18n("Pager") << i18n("ISDN") << i18n("Video") << i18n("Callback") << i18n("Primary")<< i18n("Other"); |
237 | return list; | 237 | return list; |
238 | } | 238 | } |
239 | 239 | ||
240 | int PhoneNumber::typeListIndex4Type(int type ) | 240 | int PhoneNumber::typeListIndex4Type(int type ) |
241 | { | 241 | { |
242 | TypeList list = supportedTypeList(); | 242 | TypeList list = supportedTypeList(); |
243 | int i = 0; | 243 | int i = 0; |
244 | while ( i < list.count() ) { | 244 | while ( i < list.count() ) { |
245 | if ( list [i] == type ) | 245 | if ( list [i] == type ) |
246 | return i; | 246 | return i; |
247 | ++i; | 247 | ++i; |
248 | } | 248 | } |
249 | return list.count()-1; | 249 | return list.count()-1; |
250 | } | 250 | } |
251 | 251 | ||
252 | QString PhoneNumber::label( int type ) | 252 | QString PhoneNumber::label( int type ) |
253 | { | 253 | { |
254 | return typeLabel( type ); | 254 | return typeLabel( type ); |
255 | } | 255 | } |
256 | 256 | ||
257 | QString PhoneNumber::typeLabel( int type ) | 257 | QString PhoneNumber::typeLabel( int type ) |
258 | { | 258 | { |
259 | if ((type & Cell) == Cell) | 259 | if ((type & Cell) == Cell) |
260 | return i18n("Mobile"); | 260 | return i18n("Mobile"); |
261 | if ((type & Home) == Home) { | 261 | if ((type & Home) == Home) { |
262 | if ((type & Pref) == Pref) | 262 | if ((type & Pref) == Pref) |
263 | return i18n("Home"); | 263 | return i18n("Home"); |
264 | if ((type & Fax) == Fax) | 264 | if ((type & Fax) == Fax) |
265 | return i18n("Fax (Home)"); | 265 | return i18n("Fax (Home)"); |
266 | return i18n("Home2"); | 266 | return i18n("Home2"); |
267 | } | 267 | } |
268 | 268 | ||