From 51c4e476cdde1eedb73dd1e0f0aa89e3d76292fc Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Mon, 10 Aug 2015 01:18:34 +0200 Subject: const scan and public default ctor --- common/storage.h | 4 ++-- common/storage_lmdb.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/storage.h b/common/storage.h index 77f11f9..fd35274 100644 --- a/common/storage.h +++ b/common/storage.h @@ -54,6 +54,7 @@ public: class Transaction { public: + Transaction(); ~Transaction(); bool commit(const std::function &errorHandler = std::function()); void abort(); @@ -79,7 +80,7 @@ public: */ int scan(const QByteArray &k, const std::function &resultHandler, - const std::function &errorHandler = std::function()); + const std::function &errorHandler = std::function()) const; Transaction(Transaction&& other) : d(other.d) { @@ -96,7 +97,6 @@ public: Transaction& operator=(Transaction& other); friend Storage; class Private; - Transaction(); Transaction(Private*); Private *d; }; diff --git a/common/storage_lmdb.cpp b/common/storage_lmdb.cpp index 230409f..d3c52b7 100644 --- a/common/storage_lmdb.cpp +++ b/common/storage_lmdb.cpp @@ -165,7 +165,7 @@ bool Storage::Transaction::write(const QByteArray &sKey, const QByteArray &sValu int Storage::Transaction::scan(const QByteArray &k, const std::function &resultHandler, - const std::function &errorHandler) + const std::function &errorHandler) const { if (!d || !d->transaction) { Error error(d->name.toLatin1(), ErrorCodes::NotOpen, "Not open"); -- cgit v1.2.3