diff --git a/sflphone-common/src/Makefile.am b/sflphone-common/src/Makefile.am index 551786ad48f53329842f8eef1f963ab9e09b2012..cd1365389762863e8c6ee3da0935eff98e2417f1 100644 --- a/sflphone-common/src/Makefile.am +++ b/sflphone-common/src/Makefile.am @@ -15,7 +15,6 @@ sflphoned_SOURCES = \ preferences.cpp \ managerimpl.cpp \ managerimpl_registration.cpp \ - observer.cpp \ eventthread.cpp \ accountcreator.cpp \ call.cpp \ @@ -54,7 +53,6 @@ noinst_HEADERS = \ managerimpl.h \ manager.h \ global.h \ - observer.h \ eventthread.h \ user_cfg.h \ account.h \ diff --git a/sflphone-common/src/managerimpl.h b/sflphone-common/src/managerimpl.h index 460f92f8c723286850166267ab00d4fa19d23427..6d8b679a4a6213efbf68f464c77df628bb45594d 100644 --- a/sflphone-common/src/managerimpl.h +++ b/sflphone-common/src/managerimpl.h @@ -42,7 +42,6 @@ #include <cc++/thread.h> #include "dbus/dbusmanager.h" -#include "observer.h" #include "config/config.h" #include "account.h" diff --git a/sflphone-common/src/observer.cpp b/sflphone-common/src/observer.cpp deleted file mode 100644 index a5f14136cb5ccedad0d74219e809bb60eea3bc4c..0000000000000000000000000000000000000000 --- a/sflphone-common/src/observer.cpp +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010, 2011 Savoir-Faire Linux Inc. - * Author: Yan Morin <yan.morin@savoirfairelinux.com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * Additional permission under GNU GPL version 3 section 7: - * - * If you modify this program, or any covered work, by linking or - * combining it with the OpenSSL project's OpenSSL library (or a - * modified version of that library), containing parts covered by the - * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc. - * grants you additional permission to convey the resulting work. - * Corresponding Source for a non-source form of such a combination - * shall include the source code for the parts of OpenSSL used as well - * as that of the covered work. - */ - -#include "observer.h" -#include <algorithm> - -namespace Pattern -{ - -void -Subject::attach (Observer& observer) -{ - if (std::find (_observers.begin(), _observers.end(), &observer) == _observers.end()) { - _observers.push_back (&observer); - } -} - -void -Subject::detach (Observer& observer) -{ - std::list<Observer*>::iterator iter = std::find (_observers.begin(), _observers.end(), &observer); - - if (iter != _observers.end()) { - _observers.erase (iter); - } -} - -void -Subject::notify() -{ - std::list<Observer*>::iterator iter = _observers.begin(); - - while (iter != _observers.end()) { - if (*iter) { - (*iter)->update(); - } - - iter++; - } -} - -} // end of namespace diff --git a/sflphone-common/src/observer.h b/sflphone-common/src/observer.h deleted file mode 100644 index ea5ae8cfeda7fe8a0dc0e0756540e13540652409..0000000000000000000000000000000000000000 --- a/sflphone-common/src/observer.h +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010, 2011 Savoir-Faire Linux Inc. - * Author: Yan Morin <yan.morin@savoirfairelinux.com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * Additional permission under GNU GPL version 3 section 7: - * - * If you modify this program, or any covered work, by linking or - * combining it with the OpenSSL project's OpenSSL library (or a - * modified version of that library), containing parts covered by the - * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc. - * grants you additional permission to convey the resulting work. - * Corresponding Source for a non-source form of such a combination - * shall include the source code for the parts of OpenSSL used as well - * as that of the covered work. - */ - -#ifndef __PATTERN_OBSERVER_H_ -#define __PATTERN_OBSERVER_H_ - -#include <list> - -/** - * Observer design pattern interface - */ -namespace Pattern -{ - -/** - * Observer interface - */ -class Observer -{ - public: - virtual ~Observer() {}; - virtual void update() = 0; -}; - -class Subject -{ - public: - virtual ~Subject() {}; - void attach (Observer& observer); - void detach (Observer& observer); - void notify(); - - private: - std::list<Observer*> _observers; -}; - -} // end namespace - -#endif // __PATTERN_OBSERVER_H_