--- a/qtmobility/src/versit/qversitcontactimporter_p.h	Fri Apr 16 15:51:22 2010 +0300
+++ b/qtmobility/src/versit/qversitcontactimporter_p.h	Mon May 03 13:18:40 2010 +0300
@@ -74,9 +74,12 @@
     QVersitContactImporterPrivate();
     ~QVersitContactImporterPrivate();
 
-    QContact importContact(const QVersitDocument& versitDocument, int contactIndex);
+    bool importContact(const QVersitDocument& versitDocument, int contactIndex,
+                       QContact* contact, QVersitContactImporter::Error* error);
     QList<QVersitProperty> unconvertedVersitProperties();
 
+    static QString synthesizedDisplayLabel(const QContact& contact);
+
 private:
     void importProperty(const QVersitDocument& document, const QVersitProperty& property,
                         int contactIndex, QContact* contact) const;
@@ -90,12 +93,14 @@
     bool createAnniversary(const QVersitProperty& property, QContact* contact) const;
     bool createBirthday(const QVersitProperty& property, QContact* contact) const;
     bool createNicknames(const QVersitProperty& property, QContact* contact) const;
+    bool createTags(const QVersitProperty& property, QContact* contact) const;
     bool createOnlineAccount(const QVersitProperty& property, QContact* contact) const;
-    bool createAvatar(const QVersitProperty& property, const QString& subType, QContact* contact) const;
+    bool createRingtone(const QVersitProperty& property, QContact* contact) const;
+    bool createThumbnail(const QVersitProperty& property, QContact* contact) const;
     bool createGeoLocation(const QVersitProperty& property, QContact* contact) const;
     bool createFamily(const QVersitProperty& property, QContact* contact) const;
     bool createNameValueDetail(const QVersitProperty& property, QContact* contact) const;
-    bool createLabel(const QVersitProperty& property, QContact* contact) const;
+    bool createCustomLabel(const QVersitProperty& property, QContact* contact) const;
     QStringList extractContexts(const QVersitProperty& property) const;
     QStringList extractSubTypes(const QVersitProperty& property) const;
     QString takeFirst(QList<QString>& list) const;
@@ -106,11 +111,12 @@
             QContact* contact, QContactDetail* detail, const QStringList& contexts) const;
 
 public: // Data
+    QList<QContact> mContacts;
+    QMap<int, QVersitContactImporter::Error> mErrors;
     QVersitContactImporterPropertyHandler* mPropertyHandler;
     QVersitDefaultResourceHandler* mDefaultResourceHandler;
     QVersitResourceHandler* mResourceHandler;
 
-private: // Data
     QHash<QString,QPair<QString,QString> > mDetailMappings;
     QHash<QString,QString> mContextMappings;
     QHash<QString,QString> mSubTypeMappings;