Changeset 266 for trunk/src/object.cc

Timestamp:

06/19/14 03:49:49 (11 years ago)

Author:

epyon

Message:

• decoupling - uid_store independent of nv::object
• decoupling - nv::object no longer linked with lua in any way
• decoupling - gui::element related object methods moved to element
• uid_store can operate on void* or specialized base class
• root class no longer carries uid store nor lua state (will be removed later)

File:

• trunk/src/object.cc (modified) (3 diffs)

trunk/src/object.cc

@@ -8 +8 @@
 
 #include <algorithm>
-#include "nv/types.hh"
-#include "nv/lua/lua_state.hh"
-#include "nv/uid.hh"
 
 using namespace nv;
@@ -18 +15 @@
         , m_name()
         , m_uid(0)
-        , m_lua_index(lua::ref::none)
-        , m_lua_proto_index(lua::ref::none)
         , m_parent( nullptr )
         , m_children()
@@ -124 +119 @@
 }
 
-bool object::move_to_top( object* child )
-{
-        list::iterator it = std::find( m_children.begin(), m_children.end(), child );
-        if ( it != m_children.end() )
-        {
-                m_children.erase( it );
-                m_children.push_back( child );
-                return true;
-        }       
-        return false;
-}
-
-bool object::move_to_bottom( object* child )
-{
-        list::iterator it = std::find( m_children.begin(), m_children.end(), child );
-        if ( it != m_children.end() )
-        {
-                m_children.erase( it );
-                m_children.push_front( child );
-                return true;
-        }       
-        return false;
-}
 
 // void object::register_type( type_database* db )