Sqlite: Cleanup Sqlite

We don't need the threading anymore, so we removed it. The indexer
will be run in its thread anyway, so an extra thread makes the code
only more complicated. And we added namespaces.

Change-Id: Ibcba306324763285cf653c28bb08122345e5f8da
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Marco Bubke
2017-07-26 16:02:24 +02:00
parent 94ba1b8b5d
commit 3dcce060b2
50 changed files with 461 additions and 1196 deletions

View File

@@ -25,18 +25,18 @@
#pragma once
#include "sqlitedatabaseconnectionproxy.h"
#include "sqlitedatabasebackend.h"
#include "sqliteglobal.h"
#include <QString>
#include <QVector>
namespace Sqlite {
class SqliteTable;
class SQLITE_EXPORT SqliteDatabase : public QObject
class SQLITE_EXPORT SqliteDatabase
{
Q_OBJECT
public:
SqliteDatabase();
~SqliteDatabase();
@@ -55,25 +55,16 @@ public:
void setJournalMode(JournalMode journalMode);
JournalMode journalMode() const;
QThread *writeWorkerThread() const;
QThread *readWorkerThread() const;
signals:
void databaseIsOpened();
void databaseIsClosed();
private:
void handleReadDatabaseConnectionIsOpened();
void handleWriteDatabaseConnectionIsOpened();
void handleReadDatabaseConnectionIsClosed();
void handleWriteDatabaseConnectionIsClosed();
void initializeTables();
void shutdownTables();
private:
SqliteDatabaseConnectionProxy readDatabaseConnection;
SqliteDatabaseConnectionProxy writeDatabaseConnection;
QVector<SqliteTable*> sqliteTables;
QString databaseFilePath_;
JournalMode journalMode_;
SqliteDatabaseBackend m_sqliteDatabaseBackEnd;
QVector<SqliteTable*> m_sqliteTables;
QString m_databaseFilePath;
JournalMode m_journalMode;
bool m_isOpen = false;
};
} // namespace Sqlite