github/textmate
1
1
Fork 0
mirror of https://github.com/textmate/textmate.git synced 2026-04-28 03:00:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix issues with redundant qualified names

Browse Source 
Starting in Clang 5, lookup with nested-class names is stricter (e.g., A::A now specifically refers to the constructor name).
This commit is contained in:
Ronald Wampler
2017-06-23 13:24:04 -04:00
parent 49cc123544
commit c0fb320549
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Frameworks/theme/src/theme.cc
View File

@@ -172,8 +172,8 @@ bool gutter_styles_t::is_transparent () const
theme_ptr theme_t::copy_with_font_name_and_size (std::string const& fontName, CGFloat fontSize)
{
if(_font_name == fontName && _font_size == fontSize)
return std::make_shared<theme_t::theme_t>(*this);
return std::make_shared<theme_t::theme_t>(this->_item, fontName, fontSize);
return std::make_shared<theme_t>(*this);
return std::make_shared<theme_t>(this->_item, fontName, fontSize);
}
theme_t::theme_t (bundles::item_ptr const& themeItem, std::string const& fontName, CGFloat fontSize) :_item(themeItem), _font_name(fontName), _font_size(fontSize)
@@ -429,13 +429,13 @@ static theme_t::color_info_t read_color (std::string const& str_color)
unsigned int col[4] = { 0x00, 0x00, 0x00, 0xFF } ;
if(3 <= sscanf(str_color.c_str(), "#%02x%02x%02x%02x", &col[R], &col[G], &col[B], &col[A]))
return theme_t::color_info_t::color_info_t(col[R]/255.0, col[G]/255.0, col[B]/255.0, col[A]/255.0);
return theme_t::color_info_t(col[R]/255.0, col[G]/255.0, col[B]/255.0, col[A]/255.0);
col[A] = 0xF;
if(3 <= sscanf(str_color.c_str(), "#%1x%1x%1x%1x", &col[R], &col[G], &col[B], &col[A]))
return theme_t::color_info_t::color_info_t(col[R]/15.0, col[G]/15.0, col[B]/15.0, col[A]/15.0);
return theme_t::color_info_t(col[R]/15.0, col[G]/15.0, col[B]/15.0, col[A]/15.0);
return theme_t::color_info_t::color_info_t(); // color is not set
return theme_t::color_info_t(); // color is not set
}
static theme_t::color_info_t blend (theme_t::color_info_t const& lhs, theme_t::color_info_t const& rhs)