From b6a6d7736671e8b0bf5c114aa7c4f5fb8b6df76a Mon Sep 17 00:00:00 2001 From: Miika Turkia <[email protected]> Date: Tue, 10 Mar 2015 22:18:58 +0200 Subject: [PATCH] Trim CSV lines on import
In practice this will sanitize Windows line terminations (discard the carriage return); Signed-off-by: Miika Turkia <[email protected]> --- qt-ui/divelogimportdialog.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qt-ui/divelogimportdialog.cpp b/qt-ui/divelogimportdialog.cpp index ce12ef7..cb6225f 100644 --- a/qt-ui/divelogimportdialog.cpp +++ b/qt-ui/divelogimportdialog.cpp @@ -514,7 +514,7 @@ void DiveLogImportDialog::loadFileContents(int value, whatChanged triggeredBy) } while (rows < 10 && !f.atEnd()) { - QString currLine = f.readLine(); + QString currLine = f.readLine().trimmed(); currColumns = currLine.split(separator); fileColumns.append(currColumns); rows += 1; -- 1.9.1
_______________________________________________ subsurface mailing list [email protected] http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
