mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-01 03:21:41 +00:00
Code Issues Projects Releases Wiki Activity

Move toUpper() from StringUtils to the JournalViewModel

Browse Source
This commit is contained in:
Andrei Kortunov 2017-11-23 19:37:45 +04:00
parent a8bf4cdd98
commit 94c0e3ed10
2 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
apps/openmw/mwgui/journalviewmodel.cpp
View File

@ -314,7 +314,7 @@ struct JournalViewModelImpl : JournalViewModel
for (MWBase::Journal::TTopicIter i = journal->topicBegin (); i != journal->topicEnd (); ++i)
{
Utf8Stream stream (i->first.c_str());
uint32_t first = Misc::StringUtils::toUpper(stream.peek());
uint32_t first = toUpper(stream.peek());
if (first != character)
continue;
@ -323,6 +323,23 @@ struct JournalViewModelImpl : JournalViewModel
}
}
static uint32_t toUpper(uint32_t ch)
{
// Russian alphabet
if (ch >= 0x0430 && ch < 0x0450)
ch -= 0x20;
// Cyrillic IO character
if (ch == 0x0451)
ch -= 0x50;
// Latin alphabet
if (ch >= 0x61 && ch < 0x80)
ch -= 0x20;
return ch;
}
struct TopicEntryImpl : BaseEntry <MWDialogue::Topic::TEntryIter, TopicEntry>
{
MWDialogue::Topic const & mTopic;

18
components/misc/stringops.hpp
View File

@ -1,7 +1,6 @@
#ifndef MISC_STRINGOPS_H
#define MISC_STRINGOPS_H
#include <stdint.h>
#include <cctype>
#include <cstring>
#include <string>
@ -57,23 +56,6 @@ public:
};
}
static uint32_t toUpper(uint32_t ch)
{
// Russian alphabet
if (ch >= 0x0430 && ch < 0x0450)
ch -= 0x20;
// Cyrillic YO character
if (ch == 0x0451)
ch -= 0x50;
// Latin alphabet
if (ch >= 0x61 && ch < 0x80)
ch -= 0x20;
return ch;
}
static bool ciLess(const std::string &x, const std::string &y) {
return std::lexicographical_compare(x.begin(), x.end(), y.begin(), y.end(), ci());
}