-rw-r--r-- | kabc/addressbook.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kabc/addressbook.h b/kabc/addressbook.h index 3a8e028..f89d7da 100644 --- a/kabc/addressbook.h +++ b/kabc/addressbook.h | |||
@@ -95,48 +95,49 @@ class AddressBook : public QObject | |||
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 | virtual ~AddressBook(); | 120 | virtual ~AddressBook(); |
120 | 121 | ||
121 | /** | 122 | /** |
122 | Requests a ticket for saving the addressbook. Calling this function locks | 123 | Requests a ticket for saving the addressbook. Calling this function locks |
123 | 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 |
124 | 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 |
125 | for calling the @ref save() function. | 126 | for calling the @ref save() function. |
126 | 127 | ||
127 | @see save() | 128 | @see save() |
128 | */ | 129 | */ |
129 | Ticket *requestSaveTicket( Resource *resource=0 ); | 130 | Ticket *requestSaveTicket( Resource *resource=0 ); |
130 | 131 | ||
131 | /** | 132 | /** |
132 | Load address book from file. | 133 | Load address book from file. |
133 | */ | 134 | */ |
134 | bool load(); | 135 | bool load(); |
135 | 136 | ||
136 | /** | 137 | /** |
137 | 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 |
138 | object has been requested for by @ref requestSaveTicket(). | 139 | object has been requested for by @ref requestSaveTicket(). |
139 | 140 | ||
140 | @param ticket a ticket object returned by @ref requestSaveTicket() | 141 | @param ticket a ticket object returned by @ref requestSaveTicket() |
141 | */ | 142 | */ |
142 | bool save( Ticket *ticket ); | 143 | bool save( Ticket *ticket ); |
@@ -287,41 +288,40 @@ class AddressBook : public QObject | |||
287 | void cleanUp(); | 288 | void cleanUp(); |
288 | 289 | ||
289 | signals: | 290 | signals: |
290 | /** | 291 | /** |
291 | Emitted, when the address book has changed on disk. | 292 | Emitted, when the address book has changed on disk. |
292 | */ | 293 | */ |
293 | void addressBookChanged( AddressBook * ); | 294 | void addressBookChanged( AddressBook * ); |
294 | 295 | ||
295 | /** | 296 | /** |
296 | Emitted, when the address book has been locked for writing. | 297 | Emitted, when the address book has been locked for writing. |
297 | */ | 298 | */ |
298 | void addressBookLocked( AddressBook * ); | 299 | void addressBookLocked( AddressBook * ); |
299 | 300 | ||
300 | /** | 301 | /** |
301 | Emitted, when the address book has been unlocked. | 302 | Emitted, when the address book has been unlocked. |
302 | */ | 303 | */ |
303 | void addressBookUnlocked( AddressBook * ); | 304 | void addressBookUnlocked( AddressBook * ); |
304 | 305 | ||
305 | protected: | 306 | protected: |
306 | void deleteRemovedAddressees(); | 307 | void deleteRemovedAddressees(); |
307 | void setStandardResource( Resource * ); | 308 | void setStandardResource( Resource * ); |
308 | Resource *standardResource(); | 309 | Resource *standardResource(); |
309 | KRES::Manager<Resource> *resourceManager(); | 310 | KRES::Manager<Resource> *resourceManager(); |
310 | 311 | ||
312 | void init(const QString &config, const QString &family); | ||
313 | |||
311 | private: | 314 | private: |
312 | //US QPtrList<Resource> mDummy; // Remove in KDE 4 | 315 | //US QPtrList<Resource> mDummy; // Remove in KDE 4 |
313 | 316 | ||
314 | //US optimization | ||
315 | void init(const QString &config); | ||
316 | |||
317 | 317 | ||
318 | struct AddressBookData; | 318 | struct AddressBookData; |
319 | AddressBookData *d; | 319 | AddressBookData *d; |
320 | }; | 320 | }; |
321 | 321 | ||
322 | QDataStream &operator<<( QDataStream &, const AddressBook & ); | 322 | QDataStream &operator<<( QDataStream &, const AddressBook & ); |
323 | QDataStream &operator>>( QDataStream &, AddressBook & ); | 323 | QDataStream &operator>>( QDataStream &, AddressBook & ); |
324 | 324 | ||
325 | } | 325 | } |
326 | 326 | ||
327 | #endif | 327 | #endif |