From 988087b43a52c24e56cdd83cdd1c86bb927e4ad9 Mon Sep 17 00:00:00 2001
From: Markus Mittendrein <git@maxmitti.tk>
Date: Mon, 12 Oct 2015 14:19:54 +0200
Subject: Fix crash in Util::trimQuotes

---
 src/Util.cpp | 4 +++-
 src/Util.hpp | 8 ++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/Util.cpp b/src/Util.cpp
index 4db3773..78dd8d2 100644
--- a/src/Util.cpp
+++ b/src/Util.cpp
@@ -1,8 +1,10 @@
 #include "Util.hpp"
 
 namespace Util {
-    QString& trimQuotes(QString&& string, bool& trimmed)
+    QString trimQuotes(QString string, bool& trimmed)
     {
+        if(string.isEmpty()) return string;
+
         trimmed = false;
         if(string.length() >= 2 && string.at(0) == '"' && string.at(string.length() - 1) == '"')
         {
diff --git a/src/Util.hpp b/src/Util.hpp
index b0d1f78..5826b1b 100644
--- a/src/Util.hpp
+++ b/src/Util.hpp
@@ -1,8 +1,12 @@
 #pragma once
 
 #include <QString>
+#include <QMap>
 
 namespace Util {
-    QString& trimQuotes(QString&& string, bool& trimmed);
-    QString& trimQuotes(const QString& string, bool& trimmed);
+    static const QMap<QChar, QChar> unescapeChars {
+        {'n', '\n'},
+    };
+
+    QString trimQuotes(QString string, bool& trimmed);
 }
-- 
cgit v1.2.3-54-g00ecf