diff options
| author |   Unit 193 <unit193@ubuntu.com> | 2017-02-09 04:37:26 -0500 |
|---|---|---|
| committer | Unit 193 <unit193@ubuntu.com> | 2017-02-09 04:37:26 -0500 |
| commit | c9d6debf9015b7853c3e061bbc64a555d85e2fcd (patch) | |
| tree | 53341bc57ae9fbad2beb5b6c08d97a68bee0ec8e /SQLiteStudio3/coreSQLiteStudio/csvformat.cpp | |
| parent | d5caba2b1f36dc3b92fa705a06097d0597fa2ddd (diff) | |
| parent | d9aa870e5d509cc7309ab82dd102a937ab58613a (diff) | |
Merge tag 'upstream/3.1.1+dfsg1'
Upstream version 3.1.1+dfsg1
# gpg: Signature made Thu 09 Feb 2017 04:37:24 AM EST
# gpg: using RSA key 5001E1B09AA3744B
# gpg: issuer "unit193@ubuntu.com"
# gpg: Good signature from "Unit 193 <unit193@ubuntu.com>" [unknown]
# gpg: aka "Unit 193 <unit193@gmail.com>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 8DB3 E586 865D 2B4A 2B18 5A5C 5001 E1B0 9AA3 744B
Diffstat (limited to 'SQLiteStudio3/coreSQLiteStudio/csvformat.cpp')
| -rw-r--r-- | SQLiteStudio3/coreSQLiteStudio/csvformat.cpp | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/SQLiteStudio3/coreSQLiteStudio/csvformat.cpp b/SQLiteStudio3/coreSQLiteStudio/csvformat.cpp index f5daa60..151fffd 100644 --- a/SQLiteStudio3/coreSQLiteStudio/csvformat.cpp +++ b/SQLiteStudio3/coreSQLiteStudio/csvformat.cpp @@ -1,7 +1,7 @@ #include "csvformat.h" #include <QtGlobal> -const CsvFormat CsvFormat::DEFAULT = {",", "\n"}; +const CsvFormat CsvFormat::DEFAULT = {{","}, {"\r\n", "\n", "\r"}}; CsvFormat::CsvFormat() { @@ -12,6 +12,27 @@ CsvFormat::CsvFormat(const QString& columnSeparator, const QString& rowSeparator { } +CsvFormat::CsvFormat(const QStringList &columnSeparators, const QStringList &rowSeparators) +{ + if (rowSeparators.size() > 1) + { + this->rowSeparators = rowSeparators; + multipleRowSeparators = true; + strictRowSeparator = true; + } + else if (rowSeparators.size() > 0) + this->rowSeparator = rowSeparators.first(); + + if (columnSeparators.size() > 1) + { + this->columnSeparators = columnSeparators; + multipleColumnSeparators = true; + strictColumnSeparator = true; + } + else if (columnSeparators.size() > 0) + this->columnSeparator = columnSeparators.first(); +} + CsvFormat::CsvFormat(const QString& columnSeparator, const QString& rowSeparator, bool strictRowSeparator, bool strictColumnSeparator) : columnSeparator(columnSeparator), rowSeparator(rowSeparator), strictColumnSeparator(strictColumnSeparator), strictRowSeparator(strictRowSeparator) { |