mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove deprecated code

Browse Source
This commit is contained in:
Jinhao 2020-04-17 07:23:19 +08:00
parent c5ce97734f
commit cffea79e0f
1 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/nana/gui/widgets/skeletons/text_token_stream.hpp
View File

@ -50,15 +50,6 @@ namespace nana{ namespace widgets{ namespace skeletons
endptr_(s.data() + s.size()), endptr_(s.data() + s.size()),
format_enabled_(format_enabled) format_enabled_(format_enabled)
{ {
entities_ = unicode_bidi{}.reorder(s.c_str(), s.size());
for (auto & e : entities_)
{
ptr_ = e.begin;
if (e.begin < e.end)
break;
++idx_;
}
} }
void push(token tk) void push(token tk)
@ -428,10 +419,6 @@ namespace nana{ namespace widgets{ namespace skeletons
} }
} }
private: private:
std::vector<unicode_bidi::entity> entities_;
std::size_t idx_{ 0 };
const wchar_t* ptr_{ nullptr };
const wchar_t * iptr_; const wchar_t * iptr_;
const wchar_t * endptr_; const wchar_t * endptr_;
const bool format_enabled_; const bool format_enabled_;
@ -722,7 +709,7 @@ namespace nana{ namespace widgets{ namespace skeletons
//Check whether the next position is belone to current entity. //Check whether the next position is belone to current entity.
while (++i != position.cend()) while (++i != position.cend())
{ {
if (*i < endpos) if (*i < static_cast<std::size_t>(endpos))
{ {
ln.push_back(dump[i - position.cbegin()]); ln.push_back(dump[i - position.cbegin()]);
} }