-rw-r--r-- | kabc/phonenumber.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/kabc/phonenumber.cpp b/kabc/phonenumber.cpp index e5abc0e..6e94c7e 100644 --- a/kabc/phonenumber.cpp +++ b/kabc/phonenumber.cpp | |||
@@ -51,52 +51,50 @@ PhoneNumber::~PhoneNumber() | |||
51 | void PhoneNumber::init() | 51 | void PhoneNumber::init() |
52 | { | 52 | { |
53 | mId = KApplication::randomString( 8 ); | 53 | mId = KApplication::randomString( 8 ); |
54 | } | 54 | } |
55 | 55 | ||
56 | bool PhoneNumber::operator==( const PhoneNumber &p ) const | 56 | bool PhoneNumber::operator==( const PhoneNumber &p ) const |
57 | { | 57 | { |
58 | if ( mNumber != p.mNumber ) return false; | 58 | if ( mNumber != p.mNumber ) return false; |
59 | if ( mType != p.mType ) return false; | 59 | if ( mType != p.mType ) return false; |
60 | 60 | ||
61 | return true; | 61 | return true; |
62 | } | 62 | } |
63 | 63 | ||
64 | bool PhoneNumber::operator!=( const PhoneNumber &p ) const | 64 | bool PhoneNumber::operator!=( const PhoneNumber &p ) const |
65 | { | 65 | { |
66 | return !( p == *this ); | 66 | return !( p == *this ); |
67 | } | 67 | } |
68 | 68 | ||
69 | bool PhoneNumber::simplifyNumber() | 69 | bool PhoneNumber::simplifyNumber() |
70 | { | 70 | { |
71 | QString Number; | 71 | QString Number; |
72 | int i; | 72 | int i; |
73 | Number = mNumber.stripWhiteSpace (); | 73 | Number = mNumber.stripWhiteSpace (); |
74 | mNumber = ""; | 74 | mNumber = ""; |
75 | if ( Number.at(0) == '+' ) | ||
76 | mNumber += "+"; | ||
77 | for ( i = 0; i < Number.length(); ++i) { | 75 | for ( i = 0; i < Number.length(); ++i) { |
78 | if ( Number.at(i).isDigit() ) | 76 | if ( Number.at(i).isDigit() || Number.at(i) == '+'|| Number.at(i) == '*'|| Number.at(i) == '#' ) |
79 | mNumber += Number.at(i); | 77 | mNumber += Number.at(i); |
80 | } | 78 | } |
81 | return ( mNumber.length() > 0 ); | 79 | return ( mNumber.length() > 0 ); |
82 | } | 80 | } |
83 | // make cellphone compatible | 81 | // make cellphone compatible |
84 | void PhoneNumber::simplifyType() | 82 | void PhoneNumber::simplifyType() |
85 | { | 83 | { |
86 | if ( mType & Fax ) mType = Fax; | 84 | if ( mType & Fax ) mType = Fax; |
87 | else if ( mType & Cell ) mType = Cell; | 85 | else if ( mType & Cell ) mType = Cell; |
88 | else if ( mType & Work ) mType = Work ; | 86 | else if ( mType & Work ) mType = Work ; |
89 | else if ( mType & Home ) mType = Home; | 87 | else if ( mType & Home ) mType = Home; |
90 | else mType = Pref; | 88 | else mType = Pref; |
91 | } | 89 | } |
92 | void PhoneNumber::setId( const QString &id ) | 90 | void PhoneNumber::setId( const QString &id ) |
93 | { | 91 | { |
94 | mId = id; | 92 | mId = id; |
95 | } | 93 | } |
96 | 94 | ||
97 | QString PhoneNumber::id() const | 95 | QString PhoneNumber::id() const |
98 | { | 96 | { |
99 | return mId; | 97 | return mId; |
100 | } | 98 | } |
101 | 99 | ||
102 | void PhoneNumber::setNumber( const QString &number ) | 100 | void PhoneNumber::setNumber( const QString &number ) |