diff options
| author | Philipp Temminghoff <phil65@kodi.tv> | 2016-12-18 02:16:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-18 02:16:53 +0100 |
| commit | e57386f4d588b9397670e5d931f13f601074cd30 (patch) | |
| tree | e3f5c718cf07a9a6192b9d9d03a02763a9919c94 | |
| parent | 79aa52b74b448102cefdabc84b19c909c33c87c7 (diff) | |
| parent | 648fdcf3863b3bd8939ee3e601c3827d4259db6e (diff) | |
Merge pull request #11114 from phil65/rem_old_shit
[gui] remove old code for viewtype parsing
| -rw-r--r-- | xbmc/guilib/GUIControlGroup.cpp | 11 | ||||
| -rw-r--r-- | xbmc/guilib/GUIControlGroup.h | 1 | ||||
| -rw-r--r-- | xbmc/windows/GUIMediaWindow.cpp | 14 |
3 files changed, 0 insertions, 26 deletions
diff --git a/xbmc/guilib/GUIControlGroup.cpp b/xbmc/guilib/GUIControlGroup.cpp index ef78ab70d5..ef5c6fd8d7 100644 --- a/xbmc/guilib/GUIControlGroup.cpp +++ b/xbmc/guilib/GUIControlGroup.cpp @@ -664,17 +664,6 @@ void CGUIControlGroup::ClearAll() SetInvalid(); } -void CGUIControlGroup::GetContainers(std::vector<CGUIControl *> &containers) const -{ - for (auto *control : m_children) - { - if (control->IsContainer()) - containers.push_back(control); - else if (control->IsGroup()) - ((CGUIControlGroup *)control)->GetContainers(containers); - } -} - #ifdef _DEBUG void CGUIControlGroup::DumpTextureUse() { diff --git a/xbmc/guilib/GUIControlGroup.h b/xbmc/guilib/GUIControlGroup.h index ea1d8fc65c..52267b2896 100644 --- a/xbmc/guilib/GUIControlGroup.h +++ b/xbmc/guilib/GUIControlGroup.h @@ -73,7 +73,6 @@ public: const CGUIControl *GetControl(int id) const; CGUIControl *GetControl(int id); virtual CGUIControl *GetFirstFocusableControl(int id); - void GetContainers(std::vector<CGUIControl *> &containers) const; virtual void AddControl(CGUIControl *control, int position = -1); bool InsertControl(CGUIControl *control, const CGUIControl *insertPoint); diff --git a/xbmc/windows/GUIMediaWindow.cpp b/xbmc/windows/GUIMediaWindow.cpp index fb3fc053ed..42549ac0d6 100644 --- a/xbmc/windows/GUIMediaWindow.cpp +++ b/xbmc/windows/GUIMediaWindow.cpp @@ -79,9 +79,6 @@ #define CONTROL_LABELFILES 12 -#define CONTROL_VIEW_START 50 -#define CONTROL_VIEW_END 59 - #define PROPERTY_PATH_DB "path.db" #define PROPERTY_SORT_ORDER "sort.order" #define PROPERTY_SORT_ASCENDING "sort.ascending" @@ -129,17 +126,6 @@ void CGUIMediaWindow::LoadAdditionalTags(TiXmlElement *root) m_viewControl.AddView(control); } } - else - { // backward compatibility - std::vector<CGUIControl *> controls; - GetContainers(controls); - for (ciControls it = controls.begin(); it != controls.end(); it++) - { - CGUIControl *control = *it; - if (control->GetID() >= CONTROL_VIEW_START && control->GetID() <= CONTROL_VIEW_END) - m_viewControl.AddView(control); - } - } m_viewControl.SetViewControlID(CONTROL_BTNVIEWASICONS); } |