From bbc9697a153b30503d9d12c120505ec81adeacf1 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 30 Apr 2014 19:53:43 +0300
Subject: Fix code style in input.

---
 src/input/inputmanager.cpp      | 2 +-
 src/input/keyboardconfig.cpp    | 2 +-
 src/input/multitouchmanager.cpp | 4 ++--
 src/input/multitouchmanager.h   | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/input/inputmanager.cpp b/src/input/inputmanager.cpp
index d611e4790..c30d97394 100644
--- a/src/input/inputmanager.cpp
+++ b/src/input/inputmanager.cpp
@@ -122,7 +122,7 @@ void InputManager::retrieve()
             mNameMap[cf] = i;
             KeyFunction &kf = mKey[i];
             const std::string keyStr = config.getValue(cf, "");
-            const int keyStrSize = keyStr.size();
+            const size_t keyStrSize = keyStr.size();
             if (keyStr.empty())
                 continue;
 
diff --git a/src/input/keyboardconfig.cpp b/src/input/keyboardconfig.cpp
index 3756e27fb..ee0254b69 100644
--- a/src/input/keyboardconfig.cpp
+++ b/src/input/keyboardconfig.cpp
@@ -68,8 +68,8 @@ int KeyboardConfig::getKeyValueFromEvent(const SDL_Event &event)
         return event.key.keysym.sym;
     else if (event.key.keysym.scancode > 1)
         return -event.key.keysym.scancode;
-#endif
     return 0;
+#endif
 }
 
 int KeyboardConfig::getKeyIndex(const SDL_Event &event, const int grp)
diff --git a/src/input/multitouchmanager.cpp b/src/input/multitouchmanager.cpp
index 446e40aa1..c1626da41 100644
--- a/src/input/multitouchmanager.cpp
+++ b/src/input/multitouchmanager.cpp
@@ -66,8 +66,8 @@ void MultiTouchManager::handleFingerUp(const SDL_Event &event)
     updateFinger(event, false);
 }
 
-void MultiTouchManager::checkDevice(const int touchId,
-                                    const int fingerId)
+void MultiTouchManager::checkDevice(const long touchId,
+                                    const long fingerId)
 {
     if (fingerId != 1 || !guiInput)
         return;
diff --git a/src/input/multitouchmanager.h b/src/input/multitouchmanager.h
index 82bfd0881..707f93e82 100644
--- a/src/input/multitouchmanager.h
+++ b/src/input/multitouchmanager.h
@@ -57,8 +57,8 @@ class MultiTouchManager final
 
         void handleFingerUp(const SDL_Event &event);
 
-        void checkDevice(const int touchId,
-                         const int fingerId);
+        void checkDevice(const long touchId,
+                         const long fingerId);
 #endif
 
     private:
-- 
cgit v1.2.3-70-g09d2