procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix emoji search in dictionary (#234) 

The commit b2ee90263d introduced regression in whole places where smilies are used. Now it seems to be fixed.
Thanks for testing for @saphire , @Randl and @zgwerby for reporting issue #233 .
Closes #233.
This commit is contained in:
Evgeniy Zheltonozhskiy 2019-06-24 12:48:03 +03:00 committed by Alex
parent e164760eb0
commit d0de5d31e6
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Telegram/SourceFiles/codegen/common/cpp_file.cpp
View File

@ -64,6 +64,7 @@ void writeLicense(QTextStream &stream, const ProjectInfo &project) {
CppFile::CppFile(const QString &path, const ProjectInfo &project) CppFile::CppFile(const QString &path, const ProjectInfo &project)
: stream_(&content_) : stream_(&content_)
, forceReGenerate_(project.forceReGenerate) { , forceReGenerate_(project.forceReGenerate) {
stream_.setCodec("UTF-8");
bool cpp = path.toLower().endsWith(".cpp"); bool cpp = path.toLower().endsWith(".cpp");
QFileInfo info(path); QFileInfo info(path);

8
Telegram/SourceFiles/codegen/emoji/generator.cpp
View File

@ -643,7 +643,7 @@ const std::map<QString, int> EmojiMap = {\n\
\n"; \n";
for (auto &item : data_.map) { for (auto &item : data_.map) {
source_->stream() << "{\"" << item.first << "\"," << item.second << "},\n"; source_->stream() << "{QString(\"" << item.first << "\")," << item.second << "},\n";
} }
source_->stream() << "\ source_->stream() << "\
\n\ \n\
@ -674,10 +674,10 @@ bool Generator::writeFindFromDictionary(const std::map<QString, int, std::greate
auto max_length = max_el->first.size(); auto max_length = max_el->first.size();
source_->stream() << "\tstd::array<size_t, " << max_length + 1 << "> sizes;\n"; source_->stream() << "\tstd::array<size_t, " << max_length + 1 << "> sizes;\n";
if (skipPostfixes) { if (skipPostfixes) {
source_->stream() << "\tfor (int i=0,l=0; i<str.size() && l < " << max_length << R"code(; ++i) { source_->stream() << "\tfor (int i=0,l=0; i<full_str.size() && l < " << max_length << R"code(; ++i) {
if (str[i] == kPostfix) {continue;} if (full_str[i] == kPostfix) {continue;}
++l; ++l;
sizes[l]=i; sizes[l]=i+1;
str+=full_str[i]; str+=full_str[i];
} }
)code"; )code";