diff options
| author | MaestroDD <MaestroDD@svn> | 2010-01-20 15:02:51 +0000 |
|---|---|---|
| committer | MaestroDD <MaestroDD@svn> | 2010-01-20 15:02:51 +0000 |
| commit | 01c4d6b96d62d34a7cddc99ad1c5db9af97604a6 (patch) | |
| tree | 929a8d7a873fc7fceeaa8d5890b2bf7270b3877e /guilib/GUISpinControl.cpp | |
| parent | 7947147e81ab0774cabb28c4a27bf5652decff25 (diff) | |
fixed build: don't use reserved 'id' as c++ member var
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@27026 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
Diffstat (limited to 'guilib/GUISpinControl.cpp')
| -rw-r--r-- | guilib/GUISpinControl.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/guilib/GUISpinControl.cpp b/guilib/GUISpinControl.cpp index a16fca38c0..2f1e7aba27 100644 --- a/guilib/GUISpinControl.cpp +++ b/guilib/GUISpinControl.cpp @@ -63,7 +63,7 @@ CGUISpinControl::~CGUISpinControl(void) bool CGUISpinControl::OnAction(const CAction &action) { - switch (action.id) + switch (action.actionId) { case REMOTE_0: case REMOTE_1: @@ -81,7 +81,7 @@ bool CGUISpinControl::OnAction(const CAction &action) m_iTypedPos = 0; strcpy(m_szTyped, ""); } - int iNumber = action.id - REMOTE_0; + int iNumber = action.actionId - REMOTE_0; m_szTyped[m_iTypedPos] = iNumber + '0'; m_iTypedPos++; @@ -166,7 +166,7 @@ bool CGUISpinControl::OnAction(const CAction &action) break; } /* static float m_fSmoothScrollOffset = 0.0f; - if (action.id == ACTION_SCROLL_UP) + if (action.actionId == ACTION_SCROLL_UP) { m_fSmoothScrollOffset += action.amount1 * action.amount1; bool handled = false; |