diff options
| author | jmarshallnz <jmarshallnz@svn> | 2010-02-19 02:55:37 +0000 |
|---|---|---|
| committer | jmarshallnz <jmarshallnz@svn> | 2010-02-19 02:55:37 +0000 |
| commit | 5f22c573c7fbb7a45cf2aaee2e1ddad7bb7899cb (patch) | |
| tree | 616c5e8b5f6bb5ee97f4e2ed92ab661d2f22e555 /guilib/GUIButtonScroller.cpp | |
| parent | af22bc05ff517e85698c5618ad0b322706955ed8 (diff) | |
cleanup: Move all members of CAction private, accessed via getters, as we only ever set in constructors.
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@27962 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
Diffstat (limited to 'guilib/GUIButtonScroller.cpp')
| -rw-r--r-- | guilib/GUIButtonScroller.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/guilib/GUIButtonScroller.cpp b/guilib/GUIButtonScroller.cpp index 509b9b6145..2db7e8831f 100644 --- a/guilib/GUIButtonScroller.cpp +++ b/guilib/GUIButtonScroller.cpp @@ -114,7 +114,7 @@ CGUIButtonScroller::~CGUIButtonScroller(void) bool CGUIButtonScroller::OnAction(const CAction &action) { - if (action.actionId == ACTION_SELECT_ITEM) + if (action.GetID() == ACTION_SELECT_ITEM) { // send the appropriate message to the parent window vector<CGUIActionDescriptor> actions = m_vecButtons[GetActiveButton()]->clickActions; @@ -127,15 +127,15 @@ bool CGUIButtonScroller::OnAction(const CAction &action) } return true; } - if (action.actionId == ACTION_CONTEXT_MENU) + if (action.GetID() == ACTION_CONTEXT_MENU) { // send a click message to our parent - SEND_CLICK_MESSAGE(GetID(), GetParentID(), action.actionId); + SEND_CLICK_MESSAGE(GetID(), GetParentID(), action.GetID()); return true; } // smooth scrolling (for analog controls) - if (action.actionId == ACTION_SCROLL_UP) + if (action.GetID() == ACTION_SCROLL_UP) { - m_fAnalogScrollSpeed += action.amount1 * action.amount1; + m_fAnalogScrollSpeed += action.GetAmount() * action.GetAmount(); bool handled = false; while (m_fAnalogScrollSpeed > ANALOG_SCROLL_START) { @@ -147,9 +147,9 @@ bool CGUIButtonScroller::OnAction(const CAction &action) } return handled; } - if (action.actionId == ACTION_SCROLL_DOWN) + if (action.GetID() == ACTION_SCROLL_DOWN) { - m_fAnalogScrollSpeed += action.amount1 * action.amount1; + m_fAnalogScrollSpeed += action.GetAmount() * action.GetAmount(); bool handled = false; while (m_fAnalogScrollSpeed > ANALOG_SCROLL_START) { |