--- a/qtcontactsmobility/src/versit/qvcard21writer_p.h	Fri Mar 19 09:27:18 2010 +0200
+++ b/qtcontactsmobility/src/versit/qvcard21writer_p.h	Fri Apr 16 14:53:18 2010 +0300
@@ -53,21 +53,21 @@
 // We mean it.
 //
 
-#include "qversitwriter_p.h"
+#include "qversitdocumentwriter_p.h"
 #include "qmobilityglobal.h"
 
 QTM_BEGIN_NAMESPACE
 
-class Q_AUTOTEST_EXPORT QVCard21Writer : public QVersitWriterPrivate
+class Q_AUTOTEST_EXPORT QVCard21Writer : public QVersitDocumentWriter
 {
 public:
     QVCard21Writer();
     ~QVCard21Writer();
 
-protected: // From QVersitWriterPrivate
-    QByteArray encodeVersitProperty(const QVersitProperty& property);
-    QByteArray encodeParameters(const QMultiHash<QString,QString>& parameters) const;
-    bool quotedPrintableEncode(const QVersitProperty& property, QByteArray& value) const;
+    void encodeVersitProperty(const QVersitProperty& property);
+    void encodeParameters(const QMultiHash<QString,QString>& parameters);
+    bool quotedPrintableEncode(QString& text) const;
+    bool shouldBeQuotedPrintableEncoded(QChar chr) const;
 };
 
 QTM_END_NAMESPACE