1.1 --- a/lemon/bits/alteration_notifier.h Thu Mar 01 16:50:12 2007 +0000
1.2 +++ b/lemon/bits/alteration_notifier.h Thu Mar 01 17:14:24 2007 +0000
1.3 @@ -143,13 +143,13 @@
1.4 ///
1.5 /// Default constructor for ObserverBase.
1.6 ///
1.7 - ObserverBase() : notifier(0) {}
1.8 + ObserverBase() : _notifier(0) {}
1.9
1.10 /// \brief Constructor which attach the observer into notifier.
1.11 ///
1.12 /// Constructor which attach the observer into notifier.
1.13 - ObserverBase(AlterationNotifier& _notifier) {
1.14 - attach(_notifier);
1.15 + ObserverBase(AlterationNotifier& notifier) {
1.16 + attach(notifier);
1.17 }
1.18
1.19 /// \brief Constructor which attach the obserever to the same notifier.
1.20 @@ -158,7 +158,7 @@
1.21 /// the other observer is attached to.
1.22 ObserverBase(const ObserverBase& copy) {
1.23 if (copy.attached()) {
1.24 - attach(*copy.getNotifier());
1.25 + attach(*copy._notifier());
1.26 }
1.27 }
1.28
1.29 @@ -173,8 +173,8 @@
1.30 ///
1.31 /// This member attaches the observer into an AlterationNotifier.
1.32 ///
1.33 - void attach(AlterationNotifier& _notifier) {
1.34 - _notifier.attach(*this);
1.35 + void attach(AlterationNotifier& notifier) {
1.36 + notifier.attach(*this);
1.37 }
1.38
1.39 /// \brief Detaches the observer into an AlterationNotifier.
1.40 @@ -182,7 +182,7 @@
1.41 /// This member detaches the observer from an AlterationNotifier.
1.42 ///
1.43 void detach() {
1.44 - notifier->detach(*this);
1.45 + _notifier->detach(*this);
1.46 }
1.47
1.48 /// \brief Gives back a pointer to the notifier which the map
1.49 @@ -191,10 +191,10 @@
1.50 /// This function gives back a pointer to the notifier which the map
1.51 /// attached into.
1.52 ///
1.53 - Notifier* getNotifier() const { return const_cast<Notifier*>(notifier); }
1.54 + Notifier* notifier() const { return const_cast<Notifier*>(_notifier); }
1.55
1.56 /// Gives back true when the observer is attached into a notifier.
1.57 - bool attached() const { return notifier != 0; }
1.58 + bool attached() const { return _notifier != 0; }
1.59
1.60 private:
1.61
1.62 @@ -202,8 +202,8 @@
1.63
1.64 protected:
1.65
1.66 - Notifier* notifier;
1.67 - typename std::list<ObserverBase*>::iterator index;
1.68 + Notifier* _notifier;
1.69 + typename std::list<ObserverBase*>::iterator _index;
1.70
1.71 /// \brief The member function to notificate the observer about an
1.72 /// item is added to the container.
1.73 @@ -261,7 +261,7 @@
1.74 const Container* container;
1.75
1.76 typedef std::list<ObserverBase*> Observers;
1.77 - Observers observers;
1.78 + Observers _observers;
1.79
1.80
1.81 public:
1.82 @@ -293,8 +293,8 @@
1.83 ///
1.84 ~AlterationNotifier() {
1.85 typename Observers::iterator it;
1.86 - for (it = observers.begin(); it != observers.end(); ++it) {
1.87 - (*it)->notifier = 0;
1.88 + for (it = _observers.begin(); it != _observers.end(); ++it) {
1.89 + (*it)->_notifier = 0;
1.90 }
1.91 }
1.92
1.93 @@ -346,14 +346,14 @@
1.94 protected:
1.95
1.96 void attach(ObserverBase& observer) {
1.97 - observer.index = observers.insert(observers.begin(), &observer);
1.98 - observer.notifier = this;
1.99 + observer._index = _observers.insert(_observers.begin(), &observer);
1.100 + observer._notifier = this;
1.101 }
1.102
1.103 void detach(ObserverBase& observer) {
1.104 - observers.erase(observer.index);
1.105 - observer.index = observers.end();
1.106 - observer.notifier = 0;
1.107 + _observers.erase(observer._index);
1.108 + observer._index = _observers.end();
1.109 + observer._notifier = 0;
1.110 }
1.111
1.112 public:
1.113 @@ -367,12 +367,12 @@
1.114 void add(const Item& item) {
1.115 typename Observers::reverse_iterator it;
1.116 try {
1.117 - for (it = observers.rbegin(); it != observers.rend(); ++it) {
1.118 + for (it = _observers.rbegin(); it != _observers.rend(); ++it) {
1.119 (*it)->add(item);
1.120 }
1.121 } catch (...) {
1.122 typename Observers::iterator jt;
1.123 - for (jt = it.base(); jt != observers.end(); ++jt) {
1.124 + for (jt = it.base(); jt != _observers.end(); ++jt) {
1.125 (*jt)->erase(item);
1.126 }
1.127 throw;
1.128 @@ -388,12 +388,12 @@
1.129 void add(const std::vector<Item>& items) {
1.130 typename Observers::reverse_iterator it;
1.131 try {
1.132 - for (it = observers.rbegin(); it != observers.rend(); ++it) {
1.133 + for (it = _observers.rbegin(); it != _observers.rend(); ++it) {
1.134 (*it)->add(items);
1.135 }
1.136 } catch (...) {
1.137 typename Observers::iterator jt;
1.138 - for (jt = it.base(); jt != observers.end(); ++jt) {
1.139 + for (jt = it.base(); jt != _observers.end(); ++jt) {
1.140 (*jt)->erase(items);
1.141 }
1.142 throw;
1.143 @@ -407,15 +407,15 @@
1.144 /// the container.
1.145 ///
1.146 void erase(const Item& item) throw() {
1.147 - typename Observers::iterator it = observers.begin();
1.148 - while (it != observers.end()) {
1.149 + typename Observers::iterator it = _observers.begin();
1.150 + while (it != _observers.end()) {
1.151 try {
1.152 (*it)->erase(item);
1.153 ++it;
1.154 } catch (const ImmediateDetach&) {
1.155 - it = observers.erase(it);
1.156 - (*it)->index = observers.end();
1.157 - (*it)->notifier = 0;
1.158 + it = _observers.erase(it);
1.159 + (*it)->_index = _observers.end();
1.160 + (*it)->_notifier = 0;
1.161 }
1.162 }
1.163 }
1.164 @@ -427,15 +427,15 @@
1.165 /// the container.
1.166 ///
1.167 void erase(const std::vector<Item>& items) {
1.168 - typename Observers::iterator it = observers.begin();
1.169 - while (it != observers.end()) {
1.170 + typename Observers::iterator it = _observers.begin();
1.171 + while (it != _observers.end()) {
1.172 try {
1.173 (*it)->erase(items);
1.174 ++it;
1.175 } catch (const ImmediateDetach&) {
1.176 - it = observers.erase(it);
1.177 - (*it)->index = observers.end();
1.178 - (*it)->notifier = 0;
1.179 + it = _observers.erase(it);
1.180 + (*it)->_index = _observers.end();
1.181 + (*it)->_notifier = 0;
1.182 }
1.183 }
1.184 }
1.185 @@ -448,12 +448,12 @@
1.186 void build() {
1.187 typename Observers::reverse_iterator it;
1.188 try {
1.189 - for (it = observers.rbegin(); it != observers.rend(); ++it) {
1.190 + for (it = _observers.rbegin(); it != _observers.rend(); ++it) {
1.191 (*it)->build();
1.192 }
1.193 } catch (...) {
1.194 typename Observers::iterator jt;
1.195 - for (jt = it.base(); jt != observers.end(); ++jt) {
1.196 + for (jt = it.base(); jt != _observers.end(); ++jt) {
1.197 (*jt)->clear();
1.198 }
1.199 throw;
1.200 @@ -466,15 +466,15 @@
1.201 /// Notifies all the registed observers about all items are erased
1.202 /// from the container.
1.203 void clear() {
1.204 - typename Observers::iterator it = observers.begin();
1.205 - while (it != observers.end()) {
1.206 + typename Observers::iterator it = _observers.begin();
1.207 + while (it != _observers.end()) {
1.208 try {
1.209 (*it)->clear();
1.210 ++it;
1.211 } catch (const ImmediateDetach&) {
1.212 - it = observers.erase(it);
1.213 - (*it)->index = observers.end();
1.214 - (*it)->notifier = 0;
1.215 + it = _observers.erase(it);
1.216 + (*it)->_index = _observers.end();
1.217 + (*it)->_notifier = 0;
1.218 }
1.219 }
1.220 }