--- a/src/versit/qversitcontactexporter_p.h	Fri Sep 17 08:34:34 2010 +0300
+++ b/src/versit/qversitcontactexporter_p.h	Mon Oct 04 01:37:06 2010 +0300
@@ -56,7 +56,6 @@
 #include "qversitdocument.h"
 #include "qversitproperty.h"
 #include "qmobilityglobal.h"
-#include "qvcardbackuphandlers_p.h"
 
 #include <QHash>
 #include <QObject>
@@ -64,11 +63,12 @@
 QTM_BEGIN_NAMESPACE
 class QContact;
 class QContactDetail;
+class QVersitContactHandler;
 
 class Q_AUTOTEST_EXPORT QVersitContactExporterPrivate
 {
 public:
-    QVersitContactExporterPrivate();
+    QVersitContactExporterPrivate(const QString& profile = QString());
     ~QVersitContactExporterPrivate();
 
     bool exportContact(const QContact& contact, QVersitDocument& versitDocument,
@@ -168,8 +168,7 @@
             QList<QVersitProperty>* removedProperties,
             QList<QVersitProperty>* generatedProperties,
             QSet<QString>* processedFields);
-    QVersitProperty takeProperty(const QVersitDocument& document, const QString& propertyName,
-                                 QList<QVersitProperty>* toBeRemoved);
+
     bool isValidRemoteUrl(const QString& resourceIdentifier);
     void encodeParameters(QVersitProperty& property,
         const QStringList& contexts,
@@ -181,12 +180,12 @@
     QMap<int, QVersitContactExporter::Error> mErrors;
     QVersitContactExporterDetailHandler* mDetailHandler;
     QVersitContactExporterDetailHandlerV2* mDetailHandler2;
+    QList<QVersitContactHandler*> mPluginDetailHandlers;
     int mDetailHandlerVersion;
     QVersitDefaultResourceHandler* mDefaultResourceHandler;
     QVersitResourceHandler* mResourceHandler;
     QHash<QString,QString> mPropertyMappings;
     QHash<QString,QString> mParameterMappings;
-    QVersitDocument::VersitType mVersitType;
 };
 
 QTM_END_NAMESPACE