--- a/src/versit/qversitcontactimporter.h Fri Sep 17 08:34:34 2010 +0300
+++ b/src/versit/qversitcontactimporter.h Mon Oct 04 01:37:06 2010 +0300
@@ -73,16 +73,14 @@
class Q_VERSIT_EXPORT QVersitContactImporterPropertyHandlerV2
{
public:
- static QVersitContactImporterPropertyHandlerV2* createBackupHandler();
virtual ~QVersitContactImporterPropertyHandlerV2() {}
virtual void propertyProcessed(const QVersitDocument& document,
const QVersitProperty& property,
- bool alreadyProcessed,
const QContact& contact,
+ bool *alreadyProcessed,
QList<QContactDetail>* updatedDetails) = 0;
virtual void documentProcessed(const QVersitDocument& document,
QContact* contact) = 0;
- virtual int version() const { return 2; }
};
class Q_VERSIT_EXPORT QVersitContactImporter
@@ -95,6 +93,7 @@
};
QVersitContactImporter();
+ QVersitContactImporter(const QString& profile);
~QVersitContactImporter();
bool importDocuments(const QList<QVersitDocument>& documents);
@@ -106,11 +105,8 @@
void setResourceHandler(QVersitResourceHandler* handler);
QVersitResourceHandler* resourceHandler() const;
- // Deprecated:
-
- QList<QContact> Q_DECL_DEPRECATED importContacts(const QList<QVersitDocument>& documents);
+ /* deprecated and internal */
void Q_DECL_DEPRECATED setPropertyHandler(QVersitContactImporterPropertyHandler* handler);
- /* deprecated and internal */
Q_DECL_DEPRECATED QVersitContactImporterPropertyHandler* propertyHandler() const;
private: