read takes an error handler rather than returns a bool

1 files changed, 19 insertions, 3 deletions

diff --git a/common/storage.h b/common/storage.h
index 846e15b..e5e592c 100644
--- a/common/storage.h
+++ b/common/storage.h
@@ -7,6 +7,16 @@ class Storage {
 public:
     enum AccessMode { ReadOnly, ReadWrite };
 
+    class Error
+    {
+    public:
+        Error(const std::string &s, int c, const std::string &m)
+            : store(s), message(m), code(c) {}
+        std::string store;
+        std::string message;
+        int code;
+    };
+
     Storage(const QString &storageRoot, const QString &name, AccessMode mode = ReadOnly);
     ~Storage();
     bool isInTransaction() const;
@@ -15,9 +25,15 @@ public:
     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)> &);
+    void read(const std::string &sKey,
+              const std::function<bool(const std::string &value)> &resultHandler);
+    void read(const std::string &sKey,
+              const std::function<bool(const std::string &value)> &resultHandler,
+              const std::function<void(const Storage::Error &error)> &errors);
+    void read(const std::string &sKey, const std::function<bool(void *ptr, int size)> &resultHandler);
+    void read(const std::string &sKey,
+              const std::function<bool(void *ptr, int size)> & resultHandler,
+              const std::function<void(const Storage::Error &error)> &errorHandler);
 
     qint64 diskUsage() const;
     void removeFromDisk() const;