From 82ace39b426a843382a6a809e7b66487c1412494 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Mon, 31 Dec 2012 22:27:26 +0300
Subject: Fix code style and compilation under windows.

---
 src/gui/widgets/setuptouchitem.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/gui/widgets/setuptouchitem.cpp')

diff --git a/src/gui/widgets/setuptouchitem.cpp b/src/gui/widgets/setuptouchitem.cpp
index 06faf7b19..8fea0478e 100644
--- a/src/gui/widgets/setuptouchitem.cpp
+++ b/src/gui/widgets/setuptouchitem.cpp
@@ -39,7 +39,8 @@ class SortTouchActionFunctor final
         }
 } touchActionSorter;
 
-TouchActionsModel::TouchActionsModel()
+TouchActionsModel::TouchActionsModel() :
+    NamesModel()
 {
     std::vector<SetupActionData*> data;
 
@@ -66,14 +67,14 @@ TouchActionsModel::TouchActionsModel()
     }
 }
 
-int TouchActionsModel::getActionFromSelection(int sel)
+int TouchActionsModel::getActionFromSelection(const int sel) const
 {
-    if (sel < 0 || sel > mActionId.size())
+    if (sel < 0 || sel > static_cast<signed int>(mActionId.size()))
         return -1;
     return mActionId[sel];
 }
 
-int TouchActionsModel::getSelectionFromAction(int action)
+int TouchActionsModel::getSelectionFromAction(const int action) const
 {
     std::map<int, int>::const_iterator it
         = mActionToSelection.find(action);
-- 
cgit v1.2.3-70-g09d2