[Scummvm-cvs-logs] SF.net SVN: scummvm:[42790] scummvm/trunk/common

dreammaster at users.sourceforge.net dreammaster at users.sourceforge.net
Sun Jul 26 02:27:32 CEST 2009


Revision: 42790
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42790&view=rev
Author:   dreammaster
Date:     2009-07-26 00:27:32 +0000 (Sun, 26 Jul 2009)

Log Message:
-----------
Changed the events.cpp file to EventDispatcher.cpp, to avoid MSVC name clashes with sdl/events.cpp

Modified Paths:
--------------
    scummvm/trunk/common/module.mk

Added Paths:
-----------
    scummvm/trunk/common/EventDispatcher.cpp

Removed Paths:
-------------
    scummvm/trunk/common/events.cpp

Copied: scummvm/trunk/common/EventDispatcher.cpp (from rev 42786, scummvm/trunk/common/events.cpp)
===================================================================
--- scummvm/trunk/common/EventDispatcher.cpp	                        (rev 0)
+++ scummvm/trunk/common/EventDispatcher.cpp	2009-07-26 00:27:32 UTC (rev 42790)
@@ -0,0 +1,138 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * 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 2
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#include "common/events.h"
+
+namespace Common {
+
+EventDispatcher::EventDispatcher() : _mapper(0) {
+}
+
+EventDispatcher::~EventDispatcher() {
+	for (Common::List<SourceEntry>::iterator i = _sources.begin(); i != _sources.end(); ++i) {
+		if (i->autoFree)
+			delete i->source;
+	}
+
+	for (Common::List<ObserverEntry>::iterator i = _observers.begin(); i != _observers.end(); ++i) {
+		if (i->autoFree)
+			delete i->observer;
+	}
+
+	delete _mapper;
+	_mapper = 0;
+}
+
+void EventDispatcher::dispatch() {
+	Common::Event event;
+
+	for (Common::List<SourceEntry>::iterator i = _sources.begin(); i != _sources.end(); ++i) {
+		const bool allowMapping = i->source->allowMapping();
+
+		while (i->source->pollEvent(event)) {
+			// We only try to process the events via the setup event mapper, when
+			// we have a setup mapper and when the event source allows mapping.
+			if (_mapper && allowMapping) {
+				if (_mapper->notifyEvent(event)) {
+					// We allow the event mapper to create multiple events, when
+					// eating an event.
+					while (_mapper->pollEvent(event))
+						dispatchEvent(event);
+
+					// Try getting another event from the current EventSource.
+					continue;
+				}
+			}
+
+			dispatchEvent(event);
+		}
+	}
+}
+
+void EventDispatcher::registerMapper(EventMapper *mapper) {
+	if (_mapper)
+		delete _mapper;
+	_mapper = mapper;
+}
+
+void EventDispatcher::registerSource(EventSource *source, bool autoFree) {
+	SourceEntry newEntry;
+
+	newEntry.source = source;
+	newEntry.autoFree = autoFree;
+
+	_sources.push_back(newEntry);
+}
+
+void EventDispatcher::unregisterSource(EventSource *source) {
+	for (Common::List<SourceEntry>::iterator i = _sources.begin(); i != _sources.end(); ++i) {
+		if (i->source == source) {
+			if (i->autoFree)
+				delete source;
+
+			_sources.erase(i);
+			return;
+		}
+	}
+}
+
+void EventDispatcher::registerObserver(EventObserver *obs, uint priority, bool autoFree) {
+	ObserverEntry newEntry;
+
+	newEntry.observer = obs;
+	newEntry.priority = priority;
+	newEntry.autoFree = autoFree;
+
+	for (Common::List<ObserverEntry>::iterator i = _observers.begin(); i != _observers.end(); ++i) {
+		if (i->priority < priority) {
+			_observers.insert(i, newEntry);
+			return;
+		}
+	}
+
+	_observers.push_back(newEntry);
+}
+
+void EventDispatcher::unregisterObserver(EventObserver *obs) {
+	for (Common::List<ObserverEntry>::iterator i = _observers.begin(); i != _observers.end(); ++i) {
+		if (i->observer == obs) {
+			if (i->autoFree)
+				delete obs;
+
+			_observers.erase(i);
+			return;
+		}
+	}
+}
+
+void EventDispatcher::dispatchEvent(const Event &event) {
+	for (Common::List<ObserverEntry>::iterator i = _observers.begin(); i != _observers.end(); ++i) {
+		if (i->observer->notifyEvent(event))
+			break;
+	}
+}
+
+} // end of namespace Common
+

Deleted: scummvm/trunk/common/events.cpp
===================================================================
--- scummvm/trunk/common/events.cpp	2009-07-26 00:04:12 UTC (rev 42789)
+++ scummvm/trunk/common/events.cpp	2009-07-26 00:27:32 UTC (rev 42790)
@@ -1,138 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * 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 2
- * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#include "common/events.h"
-
-namespace Common {
-
-EventDispatcher::EventDispatcher() : _mapper(0) {
-}
-
-EventDispatcher::~EventDispatcher() {
-	for (Common::List<SourceEntry>::iterator i = _sources.begin(); i != _sources.end(); ++i) {
-		if (i->autoFree)
-			delete i->source;
-	}
-
-	for (Common::List<ObserverEntry>::iterator i = _observers.begin(); i != _observers.end(); ++i) {
-		if (i->autoFree)
-			delete i->observer;
-	}
-
-	delete _mapper;
-	_mapper = 0;
-}
-
-void EventDispatcher::dispatch() {
-	Common::Event event;
-
-	for (Common::List<SourceEntry>::iterator i = _sources.begin(); i != _sources.end(); ++i) {
-		const bool allowMapping = i->source->allowMapping();
-
-		while (i->source->pollEvent(event)) {
-			// We only try to process the events via the setup event mapper, when
-			// we have a setup mapper and when the event source allows mapping.
-			if (_mapper && allowMapping) {
-				if (_mapper->notifyEvent(event)) {
-					// We allow the event mapper to create multiple events, when
-					// eating an event.
-					while (_mapper->pollEvent(event))
-						dispatchEvent(event);
-
-					// Try getting another event from the current EventSource.
-					continue;
-				}
-			}
-
-			dispatchEvent(event);
-		}
-	}
-}
-
-void EventDispatcher::registerMapper(EventMapper *mapper) {
-	if (_mapper)
-		delete _mapper;
-	_mapper = mapper;
-}
-
-void EventDispatcher::registerSource(EventSource *source, bool autoFree) {
-	SourceEntry newEntry;
-
-	newEntry.source = source;
-	newEntry.autoFree = autoFree;
-
-	_sources.push_back(newEntry);
-}
-
-void EventDispatcher::unregisterSource(EventSource *source) {
-	for (Common::List<SourceEntry>::iterator i = _sources.begin(); i != _sources.end(); ++i) {
-		if (i->source == source) {
-			if (i->autoFree)
-				delete source;
-
-			_sources.erase(i);
-			return;
-		}
-	}
-}
-
-void EventDispatcher::registerObserver(EventObserver *obs, uint priority, bool autoFree) {
-	ObserverEntry newEntry;
-
-	newEntry.observer = obs;
-	newEntry.priority = priority;
-	newEntry.autoFree = autoFree;
-
-	for (Common::List<ObserverEntry>::iterator i = _observers.begin(); i != _observers.end(); ++i) {
-		if (i->priority < priority) {
-			_observers.insert(i, newEntry);
-			return;
-		}
-	}
-
-	_observers.push_back(newEntry);
-}
-
-void EventDispatcher::unregisterObserver(EventObserver *obs) {
-	for (Common::List<ObserverEntry>::iterator i = _observers.begin(); i != _observers.end(); ++i) {
-		if (i->observer == obs) {
-			if (i->autoFree)
-				delete obs;
-
-			_observers.erase(i);
-			return;
-		}
-	}
-}
-
-void EventDispatcher::dispatchEvent(const Event &event) {
-	for (Common::List<ObserverEntry>::iterator i = _observers.begin(); i != _observers.end(); ++i) {
-		if (i->observer->notifyEvent(event))
-			break;
-	}
-}
-
-} // end of namespace Common
-

Modified: scummvm/trunk/common/module.mk
===================================================================
--- scummvm/trunk/common/module.mk	2009-07-26 00:04:12 UTC (rev 42789)
+++ scummvm/trunk/common/module.mk	2009-07-26 00:27:32 UTC (rev 42790)
@@ -5,7 +5,7 @@
 	config-file.o \
 	config-manager.o \
 	debug.o \
-	events.o \
+	EventDispatcher.o \
 	EventRecorder.o \
 	file.o \
 	fs.o \


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list