--- a/qtcontactsmobility/src/versit/qversitreader.h	Fri Mar 19 09:27:18 2010 +0200
+++ b/qtcontactsmobility/src/versit/qversitreader.h	Fri Apr 16 14:53:18 2010 +0300
@@ -47,9 +47,8 @@
 
 #include <QObject>
 
-QT_BEGIN_NAMESPACE
 class QIODevice;
-QT_END_NAMESPACE
+class QTextCodec;
 
 QTM_BEGIN_NAMESPACE
 
@@ -61,6 +60,22 @@
     Q_OBJECT  
     
 public:
+    enum Error {
+        NoError = 0,
+        UnspecifiedError,
+        IOError,
+        OutOfMemoryError,
+        NotReadyError,
+        ParseError
+    };
+
+    enum State {
+        InactiveState = 0,
+        ActiveState,
+        CanceledState,
+        FinishedState
+    };
+
     QVersitReader();
     ~QVersitReader();
 
@@ -68,15 +83,28 @@
     void setDevice(QIODevice* device);
     QIODevice* device() const;
 
+    void setDefaultCodec(QTextCodec* codec);
+    QTextCodec* defaultCodec() const;
+
     // reading:
     bool startReading();
-    bool readAll();
+    void cancel();
+    bool waitForFinished(int msec = -1);
 
     // output:
-    QList<QVersitDocument> result() const;
+    QList<QVersitDocument> results() const;
+
+    State state() const;
+    Error error() const;
+
+    // Deprecated
+    bool Q_DECL_DEPRECATED readAll();
+    QList<QVersitDocument> Q_DECL_DEPRECATED result() const;
 
 signals:
-    void readingDone();
+    void stateChanged(QVersitReader::State state);
+    void resultsAvailable(QList<QVersitDocument>& results);
+    void resultsAvailable();
     
 private: // data
     QVersitReaderPrivate* d;   
@@ -84,4 +112,6 @@
 
 QTM_END_NAMESPACE
 
+Q_DECLARE_METATYPE(QTM_PREPEND_NAMESPACE(QVersitReader::State))
+
 #endif // QVERSITREADER_H