nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bug fix

Browse source
This commit is contained in:
fluxgen 2003-08-19 16:03:26 +00:00
parent 443874957b
commit e5ce1a6583
1 changed files with 14 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/FbTk/Subject.cc
View file

@ -1,5 +1,5 @@
// Subject.cc for FbTk // Subject.cc for FbTk
// Copyright (c) 2002 Henrik Kinnunen (fluxgen@fluxbox.org) // Copyright (c) 2002 - 2003 Henrik Kinnunen (fluxgen<at>users.sourceforge.net)
// //
// Permission is hereby granted, free of charge, to any person obtaining a // Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"), // copy of this software and associated documentation files (the "Software"),
@ -19,7 +19,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: Subject.cc,v 1.1 2003/02/15 01:21:40 fluxgen Exp $ // $Id: Subject.cc,v 1.2 2003/08/19 16:03:26 fluxgen Exp $
#include "Subject.hh" #include "Subject.hh"
#include "Observer.hh" #include "Observer.hh"
@ -36,45 +36,32 @@ Subject::Subject() {
} }
Subject::~Subject() { Subject::~Subject() {
SubjectList::iterator it = s_subjectlist.begin(); s_subjectlist.erase(std::remove(s_subjectlist.begin(),
SubjectList::iterator it_end = s_subjectlist.end(); s_subjectlist.end(), this));
for (; it != it_end; ++it) {
if (this == (*it)) {
s_subjectlist.erase(it);
break;
}
}
} }
void Subject::attach(Observer *obj) { void Subject::attach(Observer *obj) {
m_observerlist.push_back(obj); m_observerlist.push_back(obj);
// no need to have more than one instance of an observer // no need to have more than one instance of an observer
std::unique(m_observerlist.begin(), m_observerlist.end()); m_observerlist.erase(std::unique(m_observerlist.begin(), m_observerlist.end()),
m_observerlist.end());
} }
void Subject::detach(Observer *obj) { void Subject::detach(Observer *obj) {
ObserverList::iterator it = m_observerlist.begin(); m_observerlist.erase(std::remove(m_observerlist.begin(),
ObserverList::iterator it_end = m_observerlist.end(); m_observerlist.end(), obj),
for (; it != it_end; ++it) { m_observerlist.end());
if (obj == (*it)) {
m_observerlist.erase(it);
break;
}
}
} }
void Subject::notify() { void Subject::notify() {
ObserverList::iterator it = m_observerlist.begin(); std::for_each(m_observerlist.begin(), m_observerlist.end(),
for (; it != m_observerlist.end(); ++it) { std::bind2nd(std::mem_fun(&Observer::update), this));
(*it)->update(this);
}
} }
void Subject::removeObserver(Observer *obj) { void Subject::removeObserver(Observer *obj) {
SubjectList::iterator it = s_subjectlist.begin(); std::for_each(s_subjectlist.begin(), s_subjectlist.end(),
for(; it != s_subjectlist.end(); ++it) { std::bind2nd(std::mem_fun(&Subject::detach), obj));
(*it)->detach(obj);
}
} }
}; // end namespace FbTk }; // end namespace FbTk