-rw-r--r-- | kabc/addressee.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp index fda62f1..e241281 100644 --- a/kabc/addressee.cpp +++ b/kabc/addressee.cpp | |||
@@ -1,521 +1,525 @@ | |||
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 | 46 | ||
47 | struct Addressee::AddresseeData : public KShared | 47 | struct Addressee::AddresseeData : public KShared |
48 | { | 48 | { |
49 | QString uid; | 49 | QString uid; |
50 | QString name; | 50 | QString name; |
51 | QString formattedName; | 51 | QString formattedName; |
52 | QString familyName; | 52 | QString familyName; |
53 | QString givenName; | 53 | QString givenName; |
54 | QString additionalName; | 54 | QString additionalName; |
55 | QString prefix; | 55 | QString prefix; |
56 | QString suffix; | 56 | QString suffix; |
57 | QString nickName; | 57 | QString nickName; |
58 | QDateTime birthday; | 58 | QDateTime birthday; |
59 | QString mailer; | 59 | QString mailer; |
60 | TimeZone timeZone; | 60 | TimeZone timeZone; |
61 | Geo geo; | 61 | Geo geo; |
62 | QString title; | 62 | QString title; |
63 | QString role; | 63 | QString role; |
64 | QString organization; | 64 | QString organization; |
65 | QString note; | 65 | QString note; |
66 | QString productId; | 66 | QString productId; |
67 | QDateTime revision; | 67 | QDateTime revision; |
68 | QString sortString; | 68 | QString sortString; |
69 | QString externalUID; | 69 | QString externalUID; |
70 | QString originalExternalUID; | 70 | QString originalExternalUID; |
71 | KURL url; | 71 | KURL url; |
72 | Secrecy secrecy; | 72 | Secrecy secrecy; |
73 | Picture logo; | 73 | Picture logo; |
74 | Picture photo; | 74 | Picture photo; |
75 | Sound sound; | 75 | Sound sound; |
76 | Agent agent; | 76 | Agent agent; |
77 | QString mExternalId; | 77 | QString mExternalId; |
78 | PhoneNumber::List phoneNumbers; | 78 | PhoneNumber::List phoneNumbers; |
79 | Address::List addresses; | 79 | Address::List addresses; |
80 | Key::List keys; | 80 | Key::List keys; |
81 | QStringList emails; | 81 | QStringList emails; |
82 | QStringList categories; | 82 | QStringList categories; |
83 | QStringList custom; | 83 | QStringList custom; |
84 | int mTempSyncStat; | 84 | int mTempSyncStat; |
85 | Resource *resource; | 85 | Resource *resource; |
86 | 86 | ||
87 | bool empty :1; | 87 | bool empty :1; |
88 | bool changed :1; | 88 | bool changed :1; |
89 | }; | 89 | }; |
90 | 90 | ||
91 | Addressee::Addressee() | 91 | Addressee::Addressee() |
92 | { | 92 | { |
93 | mData = new AddresseeData; | 93 | mData = new AddresseeData; |
94 | mData->empty = true; | 94 | mData->empty = true; |
95 | mData->changed = false; | 95 | mData->changed = false; |
96 | mData->resource = 0; | 96 | mData->resource = 0; |
97 | mData->mExternalId = ":"; | 97 | mData->mExternalId = ":"; |
98 | mData->revision = QDateTime ( QDate( 2004,1,1)); | 98 | mData->revision = QDateTime ( QDate( 2003,1,1)); |
99 | mData->mTempSyncStat = SYNC_TEMPSTATE_INITIAL; | 99 | mData->mTempSyncStat = SYNC_TEMPSTATE_INITIAL; |
100 | } | 100 | } |
101 | 101 | ||
102 | Addressee::~Addressee() | 102 | Addressee::~Addressee() |
103 | { | 103 | { |
104 | } | 104 | } |
105 | 105 | ||
106 | Addressee::Addressee( const Addressee &a ) | 106 | Addressee::Addressee( const Addressee &a ) |
107 | { | 107 | { |
108 | mData = a.mData; | 108 | mData = a.mData; |
109 | } | 109 | } |
110 | 110 | ||
111 | Addressee &Addressee::operator=( const Addressee &a ) | 111 | Addressee &Addressee::operator=( const Addressee &a ) |
112 | { | 112 | { |
113 | mData = a.mData; | 113 | mData = a.mData; |
114 | return (*this); | 114 | return (*this); |
115 | } | 115 | } |
116 | 116 | ||
117 | Addressee Addressee::copy() | 117 | Addressee Addressee::copy() |
118 | { | 118 | { |
119 | Addressee a; | 119 | Addressee a; |
120 | *(a.mData) = *mData; | 120 | *(a.mData) = *mData; |
121 | return a; | 121 | return a; |
122 | } | 122 | } |
123 | 123 | ||
124 | void Addressee::detach() | 124 | void Addressee::detach() |
125 | { | 125 | { |
126 | if ( mData.count() == 1 ) return; | 126 | if ( mData.count() == 1 ) return; |
127 | *this = copy(); | 127 | *this = copy(); |
128 | } | 128 | } |
129 | 129 | ||
130 | bool Addressee::operator==( const Addressee &a ) const | 130 | bool Addressee::operator==( const Addressee &a ) const |
131 | { | 131 | { |
132 | if ( uid() != a.uid() ) return false; | 132 | if ( uid() != a.uid() ) return false; |
133 | if ( mData->name != a.mData->name ) return false; | 133 | if ( mData->name != a.mData->name ) return false; |
134 | if ( mData->formattedName != a.mData->formattedName ) return false; | 134 | if ( mData->formattedName != a.mData->formattedName ) return false; |
135 | if ( mData->familyName != a.mData->familyName ) return false; | 135 | if ( mData->familyName != a.mData->familyName ) return false; |
136 | if ( mData->givenName != a.mData->givenName ) return false; | 136 | if ( mData->givenName != a.mData->givenName ) return false; |
137 | if ( mData->additionalName != a.mData->additionalName ) return false; | 137 | if ( mData->additionalName != a.mData->additionalName ) return false; |
138 | if ( mData->prefix != a.mData->prefix ) return false; | 138 | if ( mData->prefix != a.mData->prefix ) return false; |
139 | if ( mData->suffix != a.mData->suffix ) return false; | 139 | if ( mData->suffix != a.mData->suffix ) return false; |
140 | if ( mData->nickName != a.mData->nickName ) return false; | 140 | if ( mData->nickName != a.mData->nickName ) return false; |
141 | if ( mData->birthday != a.mData->birthday ) return false; | 141 | if ( mData->birthday != a.mData->birthday ) return false; |
142 | if ( mData->mailer != a.mData->mailer ) return false; | 142 | if ( mData->mailer != a.mData->mailer ) return false; |
143 | if ( mData->timeZone != a.mData->timeZone ) return false; | 143 | if ( mData->timeZone != a.mData->timeZone ) return false; |
144 | if ( mData->geo != a.mData->geo ) return false; | 144 | if ( mData->geo != a.mData->geo ) return false; |
145 | if ( mData->title != a.mData->title ) return false; | 145 | if ( mData->title != a.mData->title ) return false; |
146 | if ( mData->role != a.mData->role ) return false; | 146 | if ( mData->role != a.mData->role ) return false; |
147 | if ( mData->organization != a.mData->organization ) return false; | 147 | if ( mData->organization != a.mData->organization ) return false; |
148 | if ( mData->note != a.mData->note ) return false; | 148 | if ( mData->note != a.mData->note ) return false; |
149 | if ( mData->productId != a.mData->productId ) return false; | 149 | if ( mData->productId != a.mData->productId ) return false; |
150 | //if ( mData->revision != a.mData->revision ) return false; | 150 | //if ( mData->revision != a.mData->revision ) return false; |
151 | if ( mData->sortString != a.mData->sortString ) return false; | 151 | if ( mData->sortString != a.mData->sortString ) return false; |
152 | if ( mData->secrecy != a.mData->secrecy ) return false; | 152 | if ( mData->secrecy != a.mData->secrecy ) return false; |
153 | if ( mData->logo != a.mData->logo ) return false; | 153 | if ( mData->logo != a.mData->logo ) return false; |
154 | if ( mData->photo != a.mData->photo ) return false; | 154 | if ( mData->photo != a.mData->photo ) return false; |
155 | if ( mData->sound != a.mData->sound ) return false; | 155 | if ( mData->sound != a.mData->sound ) return false; |
156 | if ( mData->agent != a.mData->agent ) return false; | 156 | if ( mData->agent != a.mData->agent ) return false; |
157 | if ( ( mData->url.isValid() || a.mData->url.isValid() ) && | 157 | if ( ( mData->url.isValid() || a.mData->url.isValid() ) && |
158 | ( mData->url != a.mData->url ) ) return false; | 158 | ( mData->url != a.mData->url ) ) return false; |
159 | if ( mData->phoneNumbers != a.mData->phoneNumbers ) return false; | 159 | if ( mData->phoneNumbers != a.mData->phoneNumbers ) return false; |
160 | if ( mData->addresses != a.mData->addresses ) return false; | 160 | if ( mData->addresses != a.mData->addresses ) return false; |
161 | if ( mData->keys != a.mData->keys ) return false; | 161 | if ( mData->keys != a.mData->keys ) return false; |
162 | if ( mData->emails != a.mData->emails ) return false; | 162 | if ( mData->emails != a.mData->emails ) return false; |
163 | if ( mData->categories != a.mData->categories ) return false; | 163 | if ( mData->categories != a.mData->categories ) return false; |
164 | if ( mData->custom != a.mData->custom ) return false; | 164 | if ( mData->custom != a.mData->custom ) return false; |
165 | 165 | ||
166 | return true; | 166 | return true; |
167 | } | 167 | } |
168 | 168 | ||
169 | bool Addressee::operator!=( const Addressee &a ) const | 169 | bool Addressee::operator!=( const Addressee &a ) const |
170 | { | 170 | { |
171 | return !( a == *this ); | 171 | return !( a == *this ); |
172 | } | 172 | } |
173 | 173 | ||
174 | bool Addressee::isEmpty() const | 174 | bool Addressee::isEmpty() const |
175 | { | 175 | { |
176 | return mData->empty; | 176 | return mData->empty; |
177 | } | 177 | } |
178 | ulong Addressee::getCsum4List( const QStringList & attList) | 178 | ulong Addressee::getCsum4List( const QStringList & attList) |
179 | { | 179 | { |
180 | int max = attList.count(); | 180 | int max = attList.count(); |
181 | ulong cSum = 0; | 181 | ulong cSum = 0; |
182 | int j,k,i; | 182 | int j,k,i; |
183 | int add; | 183 | int add; |
184 | for ( i = 0; i < max ; ++i ) { | 184 | for ( i = 0; i < max ; ++i ) { |
185 | QString s = attList[i]; | 185 | QString s = attList[i]; |
186 | if ( ! s.isEmpty() ){ | 186 | if ( ! s.isEmpty() ){ |
187 | j = s.length(); | 187 | j = s.length(); |
188 | for ( k = 0; k < j; ++k ) { | 188 | for ( k = 0; k < j; ++k ) { |
189 | int mul = k +1; | 189 | int mul = k +1; |
190 | add = s[k].unicode (); | 190 | add = s[k].unicode (); |
191 | if ( k < 16 ) | 191 | if ( k < 16 ) |
192 | mul = mul * mul; | 192 | mul = mul * mul; |
193 | int ii = i+1; | 193 | int ii = i+1; |
194 | add = add * mul *ii*ii*ii; | 194 | add = add * mul *ii*ii*ii; |
195 | cSum += add; | 195 | cSum += add; |
196 | } | 196 | } |
197 | } | 197 | } |
198 | 198 | ||
199 | } | 199 | } |
200 | //QString dump = attList.join(","); | 200 | //QString dump = attList.join(","); |
201 | //qDebug("csum: %d %s", cSum,dump.latin1()); | 201 | //qDebug("csum: %d %s", cSum,dump.latin1()); |
202 | 202 | ||
203 | return cSum; | 203 | return cSum; |
204 | 204 | ||
205 | } | 205 | } |
206 | void Addressee::computeCsum(const QString &dev) | 206 | void Addressee::computeCsum(const QString &dev) |
207 | { | 207 | { |
208 | QStringList l; | 208 | QStringList l; |
209 | if ( !mData->name.isEmpty() ) l.append(mData->name); | 209 | if ( !mData->name.isEmpty() ) l.append(mData->name); |
210 | if ( !mData->formattedName.isEmpty() ) l.append(mData->formattedName ); | 210 | if ( !mData->formattedName.isEmpty() ) l.append(mData->formattedName ); |
211 | if ( !mData->familyName.isEmpty() ) l.append( mData->familyName ); | 211 | if ( !mData->familyName.isEmpty() ) l.append( mData->familyName ); |
212 | if ( !mData->givenName.isEmpty() ) l.append(mData->givenName ); | 212 | if ( !mData->givenName.isEmpty() ) l.append(mData->givenName ); |
213 | if ( !mData->additionalName ) l.append( mData->additionalName ); | 213 | if ( !mData->additionalName ) l.append( mData->additionalName ); |
214 | if ( !mData->prefix.isEmpty() ) l.append( mData->prefix ); | 214 | if ( !mData->prefix.isEmpty() ) l.append( mData->prefix ); |
215 | if ( !mData->suffix.isEmpty() ) l.append( mData->suffix ); | 215 | if ( !mData->suffix.isEmpty() ) l.append( mData->suffix ); |
216 | if ( !mData->nickName.isEmpty() ) l.append( mData->nickName ); | 216 | if ( !mData->nickName.isEmpty() ) l.append( mData->nickName ); |
217 | if ( mData->birthday.isValid() ) l.append( mData->birthday.toString() ); | 217 | if ( mData->birthday.isValid() ) l.append( mData->birthday.toString() ); |
218 | if ( !mData->mailer.isEmpty() ) l.append( mData->mailer ); | 218 | if ( !mData->mailer.isEmpty() ) l.append( mData->mailer ); |
219 | if ( mData->timeZone.isValid() ) l.append( mData->timeZone.asString() ); | 219 | if ( mData->timeZone.isValid() ) l.append( mData->timeZone.asString() ); |
220 | if ( mData->geo.isValid() ) l.append( mData->geo.asString() ); | 220 | if ( mData->geo.isValid() ) l.append( mData->geo.asString() ); |
221 | if ( !mData->title .isEmpty() ) l.append( mData->title ); | 221 | if ( !mData->title .isEmpty() ) l.append( mData->title ); |
222 | if ( !mData->role.isEmpty() ) l.append( mData->role ); | 222 | if ( !mData->role.isEmpty() ) l.append( mData->role ); |
223 | if ( !mData->organization.isEmpty() ) l.append( mData->organization ); | 223 | if ( !mData->organization.isEmpty() ) l.append( mData->organization ); |
224 | if ( !mData->note.isEmpty() ) l.append( mData->note ); | 224 | if ( !mData->note.isEmpty() ) l.append( mData->note ); |
225 | if ( !mData->productId.isEmpty() ) l.append(mData->productId ); | 225 | if ( !mData->productId.isEmpty() ) l.append(mData->productId ); |
226 | if ( !mData->sortString.isEmpty() ) l.append( mData->sortString ); | 226 | if ( !mData->sortString.isEmpty() ) l.append( mData->sortString ); |
227 | if ( mData->secrecy.isValid() ) l.append( mData->secrecy.asString()); | 227 | if ( mData->secrecy.isValid() ) l.append( mData->secrecy.asString()); |
228 | // if ( !mData->logo.isEmpty() ) l.append( ); | 228 | // if ( !mData->logo.isEmpty() ) l.append( ); |
229 | //if ( !mData->photo.isEmpty() ) l.append( ); | 229 | //if ( !mData->photo.isEmpty() ) l.append( ); |
230 | //if ( !mData->sound.isEmpty() ) l.append( ); | 230 | //if ( !mData->sound.isEmpty() ) l.append( ); |
231 | //if ( !mData->agent.isEmpty() ) l.append( ); | 231 | //if ( !mData->agent.isEmpty() ) l.append( ); |
232 | //if ( mData->url.isValid() ) l.append( ); | 232 | //if ( mData->url.isValid() ) l.append( ); |
233 | #if 0 | 233 | #if 0 |
234 | if ( !mData->phoneNumbers.isEmpty() ) l.append( ); | 234 | if ( !mData->phoneNumbers.isEmpty() ) l.append( ); |
235 | if ( !mData->addresses.isEmpty() ) l.append( ); | 235 | if ( !mData->addresses.isEmpty() ) l.append( ); |
236 | //if ( !mData->keys.isEmpty() ) l.append( ); | 236 | //if ( !mData->keys.isEmpty() ) l.append( ); |
237 | if ( !mData->emails.isEmpty() ) l.append( ); | 237 | if ( !mData->emails.isEmpty() ) l.append( ); |
238 | if ( !mData->categories .isEmpty() ) l.append( ); | 238 | if ( !mData->categories .isEmpty() ) l.append( ); |
239 | if ( !mData->custom.isEmpty() ) l.append( ); | 239 | if ( !mData->custom.isEmpty() ) l.append( ); |
240 | #endif | 240 | #endif |
241 | KABC::PhoneNumber::List phoneNumbers; | 241 | KABC::PhoneNumber::List phoneNumbers; |
242 | KABC::PhoneNumber::List::Iterator phoneIter; | 242 | KABC::PhoneNumber::List::Iterator phoneIter; |
243 | 243 | ||
244 | QStringList t; | 244 | QStringList t; |
245 | for ( phoneIter = mData->phoneNumbers.begin(); phoneIter != mData->phoneNumbers.end(); | 245 | for ( phoneIter = mData->phoneNumbers.begin(); phoneIter != mData->phoneNumbers.end(); |
246 | ++phoneIter ) | 246 | ++phoneIter ) |
247 | t.append( ( *phoneIter ).number()+QString::number( ( *phoneIter ).type() ) ); | 247 | t.append( ( *phoneIter ).number()+QString::number( ( *phoneIter ).type() ) ); |
248 | t.sort(); | 248 | t.sort(); |
249 | uint iii; | 249 | uint iii; |
250 | for ( iii = 0; iii < t.count(); ++iii) | 250 | for ( iii = 0; iii < t.count(); ++iii) |
251 | l.append( t[iii] ); | 251 | l.append( t[iii] ); |
252 | t = mData->emails; | 252 | t = mData->emails; |
253 | t.sort(); | 253 | t.sort(); |
254 | for ( iii = 0; iii < t.count(); ++iii) | 254 | for ( iii = 0; iii < t.count(); ++iii) |
255 | l.append( t[iii] ); | 255 | l.append( t[iii] ); |
256 | t = mData->categories; | 256 | t = mData->categories; |
257 | t.sort(); | 257 | t.sort(); |
258 | for ( iii = 0; iii < t.count(); ++iii) | 258 | for ( iii = 0; iii < t.count(); ++iii) |
259 | l.append( t[iii] ); | 259 | l.append( t[iii] ); |
260 | t = mData->custom; | 260 | t = mData->custom; |
261 | t.sort(); | 261 | t.sort(); |
262 | for ( iii = 0; iii < t.count(); ++iii) | 262 | for ( iii = 0; iii < t.count(); ++iii) |
263 | l.append( t[iii] ); | 263 | l.append( t[iii] ); |
264 | KABC::Address::List::Iterator addressIter; | 264 | KABC::Address::List::Iterator addressIter; |
265 | for ( addressIter = mData->addresses.begin(); addressIter != mData->addresses.end(); | 265 | for ( addressIter = mData->addresses.begin(); addressIter != mData->addresses.end(); |
266 | ++addressIter ) { | 266 | ++addressIter ) { |
267 | t = (*addressIter).asList(); | 267 | t = (*addressIter).asList(); |
268 | t.sort(); | 268 | t.sort(); |
269 | for ( iii = 0; iii < t.count(); ++iii) | 269 | for ( iii = 0; iii < t.count(); ++iii) |
270 | l.append( t[iii] ); | 270 | l.append( t[iii] ); |
271 | } | 271 | } |
272 | uint cs = getCsum4List(l); | 272 | uint cs = getCsum4List(l); |
273 | // qDebug("CSUM computed %d %s %s", cs,QString::number (cs ).latin1(), uid().latin1() ); | 273 | // qDebug("CSUM computed %d %s %s", cs,QString::number (cs ).latin1(), uid().latin1() ); |
274 | setCsum( dev, QString::number (cs )); | 274 | setCsum( dev, QString::number (cs )); |
275 | } | 275 | } |
276 | 276 | ||
277 | void Addressee::mergeContact( const Addressee& ad ) | 277 | void Addressee::mergeContact( const Addressee& ad ) |
278 | { | 278 | { |
279 | 279 | ||
280 | detach(); | 280 | detach(); |
281 | if ( mData->name.isEmpty() ) mData->name = ad.mData->name; | 281 | if ( mData->name.isEmpty() ) mData->name = ad.mData->name; |
282 | if ( mData->formattedName.isEmpty() ) mData->formattedName = ad.mData->formattedName; | 282 | if ( mData->formattedName.isEmpty() ) mData->formattedName = ad.mData->formattedName; |
283 | if ( mData->familyName.isEmpty() ) mData->familyName = ad.mData->familyName; | 283 | if ( mData->familyName.isEmpty() ) mData->familyName = ad.mData->familyName; |
284 | if ( mData->givenName.isEmpty() ) mData->givenName = ad.mData->givenName ; | 284 | if ( mData->givenName.isEmpty() ) mData->givenName = ad.mData->givenName ; |
285 | if ( mData->additionalName ) mData->additionalName = ad.mData->additionalName; | 285 | if ( mData->additionalName ) mData->additionalName = ad.mData->additionalName; |
286 | if ( mData->prefix.isEmpty() ) mData->prefix = ad.mData->prefix; | 286 | if ( mData->prefix.isEmpty() ) mData->prefix = ad.mData->prefix; |
287 | if ( mData->suffix.isEmpty() ) mData->suffix = ad.mData->suffix; | 287 | if ( mData->suffix.isEmpty() ) mData->suffix = ad.mData->suffix; |
288 | if ( mData->nickName.isEmpty() ) mData->nickName = ad.mData->nickName; | 288 | if ( mData->nickName.isEmpty() ) mData->nickName = ad.mData->nickName; |
289 | if ( !mData->birthday.isValid() ) | 289 | if ( !mData->birthday.isValid() ) |
290 | if ( ad.mData->birthday.isValid()) | 290 | if ( ad.mData->birthday.isValid()) |
291 | mData->birthday = ad.mData->birthday; | 291 | mData->birthday = ad.mData->birthday; |
292 | if ( mData->mailer.isEmpty() ) mData->mailer = ad.mData->mailer; | 292 | if ( mData->mailer.isEmpty() ) mData->mailer = ad.mData->mailer; |
293 | if ( !mData->timeZone.isValid() ) mData->timeZone = ad.mData->timeZone; | 293 | if ( !mData->timeZone.isValid() ) mData->timeZone = ad.mData->timeZone; |
294 | if ( !mData->geo.isValid() ) mData->geo = ad.mData->geo; | 294 | if ( !mData->geo.isValid() ) mData->geo = ad.mData->geo; |
295 | if ( mData->title .isEmpty() ) mData->title = ad.mData->title ; | 295 | if ( mData->title .isEmpty() ) mData->title = ad.mData->title ; |
296 | if ( mData->role.isEmpty() ) mData->role = ad.mData->role ; | 296 | if ( mData->role.isEmpty() ) mData->role = ad.mData->role ; |
297 | if ( mData->organization.isEmpty() ) mData->organization = ad.mData->organization ; | 297 | if ( mData->organization.isEmpty() ) mData->organization = ad.mData->organization ; |
298 | if ( mData->note.isEmpty() ) mData->note = ad.mData->note ; | 298 | if ( mData->note.isEmpty() ) mData->note = ad.mData->note ; |
299 | if ( mData->productId.isEmpty() ) mData->productId = ad.mData->productId; | 299 | if ( mData->productId.isEmpty() ) mData->productId = ad.mData->productId; |
300 | if ( mData->sortString.isEmpty() ) mData->sortString = ad.mData->sortString; | 300 | if ( mData->sortString.isEmpty() ) mData->sortString = ad.mData->sortString; |
301 | if ( !mData->secrecy.isValid() ) mData->secrecy = ad.mData->secrecy; | 301 | if ( !mData->secrecy.isValid() ) mData->secrecy = ad.mData->secrecy; |
302 | if ( ( !mData->url.isValid() && ad.mData->url.isValid() ) ) mData->url = ad.mData->url ; | 302 | if ( ( !mData->url.isValid() && ad.mData->url.isValid() ) ) mData->url = ad.mData->url ; |
303 | 303 | ||
304 | // pending: | 304 | // pending: |
305 | // merging phonenumbers | 305 | // merging phonenumbers |
306 | // merging addresses | 306 | // merging addresses |
307 | // merging emails; | 307 | // merging emails; |
308 | // merging categories; | 308 | // merging categories; |
309 | // merging custom; | 309 | // merging custom; |
310 | // merging keys | 310 | // merging keys |
311 | qDebug("merge contact %s ", ad.uid().latin1()); | ||
312 | setUid( ad.uid() ); | ||
311 | } | 313 | } |
312 | 314 | ||
313 | void Addressee::removeID(const QString &prof) | 315 | void Addressee::removeID(const QString &prof) |
314 | { | 316 | { |
315 | detach(); | 317 | detach(); |
316 | mData->mExternalId = KIdManager::removeId ( mData->mExternalId, prof); | 318 | mData->mExternalId = KIdManager::removeId ( mData->mExternalId, prof); |
317 | 319 | ||
318 | } | 320 | } |
319 | void Addressee::setID( const QString & prof , const QString & id ) | 321 | void Addressee::setID( const QString & prof , const QString & id ) |
320 | { | 322 | { |
321 | detach(); | 323 | detach(); |
322 | mData->mExternalId = KIdManager::setId ( mData->mExternalId, prof, id ); | 324 | mData->mExternalId = KIdManager::setId ( mData->mExternalId, prof, id ); |
323 | //qDebug("setID2 %s %s %s",mData->mExternalId.latin1(), prof.latin1(), id.latin1() ); | 325 | //qDebug("setID2 %s %s %s",mData->mExternalId.latin1(), prof.latin1(), id.latin1() ); |
324 | } | 326 | } |
325 | void Addressee::setTempSyncStat( int id ) | 327 | void Addressee::setTempSyncStat( int id ) |
326 | { | 328 | { |
327 | if ( mData->mTempSyncStat == id ) return; | 329 | if ( mData->mTempSyncStat == id ) return; |
328 | detach(); | 330 | detach(); |
329 | mData->mTempSyncStat = id; | 331 | mData->mTempSyncStat = id; |
330 | } | 332 | } |
331 | int Addressee::tempSyncStat() const | 333 | int Addressee::tempSyncStat() const |
332 | { | 334 | { |
333 | return mData->mTempSyncStat; | 335 | return mData->mTempSyncStat; |
334 | } | 336 | } |
335 | 337 | ||
336 | QString Addressee::getID( const QString & prof) | 338 | QString Addressee::getID( const QString & prof) |
337 | { | 339 | { |
338 | return KIdManager::getId ( mData->mExternalId, prof ); | 340 | return KIdManager::getId ( mData->mExternalId, prof ); |
339 | } | 341 | } |
340 | 342 | ||
341 | void Addressee::setCsum( const QString & prof , const QString & id ) | 343 | void Addressee::setCsum( const QString & prof , const QString & id ) |
342 | { | 344 | { |
343 | detach(); | 345 | detach(); |
344 | //qDebug("setcsum1 %s %s %s",mData->mExternalId.latin1(), prof.latin1(), id.latin1() ); | 346 | //qDebug("setcsum1 %s %s %s",mData->mExternalId.latin1(), prof.latin1(), id.latin1() ); |
345 | mData->mExternalId = KIdManager::setCsum ( mData->mExternalId, prof, id ); | 347 | mData->mExternalId = KIdManager::setCsum ( mData->mExternalId, prof, id ); |
346 | //qDebug("setcsum2 %s ",mData->mExternalId.latin1() ); | 348 | //qDebug("setcsum2 %s ",mData->mExternalId.latin1() ); |
347 | } | 349 | } |
348 | 350 | ||
349 | QString Addressee::getCsum( const QString & prof) | 351 | QString Addressee::getCsum( const QString & prof) |
350 | { | 352 | { |
351 | return KIdManager::getCsum ( mData->mExternalId, prof ); | 353 | return KIdManager::getCsum ( mData->mExternalId, prof ); |
352 | } | 354 | } |
353 | 355 | ||
354 | void Addressee::setIDStr( const QString & s ) | 356 | void Addressee::setIDStr( const QString & s ) |
355 | { | 357 | { |
356 | detach(); | 358 | detach(); |
357 | mData->mExternalId = s; | 359 | mData->mExternalId = s; |
358 | } | 360 | } |
359 | 361 | ||
360 | QString Addressee::IDStr() const | 362 | QString Addressee::IDStr() const |
361 | { | 363 | { |
362 | return mData->mExternalId; | 364 | return mData->mExternalId; |
363 | } | 365 | } |
364 | 366 | ||
365 | void Addressee::setExternalUID( const QString &id ) | 367 | void Addressee::setExternalUID( const QString &id ) |
366 | { | 368 | { |
367 | if ( id == mData->externalUID ) return; | 369 | if ( id == mData->externalUID ) return; |
368 | detach(); | 370 | detach(); |
369 | mData->empty = false; | 371 | mData->empty = false; |
370 | mData->externalUID = id; | 372 | mData->externalUID = id; |
371 | } | 373 | } |
372 | 374 | ||
373 | QString Addressee::externalUID() const | 375 | QString Addressee::externalUID() const |
374 | { | 376 | { |
375 | return mData->externalUID; | 377 | return mData->externalUID; |
376 | } | 378 | } |
377 | void Addressee::setOriginalExternalUID( const QString &id ) | 379 | void Addressee::setOriginalExternalUID( const QString &id ) |
378 | { | 380 | { |
379 | if ( id == mData->originalExternalUID ) return; | 381 | if ( id == mData->originalExternalUID ) return; |
380 | detach(); | 382 | detach(); |
381 | mData->empty = false; | 383 | mData->empty = false; |
384 | qDebug("*******Set orig uid %s ", id.latin1()); | ||
382 | mData->originalExternalUID = id; | 385 | mData->originalExternalUID = id; |
383 | } | 386 | } |
384 | 387 | ||
385 | QString Addressee::originalExternalUID() const | 388 | QString Addressee::originalExternalUID() const |
386 | { | 389 | { |
387 | return mData->originalExternalUID; | 390 | return mData->originalExternalUID; |
388 | } | 391 | } |
389 | 392 | ||
390 | void Addressee::setUid( const QString &id ) | 393 | void Addressee::setUid( const QString &id ) |
391 | { | 394 | { |
392 | if ( id == mData->uid ) return; | 395 | if ( id == mData->uid ) return; |
393 | detach(); | 396 | detach(); |
397 | qDebug("****setuid %s ", id.latin1()); | ||
394 | mData->empty = false; | 398 | mData->empty = false; |
395 | mData->uid = id; | 399 | mData->uid = id; |
396 | } | 400 | } |
397 | 401 | ||
398 | QString Addressee::uid() const | 402 | QString Addressee::uid() const |
399 | { | 403 | { |
400 | if ( mData->uid.isEmpty() ) | 404 | if ( mData->uid.isEmpty() ) |
401 | mData->uid = KApplication::randomString( 10 ); | 405 | mData->uid = KApplication::randomString( 10 ); |
402 | 406 | ||
403 | return mData->uid; | 407 | return mData->uid; |
404 | } | 408 | } |
405 | 409 | ||
406 | QString Addressee::uidLabel() | 410 | QString Addressee::uidLabel() |
407 | { | 411 | { |
408 | return i18n("Unique Identifier"); | 412 | return i18n("Unique Identifier"); |
409 | } | 413 | } |
410 | 414 | ||
411 | void Addressee::setName( const QString &name ) | 415 | void Addressee::setName( const QString &name ) |
412 | { | 416 | { |
413 | if ( name == mData->name ) return; | 417 | if ( name == mData->name ) return; |
414 | detach(); | 418 | detach(); |
415 | mData->empty = false; | 419 | mData->empty = false; |
416 | mData->name = name; | 420 | mData->name = name; |
417 | } | 421 | } |
418 | 422 | ||
419 | QString Addressee::name() const | 423 | QString Addressee::name() const |
420 | { | 424 | { |
421 | return mData->name; | 425 | return mData->name; |
422 | } | 426 | } |
423 | 427 | ||
424 | QString Addressee::nameLabel() | 428 | QString Addressee::nameLabel() |
425 | { | 429 | { |
426 | return i18n("Name"); | 430 | return i18n("Name"); |
427 | } | 431 | } |
428 | 432 | ||
429 | 433 | ||
430 | void Addressee::setFormattedName( const QString &formattedName ) | 434 | void Addressee::setFormattedName( const QString &formattedName ) |
431 | { | 435 | { |
432 | if ( formattedName == mData->formattedName ) return; | 436 | if ( formattedName == mData->formattedName ) return; |
433 | detach(); | 437 | detach(); |
434 | mData->empty = false; | 438 | mData->empty = false; |
435 | mData->formattedName = formattedName; | 439 | mData->formattedName = formattedName; |
436 | } | 440 | } |
437 | 441 | ||
438 | QString Addressee::formattedName() const | 442 | QString Addressee::formattedName() const |
439 | { | 443 | { |
440 | return mData->formattedName; | 444 | return mData->formattedName; |
441 | } | 445 | } |
442 | 446 | ||
443 | QString Addressee::formattedNameLabel() | 447 | QString Addressee::formattedNameLabel() |
444 | { | 448 | { |
445 | return i18n("Formatted Name"); | 449 | return i18n("Formatted Name"); |
446 | } | 450 | } |
447 | 451 | ||
448 | 452 | ||
449 | void Addressee::setFamilyName( const QString &familyName ) | 453 | void Addressee::setFamilyName( const QString &familyName ) |
450 | { | 454 | { |
451 | if ( familyName == mData->familyName ) return; | 455 | if ( familyName == mData->familyName ) return; |
452 | detach(); | 456 | detach(); |
453 | mData->empty = false; | 457 | mData->empty = false; |
454 | mData->familyName = familyName; | 458 | mData->familyName = familyName; |
455 | } | 459 | } |
456 | 460 | ||
457 | QString Addressee::familyName() const | 461 | QString Addressee::familyName() const |
458 | { | 462 | { |
459 | return mData->familyName; | 463 | return mData->familyName; |
460 | } | 464 | } |
461 | 465 | ||
462 | QString Addressee::familyNameLabel() | 466 | QString Addressee::familyNameLabel() |
463 | { | 467 | { |
464 | return i18n("Family Name"); | 468 | return i18n("Family Name"); |
465 | } | 469 | } |
466 | 470 | ||
467 | 471 | ||
468 | void Addressee::setGivenName( const QString &givenName ) | 472 | void Addressee::setGivenName( const QString &givenName ) |
469 | { | 473 | { |
470 | if ( givenName == mData->givenName ) return; | 474 | if ( givenName == mData->givenName ) return; |
471 | detach(); | 475 | detach(); |
472 | mData->empty = false; | 476 | mData->empty = false; |
473 | mData->givenName = givenName; | 477 | mData->givenName = givenName; |
474 | } | 478 | } |
475 | 479 | ||
476 | QString Addressee::givenName() const | 480 | QString Addressee::givenName() const |
477 | { | 481 | { |
478 | return mData->givenName; | 482 | return mData->givenName; |
479 | } | 483 | } |
480 | 484 | ||
481 | QString Addressee::givenNameLabel() | 485 | QString Addressee::givenNameLabel() |
482 | { | 486 | { |
483 | return i18n("Given Name"); | 487 | return i18n("Given Name"); |
484 | } | 488 | } |
485 | 489 | ||
486 | 490 | ||
487 | void Addressee::setAdditionalName( const QString &additionalName ) | 491 | void Addressee::setAdditionalName( const QString &additionalName ) |
488 | { | 492 | { |
489 | if ( additionalName == mData->additionalName ) return; | 493 | if ( additionalName == mData->additionalName ) return; |
490 | detach(); | 494 | detach(); |
491 | mData->empty = false; | 495 | mData->empty = false; |
492 | mData->additionalName = additionalName; | 496 | mData->additionalName = additionalName; |
493 | } | 497 | } |
494 | 498 | ||
495 | QString Addressee::additionalName() const | 499 | QString Addressee::additionalName() const |
496 | { | 500 | { |
497 | return mData->additionalName; | 501 | return mData->additionalName; |
498 | } | 502 | } |
499 | 503 | ||
500 | QString Addressee::additionalNameLabel() | 504 | QString Addressee::additionalNameLabel() |
501 | { | 505 | { |
502 | return i18n("Additional Names"); | 506 | return i18n("Additional Names"); |
503 | } | 507 | } |
504 | 508 | ||
505 | 509 | ||
506 | void Addressee::setPrefix( const QString &prefix ) | 510 | void Addressee::setPrefix( const QString &prefix ) |
507 | { | 511 | { |
508 | if ( prefix == mData->prefix ) return; | 512 | if ( prefix == mData->prefix ) return; |
509 | detach(); | 513 | detach(); |
510 | mData->empty = false; | 514 | mData->empty = false; |
511 | mData->prefix = prefix; | 515 | mData->prefix = prefix; |
512 | } | 516 | } |
513 | 517 | ||
514 | QString Addressee::prefix() const | 518 | QString Addressee::prefix() const |
515 | { | 519 | { |
516 | return mData->prefix; | 520 | return mData->prefix; |
517 | } | 521 | } |
518 | 522 | ||
519 | QString Addressee::prefixLabel() | 523 | QString Addressee::prefixLabel() |
520 | { | 524 | { |
521 | return i18n("Honorific Prefixes"); | 525 | return i18n("Honorific Prefixes"); |