feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Sqlite: Cleanup exceptions

Browse Source 
Change-Id: Id5ac7e6aba407eb5a3164bba57bff043e809beef
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Marco Bubke
2017-07-26 16:38:21 +02:00
parent 3dcce060b2
commit e562cc3f68
4 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libs/sqlite/sqliteexception.cpp
View File

@@ -25,16 +25,12 @@
#include "sqliteexception.h" #include "sqliteexception.h"
#include <utils/smallstringio.h>
#include <QDebug> #include <QDebug>
namespace Sqlite { namespace Sqlite {
SqliteException::SqliteException(const char *whatErrorHasHappen, const char *sqliteErrorMessage)
: m_whatErrorHasHappen(whatErrorHasHappen),
m_sqliteErrorMessage(sqliteErrorMessage)
{
}
void SqliteException::printWarning() const void SqliteException::printWarning() const
{ {
if (!m_sqliteErrorMessage.isEmpty()) if (!m_sqliteErrorMessage.isEmpty())

13
src/libs/sqlite/sqliteexception.h
View File

@@ -27,20 +27,25 @@
#include "sqliteglobal.h" #include "sqliteglobal.h"
#include <QByteArray> #include <utils/smallstring.h>
namespace Sqlite { namespace Sqlite {
class SQLITE_EXPORT SqliteException class SQLITE_EXPORT SqliteException
{ {
public: 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; void printWarning() const;
private: private:
const char *m_whatErrorHasHappen; Utils::SmallString m_whatErrorHasHappen;
QByteArray m_sqliteErrorMessage; Utils::SmallString m_sqliteErrorMessage;
}; };
} // namespace Sqlite } // namespace Sqlite

7
src/libs/sqlite/sqlstatementbuilderexception.cpp
View File

@@ -27,9 +27,8 @@
namespace Sqlite { namespace Sqlite {
SqlStatementBuilderException::SqlStatementBuilderException(const char *whatErrorHasHappen, const char *errorMessage)
: SqliteException(whatErrorHasHappen, errorMessage)
{
}
} // namespace Sqlite } // namespace Sqlite

2
src/libs/sqlite/sqlstatementbuilderexception.h
View File

@@ -32,7 +32,7 @@ namespace Sqlite {
class SQLITE_EXPORT SqlStatementBuilderException : public SqliteException class SQLITE_EXPORT SqlStatementBuilderException : public SqliteException
{ {
public: public:
SqlStatementBuilderException(const char *m_whatErrorHasHappen, const char *errorMessage = 0); using SqliteException::SqliteException;
}; };
} // namespace Sqlite } // namespace Sqlite