Merge branch 'unstable' of https://github.com/opentrack/opentrack into unstable

2 files changed, 4 insertions, 5 deletions

diff --git a/csv/csv.cpp b/csv/csv.cpp
index 189d05d9..8a5f5784 100644
--- a/csv/csv.cpp
+++ b/csv/csv.cpp
@@ -19,7 +19,7 @@
 #include <utility>
 #include <algorithm>
 
-const QTextCodec* CSV::m_codec = QTextCodec::codecForName("System");
+const QTextCodec* const CSV::m_codec = QTextCodec::codecForName("System");
 const QRegExp CSV::m_rx = QRegExp(QString("((?:(?:[^;\\n]*;?)|(?:\"[^\"]*\";?))*)?\\n?"));
 const QRegExp CSV::m_rx2 = QRegExp(QString("(?:\"([^\"]*)\";?)|(?:([^;]*);?)?"));
 
@@ -45,7 +45,7 @@ QString CSV::readLine()
     }
     else
     {
-        static const QChar lf(QChar::LineFeed);
+        const QChar lf(QChar::LineFeed);
 
         while (m_pos < m_string.length())
             if (m_string[m_pos++] == lf)
diff --git a/csv/csv.h b/csv/csv.h
index 34fa75d8..9e72b2bb 100644
--- a/csv/csv.h
+++ b/csv/csv.h
@@ -21,7 +21,6 @@ private:
     QString m_string;
     int m_pos;
 
-    static const QTextCodec* m_codec;
-    static const QRegExp m_rx;
-    static const QRegExp m_rx2; // Silly M$ compiler! It will generate an error if both of these variables are declared on the same line! (M$ Visual Studio Community 2015, Update 3)
+    static QTextCodec const* const m_codec;
+    static const QRegExp m_rx, m_rx2;
 };