From c51b1189e3d5353e842991f5859ddcea0f73e426 Mon Sep 17 00:00:00 2001 From: theuni Date: Mon, 24 Jan 2011 16:05:21 -0500 Subject: Merged cptspiff's code-reshuffle branch. Squashed commit due to build breakage during code-reshuffle history. Conflicts: xbmc/Util.cpp xbmc/cdrip/CDDARipper.cpp xbmc/filesystem/Directory.cpp xbmc/filesystem/File.cpp --- guilib/GUIColorManager.h | 70 ------------------------------------------------ 1 file changed, 70 deletions(-) delete mode 100644 guilib/GUIColorManager.h (limited to 'guilib/GUIColorManager.h') diff --git a/guilib/GUIColorManager.h b/guilib/GUIColorManager.h deleted file mode 100644 index e1f66e82c6..0000000000 --- a/guilib/GUIColorManager.h +++ /dev/null @@ -1,70 +0,0 @@ -/*! -\file GUIColorManager.h -\brief -*/ - -#ifndef GUILIB_COLORMANAGER_H -#define GUILIB_COLORMANAGER_H - -#pragma once - -/* - * Copyright (C) 2005-2008 Team XBMC - * http://www.xbmc.org - * - * This Program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This Program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with XBMC; see the file COPYING. If not, write to - * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. - * http://www.gnu.org/copyleft/gpl.html - * - */ - -/*! - \ingroup textures - \brief - */ - -#include "StdString.h" - -#include - -class TiXmlDocument; - -typedef uint32_t color_t; - -class CGUIColorManager -{ -public: - CGUIColorManager(void); - virtual ~CGUIColorManager(void); - - void Load(const CStdString &colorFile); - - color_t GetColor(const CStdString &color) const; - - void Clear(); - -protected: - bool LoadXML(TiXmlDocument &xmlDoc); - - std::map m_colors; - typedef std::map::iterator iColor; - typedef std::map::const_iterator icColor; -}; - -/*! - \ingroup textures - \brief - */ -extern CGUIColorManager g_colorManager; -#endif -- cgit v1.2.3