diff options
| author |   Unit 193 <unit193@ubuntu.com> | 2016-06-13 18:42:57 -0400 |
|---|---|---|
| committer | Unit 193 <unit193@ubuntu.com> | 2016-06-13 18:42:57 -0400 |
| commit | 65d5f68cc6dc81799c5a5d90400a2c1f0dd02547 (patch) | |
| tree | 6f245ba901b87ef42fed69965aea22f5eea6b590 /SQLiteStudio3/coreSQLiteStudio/csvserializer.h | |
| parent | aeb6bad01630d325a4e768e798a7a6d44e18fdaf (diff) | |
| parent | 5d9314f134ddd3dc4c853e398ac90ba247fb2e4f (diff) | |
Merge tag 'upstream/3.1.0'
Upstream version 3.1.0
# gpg: Signature made Mon 13 Jun 2016 06:42:54 PM EDT using RSA key ID EBE9BD91
# gpg: Good signature from "Unit 193 <unit193@gmail.com>"
# gpg: aka "Unit 193 <unit193@ninthfloor.org>"
# gpg: aka "Unit 193 <unit193@ubuntu.com>"
# gpg: aka "Unit 193 <unit193@ninthfloor.com>"
Diffstat (limited to 'SQLiteStudio3/coreSQLiteStudio/csvserializer.h')
| -rw-r--r-- | SQLiteStudio3/coreSQLiteStudio/csvserializer.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/SQLiteStudio3/coreSQLiteStudio/csvserializer.h b/SQLiteStudio3/coreSQLiteStudio/csvserializer.h index 1ff6ee9..0b7e095 100644 --- a/SQLiteStudio3/coreSQLiteStudio/csvserializer.h +++ b/SQLiteStudio3/coreSQLiteStudio/csvserializer.h @@ -4,6 +4,8 @@ #include "coreSQLiteStudio_global.h" #include "csvformat.h" +#include <QTextStream> + class API_EXPORT CsvSerializer { public: @@ -11,6 +13,11 @@ class API_EXPORT CsvSerializer static QString serialize(const QStringList& data, const CsvFormat& format); static QList<QStringList> deserialize(const QString& data, const CsvFormat& format); static QList<QList<QByteArray>> deserialize(const QByteArray& data, const CsvFormat& format); + static QList<QStringList> deserialize(QTextStream& data, const CsvFormat& format); + static QStringList deserializeOneEntry(QTextStream& data, const CsvFormat& format); + + private: + static QList<QStringList> deserialize(QTextStream& data, const CsvFormat& format, bool oneEntry); }; #endif // CSVSERIALIZER_H |