From 6d0b8f7bc87d233e261dac8a384107bf214d55c6 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Wed, 22 May 2013 10:14:12 +0200
Subject: [PATCH 1/2] added missing include

---
 apps/opencs/view/settings/usersettingsdialog.hpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/opencs/view/settings/usersettingsdialog.hpp b/apps/opencs/view/settings/usersettingsdialog.hpp
index 2047efde3..31d40ca01 100644
--- a/apps/opencs/view/settings/usersettingsdialog.hpp
+++ b/apps/opencs/view/settings/usersettingsdialog.hpp
@@ -3,6 +3,7 @@
 
 #include <QMainWindow>
 #include <QStackedWidget>
+#include <QListWidgetItem>
 
 #ifndef Q_MOC_RUN
 #include <components/files/configurationmanager.hpp>

From 7149439ace598415039f11e57f97b18e51178758 Mon Sep 17 00:00:00 2001
From: Miroslav Puda <pakanek@gmail.com>
Date: Wed, 22 May 2013 13:23:49 +0200
Subject: [PATCH 2/2] Replacement of empty() method by assertion.

---
 components/compiler/scanner.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/components/compiler/scanner.cpp b/components/compiler/scanner.cpp
index d5095a50a..b45015d1e 100644
--- a/components/compiler/scanner.cpp
+++ b/components/compiler/scanner.cpp
@@ -1,6 +1,7 @@
 
 #include "scanner.hpp"
 
+#include <cassert>
 #include <cctype>
 #include <sstream>
 #include <algorithm>
@@ -163,6 +164,7 @@ namespace Compiler
 
     bool Scanner::scanInt (char c, Parser& parser, bool& cont)
     {
+        assert(c != '\0');
         std::string value;
         value += c;
 
@@ -187,11 +189,7 @@ namespace Compiler
             }
         }
 
-        /*
-         * value could be empty only if scanInt is called with c == '\0'.
-         * That is unlikely so it should be replaced by assertion.
-         */
-        if (value.empty() || error)
+        if (error)
             return false;
 
         TokenLoc loc (mLoc);