From 002181a960667f24636a7774e42763432ba4d304 Mon Sep 17 00:00:00 2001 From: ExMix Date: Fri, 28 Aug 2015 14:26:47 +0300 Subject: [PATCH] review fixes --- android/jni/com/mapswithme/maps/Framework.cpp | 2 +- android/jni/com/mapswithme/maps/Framework.hpp | 2 +- drape_frontend/kinetic_scroller.cpp | 2 +- drape_frontend/kinetic_scroller.hpp | 2 +- drape_frontend/user_event_stream.cpp | 15 ++++----------- drape_frontend/user_event_stream.hpp | 2 +- 6 files changed, 9 insertions(+), 16 deletions(-) diff --git a/android/jni/com/mapswithme/maps/Framework.cpp b/android/jni/com/mapswithme/maps/Framework.cpp index 6229e47388..09e5215450 100644 --- a/android/jni/com/mapswithme/maps/Framework.cpp +++ b/android/jni/com/mapswithme/maps/Framework.cpp @@ -248,7 +248,7 @@ TStatus Framework::GetCountryStatus(TIndex const & idx) const return m_work.GetCountryStatus(idx); } -void Framework::Touch(int action, Finger f1, Finger f2, uint8_t maskedPointer) +void Framework::Touch(int action, Finger const & f1, Finger const & f2, uint8_t maskedPointer) { MultiTouchAction eventType = static_cast(action); df::TouchEvent event; diff --git a/android/jni/com/mapswithme/maps/Framework.hpp b/android/jni/com/mapswithme/maps/Framework.hpp index 2e62045c26..9ebcd7f8b0 100644 --- a/android/jni/com/mapswithme/maps/Framework.hpp +++ b/android/jni/com/mapswithme/maps/Framework.hpp @@ -113,7 +113,7 @@ namespace android float m_x, m_y; }; - void Touch(int action, Finger f1, Finger f2, uint8_t maskedPointer); + void Touch(int action, Finger const & f1, Finger const & f2, uint8_t maskedPointer); /// Show rect from another activity. Ensure that no LoadState will be called, /// when main map activity will become active. diff --git a/drape_frontend/kinetic_scroller.cpp b/drape_frontend/kinetic_scroller.cpp index 5317578247..ea2eb31394 100644 --- a/drape_frontend/kinetic_scroller.cpp +++ b/drape_frontend/kinetic_scroller.cpp @@ -51,7 +51,7 @@ void KineticScroller::InitGrab(ScreenBase const & modelView, double timeStamp) m_lastRect = modelView.GlobalRect(); } -bool KineticScroller::IsActive() +bool KineticScroller::IsActive() const { return m_lastTimestamp > 0.0; } diff --git a/drape_frontend/kinetic_scroller.hpp b/drape_frontend/kinetic_scroller.hpp index 2e7f9d98f7..832dcb8d05 100644 --- a/drape_frontend/kinetic_scroller.hpp +++ b/drape_frontend/kinetic_scroller.hpp @@ -13,7 +13,7 @@ public: KineticScroller(); void InitGrab(ScreenBase const & modelView, double timeStamp); - bool IsActive(); + bool IsActive() const; void GrabViewRect(ScreenBase const & modelView, double timeStamp); void CancelGrab(); unique_ptr CreateKineticAnimation(ScreenBase const & modelView); diff --git a/drape_frontend/user_event_stream.cpp b/drape_frontend/user_event_stream.cpp index 4f9d01eeb4..7879c42933 100644 --- a/drape_frontend/user_event_stream.cpp +++ b/drape_frontend/user_event_stream.cpp @@ -30,11 +30,6 @@ size_t GetValidTouchesCount(array const & touches) return result; } -int8_t toInt(bool v) -{ - return v == true ? 1 : 0; -} - } // namespace #ifdef DEBUG @@ -57,9 +52,7 @@ uint8_t const TouchEvent::INVALID_MASKED_POINTER = 0xFF; void TouchEvent::PrepareTouches(array const & previousToches) { - size_t validCount = GetValidTouchesCount(m_touches); - size_t prevValidCount = GetValidTouchesCount(previousToches); - if (validCount == 2 && prevValidCount > 0) + if (GetValidTouchesCount(m_touches) == 2 && GetValidTouchesCount(previousToches) > 0) { if (previousToches[0].m_id == m_touches[1].m_id) Swap(); @@ -89,8 +82,8 @@ uint8_t TouchEvent::GetSecondMaskedPointer() const size_t TouchEvent::GetMaskedCount() { - return toInt(GetFirstMaskedPointer() != INVALID_MASKED_POINTER) + - toInt(GetSecondMaskedPointer() != INVALID_MASKED_POINTER); + return static_cast(GetFirstMaskedPointer() != INVALID_MASKED_POINTER) + + static_cast(GetSecondMaskedPointer() != INVALID_MASKED_POINTER); } void TouchEvent::Swap() @@ -100,7 +93,7 @@ void TouchEvent::Swap() if (index == INVALID_MASKED_POINTER) return index; - return my::cyclicClamp(index + 1, 0, 1); + return index ^ 0x1; }; swap(m_touches[0], m_touches[1]); diff --git a/drape_frontend/user_event_stream.hpp b/drape_frontend/user_event_stream.hpp index 60447ae801..b40d562b82 100644 --- a/drape_frontend/user_event_stream.hpp +++ b/drape_frontend/user_event_stream.hpp @@ -57,7 +57,7 @@ struct TouchEvent /// and GetFirstMaskedPointer return index of this pointer in m_touces (0 in this case) /// Than user put down second finger. m_touches will have 2 valid elements, but new finger only one. /// In this case GetFirstMaskedPointer returns index of new pointer. - /// If user put down both fingers than GetFirst and GetSecond + /// If user put down both fingers simultaneously, then GetFirst and GetSecond /// will return valid not equal INVALID_MASKED_POINTER void SetFirstMaskedPointer(uint8_t firstMask); uint8_t GetFirstMaskedPointer() const;