-rw-r--r-- | kabc/address.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/kabc/address.cpp b/kabc/address.cpp index c820a6c..5ffe511 100644 --- a/kabc/address.cpp +++ b/kabc/address.cpp | |||
@@ -59,64 +59,77 @@ bool Address::operator==( const Address &a ) const | |||
59 | if ( mPostOfficeBox != a.mPostOfficeBox ) return false; | 59 | if ( mPostOfficeBox != a.mPostOfficeBox ) return false; |
60 | if ( mExtended != a.mExtended ) return false; | 60 | if ( mExtended != a.mExtended ) return false; |
61 | if ( mStreet != a.mStreet ) return false; | 61 | if ( mStreet != a.mStreet ) return false; |
62 | if ( mLocality != a.mLocality ) return false; | 62 | if ( mLocality != a.mLocality ) return false; |
63 | if ( mRegion != a.mRegion ) return false; | 63 | if ( mRegion != a.mRegion ) return false; |
64 | if ( mPostalCode != a.mPostalCode ) return false; | 64 | if ( mPostalCode != a.mPostalCode ) return false; |
65 | if ( mCountry != a.mCountry ) return false; | 65 | if ( mCountry != a.mCountry ) return false; |
66 | if ( mLabel != a.mLabel ) return false; | 66 | if ( mLabel != a.mLabel ) return false; |
67 | 67 | ||
68 | return true; | 68 | return true; |
69 | } | 69 | } |
70 | 70 | ||
71 | bool Address::operator!=( const Address &a ) const | 71 | bool Address::operator!=( const Address &a ) const |
72 | { | 72 | { |
73 | return !( a == *this ); | 73 | return !( a == *this ); |
74 | } | 74 | } |
75 | 75 | ||
76 | bool Address::isEmpty() const | 76 | bool Address::isEmpty() const |
77 | { | 77 | { |
78 | if ( mPostOfficeBox.isEmpty() && | 78 | if ( mPostOfficeBox.isEmpty() && |
79 | mExtended.isEmpty() && | 79 | mExtended.isEmpty() && |
80 | mStreet.isEmpty() && | 80 | mStreet.isEmpty() && |
81 | mLocality.isEmpty() && | 81 | mLocality.isEmpty() && |
82 | mRegion.isEmpty() && | 82 | mRegion.isEmpty() && |
83 | mPostalCode.isEmpty() && | 83 | mPostalCode.isEmpty() && |
84 | mCountry.isEmpty() && | 84 | mCountry.isEmpty() && |
85 | mLabel.isEmpty() ) { | 85 | mLabel.isEmpty() ) { |
86 | return true; | 86 | return true; |
87 | } | 87 | } |
88 | return false; | 88 | return false; |
89 | } | 89 | } |
90 | 90 | ||
91 | QStringList Address::asList() | ||
92 | { | ||
93 | QStringList result; | ||
94 | if ( ! mPostOfficeBox.isEmpty() )result.append(mPostOfficeBox); | ||
95 | if ( ! mExtended.isEmpty())result.append(mExtended); | ||
96 | if ( ! mStreet.isEmpty())result.append(mStreet); | ||
97 | if ( ! mLocality.isEmpty() )result.append(mLocality); | ||
98 | if ( ! mRegion.isEmpty())result.append(mRegion); | ||
99 | if ( ! mPostalCode.isEmpty())result.append(mPostalCode); | ||
100 | if ( ! mCountry.isEmpty())result.append(mCountry); | ||
101 | if ( ! mLabel.isEmpty() )result.append(mLabel); | ||
102 | return result; | ||
103 | } | ||
91 | void Address::clear() | 104 | void Address::clear() |
92 | { | 105 | { |
93 | *this = Address(); | 106 | *this = Address(); |
94 | } | 107 | } |
95 | 108 | ||
96 | void Address::setId( const QString &id ) | 109 | void Address::setId( const QString &id ) |
97 | { | 110 | { |
98 | mEmpty = false; | 111 | mEmpty = false; |
99 | 112 | ||
100 | mId = id; | 113 | mId = id; |
101 | } | 114 | } |
102 | 115 | ||
103 | QString Address::id() const | 116 | QString Address::id() const |
104 | { | 117 | { |
105 | return mId; | 118 | return mId; |
106 | } | 119 | } |
107 | 120 | ||
108 | void Address::setType( int type ) | 121 | void Address::setType( int type ) |
109 | { | 122 | { |
110 | mEmpty = false; | 123 | mEmpty = false; |
111 | 124 | ||
112 | mType = type; | 125 | mType = type; |
113 | } | 126 | } |
114 | 127 | ||
115 | int Address::type() const | 128 | int Address::type() const |
116 | { | 129 | { |
117 | return mType; | 130 | return mType; |
118 | } | 131 | } |
119 | 132 | ||
120 | QString Address::typeLabel() const | 133 | QString Address::typeLabel() const |
121 | { | 134 | { |
122 | QString label; | 135 | QString label; |