Peter M. Groen / openbr

Commit dc4eaa32739324f883cc8fcfc4cf0b896f2ccb04

Authored by Scott Klum
1 parent fa185e82

Fixed newLine regular expression

Inline Side-by-side
Showing 2 changed files with 2 additions and 2 deletions
openbr/core/qtutils.cpp
  View file @dc4eaa3
@@ -80,7 +80,7 @@ void readFile(const QString &file, QStringList &lines) @@ -80,7 +80,7 @@ void readFile(const QString &file, QStringList &lines)
80 { 80 {
81 QByteArray data; 81 QByteArray data;
82 readFile(file, data); 82 readFile(file, data);
83 - lines = QString(data).split(QRegularExpression("[\n|\r\n|\r]"), QString::SkipEmptyParts); 83 + lines = QString(data).split(QRegularExpression("(\n|\r\n|\r)"), QString::SkipEmptyParts);
84 for (int i=0; i<lines.size(); i++) 84 for (int i=0; i<lines.size(); i++)
85 lines[i] = lines[i].simplified(); 85 lines[i] = lines[i].simplified();
86 } 86 }
openbr/plugins/format.cpp
  View file @dc4eaa3
@@ -162,7 +162,7 @@ class csvFormat : public Format @@ -162,7 +162,7 @@ class csvFormat : public Format
162 { 162 {
163 QFile f(file.name); 163 QFile f(file.name);
164 f.open(QFile::ReadOnly); 164 f.open(QFile::ReadOnly);
165 - QStringList lines(QString(f.readAll()).split(QRegularExpression("[\n|\r\n|\r]"), QString::SkipEmptyParts)); 165 + QStringList lines(QString(f.readAll()).split(QRegularExpression("(\n|\r\n|\r)"), QString::SkipEmptyParts));
166 f.close(); 166 f.close();
167 167
168 bool isUChar = true; 168 bool isUChar = true;