[Pkg-owncloud-commits] [owncloud-client] 193/211: SqlDatabase: Make it non-copyable.

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 5640cbf65374752d8b1fe3d61942092ad44bbc07
Author: Christian Kamm <kamm at incasoftware.de>
Date:   Thu Oct 23 15:34:07 2014 +0200

    SqlDatabase: Make it non-copyable.
---
 src/mirall/ownsql.cpp        | 4 ++--
 src/mirall/ownsql.h          | 5 +++--
 src/mirall/syncjournaldb.cpp | 1 -
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/mirall/ownsql.cpp b/src/mirall/ownsql.cpp
index 567c310..da9d521 100644
--- a/src/mirall/ownsql.cpp
+++ b/src/mirall/ownsql.cpp
@@ -99,7 +99,7 @@ sqlite3* SqlDatabase::sqliteDb()
 
 /* =========================================================================================== */
 
-SqlQuery::SqlQuery( SqlDatabase db )
+SqlQuery::SqlQuery( SqlDatabase& db )
     :_db(db.sqliteDb()),
       _stmt(0)
 {
@@ -113,7 +113,7 @@ SqlQuery::~SqlQuery()
     }
 }
 
-SqlQuery::SqlQuery(const QString& sql, SqlDatabase db)
+SqlQuery::SqlQuery(const QString& sql, SqlDatabase& db)
     :_db(db.sqliteDb()),
       _stmt(0)
 {
diff --git a/src/mirall/ownsql.h b/src/mirall/ownsql.h
index 31864c1..055be33 100644
--- a/src/mirall/ownsql.h
+++ b/src/mirall/ownsql.h
@@ -25,6 +25,7 @@ namespace Mirall {
 
 class OWNCLOUDSYNC_EXPORT SqlDatabase
 {
+    Q_DISABLE_COPY(SqlDatabase)
 public:
     explicit SqlDatabase();
 
@@ -48,8 +49,8 @@ class OWNCLOUDSYNC_EXPORT SqlQuery
     Q_DISABLE_COPY(SqlQuery)
 public:
     explicit SqlQuery();
-    explicit SqlQuery(SqlDatabase db);
-    explicit SqlQuery(const QString& sql, SqlDatabase db);
+    explicit SqlQuery(SqlDatabase& db);
+    explicit SqlQuery(const QString& sql, SqlDatabase& db);
 
     ~SqlQuery();
     QString error() const;
diff --git a/src/mirall/syncjournaldb.cpp b/src/mirall/syncjournaldb.cpp
index 51b0f11..bd08565 100644
--- a/src/mirall/syncjournaldb.cpp
+++ b/src/mirall/syncjournaldb.cpp
@@ -359,7 +359,6 @@ void SyncJournalDb::close()
     _possibleUpgradeFromMirall_1_5 = false;
 
     _db.close();
-    _db = SqlDatabase(); // avoid the warning SqlDatabasePrivate::removeDatabase: connection [...] still in use
     _avoidReadFromDbOnNextSyncFilter.clear();
 }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git