[PATCH] CSV import: trim column headers

Miika Turkia miika.turkia at gmail.com
Fri Sep 11 11:15:19 PDT 2015


This will trim the column headers so we handle Windows line endings
properly.

Signed-off-by: Miika Turkia <miika.turkia at gmail.com>
---
 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 c21a6a1..025d181 100644
--- a/qt-ui/divelogimportdialog.cpp
+++ b/qt-ui/divelogimportdialog.cpp
@@ -507,7 +507,7 @@ void DiveLogImportDialog::loadFileContents(int value, whatChanged triggeredBy)
 				columnText.replace("2", "₂", Qt::CaseInsensitive);
 				columnText.replace("cylinder", "cyl.", Qt::CaseInsensitive);
 			}
-			int idx = provider->mymatch(columnText);
+			int idx = provider->mymatch(columnText.trimmed());
 			if (idx >= 0) {
 				QString foundHeading = provider->data(provider->index(idx, 0), Qt::DisplayRole).toString();
 				provider->removeRow(idx);
-- 
2.1.4



More information about the subsurface mailing list