author | zautrix <zautrix> | 2004-10-08 23:38:07 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-08 23:38:07 (UTC) |
commit | 07fdef2c2ea1153d39d7114b3d5bd4abc4f4c861 (patch) (unidiff) | |
tree | 03d0e5d20e607e035e17fcdabd6bce789069f41e /kabc/addressee.cpp | |
parent | 44169895703beb3e8b1551a313d2d341bf742905 (diff) | |
download | kdepimpi-07fdef2c2ea1153d39d7114b3d5bd4abc4f4c861.zip kdepimpi-07fdef2c2ea1153d39d7114b3d5bd4abc4f4c861.tar.gz kdepimpi-07fdef2c2ea1153d39d7114b3d5bd4abc4f4c861.tar.bz2 |
some bugfixes
-rw-r--r-- | kabc/addressee.cpp | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp index e571980..19a1845 100644 --- a/kabc/addressee.cpp +++ b/kabc/addressee.cpp | |||
@@ -1,701 +1,717 @@ | |||
1 | /*** Warning! This file has been generated by the script makeaddressee ***/ | 1 | /*** Warning! This file has been generated by the script makeaddressee ***/ |
2 | /* | 2 | /* |
3 | This file is part of libkabc. | 3 | This file is part of libkabc. |
4 | Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org> | 4 | Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org> |
5 | 5 | ||
6 | This library is free software; you can redistribute it and/or | 6 | This library is free software; you can redistribute it and/or |
7 | modify it under the terms of the GNU Library General Public | 7 | modify it under the terms of the GNU Library General Public |
8 | License as published by the Free Software Foundation; either | 8 | License as published by the Free Software Foundation; either |
9 | version 2 of the License, or (at your option) any later version. | 9 | version 2 of the License, or (at your option) any later version. |
10 | 10 | ||
11 | This library is distributed in the hope that it will be useful, | 11 | This library is distributed in the hope that it will be useful, |
12 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 12 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
13 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 13 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
14 | Library General Public License for more details. | 14 | Library General Public License for more details. |
15 | 15 | ||
16 | You should have received a copy of the GNU Library General Public License | 16 | You should have received a copy of the GNU Library General Public License |
17 | along with this library; see the file COPYING.LIB. If not, write to | 17 | along with this library; see the file COPYING.LIB. If not, write to |
18 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 18 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
19 | Boston, MA 02111-1307, USA. | 19 | Boston, MA 02111-1307, USA. |
20 | */ | 20 | */ |
21 | 21 | ||
22 | /* | 22 | /* |
23 | Enhanced Version of the file for platform independent KDE tools. | 23 | Enhanced Version of the file for platform independent KDE tools. |
24 | Copyright (c) 2004 Ulf Schenk | 24 | Copyright (c) 2004 Ulf Schenk |
25 | 25 | ||
26 | $Id$ | 26 | $Id$ |
27 | */ | 27 | */ |
28 | 28 | ||
29 | #include <kconfig.h> | 29 | #include <kconfig.h> |
30 | 30 | ||
31 | #include <ksharedptr.h> | 31 | #include <ksharedptr.h> |
32 | #include <kdebug.h> | 32 | #include <kdebug.h> |
33 | #include <kapplication.h> | 33 | #include <kapplication.h> |
34 | #include <klocale.h> | 34 | #include <klocale.h> |
35 | #include <kidmanager.h> | 35 | #include <kidmanager.h> |
36 | //US | 36 | //US |
37 | #include <kstandarddirs.h> | 37 | #include <kstandarddirs.h> |
38 | #include <libkcal/syncdefines.h> | 38 | #include <libkcal/syncdefines.h> |
39 | 39 | ||
40 | //US #include "resource.h" | 40 | //US #include "resource.h" |
41 | #include "addressee.h" | 41 | #include "addressee.h" |
42 | 42 | ||
43 | using namespace KABC; | 43 | using namespace KABC; |
44 | 44 | ||
45 | static bool matchBinaryPattern( int value, int pattern ); | 45 | static bool matchBinaryPattern( int value, int pattern ); |
46 | static bool matchBinaryPatternA( int value, int pattern ); | 46 | static bool matchBinaryPatternA( int value, int pattern ); |
47 | static bool matchBinaryPatternP( int value, int pattern ); | 47 | static bool matchBinaryPatternP( int value, int pattern ); |
48 | 48 | ||
49 | struct Addressee::AddresseeData : public KShared | 49 | struct Addressee::AddresseeData : public KShared |
50 | { | 50 | { |
51 | QString uid; | 51 | QString uid; |
52 | QString name; | 52 | QString name; |
53 | QString formattedName; | 53 | QString formattedName; |
54 | QString familyName; | 54 | QString familyName; |
55 | QString givenName; | 55 | QString givenName; |
56 | QString additionalName; | 56 | QString additionalName; |
57 | QString prefix; | 57 | QString prefix; |
58 | QString suffix; | 58 | QString suffix; |
59 | QString nickName; | 59 | QString nickName; |
60 | QDateTime birthday; | 60 | QDateTime birthday; |
61 | QString mailer; | 61 | QString mailer; |
62 | TimeZone timeZone; | 62 | TimeZone timeZone; |
63 | Geo geo; | 63 | Geo geo; |
64 | QString title; | 64 | QString title; |
65 | QString role; | 65 | QString role; |
66 | QString organization; | 66 | QString organization; |
67 | QString note; | 67 | QString note; |
68 | QString productId; | 68 | QString productId; |
69 | QDateTime revision; | 69 | QDateTime revision; |
70 | QString sortString; | 70 | QString sortString; |
71 | QString externalUID; | 71 | QString externalUID; |
72 | QString originalExternalUID; | 72 | QString originalExternalUID; |
73 | KURL url; | 73 | KURL url; |
74 | Secrecy secrecy; | 74 | Secrecy secrecy; |
75 | Picture logo; | 75 | Picture logo; |
76 | Picture photo; | 76 | Picture photo; |
77 | Sound sound; | 77 | Sound sound; |
78 | Agent agent; | 78 | Agent agent; |
79 | QString mExternalId; | 79 | QString mExternalId; |
80 | PhoneNumber::List phoneNumbers; | 80 | PhoneNumber::List phoneNumbers; |
81 | Address::List addresses; | 81 | Address::List addresses; |
82 | Key::List keys; | 82 | Key::List keys; |
83 | QStringList emails; | 83 | QStringList emails; |
84 | QStringList categories; | 84 | QStringList categories; |
85 | QStringList custom; | 85 | QStringList custom; |
86 | int mTempSyncStat; | 86 | int mTempSyncStat; |
87 | Resource *resource; | 87 | Resource *resource; |
88 | 88 | ||
89 | bool empty :1; | 89 | bool empty :1; |
90 | bool changed :1; | 90 | bool changed :1; |
91 | }; | 91 | }; |
92 | 92 | ||
93 | Addressee::Addressee() | 93 | Addressee::Addressee() |
94 | { | 94 | { |
95 | mData = new AddresseeData; | 95 | mData = new AddresseeData; |
96 | mData->empty = true; | 96 | mData->empty = true; |
97 | mData->changed = false; | 97 | mData->changed = false; |
98 | mData->resource = 0; | 98 | mData->resource = 0; |
99 | mData->mExternalId = ":"; | 99 | mData->mExternalId = ":"; |
100 | mData->revision = QDateTime ( QDate( 2003,1,1)); | 100 | mData->revision = QDateTime ( QDate( 2003,1,1)); |
101 | mData->mTempSyncStat = SYNC_TEMPSTATE_INITIAL; | 101 | mData->mTempSyncStat = SYNC_TEMPSTATE_INITIAL; |
102 | } | 102 | } |
103 | 103 | ||
104 | Addressee::~Addressee() | 104 | Addressee::~Addressee() |
105 | { | 105 | { |
106 | } | 106 | } |
107 | 107 | ||
108 | Addressee::Addressee( const Addressee &a ) | 108 | Addressee::Addressee( const Addressee &a ) |
109 | { | 109 | { |
110 | mData = a.mData; | 110 | mData = a.mData; |
111 | } | 111 | } |
112 | 112 | ||
113 | Addressee &Addressee::operator=( const Addressee &a ) | 113 | Addressee &Addressee::operator=( const Addressee &a ) |
114 | { | 114 | { |
115 | mData = a.mData; | 115 | mData = a.mData; |
116 | return (*this); | 116 | return (*this); |
117 | } | 117 | } |
118 | 118 | ||
119 | Addressee Addressee::copy() | 119 | Addressee Addressee::copy() |
120 | { | 120 | { |
121 | Addressee a; | 121 | Addressee a; |
122 | *(a.mData) = *mData; | 122 | *(a.mData) = *mData; |
123 | return a; | 123 | return a; |
124 | } | 124 | } |
125 | 125 | ||
126 | void Addressee::detach() | 126 | void Addressee::detach() |
127 | { | 127 | { |
128 | if ( mData.count() == 1 ) return; | 128 | if ( mData.count() == 1 ) return; |
129 | *this = copy(); | 129 | *this = copy(); |
130 | } | 130 | } |
131 | 131 | ||
132 | bool Addressee::operator==( const Addressee &a ) const | 132 | bool Addressee::operator==( const Addressee &a ) const |
133 | { | 133 | { |
134 | if ( uid() != a.uid() ) return false; | 134 | if ( uid() != a.uid() ) return false; |
135 | if ( mData->name != a.mData->name ) return false; | 135 | if ( mData->name != a.mData->name ) return false; |
136 | if ( mData->formattedName != a.mData->formattedName ) return false; | 136 | if ( mData->formattedName != a.mData->formattedName ) return false; |
137 | if ( mData->familyName != a.mData->familyName ) return false; | 137 | if ( mData->familyName != a.mData->familyName ) return false; |
138 | if ( mData->givenName != a.mData->givenName ) return false; | 138 | if ( mData->givenName != a.mData->givenName ) return false; |
139 | if ( mData->additionalName != a.mData->additionalName ) return false; | 139 | if ( mData->additionalName != a.mData->additionalName ) return false; |
140 | if ( mData->prefix != a.mData->prefix ) return false; | 140 | if ( mData->prefix != a.mData->prefix ) return false; |
141 | if ( mData->suffix != a.mData->suffix ) return false; | 141 | if ( mData->suffix != a.mData->suffix ) return false; |
142 | if ( mData->nickName != a.mData->nickName ) return false; | 142 | if ( mData->nickName != a.mData->nickName ) return false; |
143 | if ( mData->birthday != a.mData->birthday ) return false; | 143 | if ( mData->birthday != a.mData->birthday ) return false; |
144 | if ( mData->mailer != a.mData->mailer ) return false; | 144 | if ( mData->mailer != a.mData->mailer ) return false; |
145 | if ( mData->timeZone != a.mData->timeZone ) return false; | 145 | if ( mData->timeZone != a.mData->timeZone ) return false; |
146 | if ( mData->geo != a.mData->geo ) return false; | 146 | if ( mData->geo != a.mData->geo ) return false; |
147 | if ( mData->title != a.mData->title ) return false; | 147 | if ( mData->title != a.mData->title ) return false; |
148 | if ( mData->role != a.mData->role ) return false; | 148 | if ( mData->role != a.mData->role ) return false; |
149 | if ( mData->organization != a.mData->organization ) return false; | 149 | if ( mData->organization != a.mData->organization ) return false; |
150 | if ( mData->note != a.mData->note ) return false; | 150 | if ( mData->note != a.mData->note ) return false; |
151 | if ( mData->productId != a.mData->productId ) return false; | 151 | if ( mData->productId != a.mData->productId ) return false; |
152 | //if ( mData->revision != a.mData->revision ) return false; | 152 | //if ( mData->revision != a.mData->revision ) return false; |
153 | if ( mData->sortString != a.mData->sortString ) return false; | 153 | if ( mData->sortString != a.mData->sortString ) return false; |
154 | if ( mData->secrecy != a.mData->secrecy ) return false; | 154 | if ( mData->secrecy != a.mData->secrecy ) return false; |
155 | if ( mData->logo != a.mData->logo ) return false; | 155 | if ( mData->logo != a.mData->logo ) return false; |
156 | if ( mData->photo != a.mData->photo ) return false; | 156 | if ( mData->photo != a.mData->photo ) return false; |
157 | if ( mData->sound != a.mData->sound ) return false; | 157 | if ( mData->sound != a.mData->sound ) return false; |
158 | if ( mData->agent != a.mData->agent ) return false; | 158 | if ( mData->agent != a.mData->agent ) return false; |
159 | if ( ( mData->url.isValid() || a.mData->url.isValid() ) && | 159 | if ( ( mData->url.isValid() || a.mData->url.isValid() ) && |
160 | ( mData->url != a.mData->url ) ) return false; | 160 | ( mData->url != a.mData->url ) ) return false; |
161 | if ( mData->phoneNumbers != a.mData->phoneNumbers ) return false; | 161 | if ( mData->phoneNumbers != a.mData->phoneNumbers ) return false; |
162 | if ( mData->addresses != a.mData->addresses ) return false; | 162 | if ( mData->addresses != a.mData->addresses ) return false; |
163 | if ( mData->keys != a.mData->keys ) return false; | 163 | if ( mData->keys != a.mData->keys ) return false; |
164 | if ( mData->emails != a.mData->emails ) return false; | 164 | if ( mData->emails != a.mData->emails ) return false; |
165 | if ( mData->categories != a.mData->categories ) return false; | 165 | if ( mData->categories != a.mData->categories ) return false; |
166 | if ( mData->custom != a.mData->custom ) return false; | 166 | if ( mData->custom != a.mData->custom ) return false; |
167 | 167 | ||
168 | return true; | 168 | return true; |
169 | } | 169 | } |
170 | 170 | ||
171 | bool Addressee::operator!=( const Addressee &a ) const | 171 | bool Addressee::operator!=( const Addressee &a ) const |
172 | { | 172 | { |
173 | return !( a == *this ); | 173 | return !( a == *this ); |
174 | } | 174 | } |
175 | 175 | ||
176 | bool Addressee::isEmpty() const | 176 | bool Addressee::isEmpty() const |
177 | { | 177 | { |
178 | return mData->empty; | 178 | return mData->empty; |
179 | } | 179 | } |
180 | ulong Addressee::getCsum4List( const QStringList & attList) | 180 | ulong Addressee::getCsum4List( const QStringList & attList) |
181 | { | 181 | { |
182 | int max = attList.count(); | 182 | int max = attList.count(); |
183 | ulong cSum = 0; | 183 | ulong cSum = 0; |
184 | int j,k,i; | 184 | int j,k,i; |
185 | int add; | 185 | int add; |
186 | for ( i = 0; i < max ; ++i ) { | 186 | for ( i = 0; i < max ; ++i ) { |
187 | QString s = attList[i]; | 187 | QString s = attList[i]; |
188 | if ( ! s.isEmpty() ){ | 188 | if ( ! s.isEmpty() ){ |
189 | j = s.length(); | 189 | j = s.length(); |
190 | for ( k = 0; k < j; ++k ) { | 190 | for ( k = 0; k < j; ++k ) { |
191 | int mul = k +1; | 191 | int mul = k +1; |
192 | add = s[k].unicode (); | 192 | add = s[k].unicode (); |
193 | if ( k < 16 ) | 193 | if ( k < 16 ) |
194 | mul = mul * mul; | 194 | mul = mul * mul; |
195 | int ii = i+1; | 195 | int ii = i+1; |
196 | add = add * mul *ii*ii*ii; | 196 | add = add * mul *ii*ii*ii; |
197 | cSum += add; | 197 | cSum += add; |
198 | } | 198 | } |
199 | } | 199 | } |
200 | 200 | ||
201 | } | 201 | } |
202 | //QString dump = attList.join(","); | 202 | //QString dump = attList.join(","); |
203 | //qDebug("csum: %d %s", cSum,dump.latin1()); | 203 | //qDebug("csum: %d %s", cSum,dump.latin1()); |
204 | 204 | ||
205 | return cSum; | 205 | return cSum; |
206 | 206 | ||
207 | } | 207 | } |
208 | void Addressee::computeCsum(const QString &dev) | 208 | void Addressee::computeCsum(const QString &dev) |
209 | { | 209 | { |
210 | QStringList l; | 210 | QStringList l; |
211 | if ( !mData->name.isEmpty() ) l.append(mData->name); | 211 | if ( !mData->name.isEmpty() ) l.append(mData->name); |
212 | if ( !mData->formattedName.isEmpty() ) l.append(mData->formattedName ); | 212 | if ( !mData->formattedName.isEmpty() ) l.append(mData->formattedName ); |
213 | if ( !mData->familyName.isEmpty() ) l.append( mData->familyName ); | 213 | if ( !mData->familyName.isEmpty() ) l.append( mData->familyName ); |
214 | if ( !mData->givenName.isEmpty() ) l.append(mData->givenName ); | 214 | if ( !mData->givenName.isEmpty() ) l.append(mData->givenName ); |
215 | if ( !mData->additionalName ) l.append( mData->additionalName ); | 215 | if ( !mData->additionalName ) l.append( mData->additionalName ); |
216 | if ( !mData->prefix.isEmpty() ) l.append( mData->prefix ); | 216 | if ( !mData->prefix.isEmpty() ) l.append( mData->prefix ); |
217 | if ( !mData->suffix.isEmpty() ) l.append( mData->suffix ); | 217 | if ( !mData->suffix.isEmpty() ) l.append( mData->suffix ); |
218 | if ( !mData->nickName.isEmpty() ) l.append( mData->nickName ); | 218 | if ( !mData->nickName.isEmpty() ) l.append( mData->nickName ); |
219 | if ( mData->birthday.isValid() ) l.append( mData->birthday.toString() ); | 219 | if ( mData->birthday.isValid() ) l.append( mData->birthday.toString() ); |
220 | if ( !mData->mailer.isEmpty() ) l.append( mData->mailer ); | 220 | if ( !mData->mailer.isEmpty() ) l.append( mData->mailer ); |
221 | if ( mData->timeZone.isValid() ) l.append( mData->timeZone.asString() ); | 221 | if ( mData->timeZone.isValid() ) l.append( mData->timeZone.asString() ); |
222 | if ( mData->geo.isValid() ) l.append( mData->geo.asString() ); | 222 | if ( mData->geo.isValid() ) l.append( mData->geo.asString() ); |
223 | if ( !mData->title .isEmpty() ) l.append( mData->title ); | 223 | if ( !mData->title .isEmpty() ) l.append( mData->title ); |
224 | if ( !mData->role.isEmpty() ) l.append( mData->role ); | 224 | if ( !mData->role.isEmpty() ) l.append( mData->role ); |
225 | if ( !mData->organization.isEmpty() ) l.append( mData->organization ); | 225 | if ( !mData->organization.isEmpty() ) l.append( mData->organization ); |
226 | if ( !mData->note.isEmpty() ) l.append( mData->note ); | 226 | if ( !mData->note.isEmpty() ) l.append( mData->note ); |
227 | if ( !mData->productId.isEmpty() ) l.append(mData->productId ); | 227 | if ( !mData->productId.isEmpty() ) l.append(mData->productId ); |
228 | if ( !mData->sortString.isEmpty() ) l.append( mData->sortString ); | 228 | if ( !mData->sortString.isEmpty() ) l.append( mData->sortString ); |
229 | if ( mData->secrecy.isValid() ) l.append( mData->secrecy.asString()); | 229 | if ( mData->secrecy.isValid() ) l.append( mData->secrecy.asString()); |
230 | // if ( !mData->logo.isEmpty() ) l.append( ); | 230 | // if ( !mData->logo.isEmpty() ) l.append( ); |
231 | //if ( !mData->photo.isEmpty() ) l.append( ); | 231 | //if ( !mData->photo.isEmpty() ) l.append( ); |
232 | //if ( !mData->sound.isEmpty() ) l.append( ); | 232 | //if ( !mData->sound.isEmpty() ) l.append( ); |
233 | //if ( !mData->agent.isEmpty() ) l.append( ); | 233 | //if ( !mData->agent.isEmpty() ) l.append( ); |
234 | //if ( mData->url.isValid() ) l.append( ); | 234 | //if ( mData->url.isValid() ) l.append( ); |
235 | #if 0 | 235 | #if 0 |
236 | if ( !mData->phoneNumbers.isEmpty() ) l.append( ); | 236 | if ( !mData->phoneNumbers.isEmpty() ) l.append( ); |
237 | if ( !mData->addresses.isEmpty() ) l.append( ); | 237 | if ( !mData->addresses.isEmpty() ) l.append( ); |
238 | //if ( !mData->keys.isEmpty() ) l.append( ); | 238 | //if ( !mData->keys.isEmpty() ) l.append( ); |
239 | if ( !mData->emails.isEmpty() ) l.append( ); | 239 | if ( !mData->emails.isEmpty() ) l.append( ); |
240 | if ( !mData->categories .isEmpty() ) l.append( ); | 240 | if ( !mData->categories .isEmpty() ) l.append( ); |
241 | if ( !mData->custom.isEmpty() ) l.append( ); | 241 | if ( !mData->custom.isEmpty() ) l.append( ); |
242 | #endif | 242 | #endif |
243 | KABC::PhoneNumber::List phoneNumbers; | 243 | KABC::PhoneNumber::List phoneNumbers; |
244 | KABC::PhoneNumber::List::Iterator phoneIter; | 244 | KABC::PhoneNumber::List::Iterator phoneIter; |
245 | 245 | ||
246 | QStringList t; | 246 | QStringList t; |
247 | for ( phoneIter = mData->phoneNumbers.begin(); phoneIter != mData->phoneNumbers.end(); | 247 | for ( phoneIter = mData->phoneNumbers.begin(); phoneIter != mData->phoneNumbers.end(); |
248 | ++phoneIter ) | 248 | ++phoneIter ) |
249 | t.append( ( *phoneIter ).number()+QString::number( ( *phoneIter ).type() ) ); | 249 | t.append( ( *phoneIter ).number()+QString::number( ( *phoneIter ).type() ) ); |
250 | t.sort(); | 250 | t.sort(); |
251 | uint iii; | 251 | uint iii; |
252 | for ( iii = 0; iii < t.count(); ++iii) | 252 | for ( iii = 0; iii < t.count(); ++iii) |
253 | l.append( t[iii] ); | 253 | l.append( t[iii] ); |
254 | t = mData->emails; | 254 | t = mData->emails; |
255 | t.sort(); | 255 | t.sort(); |
256 | for ( iii = 0; iii < t.count(); ++iii) | 256 | for ( iii = 0; iii < t.count(); ++iii) |
257 | l.append( t[iii] ); | 257 | l.append( t[iii] ); |
258 | t = mData->categories; | 258 | t = mData->categories; |
259 | t.sort(); | 259 | t.sort(); |
260 | for ( iii = 0; iii < t.count(); ++iii) | 260 | for ( iii = 0; iii < t.count(); ++iii) |
261 | l.append( t[iii] ); | 261 | l.append( t[iii] ); |
262 | t = mData->custom; | 262 | t = mData->custom; |
263 | t.sort(); | 263 | t.sort(); |
264 | for ( iii = 0; iii < t.count(); ++iii) | 264 | for ( iii = 0; iii < t.count(); ++iii) |
265 | l.append( t[iii] ); | 265 | l.append( t[iii] ); |
266 | KABC::Address::List::Iterator addressIter; | 266 | KABC::Address::List::Iterator addressIter; |
267 | for ( addressIter = mData->addresses.begin(); addressIter != mData->addresses.end(); | 267 | for ( addressIter = mData->addresses.begin(); addressIter != mData->addresses.end(); |
268 | ++addressIter ) { | 268 | ++addressIter ) { |
269 | t = (*addressIter).asList(); | 269 | t = (*addressIter).asList(); |
270 | t.sort(); | 270 | t.sort(); |
271 | for ( iii = 0; iii < t.count(); ++iii) | 271 | for ( iii = 0; iii < t.count(); ++iii) |
272 | l.append( t[iii] ); | 272 | l.append( t[iii] ); |
273 | } | 273 | } |
274 | uint cs = getCsum4List(l); | 274 | uint cs = getCsum4List(l); |
275 | // qDebug("CSUM computed %d %s %s", cs,QString::number (cs ).latin1(), uid().latin1() ); | 275 | // qDebug("CSUM computed %d %s %s", cs,QString::number (cs ).latin1(), uid().latin1() ); |
276 | setCsum( dev, QString::number (cs )); | 276 | setCsum( dev, QString::number (cs )); |
277 | } | 277 | } |
278 | 278 | ||
279 | void Addressee::mergeContact( const Addressee& ad ) | 279 | void Addressee::mergeContact( const Addressee& ad ) |
280 | { | 280 | { |
281 | 281 | ||
282 | detach(); | 282 | detach(); |
283 | if ( mData->name.isEmpty() ) mData->name = ad.mData->name; | 283 | if ( mData->name.isEmpty() ) mData->name = ad.mData->name; |
284 | if ( mData->formattedName.isEmpty() ) mData->formattedName = ad.mData->formattedName; | 284 | if ( mData->formattedName.isEmpty() ) mData->formattedName = ad.mData->formattedName; |
285 | if ( mData->familyName.isEmpty() ) mData->familyName = ad.mData->familyName; | 285 | if ( mData->familyName.isEmpty() ) mData->familyName = ad.mData->familyName; |
286 | if ( mData->givenName.isEmpty() ) mData->givenName = ad.mData->givenName ; | 286 | if ( mData->givenName.isEmpty() ) mData->givenName = ad.mData->givenName ; |
287 | if ( mData->additionalName ) mData->additionalName = ad.mData->additionalName; | 287 | if ( mData->additionalName ) mData->additionalName = ad.mData->additionalName; |
288 | if ( mData->prefix.isEmpty() ) mData->prefix = ad.mData->prefix; | 288 | if ( mData->prefix.isEmpty() ) mData->prefix = ad.mData->prefix; |
289 | if ( mData->suffix.isEmpty() ) mData->suffix = ad.mData->suffix; | 289 | if ( mData->suffix.isEmpty() ) mData->suffix = ad.mData->suffix; |
290 | if ( mData->nickName.isEmpty() ) mData->nickName = ad.mData->nickName; | 290 | if ( mData->nickName.isEmpty() ) mData->nickName = ad.mData->nickName; |
291 | if ( !mData->birthday.isValid() ) | 291 | if ( !mData->birthday.isValid() ) |
292 | if ( ad.mData->birthday.isValid()) | 292 | if ( ad.mData->birthday.isValid()) |
293 | mData->birthday = ad.mData->birthday; | 293 | mData->birthday = ad.mData->birthday; |
294 | if ( mData->mailer.isEmpty() ) mData->mailer = ad.mData->mailer; | 294 | if ( mData->mailer.isEmpty() ) mData->mailer = ad.mData->mailer; |
295 | if ( !mData->timeZone.isValid() ) mData->timeZone = ad.mData->timeZone; | 295 | if ( !mData->timeZone.isValid() ) mData->timeZone = ad.mData->timeZone; |
296 | if ( !mData->geo.isValid() ) mData->geo = ad.mData->geo; | 296 | if ( !mData->geo.isValid() ) mData->geo = ad.mData->geo; |
297 | if ( mData->title .isEmpty() ) mData->title = ad.mData->title ; | 297 | if ( mData->title .isEmpty() ) mData->title = ad.mData->title ; |
298 | if ( mData->role.isEmpty() ) mData->role = ad.mData->role ; | 298 | if ( mData->role.isEmpty() ) mData->role = ad.mData->role ; |
299 | if ( mData->organization.isEmpty() ) mData->organization = ad.mData->organization ; | 299 | if ( mData->organization.isEmpty() ) mData->organization = ad.mData->organization ; |
300 | if ( mData->note.isEmpty() ) mData->note = ad.mData->note ; | 300 | if ( mData->note.isEmpty() ) mData->note = ad.mData->note ; |
301 | if ( mData->productId.isEmpty() ) mData->productId = ad.mData->productId; | 301 | if ( mData->productId.isEmpty() ) mData->productId = ad.mData->productId; |
302 | if ( mData->sortString.isEmpty() ) mData->sortString = ad.mData->sortString; | 302 | if ( mData->sortString.isEmpty() ) mData->sortString = ad.mData->sortString; |
303 | if ( !mData->secrecy.isValid() ) mData->secrecy = ad.mData->secrecy; | 303 | if ( !mData->secrecy.isValid() ) mData->secrecy = ad.mData->secrecy; |
304 | if ( ( !mData->url.isValid() && ad.mData->url.isValid() ) ) mData->url = ad.mData->url ; | 304 | if ( ( !mData->url.isValid() && ad.mData->url.isValid() ) ) mData->url = ad.mData->url ; |
305 | 305 | ||
306 | // pending: | 306 | // pending: |
307 | // merging phonenumbers | 307 | // merging phonenumbers |
308 | // merging addresses | 308 | // merging addresses |
309 | // merging emails; | 309 | // merging emails; |
310 | // merging categories; | 310 | // merging categories; |
311 | // merging custom; | 311 | // merging custom; |
312 | // merging keys | 312 | // merging keys |
313 | qDebug("merge contact %s ", ad.uid().latin1()); | 313 | qDebug("merge contact %s ", ad.uid().latin1()); |
314 | setUid( ad.uid() ); | 314 | setUid( ad.uid() ); |
315 | setRevision( ad.revision() ); | 315 | setRevision( ad.revision() ); |
316 | } | 316 | } |
317 | 317 | ||
318 | void Addressee::simplifyAddresses() | ||
319 | { | ||
320 | if ( mData->addresses.count() < 3 ) return ; | ||
321 | int count = 0; | ||
322 | Address::List list; | ||
323 | Address::List::Iterator it; | ||
324 | for( it = mData->addresses.begin(); it != mData->addresses.end(); ++it ) { | ||
325 | if ( count > 1 ) | ||
326 | list.append( *it ); | ||
327 | ++count; | ||
328 | } | ||
329 | for( it = list.begin(); it != list.end(); ++it ) { | ||
330 | removeAddress( (*it) ); | ||
331 | } | ||
332 | } | ||
333 | |||
318 | // removes all emails but the first | 334 | // removes all emails but the first |
319 | // needed by phone sync | 335 | // needed by phone sync |
320 | void Addressee::simplifyEmails() | 336 | void Addressee::simplifyEmails() |
321 | { | 337 | { |
322 | if ( mData->emails.count() == 0 ) return ; | 338 | if ( mData->emails.count() == 0 ) return ; |
323 | QString email = mData->emails.first(); | 339 | QString email = mData->emails.first(); |
324 | detach(); | 340 | detach(); |
325 | mData->emails.clear(); | 341 | mData->emails.clear(); |
326 | mData->emails.append( email ); | 342 | mData->emails.append( email ); |
327 | } | 343 | } |
328 | 344 | ||
329 | void Addressee::simplifyPhoneNumbers() | 345 | void Addressee::simplifyPhoneNumbers() |
330 | { | 346 | { |
331 | KABC::PhoneNumber::List removeNumbers; | 347 | KABC::PhoneNumber::List removeNumbers; |
332 | KABC::PhoneNumber::List::Iterator phoneIter; | 348 | KABC::PhoneNumber::List::Iterator phoneIter; |
333 | for ( phoneIter = mData->phoneNumbers.begin(); phoneIter != mData->phoneNumbers.end(); | 349 | for ( phoneIter = mData->phoneNumbers.begin(); phoneIter != mData->phoneNumbers.end(); |
334 | ++phoneIter ) { | 350 | ++phoneIter ) { |
335 | if ( ! ( *phoneIter ).simplifyNumber() ) | 351 | if ( ! ( *phoneIter ).simplifyNumber() ) |
336 | removeNumbers.append( ( *phoneIter ) ); | 352 | removeNumbers.append( ( *phoneIter ) ); |
337 | } | 353 | } |
338 | for ( phoneIter = removeNumbers.begin(); phoneIter != removeNumbers.end(); | 354 | for ( phoneIter = removeNumbers.begin(); phoneIter != removeNumbers.end(); |
339 | ++phoneIter ) { | 355 | ++phoneIter ) { |
340 | removePhoneNumber(( *phoneIter )); | 356 | removePhoneNumber(( *phoneIter )); |
341 | } | 357 | } |
342 | } | 358 | } |
343 | void Addressee::simplifyPhoneNumberTypes() | 359 | void Addressee::simplifyPhoneNumberTypes() |
344 | { | 360 | { |
345 | KABC::PhoneNumber::List::Iterator phoneIter; | 361 | KABC::PhoneNumber::List::Iterator phoneIter; |
346 | for ( phoneIter = mData->phoneNumbers.begin(); phoneIter != mData->phoneNumbers.end(); | 362 | for ( phoneIter = mData->phoneNumbers.begin(); phoneIter != mData->phoneNumbers.end(); |
347 | ++phoneIter ) | 363 | ++phoneIter ) |
348 | ( *phoneIter ).simplifyType(); | 364 | ( *phoneIter ).simplifyType(); |
349 | } | 365 | } |
350 | void Addressee::removeID(const QString &prof) | 366 | void Addressee::removeID(const QString &prof) |
351 | { | 367 | { |
352 | detach(); | 368 | detach(); |
353 | mData->mExternalId = KIdManager::removeId ( mData->mExternalId, prof); | 369 | mData->mExternalId = KIdManager::removeId ( mData->mExternalId, prof); |
354 | 370 | ||
355 | } | 371 | } |
356 | void Addressee::setID( const QString & prof , const QString & id ) | 372 | void Addressee::setID( const QString & prof , const QString & id ) |
357 | { | 373 | { |
358 | detach(); | 374 | detach(); |
359 | mData->mExternalId = KIdManager::setId ( mData->mExternalId, prof, id ); | 375 | mData->mExternalId = KIdManager::setId ( mData->mExternalId, prof, id ); |
360 | //qDebug("setID2 %s %s %s",mData->mExternalId.latin1(), prof.latin1(), id.latin1() ); | 376 | //qDebug("setID2 %s %s %s",mData->mExternalId.latin1(), prof.latin1(), id.latin1() ); |
361 | } | 377 | } |
362 | void Addressee::setTempSyncStat( int id ) | 378 | void Addressee::setTempSyncStat( int id ) |
363 | { | 379 | { |
364 | if ( mData->mTempSyncStat == id ) return; | 380 | if ( mData->mTempSyncStat == id ) return; |
365 | detach(); | 381 | detach(); |
366 | mData->mTempSyncStat = id; | 382 | mData->mTempSyncStat = id; |
367 | } | 383 | } |
368 | int Addressee::tempSyncStat() const | 384 | int Addressee::tempSyncStat() const |
369 | { | 385 | { |
370 | return mData->mTempSyncStat; | 386 | return mData->mTempSyncStat; |
371 | } | 387 | } |
372 | 388 | ||
373 | QString Addressee::getID( const QString & prof) | 389 | QString Addressee::getID( const QString & prof) |
374 | { | 390 | { |
375 | return KIdManager::getId ( mData->mExternalId, prof ); | 391 | return KIdManager::getId ( mData->mExternalId, prof ); |
376 | } | 392 | } |
377 | 393 | ||
378 | void Addressee::setCsum( const QString & prof , const QString & id ) | 394 | void Addressee::setCsum( const QString & prof , const QString & id ) |
379 | { | 395 | { |
380 | detach(); | 396 | detach(); |
381 | //qDebug("setcsum1 %s %s %s",mData->mExternalId.latin1(), prof.latin1(), id.latin1() ); | 397 | //qDebug("setcsum1 %s %s %s",mData->mExternalId.latin1(), prof.latin1(), id.latin1() ); |
382 | mData->mExternalId = KIdManager::setCsum ( mData->mExternalId, prof, id ); | 398 | mData->mExternalId = KIdManager::setCsum ( mData->mExternalId, prof, id ); |
383 | //qDebug("setcsum2 %s ",mData->mExternalId.latin1() ); | 399 | //qDebug("setcsum2 %s ",mData->mExternalId.latin1() ); |
384 | } | 400 | } |
385 | 401 | ||
386 | QString Addressee::getCsum( const QString & prof) | 402 | QString Addressee::getCsum( const QString & prof) |
387 | { | 403 | { |
388 | return KIdManager::getCsum ( mData->mExternalId, prof ); | 404 | return KIdManager::getCsum ( mData->mExternalId, prof ); |
389 | } | 405 | } |
390 | 406 | ||
391 | void Addressee::setIDStr( const QString & s ) | 407 | void Addressee::setIDStr( const QString & s ) |
392 | { | 408 | { |
393 | detach(); | 409 | detach(); |
394 | mData->mExternalId = s; | 410 | mData->mExternalId = s; |
395 | } | 411 | } |
396 | 412 | ||
397 | QString Addressee::IDStr() const | 413 | QString Addressee::IDStr() const |
398 | { | 414 | { |
399 | return mData->mExternalId; | 415 | return mData->mExternalId; |
400 | } | 416 | } |
401 | 417 | ||
402 | void Addressee::setExternalUID( const QString &id ) | 418 | void Addressee::setExternalUID( const QString &id ) |
403 | { | 419 | { |
404 | if ( id == mData->externalUID ) return; | 420 | if ( id == mData->externalUID ) return; |
405 | detach(); | 421 | detach(); |
406 | mData->empty = false; | 422 | mData->empty = false; |
407 | mData->externalUID = id; | 423 | mData->externalUID = id; |
408 | } | 424 | } |
409 | 425 | ||
410 | QString Addressee::externalUID() const | 426 | QString Addressee::externalUID() const |
411 | { | 427 | { |
412 | return mData->externalUID; | 428 | return mData->externalUID; |
413 | } | 429 | } |
414 | void Addressee::setOriginalExternalUID( const QString &id ) | 430 | void Addressee::setOriginalExternalUID( const QString &id ) |
415 | { | 431 | { |
416 | if ( id == mData->originalExternalUID ) return; | 432 | if ( id == mData->originalExternalUID ) return; |
417 | detach(); | 433 | detach(); |
418 | mData->empty = false; | 434 | mData->empty = false; |
419 | //qDebug("*******Set orig uid %s ", id.latin1()); | 435 | //qDebug("*******Set orig uid %s ", id.latin1()); |
420 | mData->originalExternalUID = id; | 436 | mData->originalExternalUID = id; |
421 | } | 437 | } |
422 | 438 | ||
423 | QString Addressee::originalExternalUID() const | 439 | QString Addressee::originalExternalUID() const |
424 | { | 440 | { |
425 | return mData->originalExternalUID; | 441 | return mData->originalExternalUID; |
426 | } | 442 | } |
427 | 443 | ||
428 | void Addressee::setUid( const QString &id ) | 444 | void Addressee::setUid( const QString &id ) |
429 | { | 445 | { |
430 | if ( id == mData->uid ) return; | 446 | if ( id == mData->uid ) return; |
431 | detach(); | 447 | detach(); |
432 | //qDebug("****setuid %s ", id.latin1()); | 448 | //qDebug("****setuid %s ", id.latin1()); |
433 | mData->empty = false; | 449 | mData->empty = false; |
434 | mData->uid = id; | 450 | mData->uid = id; |
435 | } | 451 | } |
436 | 452 | ||
437 | QString Addressee::uid() const | 453 | QString Addressee::uid() const |
438 | { | 454 | { |
439 | if ( mData->uid.isEmpty() ) | 455 | if ( mData->uid.isEmpty() ) |
440 | mData->uid = KApplication::randomString( 10 ); | 456 | mData->uid = KApplication::randomString( 10 ); |
441 | 457 | ||
442 | return mData->uid; | 458 | return mData->uid; |
443 | } | 459 | } |
444 | 460 | ||
445 | QString Addressee::uidLabel() | 461 | QString Addressee::uidLabel() |
446 | { | 462 | { |
447 | return i18n("Unique Identifier"); | 463 | return i18n("Unique Identifier"); |
448 | } | 464 | } |
449 | 465 | ||
450 | void Addressee::setName( const QString &name ) | 466 | void Addressee::setName( const QString &name ) |
451 | { | 467 | { |
452 | if ( name == mData->name ) return; | 468 | if ( name == mData->name ) return; |
453 | detach(); | 469 | detach(); |
454 | mData->empty = false; | 470 | mData->empty = false; |
455 | mData->name = name; | 471 | mData->name = name; |
456 | } | 472 | } |
457 | 473 | ||
458 | QString Addressee::name() const | 474 | QString Addressee::name() const |
459 | { | 475 | { |
460 | return mData->name; | 476 | return mData->name; |
461 | } | 477 | } |
462 | 478 | ||
463 | QString Addressee::nameLabel() | 479 | QString Addressee::nameLabel() |
464 | { | 480 | { |
465 | return i18n("Name"); | 481 | return i18n("Name"); |
466 | } | 482 | } |
467 | 483 | ||
468 | 484 | ||
469 | void Addressee::setFormattedName( const QString &formattedName ) | 485 | void Addressee::setFormattedName( const QString &formattedName ) |
470 | { | 486 | { |
471 | if ( formattedName == mData->formattedName ) return; | 487 | if ( formattedName == mData->formattedName ) return; |
472 | detach(); | 488 | detach(); |
473 | mData->empty = false; | 489 | mData->empty = false; |
474 | mData->formattedName = formattedName; | 490 | mData->formattedName = formattedName; |
475 | } | 491 | } |
476 | 492 | ||
477 | QString Addressee::formattedName() const | 493 | QString Addressee::formattedName() const |
478 | { | 494 | { |
479 | return mData->formattedName; | 495 | return mData->formattedName; |
480 | } | 496 | } |
481 | 497 | ||
482 | QString Addressee::formattedNameLabel() | 498 | QString Addressee::formattedNameLabel() |
483 | { | 499 | { |
484 | return i18n("Formatted Name"); | 500 | return i18n("Formatted Name"); |
485 | } | 501 | } |
486 | 502 | ||
487 | 503 | ||
488 | void Addressee::setFamilyName( const QString &familyName ) | 504 | void Addressee::setFamilyName( const QString &familyName ) |
489 | { | 505 | { |
490 | if ( familyName == mData->familyName ) return; | 506 | if ( familyName == mData->familyName ) return; |
491 | detach(); | 507 | detach(); |
492 | mData->empty = false; | 508 | mData->empty = false; |
493 | mData->familyName = familyName; | 509 | mData->familyName = familyName; |
494 | } | 510 | } |
495 | 511 | ||
496 | QString Addressee::familyName() const | 512 | QString Addressee::familyName() const |
497 | { | 513 | { |
498 | return mData->familyName; | 514 | return mData->familyName; |
499 | } | 515 | } |
500 | 516 | ||
501 | QString Addressee::familyNameLabel() | 517 | QString Addressee::familyNameLabel() |
502 | { | 518 | { |
503 | return i18n("Family Name"); | 519 | return i18n("Family Name"); |
504 | } | 520 | } |
505 | 521 | ||
506 | 522 | ||
507 | void Addressee::setGivenName( const QString &givenName ) | 523 | void Addressee::setGivenName( const QString &givenName ) |
508 | { | 524 | { |
509 | if ( givenName == mData->givenName ) return; | 525 | if ( givenName == mData->givenName ) return; |
510 | detach(); | 526 | detach(); |
511 | mData->empty = false; | 527 | mData->empty = false; |
512 | mData->givenName = givenName; | 528 | mData->givenName = givenName; |
513 | } | 529 | } |
514 | 530 | ||
515 | QString Addressee::givenName() const | 531 | QString Addressee::givenName() const |
516 | { | 532 | { |
517 | return mData->givenName; | 533 | return mData->givenName; |
518 | } | 534 | } |
519 | 535 | ||
520 | QString Addressee::givenNameLabel() | 536 | QString Addressee::givenNameLabel() |
521 | { | 537 | { |
522 | return i18n("Given Name"); | 538 | return i18n("Given Name"); |
523 | } | 539 | } |
524 | 540 | ||
525 | 541 | ||
526 | void Addressee::setAdditionalName( const QString &additionalName ) | 542 | void Addressee::setAdditionalName( const QString &additionalName ) |
527 | { | 543 | { |
528 | if ( additionalName == mData->additionalName ) return; | 544 | if ( additionalName == mData->additionalName ) return; |
529 | detach(); | 545 | detach(); |
530 | mData->empty = false; | 546 | mData->empty = false; |
531 | mData->additionalName = additionalName; | 547 | mData->additionalName = additionalName; |
532 | } | 548 | } |
533 | 549 | ||
534 | QString Addressee::additionalName() const | 550 | QString Addressee::additionalName() const |
535 | { | 551 | { |
536 | return mData->additionalName; | 552 | return mData->additionalName; |
537 | } | 553 | } |
538 | 554 | ||
539 | QString Addressee::additionalNameLabel() | 555 | QString Addressee::additionalNameLabel() |
540 | { | 556 | { |
541 | return i18n("Additional Names"); | 557 | return i18n("Additional Names"); |
542 | } | 558 | } |
543 | 559 | ||
544 | 560 | ||
545 | void Addressee::setPrefix( const QString &prefix ) | 561 | void Addressee::setPrefix( const QString &prefix ) |
546 | { | 562 | { |
547 | if ( prefix == mData->prefix ) return; | 563 | if ( prefix == mData->prefix ) return; |
548 | detach(); | 564 | detach(); |
549 | mData->empty = false; | 565 | mData->empty = false; |
550 | mData->prefix = prefix; | 566 | mData->prefix = prefix; |
551 | } | 567 | } |
552 | 568 | ||
553 | QString Addressee::prefix() const | 569 | QString Addressee::prefix() const |
554 | { | 570 | { |
555 | return mData->prefix; | 571 | return mData->prefix; |
556 | } | 572 | } |
557 | 573 | ||
558 | QString Addressee::prefixLabel() | 574 | QString Addressee::prefixLabel() |
559 | { | 575 | { |
560 | return i18n("Honorific Prefixes"); | 576 | return i18n("Honorific Prefixes"); |
561 | } | 577 | } |
562 | 578 | ||
563 | 579 | ||
564 | void Addressee::setSuffix( const QString &suffix ) | 580 | void Addressee::setSuffix( const QString &suffix ) |
565 | { | 581 | { |
566 | if ( suffix == mData->suffix ) return; | 582 | if ( suffix == mData->suffix ) return; |
567 | detach(); | 583 | detach(); |
568 | mData->empty = false; | 584 | mData->empty = false; |
569 | mData->suffix = suffix; | 585 | mData->suffix = suffix; |
570 | } | 586 | } |
571 | 587 | ||
572 | QString Addressee::suffix() const | 588 | QString Addressee::suffix() const |
573 | { | 589 | { |
574 | return mData->suffix; | 590 | return mData->suffix; |
575 | } | 591 | } |
576 | 592 | ||
577 | QString Addressee::suffixLabel() | 593 | QString Addressee::suffixLabel() |
578 | { | 594 | { |
579 | return i18n("Honorific Suffixes"); | 595 | return i18n("Honorific Suffixes"); |
580 | } | 596 | } |
581 | 597 | ||
582 | 598 | ||
583 | void Addressee::setNickName( const QString &nickName ) | 599 | void Addressee::setNickName( const QString &nickName ) |
584 | { | 600 | { |
585 | if ( nickName == mData->nickName ) return; | 601 | if ( nickName == mData->nickName ) return; |
586 | detach(); | 602 | detach(); |
587 | mData->empty = false; | 603 | mData->empty = false; |
588 | mData->nickName = nickName; | 604 | mData->nickName = nickName; |
589 | } | 605 | } |
590 | 606 | ||
591 | QString Addressee::nickName() const | 607 | QString Addressee::nickName() const |
592 | { | 608 | { |
593 | return mData->nickName; | 609 | return mData->nickName; |
594 | } | 610 | } |
595 | 611 | ||
596 | QString Addressee::nickNameLabel() | 612 | QString Addressee::nickNameLabel() |
597 | { | 613 | { |
598 | return i18n("Nick Name"); | 614 | return i18n("Nick Name"); |
599 | } | 615 | } |
600 | 616 | ||
601 | 617 | ||
602 | void Addressee::setBirthday( const QDateTime &birthday ) | 618 | void Addressee::setBirthday( const QDateTime &birthday ) |
603 | { | 619 | { |
604 | if ( birthday == mData->birthday ) return; | 620 | if ( birthday == mData->birthday ) return; |
605 | detach(); | 621 | detach(); |
606 | mData->empty = false; | 622 | mData->empty = false; |
607 | mData->birthday = birthday; | 623 | mData->birthday = birthday; |
608 | } | 624 | } |
609 | 625 | ||
610 | QDateTime Addressee::birthday() const | 626 | QDateTime Addressee::birthday() const |
611 | { | 627 | { |
612 | return mData->birthday; | 628 | return mData->birthday; |
613 | } | 629 | } |
614 | 630 | ||
615 | QString Addressee::birthdayLabel() | 631 | QString Addressee::birthdayLabel() |
616 | { | 632 | { |
617 | return i18n("Birthday"); | 633 | return i18n("Birthday"); |
618 | } | 634 | } |
619 | 635 | ||
620 | 636 | ||
621 | QString Addressee::homeAddressStreetLabel() | 637 | QString Addressee::homeAddressStreetLabel() |
622 | { | 638 | { |
623 | return i18n("Home Address Street"); | 639 | return i18n("Home Address Street"); |
624 | } | 640 | } |
625 | 641 | ||
626 | 642 | ||
627 | QString Addressee::homeAddressLocalityLabel() | 643 | QString Addressee::homeAddressLocalityLabel() |
628 | { | 644 | { |
629 | return i18n("Home Address Locality"); | 645 | return i18n("Home Address Locality"); |
630 | } | 646 | } |
631 | 647 | ||
632 | 648 | ||
633 | QString Addressee::homeAddressRegionLabel() | 649 | QString Addressee::homeAddressRegionLabel() |
634 | { | 650 | { |
635 | return i18n("Home Address Region"); | 651 | return i18n("Home Address Region"); |
636 | } | 652 | } |
637 | 653 | ||
638 | 654 | ||
639 | QString Addressee::homeAddressPostalCodeLabel() | 655 | QString Addressee::homeAddressPostalCodeLabel() |
640 | { | 656 | { |
641 | return i18n("Home Address Postal Code"); | 657 | return i18n("Home Address Postal Code"); |
642 | } | 658 | } |
643 | 659 | ||
644 | 660 | ||
645 | QString Addressee::homeAddressCountryLabel() | 661 | QString Addressee::homeAddressCountryLabel() |
646 | { | 662 | { |
647 | return i18n("Home Address Country"); | 663 | return i18n("Home Address Country"); |
648 | } | 664 | } |
649 | 665 | ||
650 | 666 | ||
651 | QString Addressee::homeAddressLabelLabel() | 667 | QString Addressee::homeAddressLabelLabel() |
652 | { | 668 | { |
653 | return i18n("Home Address Label"); | 669 | return i18n("Home Address Label"); |
654 | } | 670 | } |
655 | 671 | ||
656 | 672 | ||
657 | QString Addressee::businessAddressStreetLabel() | 673 | QString Addressee::businessAddressStreetLabel() |
658 | { | 674 | { |
659 | return i18n("Business Address Street"); | 675 | return i18n("Business Address Street"); |
660 | } | 676 | } |
661 | 677 | ||
662 | 678 | ||
663 | QString Addressee::businessAddressLocalityLabel() | 679 | QString Addressee::businessAddressLocalityLabel() |
664 | { | 680 | { |
665 | return i18n("Business Address Locality"); | 681 | return i18n("Business Address Locality"); |
666 | } | 682 | } |
667 | 683 | ||
668 | 684 | ||
669 | QString Addressee::businessAddressRegionLabel() | 685 | QString Addressee::businessAddressRegionLabel() |
670 | { | 686 | { |
671 | return i18n("Business Address Region"); | 687 | return i18n("Business Address Region"); |
672 | } | 688 | } |
673 | 689 | ||
674 | 690 | ||
675 | QString Addressee::businessAddressPostalCodeLabel() | 691 | QString Addressee::businessAddressPostalCodeLabel() |
676 | { | 692 | { |
677 | return i18n("Business Address Postal Code"); | 693 | return i18n("Business Address Postal Code"); |
678 | } | 694 | } |
679 | 695 | ||
680 | 696 | ||
681 | QString Addressee::businessAddressCountryLabel() | 697 | QString Addressee::businessAddressCountryLabel() |
682 | { | 698 | { |
683 | return i18n("Business Address Country"); | 699 | return i18n("Business Address Country"); |
684 | } | 700 | } |
685 | 701 | ||
686 | 702 | ||
687 | QString Addressee::businessAddressLabelLabel() | 703 | QString Addressee::businessAddressLabelLabel() |
688 | { | 704 | { |
689 | return i18n("Business Address Label"); | 705 | return i18n("Business Address Label"); |
690 | } | 706 | } |
691 | 707 | ||
692 | 708 | ||
693 | QString Addressee::homePhoneLabel() | 709 | QString Addressee::homePhoneLabel() |
694 | { | 710 | { |
695 | return i18n("Home Phone"); | 711 | return i18n("Home Phone"); |
696 | } | 712 | } |
697 | 713 | ||
698 | 714 | ||
699 | QString Addressee::businessPhoneLabel() | 715 | QString Addressee::businessPhoneLabel() |
700 | { | 716 | { |
701 | return i18n("Business Phone"); | 717 | return i18n("Business Phone"); |