summaryrefslogtreecommitdiffabout
path: root/kabc
authorzautrix <zautrix>2005-03-31 11:26:51 (UTC)
committer zautrix <zautrix>2005-03-31 11:26:51 (UTC)
commitc0fa26aa3b33c293853bdd7d028ddb0545e33c85 (patch) (side-by-side diff)
tree12bbb65fb6d235415bd7a7007c1e019ccfcf97ac /kabc
parentf39d5000ed2f9a436ee94cbd42f840651afa89d6 (diff)
downloadkdepimpi-c0fa26aa3b33c293853bdd7d028ddb0545e33c85.zip
kdepimpi-c0fa26aa3b33c293853bdd7d028ddb0545e33c85.tar.gz
kdepimpi-c0fa26aa3b33c293853bdd7d028ddb0545e33c85.tar.bz2
many fixes
Diffstat (limited to 'kabc') (more/less context) (show whitespace changes)
-rw-r--r--kabc/phonenumber.cpp30
1 files changed, 13 insertions, 17 deletions
diff --git a/kabc/phonenumber.cpp b/kabc/phonenumber.cpp
index abb3b3b..041effc 100644
--- a/kabc/phonenumber.cpp
+++ b/kabc/phonenumber.cpp
@@ -186,6 +186,10 @@ QString PhoneNumber::typeLabel( int type )
typeString += " ";
-
if ((type & Cell) == Cell)
- typeString += i18n("Mobile");
- else if ((type & Fax) == Fax)
+ typeString += i18n("Mobile") +" ";
+ if ((type & Sip) == Sip)
+ typeString += i18n("SIP")+" ";
+ if ((type & Car) == Car)
+ typeString += i18n("Car")+" ";
+
+ if ((type & Fax) == Fax)
typeString += i18n("Fax");
@@ -193,6 +197,2 @@ QString PhoneNumber::typeLabel( int type )
typeString += i18n("Messenger");
- else if ((type & Voice) == Voice) {
-// add nothing in case of the Voice flag
-// typeString += i18n("Voice");
- }
else if ((type & Video) == Video)
@@ -203,4 +203,2 @@ QString PhoneNumber::typeLabel( int type )
typeString += i18n("Modem");
- else if ((type & Car) == Car)
- typeString += i18n("Car");
else if ((type & Isdn) == Isdn)
@@ -211,8 +209,3 @@ QString PhoneNumber::typeLabel( int type )
typeString += i18n("Pager");
- else if ((type & Sip) == Sip)
- typeString += i18n("SIP");
-
// add the prefered flag
- if (!typeString.isEmpty())
- typeString += " ";
/*
@@ -222,7 +215,10 @@ QString PhoneNumber::typeLabel( int type )
//if we still have no match, return "other"
- if (typeString.isEmpty())
+ if (typeString.isEmpty()) {
+ if ((type & Voice) == Voice)
+ return i18n("Voice");
+ else
return i18n("Other");
+ }
-
- return typeString;
+ return typeString.stripWhiteSpace();
}