branch merge

2011-02-23 19:40:03 -06:00
parent 0a3a47086c 105608cf08
commit 003f403f0c
2 changed files with 3 additions and 3 deletions
@@ -91,7 +91,7 @@ void MouseDevice::AddElement( int usagePage, int usage, IOHIDElementCookie cooki

 void MouseDevice::Open()
 {
-	const Mouse& m = m_Mouse;
+	//const Mouse& m = m_Mouse;
 	for( hash_map<IOHIDElementCookie,DeviceButton>::const_iterator i = m_Mapping.begin(); i != m_Mapping.end(); ++i )
 		AddElementToQueue( i->first );
 }
@@ -107,4 +107,4 @@ void MouseDevice::GetButtonPresses( vector<DeviceInput>& vPresses, IOHIDElementC
 void MouseDevice::GetDevicesAndDescriptions( vector<InputDeviceInfo>& vDevices ) const
 {
 	vDevices.push_back( InputDeviceInfo(DEVICE_MOUSE, "Mouse") );
-}
+}
@@ -59,4 +59,4 @@ public:
 * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 * PERFORMANCE OF THIS SOFTWARE.
 */
- 
+