X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FDispatch.hh;h=fd328fe37d733a49dba95f84176a68f279923e99;hp=bbf37f3c3cf31baad892a6a0c2eb26a520d243c1;hb=837bae9f2bf7b25e1d3d2625eeaf39c1d2f48827;hpb=e495074443d9fd7bc16137084cf9de3d031b75c4

diff --git a/src/Moof/Dispatch.hh b/src/Moof/Dispatch.hh
index bbf37f3..fd328fe 100644
--- a/src/Moof/Dispatch.hh
+++ b/src/Moof/Dispatch.hh
@@ -1,30 +1,13 @@
 
-/*******************************************************************************
-
- Copyright (c) 2009, Charles McGarvey
- All rights reserved.
- 
- Redistribution   and   use  in  source  and  binary  forms,  with  or  without
- modification, are permitted provided that the following conditions are met:
- 
-   * Redistributions  of  source  code  must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
-   * Redistributions  in binary form must reproduce the above copyright notice,
-     this  list of conditions and the following disclaimer in the documentation
-     and/or other materials provided with the distribution.
- 
- THIS  SOFTWARE  IS  PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND  ANY  EXPRESS  OR  IMPLIED  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED.  IN  NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR  ANY  DIRECT,  INDIRECT,  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES  (INCLUDING,  BUT  NOT  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES;  LOSS  OF  USE,  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED  AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR  TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
+/*]  Copyright (c) 2009-2010, Charles McGarvey  [**************************
+**]  All rights reserved.
+*
+* vi:ts=4 sw=4 tw=75
+*
+* Distributable under the terms and conditions of the 2-clause BSD license;
+* see the file COPYING for a complete text of the license.
+*
+**************************************************************************/
 
 #ifndef _MOOF_DISPATCH_HH_
 #define _MOOF_DISPATCH_HH_
@@ -108,14 +91,10 @@ public:
 
 
 	Dispatch();
-	~Dispatch();
-
-	// create and/or get a global instance
-	static Dispatch& getInstance();
 
 	Handler addHandler(const std::string& event, const Function& callback);
 	Handler addHandler(const std::string& event, const Function& callback,
-			Handler handler);
+					   Handler handler);
 
 	void dispatch(const std::string& event, const Message* message = 0);
 };
@@ -125,5 +104,3 @@ public:
 
 #endif // _MOOF_DISPATCH_HH_
 
-/** vim: set ts=4 sw=4 tw=80: *************************************************/
-