# HG changeset patch # User Tom Fredrik Blenning Klaussen # Date 1346952152 -7200 # Node ID c978d4a6514d3f2ac727fd105e4f568f65298b78 # Parent bf3dce7fedcbc55f08b52c3452c0f1dc1a364301 Replace unnecessary asserts with exceptions. diff -r bf3dce7fedcb -r c978d4a6514d DBCache.hpp --- a/DBCache.hpp Thu Sep 06 19:14:58 2012 +0200 +++ b/DBCache.hpp Thu Sep 06 19:22:32 2012 +0200 @@ -9,7 +9,6 @@ #include #include -#include #include "OrderedPair.hpp" #include @@ -17,6 +16,7 @@ #include "ThreadSafeLookup.hpp" #include "UniqueString.hpp" #include "Exception/SQLException.hpp" +#include "Exception/IOException.hpp" template @@ -301,8 +301,8 @@ { db = QSqlDatabase::addDatabase("QSQLITE", "dictName"); db.setDatabaseName(dbName); - bool ok = db.open(); - assert(ok); + if (!db.open()) + throw IOException(QString("Unable to open SQLite database with path '%1'").arg(dictName)); setup(db, dictName); } diff -r bf3dce7fedcb -r c978d4a6514d SqliteDBLink.cpp --- a/SqliteDBLink.cpp Thu Sep 06 19:14:58 2012 +0200 +++ b/SqliteDBLink.cpp Thu Sep 06 19:22:32 2012 +0200 @@ -9,15 +9,14 @@ #include #include "Exception/SQLException.hpp" - -#include +#include "Exception/IOException.hpp" SqliteDBLink::SqliteDBLink(const QString& dbPath) { db = QSqlDatabase::addDatabase("QSQLITE", "SqliteDBLink"); db.setDatabaseName(dbPath); - bool ok = db.open(); - assert(ok); + if (!db.open()) + throw IOException(QString("Unable to open SQLite database with path '%1'").arg(dbPath)); QSqlQuery query(db); if (!query.exec(QString("SELECT * FROM files;"))) { query.exec("CREATE TABLE files(path VARCHAR PRIMARY KEY ASC, size INTEGER, mtime TEXT, checksum TEXT);");