diff options
Diffstat (limited to 'indra/newview/llmimetypes.h')
-rw-r--r-- | indra/newview/llmimetypes.h | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/indra/newview/llmimetypes.h b/indra/newview/llmimetypes.h index 61359e1933..dcdd347499 100644 --- a/indra/newview/llmimetypes.h +++ b/indra/newview/llmimetypes.h @@ -33,71 +33,71 @@ #ifndef LLMIMETYPES_H #define LLMIMETYPES_H -#include "llstring.h" // because XML parsing lib uses LLString, ugh +#include <string> #include <map> class LLMIMETypes { public: - static bool parseMIMETypes(const LLString& xml_file_path); + static bool parseMIMETypes(const std::string& xml_file_path); // Loads the MIME string definition XML file, usually // from the application skins directory - static LLString translate(const LLString& mime_type); + static std::string translate(const std::string& mime_type); // Returns "QuickTime Movie" from "video/quicktime" - static LLString widgetType(const LLString& mime_type); + static std::string widgetType(const std::string& mime_type); // Type of control widgets for this MIME type // Returns "movie" from "video/quicktime" - static LLString implType(const LLString& mime_type); + static std::string implType(const std::string& mime_type); // Type of Impl to use for decoding media. - static LLString findIcon(const LLString& mime_type); + static std::string findIcon(const std::string& mime_type); // Icon from control widget type for this MIME type - static LLString findToolTip(const LLString& mime_type); + static std::string findToolTip(const std::string& mime_type); // Tool tip from control widget type for this MIME type - static LLString findPlayTip(const LLString& mime_type); + static std::string findPlayTip(const std::string& mime_type); // Play button tool tip from control widget type for this MIME type - static LLString findDefaultMimeType(const LLString& widget_type); + static std::string findDefaultMimeType(const std::string& widget_type); // Canonical mime type associated with this widget set - static bool findAllowResize(const LLString& mime_type); + static bool findAllowResize(const std::string& mime_type); // accessor for flag to enable/disable media size edit fields - static bool findAllowLooping(const LLString& mime_type); + static bool findAllowLooping(const std::string& mime_type); // accessor for flag to enable/disable media looping checkbox public: struct LLMIMEInfo { - LLString mLabel; + std::string mLabel; // friendly label like "QuickTime Movie" - LLString mWidgetType; + std::string mWidgetType; // "web" means use web media UI widgets - LLString mImpl; + std::string mImpl; // which impl to use with this mime type }; struct LLMIMEWidgetSet { - LLString mLabel; + std::string mLabel; // friendly label like "QuickTime Movie" - LLString mIcon; + std::string mIcon; // Name of icon asset to display in toolbar - LLString mDefaultMimeType; + std::string mDefaultMimeType; // Mime type string to use in absence of a specific one - LLString mToolTip; + std::string mToolTip; // custom tool tip for this mime type - LLString mPlayTip; + std::string mPlayTip; // custom tool tip to display for Play button bool mAllowResize; @@ -106,8 +106,8 @@ public: bool mAllowLooping; // enable/disable media looping checkbox }; - typedef std::map< LLString, LLMIMEInfo > mime_info_map_t; - typedef std::map< LLString, LLMIMEWidgetSet > mime_widget_set_map_t; + typedef std::map< std::string, LLMIMEInfo > mime_info_map_t; + typedef std::map< std::string, LLMIMEWidgetSet > mime_widget_set_map_t; // Public so users can iterate over it static mime_info_map_t sMap; |