diff -r e4ebb16b39ea -r 603d3f8b6302 src/versit/qversitcontactexporter.h --- a/src/versit/qversitcontactexporter.h Fri Sep 17 08:34:34 2010 +0300 +++ b/src/versit/qversitcontactexporter.h Mon Oct 04 01:37:06 2010 +0300 @@ -71,17 +71,16 @@ class Q_VERSIT_EXPORT QVersitContactExporterDetailHandlerV2 { public: - static QVersitContactExporterDetailHandlerV2* createBackupHandler(); virtual ~QVersitContactExporterDetailHandlerV2() {} + virtual void detailProcessed(const QContact& contact, const QContactDetail& detail, - const QSet& processedFields, const QVersitDocument& document, + QSet* processedFields, QList* toBeRemoved, QList* toBeAdded) = 0; virtual void contactProcessed(const QContact& contact, QVersitDocument* document) = 0; - virtual int version() const { return 2; } }; class Q_VERSIT_EXPORT QVersitContactExporter @@ -94,6 +93,7 @@ }; QVersitContactExporter(); + QVersitContactExporter(const QString& profile); ~QVersitContactExporter(); bool exportContacts(const QList& contacts, QVersitDocument::VersitType versitType); @@ -105,11 +105,8 @@ void setResourceHandler(QVersitResourceHandler* handler); QVersitResourceHandler* resourceHandler() const; - // Deprecated: - + /* deprecated and internal */ void Q_DECL_DEPRECATED setDetailHandler(QVersitContactExporterDetailHandler* handler); - QList Q_DECL_DEPRECATED exportContacts(const QList& contacts); - /* deprecated and internal */ Q_DECL_DEPRECATED QVersitContactExporterDetailHandler* detailHandler() const; private: