diff options
| author | Anton <anton@picapica> | 2017-12-30 21:30:53 +0400 |
|---|---|---|
| committer | Anton <anton@picapica> | 2017-12-30 21:30:53 +0400 |
| commit | 5cf791b272ca46b648842417fe7c0bd7fe3249d1 (patch) | |
| tree | 3dbc26fcd0075940a139e73dbd4dd5b1342ef91d /pica-client | |
| parent | 833c5d5173cd4a37e14a587b72f7bf696c6e4b77 (diff) | |
| download | pica-pica-5cf791b272ca46b648842417fe7c0bd7fe3249d1.tar.gz pica-pica-5cf791b272ca46b648842417fe7c0bd7fe3249d1.zip | |
pica-client: use single sqlite database connection instance, prevents multiple warnings about connection in use
Diffstat (limited to 'pica-client')
| -rw-r--r-- | pica-client/accounts.cpp | 2 | ||||
| -rw-r--r-- | pica-client/contacts.cpp | 2 | ||||
| -rw-r--r-- | pica-client/history.cpp | 2 | ||||
| -rw-r--r-- | pica-client/main.cpp | 1 | ||||
| -rw-r--r-- | pica-client/nodes.cpp | 2 | ||||
| -rw-r--r-- | pica-client/settings.cpp | 2 |
6 files changed, 6 insertions, 5 deletions
diff --git a/pica-client/accounts.cpp b/pica-client/accounts.cpp index cf565d8..0f7c3b3 100644 --- a/pica-client/accounts.cpp +++ b/pica-client/accounts.cpp @@ -15,7 +15,7 @@ void Accounts::SetCurrentAccount(Accounts::AccountRecord &rec) Accounts::Accounts(QString storage) { - dbconn = QSqlDatabase::addDatabase("QSQLITE"); + dbconn = QSqlDatabase::database(); dbconn.setDatabaseName(storage); if (!dbconn.open()) diff --git a/pica-client/contacts.cpp b/pica-client/contacts.cpp index 44bce24..08ff999 100644 --- a/pica-client/contacts.cpp +++ b/pica-client/contacts.cpp @@ -6,7 +6,7 @@ Contacts::Contacts(QString storage, QByteArray user_account_id) : account_id_(user_account_id) { - dbconn = QSqlDatabase::addDatabase("QSQLITE"); + dbconn = QSqlDatabase::database(); dbconn.setDatabaseName(storage); if (!dbconn.open()) diff --git a/pica-client/history.cpp b/pica-client/history.cpp index 933e2a9..77afe1b 100644 --- a/pica-client/history.cpp +++ b/pica-client/history.cpp @@ -4,7 +4,7 @@ History::History(QString storage, QByteArray my_id) : me_(my_id) { - dbconn = QSqlDatabase::addDatabase("QSQLITE"); + dbconn = QSqlDatabase::database(); dbconn.setDatabaseName(storage); if (!dbconn.open()) diff --git a/pica-client/main.cpp b/pica-client/main.cpp index cadc6d5..90e093a 100644 --- a/pica-client/main.cpp +++ b/pica-client/main.cpp @@ -485,6 +485,7 @@ int main(int argc, char *argv[]) { QApplication a(argc, argv); + QSqlDatabase::addDatabase("QSQLITE"); if (!create_config_dir()) return -1; #ifndef WIN32 diff --git a/pica-client/nodes.cpp b/pica-client/nodes.cpp index 93ae5e2..229cb4a 100644 --- a/pica-client/nodes.cpp +++ b/pica-client/nodes.cpp @@ -2,7 +2,7 @@ Nodes::Nodes(QString storage) { - dbconn = QSqlDatabase::addDatabase("QSQLITE"); + dbconn = QSqlDatabase::database(); dbconn.setDatabaseName(storage); if (!dbconn.open()) diff --git a/pica-client/settings.cpp b/pica-client/settings.cpp index 4651bf2..474ddf5 100644 --- a/pica-client/settings.cpp +++ b/pica-client/settings.cpp @@ -2,7 +2,7 @@ Settings::Settings(QString storage) { - dbconn = QSqlDatabase::addDatabase("QSQLITE"); + dbconn = QSqlDatabase::database(); dbconn.setDatabaseName(storage); if (!dbconn.open()) |