summaryrefslogtreecommitdiffabout
authorulf69 <ulf69>2004-06-29 05:31:09 (UTC)
committer ulf69 <ulf69>2004-06-29 05:31:09 (UTC)
commit32ccd8d1cd509afdccea7ce62406ad260a2e6f8f (patch) (side-by-side diff)
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
@@ -4,70 +4,64 @@
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
You should have received a copy of the GNU Library General Public License
along with this library; see the file COPYING.LIB. If not, write to
the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
/*
Enhanced Version of the file for platform independent KDE tools.
Copyright (c) 2004 Ulf Schenk
$Id$
*/
#ifndef KABC_ADDRESSBOOK_H
#define KABC_ADDRESSBOOK_H
#include <qobject.h>
#include <kresources/manager.h>
#include <qptrlist.h>
-#ifndef KAB_EMBEDDED
-
-#else //KAB_EMBEDDED
-#endif //KAB_EMBEDDED
-
-
#include "addressee.h"
#include "field.h"
namespace KABC {
class ErrorHandler;
class Resource;
class Ticket;
/**
@short Address Book
This class provides access to a collection of address book entries.
*/
class AddressBook : public QObject
{
Q_OBJECT
friend QDataStream &operator<<( QDataStream &, const AddressBook & );
friend QDataStream &operator>>( QDataStream &, AddressBook & );
friend class StdAddressBook;
public:
/**
@short Address Book Iterator
This class provides an iterator for address book entries.
*/
class Iterator
{
public:
Iterator();
@@ -286,52 +280,48 @@ class AddressBook : public QObject
Shows gui independend error messages.
*/
void error( const QString& );
/**
Query all resources to clean up their lock files
*/
void cleanUp();
signals:
/**
Emitted, when the address book has changed on disk.
*/
void addressBookChanged( AddressBook * );
/**
Emitted, when the address book has been locked for writing.
*/
void addressBookLocked( AddressBook * );
/**
Emitted, when the address book has been unlocked.
*/
void addressBookUnlocked( AddressBook * );
protected:
void deleteRemovedAddressees();
void setStandardResource( Resource * );
Resource *standardResource();
KRES::Manager<Resource> *resourceManager();
private:
-#ifndef KAB_EMBEDDED
- QPtrList<Resource> mDummy; // Remove in KDE 4
-#endif //KAB_EMBEDDED
+//US QPtrList<Resource> mDummy; // Remove in KDE 4
-#ifdef KAB_EMBEDDED
//US optimization
void init(const QString &config);
-#endif //KAB_EMBEDDED
struct AddressBookData;
AddressBookData *d;
};
QDataStream &operator<<( QDataStream &, const AddressBook & );
QDataStream &operator>>( QDataStream &, AddressBook & );
}
#endif