From ab9cb939cfa865804ad354a15099192fe5f64b9f Mon Sep 17 00:00:00 2001 From: fluxgen Date: Sat, 15 Feb 2003 01:20:06 +0000 Subject: moved to FbTk --- src/Observer.cc | 33 ------------------------ src/Observer.hh | 39 ---------------------------- src/Subject.cc | 80 --------------------------------------------------------- src/Subject.hh | 54 -------------------------------------- 4 files changed, 206 deletions(-) delete mode 100644 src/Observer.cc delete mode 100644 src/Observer.hh delete mode 100644 src/Subject.cc delete mode 100644 src/Subject.hh diff --git a/src/Observer.cc b/src/Observer.cc deleted file mode 100644 index c03fba4..0000000 --- a/src/Observer.cc +++ /dev/null @@ -1,33 +0,0 @@ -// Observer.cc for FbTk -// Copyright (c) 2002 Henrik Kinnunen (fluxgen@fluxbox.org) -// -// Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the "Software"), -// to deal in the Software without restriction, including without limitation -// the rights to use, copy, modify, merge, publish, distribute, sublicense, -// and/or sell copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. - -// $Id: Observer.cc,v 1.2 2002/12/01 13:41:58 rathnor Exp $ - -#include "Observer.hh" -#include "Subject.hh" - -namespace FbTk { - -Observer::~Observer() { - Subject::removeObserver(this); // make sure no subject has this observer attached -} - -}; diff --git a/src/Observer.hh b/src/Observer.hh deleted file mode 100644 index 1e9c6a7..0000000 --- a/src/Observer.hh +++ /dev/null @@ -1,39 +0,0 @@ -// Observer.hh for FbTk -// Copyright (c) 2002 Henrik Kinnunen (fluxgen@fluxbox.org) -// -// Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the "Software"), -// to deal in the Software without restriction, including without limitation -// the rights to use, copy, modify, merge, publish, distribute, sublicense, -// and/or sell copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. - -// $Id: Observer.hh,v 1.2 2002/12/01 13:41:58 rathnor Exp $ - -#ifndef FBTK_OBSERVER_HH -#define FBTK_OBSERVER_HH - -namespace FbTk { - -class Subject; - -class Observer { -public: - virtual ~Observer(); - virtual void update(Subject *changedSubj) = 0; -}; - -}; // end namespace FBTK - -#endif // FBTK_OBSERVER_HH diff --git a/src/Subject.cc b/src/Subject.cc deleted file mode 100644 index 3811255..0000000 --- a/src/Subject.cc +++ /dev/null @@ -1,80 +0,0 @@ -// Subject.cc for FbTk -// Copyright (c) 2002 Henrik Kinnunen (fluxgen@fluxbox.org) -// -// Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the "Software"), -// to deal in the Software without restriction, including without limitation -// the rights to use, copy, modify, merge, publish, distribute, sublicense, -// and/or sell copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. - -// $Id: Subject.cc,v 1.2 2002/12/01 13:41:59 rathnor Exp $ - -#include "Subject.hh" -#include "Observer.hh" - -#include -#include - -namespace FbTk { - -Subject::SubjectList Subject::s_subjectlist; - -Subject::Subject() { - s_subjectlist.push_back(this); -} - -Subject::~Subject() { - SubjectList::iterator it = s_subjectlist.begin(); - SubjectList::iterator it_end = s_subjectlist.end(); - for (; it != it_end; ++it) { - if (this == (*it)) { - s_subjectlist.erase(it); - break; - } - } -} - -void Subject::attach(Observer *obj) { - m_observerlist.push_back(obj); - // no need to have more than one instance of an observer - std::unique(m_observerlist.begin(), m_observerlist.end()); -} - -void Subject::detach(Observer *obj) { - ObserverList::iterator it = m_observerlist.begin(); - ObserverList::iterator it_end = m_observerlist.end(); - for (; it != it_end; ++it) { - if (obj == (*it)) { - m_observerlist.erase(it); - break; - } - } -} - -void Subject::notify() { - ObserverList::iterator it = m_observerlist.begin(); - for (; it != m_observerlist.end(); ++it) { - (*it)->update(this); - } -} - -void Subject::removeObserver(Observer *obj) { - SubjectList::iterator it = s_subjectlist.begin(); - for(; it != s_subjectlist.end(); ++it) { - (*it)->detach(obj); - } -} - -}; // end namespace FbTk diff --git a/src/Subject.hh b/src/Subject.hh deleted file mode 100644 index 08ad15c..0000000 --- a/src/Subject.hh +++ /dev/null @@ -1,54 +0,0 @@ -// Subject.hh for FbTk -// Copyright (c) 2002 Henrik Kinnunen (fluxgen@fluxbox.org) -// -// Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the "Software"), -// to deal in the Software without restriction, including without limitation -// the rights to use, copy, modify, merge, publish, distribute, sublicense, -// and/or sell copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. - -// $Id: Subject.hh,v 1.2 2002/12/01 13:42:00 rathnor Exp $ - -#ifndef FBTK_SUBJECT_HH -#define FBTK_SUBJECT_HH - -#include - -namespace FbTk { - -class Observer; - -class Subject { -public: - Subject(); - virtual ~Subject(); - /// attach an observer - void attach(Observer *obs); - /// detach an observer - void detach(Observer *obs); - /// notify all attached observers - void notify(); - static void removeObserver(Observer *obs); -private: - typedef std::vector ObserverList; - ObserverList m_observerlist; - - typedef std::vector SubjectList; - static SubjectList s_subjectlist; -}; - -}; // end namespace FbTk - -#endif // FBTK_SUBJECT_HH -- cgit v0.11.2