--- a/src/core/reference-list.h Tue Sep 05 12:54:53 2006 +0200
+++ b/src/core/reference-list.h Tue Sep 05 13:13:39 2006 +0200
@@ -52,7 +52,7 @@
{
m_prev = this;
m_next = this;
- insert_self_in_other (o);
+ insertSelfInOther (o);
}
ReferenceList (ReferenceList const&o)
: m_objPtr (),
@@ -61,10 +61,10 @@
{
m_prev = this;
m_next = this;
- insert_self_in_other (o);
+ insertSelfInOther (o);
}
- ReferenceList (OBJ_PTR const &obj_ptr)
- : m_objPtr (obj_ptr),
+ ReferenceList (OBJ_PTR const &objPtr)
+ : m_objPtr (objPtr),
m_prev (),
m_next ()
{
@@ -72,33 +72,33 @@
m_next = this;
}
~ReferenceList () {
- remove_from_list ();
+ removeFrom_list ();
}
ReferenceList & operator= (ReferenceList const&o) {
- remove_from_list ();
- insert_self_in_other (o);
+ removeFrom_list ();
+ insertSelfInOther (o);
return *this;
}
OBJ_PTR operator-> () {
return m_objPtr;
}
- void set (OBJ_PTR obj_ptr) {
- remove_from_list ();
- m_objPtr = obj_ptr;
+ void set (OBJ_PTR objPtr) {
+ removeFrom_list ();
+ m_objPtr = objPtr;
}
OBJ_PTR get (void) {
// explicit conversion to raw pointer type.
return m_objPtr;
}
private:
- void insert_self_in_other (ReferenceList const&o) {
+ void insertSelfInOther (ReferenceList const&o) {
m_prev = &o;
m_next = o.m_next;
m_next->m_prev = this;
o.m_next = this;
m_objPtr = o.m_objPtr;
}
- void remove_from_list (void) {
+ void removeFrom_list (void) {
if (m_prev == this) {
//assert (m_next == this);
delete m_objPtr;