diff -r 2b40d63a9c3d -r 90517678cc4f qtmobility/plugins/contacts/symbiansim/inc/cntsimstore.h --- a/qtmobility/plugins/contacts/symbiansim/inc/cntsimstore.h Fri Apr 16 15:51:22 2010 +0300 +++ b/qtmobility/plugins/contacts/symbiansim/inc/cntsimstore.h Mon May 03 13:18:40 2010 +0300 @@ -53,6 +53,14 @@ QTM_USE_NAMESPACE +#ifdef SYMBIANSIM_BACKEND_PHONEBOOKINFOV1 +typedef RMobilePhoneBookStore::TMobilePhoneBookInfoV1 TSimStoreInfo; +typedef RMobilePhoneBookStore::TMobilePhoneBookInfoV1Pckg TSimStoreInfoPckg; +#else +typedef RMobilePhoneBookStore::TMobilePhoneBookInfoV5 TSimStoreInfo; +typedef RMobilePhoneBookStore::TMobilePhoneBookInfoV5Pckg TSimStoreInfoPckg; +#endif + class CntSimStorePrivate; class CntSymbianSimEngine; @@ -60,32 +68,34 @@ { Q_OBJECT public: - CntSimStore(CntSymbianSimEngine* engine, QString storeName); + CntSimStore(CntSymbianSimEngine* engine, QString storeName, QContactManager::Error* error); ~CntSimStore(); QString storeName(); - RMobilePhoneBookStore::TMobilePhoneBookInfoV5 storeInfo(); + TSimStoreInfo storeInfo(); - QContactManager::Error getInfo(); - QContactManager::Error read(int index, int numSlots); - QContactManager::Error write(const QContact &contact); - QContactManager::Error remove(int index); + bool read(int index, int numSlots, QContactManager::Error* error); + bool write(const QContact &contact, QContactManager::Error* error); + bool remove(int index, QContactManager::Error* error); + bool getReservedSlots(QContactManager::Error* error); + void cancel(); bool isBusy(); + + TInt lastAsyncError(); signals: // NOTE: Use Qt::QueuedConnection as connection type to make signals asynchronous. // CntSimStorePrivate emitting these signals is an active object and emitting // signals synchronously will corrupt the AO state. - void getInfoComplete(RMobilePhoneBookStore::TMobilePhoneBookInfoV5 info, QContactManager::Error error); void readComplete(QList contacts, QContactManager::Error error); void writeComplete(QContact contacts, QContactManager::Error error); void removeComplete(QContactManager::Error error); + void getReservedSlotsComplete(QList reservedSlots, QContactManager::Error error); private: CntSimStorePrivate *d_ptr; friend class CntSimStorePrivate; }; - #endif // CNTSIMSTORE_H_