[Opde-commits] SF.net SVN: opde:[1167] trunk/src/services/input

[<pa...@us...>]

Revision: 1167
          http://opde.svn.sourceforge.net/opde/?rev=1167&view=rev
Author:   patryn
Date:     2009-03-17 02:29:16 +0000 (Tue, 17 Mar 2009)

Log Message:
-----------
Changing the keymapping to unsigned int.

Modified Paths:
--------------
    trunk/src/services/input/InputService.cpp
    trunk/src/services/input/InputService.h

Modified: trunk/src/services/input/InputService.cpp
===================================================================
--- trunk/src/services/input/InputService.cpp	2009-03-16 16:40:15 UTC (rev 1166)
+++ trunk/src/services/input/InputService.cpp	2009-03-17 02:29:16 UTC (rev 1167)
@@ -280,9 +280,9 @@
 	}
 
 	//------------------------------------------------------
-	int InputService::MapToOISCode(std::string Key) const
+	unsigned int InputService::MapToOISCode(std::string Key) const
 	{
-		int Code;
+		unsigned int Code;
 		ReverseKeyMap::const_iterator it = mReverseKeyMap.find(Key);
 
 		if (it != mReverseKeyMap.end())
@@ -319,7 +319,7 @@
 		
 		for(BindFileCommands::const_iterator Command = BindCommands.begin(); Command != BindCommands.end(); Command++)
 		{
-			int Modifier = 0;
+			unsigned int Modifier = 0;
 			std::string Key, Keys = Command->at(1);
 
 			if((Keys.length() > 1) && (Keys.find('+') != string::npos))
@@ -342,7 +342,7 @@
 			else
 				Key = Keys;
 			
-			int Code = MapToOISCode(Key);
+			unsigned int Code = MapToOISCode(Key);
 			CommandMap.insert(make_pair(Code | Modifier, stripComment(Command->at(2))));
 		}
 
@@ -626,7 +626,7 @@
 		}
 
 		// dispatch the key event using the mapper
-		int Key = (int)e.key;
+		unsigned int Key = (unsigned int)e.key;
 
 		if (mKeyboard->isModifierDown(Keyboard::Alt))
 			Key |= ALT_MOD;
@@ -670,7 +670,7 @@
 	}
 
 	//------------------------------------------------------
-	void InputService::ProcessJoyMouseEvent(int Id, InputEventType Event)
+	void InputService::ProcessJoyMouseEvent(unsigned int Id, InputEventType Event)
 	{
 		// Some safety checks
 		if (mInputMode == IM_DIRECT)
@@ -682,7 +682,7 @@
 		}
 
 		// dispatch the key event using the mapper
-		int Button = Id;
+		unsigned int Button = Id;
 		if((Event == IET_MOUSE_PRESS) || (Event == IET_MOUSE_RELEASE))
 			Button += DARK_MOUSE_EVENT;
 		else

Modified: trunk/src/services/input/InputService.h
===================================================================
--- trunk/src/services/input/InputService.h	2009-03-16 16:40:15 UTC (rev 1166)
+++ trunk/src/services/input/InputService.h	2009-03-17 02:29:16 UTC (rev 1167)
@@ -235,7 +235,7 @@
 
 			void InitKeyMap();
 			void Tokenize(std::string , std::vector<std::string> &OutVector, char Token);
-			int MapToOISCode(std::string Key) const;
+			unsigned int MapToOISCode(std::string Key) const;
 
 			/// registers (int)OIS::KeyCode to textual representation and inverse mappings
 			void RegisterValidKey(int kc, const std::string& txt);
@@ -253,7 +253,7 @@
 			/// Processes the received key event with current mapper, and if it finds a match, sends an event
 			void ProcessKeyEvent(const OIS::KeyEvent &e, InputEventType t);
 
-			void ProcessJoyMouseEvent(int Id, InputEventType Event);
+			void ProcessJoyMouseEvent(unsigned int Id, InputEventType Event);
 
 
 			// ---- OIS input events ----
@@ -279,7 +279,7 @@
 
 			typedef std::vector<ContentsVector> BindFileCommands;
 
-			typedef std::map<int, std::string> CommandMapVector;
+			typedef std::map<unsigned int, std::string> CommandMapVector;
 
 			/// Named context to an event mapper map
 			typedef std::map< std::string, InputEventMapperPtr > ContextToMapper;
@@ -288,7 +288,7 @@
 			typedef std::map< std::string, DVariant > ValueMap;
 
 			/// map of (int)OIS::KeyCode to the code text
-			typedef std::map<int, std::string> KeyMap; // (lower case please)
+			typedef std::map<unsigned int, std::string> KeyMap; // (lower case please)
 
 			/// map of the command text to the (int) ois key code
 			typedef std::map<std::string, int> ReverseKeyMap; // (lower case please)


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