From e562cc3f6871f46a456c6cd2564d79cbea85ff29 Mon Sep 17 00:00:00 2001
From: Marco Bubke <marco.bubke@qt.io>
Date: Wed, 26 Jul 2017 16:38:21 +0200
Subject: [PATCH] Sqlite: Cleanup exceptions

Change-Id: Id5ac7e6aba407eb5a3164bba57bff043e809beef
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
---
 src/libs/sqlite/sqliteexception.cpp              |  8 ++------
 src/libs/sqlite/sqliteexception.h                | 13 +++++++++----
 src/libs/sqlite/sqlstatementbuilderexception.cpp |  7 +++----
 src/libs/sqlite/sqlstatementbuilderexception.h   |  2 +-
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/libs/sqlite/sqliteexception.cpp b/src/libs/sqlite/sqliteexception.cpp
index 4f16a88bc1d..468d5fd26ae 100644
--- a/src/libs/sqlite/sqliteexception.cpp
+++ b/src/libs/sqlite/sqliteexception.cpp
@@ -25,16 +25,12 @@
 
 #include "sqliteexception.h"
 
+#include <utils/smallstringio.h>
+
 #include <QDebug>
 
 namespace Sqlite {
 
-SqliteException::SqliteException(const char *whatErrorHasHappen, const char *sqliteErrorMessage)
-    : m_whatErrorHasHappen(whatErrorHasHappen),
-      m_sqliteErrorMessage(sqliteErrorMessage)
-{
-}
-
 void SqliteException::printWarning() const
 {
     if (!m_sqliteErrorMessage.isEmpty())
diff --git a/src/libs/sqlite/sqliteexception.h b/src/libs/sqlite/sqliteexception.h
index b74cfd78fba..9a60cb52e0d 100644
--- a/src/libs/sqlite/sqliteexception.h
+++ b/src/libs/sqlite/sqliteexception.h
@@ -27,20 +27,25 @@
 
 #include "sqliteglobal.h"
 
-#include <QByteArray>
+#include <utils/smallstring.h>
 
 namespace Sqlite {
 
 class SQLITE_EXPORT SqliteException
 {
 public:
-    SqliteException(const char *m_whatErrorHasHappen, const char *sqliteErrorMessage = 0);
+    SqliteException(Utils::SmallString &&whatErrorHasHappen,
+                    Utils::SmallString &&sqliteErrorMessage = Utils::SmallString())
+        : m_whatErrorHasHappen(std::move(whatErrorHasHappen)),
+          m_sqliteErrorMessage(std::move(sqliteErrorMessage))
+    {
+    }
 
     void printWarning() const;
 
 private:
-    const char *m_whatErrorHasHappen;
-    QByteArray m_sqliteErrorMessage;
+    Utils::SmallString m_whatErrorHasHappen;
+    Utils::SmallString m_sqliteErrorMessage;
 };
 
 } // namespace Sqlite
diff --git a/src/libs/sqlite/sqlstatementbuilderexception.cpp b/src/libs/sqlite/sqlstatementbuilderexception.cpp
index f3a300c098a..82f5b4f7929 100644
--- a/src/libs/sqlite/sqlstatementbuilderexception.cpp
+++ b/src/libs/sqlite/sqlstatementbuilderexception.cpp
@@ -27,9 +27,8 @@
 
 namespace Sqlite {
 
-SqlStatementBuilderException::SqlStatementBuilderException(const char *whatErrorHasHappen, const char *errorMessage)
-    : SqliteException(whatErrorHasHappen, errorMessage)
-{
-}
+
+
+
 
 } // namespace Sqlite
diff --git a/src/libs/sqlite/sqlstatementbuilderexception.h b/src/libs/sqlite/sqlstatementbuilderexception.h
index bbc3c9cca9b..f7dd9ed5ce4 100644
--- a/src/libs/sqlite/sqlstatementbuilderexception.h
+++ b/src/libs/sqlite/sqlstatementbuilderexception.h
@@ -32,7 +32,7 @@ namespace Sqlite {
 class SQLITE_EXPORT SqlStatementBuilderException : public SqliteException
 {
 public:
-    SqlStatementBuilderException(const char *m_whatErrorHasHappen, const char *errorMessage = 0);
+    using SqliteException::SqliteException;
 };
 
 } // namespace Sqlite