diff options
| author | jmarshallnz <jmarshallnz@svn> | 2010-04-07 03:28:57 +0000 |
|---|---|---|
| committer | jmarshallnz <jmarshallnz@svn> | 2010-04-07 03:28:57 +0000 |
| commit | 6de3383ec0e696695d3d585b9e59dd0071af3760 (patch) | |
| tree | 38e21c1f7b6e8eb079e9faeab1c4136f66062d18 /guilib | |
| parent | f884cf47d655721c9805174dd2303619e07b2d85 (diff) | |
cleanup: Move TranslateWindowString() to TranslateWindow() and use a lookup table for translation in both directions.
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@29098 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
Diffstat (limited to 'guilib')
| -rw-r--r-- | guilib/GUIAudioManager.cpp | 2 | ||||
| -rw-r--r-- | guilib/GUIWindow.cpp | 2 | ||||
| -rw-r--r-- | guilib/Key.h | 4 |
3 files changed, 3 insertions, 5 deletions
diff --git a/guilib/GUIAudioManager.cpp b/guilib/GUIAudioManager.cpp index ca9c317447..f5ec711afb 100644 --- a/guilib/GUIAudioManager.cpp +++ b/guilib/GUIAudioManager.cpp @@ -368,7 +368,7 @@ bool CGUIAudioManager::Load() if (pIdNode) { if (pIdNode->FirstChild()) - id = CButtonTranslator::TranslateWindowString(pIdNode->FirstChild()->Value()); + id = CButtonTranslator::TranslateWindow(pIdNode->FirstChild()->Value()); } CWindowSounds sounds; diff --git a/guilib/GUIWindow.cpp b/guilib/GUIWindow.cpp index 1c98d5563d..be8ac3d72f 100644 --- a/guilib/GUIWindow.cpp +++ b/guilib/GUIWindow.cpp @@ -159,7 +159,7 @@ bool CGUIWindow::Load(TiXmlDocument &xmlDoc) } else if (strValue == "previouswindow" && pChild->FirstChild()) { - m_previousWindow = CButtonTranslator::TranslateWindowString(pChild->FirstChild()->Value()); + m_previousWindow = CButtonTranslator::TranslateWindow(pChild->FirstChild()->Value()); } else if (strValue == "defaultcontrol" && pChild->FirstChild()) { diff --git a/guilib/Key.h b/guilib/Key.h index c81a072bca..8f3d337be6 100644 --- a/guilib/Key.h +++ b/guilib/Key.h @@ -309,9 +309,7 @@ #define WINDOW_SETTINGS_APPEARANCE 10019 #define WINDOW_SCRIPTS 10020 -#define WINDOW_VIDEO_GENRE 10021 -#define WINDOW_VIDEO_ACTOR 10022 -#define WINDOW_VIDEO_YEAR 10023 + #define WINDOW_VIDEO_FILES 10024 #define WINDOW_VIDEO_NAV 10025 #define WINDOW_VIDEO_PLAYLIST 10028 |