lemon-0.x: comparison lemon/bits/alteration

equal deleted inserted replaced

-:1d8a8f01f31e
+:650f8e4038eb
 /// \brief Default constructor.
 ///
 /// 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) {
+ObserverBase(AlterationNotifier& notifier) {
-attach(_notifier);
+attach(notifier);
 }
 /// \brief Constructor which attach the obserever to the same notifier.
 ///
 /// Constructor which attach the obserever to the same notifier as
 /// the other observer is attached to.
 ObserverBase(const ObserverBase& copy) {
 	if (copy.attached()) {
-attach(*copy.getNotifier());
+attach(*copy._notifier());
 	}
 }
 /// \brief Destructor
 virtual ~ObserverBase() {
 /// \brief Attaches the observer into an AlterationNotifier.
 ///
 /// This member attaches the observer into an AlterationNotifier.
 ///
-void attach(AlterationNotifier& _notifier) {
+void attach(AlterationNotifier& notifier) {
-	_notifier.attach(*this);
+	notifier.attach(*this);
 }
 /// \brief Detaches the observer into an AlterationNotifier.
 ///
 /// This member detaches the observer from an AlterationNotifier.
 ///
 void detach() {
-notifier->detach(*this);
+_notifier->detach(*this);
 }
 /// \brief Gives back a pointer to the notifier which the map
 /// attached into.
 ///
 /// This function gives back a pointer to the notifier which the map
 /// 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:
 ObserverBase& operator=(const ObserverBase& copy);
 protected:
-Notifier* notifier;
+Notifier* _notifier;
-typename std::list<ObserverBase*>::iterator index;
+typename std::list<ObserverBase*>::iterator _index;
 /// \brief The member function to notificate the observer about an
 /// item is added to the container.
 ///
 /// The add() member function notificates the observer about an item
 protected:
 const Container* container;
 typedef std::list<ObserverBase*> Observers;
-Observers observers;
+Observers _observers;
 public:
 /// \brief Default constructor.
 ///
 /// Destructor of the AlterationNotifier.
 ///
 ~AlterationNotifier() {
 typename Observers::iterator it;
-for (it = observers.begin(); it != observers.end(); ++it) {
+for (it = _observers.begin(); it != _observers.end(); ++it) {
-	(*it)->notifier = 0;
+	(*it)->_notifier = 0;
 }
 }
 /// \brief Sets the container.
 ///
 }
 protected:
 void attach(ObserverBase& observer) {
-observer.index = observers.insert(observers.begin(), &observer);
+observer._index = _observers.insert(_observers.begin(), &observer);
-observer.notifier = this;
+observer._notifier = this;
 }
 void detach(ObserverBase& observer) {
-observers.erase(observer.index);
+_observers.erase(observer._index);
-observer.index = observers.end();
+observer._index = _observers.end();
-observer.notifier = 0;
+observer._notifier = 0;
 }
 public:
 /// \brief Notifies all the registed observers about an item added to
 /// the container.
 ///
 void add(const Item& item) {
 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);
 }
 throw;
 }
 }
 /// the container.
 ///
 void add(const std::vector<Item>& items) {
 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);
 }
 throw;
 }
 }
 ///
 /// It notifies all the registed observers about an item erased from
 /// the container.
 ///
 void erase(const Item& item) throw() {
-typename Observers::iterator it = observers.begin();
+typename Observers::iterator it = _observers.begin();
-while (it != observers.end()) {
+while (it != _observers.end()) {
 try {
 (*it)->erase(item);
 ++it;
 } catch (const ImmediateDetach&) {
-it = observers.erase(it);
+it = _observers.erase(it);
-(*it)->index = observers.end();
+(*it)->_index = _observers.end();
-(*it)->notifier = 0;
+(*it)->_notifier = 0;
 }
 }
 }
 /// \brief Notifies all the registed observers about more item erased
 ///
 /// It notifies all the registed observers about more item erased from
 /// the container.
 ///
 void erase(const std::vector<Item>& items) {
-typename Observers::iterator it = observers.begin();
+typename Observers::iterator it = _observers.begin();
-while (it != observers.end()) {
+while (it != _observers.end()) {
 try {
 (*it)->erase(items);
 ++it;
 } catch (const ImmediateDetach&) {
-it = observers.erase(it);
+it = _observers.erase(it);
-(*it)->index = observers.end();
+(*it)->_index = _observers.end();
-(*it)->notifier = 0;
+(*it)->_notifier = 0;
 }
 }
 }
 /// \brief Notifies all the registed observers about the container is
 /// Notifies all the registed observers about the container is built
 /// from an empty container.
 void build() {
 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();
 }
 throw;
 }
 }
 /// erased.
 ///
 /// Notifies all the registed observers about all items are erased
 /// from the container.
 void clear() {
-typename Observers::iterator it = observers.begin();
+typename Observers::iterator it = _observers.begin();
-while (it != observers.end()) {
+while (it != _observers.end()) {
 try {
 (*it)->clear();
 ++it;
 } catch (const ImmediateDetach&) {
-it = observers.erase(it);
+it = _observers.erase(it);
-(*it)->index = observers.end();
+(*it)->_index = _observers.end();
-(*it)->notifier = 0;
+(*it)->_notifier = 0;
 }
 }
 }
 };

changeset 2384	805c5a2a36dd
parent 2305	4a2236cc98a0
child 2386	81b47fc5c444