[Scummvm-cvs-logs] SF.net SVN: scummvm:[35973] scummvm/trunk/backends

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Wed Jan 21 03:11:25 CET 2009


Revision: 35973
          http://scummvm.svn.sourceforge.net/scummvm/?rev=35973&view=rev
Author:   fingolfin
Date:     2009-01-21 02:11:25 +0000 (Wed, 21 Jan 2009)

Log Message:
-----------
Yet more cleanup

Modified Paths:
--------------
    scummvm/trunk/backends/keymapper/keymapper.cpp
    scummvm/trunk/backends/keymapper/keymapper.h
    scummvm/trunk/backends/platform/sdl/events.cpp

Modified: scummvm/trunk/backends/keymapper/keymapper.cpp
===================================================================
--- scummvm/trunk/backends/keymapper/keymapper.cpp	2009-01-21 02:07:23 UTC (rev 35972)
+++ scummvm/trunk/backends/keymapper/keymapper.cpp	2009-01-21 02:11:25 UTC (rev 35973)
@@ -54,7 +54,8 @@
 
 Keymapper::Keymapper(EventManager *evtMgr)
 	: _eventMan(evtMgr), _enabled(true), _hardwareKeys(0) {
-	_globalDomain.setConfigDomain(ConfMan.getDomain(ConfigManager::kApplicationDomain));
+	ConfigManager::Domain *confDom = ConfMan.getDomain(ConfigManager::kApplicationDomain);
+	_globalDomain.setConfigDomain(confDom);
 }
 
 Keymapper::~Keymapper() {

Modified: scummvm/trunk/backends/keymapper/keymapper.h
===================================================================
--- scummvm/trunk/backends/keymapper/keymapper.h	2009-01-21 02:07:23 UTC (rev 35972)
+++ scummvm/trunk/backends/keymapper/keymapper.h	2009-01-21 02:11:25 UTC (rev 35973)
@@ -124,7 +124,7 @@
 	 * it for use.
 	 * @param name		name of the keymap to push
 	 * @param inherit	if true keymapper will iterate down the 
-	 *					stack it cannot find a key in the new map
+	 *					stack if it cannot find a key in the new map
 	 * @return			true if succesful
 	 */
 	bool pushKeymap(const String& name, bool inherit = false);
@@ -184,8 +184,6 @@
 	Action *getAction(const KeyState& key);
 	void executeAction(const Action *act, bool keyDown);
 
-	typedef List<HardwareKey*>::iterator Iterator;
-
 	EventManager *_eventMan;
 
 	bool _enabled;

Modified: scummvm/trunk/backends/platform/sdl/events.cpp
===================================================================
--- scummvm/trunk/backends/platform/sdl/events.cpp	2009-01-21 02:07:23 UTC (rev 35972)
+++ scummvm/trunk/backends/platform/sdl/events.cpp	2009-01-21 02:11:25 UTC (rev 35973)
@@ -539,9 +539,7 @@
 	mapper->registerHardwareKeySet(keySet);
 
 	Keymap *globalMap = new Keymap("global");
-	Keymap *guiMap = new Keymap("gui");
 	Action *act;
-	Event evt ;
 
 	act = new Action(globalMap, "MENU", "Menu", kGenericActionType, kSelectKeyType);
 	act->addKeyEvent(KeyState(KEYCODE_F5, ASCII_F5, 0));
@@ -556,13 +554,16 @@
 	act->addKeyEvent(KeyState(KEYCODE_PERIOD, '.', 0));
 
 	act = new Action(globalMap, "VIRT", "Display keyboard", kVirtualKeyboardActionType);
-	act->addKeyEvent(KeyState(KEYCODE_F6, ASCII_F6, 0));
+	act->addKeyEvent(KeyState(KEYCODE_F7, ASCII_F7, 0));
 
 	act = new Action(globalMap, "REMP", "Remap keys", kKeyRemapActionType);
-	act->addKeyEvent(KeyState(KEYCODE_F7, ASCII_F7, 0));
+	act->addKeyEvent(KeyState(KEYCODE_F8, ASCII_F8, 0));
 
 	mapper->addGlobalKeymap(globalMap);
 
+
+	Keymap *guiMap = new Keymap("gui");
+
 	act = new Action(guiMap, "CLOS", "Close", kGenericActionType, kStartKeyType);
 	act->addKeyEvent(KeyState(KEYCODE_ESCAPE, ASCII_ESCAPE, 0));
 	


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