summaryrefslogtreecommitdiffabout
path: root/kabc
authorzautrix <zautrix>2004-09-18 13:13:58 (UTC)
committer zautrix <zautrix>2004-09-18 13:13:58 (UTC)
commitbb16660f29fc709791aa0ee4cb63a40710a994a8 (patch) (unidiff)
tree5d7387987848039bb3594a624b819d136a38b0cd /kabc
parent4ec7c78ebd2c5a79ff224e9b07d9a3164f7fe602 (diff)
downloadkdepimpi-bb16660f29fc709791aa0ee4cb63a40710a994a8.zip
kdepimpi-bb16660f29fc709791aa0ee4cb63a40710a994a8.tar.gz
kdepimpi-bb16660f29fc709791aa0ee4cb63a40710a994a8.tar.bz2
more AB syncing
Diffstat (limited to 'kabc') (more/less context) (ignore whitespace changes)
-rw-r--r--kabc/addressbook.cpp27
-rw-r--r--kabc/addressbook.h5
-rw-r--r--kabc/addressee.cpp54
-rw-r--r--kabc/addressee.h12
4 files changed, 96 insertions, 2 deletions
diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp
index 70eda1b..9332e21 100644
--- a/kabc/addressbook.cpp
+++ b/kabc/addressbook.cpp
@@ -1,743 +1,770 @@
1/* 1/*
2 This file is part of libkabc. 2 This file is part of libkabc.
3 Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org> 3 Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
4 4
5 This library is free software; you can redistribute it and/or 5 This library is free software; you can redistribute it and/or
6 modify it under the terms of the GNU Library General Public 6 modify it under the terms of the GNU Library General Public
7 License as published by the Free Software Foundation; either 7 License as published by the Free Software Foundation; either
8 version 2 of the License, or (at your option) any later version. 8 version 2 of the License, or (at your option) any later version.
9 9
10 This library is distributed in the hope that it will be useful, 10 This library is distributed in the hope that it will be useful,
11 but WITHOUT ANY WARRANTY; without even the implied warranty of 11 but WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13 Library General Public License for more details. 13 Library General Public License for more details.
14 14
15 You should have received a copy of the GNU Library General Public License 15 You should have received a copy of the GNU Library General Public License
16 along with this library; see the file COPYING.LIB. If not, write to 16 along with this library; see the file COPYING.LIB. If not, write to
17 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, 17 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
18 Boston, MA 02111-1307, USA. 18 Boston, MA 02111-1307, USA.
19*/ 19*/
20 20
21/* 21/*
22Enhanced Version of the file for platform independent KDE tools. 22Enhanced Version of the file for platform independent KDE tools.
23Copyright (c) 2004 Ulf Schenk 23Copyright (c) 2004 Ulf Schenk
24 24
25$Id$ 25$Id$
26*/ 26*/
27 27
28/*US 28/*US
29 29
30#include <qfile.h> 30#include <qfile.h>
31#include <qregexp.h> 31#include <qregexp.h>
32#include <qtimer.h> 32#include <qtimer.h>
33 33
34#include <kapplication.h> 34#include <kapplication.h>
35#include <kinstance.h> 35#include <kinstance.h>
36#include <kstandarddirs.h> 36#include <kstandarddirs.h>
37 37
38#include "errorhandler.h" 38#include "errorhandler.h"
39*/ 39*/
40#include <qptrlist.h> 40#include <qptrlist.h>
41 41
42#include <kglobal.h> 42#include <kglobal.h>
43#include <klocale.h> 43#include <klocale.h>
44#include <kdebug.h> 44#include <kdebug.h>
45#include <libkcal/syncdefines.h>
45#include "addressbook.h" 46#include "addressbook.h"
46#include "resource.h" 47#include "resource.h"
47 48
48//US #include "addressbook.moc" 49//US #include "addressbook.moc"
49 50
50using namespace KABC; 51using namespace KABC;
51 52
52struct AddressBook::AddressBookData 53struct AddressBook::AddressBookData
53{ 54{
54 Addressee::List mAddressees; 55 Addressee::List mAddressees;
55 Addressee::List mRemovedAddressees; 56 Addressee::List mRemovedAddressees;
56 Field::List mAllFields; 57 Field::List mAllFields;
57 KConfig *mConfig; 58 KConfig *mConfig;
58 KRES::Manager<Resource> *mManager; 59 KRES::Manager<Resource> *mManager;
59//US ErrorHandler *mErrorHandler; 60//US ErrorHandler *mErrorHandler;
60}; 61};
61 62
62struct AddressBook::Iterator::IteratorData 63struct AddressBook::Iterator::IteratorData
63{ 64{
64 Addressee::List::Iterator mIt; 65 Addressee::List::Iterator mIt;
65}; 66};
66 67
67struct AddressBook::ConstIterator::ConstIteratorData 68struct AddressBook::ConstIterator::ConstIteratorData
68{ 69{
69 Addressee::List::ConstIterator mIt; 70 Addressee::List::ConstIterator mIt;
70}; 71};
71 72
72AddressBook::Iterator::Iterator() 73AddressBook::Iterator::Iterator()
73{ 74{
74 d = new IteratorData; 75 d = new IteratorData;
75} 76}
76 77
77AddressBook::Iterator::Iterator( const AddressBook::Iterator &i ) 78AddressBook::Iterator::Iterator( const AddressBook::Iterator &i )
78{ 79{
79 d = new IteratorData; 80 d = new IteratorData;
80 d->mIt = i.d->mIt; 81 d->mIt = i.d->mIt;
81} 82}
82 83
83AddressBook::Iterator &AddressBook::Iterator::operator=( const AddressBook::Iterator &i ) 84AddressBook::Iterator &AddressBook::Iterator::operator=( const AddressBook::Iterator &i )
84{ 85{
85 if( this == &i ) return *this; // guard against self assignment 86 if( this == &i ) return *this; // guard against self assignment
86 delete d; // delete the old data the Iterator was completely constructed before 87 delete d; // delete the old data the Iterator was completely constructed before
87 d = new IteratorData; 88 d = new IteratorData;
88 d->mIt = i.d->mIt; 89 d->mIt = i.d->mIt;
89 return *this; 90 return *this;
90} 91}
91 92
92AddressBook::Iterator::~Iterator() 93AddressBook::Iterator::~Iterator()
93{ 94{
94 delete d; 95 delete d;
95} 96}
96 97
97const Addressee &AddressBook::Iterator::operator*() const 98const Addressee &AddressBook::Iterator::operator*() const
98{ 99{
99 return *(d->mIt); 100 return *(d->mIt);
100} 101}
101 102
102Addressee &AddressBook::Iterator::operator*() 103Addressee &AddressBook::Iterator::operator*()
103{ 104{
104 return *(d->mIt); 105 return *(d->mIt);
105} 106}
106 107
107Addressee *AddressBook::Iterator::operator->() 108Addressee *AddressBook::Iterator::operator->()
108{ 109{
109 return &(*(d->mIt)); 110 return &(*(d->mIt));
110} 111}
111 112
112AddressBook::Iterator &AddressBook::Iterator::operator++() 113AddressBook::Iterator &AddressBook::Iterator::operator++()
113{ 114{
114 (d->mIt)++; 115 (d->mIt)++;
115 return *this; 116 return *this;
116} 117}
117 118
118AddressBook::Iterator &AddressBook::Iterator::operator++(int) 119AddressBook::Iterator &AddressBook::Iterator::operator++(int)
119{ 120{
120 (d->mIt)++; 121 (d->mIt)++;
121 return *this; 122 return *this;
122} 123}
123 124
124AddressBook::Iterator &AddressBook::Iterator::operator--() 125AddressBook::Iterator &AddressBook::Iterator::operator--()
125{ 126{
126 (d->mIt)--; 127 (d->mIt)--;
127 return *this; 128 return *this;
128} 129}
129 130
130AddressBook::Iterator &AddressBook::Iterator::operator--(int) 131AddressBook::Iterator &AddressBook::Iterator::operator--(int)
131{ 132{
132 (d->mIt)--; 133 (d->mIt)--;
133 return *this; 134 return *this;
134} 135}
135 136
136bool AddressBook::Iterator::operator==( const Iterator &it ) 137bool AddressBook::Iterator::operator==( const Iterator &it )
137{ 138{
138 return ( d->mIt == it.d->mIt ); 139 return ( d->mIt == it.d->mIt );
139} 140}
140 141
141bool AddressBook::Iterator::operator!=( const Iterator &it ) 142bool AddressBook::Iterator::operator!=( const Iterator &it )
142{ 143{
143 return ( d->mIt != it.d->mIt ); 144 return ( d->mIt != it.d->mIt );
144} 145}
145 146
146 147
147AddressBook::ConstIterator::ConstIterator() 148AddressBook::ConstIterator::ConstIterator()
148{ 149{
149 d = new ConstIteratorData; 150 d = new ConstIteratorData;
150} 151}
151 152
152AddressBook::ConstIterator::ConstIterator( const AddressBook::ConstIterator &i ) 153AddressBook::ConstIterator::ConstIterator( const AddressBook::ConstIterator &i )
153{ 154{
154 d = new ConstIteratorData; 155 d = new ConstIteratorData;
155 d->mIt = i.d->mIt; 156 d->mIt = i.d->mIt;
156} 157}
157 158
158AddressBook::ConstIterator &AddressBook::ConstIterator::operator=( const AddressBook::ConstIterator &i ) 159AddressBook::ConstIterator &AddressBook::ConstIterator::operator=( const AddressBook::ConstIterator &i )
159{ 160{
160 if( this == &i ) return *this; // guard for self assignment 161 if( this == &i ) return *this; // guard for self assignment
161 delete d; // delete the old data because the Iterator was really constructed before 162 delete d; // delete the old data because the Iterator was really constructed before
162 d = new ConstIteratorData; 163 d = new ConstIteratorData;
163 d->mIt = i.d->mIt; 164 d->mIt = i.d->mIt;
164 return *this; 165 return *this;
165} 166}
166 167
167AddressBook::ConstIterator::~ConstIterator() 168AddressBook::ConstIterator::~ConstIterator()
168{ 169{
169 delete d; 170 delete d;
170} 171}
171 172
172const Addressee &AddressBook::ConstIterator::operator*() const 173const Addressee &AddressBook::ConstIterator::operator*() const
173{ 174{
174 return *(d->mIt); 175 return *(d->mIt);
175} 176}
176 177
177const Addressee* AddressBook::ConstIterator::operator->() const 178const Addressee* AddressBook::ConstIterator::operator->() const
178{ 179{
179 return &(*(d->mIt)); 180 return &(*(d->mIt));
180} 181}
181 182
182AddressBook::ConstIterator &AddressBook::ConstIterator::operator++() 183AddressBook::ConstIterator &AddressBook::ConstIterator::operator++()
183{ 184{
184 (d->mIt)++; 185 (d->mIt)++;
185 return *this; 186 return *this;
186} 187}
187 188
188AddressBook::ConstIterator &AddressBook::ConstIterator::operator++(int) 189AddressBook::ConstIterator &AddressBook::ConstIterator::operator++(int)
189{ 190{
190 (d->mIt)++; 191 (d->mIt)++;
191 return *this; 192 return *this;
192} 193}
193 194
194AddressBook::ConstIterator &AddressBook::ConstIterator::operator--() 195AddressBook::ConstIterator &AddressBook::ConstIterator::operator--()
195{ 196{
196 (d->mIt)--; 197 (d->mIt)--;
197 return *this; 198 return *this;
198} 199}
199 200
200AddressBook::ConstIterator &AddressBook::ConstIterator::operator--(int) 201AddressBook::ConstIterator &AddressBook::ConstIterator::operator--(int)
201{ 202{
202 (d->mIt)--; 203 (d->mIt)--;
203 return *this; 204 return *this;
204} 205}
205 206
206bool AddressBook::ConstIterator::operator==( const ConstIterator &it ) 207bool AddressBook::ConstIterator::operator==( const ConstIterator &it )
207{ 208{
208 return ( d->mIt == it.d->mIt ); 209 return ( d->mIt == it.d->mIt );
209} 210}
210 211
211bool AddressBook::ConstIterator::operator!=( const ConstIterator &it ) 212bool AddressBook::ConstIterator::operator!=( const ConstIterator &it )
212{ 213{
213 return ( d->mIt != it.d->mIt ); 214 return ( d->mIt != it.d->mIt );
214} 215}
215 216
216 217
217AddressBook::AddressBook() 218AddressBook::AddressBook()
218{ 219{
219 init(0, "contact"); 220 init(0, "contact");
220} 221}
221 222
222AddressBook::AddressBook( const QString &config ) 223AddressBook::AddressBook( const QString &config )
223{ 224{
224 init(config, "contact"); 225 init(config, "contact");
225} 226}
226 227
227AddressBook::AddressBook( const QString &config, const QString &family ) 228AddressBook::AddressBook( const QString &config, const QString &family )
228{ 229{
229 init(config, family); 230 init(config, family);
230 231
231} 232}
232 233
233// the default family is "contact" 234// the default family is "contact"
234void AddressBook::init(const QString &config, const QString &family ) 235void AddressBook::init(const QString &config, const QString &family )
235{ 236{
236 d = new AddressBookData; 237 d = new AddressBookData;
237 QString fami = family; 238 QString fami = family;
238 qDebug("new ab "); 239 qDebug("new ab ");
239 if (config != 0) { 240 if (config != 0) {
240 qDebug("config != 0 "); 241 qDebug("config != 0 ");
241 if ( family == "syncContact" ) { 242 if ( family == "syncContact" ) {
242 qDebug("creating sync config "); 243 qDebug("creating sync config ");
243 fami = "contact"; 244 fami = "contact";
244 KConfig* con = new KConfig( locateLocal("config", "syncContactrc") ); 245 KConfig* con = new KConfig( locateLocal("config", "syncContactrc") );
245 con->setGroup( "General" ); 246 con->setGroup( "General" );
246 con->writeEntry( "ResourceKeys", QString("sync") ); 247 con->writeEntry( "ResourceKeys", QString("sync") );
247 con->writeEntry( "Standard", QString("sync") ); 248 con->writeEntry( "Standard", QString("sync") );
248 con->setGroup( "Resource_sync" ); 249 con->setGroup( "Resource_sync" );
249 con->writeEntry( "FileFormat", QString("vcard") ); 250 con->writeEntry( "FileFormat", QString("vcard") );
250 con->writeEntry( "FileName", config ); 251 con->writeEntry( "FileName", config );
251 con->writeEntry( "ResourceIdentifier", QString("sync") ); 252 con->writeEntry( "ResourceIdentifier", QString("sync") );
252 con->writeEntry( "ResourceName", QString("sync_res") ); 253 con->writeEntry( "ResourceName", QString("sync_res") );
253 con->writeEntry( "ResourceType", QString("file") ); 254 con->writeEntry( "ResourceType", QString("file") );
254 //con->sync(); 255 //con->sync();
255 d->mConfig = con; 256 d->mConfig = con;
256 } 257 }
257 else 258 else
258 d->mConfig = new KConfig( locateLocal("config", config) ); 259 d->mConfig = new KConfig( locateLocal("config", config) );
259// qDebug("AddressBook::init 1 config=%s",config.latin1() ); 260// qDebug("AddressBook::init 1 config=%s",config.latin1() );
260 } 261 }
261 else { 262 else {
262 d->mConfig = 0; 263 d->mConfig = 0;
263// qDebug("AddressBook::init 1 config=0"); 264// qDebug("AddressBook::init 1 config=0");
264 } 265 }
265 266
266//US d->mErrorHandler = 0; 267//US d->mErrorHandler = 0;
267 d->mManager = new KRES::Manager<Resource>( fami, false ); 268 d->mManager = new KRES::Manager<Resource>( fami, false );
268 d->mManager->readConfig( d->mConfig ); 269 d->mManager->readConfig( d->mConfig );
269 if ( family == "syncContact" ) { 270 if ( family == "syncContact" ) {
270 KRES::Manager<Resource> *manager = d->mManager; 271 KRES::Manager<Resource> *manager = d->mManager;
271 KRES::Manager<Resource>::ActiveIterator it; 272 KRES::Manager<Resource>::ActiveIterator it;
272 for ( it = manager->activeBegin(); it != manager->activeEnd(); ++it ) { 273 for ( it = manager->activeBegin(); it != manager->activeEnd(); ++it ) {
273 (*it)->setAddressBook( this ); 274 (*it)->setAddressBook( this );
274 if ( !(*it)->open() ) 275 if ( !(*it)->open() )
275 error( QString( "Unable to open resource '%1'!" ).arg( (*it)->resourceName() ) ); 276 error( QString( "Unable to open resource '%1'!" ).arg( (*it)->resourceName() ) );
276 } 277 }
277 Resource *res = standardResource(); 278 Resource *res = standardResource();
278 if ( !res ) { 279 if ( !res ) {
279 qDebug("ERROR: no standard resource"); 280 qDebug("ERROR: no standard resource");
280 res = manager->createResource( "file" ); 281 res = manager->createResource( "file" );
281 if ( res ) 282 if ( res )
282 { 283 {
283 addResource( res ); 284 addResource( res );
284 } 285 }
285 else 286 else
286 qDebug(" No resource available!!!"); 287 qDebug(" No resource available!!!");
287 } 288 }
288 setStandardResource( res ); 289 setStandardResource( res );
289 manager->writeConfig(); 290 manager->writeConfig();
290 } 291 }
291 addCustomField( i18n( "Department" ), KABC::Field::Organization, 292 addCustomField( i18n( "Department" ), KABC::Field::Organization,
292 "X-Department", "KADDRESSBOOK" ); 293 "X-Department", "KADDRESSBOOK" );
293 addCustomField( i18n( "Profession" ), KABC::Field::Organization, 294 addCustomField( i18n( "Profession" ), KABC::Field::Organization,
294 "X-Profession", "KADDRESSBOOK" ); 295 "X-Profession", "KADDRESSBOOK" );
295 addCustomField( i18n( "Assistant's Name" ), KABC::Field::Organization, 296 addCustomField( i18n( "Assistant's Name" ), KABC::Field::Organization,
296 "X-AssistantsName", "KADDRESSBOOK" ); 297 "X-AssistantsName", "KADDRESSBOOK" );
297 addCustomField( i18n( "Manager's Name" ), KABC::Field::Organization, 298 addCustomField( i18n( "Manager's Name" ), KABC::Field::Organization,
298 "X-ManagersName", "KADDRESSBOOK" ); 299 "X-ManagersName", "KADDRESSBOOK" );
299 addCustomField( i18n( "Spouse's Name" ), KABC::Field::Personal, 300 addCustomField( i18n( "Spouse's Name" ), KABC::Field::Personal,
300 "X-SpousesName", "KADDRESSBOOK" ); 301 "X-SpousesName", "KADDRESSBOOK" );
301 addCustomField( i18n( "Office" ), KABC::Field::Personal, 302 addCustomField( i18n( "Office" ), KABC::Field::Personal,
302 "X-Office", "KADDRESSBOOK" ); 303 "X-Office", "KADDRESSBOOK" );
303 addCustomField( i18n( "IM Address" ), KABC::Field::Personal, 304 addCustomField( i18n( "IM Address" ), KABC::Field::Personal,
304 "X-IMAddress", "KADDRESSBOOK" ); 305 "X-IMAddress", "KADDRESSBOOK" );
305 addCustomField( i18n( "Anniversary" ), KABC::Field::Personal, 306 addCustomField( i18n( "Anniversary" ), KABC::Field::Personal,
306 "X-Anniversary", "KADDRESSBOOK" ); 307 "X-Anniversary", "KADDRESSBOOK" );
307 308
308 //US added this field to become compatible with Opie/qtopia addressbook 309 //US added this field to become compatible with Opie/qtopia addressbook
309 // values can be "female" or "male" or "". An empty field represents undefined. 310 // values can be "female" or "male" or "". An empty field represents undefined.
310 addCustomField( i18n( "Gender" ), KABC::Field::Personal, 311 addCustomField( i18n( "Gender" ), KABC::Field::Personal,
311 "X-Gender", "KADDRESSBOOK" ); 312 "X-Gender", "KADDRESSBOOK" );
312 addCustomField( i18n( "Children" ), KABC::Field::Personal, 313 addCustomField( i18n( "Children" ), KABC::Field::Personal,
313 "X-Children", "KADDRESSBOOK" ); 314 "X-Children", "KADDRESSBOOK" );
314 addCustomField( i18n( "FreeBusyUrl" ), KABC::Field::Personal, 315 addCustomField( i18n( "FreeBusyUrl" ), KABC::Field::Personal,
315 "X-FreeBusyUrl", "KADDRESSBOOK" ); 316 "X-FreeBusyUrl", "KADDRESSBOOK" );
316 addCustomField( i18n( "ExternalID" ), KABC::Field::Personal, 317 addCustomField( i18n( "ExternalID" ), KABC::Field::Personal,
317 "X-ExternalID", "KADDRESSBOOK" ); 318 "X-ExternalID", "KADDRESSBOOK" );
318} 319}
319 320
320AddressBook::~AddressBook() 321AddressBook::~AddressBook()
321{ 322{
322 delete d->mConfig; d->mConfig = 0; 323 delete d->mConfig; d->mConfig = 0;
323 delete d->mManager; d->mManager = 0; 324 delete d->mManager; d->mManager = 0;
324//US delete d->mErrorHandler; d->mErrorHandler = 0; 325//US delete d->mErrorHandler; d->mErrorHandler = 0;
325 delete d; d = 0; 326 delete d; d = 0;
326} 327}
327 328
328bool AddressBook::load() 329bool AddressBook::load()
329{ 330{
330 331
331 332
332 clear(); 333 clear();
333 334
334 KRES::Manager<Resource>::ActiveIterator it; 335 KRES::Manager<Resource>::ActiveIterator it;
335 bool ok = true; 336 bool ok = true;
336 for ( it = d->mManager->activeBegin(); it != d->mManager->activeEnd(); ++it ) 337 for ( it = d->mManager->activeBegin(); it != d->mManager->activeEnd(); ++it )
337 if ( !(*it)->load() ) { 338 if ( !(*it)->load() ) {
338 error( i18n("Unable to load resource '%1'").arg( (*it)->resourceName() ) ); 339 error( i18n("Unable to load resource '%1'").arg( (*it)->resourceName() ) );
339 ok = false; 340 ok = false;
340 } 341 }
341 342
342 // mark all addressees as unchanged 343 // mark all addressees as unchanged
343 Addressee::List::Iterator addrIt; 344 Addressee::List::Iterator addrIt;
344 for ( addrIt = d->mAddressees.begin(); addrIt != d->mAddressees.end(); ++addrIt ) 345 for ( addrIt = d->mAddressees.begin(); addrIt != d->mAddressees.end(); ++addrIt )
345 (*addrIt).setChanged( false ); 346 (*addrIt).setChanged( false );
346 347
347 return ok; 348 return ok;
348} 349}
349 350
350bool AddressBook::save( Ticket *ticket ) 351bool AddressBook::save( Ticket *ticket )
351{ 352{
352 kdDebug(5700) << "AddressBook::save()"<< endl; 353 kdDebug(5700) << "AddressBook::save()"<< endl;
353 354
354 if ( ticket->resource() ) { 355 if ( ticket->resource() ) {
355 deleteRemovedAddressees(); 356 deleteRemovedAddressees();
356 return ticket->resource()->save( ticket ); 357 return ticket->resource()->save( ticket );
357 } 358 }
358 359
359 return false; 360 return false;
360} 361}
361bool AddressBook::saveAB() 362bool AddressBook::saveAB()
362{ 363{
363 bool ok = true; 364 bool ok = true;
364 365
365 deleteRemovedAddressees(); 366 deleteRemovedAddressees();
366 367
367 KRES::Manager<Resource>::ActiveIterator it; 368 KRES::Manager<Resource>::ActiveIterator it;
368 KRES::Manager<Resource> *manager = d->mManager; 369 KRES::Manager<Resource> *manager = d->mManager;
369 for ( it = manager->activeBegin(); it != manager->activeEnd(); ++it ) { 370 for ( it = manager->activeBegin(); it != manager->activeEnd(); ++it ) {
370 if ( !(*it)->readOnly() && (*it)->isOpen() ) { 371 if ( !(*it)->readOnly() && (*it)->isOpen() ) {
371 Ticket *ticket = requestSaveTicket( *it ); 372 Ticket *ticket = requestSaveTicket( *it );
372// qDebug("StdAddressBook::save '%s'", (*it)->resourceName().latin1() ); 373// qDebug("StdAddressBook::save '%s'", (*it)->resourceName().latin1() );
373 if ( !ticket ) { 374 if ( !ticket ) {
374 error( i18n( "Unable to save to resource '%1'. It is locked." ) 375 error( i18n( "Unable to save to resource '%1'. It is locked." )
375 .arg( (*it)->resourceName() ) ); 376 .arg( (*it)->resourceName() ) );
376 return false; 377 return false;
377 } 378 }
378 379
379 //if ( !save( ticket ) ) 380 //if ( !save( ticket ) )
380 if ( ticket->resource() ) { 381 if ( ticket->resource() ) {
381 if ( ! ticket->resource()->save( ticket ) ) 382 if ( ! ticket->resource()->save( ticket ) )
382 ok = false; 383 ok = false;
383 } else 384 } else
384 ok = false; 385 ok = false;
385 386
386 } 387 }
387 } 388 }
388 return ok; 389 return ok;
389} 390}
390 391
391AddressBook::Iterator AddressBook::begin() 392AddressBook::Iterator AddressBook::begin()
392{ 393{
393 Iterator it = Iterator(); 394 Iterator it = Iterator();
394 it.d->mIt = d->mAddressees.begin(); 395 it.d->mIt = d->mAddressees.begin();
395 return it; 396 return it;
396} 397}
397 398
398AddressBook::ConstIterator AddressBook::begin() const 399AddressBook::ConstIterator AddressBook::begin() const
399{ 400{
400 ConstIterator it = ConstIterator(); 401 ConstIterator it = ConstIterator();
401 it.d->mIt = d->mAddressees.begin(); 402 it.d->mIt = d->mAddressees.begin();
402 return it; 403 return it;
403} 404}
404 405
405AddressBook::Iterator AddressBook::end() 406AddressBook::Iterator AddressBook::end()
406{ 407{
407 Iterator it = Iterator(); 408 Iterator it = Iterator();
408 it.d->mIt = d->mAddressees.end(); 409 it.d->mIt = d->mAddressees.end();
409 return it; 410 return it;
410} 411}
411 412
412AddressBook::ConstIterator AddressBook::end() const 413AddressBook::ConstIterator AddressBook::end() const
413{ 414{
414 ConstIterator it = ConstIterator(); 415 ConstIterator it = ConstIterator();
415 it.d->mIt = d->mAddressees.end(); 416 it.d->mIt = d->mAddressees.end();
416 return it; 417 return it;
417} 418}
418 419
419void AddressBook::clear() 420void AddressBook::clear()
420{ 421{
421 d->mAddressees.clear(); 422 d->mAddressees.clear();
422} 423}
423 424
424Ticket *AddressBook::requestSaveTicket( Resource *resource ) 425Ticket *AddressBook::requestSaveTicket( Resource *resource )
425{ 426{
426 kdDebug(5700) << "AddressBook::requestSaveTicket()" << endl; 427 kdDebug(5700) << "AddressBook::requestSaveTicket()" << endl;
427 428
428 if ( !resource ) 429 if ( !resource )
429 { 430 {
430 qDebug("AddressBook::requestSaveTicket no resource" ); 431 qDebug("AddressBook::requestSaveTicket no resource" );
431 resource = standardResource(); 432 resource = standardResource();
432 } 433 }
433 434
434 KRES::Manager<Resource>::ActiveIterator it; 435 KRES::Manager<Resource>::ActiveIterator it;
435 for ( it = d->mManager->activeBegin(); it != d->mManager->activeEnd(); ++it ) { 436 for ( it = d->mManager->activeBegin(); it != d->mManager->activeEnd(); ++it ) {
436 if ( (*it) == resource ) { 437 if ( (*it) == resource ) {
437 if ( (*it)->readOnly() || !(*it)->isOpen() ) 438 if ( (*it)->readOnly() || !(*it)->isOpen() )
438 return 0; 439 return 0;
439 else 440 else
440 return (*it)->requestSaveTicket(); 441 return (*it)->requestSaveTicket();
441 } 442 }
442 } 443 }
443 444
444 return 0; 445 return 0;
445} 446}
446 447
447void AddressBook::insertAddressee( const Addressee &a ) 448void AddressBook::insertAddressee( const Addressee &a )
448{ 449{
449 Addressee::List::Iterator it; 450 Addressee::List::Iterator it;
450 for ( it = d->mAddressees.begin(); it != d->mAddressees.end(); ++it ) { 451 for ( it = d->mAddressees.begin(); it != d->mAddressees.end(); ++it ) {
451 if ( a.uid() == (*it).uid() ) { 452 if ( a.uid() == (*it).uid() ) {
452 bool changed = false; 453 bool changed = false;
453 Addressee addr = a; 454 Addressee addr = a;
454 if ( addr != (*it) ) 455 if ( addr != (*it) )
455 changed = true; 456 changed = true;
456 457
457 (*it) = a; 458 (*it) = a;
458 if ( (*it).resource() == 0 ) 459 if ( (*it).resource() == 0 )
459 (*it).setResource( standardResource() ); 460 (*it).setResource( standardResource() );
460 461
461 if ( changed ) { 462 if ( changed ) {
462 (*it).setRevision( QDateTime::currentDateTime() ); 463 (*it).setRevision( QDateTime::currentDateTime() );
463 (*it).setChanged( true ); 464 (*it).setChanged( true );
464 } 465 }
465 466
466 return; 467 return;
467 } 468 }
468 } 469 }
469 d->mAddressees.append( a ); 470 d->mAddressees.append( a );
470 Addressee& addr = d->mAddressees.last(); 471 Addressee& addr = d->mAddressees.last();
471 if ( addr.resource() == 0 ) 472 if ( addr.resource() == 0 )
472 addr.setResource( standardResource() ); 473 addr.setResource( standardResource() );
473 474
474 addr.setChanged( true ); 475 addr.setChanged( true );
475} 476}
476 477
477void AddressBook::removeAddressee( const Addressee &a ) 478void AddressBook::removeAddressee( const Addressee &a )
478{ 479{
479 Iterator it; 480 Iterator it;
480 for ( it = begin(); it != end(); ++it ) { 481 for ( it = begin(); it != end(); ++it ) {
481 if ( a.uid() == (*it).uid() ) { 482 if ( a.uid() == (*it).uid() ) {
482 removeAddressee( it ); 483 removeAddressee( it );
483 return; 484 return;
484 } 485 }
485 } 486 }
486} 487}
487 488
488void AddressBook::removeAddressee( const Iterator &it ) 489void AddressBook::removeAddressee( const Iterator &it )
489{ 490{
490 d->mRemovedAddressees.append( (*it) ); 491 d->mRemovedAddressees.append( (*it) );
491 d->mAddressees.remove( it.d->mIt ); 492 d->mAddressees.remove( it.d->mIt );
492} 493}
493 494
494AddressBook::Iterator AddressBook::find( const Addressee &a ) 495AddressBook::Iterator AddressBook::find( const Addressee &a )
495{ 496{
496 Iterator it; 497 Iterator it;
497 for ( it = begin(); it != end(); ++it ) { 498 for ( it = begin(); it != end(); ++it ) {
498 if ( a.uid() == (*it).uid() ) { 499 if ( a.uid() == (*it).uid() ) {
499 return it; 500 return it;
500 } 501 }
501 } 502 }
502 return end(); 503 return end();
503} 504}
504 505
505Addressee AddressBook::findByUid( const QString &uid ) 506Addressee AddressBook::findByUid( const QString &uid )
506{ 507{
507 Iterator it; 508 Iterator it;
508 for ( it = begin(); it != end(); ++it ) { 509 for ( it = begin(); it != end(); ++it ) {
509 if ( uid == (*it).uid() ) { 510 if ( uid == (*it).uid() ) {
510 return *it; 511 return *it;
511 } 512 }
512 } 513 }
513 return Addressee(); 514 return Addressee();
514} 515}
516Addressee::List AddressBook::getExternLastSyncAddressees()
517{
518 Addressee::List results;
519
520 Iterator it;
521 for ( it = begin(); it != end(); ++it ) {
522 if ( (*it).uid().left( 20 ) == "last-syncAddressee-" ) {
523 if ( (*it).familyName().left(3) == "E: " )
524 results.append( *it );
525 }
526 }
527
528 return results;
529}
530void AddressBook::resetTempSyncStat()
531{
532
533
534 Iterator it;
535 for ( it = begin(); it != end(); ++it ) {
536 (*it).setTempSyncStat ( SYNC_TEMPSTATE_INITIAL );
537 }
538
539}
540
541
515 542
516Addressee::List AddressBook::allAddressees() 543Addressee::List AddressBook::allAddressees()
517{ 544{
518 return d->mAddressees; 545 return d->mAddressees;
519} 546}
520 547
521Addressee::List AddressBook::findByName( const QString &name ) 548Addressee::List AddressBook::findByName( const QString &name )
522{ 549{
523 Addressee::List results; 550 Addressee::List results;
524 551
525 Iterator it; 552 Iterator it;
526 for ( it = begin(); it != end(); ++it ) { 553 for ( it = begin(); it != end(); ++it ) {
527 if ( name == (*it).realName() ) { 554 if ( name == (*it).realName() ) {
528 results.append( *it ); 555 results.append( *it );
529 } 556 }
530 } 557 }
531 558
532 return results; 559 return results;
533} 560}
534 561
535Addressee::List AddressBook::findByEmail( const QString &email ) 562Addressee::List AddressBook::findByEmail( const QString &email )
536{ 563{
537 Addressee::List results; 564 Addressee::List results;
538 QStringList mailList; 565 QStringList mailList;
539 566
540 Iterator it; 567 Iterator it;
541 for ( it = begin(); it != end(); ++it ) { 568 for ( it = begin(); it != end(); ++it ) {
542 mailList = (*it).emails(); 569 mailList = (*it).emails();
543 for ( QStringList::Iterator ite = mailList.begin(); ite != mailList.end(); ++ite ) { 570 for ( QStringList::Iterator ite = mailList.begin(); ite != mailList.end(); ++ite ) {
544 if ( email == (*ite) ) { 571 if ( email == (*ite) ) {
545 results.append( *it ); 572 results.append( *it );
546 } 573 }
547 } 574 }
548 } 575 }
549 576
550 return results; 577 return results;
551} 578}
552 579
553Addressee::List AddressBook::findByCategory( const QString &category ) 580Addressee::List AddressBook::findByCategory( const QString &category )
554{ 581{
555 Addressee::List results; 582 Addressee::List results;
556 583
557 Iterator it; 584 Iterator it;
558 for ( it = begin(); it != end(); ++it ) { 585 for ( it = begin(); it != end(); ++it ) {
559 if ( (*it).hasCategory( category) ) { 586 if ( (*it).hasCategory( category) ) {
560 results.append( *it ); 587 results.append( *it );
561 } 588 }
562 } 589 }
563 590
564 return results; 591 return results;
565} 592}
566 593
567void AddressBook::dump() const 594void AddressBook::dump() const
568{ 595{
569 kdDebug(5700) << "AddressBook::dump() --- begin ---" << endl; 596 kdDebug(5700) << "AddressBook::dump() --- begin ---" << endl;
570 597
571 ConstIterator it; 598 ConstIterator it;
572 for( it = begin(); it != end(); ++it ) { 599 for( it = begin(); it != end(); ++it ) {
573 (*it).dump(); 600 (*it).dump();
574 } 601 }
575 602
576 kdDebug(5700) << "AddressBook::dump() --- end ---" << endl; 603 kdDebug(5700) << "AddressBook::dump() --- end ---" << endl;
577} 604}
578 605
579QString AddressBook::identifier() 606QString AddressBook::identifier()
580{ 607{
581 QStringList identifier; 608 QStringList identifier;
582 609
583 610
584 KRES::Manager<Resource>::ActiveIterator it; 611 KRES::Manager<Resource>::ActiveIterator it;
585 for ( it = d->mManager->activeBegin(); it != d->mManager->activeEnd(); ++it ) { 612 for ( it = d->mManager->activeBegin(); it != d->mManager->activeEnd(); ++it ) {
586 if ( !(*it)->identifier().isEmpty() ) 613 if ( !(*it)->identifier().isEmpty() )
587 identifier.append( (*it)->identifier() ); 614 identifier.append( (*it)->identifier() );
588 } 615 }
589 616
590 return identifier.join( ":" ); 617 return identifier.join( ":" );
591} 618}
592 619
593Field::List AddressBook::fields( int category ) 620Field::List AddressBook::fields( int category )
594{ 621{
595 if ( d->mAllFields.isEmpty() ) { 622 if ( d->mAllFields.isEmpty() ) {
596 d->mAllFields = Field::allFields(); 623 d->mAllFields = Field::allFields();
597 } 624 }
598 625
599 if ( category == Field::All ) return d->mAllFields; 626 if ( category == Field::All ) return d->mAllFields;
600 627
601 Field::List result; 628 Field::List result;
602 Field::List::ConstIterator it; 629 Field::List::ConstIterator it;
603 for( it = d->mAllFields.begin(); it != d->mAllFields.end(); ++it ) { 630 for( it = d->mAllFields.begin(); it != d->mAllFields.end(); ++it ) {
604 if ( (*it)->category() & category ) result.append( *it ); 631 if ( (*it)->category() & category ) result.append( *it );
605 } 632 }
606 633
607 return result; 634 return result;
608} 635}
609 636
610bool AddressBook::addCustomField( const QString &label, int category, 637bool AddressBook::addCustomField( const QString &label, int category,
611 const QString &key, const QString &app ) 638 const QString &key, const QString &app )
612{ 639{
613 if ( d->mAllFields.isEmpty() ) { 640 if ( d->mAllFields.isEmpty() ) {
614 d->mAllFields = Field::allFields(); 641 d->mAllFields = Field::allFields();
615 } 642 }
616//US QString a = app.isNull() ? KGlobal::instance()->instanceName() : app; 643//US QString a = app.isNull() ? KGlobal::instance()->instanceName() : app;
617 QString a = app.isNull() ? KGlobal::getAppName() : app; 644 QString a = app.isNull() ? KGlobal::getAppName() : app;
618 645
619 QString k = key.isNull() ? label : key; 646 QString k = key.isNull() ? label : key;
620 647
621 Field *field = Field::createCustomField( label, category, k, a ); 648 Field *field = Field::createCustomField( label, category, k, a );
622 649
623 if ( !field ) return false; 650 if ( !field ) return false;
624 651
625 d->mAllFields.append( field ); 652 d->mAllFields.append( field );
626 653
627 return true; 654 return true;
628} 655}
629 656
630QDataStream &KABC::operator<<( QDataStream &s, const AddressBook &ab ) 657QDataStream &KABC::operator<<( QDataStream &s, const AddressBook &ab )
631{ 658{
632 if (!ab.d) return s; 659 if (!ab.d) return s;
633 660
634 return s << ab.d->mAddressees; 661 return s << ab.d->mAddressees;
635} 662}
636 663
637QDataStream &KABC::operator>>( QDataStream &s, AddressBook &ab ) 664QDataStream &KABC::operator>>( QDataStream &s, AddressBook &ab )
638{ 665{
639 if (!ab.d) return s; 666 if (!ab.d) return s;
640 667
641 s >> ab.d->mAddressees; 668 s >> ab.d->mAddressees;
642 669
643 return s; 670 return s;
644} 671}
645 672
646bool AddressBook::addResource( Resource *resource ) 673bool AddressBook::addResource( Resource *resource )
647{ 674{
648 if ( !resource->open() ) { 675 if ( !resource->open() ) {
649 kdDebug(5700) << "AddressBook::addResource(): can't add resource" << endl; 676 kdDebug(5700) << "AddressBook::addResource(): can't add resource" << endl;
650 return false; 677 return false;
651 } 678 }
652 679
653 resource->setAddressBook( this ); 680 resource->setAddressBook( this );
654 681
655 d->mManager->add( resource ); 682 d->mManager->add( resource );
656 return true; 683 return true;
657} 684}
658 685
659bool AddressBook::removeResource( Resource *resource ) 686bool AddressBook::removeResource( Resource *resource )
660{ 687{
661 resource->close(); 688 resource->close();
662 689
663 if ( resource == standardResource() ) 690 if ( resource == standardResource() )
664 d->mManager->setStandardResource( 0 ); 691 d->mManager->setStandardResource( 0 );
665 692
666 resource->setAddressBook( 0 ); 693 resource->setAddressBook( 0 );
667 694
668 d->mManager->remove( resource ); 695 d->mManager->remove( resource );
669 return true; 696 return true;
670} 697}
671 698
672QPtrList<Resource> AddressBook::resources() 699QPtrList<Resource> AddressBook::resources()
673{ 700{
674 QPtrList<Resource> list; 701 QPtrList<Resource> list;
675 702
676// qDebug("AddressBook::resources() 1"); 703// qDebug("AddressBook::resources() 1");
677 704
678 KRES::Manager<Resource>::ActiveIterator it; 705 KRES::Manager<Resource>::ActiveIterator it;
679 for ( it = d->mManager->activeBegin(); it != d->mManager->activeEnd(); ++it ) 706 for ( it = d->mManager->activeBegin(); it != d->mManager->activeEnd(); ++it )
680 list.append( *it ); 707 list.append( *it );
681 708
682 return list; 709 return list;
683} 710}
684 711
685/*US 712/*US
686void AddressBook::setErrorHandler( ErrorHandler *handler ) 713void AddressBook::setErrorHandler( ErrorHandler *handler )
687{ 714{
688 delete d->mErrorHandler; 715 delete d->mErrorHandler;
689 d->mErrorHandler = handler; 716 d->mErrorHandler = handler;
690} 717}
691*/ 718*/
692 719
693void AddressBook::error( const QString& msg ) 720void AddressBook::error( const QString& msg )
694{ 721{
695/*US 722/*US
696 if ( !d->mErrorHandler ) // create default error handler 723 if ( !d->mErrorHandler ) // create default error handler
697 d->mErrorHandler = new ConsoleErrorHandler; 724 d->mErrorHandler = new ConsoleErrorHandler;
698 725
699 if ( d->mErrorHandler ) 726 if ( d->mErrorHandler )
700 d->mErrorHandler->error( msg ); 727 d->mErrorHandler->error( msg );
701 else 728 else
702 kdError(5700) << "no error handler defined" << endl; 729 kdError(5700) << "no error handler defined" << endl;
703*/ 730*/
704 kdDebug(5700) << "msg" << endl; 731 kdDebug(5700) << "msg" << endl;
705 qDebug(msg); 732 qDebug(msg);
706} 733}
707 734
708void AddressBook::deleteRemovedAddressees() 735void AddressBook::deleteRemovedAddressees()
709{ 736{
710 Addressee::List::Iterator it; 737 Addressee::List::Iterator it;
711 for ( it = d->mRemovedAddressees.begin(); it != d->mRemovedAddressees.end(); ++it ) { 738 for ( it = d->mRemovedAddressees.begin(); it != d->mRemovedAddressees.end(); ++it ) {
712 Resource *resource = (*it).resource(); 739 Resource *resource = (*it).resource();
713 if ( resource && !resource->readOnly() && resource->isOpen() ) 740 if ( resource && !resource->readOnly() && resource->isOpen() )
714 resource->removeAddressee( *it ); 741 resource->removeAddressee( *it );
715 } 742 }
716 743
717 d->mRemovedAddressees.clear(); 744 d->mRemovedAddressees.clear();
718} 745}
719 746
720void AddressBook::setStandardResource( Resource *resource ) 747void AddressBook::setStandardResource( Resource *resource )
721{ 748{
722// qDebug("AddressBook::setStandardResource 1"); 749// qDebug("AddressBook::setStandardResource 1");
723 d->mManager->setStandardResource( resource ); 750 d->mManager->setStandardResource( resource );
724} 751}
725 752
726Resource *AddressBook::standardResource() 753Resource *AddressBook::standardResource()
727{ 754{
728 return d->mManager->standardResource(); 755 return d->mManager->standardResource();
729} 756}
730 757
731KRES::Manager<Resource> *AddressBook::resourceManager() 758KRES::Manager<Resource> *AddressBook::resourceManager()
732{ 759{
733 return d->mManager; 760 return d->mManager;
734} 761}
735 762
736void AddressBook::cleanUp() 763void AddressBook::cleanUp()
737{ 764{
738 KRES::Manager<Resource>::ActiveIterator it; 765 KRES::Manager<Resource>::ActiveIterator it;
739 for ( it = d->mManager->activeBegin(); it != d->mManager->activeEnd(); ++it ) { 766 for ( it = d->mManager->activeBegin(); it != d->mManager->activeEnd(); ++it ) {
740 if ( !(*it)->readOnly() && (*it)->isOpen() ) 767 if ( !(*it)->readOnly() && (*it)->isOpen() )
741 (*it)->cleanUp(); 768 (*it)->cleanUp();
742 } 769 }
743} 770}
diff --git a/kabc/addressbook.h b/kabc/addressbook.h
index e43de31..05225f9 100644
--- a/kabc/addressbook.h
+++ b/kabc/addressbook.h
@@ -1,328 +1,333 @@
1/* 1/*
2 This file is part of libkabc. 2 This file is part of libkabc.
3 Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org> 3 Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
4 4
5 This library is free software; you can redistribute it and/or 5 This library is free software; you can redistribute it and/or
6 modify it under the terms of the GNU Library General Public 6 modify it under the terms of the GNU Library General Public
7 License as published by the Free Software Foundation; either 7 License as published by the Free Software Foundation; either
8 version 2 of the License, or (at your option) any later version. 8 version 2 of the License, or (at your option) any later version.
9 9
10 This library is distributed in the hope that it will be useful, 10 This library is distributed in the hope that it will be useful,
11 but WITHOUT ANY WARRANTY; without even the implied warranty of 11 but WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13 Library General Public License for more details. 13 Library General Public License for more details.
14 14
15 You should have received a copy of the GNU Library General Public License 15 You should have received a copy of the GNU Library General Public License
16 along with this library; see the file COPYING.LIB. If not, write to 16 along with this library; see the file COPYING.LIB. If not, write to
17 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, 17 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
18 Boston, MA 02111-1307, USA. 18 Boston, MA 02111-1307, USA.
19*/ 19*/
20 20
21/* 21/*
22Enhanced Version of the file for platform independent KDE tools. 22Enhanced Version of the file for platform independent KDE tools.
23Copyright (c) 2004 Ulf Schenk 23Copyright (c) 2004 Ulf Schenk
24 24
25$Id$ 25$Id$
26*/ 26*/
27 27
28#ifndef KABC_ADDRESSBOOK_H 28#ifndef KABC_ADDRESSBOOK_H
29#define KABC_ADDRESSBOOK_H 29#define KABC_ADDRESSBOOK_H
30 30
31#include <qobject.h> 31#include <qobject.h>
32 32
33#include <kresources/manager.h> 33#include <kresources/manager.h>
34#include <qptrlist.h> 34#include <qptrlist.h>
35 35
36#include "addressee.h" 36#include "addressee.h"
37#include "field.h" 37#include "field.h"
38 38
39namespace KABC { 39namespace KABC {
40 40
41class ErrorHandler; 41class ErrorHandler;
42class Resource; 42class Resource;
43class Ticket; 43class Ticket;
44 44
45/** 45/**
46 @short Address Book 46 @short Address Book
47 47
48 This class provides access to a collection of address book entries. 48 This class provides access to a collection of address book entries.
49*/ 49*/
50class AddressBook : public QObject 50class AddressBook : public QObject
51{ 51{
52 Q_OBJECT 52 Q_OBJECT
53 53
54 friend QDataStream &operator<<( QDataStream &, const AddressBook & ); 54 friend QDataStream &operator<<( QDataStream &, const AddressBook & );
55 friend QDataStream &operator>>( QDataStream &, AddressBook & ); 55 friend QDataStream &operator>>( QDataStream &, AddressBook & );
56 friend class StdAddressBook; 56 friend class StdAddressBook;
57 57
58 public: 58 public:
59 /** 59 /**
60 @short Address Book Iterator 60 @short Address Book Iterator
61 61
62 This class provides an iterator for address book entries. 62 This class provides an iterator for address book entries.
63 */ 63 */
64 class Iterator 64 class Iterator
65 { 65 {
66 public: 66 public:
67 Iterator(); 67 Iterator();
68 Iterator( const Iterator & ); 68 Iterator( const Iterator & );
69 ~Iterator(); 69 ~Iterator();
70 70
71 Iterator &operator=( const Iterator & ); 71 Iterator &operator=( const Iterator & );
72 const Addressee &operator*() const; 72 const Addressee &operator*() const;
73 Addressee &operator*(); 73 Addressee &operator*();
74 Addressee* operator->(); 74 Addressee* operator->();
75 Iterator &operator++(); 75 Iterator &operator++();
76 Iterator &operator++(int); 76 Iterator &operator++(int);
77 Iterator &operator--(); 77 Iterator &operator--();
78 Iterator &operator--(int); 78 Iterator &operator--(int);
79 bool operator==( const Iterator &it ); 79 bool operator==( const Iterator &it );
80 bool operator!=( const Iterator &it ); 80 bool operator!=( const Iterator &it );
81 81
82 struct IteratorData; 82 struct IteratorData;
83 IteratorData *d; 83 IteratorData *d;
84 }; 84 };
85 85
86 /** 86 /**
87 @short Address Book Const Iterator 87 @short Address Book Const Iterator
88 88
89 This class provides a const iterator for address book entries. 89 This class provides a const iterator for address book entries.
90 */ 90 */
91 class ConstIterator 91 class ConstIterator
92 { 92 {
93 public: 93 public:
94 ConstIterator(); 94 ConstIterator();
95 ConstIterator( const ConstIterator & ); 95 ConstIterator( const ConstIterator & );
96 ~ConstIterator(); 96 ~ConstIterator();
97 97
98 ConstIterator &operator=( const ConstIterator & ); 98 ConstIterator &operator=( const ConstIterator & );
99 const Addressee &operator*() const; 99 const Addressee &operator*() const;
100 const Addressee* operator->() const; 100 const Addressee* operator->() const;
101 ConstIterator &operator++(); 101 ConstIterator &operator++();
102 ConstIterator &operator++(int); 102 ConstIterator &operator++(int);
103 ConstIterator &operator--(); 103 ConstIterator &operator--();
104 ConstIterator &operator--(int); 104 ConstIterator &operator--(int);
105 bool operator==( const ConstIterator &it ); 105 bool operator==( const ConstIterator &it );
106 bool operator!=( const ConstIterator &it ); 106 bool operator!=( const ConstIterator &it );
107 107
108 struct ConstIteratorData; 108 struct ConstIteratorData;
109 ConstIteratorData *d; 109 ConstIteratorData *d;
110 }; 110 };
111 111
112 /** 112 /**
113 Constructs a address book object. 113 Constructs a address book object.
114 114
115 @param format File format class. 115 @param format File format class.
116 */ 116 */
117 AddressBook(); 117 AddressBook();
118 AddressBook( const QString &config ); 118 AddressBook( const QString &config );
119 AddressBook( const QString &config, const QString &family ); 119 AddressBook( const QString &config, const QString &family );
120 virtual ~AddressBook(); 120 virtual ~AddressBook();
121 121
122 /** 122 /**
123 Requests a ticket for saving the addressbook. Calling this function locks 123 Requests a ticket for saving the addressbook. Calling this function locks
124 the addressbook for all other processes. If the address book is already 124 the addressbook for all other processes. If the address book is already
125 locked the function returns 0. You need the returned @ref Ticket object 125 locked the function returns 0. You need the returned @ref Ticket object
126 for calling the @ref save() function. 126 for calling the @ref save() function.
127 127
128 @see save() 128 @see save()
129 */ 129 */
130 Ticket *requestSaveTicket( Resource *resource=0 ); 130 Ticket *requestSaveTicket( Resource *resource=0 );
131 131
132 /** 132 /**
133 Load address book from file. 133 Load address book from file.
134 */ 134 */
135 bool load(); 135 bool load();
136 136
137 /** 137 /**
138 Save address book. The address book is saved to the file, the Ticket 138 Save address book. The address book is saved to the file, the Ticket
139 object has been requested for by @ref requestSaveTicket(). 139 object has been requested for by @ref requestSaveTicket().
140 140
141 @param ticket a ticket object returned by @ref requestSaveTicket() 141 @param ticket a ticket object returned by @ref requestSaveTicket()
142 */ 142 */
143 bool save( Ticket *ticket ); 143 bool save( Ticket *ticket );
144 bool saveAB( ); 144 bool saveAB( );
145 145
146 /** 146 /**
147 Returns a iterator for first entry of address book. 147 Returns a iterator for first entry of address book.
148 */ 148 */
149 Iterator begin(); 149 Iterator begin();
150 150
151 /** 151 /**
152 Returns a const iterator for first entry of address book. 152 Returns a const iterator for first entry of address book.
153 */ 153 */
154 ConstIterator begin() const; 154 ConstIterator begin() const;
155 155
156 /** 156 /**
157 Returns a iterator for first entry of address book. 157 Returns a iterator for first entry of address book.
158 */ 158 */
159 Iterator end(); 159 Iterator end();
160 160
161 /** 161 /**
162 Returns a const iterator for first entry of address book. 162 Returns a const iterator for first entry of address book.
163 */ 163 */
164 ConstIterator end() const; 164 ConstIterator end() const;
165 165
166 /** 166 /**
167 Removes all entries from address book. 167 Removes all entries from address book.
168 */ 168 */
169 void clear(); 169 void clear();
170 170
171 /** 171 /**
172 Insert an Addressee object into address book. If an object with the same 172 Insert an Addressee object into address book. If an object with the same
173 unique id already exists in the address book it it replaced by the new 173 unique id already exists in the address book it it replaced by the new
174 one. If not the new object is appended to the address book. 174 one. If not the new object is appended to the address book.
175 */ 175 */
176 void insertAddressee( const Addressee & ); 176 void insertAddressee( const Addressee & );
177 177
178 /** 178 /**
179 Removes entry from the address book. 179 Removes entry from the address book.
180 */ 180 */
181 void removeAddressee( const Addressee & ); 181 void removeAddressee( const Addressee & );
182 182
183 /** 183 /**
184 This is like @ref removeAddressee() just above, with the difference that 184 This is like @ref removeAddressee() just above, with the difference that
185 the first element is a iterator, returned by @ref begin(). 185 the first element is a iterator, returned by @ref begin().
186 */ 186 */
187 void removeAddressee( const Iterator & ); 187 void removeAddressee( const Iterator & );
188 188
189 /** 189 /**
190 Find the specified entry in address book. Returns end(), if the entry 190 Find the specified entry in address book. Returns end(), if the entry
191 couldn't be found. 191 couldn't be found.
192 */ 192 */
193 Iterator find( const Addressee & ); 193 Iterator find( const Addressee & );
194 194
195 /** 195 /**
196 Find the entry specified by an unique id. Returns an empty Addressee 196 Find the entry specified by an unique id. Returns an empty Addressee
197 object, if the address book does not contain an entry with this id. 197 object, if the address book does not contain an entry with this id.
198 */ 198 */
199 Addressee findByUid( const QString & ); 199 Addressee findByUid( const QString & );
200 200
201 201
202 /** 202 /**
203 Returns a list of all addressees in the address book. This list can 203 Returns a list of all addressees in the address book. This list can
204 be sorted with @ref KABC::AddresseeList for example. 204 be sorted with @ref KABC::AddresseeList for example.
205 */ 205 */
206 Addressee::List allAddressees(); 206 Addressee::List allAddressees();
207 207
208 /** 208 /**
209 Find all entries with the specified name in the address book. Returns 209 Find all entries with the specified name in the address book. Returns
210 an empty list, if no entries could be found. 210 an empty list, if no entries could be found.
211 */ 211 */
212 Addressee::List findByName( const QString & ); 212 Addressee::List findByName( const QString & );
213 213
214 /** 214 /**
215 Find all entries with the specified email address in the address book. 215 Find all entries with the specified email address in the address book.
216 Returns an empty list, if no entries could be found. 216 Returns an empty list, if no entries could be found.
217 */ 217 */
218 Addressee::List findByEmail( const QString & ); 218 Addressee::List findByEmail( const QString & );
219 219
220 /** 220 /**
221 Find all entries wich have the specified category in the address book. 221 Find all entries wich have the specified category in the address book.
222 Returns an empty list, if no entries could be found. 222 Returns an empty list, if no entries could be found.
223 */ 223 */
224 Addressee::List findByCategory( const QString & ); 224 Addressee::List findByCategory( const QString & );
225 225
226 /** 226 /**
227 Return a string identifying this addressbook. 227 Return a string identifying this addressbook.
228 */ 228 */
229 virtual QString identifier(); 229 virtual QString identifier();
230 230
231 /** 231 /**
232 Used for debug output. 232 Used for debug output.
233 */ 233 */
234 void dump() const; 234 void dump() const;
235 235
236 void emitAddressBookLocked() { emit addressBookLocked( this ); } 236 void emitAddressBookLocked() { emit addressBookLocked( this ); }
237 void emitAddressBookUnlocked() { emit addressBookUnlocked( this ); } 237 void emitAddressBookUnlocked() { emit addressBookUnlocked( this ); }
238 void emitAddressBookChanged() { emit addressBookChanged( this ); } 238 void emitAddressBookChanged() { emit addressBookChanged( this ); }
239 239
240 /** 240 /**
241 Return list of all Fields known to the address book which are associated 241 Return list of all Fields known to the address book which are associated
242 with the given field category. 242 with the given field category.
243 */ 243 */
244 Field::List fields( int category = Field::All ); 244 Field::List fields( int category = Field::All );
245 245
246 /** 246 /**
247 Add custom field to address book. 247 Add custom field to address book.
248 248
249 @param label User visible label of the field. 249 @param label User visible label of the field.
250 @param category Ored list of field categories. 250 @param category Ored list of field categories.
251 @param key Identifier used as key for reading and writing the field. 251 @param key Identifier used as key for reading and writing the field.
252 @param app String used as application key for reading and writing 252 @param app String used as application key for reading and writing
253 the field. 253 the field.
254 */ 254 */
255 bool addCustomField( const QString &label, int category = Field::All, 255 bool addCustomField( const QString &label, int category = Field::All,
256 const QString &key = QString::null, 256 const QString &key = QString::null,
257 const QString &app = QString::null ); 257 const QString &app = QString::null );
258 258
259 259
260 /** 260 /**
261 Add address book resource. 261 Add address book resource.
262 */ 262 */
263 bool addResource( Resource * ); 263 bool addResource( Resource * );
264 264
265 /** 265 /**
266 Remove address book resource. 266 Remove address book resource.
267 */ 267 */
268 bool removeResource( Resource * ); 268 bool removeResource( Resource * );
269 269
270 /** 270 /**
271 Return pointer list of all resources. 271 Return pointer list of all resources.
272 */ 272 */
273 QPtrList<Resource> resources(); 273 QPtrList<Resource> resources();
274 274
275 /** 275 /**
276 Set the @p ErrorHandler, that is used by @ref error() to 276 Set the @p ErrorHandler, that is used by @ref error() to
277 provide gui-independend error messages. 277 provide gui-independend error messages.
278 */ 278 */
279 void setErrorHandler( ErrorHandler * ); 279 void setErrorHandler( ErrorHandler * );
280 280
281 /** 281 /**
282 Shows gui independend error messages. 282 Shows gui independend error messages.
283 */ 283 */
284 void error( const QString& ); 284 void error( const QString& );
285 285
286 /** 286 /**
287 Query all resources to clean up their lock files 287 Query all resources to clean up their lock files
288 */ 288 */
289 void cleanUp(); 289 void cleanUp();
290 290
291 // sync stuff
292 Addressee::List getExternLastSyncAddressees();
293 void resetTempSyncStat();
294
295
291 signals: 296 signals:
292 /** 297 /**
293 Emitted, when the address book has changed on disk. 298 Emitted, when the address book has changed on disk.
294 */ 299 */
295 void addressBookChanged( AddressBook * ); 300 void addressBookChanged( AddressBook * );
296 301
297 /** 302 /**
298 Emitted, when the address book has been locked for writing. 303 Emitted, when the address book has been locked for writing.
299 */ 304 */
300 void addressBookLocked( AddressBook * ); 305 void addressBookLocked( AddressBook * );
301 306
302 /** 307 /**
303 Emitted, when the address book has been unlocked. 308 Emitted, when the address book has been unlocked.
304 */ 309 */
305 void addressBookUnlocked( AddressBook * ); 310 void addressBookUnlocked( AddressBook * );
306 311
307 protected: 312 protected:
308 void deleteRemovedAddressees(); 313 void deleteRemovedAddressees();
309 void setStandardResource( Resource * ); 314 void setStandardResource( Resource * );
310 Resource *standardResource(); 315 Resource *standardResource();
311 KRES::Manager<Resource> *resourceManager(); 316 KRES::Manager<Resource> *resourceManager();
312 317
313 void init(const QString &config, const QString &family); 318 void init(const QString &config, const QString &family);
314 319
315 private: 320 private:
316//US QPtrList<Resource> mDummy; // Remove in KDE 4 321//US QPtrList<Resource> mDummy; // Remove in KDE 4
317 322
318 323
319 struct AddressBookData; 324 struct AddressBookData;
320 AddressBookData *d; 325 AddressBookData *d;
321}; 326};
322 327
323QDataStream &operator<<( QDataStream &, const AddressBook & ); 328QDataStream &operator<<( QDataStream &, const AddressBook & );
324QDataStream &operator>>( QDataStream &, AddressBook & ); 329QDataStream &operator>>( QDataStream &, AddressBook & );
325 330
326} 331}
327 332
328#endif 333#endif
diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp
index 4cdd5e5..fb32f6e 100644
--- a/kabc/addressee.cpp
+++ b/kabc/addressee.cpp
@@ -1,1630 +1,1682 @@
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/*
23Enhanced Version of the file for platform independent KDE tools. 23Enhanced Version of the file for platform independent KDE tools.
24Copyright (c) 2004 Ulf Schenk 24Copyright (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//US 36//US
36#include <kstandarddirs.h> 37#include <kstandarddirs.h>
38#include <libkcal/syncdefines.h>
37 39
38//US #include "resource.h" 40//US #include "resource.h"
39#include "addressee.h" 41#include "addressee.h"
40 42
41using namespace KABC; 43using namespace KABC;
42 44
43static bool matchBinaryPattern( int value, int pattern ); 45static bool matchBinaryPattern( int value, int pattern );
44 46
45struct Addressee::AddresseeData : public KShared 47struct Addressee::AddresseeData : public KShared
46{ 48{
47 QString uid; 49 QString uid;
48 QString name; 50 QString name;
49 QString formattedName; 51 QString formattedName;
50 QString familyName; 52 QString familyName;
51 QString givenName; 53 QString givenName;
52 QString additionalName; 54 QString additionalName;
53 QString prefix; 55 QString prefix;
54 QString suffix; 56 QString suffix;
55 QString nickName; 57 QString nickName;
56 QDateTime birthday; 58 QDateTime birthday;
57 QString mailer; 59 QString mailer;
58 TimeZone timeZone; 60 TimeZone timeZone;
59 Geo geo; 61 Geo geo;
60 QString title; 62 QString title;
61 QString role; 63 QString role;
62 QString organization; 64 QString organization;
63 QString note; 65 QString note;
64 QString productId; 66 QString productId;
65 QDateTime revision; 67 QDateTime revision;
66 QString sortString; 68 QString sortString;
67 KURL url; 69 KURL url;
68 Secrecy secrecy; 70 Secrecy secrecy;
69 Picture logo; 71 Picture logo;
70 Picture photo; 72 Picture photo;
71 Sound sound; 73 Sound sound;
72 Agent agent; 74 Agent agent;
73 75 QString mExternalId;
74 PhoneNumber::List phoneNumbers; 76 PhoneNumber::List phoneNumbers;
75 Address::List addresses; 77 Address::List addresses;
76 Key::List keys; 78 Key::List keys;
77 QStringList emails; 79 QStringList emails;
78 QStringList categories; 80 QStringList categories;
79 QStringList custom; 81 QStringList custom;
80 82
81 Resource *resource; 83 Resource *resource;
82 84
83 bool empty :1; 85 bool empty :1;
84 bool changed :1; 86 bool changed :1;
85}; 87};
86 88
87Addressee::Addressee() 89Addressee::Addressee()
88{ 90{
89 mData = new AddresseeData; 91 mData = new AddresseeData;
90 mData->empty = true; 92 mData->empty = true;
91 mData->changed = false; 93 mData->changed = false;
92 mData->resource = 0; 94 mData->resource = 0;
95 mData->mExternalId = ":";
96 mTempSyncStat = SYNC_TEMPSTATE_INITIAL;
93} 97}
94 98
95Addressee::~Addressee() 99Addressee::~Addressee()
96{ 100{
97} 101}
98 102
99Addressee::Addressee( const Addressee &a ) 103Addressee::Addressee( const Addressee &a )
100{ 104{
101 mData = a.mData; 105 mData = a.mData;
106 mTempSyncStat = SYNC_TEMPSTATE_INITIAL;
102} 107}
103 108
104Addressee &Addressee::operator=( const Addressee &a ) 109Addressee &Addressee::operator=( const Addressee &a )
105{ 110{
106 mData = a.mData; 111 mData = a.mData;
107 return (*this); 112 return (*this);
108} 113}
109 114
110Addressee Addressee::copy() 115Addressee Addressee::copy()
111{ 116{
112 Addressee a; 117 Addressee a;
113 *(a.mData) = *mData; 118 *(a.mData) = *mData;
114 return a; 119 return a;
115} 120}
116 121
117void Addressee::detach() 122void Addressee::detach()
118{ 123{
119 if ( mData.count() == 1 ) return; 124 if ( mData.count() == 1 ) return;
120 *this = copy(); 125 *this = copy();
121} 126}
122 127
123bool Addressee::operator==( const Addressee &a ) const 128bool Addressee::operator==( const Addressee &a ) const
124{ 129{
125 if ( uid() != a.uid() ) return false; 130 if ( uid() != a.uid() ) return false;
126 if ( mData->name != a.mData->name ) return false; 131 if ( mData->name != a.mData->name ) return false;
127 if ( mData->formattedName != a.mData->formattedName ) return false; 132 if ( mData->formattedName != a.mData->formattedName ) return false;
128 if ( mData->familyName != a.mData->familyName ) return false; 133 if ( mData->familyName != a.mData->familyName ) return false;
129 if ( mData->givenName != a.mData->givenName ) return false; 134 if ( mData->givenName != a.mData->givenName ) return false;
130 if ( mData->additionalName != a.mData->additionalName ) return false; 135 if ( mData->additionalName != a.mData->additionalName ) return false;
131 if ( mData->prefix != a.mData->prefix ) return false; 136 if ( mData->prefix != a.mData->prefix ) return false;
132 if ( mData->suffix != a.mData->suffix ) return false; 137 if ( mData->suffix != a.mData->suffix ) return false;
133 if ( mData->nickName != a.mData->nickName ) return false; 138 if ( mData->nickName != a.mData->nickName ) return false;
134 if ( mData->birthday != a.mData->birthday ) return false; 139 if ( mData->birthday != a.mData->birthday ) return false;
135 if ( mData->mailer != a.mData->mailer ) return false; 140 if ( mData->mailer != a.mData->mailer ) return false;
136 if ( mData->timeZone != a.mData->timeZone ) return false; 141 if ( mData->timeZone != a.mData->timeZone ) return false;
137 if ( mData->geo != a.mData->geo ) return false; 142 if ( mData->geo != a.mData->geo ) return false;
138 if ( mData->title != a.mData->title ) return false; 143 if ( mData->title != a.mData->title ) return false;
139 if ( mData->role != a.mData->role ) return false; 144 if ( mData->role != a.mData->role ) return false;
140 if ( mData->organization != a.mData->organization ) return false; 145 if ( mData->organization != a.mData->organization ) return false;
141 if ( mData->note != a.mData->note ) return false; 146 if ( mData->note != a.mData->note ) return false;
142 if ( mData->productId != a.mData->productId ) return false; 147 if ( mData->productId != a.mData->productId ) return false;
143 if ( mData->revision != a.mData->revision ) return false; 148 if ( mData->revision != a.mData->revision ) return false;
144 if ( mData->sortString != a.mData->sortString ) return false; 149 if ( mData->sortString != a.mData->sortString ) return false;
145 if ( mData->secrecy != a.mData->secrecy ) return false; 150 if ( mData->secrecy != a.mData->secrecy ) return false;
146 if ( mData->logo != a.mData->logo ) return false; 151 if ( mData->logo != a.mData->logo ) return false;
147 if ( mData->photo != a.mData->photo ) return false; 152 if ( mData->photo != a.mData->photo ) return false;
148 if ( mData->sound != a.mData->sound ) return false; 153 if ( mData->sound != a.mData->sound ) return false;
149 if ( mData->agent != a.mData->agent ) return false; 154 if ( mData->agent != a.mData->agent ) return false;
150 if ( ( mData->url.isValid() || a.mData->url.isValid() ) && 155 if ( ( mData->url.isValid() || a.mData->url.isValid() ) &&
151 ( mData->url != a.mData->url ) ) return false; 156 ( mData->url != a.mData->url ) ) return false;
152 if ( mData->phoneNumbers != a.mData->phoneNumbers ) return false; 157 if ( mData->phoneNumbers != a.mData->phoneNumbers ) return false;
153 if ( mData->addresses != a.mData->addresses ) return false; 158 if ( mData->addresses != a.mData->addresses ) return false;
154 if ( mData->keys != a.mData->keys ) return false; 159 if ( mData->keys != a.mData->keys ) return false;
155 if ( mData->emails != a.mData->emails ) return false; 160 if ( mData->emails != a.mData->emails ) return false;
156 if ( mData->categories != a.mData->categories ) return false; 161 if ( mData->categories != a.mData->categories ) return false;
157 if ( mData->custom != a.mData->custom ) return false; 162 if ( mData->custom != a.mData->custom ) return false;
158 163
159 return true; 164 return true;
160} 165}
161 166
162bool Addressee::operator!=( const Addressee &a ) const 167bool Addressee::operator!=( const Addressee &a ) const
163{ 168{
164 return !( a == *this ); 169 return !( a == *this );
165} 170}
166 171
167bool Addressee::isEmpty() const 172bool Addressee::isEmpty() const
168{ 173{
169 return mData->empty; 174 return mData->empty;
170} 175}
176void Addressee::removeID(const QString &prof)
177{
178 detach();
179 mData->mExternalId = KIdManager::removeId ( mData->mExternalId, prof);
180
181}
182void Addressee::setID( const QString & prof , const QString & id )
183{
184 detach();
185 mData->mExternalId = KIdManager::setId ( mData->mExternalId, prof, id );
186}
187void Addressee::setTempSyncStat( int id )
188{
189 mTempSyncStat = id;
190}
191int Addressee::tempSyncStat() const
192{
193 return mTempSyncStat;
194}
195
196QString Addressee::getID( const QString & prof)
197{
198 return KIdManager::getId ( mData->mExternalId, prof );
199}
200
201void Addressee::setCsum( const QString & prof , const QString & id )
202{
203 detach();
204 mData->mExternalId = KIdManager::setCsum ( mData->mExternalId, prof, id );
205}
206
207QString Addressee::getCsum( const QString & prof)
208{
209 return KIdManager::getCsum ( mData->mExternalId, prof );
210}
211
212void Addressee::setIDStr( const QString & s )
213{
214 detach();
215 mData->mExternalId = s;
216}
217
218QString Addressee::IDStr() const
219{
220 return mData->mExternalId;
221}
222
171 223
172void Addressee::setUid( const QString &id ) 224void Addressee::setUid( const QString &id )
173{ 225{
174 if ( id == mData->uid ) return; 226 if ( id == mData->uid ) return;
175 detach(); 227 detach();
176 mData->empty = false; 228 mData->empty = false;
177 mData->uid = id; 229 mData->uid = id;
178} 230}
179 231
180QString Addressee::uid() const 232QString Addressee::uid() const
181{ 233{
182 if ( mData->uid.isEmpty() ) 234 if ( mData->uid.isEmpty() )
183 mData->uid = KApplication::randomString( 10 ); 235 mData->uid = KApplication::randomString( 10 );
184 236
185 return mData->uid; 237 return mData->uid;
186} 238}
187 239
188QString Addressee::uidLabel() 240QString Addressee::uidLabel()
189{ 241{
190 return i18n("Unique Identifier"); 242 return i18n("Unique Identifier");
191} 243}
192 244
193void Addressee::setName( const QString &name ) 245void Addressee::setName( const QString &name )
194{ 246{
195 if ( name == mData->name ) return; 247 if ( name == mData->name ) return;
196 detach(); 248 detach();
197 mData->empty = false; 249 mData->empty = false;
198 mData->name = name; 250 mData->name = name;
199} 251}
200 252
201QString Addressee::name() const 253QString Addressee::name() const
202{ 254{
203 return mData->name; 255 return mData->name;
204} 256}
205 257
206QString Addressee::nameLabel() 258QString Addressee::nameLabel()
207{ 259{
208 return i18n("Name"); 260 return i18n("Name");
209} 261}
210 262
211 263
212void Addressee::setFormattedName( const QString &formattedName ) 264void Addressee::setFormattedName( const QString &formattedName )
213{ 265{
214 if ( formattedName == mData->formattedName ) return; 266 if ( formattedName == mData->formattedName ) return;
215 detach(); 267 detach();
216 mData->empty = false; 268 mData->empty = false;
217 mData->formattedName = formattedName; 269 mData->formattedName = formattedName;
218} 270}
219 271
220QString Addressee::formattedName() const 272QString Addressee::formattedName() const
221{ 273{
222 return mData->formattedName; 274 return mData->formattedName;
223} 275}
224 276
225QString Addressee::formattedNameLabel() 277QString Addressee::formattedNameLabel()
226{ 278{
227 return i18n("Formatted Name"); 279 return i18n("Formatted Name");
228} 280}
229 281
230 282
231void Addressee::setFamilyName( const QString &familyName ) 283void Addressee::setFamilyName( const QString &familyName )
232{ 284{
233 if ( familyName == mData->familyName ) return; 285 if ( familyName == mData->familyName ) return;
234 detach(); 286 detach();
235 mData->empty = false; 287 mData->empty = false;
236 mData->familyName = familyName; 288 mData->familyName = familyName;
237} 289}
238 290
239QString Addressee::familyName() const 291QString Addressee::familyName() const
240{ 292{
241 return mData->familyName; 293 return mData->familyName;
242} 294}
243 295
244QString Addressee::familyNameLabel() 296QString Addressee::familyNameLabel()
245{ 297{
246 return i18n("Family Name"); 298 return i18n("Family Name");
247} 299}
248 300
249 301
250void Addressee::setGivenName( const QString &givenName ) 302void Addressee::setGivenName( const QString &givenName )
251{ 303{
252 if ( givenName == mData->givenName ) return; 304 if ( givenName == mData->givenName ) return;
253 detach(); 305 detach();
254 mData->empty = false; 306 mData->empty = false;
255 mData->givenName = givenName; 307 mData->givenName = givenName;
256} 308}
257 309
258QString Addressee::givenName() const 310QString Addressee::givenName() const
259{ 311{
260 return mData->givenName; 312 return mData->givenName;
261} 313}
262 314
263QString Addressee::givenNameLabel() 315QString Addressee::givenNameLabel()
264{ 316{
265 return i18n("Given Name"); 317 return i18n("Given Name");
266} 318}
267 319
268 320
269void Addressee::setAdditionalName( const QString &additionalName ) 321void Addressee::setAdditionalName( const QString &additionalName )
270{ 322{
271 if ( additionalName == mData->additionalName ) return; 323 if ( additionalName == mData->additionalName ) return;
272 detach(); 324 detach();
273 mData->empty = false; 325 mData->empty = false;
274 mData->additionalName = additionalName; 326 mData->additionalName = additionalName;
275} 327}
276 328
277QString Addressee::additionalName() const 329QString Addressee::additionalName() const
278{ 330{
279 return mData->additionalName; 331 return mData->additionalName;
280} 332}
281 333
282QString Addressee::additionalNameLabel() 334QString Addressee::additionalNameLabel()
283{ 335{
284 return i18n("Additional Names"); 336 return i18n("Additional Names");
285} 337}
286 338
287 339
288void Addressee::setPrefix( const QString &prefix ) 340void Addressee::setPrefix( const QString &prefix )
289{ 341{
290 if ( prefix == mData->prefix ) return; 342 if ( prefix == mData->prefix ) return;
291 detach(); 343 detach();
292 mData->empty = false; 344 mData->empty = false;
293 mData->prefix = prefix; 345 mData->prefix = prefix;
294} 346}
295 347
296QString Addressee::prefix() const 348QString Addressee::prefix() const
297{ 349{
298 return mData->prefix; 350 return mData->prefix;
299} 351}
300 352
301QString Addressee::prefixLabel() 353QString Addressee::prefixLabel()
302{ 354{
303 return i18n("Honorific Prefixes"); 355 return i18n("Honorific Prefixes");
304} 356}
305 357
306 358
307void Addressee::setSuffix( const QString &suffix ) 359void Addressee::setSuffix( const QString &suffix )
308{ 360{
309 if ( suffix == mData->suffix ) return; 361 if ( suffix == mData->suffix ) return;
310 detach(); 362 detach();
311 mData->empty = false; 363 mData->empty = false;
312 mData->suffix = suffix; 364 mData->suffix = suffix;
313} 365}
314 366
315QString Addressee::suffix() const 367QString Addressee::suffix() const
316{ 368{
317 return mData->suffix; 369 return mData->suffix;
318} 370}
319 371
320QString Addressee::suffixLabel() 372QString Addressee::suffixLabel()
321{ 373{
322 return i18n("Honorific Suffixes"); 374 return i18n("Honorific Suffixes");
323} 375}
324 376
325 377
326void Addressee::setNickName( const QString &nickName ) 378void Addressee::setNickName( const QString &nickName )
327{ 379{
328 if ( nickName == mData->nickName ) return; 380 if ( nickName == mData->nickName ) return;
329 detach(); 381 detach();
330 mData->empty = false; 382 mData->empty = false;
331 mData->nickName = nickName; 383 mData->nickName = nickName;
332} 384}
333 385
334QString Addressee::nickName() const 386QString Addressee::nickName() const
335{ 387{
336 return mData->nickName; 388 return mData->nickName;
337} 389}
338 390
339QString Addressee::nickNameLabel() 391QString Addressee::nickNameLabel()
340{ 392{
341 return i18n("Nick Name"); 393 return i18n("Nick Name");
342} 394}
343 395
344 396
345void Addressee::setBirthday( const QDateTime &birthday ) 397void Addressee::setBirthday( const QDateTime &birthday )
346{ 398{
347 if ( birthday == mData->birthday ) return; 399 if ( birthday == mData->birthday ) return;
348 detach(); 400 detach();
349 mData->empty = false; 401 mData->empty = false;
350 mData->birthday = birthday; 402 mData->birthday = birthday;
351} 403}
352 404
353QDateTime Addressee::birthday() const 405QDateTime Addressee::birthday() const
354{ 406{
355 return mData->birthday; 407 return mData->birthday;
356} 408}
357 409
358QString Addressee::birthdayLabel() 410QString Addressee::birthdayLabel()
359{ 411{
360 return i18n("Birthday"); 412 return i18n("Birthday");
361} 413}
362 414
363 415
364QString Addressee::homeAddressStreetLabel() 416QString Addressee::homeAddressStreetLabel()
365{ 417{
366 return i18n("Home Address Street"); 418 return i18n("Home Address Street");
367} 419}
368 420
369 421
370QString Addressee::homeAddressLocalityLabel() 422QString Addressee::homeAddressLocalityLabel()
371{ 423{
372 return i18n("Home Address Locality"); 424 return i18n("Home Address Locality");
373} 425}
374 426
375 427
376QString Addressee::homeAddressRegionLabel() 428QString Addressee::homeAddressRegionLabel()
377{ 429{
378 return i18n("Home Address Region"); 430 return i18n("Home Address Region");
379} 431}
380 432
381 433
382QString Addressee::homeAddressPostalCodeLabel() 434QString Addressee::homeAddressPostalCodeLabel()
383{ 435{
384 return i18n("Home Address Postal Code"); 436 return i18n("Home Address Postal Code");
385} 437}
386 438
387 439
388QString Addressee::homeAddressCountryLabel() 440QString Addressee::homeAddressCountryLabel()
389{ 441{
390 return i18n("Home Address Country"); 442 return i18n("Home Address Country");
391} 443}
392 444
393 445
394QString Addressee::homeAddressLabelLabel() 446QString Addressee::homeAddressLabelLabel()
395{ 447{
396 return i18n("Home Address Label"); 448 return i18n("Home Address Label");
397} 449}
398 450
399 451
400QString Addressee::businessAddressStreetLabel() 452QString Addressee::businessAddressStreetLabel()
401{ 453{
402 return i18n("Business Address Street"); 454 return i18n("Business Address Street");
403} 455}
404 456
405 457
406QString Addressee::businessAddressLocalityLabel() 458QString Addressee::businessAddressLocalityLabel()
407{ 459{
408 return i18n("Business Address Locality"); 460 return i18n("Business Address Locality");
409} 461}
410 462
411 463
412QString Addressee::businessAddressRegionLabel() 464QString Addressee::businessAddressRegionLabel()
413{ 465{
414 return i18n("Business Address Region"); 466 return i18n("Business Address Region");
415} 467}
416 468
417 469
418QString Addressee::businessAddressPostalCodeLabel() 470QString Addressee::businessAddressPostalCodeLabel()
419{ 471{
420 return i18n("Business Address Postal Code"); 472 return i18n("Business Address Postal Code");
421} 473}
422 474
423 475
424QString Addressee::businessAddressCountryLabel() 476QString Addressee::businessAddressCountryLabel()
425{ 477{
426 return i18n("Business Address Country"); 478 return i18n("Business Address Country");
427} 479}
428 480
429 481
430QString Addressee::businessAddressLabelLabel() 482QString Addressee::businessAddressLabelLabel()
431{ 483{
432 return i18n("Business Address Label"); 484 return i18n("Business Address Label");
433} 485}
434 486
435 487
436QString Addressee::homePhoneLabel() 488QString Addressee::homePhoneLabel()
437{ 489{
438 return i18n("Home Phone"); 490 return i18n("Home Phone");
439} 491}
440 492
441 493
442QString Addressee::businessPhoneLabel() 494QString Addressee::businessPhoneLabel()
443{ 495{
444 return i18n("Business Phone"); 496 return i18n("Business Phone");
445} 497}
446 498
447 499
448QString Addressee::mobilePhoneLabel() 500QString Addressee::mobilePhoneLabel()
449{ 501{
450 return i18n("Mobile Phone"); 502 return i18n("Mobile Phone");
451} 503}
452 504
453 505
454QString Addressee::homeFaxLabel() 506QString Addressee::homeFaxLabel()
455{ 507{
456 return i18n("Home Fax"); 508 return i18n("Home Fax");
457} 509}
458 510
459 511
460QString Addressee::businessFaxLabel() 512QString Addressee::businessFaxLabel()
461{ 513{
462 return i18n("Business Fax"); 514 return i18n("Business Fax");
463} 515}
464 516
465 517
466QString Addressee::carPhoneLabel() 518QString Addressee::carPhoneLabel()
467{ 519{
468 return i18n("Car Phone"); 520 return i18n("Car Phone");
469} 521}
470 522
471 523
472QString Addressee::isdnLabel() 524QString Addressee::isdnLabel()
473{ 525{
474 return i18n("ISDN"); 526 return i18n("ISDN");
475} 527}
476 528
477 529
478QString Addressee::pagerLabel() 530QString Addressee::pagerLabel()
479{ 531{
480 return i18n("Pager"); 532 return i18n("Pager");
481} 533}
482 534
483QString Addressee::sipLabel() 535QString Addressee::sipLabel()
484{ 536{
485 return i18n("SIP"); 537 return i18n("SIP");
486} 538}
487 539
488QString Addressee::emailLabel() 540QString Addressee::emailLabel()
489{ 541{
490 return i18n("Email Address"); 542 return i18n("Email Address");
491} 543}
492 544
493 545
494void Addressee::setMailer( const QString &mailer ) 546void Addressee::setMailer( const QString &mailer )
495{ 547{
496 if ( mailer == mData->mailer ) return; 548 if ( mailer == mData->mailer ) return;
497 detach(); 549 detach();
498 mData->empty = false; 550 mData->empty = false;
499 mData->mailer = mailer; 551 mData->mailer = mailer;
500} 552}
501 553
502QString Addressee::mailer() const 554QString Addressee::mailer() const
503{ 555{
504 return mData->mailer; 556 return mData->mailer;
505} 557}
506 558
507QString Addressee::mailerLabel() 559QString Addressee::mailerLabel()
508{ 560{
509 return i18n("Mail Client"); 561 return i18n("Mail Client");
510} 562}
511 563
512 564
513void Addressee::setTimeZone( const TimeZone &timeZone ) 565void Addressee::setTimeZone( const TimeZone &timeZone )
514{ 566{
515 if ( timeZone == mData->timeZone ) return; 567 if ( timeZone == mData->timeZone ) return;
516 detach(); 568 detach();
517 mData->empty = false; 569 mData->empty = false;
518 mData->timeZone = timeZone; 570 mData->timeZone = timeZone;
519} 571}
520 572
521TimeZone Addressee::timeZone() const 573TimeZone Addressee::timeZone() const
522{ 574{
523 return mData->timeZone; 575 return mData->timeZone;
524} 576}
525 577
526QString Addressee::timeZoneLabel() 578QString Addressee::timeZoneLabel()
527{ 579{
528 return i18n("Time Zone"); 580 return i18n("Time Zone");
529} 581}
530 582
531 583
532void Addressee::setGeo( const Geo &geo ) 584void Addressee::setGeo( const Geo &geo )
533{ 585{
534 if ( geo == mData->geo ) return; 586 if ( geo == mData->geo ) return;
535 detach(); 587 detach();
536 mData->empty = false; 588 mData->empty = false;
537 mData->geo = geo; 589 mData->geo = geo;
538} 590}
539 591
540Geo Addressee::geo() const 592Geo Addressee::geo() const
541{ 593{
542 return mData->geo; 594 return mData->geo;
543} 595}
544 596
545QString Addressee::geoLabel() 597QString Addressee::geoLabel()
546{ 598{
547 return i18n("Geographic Position"); 599 return i18n("Geographic Position");
548} 600}
549 601
550 602
551void Addressee::setTitle( const QString &title ) 603void Addressee::setTitle( const QString &title )
552{ 604{
553 if ( title == mData->title ) return; 605 if ( title == mData->title ) return;
554 detach(); 606 detach();
555 mData->empty = false; 607 mData->empty = false;
556 mData->title = title; 608 mData->title = title;
557} 609}
558 610
559QString Addressee::title() const 611QString Addressee::title() const
560{ 612{
561 return mData->title; 613 return mData->title;
562} 614}
563 615
564QString Addressee::titleLabel() 616QString Addressee::titleLabel()
565{ 617{
566 return i18n("Title"); 618 return i18n("Title");
567} 619}
568 620
569 621
570void Addressee::setRole( const QString &role ) 622void Addressee::setRole( const QString &role )
571{ 623{
572 if ( role == mData->role ) return; 624 if ( role == mData->role ) return;
573 detach(); 625 detach();
574 mData->empty = false; 626 mData->empty = false;
575 mData->role = role; 627 mData->role = role;
576} 628}
577 629
578QString Addressee::role() const 630QString Addressee::role() const
579{ 631{
580 return mData->role; 632 return mData->role;
581} 633}
582 634
583QString Addressee::roleLabel() 635QString Addressee::roleLabel()
584{ 636{
585 return i18n("Role"); 637 return i18n("Role");
586} 638}
587 639
588 640
589void Addressee::setOrganization( const QString &organization ) 641void Addressee::setOrganization( const QString &organization )
590{ 642{
591 if ( organization == mData->organization ) return; 643 if ( organization == mData->organization ) return;
592 detach(); 644 detach();
593 mData->empty = false; 645 mData->empty = false;
594 mData->organization = organization; 646 mData->organization = organization;
595} 647}
596 648
597QString Addressee::organization() const 649QString Addressee::organization() const
598{ 650{
599 return mData->organization; 651 return mData->organization;
600} 652}
601 653
602QString Addressee::organizationLabel() 654QString Addressee::organizationLabel()
603{ 655{
604 return i18n("Organization"); 656 return i18n("Organization");
605} 657}
606 658
607 659
608void Addressee::setNote( const QString &note ) 660void Addressee::setNote( const QString &note )
609{ 661{
610 if ( note == mData->note ) return; 662 if ( note == mData->note ) return;
611 detach(); 663 detach();
612 mData->empty = false; 664 mData->empty = false;
613 mData->note = note; 665 mData->note = note;
614} 666}
615 667
616QString Addressee::note() const 668QString Addressee::note() const
617{ 669{
618 return mData->note; 670 return mData->note;
619} 671}
620 672
621QString Addressee::noteLabel() 673QString Addressee::noteLabel()
622{ 674{
623 return i18n("Note"); 675 return i18n("Note");
624} 676}
625 677
626 678
627void Addressee::setProductId( const QString &productId ) 679void Addressee::setProductId( const QString &productId )
628{ 680{
629 if ( productId == mData->productId ) return; 681 if ( productId == mData->productId ) return;
630 detach(); 682 detach();
631 mData->empty = false; 683 mData->empty = false;
632 mData->productId = productId; 684 mData->productId = productId;
633} 685}
634 686
635QString Addressee::productId() const 687QString Addressee::productId() const
636{ 688{
637 return mData->productId; 689 return mData->productId;
638} 690}
639 691
640QString Addressee::productIdLabel() 692QString Addressee::productIdLabel()
641{ 693{
642 return i18n("Product Identifier"); 694 return i18n("Product Identifier");
643} 695}
644 696
645 697
646void Addressee::setRevision( const QDateTime &revision ) 698void Addressee::setRevision( const QDateTime &revision )
647{ 699{
648 if ( revision == mData->revision ) return; 700 if ( revision == mData->revision ) return;
649 detach(); 701 detach();
650 mData->empty = false; 702 mData->empty = false;
651 mData->revision = revision; 703 mData->revision = revision;
652} 704}
653 705
654QDateTime Addressee::revision() const 706QDateTime Addressee::revision() const
655{ 707{
656 return mData->revision; 708 return mData->revision;
657} 709}
658 710
659QString Addressee::revisionLabel() 711QString Addressee::revisionLabel()
660{ 712{
661 return i18n("Revision Date"); 713 return i18n("Revision Date");
662} 714}
663 715
664 716
665void Addressee::setSortString( const QString &sortString ) 717void Addressee::setSortString( const QString &sortString )
666{ 718{
667 if ( sortString == mData->sortString ) return; 719 if ( sortString == mData->sortString ) return;
668 detach(); 720 detach();
669 mData->empty = false; 721 mData->empty = false;
670 mData->sortString = sortString; 722 mData->sortString = sortString;
671} 723}
672 724
673QString Addressee::sortString() const 725QString Addressee::sortString() const
674{ 726{
675 return mData->sortString; 727 return mData->sortString;
676} 728}
677 729
678QString Addressee::sortStringLabel() 730QString Addressee::sortStringLabel()
679{ 731{
680 return i18n("Sort String"); 732 return i18n("Sort String");
681} 733}
682 734
683 735
684void Addressee::setUrl( const KURL &url ) 736void Addressee::setUrl( const KURL &url )
685{ 737{
686 if ( url == mData->url ) return; 738 if ( url == mData->url ) return;
687 detach(); 739 detach();
688 mData->empty = false; 740 mData->empty = false;
689 mData->url = url; 741 mData->url = url;
690} 742}
691 743
692KURL Addressee::url() const 744KURL Addressee::url() const
693{ 745{
694 return mData->url; 746 return mData->url;
695} 747}
696 748
697QString Addressee::urlLabel() 749QString Addressee::urlLabel()
698{ 750{
699 return i18n("URL"); 751 return i18n("URL");
700} 752}
701 753
702 754
703void Addressee::setSecrecy( const Secrecy &secrecy ) 755void Addressee::setSecrecy( const Secrecy &secrecy )
704{ 756{
705 if ( secrecy == mData->secrecy ) return; 757 if ( secrecy == mData->secrecy ) return;
706 detach(); 758 detach();
707 mData->empty = false; 759 mData->empty = false;
708 mData->secrecy = secrecy; 760 mData->secrecy = secrecy;
709} 761}
710 762
711Secrecy Addressee::secrecy() const 763Secrecy Addressee::secrecy() const
712{ 764{
713 return mData->secrecy; 765 return mData->secrecy;
714} 766}
715 767
716QString Addressee::secrecyLabel() 768QString Addressee::secrecyLabel()
717{ 769{
718 return i18n("Security Class"); 770 return i18n("Security Class");
719} 771}
720 772
721 773
722void Addressee::setLogo( const Picture &logo ) 774void Addressee::setLogo( const Picture &logo )
723{ 775{
724 if ( logo == mData->logo ) return; 776 if ( logo == mData->logo ) return;
725 detach(); 777 detach();
726 mData->empty = false; 778 mData->empty = false;
727 mData->logo = logo; 779 mData->logo = logo;
728} 780}
729 781
730Picture Addressee::logo() const 782Picture Addressee::logo() const
731{ 783{
732 return mData->logo; 784 return mData->logo;
733} 785}
734 786
735QString Addressee::logoLabel() 787QString Addressee::logoLabel()
736{ 788{
737 return i18n("Logo"); 789 return i18n("Logo");
738} 790}
739 791
740 792
741void Addressee::setPhoto( const Picture &photo ) 793void Addressee::setPhoto( const Picture &photo )
742{ 794{
743 if ( photo == mData->photo ) return; 795 if ( photo == mData->photo ) return;
744 detach(); 796 detach();
745 mData->empty = false; 797 mData->empty = false;
746 mData->photo = photo; 798 mData->photo = photo;
747} 799}
748 800
749Picture Addressee::photo() const 801Picture Addressee::photo() const
750{ 802{
751 return mData->photo; 803 return mData->photo;
752} 804}
753 805
754QString Addressee::photoLabel() 806QString Addressee::photoLabel()
755{ 807{
756 return i18n("Photo"); 808 return i18n("Photo");
757} 809}
758 810
759 811
760void Addressee::setSound( const Sound &sound ) 812void Addressee::setSound( const Sound &sound )
761{ 813{
762 if ( sound == mData->sound ) return; 814 if ( sound == mData->sound ) return;
763 detach(); 815 detach();
764 mData->empty = false; 816 mData->empty = false;
765 mData->sound = sound; 817 mData->sound = sound;
766} 818}
767 819
768Sound Addressee::sound() const 820Sound Addressee::sound() const
769{ 821{
770 return mData->sound; 822 return mData->sound;
771} 823}
772 824
773QString Addressee::soundLabel() 825QString Addressee::soundLabel()
774{ 826{
775 return i18n("Sound"); 827 return i18n("Sound");
776} 828}
777 829
778 830
779void Addressee::setAgent( const Agent &agent ) 831void Addressee::setAgent( const Agent &agent )
780{ 832{
781 if ( agent == mData->agent ) return; 833 if ( agent == mData->agent ) return;
782 detach(); 834 detach();
783 mData->empty = false; 835 mData->empty = false;
784 mData->agent = agent; 836 mData->agent = agent;
785} 837}
786 838
787Agent Addressee::agent() const 839Agent Addressee::agent() const
788{ 840{
789 return mData->agent; 841 return mData->agent;
790} 842}
791 843
792QString Addressee::agentLabel() 844QString Addressee::agentLabel()
793{ 845{
794 return i18n("Agent"); 846 return i18n("Agent");
795} 847}
796 848
797 849
798 850
799void Addressee::setNameFromString( const QString &str ) 851void Addressee::setNameFromString( const QString &str )
800{ 852{
801 setFormattedName( str ); 853 setFormattedName( str );
802 setName( str ); 854 setName( str );
803 855
804 static bool first = true; 856 static bool first = true;
805 static QStringList titles; 857 static QStringList titles;
806 static QStringList suffixes; 858 static QStringList suffixes;
807 static QStringList prefixes; 859 static QStringList prefixes;
808 860
809 if ( first ) { 861 if ( first ) {
810 first = false; 862 first = false;
811 titles += i18n( "Dr." ); 863 titles += i18n( "Dr." );
812 titles += i18n( "Miss" ); 864 titles += i18n( "Miss" );
813 titles += i18n( "Mr." ); 865 titles += i18n( "Mr." );
814 titles += i18n( "Mrs." ); 866 titles += i18n( "Mrs." );
815 titles += i18n( "Ms." ); 867 titles += i18n( "Ms." );
816 titles += i18n( "Prof." ); 868 titles += i18n( "Prof." );
817 869
818 suffixes += i18n( "I" ); 870 suffixes += i18n( "I" );
819 suffixes += i18n( "II" ); 871 suffixes += i18n( "II" );
820 suffixes += i18n( "III" ); 872 suffixes += i18n( "III" );
821 suffixes += i18n( "Jr." ); 873 suffixes += i18n( "Jr." );
822 suffixes += i18n( "Sr." ); 874 suffixes += i18n( "Sr." );
823 875
824 prefixes += "van"; 876 prefixes += "van";
825 prefixes += "von"; 877 prefixes += "von";
826 prefixes += "de"; 878 prefixes += "de";
827 879
828 KConfig config( locateLocal( "config", "kabcrc") ); 880 KConfig config( locateLocal( "config", "kabcrc") );
829 config.setGroup( "General" ); 881 config.setGroup( "General" );
830 titles += config.readListEntry( "Prefixes" ); 882 titles += config.readListEntry( "Prefixes" );
831 titles.remove( "" ); 883 titles.remove( "" );
832 prefixes += config.readListEntry( "Inclusions" ); 884 prefixes += config.readListEntry( "Inclusions" );
833 prefixes.remove( "" ); 885 prefixes.remove( "" );
834 suffixes += config.readListEntry( "Suffixes" ); 886 suffixes += config.readListEntry( "Suffixes" );
835 suffixes.remove( "" ); 887 suffixes.remove( "" );
836 } 888 }
837 889
838 // clear all name parts 890 // clear all name parts
839 setPrefix( "" ); 891 setPrefix( "" );
840 setGivenName( "" ); 892 setGivenName( "" );
841 setAdditionalName( "" ); 893 setAdditionalName( "" );
842 setFamilyName( "" ); 894 setFamilyName( "" );
843 setSuffix( "" ); 895 setSuffix( "" );
844 896
845 if ( str.isEmpty() ) 897 if ( str.isEmpty() )
846 return; 898 return;
847 899
848 int i = str.find(','); 900 int i = str.find(',');
849 if( i < 0 ) { 901 if( i < 0 ) {
850 QStringList parts = QStringList::split( " ", str ); 902 QStringList parts = QStringList::split( " ", str );
851 int leftOffset = 0; 903 int leftOffset = 0;
852 int rightOffset = parts.count() - 1; 904 int rightOffset = parts.count() - 1;
853 905
854 QString suffix; 906 QString suffix;
855 while ( rightOffset >= 0 ) { 907 while ( rightOffset >= 0 ) {
856 if ( suffixes.contains( parts[ rightOffset ] ) ) { 908 if ( suffixes.contains( parts[ rightOffset ] ) ) {
857 suffix.prepend(parts[ rightOffset ] + (suffix.isEmpty() ? "" : " ")); 909 suffix.prepend(parts[ rightOffset ] + (suffix.isEmpty() ? "" : " "));
858 rightOffset--; 910 rightOffset--;
859 } else 911 } else
860 break; 912 break;
861 } 913 }
862 setSuffix( suffix ); 914 setSuffix( suffix );
863 915
864 if ( rightOffset < 0 ) 916 if ( rightOffset < 0 )
865 return; 917 return;
866 918
867 if ( rightOffset - 1 >= 0 && prefixes.contains( parts[ rightOffset - 1 ].lower() ) ) { 919 if ( rightOffset - 1 >= 0 && prefixes.contains( parts[ rightOffset - 1 ].lower() ) ) {
868 setFamilyName( parts[ rightOffset - 1 ] + " " + parts[ rightOffset ] ); 920 setFamilyName( parts[ rightOffset - 1 ] + " " + parts[ rightOffset ] );
869 rightOffset--; 921 rightOffset--;
870 } else 922 } else
871 setFamilyName( parts[ rightOffset ] ); 923 setFamilyName( parts[ rightOffset ] );
872 924
873 QString prefix; 925 QString prefix;
874 while ( leftOffset < rightOffset ) { 926 while ( leftOffset < rightOffset ) {
875 if ( titles.contains( parts[ leftOffset ] ) ) { 927 if ( titles.contains( parts[ leftOffset ] ) ) {
876 prefix.append( ( prefix.isEmpty() ? "" : " ") + parts[ leftOffset ] ); 928 prefix.append( ( prefix.isEmpty() ? "" : " ") + parts[ leftOffset ] );
877 leftOffset++; 929 leftOffset++;
878 } else 930 } else
879 break; 931 break;
880 } 932 }
881 setPrefix( prefix ); 933 setPrefix( prefix );
882 934
883 if ( leftOffset < rightOffset ) { 935 if ( leftOffset < rightOffset ) {
884 setGivenName( parts[ leftOffset ] ); 936 setGivenName( parts[ leftOffset ] );
885 leftOffset++; 937 leftOffset++;
886 } 938 }
887 939
888 QString additionalName; 940 QString additionalName;
889 while ( leftOffset < rightOffset ) { 941 while ( leftOffset < rightOffset ) {
890 additionalName.append( ( additionalName.isEmpty() ? "" : " ") + parts[ leftOffset ] ); 942 additionalName.append( ( additionalName.isEmpty() ? "" : " ") + parts[ leftOffset ] );
891 leftOffset++; 943 leftOffset++;
892 } 944 }
893 setAdditionalName( additionalName ); 945 setAdditionalName( additionalName );
894 } else { 946 } else {
895 QString part1 = str.left( i ); 947 QString part1 = str.left( i );
896 QString part2 = str.mid( i + 1 ); 948 QString part2 = str.mid( i + 1 );
897 949
898 QStringList parts = QStringList::split( " ", part1 ); 950 QStringList parts = QStringList::split( " ", part1 );
899 int leftOffset = 0; 951 int leftOffset = 0;
900 int rightOffset = parts.count() - 1; 952 int rightOffset = parts.count() - 1;
901 953
902 QString suffix; 954 QString suffix;
903 while ( rightOffset >= 0 ) { 955 while ( rightOffset >= 0 ) {
904 if ( suffixes.contains( parts[ rightOffset ] ) ) { 956 if ( suffixes.contains( parts[ rightOffset ] ) ) {
905 suffix.prepend(parts[ rightOffset ] + (suffix.isEmpty() ? "" : " ")); 957 suffix.prepend(parts[ rightOffset ] + (suffix.isEmpty() ? "" : " "));
906 rightOffset--; 958 rightOffset--;
907 } else 959 } else
908 break; 960 break;
909 } 961 }
910 setSuffix( suffix ); 962 setSuffix( suffix );
911 963
912 if ( rightOffset - 1 >= 0 && prefixes.contains( parts[ rightOffset - 1 ].lower() ) ) { 964 if ( rightOffset - 1 >= 0 && prefixes.contains( parts[ rightOffset - 1 ].lower() ) ) {
913 setFamilyName( parts[ rightOffset - 1 ] + " " + parts[ rightOffset ] ); 965 setFamilyName( parts[ rightOffset - 1 ] + " " + parts[ rightOffset ] );
914 rightOffset--; 966 rightOffset--;
915 } else 967 } else
916 setFamilyName( parts[ rightOffset ] ); 968 setFamilyName( parts[ rightOffset ] );
917 969
918 QString prefix; 970 QString prefix;
919 while ( leftOffset < rightOffset ) { 971 while ( leftOffset < rightOffset ) {
920 if ( titles.contains( parts[ leftOffset ] ) ) { 972 if ( titles.contains( parts[ leftOffset ] ) ) {
921 prefix.append( ( prefix.isEmpty() ? "" : " ") + parts[ leftOffset ] ); 973 prefix.append( ( prefix.isEmpty() ? "" : " ") + parts[ leftOffset ] );
922 leftOffset++; 974 leftOffset++;
923 } else 975 } else
924 break; 976 break;
925 } 977 }
926 978
927 parts = QStringList::split( " ", part2 ); 979 parts = QStringList::split( " ", part2 );
928 980
929 leftOffset = 0; 981 leftOffset = 0;
930 rightOffset = parts.count(); 982 rightOffset = parts.count();
931 983
932 while ( leftOffset < rightOffset ) { 984 while ( leftOffset < rightOffset ) {
933 if ( titles.contains( parts[ leftOffset ] ) ) { 985 if ( titles.contains( parts[ leftOffset ] ) ) {
934 prefix.append( ( prefix.isEmpty() ? "" : " ") + parts[ leftOffset ] ); 986 prefix.append( ( prefix.isEmpty() ? "" : " ") + parts[ leftOffset ] );
935 leftOffset++; 987 leftOffset++;
936 } else 988 } else
937 break; 989 break;
938 } 990 }
939 setPrefix( prefix ); 991 setPrefix( prefix );
940 992
941 if ( leftOffset < rightOffset ) { 993 if ( leftOffset < rightOffset ) {
942 setGivenName( parts[ leftOffset ] ); 994 setGivenName( parts[ leftOffset ] );
943 leftOffset++; 995 leftOffset++;
944 } 996 }
945 997
946 QString additionalName; 998 QString additionalName;
947 while ( leftOffset < rightOffset ) { 999 while ( leftOffset < rightOffset ) {
948 additionalName.append( ( additionalName.isEmpty() ? "" : " ") + parts[ leftOffset ] ); 1000 additionalName.append( ( additionalName.isEmpty() ? "" : " ") + parts[ leftOffset ] );
949 leftOffset++; 1001 leftOffset++;
950 } 1002 }
951 setAdditionalName( additionalName ); 1003 setAdditionalName( additionalName );
952 } 1004 }
953} 1005}
954 1006
955QString Addressee::realName() const 1007QString Addressee::realName() const
956{ 1008{
957 if ( !formattedName().isEmpty() ) 1009 if ( !formattedName().isEmpty() )
958 return formattedName(); 1010 return formattedName();
959 1011
960 QString n = assembledName(); 1012 QString n = assembledName();
961 1013
962 if ( n.isEmpty() ) 1014 if ( n.isEmpty() )
963 n = name(); 1015 n = name();
964 1016
965 return n; 1017 return n;
966} 1018}
967 1019
968QString Addressee::assembledName() const 1020QString Addressee::assembledName() const
969{ 1021{
970 QString name = prefix() + " " + givenName() + " " + additionalName() + " " + 1022 QString name = prefix() + " " + givenName() + " " + additionalName() + " " +
971 familyName() + " " + suffix(); 1023 familyName() + " " + suffix();
972 1024
973 return name.simplifyWhiteSpace(); 1025 return name.simplifyWhiteSpace();
974} 1026}
975 1027
976QString Addressee::fullEmail( const QString &email ) const 1028QString Addressee::fullEmail( const QString &email ) const
977{ 1029{
978 QString e; 1030 QString e;
979 if ( email.isNull() ) { 1031 if ( email.isNull() ) {
980 e = preferredEmail(); 1032 e = preferredEmail();
981 } else { 1033 } else {
982 e = email; 1034 e = email;
983 } 1035 }
984 if ( e.isEmpty() ) return QString::null; 1036 if ( e.isEmpty() ) return QString::null;
985 1037
986 QString text; 1038 QString text;
987 if ( realName().isEmpty() ) 1039 if ( realName().isEmpty() )
988 text = e; 1040 text = e;
989 else 1041 else
990 text = assembledName() + " <" + e + ">"; 1042 text = assembledName() + " <" + e + ">";
991 1043
992 return text; 1044 return text;
993} 1045}
994 1046
995void Addressee::insertEmail( const QString &email, bool preferred ) 1047void Addressee::insertEmail( const QString &email, bool preferred )
996{ 1048{
997 detach(); 1049 detach();
998 1050
999 QStringList::Iterator it = mData->emails.find( email ); 1051 QStringList::Iterator it = mData->emails.find( email );
1000 1052
1001 if ( it != mData->emails.end() ) { 1053 if ( it != mData->emails.end() ) {
1002 if ( !preferred || it == mData->emails.begin() ) return; 1054 if ( !preferred || it == mData->emails.begin() ) return;
1003 mData->emails.remove( it ); 1055 mData->emails.remove( it );
1004 mData->emails.prepend( email ); 1056 mData->emails.prepend( email );
1005 } else { 1057 } else {
1006 if ( preferred ) { 1058 if ( preferred ) {
1007 mData->emails.prepend( email ); 1059 mData->emails.prepend( email );
1008 } else { 1060 } else {
1009 mData->emails.append( email ); 1061 mData->emails.append( email );
1010 } 1062 }
1011 } 1063 }
1012} 1064}
1013 1065
1014void Addressee::removeEmail( const QString &email ) 1066void Addressee::removeEmail( const QString &email )
1015{ 1067{
1016 detach(); 1068 detach();
1017 1069
1018 QStringList::Iterator it = mData->emails.find( email ); 1070 QStringList::Iterator it = mData->emails.find( email );
1019 if ( it == mData->emails.end() ) return; 1071 if ( it == mData->emails.end() ) return;
1020 1072
1021 mData->emails.remove( it ); 1073 mData->emails.remove( it );
1022} 1074}
1023 1075
1024QString Addressee::preferredEmail() const 1076QString Addressee::preferredEmail() const
1025{ 1077{
1026 if ( mData->emails.count() == 0 ) return QString::null; 1078 if ( mData->emails.count() == 0 ) return QString::null;
1027 else return mData->emails.first(); 1079 else return mData->emails.first();
1028} 1080}
1029 1081
1030QStringList Addressee::emails() const 1082QStringList Addressee::emails() const
1031{ 1083{
1032 return mData->emails; 1084 return mData->emails;
1033} 1085}
1034void Addressee::setEmails( const QStringList& emails ) { 1086void Addressee::setEmails( const QStringList& emails ) {
1035 detach(); 1087 detach();
1036 mData->emails = emails; 1088 mData->emails = emails;
1037} 1089}
1038void Addressee::insertPhoneNumber( const PhoneNumber &phoneNumber ) 1090void Addressee::insertPhoneNumber( const PhoneNumber &phoneNumber )
1039{ 1091{
1040 detach(); 1092 detach();
1041 mData->empty = false; 1093 mData->empty = false;
1042 1094
1043 PhoneNumber::List::Iterator it; 1095 PhoneNumber::List::Iterator it;
1044 for( it = mData->phoneNumbers.begin(); it != mData->phoneNumbers.end(); ++it ) { 1096 for( it = mData->phoneNumbers.begin(); it != mData->phoneNumbers.end(); ++it ) {
1045 if ( (*it).id() == phoneNumber.id() ) { 1097 if ( (*it).id() == phoneNumber.id() ) {
1046 *it = phoneNumber; 1098 *it = phoneNumber;
1047 return; 1099 return;
1048 } 1100 }
1049 } 1101 }
1050 mData->phoneNumbers.append( phoneNumber ); 1102 mData->phoneNumbers.append( phoneNumber );
1051} 1103}
1052 1104
1053void Addressee::removePhoneNumber( const PhoneNumber &phoneNumber ) 1105void Addressee::removePhoneNumber( const PhoneNumber &phoneNumber )
1054{ 1106{
1055 detach(); 1107 detach();
1056 1108
1057 PhoneNumber::List::Iterator it; 1109 PhoneNumber::List::Iterator it;
1058 for( it = mData->phoneNumbers.begin(); it != mData->phoneNumbers.end(); ++it ) { 1110 for( it = mData->phoneNumbers.begin(); it != mData->phoneNumbers.end(); ++it ) {
1059 if ( (*it).id() == phoneNumber.id() ) { 1111 if ( (*it).id() == phoneNumber.id() ) {
1060 mData->phoneNumbers.remove( it ); 1112 mData->phoneNumbers.remove( it );
1061 return; 1113 return;
1062 } 1114 }
1063 } 1115 }
1064} 1116}
1065 1117
1066PhoneNumber Addressee::phoneNumber( int type ) const 1118PhoneNumber Addressee::phoneNumber( int type ) const
1067{ 1119{
1068 PhoneNumber phoneNumber( "", type ); 1120 PhoneNumber phoneNumber( "", type );
1069 PhoneNumber::List::ConstIterator it; 1121 PhoneNumber::List::ConstIterator it;
1070 for( it = mData->phoneNumbers.begin(); it != mData->phoneNumbers.end(); ++it ) { 1122 for( it = mData->phoneNumbers.begin(); it != mData->phoneNumbers.end(); ++it ) {
1071 if ( matchBinaryPattern( (*it).type(), type ) ) { 1123 if ( matchBinaryPattern( (*it).type(), type ) ) {
1072 if ( (*it).type() & PhoneNumber::Pref ) 1124 if ( (*it).type() & PhoneNumber::Pref )
1073 return (*it); 1125 return (*it);
1074 else if ( phoneNumber.number().isEmpty() ) 1126 else if ( phoneNumber.number().isEmpty() )
1075 phoneNumber = (*it); 1127 phoneNumber = (*it);
1076 } 1128 }
1077 } 1129 }
1078 1130
1079 return phoneNumber; 1131 return phoneNumber;
1080} 1132}
1081 1133
1082PhoneNumber::List Addressee::phoneNumbers() const 1134PhoneNumber::List Addressee::phoneNumbers() const
1083{ 1135{
1084 return mData->phoneNumbers; 1136 return mData->phoneNumbers;
1085} 1137}
1086 1138
1087PhoneNumber::List Addressee::phoneNumbers( int type ) const 1139PhoneNumber::List Addressee::phoneNumbers( int type ) const
1088{ 1140{
1089 PhoneNumber::List list; 1141 PhoneNumber::List list;
1090 1142
1091 PhoneNumber::List::ConstIterator it; 1143 PhoneNumber::List::ConstIterator it;
1092 for( it = mData->phoneNumbers.begin(); it != mData->phoneNumbers.end(); ++it ) { 1144 for( it = mData->phoneNumbers.begin(); it != mData->phoneNumbers.end(); ++it ) {
1093 if ( matchBinaryPattern( (*it).type(), type ) ) { 1145 if ( matchBinaryPattern( (*it).type(), type ) ) {
1094 list.append( *it ); 1146 list.append( *it );
1095 } 1147 }
1096 } 1148 }
1097 return list; 1149 return list;
1098} 1150}
1099 1151
1100PhoneNumber Addressee::findPhoneNumber( const QString &id ) const 1152PhoneNumber Addressee::findPhoneNumber( const QString &id ) const
1101{ 1153{
1102 PhoneNumber::List::ConstIterator it; 1154 PhoneNumber::List::ConstIterator it;
1103 for( it = mData->phoneNumbers.begin(); it != mData->phoneNumbers.end(); ++it ) { 1155 for( it = mData->phoneNumbers.begin(); it != mData->phoneNumbers.end(); ++it ) {
1104 if ( (*it).id() == id ) { 1156 if ( (*it).id() == id ) {
1105 return *it; 1157 return *it;
1106 } 1158 }
1107 } 1159 }
1108 return PhoneNumber(); 1160 return PhoneNumber();
1109} 1161}
1110 1162
1111void Addressee::insertKey( const Key &key ) 1163void Addressee::insertKey( const Key &key )
1112{ 1164{
1113 detach(); 1165 detach();
1114 mData->empty = false; 1166 mData->empty = false;
1115 1167
1116 Key::List::Iterator it; 1168 Key::List::Iterator it;
1117 for( it = mData->keys.begin(); it != mData->keys.end(); ++it ) { 1169 for( it = mData->keys.begin(); it != mData->keys.end(); ++it ) {
1118 if ( (*it).id() == key.id() ) { 1170 if ( (*it).id() == key.id() ) {
1119 *it = key; 1171 *it = key;
1120 return; 1172 return;
1121 } 1173 }
1122 } 1174 }
1123 mData->keys.append( key ); 1175 mData->keys.append( key );
1124} 1176}
1125 1177
1126void Addressee::removeKey( const Key &key ) 1178void Addressee::removeKey( const Key &key )
1127{ 1179{
1128 detach(); 1180 detach();
1129 1181
1130 Key::List::Iterator it; 1182 Key::List::Iterator it;
1131 for( it = mData->keys.begin(); it != mData->keys.end(); ++it ) { 1183 for( it = mData->keys.begin(); it != mData->keys.end(); ++it ) {
1132 if ( (*it).id() == key.id() ) { 1184 if ( (*it).id() == key.id() ) {
1133 mData->keys.remove( key ); 1185 mData->keys.remove( key );
1134 return; 1186 return;
1135 } 1187 }
1136 } 1188 }
1137} 1189}
1138 1190
1139Key Addressee::key( int type, QString customTypeString ) const 1191Key Addressee::key( int type, QString customTypeString ) const
1140{ 1192{
1141 Key::List::ConstIterator it; 1193 Key::List::ConstIterator it;
1142 for( it = mData->keys.begin(); it != mData->keys.end(); ++it ) { 1194 for( it = mData->keys.begin(); it != mData->keys.end(); ++it ) {
1143 if ( (*it).type() == type ) { 1195 if ( (*it).type() == type ) {
1144 if ( type == Key::Custom ) { 1196 if ( type == Key::Custom ) {
1145 if ( customTypeString.isEmpty() ) { 1197 if ( customTypeString.isEmpty() ) {
1146 return *it; 1198 return *it;
1147 } else { 1199 } else {
1148 if ( (*it).customTypeString() == customTypeString ) 1200 if ( (*it).customTypeString() == customTypeString )
1149 return (*it); 1201 return (*it);
1150 } 1202 }
1151 } else { 1203 } else {
1152 return *it; 1204 return *it;
1153 } 1205 }
1154 } 1206 }
1155 } 1207 }
1156 return Key( QString(), type ); 1208 return Key( QString(), type );
1157} 1209}
1158void Addressee::setKeys( const Key::List& list ) { 1210void Addressee::setKeys( const Key::List& list ) {
1159 detach(); 1211 detach();
1160 mData->keys = list; 1212 mData->keys = list;
1161} 1213}
1162 1214
1163Key::List Addressee::keys() const 1215Key::List Addressee::keys() const
1164{ 1216{
1165 return mData->keys; 1217 return mData->keys;
1166} 1218}
1167 1219
1168Key::List Addressee::keys( int type, QString customTypeString ) const 1220Key::List Addressee::keys( int type, QString customTypeString ) const
1169{ 1221{
1170 Key::List list; 1222 Key::List list;
1171 1223
1172 Key::List::ConstIterator it; 1224 Key::List::ConstIterator it;
1173 for( it = mData->keys.begin(); it != mData->keys.end(); ++it ) { 1225 for( it = mData->keys.begin(); it != mData->keys.end(); ++it ) {
1174 if ( (*it).type() == type ) { 1226 if ( (*it).type() == type ) {
1175 if ( type == Key::Custom ) { 1227 if ( type == Key::Custom ) {
1176 if ( customTypeString.isEmpty() ) { 1228 if ( customTypeString.isEmpty() ) {
1177 list.append(*it); 1229 list.append(*it);
1178 } else { 1230 } else {
1179 if ( (*it).customTypeString() == customTypeString ) 1231 if ( (*it).customTypeString() == customTypeString )
1180 list.append(*it); 1232 list.append(*it);
1181 } 1233 }
1182 } else { 1234 } else {
1183 list.append(*it); 1235 list.append(*it);
1184 } 1236 }
1185 } 1237 }
1186 } 1238 }
1187 return list; 1239 return list;
1188} 1240}
1189 1241
1190Key Addressee::findKey( const QString &id ) const 1242Key Addressee::findKey( const QString &id ) const
1191{ 1243{
1192 Key::List::ConstIterator it; 1244 Key::List::ConstIterator it;
1193 for( it = mData->keys.begin(); it != mData->keys.end(); ++it ) { 1245 for( it = mData->keys.begin(); it != mData->keys.end(); ++it ) {
1194 if ( (*it).id() == id ) { 1246 if ( (*it).id() == id ) {
1195 return *it; 1247 return *it;
1196 } 1248 }
1197 } 1249 }
1198 return Key(); 1250 return Key();
1199} 1251}
1200 1252
1201QString Addressee::asString() const 1253QString Addressee::asString() const
1202{ 1254{
1203 return "Smith, agent Smith..."; 1255 return "Smith, agent Smith...";
1204} 1256}
1205 1257
1206void Addressee::dump() const 1258void Addressee::dump() const
1207{ 1259{
1208 return; 1260 return;
1209 kdDebug(5700) << "Addressee {" << endl; 1261 kdDebug(5700) << "Addressee {" << endl;
1210 1262
1211 kdDebug(5700) << " Uid: '" << uid() << "'" << endl; 1263 kdDebug(5700) << " Uid: '" << uid() << "'" << endl;
1212 1264
1213 kdDebug(5700) << " Name: '" << name() << "'" << endl; 1265 kdDebug(5700) << " Name: '" << name() << "'" << endl;
1214 kdDebug(5700) << " FormattedName: '" << formattedName() << "'" << endl; 1266 kdDebug(5700) << " FormattedName: '" << formattedName() << "'" << endl;
1215 kdDebug(5700) << " FamilyName: '" << familyName() << "'" << endl; 1267 kdDebug(5700) << " FamilyName: '" << familyName() << "'" << endl;
1216 kdDebug(5700) << " GivenName: '" << givenName() << "'" << endl; 1268 kdDebug(5700) << " GivenName: '" << givenName() << "'" << endl;
1217 kdDebug(5700) << " AdditionalName: '" << additionalName() << "'" << endl; 1269 kdDebug(5700) << " AdditionalName: '" << additionalName() << "'" << endl;
1218 kdDebug(5700) << " Prefix: '" << prefix() << "'" << endl; 1270 kdDebug(5700) << " Prefix: '" << prefix() << "'" << endl;
1219 kdDebug(5700) << " Suffix: '" << suffix() << "'" << endl; 1271 kdDebug(5700) << " Suffix: '" << suffix() << "'" << endl;
1220 kdDebug(5700) << " NickName: '" << nickName() << "'" << endl; 1272 kdDebug(5700) << " NickName: '" << nickName() << "'" << endl;
1221 kdDebug(5700) << " Birthday: '" << birthday().toString() << "'" << endl; 1273 kdDebug(5700) << " Birthday: '" << birthday().toString() << "'" << endl;
1222 kdDebug(5700) << " Mailer: '" << mailer() << "'" << endl; 1274 kdDebug(5700) << " Mailer: '" << mailer() << "'" << endl;
1223 kdDebug(5700) << " TimeZone: '" << timeZone().asString() << "'" << endl; 1275 kdDebug(5700) << " TimeZone: '" << timeZone().asString() << "'" << endl;
1224 kdDebug(5700) << " Geo: '" << geo().asString() << "'" << endl; 1276 kdDebug(5700) << " Geo: '" << geo().asString() << "'" << endl;
1225 kdDebug(5700) << " Title: '" << title() << "'" << endl; 1277 kdDebug(5700) << " Title: '" << title() << "'" << endl;
1226 kdDebug(5700) << " Role: '" << role() << "'" << endl; 1278 kdDebug(5700) << " Role: '" << role() << "'" << endl;
1227 kdDebug(5700) << " Organization: '" << organization() << "'" << endl; 1279 kdDebug(5700) << " Organization: '" << organization() << "'" << endl;
1228 kdDebug(5700) << " Note: '" << note() << "'" << endl; 1280 kdDebug(5700) << " Note: '" << note() << "'" << endl;
1229 kdDebug(5700) << " ProductId: '" << productId() << "'" << endl; 1281 kdDebug(5700) << " ProductId: '" << productId() << "'" << endl;
1230 kdDebug(5700) << " Revision: '" << revision().toString() << "'" << endl; 1282 kdDebug(5700) << " Revision: '" << revision().toString() << "'" << endl;
1231 kdDebug(5700) << " SortString: '" << sortString() << "'" << endl; 1283 kdDebug(5700) << " SortString: '" << sortString() << "'" << endl;
1232 kdDebug(5700) << " Url: '" << url().url() << "'" << endl; 1284 kdDebug(5700) << " Url: '" << url().url() << "'" << endl;
1233 kdDebug(5700) << " Secrecy: '" << secrecy().asString() << "'" << endl; 1285 kdDebug(5700) << " Secrecy: '" << secrecy().asString() << "'" << endl;
1234 kdDebug(5700) << " Logo: '" << logo().asString() << "'" << endl; 1286 kdDebug(5700) << " Logo: '" << logo().asString() << "'" << endl;
1235 kdDebug(5700) << " Photo: '" << photo().asString() << "'" << endl; 1287 kdDebug(5700) << " Photo: '" << photo().asString() << "'" << endl;
1236 kdDebug(5700) << " Sound: '" << sound().asString() << "'" << endl; 1288 kdDebug(5700) << " Sound: '" << sound().asString() << "'" << endl;
1237 kdDebug(5700) << " Agent: '" << agent().asString() << "'" << endl; 1289 kdDebug(5700) << " Agent: '" << agent().asString() << "'" << endl;
1238 1290
1239 kdDebug(5700) << " Emails {" << endl; 1291 kdDebug(5700) << " Emails {" << endl;
1240 QStringList e = emails(); 1292 QStringList e = emails();
1241 QStringList::ConstIterator it; 1293 QStringList::ConstIterator it;
1242 for( it = e.begin(); it != e.end(); ++it ) { 1294 for( it = e.begin(); it != e.end(); ++it ) {
1243 kdDebug(5700) << " " << (*it) << endl; 1295 kdDebug(5700) << " " << (*it) << endl;
1244 } 1296 }
1245 kdDebug(5700) << " }" << endl; 1297 kdDebug(5700) << " }" << endl;
1246 1298
1247 kdDebug(5700) << " PhoneNumbers {" << endl; 1299 kdDebug(5700) << " PhoneNumbers {" << endl;
1248 PhoneNumber::List p = phoneNumbers(); 1300 PhoneNumber::List p = phoneNumbers();
1249 PhoneNumber::List::ConstIterator it2; 1301 PhoneNumber::List::ConstIterator it2;
1250 for( it2 = p.begin(); it2 != p.end(); ++it2 ) { 1302 for( it2 = p.begin(); it2 != p.end(); ++it2 ) {
1251 kdDebug(5700) << " Type: " << int((*it2).type()) << " Number: " << (*it2).number() << endl; 1303 kdDebug(5700) << " Type: " << int((*it2).type()) << " Number: " << (*it2).number() << endl;
1252 } 1304 }
1253 kdDebug(5700) << " }" << endl; 1305 kdDebug(5700) << " }" << endl;
1254 1306
1255 Address::List a = addresses(); 1307 Address::List a = addresses();
1256 Address::List::ConstIterator it3; 1308 Address::List::ConstIterator it3;
1257 for( it3 = a.begin(); it3 != a.end(); ++it3 ) { 1309 for( it3 = a.begin(); it3 != a.end(); ++it3 ) {
1258 (*it3).dump(); 1310 (*it3).dump();
1259 } 1311 }
1260 1312
1261 kdDebug(5700) << " Keys {" << endl; 1313 kdDebug(5700) << " Keys {" << endl;
1262 Key::List k = keys(); 1314 Key::List k = keys();
1263 Key::List::ConstIterator it4; 1315 Key::List::ConstIterator it4;
1264 for( it4 = k.begin(); it4 != k.end(); ++it4 ) { 1316 for( it4 = k.begin(); it4 != k.end(); ++it4 ) {
1265 kdDebug(5700) << " Type: " << int((*it4).type()) << 1317 kdDebug(5700) << " Type: " << int((*it4).type()) <<
1266 " Key: " << (*it4).textData() << 1318 " Key: " << (*it4).textData() <<
1267 " CustomString: " << (*it4).customTypeString() << endl; 1319 " CustomString: " << (*it4).customTypeString() << endl;
1268 } 1320 }
1269 kdDebug(5700) << " }" << endl; 1321 kdDebug(5700) << " }" << endl;
1270 1322
1271 kdDebug(5700) << "}" << endl; 1323 kdDebug(5700) << "}" << endl;
1272} 1324}
1273 1325
1274 1326
1275void Addressee::insertAddress( const Address &address ) 1327void Addressee::insertAddress( const Address &address )
1276{ 1328{
1277 detach(); 1329 detach();
1278 mData->empty = false; 1330 mData->empty = false;
1279 1331
1280 Address::List::Iterator it; 1332 Address::List::Iterator it;
1281 for( it = mData->addresses.begin(); it != mData->addresses.end(); ++it ) { 1333 for( it = mData->addresses.begin(); it != mData->addresses.end(); ++it ) {
1282 if ( (*it).id() == address.id() ) { 1334 if ( (*it).id() == address.id() ) {
1283 *it = address; 1335 *it = address;
1284 return; 1336 return;
1285 } 1337 }
1286 } 1338 }
1287 mData->addresses.append( address ); 1339 mData->addresses.append( address );
1288} 1340}
1289 1341
1290void Addressee::removeAddress( const Address &address ) 1342void Addressee::removeAddress( const Address &address )
1291{ 1343{
1292 detach(); 1344 detach();
1293 1345
1294 Address::List::Iterator it; 1346 Address::List::Iterator it;
1295 for( it = mData->addresses.begin(); it != mData->addresses.end(); ++it ) { 1347 for( it = mData->addresses.begin(); it != mData->addresses.end(); ++it ) {
1296 if ( (*it).id() == address.id() ) { 1348 if ( (*it).id() == address.id() ) {
1297 mData->addresses.remove( it ); 1349 mData->addresses.remove( it );
1298 return; 1350 return;
1299 } 1351 }
1300 } 1352 }
1301} 1353}
1302 1354
1303Address Addressee::address( int type ) const 1355Address Addressee::address( int type ) const
1304{ 1356{
1305 Address address( type ); 1357 Address address( type );
1306 Address::List::ConstIterator it; 1358 Address::List::ConstIterator it;
1307 for( it = mData->addresses.begin(); it != mData->addresses.end(); ++it ) { 1359 for( it = mData->addresses.begin(); it != mData->addresses.end(); ++it ) {
1308 if ( matchBinaryPattern( (*it).type(), type ) ) { 1360 if ( matchBinaryPattern( (*it).type(), type ) ) {
1309 if ( (*it).type() & Address::Pref ) 1361 if ( (*it).type() & Address::Pref )
1310 return (*it); 1362 return (*it);
1311 else if ( address.isEmpty() ) 1363 else if ( address.isEmpty() )
1312 address = (*it); 1364 address = (*it);
1313 } 1365 }
1314 } 1366 }
1315 1367
1316 return address; 1368 return address;
1317} 1369}
1318 1370
1319Address::List Addressee::addresses() const 1371Address::List Addressee::addresses() const
1320{ 1372{
1321 return mData->addresses; 1373 return mData->addresses;
1322} 1374}
1323 1375
1324Address::List Addressee::addresses( int type ) const 1376Address::List Addressee::addresses( int type ) const
1325{ 1377{
1326 Address::List list; 1378 Address::List list;
1327 1379
1328 Address::List::ConstIterator it; 1380 Address::List::ConstIterator it;
1329 for( it = mData->addresses.begin(); it != mData->addresses.end(); ++it ) { 1381 for( it = mData->addresses.begin(); it != mData->addresses.end(); ++it ) {
1330 if ( matchBinaryPattern( (*it).type(), type ) ) { 1382 if ( matchBinaryPattern( (*it).type(), type ) ) {
1331 list.append( *it ); 1383 list.append( *it );
1332 } 1384 }
1333 } 1385 }
1334 1386
1335 return list; 1387 return list;
1336} 1388}
1337 1389
1338Address Addressee::findAddress( const QString &id ) const 1390Address Addressee::findAddress( const QString &id ) const
1339{ 1391{
1340 Address::List::ConstIterator it; 1392 Address::List::ConstIterator it;
1341 for( it = mData->addresses.begin(); it != mData->addresses.end(); ++it ) { 1393 for( it = mData->addresses.begin(); it != mData->addresses.end(); ++it ) {
1342 if ( (*it).id() == id ) { 1394 if ( (*it).id() == id ) {
1343 return *it; 1395 return *it;
1344 } 1396 }
1345 } 1397 }
1346 return Address(); 1398 return Address();
1347} 1399}
1348 1400
1349void Addressee::insertCategory( const QString &c ) 1401void Addressee::insertCategory( const QString &c )
1350{ 1402{
1351 detach(); 1403 detach();
1352 mData->empty = false; 1404 mData->empty = false;
1353 1405
1354 if ( mData->categories.contains( c ) ) return; 1406 if ( mData->categories.contains( c ) ) return;
1355 1407
1356 mData->categories.append( c ); 1408 mData->categories.append( c );
1357} 1409}
1358 1410
1359void Addressee::removeCategory( const QString &c ) 1411void Addressee::removeCategory( const QString &c )
1360{ 1412{
1361 detach(); 1413 detach();
1362 1414
1363 QStringList::Iterator it = mData->categories.find( c ); 1415 QStringList::Iterator it = mData->categories.find( c );
1364 if ( it == mData->categories.end() ) return; 1416 if ( it == mData->categories.end() ) return;
1365 1417
1366 mData->categories.remove( it ); 1418 mData->categories.remove( it );
1367} 1419}
1368 1420
1369bool Addressee::hasCategory( const QString &c ) const 1421bool Addressee::hasCategory( const QString &c ) const
1370{ 1422{
1371 return ( mData->categories.contains( c ) ); 1423 return ( mData->categories.contains( c ) );
1372} 1424}
1373 1425
1374void Addressee::setCategories( const QStringList &c ) 1426void Addressee::setCategories( const QStringList &c )
1375{ 1427{
1376 detach(); 1428 detach();
1377 mData->empty = false; 1429 mData->empty = false;
1378 1430
1379 mData->categories = c; 1431 mData->categories = c;
1380} 1432}
1381 1433
1382QStringList Addressee::categories() const 1434QStringList Addressee::categories() const
1383{ 1435{
1384 return mData->categories; 1436 return mData->categories;
1385} 1437}
1386 1438
1387void Addressee::insertCustom( const QString &app, const QString &name, 1439void Addressee::insertCustom( const QString &app, const QString &name,
1388 const QString &value ) 1440 const QString &value )
1389{ 1441{
1390 if ( value.isNull() || name.isEmpty() || app.isEmpty() ) return; 1442 if ( value.isNull() || name.isEmpty() || app.isEmpty() ) return;
1391 1443
1392 detach(); 1444 detach();
1393 mData->empty = false; 1445 mData->empty = false;
1394 1446
1395 QString qualifiedName = app + "-" + name + ":"; 1447 QString qualifiedName = app + "-" + name + ":";
1396 1448
1397 QStringList::Iterator it; 1449 QStringList::Iterator it;
1398 for( it = mData->custom.begin(); it != mData->custom.end(); ++it ) { 1450 for( it = mData->custom.begin(); it != mData->custom.end(); ++it ) {
1399 if ( (*it).startsWith( qualifiedName ) ) { 1451 if ( (*it).startsWith( qualifiedName ) ) {
1400 (*it) = qualifiedName + value; 1452 (*it) = qualifiedName + value;
1401 return; 1453 return;
1402 } 1454 }
1403 } 1455 }
1404 1456
1405 mData->custom.append( qualifiedName + value ); 1457 mData->custom.append( qualifiedName + value );
1406} 1458}
1407 1459
1408void Addressee::removeCustom( const QString &app, const QString &name) 1460void Addressee::removeCustom( const QString &app, const QString &name)
1409{ 1461{
1410 detach(); 1462 detach();
1411 1463
1412 QString qualifiedName = app + "-" + name + ":"; 1464 QString qualifiedName = app + "-" + name + ":";
1413 1465
1414 QStringList::Iterator it; 1466 QStringList::Iterator it;
1415 for( it = mData->custom.begin(); it != mData->custom.end(); ++it ) { 1467 for( it = mData->custom.begin(); it != mData->custom.end(); ++it ) {
1416 if ( (*it).startsWith( qualifiedName ) ) { 1468 if ( (*it).startsWith( qualifiedName ) ) {
1417 mData->custom.remove( it ); 1469 mData->custom.remove( it );
1418 return; 1470 return;
1419 } 1471 }
1420 } 1472 }
1421} 1473}
1422 1474
1423QString Addressee::custom( const QString &app, const QString &name ) const 1475QString Addressee::custom( const QString &app, const QString &name ) const
1424{ 1476{
1425 QString qualifiedName = app + "-" + name + ":"; 1477 QString qualifiedName = app + "-" + name + ":";
1426 QString value; 1478 QString value;
1427 1479
1428 QStringList::ConstIterator it; 1480 QStringList::ConstIterator it;
1429 for( it = mData->custom.begin(); it != mData->custom.end(); ++it ) { 1481 for( it = mData->custom.begin(); it != mData->custom.end(); ++it ) {
1430 if ( (*it).startsWith( qualifiedName ) ) { 1482 if ( (*it).startsWith( qualifiedName ) ) {
1431 value = (*it).mid( (*it).find( ":" ) + 1 ); 1483 value = (*it).mid( (*it).find( ":" ) + 1 );
1432 break; 1484 break;
1433 } 1485 }
1434 } 1486 }
1435 1487
1436 return value; 1488 return value;
1437} 1489}
1438 1490
1439void Addressee::setCustoms( const QStringList &l ) 1491void Addressee::setCustoms( const QStringList &l )
1440{ 1492{
1441 detach(); 1493 detach();
1442 mData->empty = false; 1494 mData->empty = false;
1443 1495
1444 mData->custom = l; 1496 mData->custom = l;
1445} 1497}
1446 1498
1447QStringList Addressee::customs() const 1499QStringList Addressee::customs() const
1448{ 1500{
1449 return mData->custom; 1501 return mData->custom;
1450} 1502}
1451 1503
1452void Addressee::parseEmailAddress( const QString &rawEmail, QString &fullName, 1504void Addressee::parseEmailAddress( const QString &rawEmail, QString &fullName,
1453 QString &email) 1505 QString &email)
1454{ 1506{
1455 int startPos, endPos, len; 1507 int startPos, endPos, len;
1456 QString partA, partB, result; 1508 QString partA, partB, result;
1457 char endCh = '>'; 1509 char endCh = '>';
1458 1510
1459 startPos = rawEmail.find('<'); 1511 startPos = rawEmail.find('<');
1460 if (startPos < 0) 1512 if (startPos < 0)
1461 { 1513 {
1462 startPos = rawEmail.find('('); 1514 startPos = rawEmail.find('(');
1463 endCh = ')'; 1515 endCh = ')';
1464 } 1516 }
1465 if (startPos < 0) 1517 if (startPos < 0)
1466 { 1518 {
1467 // We couldn't find any separators, so we assume the whole string 1519 // We couldn't find any separators, so we assume the whole string
1468 // is the email address 1520 // is the email address
1469 email = rawEmail; 1521 email = rawEmail;
1470 fullName = ""; 1522 fullName = "";
1471 } 1523 }
1472 else 1524 else
1473 { 1525 {
1474 // We have a start position, try to find an end 1526 // We have a start position, try to find an end
1475 endPos = rawEmail.find(endCh, startPos+1); 1527 endPos = rawEmail.find(endCh, startPos+1);
1476 1528
1477 if (endPos < 0) 1529 if (endPos < 0)
1478 { 1530 {
1479 // We couldn't find the end of the email address. We can only 1531 // We couldn't find the end of the email address. We can only
1480 // assume the entire string is the email address. 1532 // assume the entire string is the email address.
1481 email = rawEmail; 1533 email = rawEmail;
1482 fullName = ""; 1534 fullName = "";
1483 } 1535 }
1484 else 1536 else
1485 { 1537 {
1486 // We have a start and end to the email address 1538 // We have a start and end to the email address
1487 1539
1488 // Grab the name part 1540 // Grab the name part
1489 fullName = rawEmail.left(startPos).stripWhiteSpace(); 1541 fullName = rawEmail.left(startPos).stripWhiteSpace();
1490 1542
1491 // grab the email part 1543 // grab the email part
1492 email = rawEmail.mid(startPos+1, endPos-startPos-1).stripWhiteSpace(); 1544 email = rawEmail.mid(startPos+1, endPos-startPos-1).stripWhiteSpace();
1493 1545
1494 // Check that we do not have any extra characters on the end of the 1546 // Check that we do not have any extra characters on the end of the
1495 // strings 1547 // strings
1496 len = fullName.length(); 1548 len = fullName.length();
1497 if (fullName[0]=='"' && fullName[len-1]=='"') 1549 if (fullName[0]=='"' && fullName[len-1]=='"')
1498 fullName = fullName.mid(1, len-2); 1550 fullName = fullName.mid(1, len-2);
1499 else if (fullName[0]=='<' && fullName[len-1]=='>') 1551 else if (fullName[0]=='<' && fullName[len-1]=='>')
1500 fullName = fullName.mid(1, len-2); 1552 fullName = fullName.mid(1, len-2);
1501 else if (fullName[0]=='(' && fullName[len-1]==')') 1553 else if (fullName[0]=='(' && fullName[len-1]==')')
1502 fullName = fullName.mid(1, len-2); 1554 fullName = fullName.mid(1, len-2);
1503 } 1555 }
1504 } 1556 }
1505} 1557}
1506 1558
1507void Addressee::setResource( Resource *resource ) 1559void Addressee::setResource( Resource *resource )
1508{ 1560{
1509 detach(); 1561 detach();
1510 mData->resource = resource; 1562 mData->resource = resource;
1511} 1563}
1512 1564
1513Resource *Addressee::resource() const 1565Resource *Addressee::resource() const
1514{ 1566{
1515 return mData->resource; 1567 return mData->resource;
1516} 1568}
1517 1569
1518//US 1570//US
1519QString Addressee::resourceLabel() 1571QString Addressee::resourceLabel()
1520{ 1572{
1521 return i18n("Resource"); 1573 return i18n("Resource");
1522} 1574}
1523 1575
1524void Addressee::setChanged( bool value ) 1576void Addressee::setChanged( bool value )
1525{ 1577{
1526 detach(); 1578 detach();
1527 mData->changed = value; 1579 mData->changed = value;
1528} 1580}
1529 1581
1530bool Addressee::changed() const 1582bool Addressee::changed() const
1531{ 1583{
1532 return mData->changed; 1584 return mData->changed;
1533} 1585}
1534 1586
1535QDataStream &KABC::operator<<( QDataStream &s, const Addressee &a ) 1587QDataStream &KABC::operator<<( QDataStream &s, const Addressee &a )
1536{ 1588{
1537 if (!a.mData) return s; 1589 if (!a.mData) return s;
1538 1590
1539 s << a.uid(); 1591 s << a.uid();
1540 1592
1541 s << a.mData->name; 1593 s << a.mData->name;
1542 s << a.mData->formattedName; 1594 s << a.mData->formattedName;
1543 s << a.mData->familyName; 1595 s << a.mData->familyName;
1544 s << a.mData->givenName; 1596 s << a.mData->givenName;
1545 s << a.mData->additionalName; 1597 s << a.mData->additionalName;
1546 s << a.mData->prefix; 1598 s << a.mData->prefix;
1547 s << a.mData->suffix; 1599 s << a.mData->suffix;
1548 s << a.mData->nickName; 1600 s << a.mData->nickName;
1549 s << a.mData->birthday; 1601 s << a.mData->birthday;
1550 s << a.mData->mailer; 1602 s << a.mData->mailer;
1551 s << a.mData->timeZone; 1603 s << a.mData->timeZone;
1552 s << a.mData->geo; 1604 s << a.mData->geo;
1553 s << a.mData->title; 1605 s << a.mData->title;
1554 s << a.mData->role; 1606 s << a.mData->role;
1555 s << a.mData->organization; 1607 s << a.mData->organization;
1556 s << a.mData->note; 1608 s << a.mData->note;
1557 s << a.mData->productId; 1609 s << a.mData->productId;
1558 s << a.mData->revision; 1610 s << a.mData->revision;
1559 s << a.mData->sortString; 1611 s << a.mData->sortString;
1560 s << a.mData->url; 1612 s << a.mData->url;
1561 s << a.mData->secrecy; 1613 s << a.mData->secrecy;
1562 s << a.mData->logo; 1614 s << a.mData->logo;
1563 s << a.mData->photo; 1615 s << a.mData->photo;
1564 s << a.mData->sound; 1616 s << a.mData->sound;
1565 s << a.mData->agent; 1617 s << a.mData->agent;
1566 s << a.mData->phoneNumbers; 1618 s << a.mData->phoneNumbers;
1567 s << a.mData->addresses; 1619 s << a.mData->addresses;
1568 s << a.mData->emails; 1620 s << a.mData->emails;
1569 s << a.mData->categories; 1621 s << a.mData->categories;
1570 s << a.mData->custom; 1622 s << a.mData->custom;
1571 s << a.mData->keys; 1623 s << a.mData->keys;
1572 return s; 1624 return s;
1573} 1625}
1574 1626
1575QDataStream &KABC::operator>>( QDataStream &s, Addressee &a ) 1627QDataStream &KABC::operator>>( QDataStream &s, Addressee &a )
1576{ 1628{
1577 if (!a.mData) return s; 1629 if (!a.mData) return s;
1578 1630
1579 s >> a.mData->uid; 1631 s >> a.mData->uid;
1580 1632
1581 s >> a.mData->name; 1633 s >> a.mData->name;
1582 s >> a.mData->formattedName; 1634 s >> a.mData->formattedName;
1583 s >> a.mData->familyName; 1635 s >> a.mData->familyName;
1584 s >> a.mData->givenName; 1636 s >> a.mData->givenName;
1585 s >> a.mData->additionalName; 1637 s >> a.mData->additionalName;
1586 s >> a.mData->prefix; 1638 s >> a.mData->prefix;
1587 s >> a.mData->suffix; 1639 s >> a.mData->suffix;
1588 s >> a.mData->nickName; 1640 s >> a.mData->nickName;
1589 s >> a.mData->birthday; 1641 s >> a.mData->birthday;
1590 s >> a.mData->mailer; 1642 s >> a.mData->mailer;
1591 s >> a.mData->timeZone; 1643 s >> a.mData->timeZone;
1592 s >> a.mData->geo; 1644 s >> a.mData->geo;
1593 s >> a.mData->title; 1645 s >> a.mData->title;
1594 s >> a.mData->role; 1646 s >> a.mData->role;
1595 s >> a.mData->organization; 1647 s >> a.mData->organization;
1596 s >> a.mData->note; 1648 s >> a.mData->note;
1597 s >> a.mData->productId; 1649 s >> a.mData->productId;
1598 s >> a.mData->revision; 1650 s >> a.mData->revision;
1599 s >> a.mData->sortString; 1651 s >> a.mData->sortString;
1600 s >> a.mData->url; 1652 s >> a.mData->url;
1601 s >> a.mData->secrecy; 1653 s >> a.mData->secrecy;
1602 s >> a.mData->logo; 1654 s >> a.mData->logo;
1603 s >> a.mData->photo; 1655 s >> a.mData->photo;
1604 s >> a.mData->sound; 1656 s >> a.mData->sound;
1605 s >> a.mData->agent; 1657 s >> a.mData->agent;
1606 s >> a.mData->phoneNumbers; 1658 s >> a.mData->phoneNumbers;
1607 s >> a.mData->addresses; 1659 s >> a.mData->addresses;
1608 s >> a.mData->emails; 1660 s >> a.mData->emails;
1609 s >> a.mData->categories; 1661 s >> a.mData->categories;
1610 s >> a.mData->custom; 1662 s >> a.mData->custom;
1611 s >> a.mData->keys; 1663 s >> a.mData->keys;
1612 1664
1613 a.mData->empty = false; 1665 a.mData->empty = false;
1614 1666
1615 return s; 1667 return s;
1616} 1668}
1617 1669
1618bool matchBinaryPattern( int value, int pattern ) 1670bool matchBinaryPattern( int value, int pattern )
1619{ 1671{
1620 /** 1672 /**
1621 We want to match all telephonnumbers/addresses which have the bits in the 1673 We want to match all telephonnumbers/addresses which have the bits in the
1622 pattern set. More are allowed. 1674 pattern set. More are allowed.
1623 if pattern == 0 we have a special handling, then we want only those with 1675 if pattern == 0 we have a special handling, then we want only those with
1624 exactly no bit set. 1676 exactly no bit set.
1625 */ 1677 */
1626 if ( pattern == 0 ) 1678 if ( pattern == 0 )
1627 return ( value == 0 ); 1679 return ( value == 0 );
1628 else 1680 else
1629 return ( pattern == ( pattern & value ) ); 1681 return ( pattern == ( pattern & value ) );
1630} 1682}
diff --git a/kabc/addressee.h b/kabc/addressee.h
index 27782f9..f098371 100644
--- a/kabc/addressee.h
+++ b/kabc/addressee.h
@@ -1,828 +1,838 @@
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/*
23Enhanced Version of the file for platform independent KDE tools. 23Enhanced Version of the file for platform independent KDE tools.
24Copyright (c) 2004 Ulf Schenk 24Copyright (c) 2004 Ulf Schenk
25 25
26$Id$ 26$Id$
27*/ 27*/
28 28
29#ifndef KABC_ADDRESSEE_H 29#ifndef KABC_ADDRESSEE_H
30#define KABC_ADDRESSEE_H 30#define KABC_ADDRESSEE_H
31 31
32#include <qdatetime.h> 32#include <qdatetime.h>
33#include <qstring.h> 33#include <qstring.h>
34#include <qstringlist.h> 34#include <qstringlist.h>
35#include <qvaluelist.h> 35#include <qvaluelist.h>
36 36
37#include <ksharedptr.h> 37#include <ksharedptr.h>
38#include <kurl.h> 38#include <kurl.h>
39 39
40#include "address.h" 40#include "address.h"
41#include "agent.h" 41#include "agent.h"
42#include "geo.h" 42#include "geo.h"
43#include "key.h" 43#include "key.h"
44#include "phonenumber.h" 44#include "phonenumber.h"
45#include "picture.h" 45#include "picture.h"
46#include "secrecy.h" 46#include "secrecy.h"
47#include "sound.h" 47#include "sound.h"
48#include "timezone.h" 48#include "timezone.h"
49 49
50namespace KABC { 50namespace KABC {
51 51
52class Resource; 52class Resource;
53 53
54/** 54/**
55 @short address book entry 55 @short address book entry
56 56
57 This class represents an entry in the address book. 57 This class represents an entry in the address book.
58 58
59 The data of this class is implicitly shared. You can pass this class by value. 59 The data of this class is implicitly shared. You can pass this class by value.
60 60
61 If you need the name of a field for presenting it to the user you should use 61 If you need the name of a field for presenting it to the user you should use
62 the functions ending in Label(). They return a translated string which can be 62 the functions ending in Label(). They return a translated string which can be
63 used as label for the corresponding field. 63 used as label for the corresponding field.
64 64
65 About the name fields: 65 About the name fields:
66 66
67 givenName() is the first name and familyName() the last name. In some 67 givenName() is the first name and familyName() the last name. In some
68 countries the family name comes first, that's the reason for the 68 countries the family name comes first, that's the reason for the
69 naming. formattedName() is the full name with the correct formatting. 69 naming. formattedName() is the full name with the correct formatting.
70 It is used as an override, when the correct formatting can't be generated 70 It is used as an override, when the correct formatting can't be generated
71 from the other name fields automatically. 71 from the other name fields automatically.
72 72
73 realName() returns a fully formatted name(). It uses formattedName, if set, 73 realName() returns a fully formatted name(). It uses formattedName, if set,
74 otherwise it constucts the name from the name fields. As fallback, if 74 otherwise it constucts the name from the name fields. As fallback, if
75 nothing else is set it uses name(). 75 nothing else is set it uses name().
76 76
77 name() is the NAME type of RFC2426. It can be used as internal name for the 77 name() is the NAME type of RFC2426. It can be used as internal name for the
78 data enty, but shouldn't be used for displaying the data to the user. 78 data enty, but shouldn't be used for displaying the data to the user.
79 */ 79 */
80class Addressee 80class Addressee
81{ 81{
82 friend QDataStream &operator<<( QDataStream &, const Addressee & ); 82 friend QDataStream &operator<<( QDataStream &, const Addressee & );
83 friend QDataStream &operator>>( QDataStream &, Addressee & ); 83 friend QDataStream &operator>>( QDataStream &, Addressee & );
84 84
85 public: 85 public:
86 typedef QValueList<Addressee> List; 86 typedef QValueList<Addressee> List;
87 87
88 /** 88 /**
89 Construct an empty address book entry. 89 Construct an empty address book entry.
90 */ 90 */
91 Addressee(); 91 Addressee();
92 ~Addressee(); 92 ~Addressee();
93 93
94 Addressee( const Addressee & ); 94 Addressee( const Addressee & );
95 Addressee &operator=( const Addressee & ); 95 Addressee &operator=( const Addressee & );
96 96
97 bool operator==( const Addressee & ) const; 97 bool operator==( const Addressee & ) const;
98 bool operator!=( const Addressee & ) const; 98 bool operator!=( const Addressee & ) const;
99 99 // sync stuff
100 void setTempSyncStat(int id);
101 int tempSyncStat() const;
102 void setIDStr( const QString & );
103 QString IDStr() const;
104 void setID( const QString &, const QString & );
105 QString getID( const QString & );
106 void setCsum( const QString &, const QString & );
107 QString getCsum( const QString & );
108 void removeID(const QString &);
100 /** 109 /**
101 Return, if the address book entry is empty. 110 Return, if the address book entry is empty.
102 */ 111 */
103 bool isEmpty() const; 112 bool isEmpty() const;
104 113
105 /** 114 /**
106 Set unique identifier. 115 Set unique identifier.
107 */ 116 */
108 void setUid( const QString &uid ); 117 void setUid( const QString &uid );
109 /** 118 /**
110 Return unique identifier. 119 Return unique identifier.
111 */ 120 */
112 QString uid() const; 121 QString uid() const;
113 /** 122 /**
114 Return translated label for uid field. 123 Return translated label for uid field.
115 */ 124 */
116 static QString uidLabel(); 125 static QString uidLabel();
117 126
118 /** 127 /**
119 Set name. 128 Set name.
120 */ 129 */
121 void setName( const QString &name ); 130 void setName( const QString &name );
122 /** 131 /**
123 Return name. 132 Return name.
124 */ 133 */
125 QString name() const; 134 QString name() const;
126 /** 135 /**
127 Return translated label for name field. 136 Return translated label for name field.
128 */ 137 */
129 static QString nameLabel(); 138 static QString nameLabel();
130 139
131 /** 140 /**
132 Set formatted name. 141 Set formatted name.
133 */ 142 */
134 void setFormattedName( const QString &formattedName ); 143 void setFormattedName( const QString &formattedName );
135 /** 144 /**
136 Return formatted name. 145 Return formatted name.
137 */ 146 */
138 QString formattedName() const; 147 QString formattedName() const;
139 /** 148 /**
140 Return translated label for formattedName field. 149 Return translated label for formattedName field.
141 */ 150 */
142 static QString formattedNameLabel(); 151 static QString formattedNameLabel();
143 152
144 /** 153 /**
145 Set family name. 154 Set family name.
146 */ 155 */
147 void setFamilyName( const QString &familyName ); 156 void setFamilyName( const QString &familyName );
148 /** 157 /**
149 Return family name. 158 Return family name.
150 */ 159 */
151 QString familyName() const; 160 QString familyName() const;
152 /** 161 /**
153 Return translated label for familyName field. 162 Return translated label for familyName field.
154 */ 163 */
155 static QString familyNameLabel(); 164 static QString familyNameLabel();
156 165
157 /** 166 /**
158 Set given name. 167 Set given name.
159 */ 168 */
160 void setGivenName( const QString &givenName ); 169 void setGivenName( const QString &givenName );
161 /** 170 /**
162 Return given name. 171 Return given name.
163 */ 172 */
164 QString givenName() const; 173 QString givenName() const;
165 /** 174 /**
166 Return translated label for givenName field. 175 Return translated label for givenName field.
167 */ 176 */
168 static QString givenNameLabel(); 177 static QString givenNameLabel();
169 178
170 /** 179 /**
171 Set additional names. 180 Set additional names.
172 */ 181 */
173 void setAdditionalName( const QString &additionalName ); 182 void setAdditionalName( const QString &additionalName );
174 /** 183 /**
175 Return additional names. 184 Return additional names.
176 */ 185 */
177 QString additionalName() const; 186 QString additionalName() const;
178 /** 187 /**
179 Return translated label for additionalName field. 188 Return translated label for additionalName field.
180 */ 189 */
181 static QString additionalNameLabel(); 190 static QString additionalNameLabel();
182 191
183 /** 192 /**
184 Set honorific prefixes. 193 Set honorific prefixes.
185 */ 194 */
186 void setPrefix( const QString &prefix ); 195 void setPrefix( const QString &prefix );
187 /** 196 /**
188 Return honorific prefixes. 197 Return honorific prefixes.
189 */ 198 */
190 QString prefix() const; 199 QString prefix() const;
191 /** 200 /**
192 Return translated label for prefix field. 201 Return translated label for prefix field.
193 */ 202 */
194 static QString prefixLabel(); 203 static QString prefixLabel();
195 204
196 /** 205 /**
197 Set honorific suffixes. 206 Set honorific suffixes.
198 */ 207 */
199 void setSuffix( const QString &suffix ); 208 void setSuffix( const QString &suffix );
200 /** 209 /**
201 Return honorific suffixes. 210 Return honorific suffixes.
202 */ 211 */
203 QString suffix() const; 212 QString suffix() const;
204 /** 213 /**
205 Return translated label for suffix field. 214 Return translated label for suffix field.
206 */ 215 */
207 static QString suffixLabel(); 216 static QString suffixLabel();
208 217
209 /** 218 /**
210 Set nick name. 219 Set nick name.
211 */ 220 */
212 void setNickName( const QString &nickName ); 221 void setNickName( const QString &nickName );
213 /** 222 /**
214 Return nick name. 223 Return nick name.
215 */ 224 */
216 QString nickName() const; 225 QString nickName() const;
217 /** 226 /**
218 Return translated label for nickName field. 227 Return translated label for nickName field.
219 */ 228 */
220 static QString nickNameLabel(); 229 static QString nickNameLabel();
221 230
222 /** 231 /**
223 Set birthday. 232 Set birthday.
224 */ 233 */
225 void setBirthday( const QDateTime &birthday ); 234 void setBirthday( const QDateTime &birthday );
226 /** 235 /**
227 Return birthday. 236 Return birthday.
228 */ 237 */
229 QDateTime birthday() const; 238 QDateTime birthday() const;
230 /** 239 /**
231 Return translated label for birthday field. 240 Return translated label for birthday field.
232 */ 241 */
233 static QString birthdayLabel(); 242 static QString birthdayLabel();
234 243
235 /** 244 /**
236 Return translated label for homeAddressStreet field. 245 Return translated label for homeAddressStreet field.
237 */ 246 */
238 static QString homeAddressStreetLabel(); 247 static QString homeAddressStreetLabel();
239 248
240 /** 249 /**
241 Return translated label for homeAddressLocality field. 250 Return translated label for homeAddressLocality field.
242 */ 251 */
243 static QString homeAddressLocalityLabel(); 252 static QString homeAddressLocalityLabel();
244 253
245 /** 254 /**
246 Return translated label for homeAddressRegion field. 255 Return translated label for homeAddressRegion field.
247 */ 256 */
248 static QString homeAddressRegionLabel(); 257 static QString homeAddressRegionLabel();
249 258
250 /** 259 /**
251 Return translated label for homeAddressPostalCode field. 260 Return translated label for homeAddressPostalCode field.
252 */ 261 */
253 static QString homeAddressPostalCodeLabel(); 262 static QString homeAddressPostalCodeLabel();
254 263
255 /** 264 /**
256 Return translated label for homeAddressCountry field. 265 Return translated label for homeAddressCountry field.
257 */ 266 */
258 static QString homeAddressCountryLabel(); 267 static QString homeAddressCountryLabel();
259 268
260 /** 269 /**
261 Return translated label for homeAddressLabel field. 270 Return translated label for homeAddressLabel field.
262 */ 271 */
263 static QString homeAddressLabelLabel(); 272 static QString homeAddressLabelLabel();
264 273
265 /** 274 /**
266 Return translated label for businessAddressStreet field. 275 Return translated label for businessAddressStreet field.
267 */ 276 */
268 static QString businessAddressStreetLabel(); 277 static QString businessAddressStreetLabel();
269 278
270 /** 279 /**
271 Return translated label for businessAddressLocality field. 280 Return translated label for businessAddressLocality field.
272 */ 281 */
273 static QString businessAddressLocalityLabel(); 282 static QString businessAddressLocalityLabel();
274 283
275 /** 284 /**
276 Return translated label for businessAddressRegion field. 285 Return translated label for businessAddressRegion field.
277 */ 286 */
278 static QString businessAddressRegionLabel(); 287 static QString businessAddressRegionLabel();
279 288
280 /** 289 /**
281 Return translated label for businessAddressPostalCode field. 290 Return translated label for businessAddressPostalCode field.
282 */ 291 */
283 static QString businessAddressPostalCodeLabel(); 292 static QString businessAddressPostalCodeLabel();
284 293
285 /** 294 /**
286 Return translated label for businessAddressCountry field. 295 Return translated label for businessAddressCountry field.
287 */ 296 */
288 static QString businessAddressCountryLabel(); 297 static QString businessAddressCountryLabel();
289 298
290 /** 299 /**
291 Return translated label for businessAddressLabel field. 300 Return translated label for businessAddressLabel field.
292 */ 301 */
293 static QString businessAddressLabelLabel(); 302 static QString businessAddressLabelLabel();
294 303
295 /** 304 /**
296 Return translated label for homePhone field. 305 Return translated label for homePhone field.
297 */ 306 */
298 static QString homePhoneLabel(); 307 static QString homePhoneLabel();
299 308
300 /** 309 /**
301 Return translated label for businessPhone field. 310 Return translated label for businessPhone field.
302 */ 311 */
303 static QString businessPhoneLabel(); 312 static QString businessPhoneLabel();
304 313
305 /** 314 /**
306 Return translated label for mobilePhone field. 315 Return translated label for mobilePhone field.
307 */ 316 */
308 static QString mobilePhoneLabel(); 317 static QString mobilePhoneLabel();
309 318
310 /** 319 /**
311 Return translated label for homeFax field. 320 Return translated label for homeFax field.
312 */ 321 */
313 static QString homeFaxLabel(); 322 static QString homeFaxLabel();
314 323
315 /** 324 /**
316 Return translated label for businessFax field. 325 Return translated label for businessFax field.
317 */ 326 */
318 static QString businessFaxLabel(); 327 static QString businessFaxLabel();
319 328
320 /** 329 /**
321 Return translated label for carPhone field. 330 Return translated label for carPhone field.
322 */ 331 */
323 static QString carPhoneLabel(); 332 static QString carPhoneLabel();
324 333
325 /** 334 /**
326 Return translated label for isdn field. 335 Return translated label for isdn field.
327 */ 336 */
328 static QString isdnLabel(); 337 static QString isdnLabel();
329 338
330 /** 339 /**
331 Return translated label for pager field. 340 Return translated label for pager field.
332 */ 341 */
333 static QString pagerLabel(); 342 static QString pagerLabel();
334 343
335 /** 344 /**
336 Return translated label for sip field. 345 Return translated label for sip field.
337 */ 346 */
338 static QString sipLabel(); 347 static QString sipLabel();
339 348
340 /** 349 /**
341 Return translated label for email field. 350 Return translated label for email field.
342 */ 351 */
343 static QString emailLabel(); 352 static QString emailLabel();
344 353
345 /** 354 /**
346 Set mail client. 355 Set mail client.
347 */ 356 */
348 void setMailer( const QString &mailer ); 357 void setMailer( const QString &mailer );
349 /** 358 /**
350 Return mail client. 359 Return mail client.
351 */ 360 */
352 QString mailer() const; 361 QString mailer() const;
353 /** 362 /**
354 Return translated label for mailer field. 363 Return translated label for mailer field.
355 */ 364 */
356 static QString mailerLabel(); 365 static QString mailerLabel();
357 366
358 /** 367 /**
359 Set time zone. 368 Set time zone.
360 */ 369 */
361 void setTimeZone( const TimeZone &timeZone ); 370 void setTimeZone( const TimeZone &timeZone );
362 /** 371 /**
363 Return time zone. 372 Return time zone.
364 */ 373 */
365 TimeZone timeZone() const; 374 TimeZone timeZone() const;
366 /** 375 /**
367 Return translated label for timeZone field. 376 Return translated label for timeZone field.
368 */ 377 */
369 static QString timeZoneLabel(); 378 static QString timeZoneLabel();
370 379
371 /** 380 /**
372 Set geographic position. 381 Set geographic position.
373 */ 382 */
374 void setGeo( const Geo &geo ); 383 void setGeo( const Geo &geo );
375 /** 384 /**
376 Return geographic position. 385 Return geographic position.
377 */ 386 */
378 Geo geo() const; 387 Geo geo() const;
379 /** 388 /**
380 Return translated label for geo field. 389 Return translated label for geo field.
381 */ 390 */
382 static QString geoLabel(); 391 static QString geoLabel();
383 392
384 /** 393 /**
385 Set title. 394 Set title.
386 */ 395 */
387 void setTitle( const QString &title ); 396 void setTitle( const QString &title );
388 /** 397 /**
389 Return title. 398 Return title.
390 */ 399 */
391 QString title() const; 400 QString title() const;
392 /** 401 /**
393 Return translated label for title field. 402 Return translated label for title field.
394 */ 403 */
395 static QString titleLabel(); 404 static QString titleLabel();
396 405
397 /** 406 /**
398 Set role. 407 Set role.
399 */ 408 */
400 void setRole( const QString &role ); 409 void setRole( const QString &role );
401 /** 410 /**
402 Return role. 411 Return role.
403 */ 412 */
404 QString role() const; 413 QString role() const;
405 /** 414 /**
406 Return translated label for role field. 415 Return translated label for role field.
407 */ 416 */
408 static QString roleLabel(); 417 static QString roleLabel();
409 418
410 /** 419 /**
411 Set organization. 420 Set organization.
412 */ 421 */
413 void setOrganization( const QString &organization ); 422 void setOrganization( const QString &organization );
414 /** 423 /**
415 Return organization. 424 Return organization.
416 */ 425 */
417 QString organization() const; 426 QString organization() const;
418 /** 427 /**
419 Return translated label for organization field. 428 Return translated label for organization field.
420 */ 429 */
421 static QString organizationLabel(); 430 static QString organizationLabel();
422 431
423 /** 432 /**
424 Set note. 433 Set note.
425 */ 434 */
426 void setNote( const QString &note ); 435 void setNote( const QString &note );
427 /** 436 /**
428 Return note. 437 Return note.
429 */ 438 */
430 QString note() const; 439 QString note() const;
431 /** 440 /**
432 Return translated label for note field. 441 Return translated label for note field.
433 */ 442 */
434 static QString noteLabel(); 443 static QString noteLabel();
435 444
436 /** 445 /**
437 Set product identifier. 446 Set product identifier.
438 */ 447 */
439 void setProductId( const QString &productId ); 448 void setProductId( const QString &productId );
440 /** 449 /**
441 Return product identifier. 450 Return product identifier.
442 */ 451 */
443 QString productId() const; 452 QString productId() const;
444 /** 453 /**
445 Return translated label for productId field. 454 Return translated label for productId field.
446 */ 455 */
447 static QString productIdLabel(); 456 static QString productIdLabel();
448 457
449 /** 458 /**
450 Set revision date. 459 Set revision date.
451 */ 460 */
452 void setRevision( const QDateTime &revision ); 461 void setRevision( const QDateTime &revision );
453 /** 462 /**
454 Return revision date. 463 Return revision date.
455 */ 464 */
456 QDateTime revision() const; 465 QDateTime revision() const;
457 /** 466 /**
458 Return translated label for revision field. 467 Return translated label for revision field.
459 */ 468 */
460 static QString revisionLabel(); 469 static QString revisionLabel();
461 470
462 /** 471 /**
463 Set sort string. 472 Set sort string.
464 */ 473 */
465 void setSortString( const QString &sortString ); 474 void setSortString( const QString &sortString );
466 /** 475 /**
467 Return sort string. 476 Return sort string.
468 */ 477 */
469 QString sortString() const; 478 QString sortString() const;
470 /** 479 /**
471 Return translated label for sortString field. 480 Return translated label for sortString field.
472 */ 481 */
473 static QString sortStringLabel(); 482 static QString sortStringLabel();
474 483
475 /** 484 /**
476 Set URL. 485 Set URL.
477 */ 486 */
478 void setUrl( const KURL &url ); 487 void setUrl( const KURL &url );
479 /** 488 /**
480 Return URL. 489 Return URL.
481 */ 490 */
482 KURL url() const; 491 KURL url() const;
483 /** 492 /**
484 Return translated label for url field. 493 Return translated label for url field.
485 */ 494 */
486 static QString urlLabel(); 495 static QString urlLabel();
487 496
488 /** 497 /**
489 Set security class. 498 Set security class.
490 */ 499 */
491 void setSecrecy( const Secrecy &secrecy ); 500 void setSecrecy( const Secrecy &secrecy );
492 /** 501 /**
493 Return security class. 502 Return security class.
494 */ 503 */
495 Secrecy secrecy() const; 504 Secrecy secrecy() const;
496 /** 505 /**
497 Return translated label for secrecy field. 506 Return translated label for secrecy field.
498 */ 507 */
499 static QString secrecyLabel(); 508 static QString secrecyLabel();
500 509
501 /** 510 /**
502 Set logo. 511 Set logo.
503 */ 512 */
504 void setLogo( const Picture &logo ); 513 void setLogo( const Picture &logo );
505 /** 514 /**
506 Return logo. 515 Return logo.
507 */ 516 */
508 Picture logo() const; 517 Picture logo() const;
509 /** 518 /**
510 Return translated label for logo field. 519 Return translated label for logo field.
511 */ 520 */
512 static QString logoLabel(); 521 static QString logoLabel();
513 522
514 /** 523 /**
515 Set photo. 524 Set photo.
516 */ 525 */
517 void setPhoto( const Picture &photo ); 526 void setPhoto( const Picture &photo );
518 /** 527 /**
519 Return photo. 528 Return photo.
520 */ 529 */
521 Picture photo() const; 530 Picture photo() const;
522 /** 531 /**
523 Return translated label for photo field. 532 Return translated label for photo field.
524 */ 533 */
525 static QString photoLabel(); 534 static QString photoLabel();
526 535
527 /** 536 /**
528 Set sound. 537 Set sound.
529 */ 538 */
530 void setSound( const Sound &sound ); 539 void setSound( const Sound &sound );
531 /** 540 /**
532 Return sound. 541 Return sound.
533 */ 542 */
534 Sound sound() const; 543 Sound sound() const;
535 /** 544 /**
536 Return translated label for sound field. 545 Return translated label for sound field.
537 */ 546 */
538 static QString soundLabel(); 547 static QString soundLabel();
539 548
540 /** 549 /**
541 Set agent. 550 Set agent.
542 */ 551 */
543 void setAgent( const Agent &agent ); 552 void setAgent( const Agent &agent );
544 /** 553 /**
545 Return agent. 554 Return agent.
546 */ 555 */
547 Agent agent() const; 556 Agent agent() const;
548 /** 557 /**
549 Return translated label for agent field. 558 Return translated label for agent field.
550 */ 559 */
551 static QString agentLabel(); 560 static QString agentLabel();
552 561
553 /** 562 /**
554 Set name fields by parsing the given string and trying to associate the 563 Set name fields by parsing the given string and trying to associate the
555 parts of the string with according fields. This function should probably 564 parts of the string with according fields. This function should probably
556 be a bit more clever. 565 be a bit more clever.
557 */ 566 */
558 void setNameFromString( const QString & ); 567 void setNameFromString( const QString & );
559 568
560 /** 569 /**
561 Return the name of the addressee. This is calculated from all the name 570 Return the name of the addressee. This is calculated from all the name
562 fields. 571 fields.
563 */ 572 */
564 QString realName() const; 573 QString realName() const;
565 574
566 /** 575 /**
567 Return the name that consists of all name parts. 576 Return the name that consists of all name parts.
568 */ 577 */
569 QString assembledName() const; 578 QString assembledName() const;
570 579
571 /** 580 /**
572 Return email address including real name. 581 Return email address including real name.
573 582
574 @param email Email address to be used to construct the full email string. 583 @param email Email address to be used to construct the full email string.
575 If this is QString::null the preferred email address is used. 584 If this is QString::null the preferred email address is used.
576 */ 585 */
577 QString fullEmail( const QString &email=QString::null ) const; 586 QString fullEmail( const QString &email=QString::null ) const;
578 587
579 /** 588 /**
580 Insert an email address. If the email address already exists in this 589 Insert an email address. If the email address already exists in this
581 addressee it is not duplicated. 590 addressee it is not duplicated.
582 591
583 @param email Email address 592 @param email Email address
584 @param preferred Set to true, if this is the preferred email address of 593 @param preferred Set to true, if this is the preferred email address of
585 the addressee. 594 the addressee.
586 */ 595 */
587 void insertEmail( const QString &email, bool preferred=false ); 596 void insertEmail( const QString &email, bool preferred=false );
588 597
589 /** 598 /**
590 Remove email address. If the email address doesn't exist, nothing happens. 599 Remove email address. If the email address doesn't exist, nothing happens.
591 */ 600 */
592 void removeEmail( const QString &email ); 601 void removeEmail( const QString &email );
593 602
594 /** 603 /**
595 Return preferred email address. This is the first email address or the 604 Return preferred email address. This is the first email address or the
596 last one added with @ref insertEmail() with a set preferred parameter. 605 last one added with @ref insertEmail() with a set preferred parameter.
597 */ 606 */
598 QString preferredEmail() const; 607 QString preferredEmail() const;
599 608
600 /** 609 /**
601 Return list of all email addresses. 610 Return list of all email addresses.
602 */ 611 */
603 QStringList emails() const; 612 QStringList emails() const;
604 613
605 /** 614 /**
606 Set the emails to @param. 615 Set the emails to @param.
607 The first email address gets the preferred one! 616 The first email address gets the preferred one!
608 @param list The list of email addresses. 617 @param list The list of email addresses.
609 */ 618 */
610 void setEmails( const QStringList& list); 619 void setEmails( const QStringList& list);
611 620
612 /** 621 /**
613 Insert a phone number. If a phone number with the same id already exists 622 Insert a phone number. If a phone number with the same id already exists
614 in this addressee it is not duplicated. 623 in this addressee it is not duplicated.
615 */ 624 */
616 void insertPhoneNumber( const PhoneNumber &phoneNumber ); 625 void insertPhoneNumber( const PhoneNumber &phoneNumber );
617 626
618 /** 627 /**
619 Remove phone number. If no phone number with the given id exists for this 628 Remove phone number. If no phone number with the given id exists for this
620 addresse nothing happens. 629 addresse nothing happens.
621 */ 630 */
622 void removePhoneNumber( const PhoneNumber &phoneNumber ); 631 void removePhoneNumber( const PhoneNumber &phoneNumber );
623 632
624 /** 633 /**
625 Return phone number, which matches the given type. 634 Return phone number, which matches the given type.
626 */ 635 */
627 PhoneNumber phoneNumber( int type ) const; 636 PhoneNumber phoneNumber( int type ) const;
628 637
629 /** 638 /**
630 Return list of all phone numbers. 639 Return list of all phone numbers.
631 */ 640 */
632 PhoneNumber::List phoneNumbers() const; 641 PhoneNumber::List phoneNumbers() const;
633 642
634 /** 643 /**
635 Return list of phone numbers with a special type. 644 Return list of phone numbers with a special type.
636 */ 645 */
637 PhoneNumber::List phoneNumbers( int type ) const; 646 PhoneNumber::List phoneNumbers( int type ) const;
638 647
639 /** 648 /**
640 Return phone number with the given id. 649 Return phone number with the given id.
641 */ 650 */
642 PhoneNumber findPhoneNumber( const QString &id ) const; 651 PhoneNumber findPhoneNumber( const QString &id ) const;
643 652
644 /** 653 /**
645 Insert a key. If a key with the same id already exists 654 Insert a key. If a key with the same id already exists
646 in this addressee it is not duplicated. 655 in this addressee it is not duplicated.
647 */ 656 */
648 void insertKey( const Key &key ); 657 void insertKey( const Key &key );
649 658
650 /** 659 /**
651 Remove a key. If no key with the given id exists for this 660 Remove a key. If no key with the given id exists for this
652 addresse nothing happens. 661 addresse nothing happens.
653 */ 662 */
654 void removeKey( const Key &key ); 663 void removeKey( const Key &key );
655 664
656 /** 665 /**
657 Return key, which matches the given type. 666 Return key, which matches the given type.
658 If @p type == Key::Custom you can specify a string 667 If @p type == Key::Custom you can specify a string
659 that should match. If you leave the string empty, the first 668 that should match. If you leave the string empty, the first
660 key with a custom value is returned. 669 key with a custom value is returned.
661 */ 670 */
662 Key key( int type, QString customTypeString = QString::null ) const; 671 Key key( int type, QString customTypeString = QString::null ) const;
663 672
664 /** 673 /**
665 Return list of all keys. 674 Return list of all keys.
666 */ 675 */
667 Key::List keys() const; 676 Key::List keys() const;
668 677
669 /** 678 /**
670 Set the list of keys 679 Set the list of keys
671 @param keys The keys to be set. 680 @param keys The keys to be set.
672 */ 681 */
673 void setKeys( const Key::List& keys); 682 void setKeys( const Key::List& keys);
674 683
675 /** 684 /**
676 Return list of keys with a special type. 685 Return list of keys with a special type.
677 If @p type == Key::Custom you can specify a string 686 If @p type == Key::Custom you can specify a string
678 that should match. If you leave the string empty, all custom 687 that should match. If you leave the string empty, all custom
679 keys will be returned. 688 keys will be returned.
680 */ 689 */
681 Key::List keys( int type, QString customTypeString = QString::null ) const; 690 Key::List keys( int type, QString customTypeString = QString::null ) const;
682 691
683 /** 692 /**
684 Return key with the given id. 693 Return key with the given id.
685 */ 694 */
686 Key findKey( const QString &id ) const; 695 Key findKey( const QString &id ) const;
687 696
688 /** 697 /**
689 Insert an address. If an address with the same id already exists 698 Insert an address. If an address with the same id already exists
690 in this addressee it is not duplicated. 699 in this addressee it is not duplicated.
691 */ 700 */
692 void insertAddress( const Address &address ); 701 void insertAddress( const Address &address );
693 702
694 /** 703 /**
695 Remove address. If no address with the given id exists for this 704 Remove address. If no address with the given id exists for this
696 addresse nothing happens. 705 addresse nothing happens.
697 */ 706 */
698 void removeAddress( const Address &address ); 707 void removeAddress( const Address &address );
699 708
700 /** 709 /**
701 Return address, which matches the given type. 710 Return address, which matches the given type.
702 */ 711 */
703 Address address( int type ) const; 712 Address address( int type ) const;
704 713
705 /** 714 /**
706 Return list of all addresses. 715 Return list of all addresses.
707 */ 716 */
708 Address::List addresses() const; 717 Address::List addresses() const;
709 718
710 /** 719 /**
711 Return list of addresses with a special type. 720 Return list of addresses with a special type.
712 */ 721 */
713 Address::List addresses( int type ) const; 722 Address::List addresses( int type ) const;
714 723
715 /** 724 /**
716 Return address with the given id. 725 Return address with the given id.
717 */ 726 */
718 Address findAddress( const QString &id ) const; 727 Address findAddress( const QString &id ) const;
719 728
720 /** 729 /**
721 Insert category. If the category already exists it is not duplicated. 730 Insert category. If the category already exists it is not duplicated.
722 */ 731 */
723 void insertCategory( const QString & ); 732 void insertCategory( const QString & );
724 733
725 /** 734 /**
726 Remove category. 735 Remove category.
727 */ 736 */
728 void removeCategory( const QString & ); 737 void removeCategory( const QString & );
729 738
730 /** 739 /**
731 Return, if addressee has the given category. 740 Return, if addressee has the given category.
732 */ 741 */
733 bool hasCategory( const QString & ) const; 742 bool hasCategory( const QString & ) const;
734 743
735 /** 744 /**
736 Set categories to given value. 745 Set categories to given value.
737 */ 746 */
738 void setCategories( const QStringList & ); 747 void setCategories( const QStringList & );
739 748
740 /** 749 /**
741 Return list of all set categories. 750 Return list of all set categories.
742 */ 751 */
743 QStringList categories() const; 752 QStringList categories() const;
744 753
745 /** 754 /**
746 Insert custom entry. The entry is identified by the name of the inserting 755 Insert custom entry. The entry is identified by the name of the inserting
747 application and a unique name. If an entry with the given app and name 756 application and a unique name. If an entry with the given app and name
748 already exists its value is replaced with the new given value. 757 already exists its value is replaced with the new given value.
749 */ 758 */
750 void insertCustom( const QString &app, const QString &name, 759 void insertCustom( const QString &app, const QString &name,
751 const QString &value ); 760 const QString &value );
752 761
753 /** 762 /**
754 Remove custom entry. 763 Remove custom entry.
755 */ 764 */
756 void removeCustom( const QString &app, const QString &name ); 765 void removeCustom( const QString &app, const QString &name );
757 766
758 /** 767 /**
759 Return value of custom entry, identified by app and entry name. 768 Return value of custom entry, identified by app and entry name.
760 */ 769 */
761 QString custom( const QString &app, const QString &name ) const; 770 QString custom( const QString &app, const QString &name ) const;
762 771
763 /** 772 /**
764 Set all custom entries. 773 Set all custom entries.
765 */ 774 */
766 void setCustoms( const QStringList & ); 775 void setCustoms( const QStringList & );
767 776
768 /** 777 /**
769 Return list of all custom entries. 778 Return list of all custom entries.
770 */ 779 */
771 QStringList customs() const; 780 QStringList customs() const;
772 781
773 /** 782 /**
774 Parse full email address. The result is given back in fullName and email. 783 Parse full email address. The result is given back in fullName and email.
775 */ 784 */
776 static void parseEmailAddress( const QString &rawEmail, QString &fullName, 785 static void parseEmailAddress( const QString &rawEmail, QString &fullName,
777 QString &email ); 786 QString &email );
778 787
779 /** 788 /**
780 Debug output. 789 Debug output.
781 */ 790 */
782 void dump() const; 791 void dump() const;
783 792
784 /** 793 /**
785 Returns string representation of the addressee. 794 Returns string representation of the addressee.
786 */ 795 */
787 QString asString() const; 796 QString asString() const;
788 797
789 /** 798 /**
790 Set resource where the addressee is from. 799 Set resource where the addressee is from.
791 */ 800 */
792 void setResource( Resource *resource ); 801 void setResource( Resource *resource );
793 802
794 /** 803 /**
795 Return pointer to resource. 804 Return pointer to resource.
796 */ 805 */
797 Resource *resource() const; 806 Resource *resource() const;
798 807
799 /** 808 /**
800 Return resourcelabel. 809 Return resourcelabel.
801 */ 810 */
802 //US 811 //US
803 static QString resourceLabel(); 812 static QString resourceLabel();
804 813
805 /** 814 /**
806 Mark addressee as changed. 815 Mark addressee as changed.
807 */ 816 */
808 void setChanged( bool value ); 817 void setChanged( bool value );
809 818
810 /** 819 /**
811 Return whether the addressee is changed. 820 Return whether the addressee is changed.
812 */ 821 */
813 bool changed() const; 822 bool changed() const;
814 823
815 private: 824 private:
816 Addressee copy(); 825 Addressee copy();
817 void detach(); 826 void detach();
827 int mTempSyncStat;
818 828
819 struct AddresseeData; 829 struct AddresseeData;
820 mutable KSharedPtr<AddresseeData> mData; 830 mutable KSharedPtr<AddresseeData> mData;
821}; 831};
822 832
823QDataStream &operator<<( QDataStream &, const Addressee & ); 833QDataStream &operator<<( QDataStream &, const Addressee & );
824QDataStream &operator>>( QDataStream &, Addressee & ); 834QDataStream &operator>>( QDataStream &, Addressee & );
825 835
826} 836}
827 837
828#endif 838#endif