Merge branch 'kyoto'

Conflicts:
	common/storage.h
	common/storage_lmdb.cpp
	dummyresource/facade.cpp
	store/test/CMakeLists.txt
	tests/storagebenchmark.cpp

1 files changed, 0 insertions, 28 deletions

diff --git a/store/database.h b/store/database.h
deleted file mode 100644
index 1cede39..0000000
--- a/store/database.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#pragma once
-
-#include <string>
-#include <QString>
-
-class Database {
-public:
-    enum TransactionType { ReadOnly, ReadWrite };
-
-    Database(const QString &storageRoot, const QString &name);
-    ~Database();
-    bool isInTransaction() const;
-    bool startTransaction(TransactionType type = ReadWrite);
-    bool commitTransaction();
-    void abortTransaction();
-    bool write(const char *key, size_t keySize, const char *value, size_t valueSize);
-    bool write(const std::string &sKey, const std::string &sValue);
-    //Perhaps prefer iterators (assuming we need to be able to match multiple values
-    bool read(const std::string &sKey, const std::function<void(const std::string &value)> &);
-    bool read(const std::string &sKey, const std::function<void(void *ptr, int size)> &);
-
-    qint64 diskUsage() const;
-    void removeFromDisk() const;
-private:
-    class Private;
-    Private * const d;
-};
-