From 313bd10d0d5ef1281accdb9990d933875dcdee6e Mon Sep 17 00:00:00 2001
From: Scott Klum <scott.klum@gmail.com>
Date: Tue, 8 Apr 2014 10:39:49 -0400
Subject: [PATCH] Added support for carriage return when reading files

---
 openbr/core/qtutils.cpp   | 3 ++-
 openbr/plugins/format.cpp | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/openbr/core/qtutils.cpp b/openbr/core/qtutils.cpp
index 0d5b511..eedf226 100644
--- a/openbr/core/qtutils.cpp
+++ b/openbr/core/qtutils.cpp
@@ -24,6 +24,7 @@
 #include <QProcess>
 #include <QProcessEnvironment>
 #include <QRegExp>
+#include <QRegularExpression>
 #include <QStack>
 #include <QUrl>
 #include <openbr/openbr_plugin.h>
@@ -79,7 +80,7 @@ void readFile(const QString &file, QStringList &lines)
 {
     QByteArray data;
     readFile(file, data);
-    lines = QString(data).split('\n', QString::SkipEmptyParts);
+    lines = QString(data).split(QRegularExpression("[\n|\r\n|\r]"), QString::SkipEmptyParts);
     for (int i=0; i<lines.size(); i++)
         lines[i] = lines[i].simplified();
 }
diff --git a/openbr/plugins/format.cpp b/openbr/plugins/format.cpp
index 14d2b97..ca8b372 100644
--- a/openbr/plugins/format.cpp
+++ b/openbr/plugins/format.cpp
@@ -151,7 +151,7 @@ class csvFormat : public Format
     {
         QFile f(file.name);
         f.open(QFile::ReadOnly);
-        QStringList lines(QString(f.readAll()).split('\n'));
+        QStringList lines(QString(f.readAll()).split(QRegularExpression("[\n|\r\n|\r]"), QString::SkipEmptyParts));
         f.close();
 
         bool isUChar = true;
--
libgit2 0.21.4