--- a/qtmobility/plugins/contacts/maemo5/qcontactabook_p.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/contacts/maemo5/qcontactabook_p.h	Fri May 14 16:41:33 2010 +0300
@@ -48,9 +48,10 @@
 #include "qtcontacts.h"
 #include "qcontactmaemo5debug_p.h"
 
+#undef signals
+#include <libosso-abook/osso-abook.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
-#include "osso-abook-workaround.h"
 #include "qcontactidshash.h"
 
 QTM_USE_NAMESPACE
@@ -97,10 +98,9 @@
   
   bool setDetailValues(const QVariantMap& data, QContactDetail* detail) const;
   
-  OssoABookContact* getAContact(const QContactLocalId& contactId) const;
+  OssoABookContact* getAContact(const QContactLocalId& contactId, QContactManager::Error* error) const;
   
   /* Filtering */
-  bool contactActionsMatch(OssoABookContact *contact, QList<QContactActionDescriptor> descriptors) const;
   EBookQuery* convert(const QContactFilter& filter) const;
   
   /* Reading - eContact/abookContact to QContact methods */
@@ -125,7 +125,7 @@
   QContactUrl* getUrlDetail(EContact *eContact) const;
   
   /* Saving - QContact to abookContact */
-  OssoABookContact* convert(const QContact *contact) const;
+  OssoABookContact* convert(const QContact *contact, QContactManager::Error* error) const;
   
   /* Save QDetails in OssoABookContact attributes */
   void setAddressDetail(const OssoABookContact* aContact, const QContactAddress& detail) const;