--- a/qtmobility/src/versit/qversitreader.h Fri Apr 16 15:51:22 2010 +0300
+++ b/qtmobility/src/versit/qversitreader.h Mon May 03 13:18:40 2010 +0300
@@ -60,7 +60,6 @@
class Q_VERSIT_EXPORT QVersitReader : public QObject
{
Q_OBJECT
-
public:
enum Error {
NoError = 0,
@@ -79,29 +78,33 @@
};
QVersitReader();
+ QVersitReader(QIODevice* inputDevice);
+ QVersitReader(const QByteArray& inputData);
~QVersitReader();
// input:
- void setDevice(QIODevice* device);
+ void setDevice(QIODevice* inputDevice);
QIODevice* device() const;
+ void setData(const QByteArray& inputData);
void setDefaultCodec(QTextCodec* codec);
QTextCodec* defaultCodec() const;
- // reading:
- bool startReading();
- void cancel();
- bool waitForFinished(int msec = -1);
-
// output:
QList<QVersitDocument> results() const;
State state() const;
Error error() const;
+ // reading:
+public Q_SLOTS:
+ bool startReading();
+ void cancel();
+public:
+ Q_INVOKABLE bool waitForFinished(int msec = -1);
+
Q_SIGNALS:
void stateChanged(QVersitReader::State state);
- void resultsAvailable(QList<QVersitDocument>& results);
void resultsAvailable();
private: // data