--- a/qtcontactsmobility/src/versit/qversitcontactexporter_p.h	Fri Mar 19 09:27:18 2010 +0200
+++ b/qtcontactsmobility/src/versit/qversitcontactexporter_p.h	Fri Apr 16 14:53:18 2010 +0300
@@ -42,6 +42,17 @@
 #ifndef QVERSITCONTACTEXPORTER_P_H
 #define QVERSITCONTACTEXPORTER_P_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include "qversitdocument.h"
 #include "qversitproperty.h"
 #include "qmobilityglobal.h"
@@ -53,17 +64,13 @@
 class QContact;
 class QContactDetail;
 
-class Q_AUTOTEST_EXPORT QVersitContactExporterPrivate : public QObject
+class Q_AUTOTEST_EXPORT QVersitContactExporterPrivate
 {
-    Q_OBJECT
 public:
     QVersitContactExporterPrivate();
     ~QVersitContactExporterPrivate();
 
-    void exportContact(QVersitDocument& versitDocument, const QContact& contact);
-
-signals:
-    void scale(const QString& imageFileName, QByteArray& imageData);
+    void exportContact(const QContact& contact, QVersitDocument& versitDocument);
 
 protected:
     void encodeName(QVersitProperty& property, const QContactDetail& detail);
@@ -91,16 +98,15 @@
     void encodeParameters(QVersitProperty& property,
         const QStringList& contexts,
         const QStringList& subTypes=QStringList());
-    bool encodeEmbeddedContent(const QString& resourcePath,
-        QVersitProperty& property,
-        bool performScaling);
+    bool encodeContentFromFile(const QString& resourcePath, QVersitProperty& property);
+    bool encodeContentFromPixmap(const QPixmap& pixmap, QVersitProperty& property);
     void setEscapedValue(QVersitProperty& property,const QString& value);
-    QByteArray escape(const QByteArray& value);
+    QString escape(const QString& value);
 
 public: // Data
-    QList<QContactDetail> mUnknownContactDetails;
-
-protected: // Data
+    QVersitContactExporterDetailHandler* mDetailHandler;
+    QVersitDefaultResourceHandler* mDefaultResourceHandler;
+    QVersitResourceHandler* mResourceHandler;
     QHash<QString,QString> mPropertyMappings;
     QHash<QString,QString> mParameterMappings;
     QVersitDocument::VersitType mVersitType;