summaryrefslogtreecommitdiffabout
authorulf69 <ulf69>2004-06-29 05:31:09 (UTC)
committer ulf69 <ulf69>2004-06-29 05:31:09 (UTC)
commit32ccd8d1cd509afdccea7ce62406ad260a2e6f8f (patch) (unidiff)
tree16bd3a22045aa4bc88df481207c57d69a0292eef
parenta027e7c5a476dbc101431ab8bf7987ba5d44d969 (diff)
downloadkdepimpi-32ccd8d1cd509afdccea7ce62406ad260a2e6f8f.zip
kdepimpi-32ccd8d1cd509afdccea7ce62406ad260a2e6f8f.tar.gz
kdepimpi-32ccd8d1cd509afdccea7ce62406ad260a2e6f8f.tar.bz2
removed references to KAB_EMBEDDED macro
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kabc/addressbook.h12
1 files changed, 1 insertions, 11 deletions
diff --git a/kabc/addressbook.h b/kabc/addressbook.h
index 3383fc0..3a8e028 100644
--- a/kabc/addressbook.h
+++ b/kabc/addressbook.h
@@ -24,30 +24,24 @@ Copyright (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#ifndef KAB_EMBEDDED
37
38#else //KAB_EMBEDDED
39#endif //KAB_EMBEDDED
40
41
42#include "addressee.h" 36#include "addressee.h"
43#include "field.h" 37#include "field.h"
44 38
45namespace KABC { 39namespace KABC {
46 40
47class ErrorHandler; 41class ErrorHandler;
48class Resource; 42class Resource;
49class Ticket; 43class Ticket;
50 44
51/** 45/**
52 @short Address Book 46 @short Address Book
53 47
@@ -306,32 +300,28 @@ class AddressBook : public QObject
306 /** 300 /**
307 Emitted, when the address book has been unlocked. 301 Emitted, when the address book has been unlocked.
308 */ 302 */
309 void addressBookUnlocked( AddressBook * ); 303 void addressBookUnlocked( AddressBook * );
310 304
311 protected: 305 protected:
312 void deleteRemovedAddressees(); 306 void deleteRemovedAddressees();
313 void setStandardResource( Resource * ); 307 void setStandardResource( Resource * );
314 Resource *standardResource(); 308 Resource *standardResource();
315 KRES::Manager<Resource> *resourceManager(); 309 KRES::Manager<Resource> *resourceManager();
316 310
317 private: 311 private:
318#ifndef KAB_EMBEDDED 312//US QPtrList<Resource> mDummy; // Remove in KDE 4
319 QPtrList<Resource> mDummy; // Remove in KDE 4
320#endif //KAB_EMBEDDED
321 313
322#ifdef KAB_EMBEDDED
323//US optimization 314//US optimization
324 void init(const QString &config); 315 void init(const QString &config);
325#endif //KAB_EMBEDDED
326 316
327 317
328 struct AddressBookData; 318 struct AddressBookData;
329 AddressBookData *d; 319 AddressBookData *d;
330}; 320};
331 321
332QDataStream &operator<<( QDataStream &, const AddressBook & ); 322QDataStream &operator<<( QDataStream &, const AddressBook & );
333QDataStream &operator>>( QDataStream &, AddressBook & ); 323QDataStream &operator>>( QDataStream &, AddressBook & );
334 324
335} 325}
336 326
337#endif 327#endif