Index: lemon/bits/alteration_notifier.h
===================================================================
--- lemon/bits/alteration_notifier.h	(revision 2305)
+++ lemon/bits/alteration_notifier.h	(revision 2384)
@@ -144,11 +144,11 @@
       /// Default constructor for ObserverBase.
       /// 
-      ObserverBase() : notifier(0) {}
+      ObserverBase() : _notifier(0) {}
 
       /// \brief Constructor which attach the observer into notifier.
       ///
       /// Constructor which attach the observer into notifier.
-      ObserverBase(AlterationNotifier& _notifier) {
-        attach(_notifier);
+      ObserverBase(AlterationNotifier& notifier) {
+        attach(notifier);
       }
 
@@ -159,5 +159,5 @@
       ObserverBase(const ObserverBase& copy) {
 	if (copy.attached()) {
-          attach(*copy.getNotifier());
+          attach(*copy._notifier());
 	}
       }
@@ -174,6 +174,6 @@
       /// This member attaches the observer into an AlterationNotifier.
       ///
-      void attach(AlterationNotifier& _notifier) {
-	_notifier.attach(*this);
+      void attach(AlterationNotifier& notifier) {
+	notifier.attach(*this);
       }
       
@@ -183,5 +183,5 @@
       ///
       void detach() {
-        notifier->detach(*this);
+        _notifier->detach(*this);
       }
       
@@ -192,8 +192,8 @@
       /// attached into.
       ///
-      Notifier* getNotifier() const { return const_cast<Notifier*>(notifier); }
+      Notifier* notifier() const { return const_cast<Notifier*>(_notifier); }
       
       /// Gives back true when the observer is attached into a notifier.
-      bool attached() const { return notifier != 0; }
+      bool attached() const { return _notifier != 0; }
 
     private:
@@ -203,6 +203,6 @@
     protected:
       
-      Notifier* notifier;
-      typename std::list<ObserverBase*>::iterator index;
+      Notifier* _notifier;
+      typename std::list<ObserverBase*>::iterator _index;
 
       /// \brief The member function to notificate the observer about an
@@ -262,5 +262,5 @@
 
     typedef std::list<ObserverBase*> Observers; 
-    Observers observers;
+    Observers _observers;
 
 		
@@ -294,6 +294,6 @@
     ~AlterationNotifier() {
       typename Observers::iterator it;
-      for (it = observers.begin(); it != observers.end(); ++it) {
-	(*it)->notifier = 0;
+      for (it = _observers.begin(); it != _observers.end(); ++it) {
+	(*it)->_notifier = 0;
       }
     }
@@ -347,12 +347,12 @@
 
     void attach(ObserverBase& observer) {
-      observer.index = observers.insert(observers.begin(), &observer);
-      observer.notifier = this;
+      observer._index = _observers.insert(_observers.begin(), &observer);
+      observer._notifier = this;
     } 
 
     void detach(ObserverBase& observer) {
-      observers.erase(observer.index);
-      observer.index = observers.end();
-      observer.notifier = 0;
+      _observers.erase(observer._index);
+      observer._index = _observers.end();
+      observer._notifier = 0;
     }
 
@@ -368,10 +368,10 @@
       typename Observers::reverse_iterator it;
       try {
-        for (it = observers.rbegin(); it != observers.rend(); ++it) {
+        for (it = _observers.rbegin(); it != _observers.rend(); ++it) {
           (*it)->add(item);
         }
       } catch (...) {
         typename Observers::iterator jt;
-        for (jt = it.base(); jt != observers.end(); ++jt) {
+        for (jt = it.base(); jt != _observers.end(); ++jt) {
           (*jt)->erase(item);
         }
@@ -389,10 +389,10 @@
       typename Observers::reverse_iterator it;
       try {
-        for (it = observers.rbegin(); it != observers.rend(); ++it) {
+        for (it = _observers.rbegin(); it != _observers.rend(); ++it) {
           (*it)->add(items);
         }
       } catch (...) {
         typename Observers::iterator jt;
-        for (jt = it.base(); jt != observers.end(); ++jt) {
+        for (jt = it.base(); jt != _observers.end(); ++jt) {
           (*jt)->erase(items);
         }
@@ -408,13 +408,13 @@
     /// 
     void erase(const Item& item) throw() {
-      typename Observers::iterator it = observers.begin();
-      while (it != observers.end()) {
+      typename Observers::iterator it = _observers.begin();
+      while (it != _observers.end()) {
         try {
           (*it)->erase(item);
           ++it;
         } catch (const ImmediateDetach&) {
-          it = observers.erase(it);
-          (*it)->index = observers.end();
-          (*it)->notifier = 0;
+          it = _observers.erase(it);
+          (*it)->_index = _observers.end();
+          (*it)->_notifier = 0;
         }
       }
@@ -428,13 +428,13 @@
     /// 
     void erase(const std::vector<Item>& items) {
-      typename Observers::iterator it = observers.begin();
-      while (it != observers.end()) {
+      typename Observers::iterator it = _observers.begin();
+      while (it != _observers.end()) {
         try {
           (*it)->erase(items);
           ++it;
         } catch (const ImmediateDetach&) {
-          it = observers.erase(it);
-          (*it)->index = observers.end();
-          (*it)->notifier = 0;
+          it = _observers.erase(it);
+          (*it)->_index = _observers.end();
+          (*it)->_notifier = 0;
         }
       }
@@ -449,10 +449,10 @@
       typename Observers::reverse_iterator it;
       try {
-        for (it = observers.rbegin(); it != observers.rend(); ++it) {
+        for (it = _observers.rbegin(); it != _observers.rend(); ++it) {
           (*it)->build();
         }
       } catch (...) {
         typename Observers::iterator jt;
-        for (jt = it.base(); jt != observers.end(); ++jt) {
+        for (jt = it.base(); jt != _observers.end(); ++jt) {
           (*jt)->clear();
         }
@@ -467,13 +467,13 @@
     /// from the container.
     void clear() {
-      typename Observers::iterator it = observers.begin();
-      while (it != observers.end()) {
+      typename Observers::iterator it = _observers.begin();
+      while (it != _observers.end()) {
         try {
           (*it)->clear();
           ++it;
         } catch (const ImmediateDetach&) {
-          it = observers.erase(it);
-          (*it)->index = observers.end();
-          (*it)->notifier = 0;
+          it = _observers.erase(it);
+          (*it)->_index = _observers.end();
+          (*it)->_notifier = 0;
         }
       }
