Omittable: better editability; drop implicit cast to bool

1 files changed, 15 insertions, 7 deletions

diff --git a/lib/util.h b/lib/util.h
index 1028e059..722a7e3d 100644
--- a/lib/util.h
+++ b/lib/util.h
@@ -108,15 +108,23 @@ namespace QMatrixClient
             }
 
             bool omitted() const { return _omitted; }
-            const value_type& value() const { Q_ASSERT(!_omitted); return _value; }
-            value_type& value() { Q_ASSERT(!_omitted); return _value; }
+            const value_type& value() const
+            {
+                Q_ASSERT(!_omitted);
+                return _value;
+            }
+            value_type& editValue()
+            {
+                _omitted = false;
+                return _value;
+            }
             value_type&& release() { _omitted = true; return std::move(_value); }
 
-            operator bool() const { return !omitted(); }
-            const value_type* operator->() const { return &_value; }
-            value_type* operator->() { return &_value; }
-            const value_type& operator*() const { return _value; }
-            value_type& operator*() { return _value; }
+            operator value_type&() & { return editValue(); }
+            const value_type* operator->() const & { return &value(); }
+            value_type* operator->() & { return &editValue(); }
+            const value_type& operator*() const & { return value(); }
+            value_type& operator*() & { return editValue(); }
 
         private:
             T _value;