cleanup: Removed depreciated control types.

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@29101 568bbfeb-2a22-0410-94d2-cc84cf5bfa90

4 files changed, 0 insertions, 27 deletions

diff --git a/guilib/GUIControl.h b/guilib/GUIControl.h
index f1c2081e62..72466930d9 100644
--- a/guilib/GUIControl.h
+++ b/guilib/GUIControl.h
@@ -224,26 +224,21 @@ public:
     GUICONTROL_BORDEREDIMAGE,
     GUICONTROL_LARGE_IMAGE,
     GUICONTROL_LABEL,
-    GUICONTROL_LIST,
     GUICONTROL_LISTGROUP,
-    GUICONTROL_LISTEX,
     GUICONTROL_PROGRESS,
     GUICONTROL_RADIO,
     GUICONTROL_RSS,
     GUICONTROL_SELECTBUTTON,
     GUICONTROL_SLIDER,
     GUICONTROL_SETTINGS_SLIDER,
-    GUICONTROL_SPINBUTTON,
     GUICONTROL_SPIN,
     GUICONTROL_SPINEX,
     GUICONTROL_TEXTBOX,
-    GUICONTROL_THUMBNAIL,
     GUICONTROL_TOGGLEBUTTON,
     GUICONTROL_VIDEO,
     GUICONTROL_MOVER,
     GUICONTROL_RESIZE,
     GUICONTROL_BUTTONBAR,
-    GUICONTROL_CONSOLE,
     GUICONTROL_EDIT,
     GUICONTROL_VISUALISATION,
     GUICONTROL_RENDERADDON,
diff --git a/guilib/GUIControlProfiler.cpp b/guilib/GUIControlProfiler.cpp
index 16142f3b72..0ffe0f5a01 100644
--- a/guilib/GUIControlProfiler.cpp
+++ b/guilib/GUIControlProfiler.cpp
@@ -157,12 +157,7 @@ void CGUIControlProfilerItem::SaveToXML(TiXmlElement *parent)
     lpszType = "fixedlist"; break;
   case CGUIControl::GUICONTAINER_PANEL:
     lpszType = "panel"; break;
-  //case CGUIControl::GUICONTROL_LIST:
   //case CGUIControl::GUICONTROL_UNKNOWN:
-  //case CGUIControl::GUICONTROL_LISTEX:
-  //case CGUIControl::GUICONTROL_SPINBUTTON:
-  //case CGUIControl::GUICONTROL_THUMBNAIL:
-  //case CGUIControl::GUICONTROL_CONSOLE:
   default:
     break;
   }
diff --git a/xbmc/lib/libPython/xbmcmodule/window.cpp b/xbmc/lib/libPython/xbmcmodule/window.cpp
index 752831ed2e..247e813d84 100644
--- a/xbmc/lib/libPython/xbmcmodule/window.cpp
+++ b/xbmc/lib/libPython/xbmcmodule/window.cpp
@@ -222,15 +222,6 @@ namespace PYXBMC
       pControl = (Control*)ControlImage_Type.tp_alloc(&ControlImage_Type, 0);
       new(&((ControlImage*)pControl)->strFileName) string();
       break;
-    case CGUIControl::GUICONTROL_LIST:
-      pControl = (Control*)ControlList_Type.tp_alloc(&ControlList_Type, 0);
-      new(&((ControlList*)pControl)->strFont) string();
-      new(&((ControlList*)pControl)->strTextureButton) string();
-      new(&((ControlList*)pControl)->strTextureButtonFocus) string();
-      new(&((ControlList*)pControl)->vecItems) std::vector<PYXBMC::ListItem*>();
-      // create a python spin control
-      ((ControlList*)pControl)->pControlSpin = (ControlSpin*)ControlSpin_New();
-      break;
     case CGUIControl::GUICONTROL_PROGRESS:
       pControl = (Control*)ControlProgress_Type.tp_alloc(&ControlProgress_Type, 0);
       new(&((ControlProgress*)pControl)->strTextureLeft) string();
diff --git a/xbmc/lib/libhttpapi/XBMChttp.cpp b/xbmc/lib/libhttpapi/XBMChttp.cpp
index e7075861ae..6e96c39ff6 100644
--- a/xbmc/lib/libhttpapi/XBMChttp.cpp
+++ b/xbmc/lib/libhttpapi/XBMChttp.cpp
@@ -1756,14 +1756,6 @@ int CXbmcHttp::xbmcGetGUIStatus()
       {
         output += closeTag+openTag+"Type:Spin"+closeTag+openTag+"Description:" + strTmp;
       }
-      else if (pControl->GetControlType() == CGUIControl::GUICONTROL_THUMBNAIL)
-      {
-        output += closeTag+openTag+"Type:ThumbNail"+closeTag+openTag+"Description:" + strTmp;
-      }
-      else if (pControl->GetControlType() == CGUIControl::GUICONTROL_LIST)
-      {
-        output += closeTag+openTag+"Type:List"+closeTag+openTag+"Description:" + strTmp;
-      }
     }
   }
   return SetResponse(output);