From 13fe1d48fa4782dc65f974bbc1cec5e2e5e8d158 Mon Sep 17 00:00:00 2001
From: Emiel Bruijntjes <emiel.bruijntjes@copernica.com>
Date: Fri, 28 Feb 2014 15:26:52 +0100
Subject: fixed a number of todos

---
 include/class.h     | 20 +++++++++-----------
 include/classbase.h | 10 +++-------
 2 files changed, 12 insertions(+), 18 deletions(-)

(limited to 'include')

diff --git a/include/class.h b/include/class.h
index ad0e1a7..bed9fa7 100644
--- a/include/class.h
+++ b/include/class.h
@@ -39,8 +39,6 @@ public:
      *  flags are set, a regular public class will be formed.
      * 
      *  @param  name        Name of the class
-     * 
-     *  @todo   make sure flags are used
      */
     Class(const char *name) : ClassBase(name) {}
 
@@ -64,14 +62,14 @@ public:
      *  @param  flags       Optional flags
      *  @param  args        Argument descriptions
      */
-    void add(const char *name, void(T::*method)(),                   int flags = 0, const Arguments &args = {}) { ClassBase::add(name, static_cast<method_callback_0>(method), flags, args); }
-    void add(const char *name, void(T::*method)(Parameters &params), int flags = 0, const Arguments &args = {}) { ClassBase::add(name, static_cast<method_callback_1>(method), flags, args); }
-    void add(const char *name, bool(T::*method)(),                   int flags = 0, const Arguments &args = {}) { ClassBase::add(name, static_cast<method_callback_2>(method), flags, args); }
-    void add(const char *name, bool(T::*method)(Parameters &params), int flags = 0, const Arguments &args = {}) { ClassBase::add(name, static_cast<method_callback_3>(method), flags, args); }
-    void add(const char *name, void(T::*method)(),                                  const Arguments &args = {}) { ClassBase::add(name, static_cast<method_callback_0>(method), 0,     args); }
-    void add(const char *name, void(T::*method)(Parameters &params),                const Arguments &args = {}) { ClassBase::add(name, static_cast<method_callback_1>(method), 0,     args); }
-    void add(const char *name, bool(T::*method)(),                                  const Arguments &args = {}) { ClassBase::add(name, static_cast<method_callback_2>(method), 0,     args); }
-    void add(const char *name, bool(T::*method)(Parameters &params),                const Arguments &args = {}) { ClassBase::add(name, static_cast<method_callback_3>(method), 0,     args); }
+    void add(const char *name, void(T::*method)(),                   int flags = Public, const Arguments &args = {}) { ClassBase::add(name, static_cast<method_callback_0>(method), flags,  args); }
+    void add(const char *name, void(T::*method)(Parameters &params), int flags = Public, const Arguments &args = {}) { ClassBase::add(name, static_cast<method_callback_1>(method), flags,  args); }
+    void add(const char *name, bool(T::*method)(),                   int flags = Public, const Arguments &args = {}) { ClassBase::add(name, static_cast<method_callback_2>(method), flags,  args); }
+    void add(const char *name, bool(T::*method)(Parameters &params), int flags = Public, const Arguments &args = {}) { ClassBase::add(name, static_cast<method_callback_3>(method), flags,  args); }
+    void add(const char *name, void(T::*method)(),                                       const Arguments &args = {}) { ClassBase::add(name, static_cast<method_callback_0>(method), Public, args); }
+    void add(const char *name, void(T::*method)(Parameters &params),                     const Arguments &args = {}) { ClassBase::add(name, static_cast<method_callback_1>(method), Public, args); }
+    void add(const char *name, bool(T::*method)(),                                       const Arguments &args = {}) { ClassBase::add(name, static_cast<method_callback_2>(method), Public, args); }
+    void add(const char *name, bool(T::*method)(Parameters &params),                     const Arguments &args = {}) { ClassBase::add(name, static_cast<method_callback_3>(method), Public, args); }
 
     /**
      *  Add a property to the class
@@ -87,7 +85,7 @@ public:
      *  @param  flags       Optional flags
      */
     template <typename TYPE>
-    void add(const char *name, const Type &value, int flags = Php::Public) { ClassBase::add(name, value, flags); }
+    void add(const char *name, const Type &value, int flags = Public) { ClassBase::add(name, value, flags); }
      
 protected:
     /**
diff --git a/include/classbase.h b/include/classbase.h
index 8b6d3dd..9fe1bda 100644
--- a/include/classbase.h
+++ b/include/classbase.h
@@ -50,22 +50,18 @@ public:
     /**
      *  Copy constructor
      *  @param  that
-     * 
-     *  @todo   add properties
+     *
      *  @todo   prefer move
      */
     ClassBase(const ClassBase &that) : 
-        _name(that._name), _flags(that._flags), _methods(that._methods) {}
+        _name(that._name), _flags(that._flags), _methods(that._methods), _members(that._members) {}
 
     /**
      *  Move constructor
      *  @param  that
-     * 
-     *  @todo   add properties
-     *  @todo   use move semantics
      */
     ClassBase(ClassBase &&that) :
-        _flags(that._flags), _methods(std::move(that._methods)), _entry(that._entry) 
+        _flags(that._flags), _methods(std::move(that._methods)), _methods(std::move(that._methods)), _entry(that._entry) 
     {
         // other entry are invalid now (not that it is used..., class objects are
         // only moved during extension setup, when the entry pointer has not yet
-- 
cgit v1.2.3