loot/libloot
0
0
Fork 0
mirror of https://github.com/loot/libloot.git synced 2026-07-27 14:16:01 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rename MessageContent.Str() to Text()

Browse Source
This commit is contained in:
Oliver Hamlet
2016-07-13 20:48:18 +01:00
parent 9633031298
commit 93f9fa168b
9 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/api.cpp
+1 -1
View File
@@ -606,7 +606,7 @@ LOOT_API unsigned int loot_get_dirty_info(loot_db * const db, const char * const
messages.insert(messages.end(), temp.begin(), temp.end());
for (const auto& message : messages) {
if (boost::starts_with(message.ChooseContent(loot::Language::english).Str(), "Do not clean")) {
if (boost::starts_with(message.ChooseContent(loot::Language::english).Text(), "Do not clean")) {
*needsCleaning = loot_needs_cleaning_no;
break;
}
src/api/loot_db.cpp
+1 -1
View File
@@ -102,7 +102,7 @@ void loot_db::setPluginMessages(const std::list<loot::Message>& pluginMessages)
size_t i = 0;
for (const auto& message : pluginMessages) {
pluginMessageStrings[i] = message.ChooseContent(loot::Language::english).Str();
pluginMessageStrings[i] = message.ChooseContent(loot::Language::english).Text();
cPluginMessages[i].type = message.Type();
cPluginMessages[i].message = pluginMessageStrings[i].c_str();
src/backend/metadata/message.cpp
+2 -2
View File
@@ -57,7 +57,7 @@ namespace loot {
bool Message::operator < (const Message& rhs) const {
if (!_content.empty() && !rhs.Content().empty())
return boost::ilexicographical_compare(ChooseContent(Language::english).Str(), rhs.ChooseContent(Language::english).Str());
return boost::ilexicographical_compare(ChooseContent(Language::english).Text(), rhs.ChooseContent(Language::english).Text());
else if (_content.empty() && !rhs.Content().empty())
return true;
else
@@ -115,7 +115,7 @@ namespace YAML {
out << Key << "type" << Value << "error";
if (rhs.Content().size() == 1)
out << Key << "content" << Value << YAML::SingleQuoted << rhs.Content().front().Str();
out << Key << "content" << Value << YAML::SingleQuoted << rhs.Content().front().Text();
else
out << Key << "content" << Value << rhs.Content();
src/backend/metadata/message.h
+1 -1
View File
@@ -124,7 +124,7 @@ namespace YAML {
if (node["subs"]) {
std::vector<std::string> subs = node["subs"].as<std::vector<std::string>>();
for (auto& mc : content) {
boost::format f(mc.Str());
boost::format f(mc.Text());
for (const auto& sub : subs) {
f = f % sub;
src/backend/metadata/message_content.cpp
+4 -4
View File
@@ -34,7 +34,7 @@ namespace loot {
MessageContent::MessageContent(const std::string& str, const unsigned int language) : _str(str), _language(language) {}
std::string MessageContent::Str() const {
std::string MessageContent::Text() const {
return _str;
}
@@ -43,11 +43,11 @@ namespace loot {
}
bool MessageContent::operator < (const MessageContent& rhs) const {
return boost::ilexicographical_compare(_str, rhs.Str());
return boost::ilexicographical_compare(_str, rhs.Text());
}
bool MessageContent::operator == (const MessageContent& rhs) const {
return (boost::iequals(_str, rhs.Str()));
return (boost::iequals(_str, rhs.Text()));
}
}
@@ -57,7 +57,7 @@ namespace YAML {
out << Key << "lang" << Value << loot::Language(rhs.Language()).Locale();
out << Key << "str" << Value << YAML::SingleQuoted << rhs.Str();
out << Key << "str" << Value << YAML::SingleQuoted << rhs.Text();
out << EndMap;
src/backend/metadata/message_content.h
+2 -2
View File
@@ -36,7 +36,7 @@ namespace loot {
MessageContent();
MessageContent(const std::string& str, const unsigned int language);
std::string Str() const;
std::string Text() const;
unsigned int Language() const;
bool operator < (const MessageContent& rhs) const;
@@ -52,7 +52,7 @@ namespace YAML {
struct convert < loot::MessageContent > {
static Node encode(const loot::MessageContent& rhs) {
Node node;
node["str"] = rhs.Str();
node["str"] = rhs.Text();
node["lang"] = loot::Language(rhs.Language()).Locale();
return node;
src/tests/backend/metadata/message_content_test.h
+5 -5
View File
@@ -34,14 +34,14 @@ namespace loot {
TEST(MessageContent, defaultConstructorShouldSetEmptyEnglishLanguageString) {
MessageContent content;
EXPECT_TRUE(content.Str().empty());
EXPECT_TRUE(content.Text().empty());
EXPECT_EQ(Language::english, content.Language());
}
TEST(MessageContent, contentConstructorShouldStoreGivenStringAndLanguage) {
MessageContent content("content", Language::french);
EXPECT_EQ("content", content.Str());
EXPECT_EQ("content", content.Text());
EXPECT_EQ(Language::french, content.Language());
}
@@ -79,7 +79,7 @@ namespace loot {
emitter << content;
EXPECT_EQ("lang: " + Language(content.Language()).Locale() +
"\nstr: '" + content.Str() + "'", emitter.c_str());
"\nstr: '" + content.Text() + "'", emitter.c_str());
}
TEST(MessageContent, encodingAsYamlShouldOutputDataCorrectly) {
@@ -87,7 +87,7 @@ namespace loot {
YAML::Node node;
node = content;
EXPECT_EQ(content.Str(), node["str"].as<std::string>());
EXPECT_EQ(content.Text(), node["str"].as<std::string>());
EXPECT_EQ(Language(Language::french).Locale(), node["lang"].as<std::string>());
}
@@ -95,7 +95,7 @@ namespace loot {
YAML::Node node = YAML::Load("{str: content, lang: de}");
MessageContent content = node.as<MessageContent>();
EXPECT_EQ("content", content.Str());
EXPECT_EQ("content", content.Text());
EXPECT_EQ(Language::german, content.Language());
}
src/tests/backend/metadata/message_test.h
+1 -1
View File
@@ -52,7 +52,7 @@ namespace loot {
TEST_P(MessageTest, scalarContentConstructorShouldCreateAMessageWithASingleContentString) {
MessageContent content = MessageContent("content1", Language::english);
Message message(Message::warn, content.Str(), "condition1");
Message message(Message::warn, content.Text(), "condition1");
EXPECT_EQ(Message::warn, message.Type());
EXPECT_EQ(MessageContents({content}), message.Content());
src/tests/backend/metadata/plugin_dirty_info_test.h
+8 -8
View File
@@ -60,35 +60,35 @@ namespace loot {
TEST_P(PluginDirtyInfoTest, asMessageShouldOutputAllNonZeroCounts) {
Message message = PluginDirtyInfo(0x12345678, 2, 10, 30, "cleaner").AsMessage();
EXPECT_EQ(Message::warn, message.Type());
EXPECT_EQ("Contains 2 ITM records, 10 deleted references and 30 deleted navmeshes. Clean with cleaner.", message.ChooseContent(Language::english).Str());
EXPECT_EQ("Contains 2 ITM records, 10 deleted references and 30 deleted navmeshes. Clean with cleaner.", message.ChooseContent(Language::english).Text());
message = PluginDirtyInfo(0x12345678, 0, 0, 0, "cleaner").AsMessage();
EXPECT_EQ(Message::warn, message.Type());
EXPECT_EQ("Clean with cleaner.", message.ChooseContent(Language::english).Str());
EXPECT_EQ("Clean with cleaner.", message.ChooseContent(Language::english).Text());
message = PluginDirtyInfo(0x12345678, 0, 10, 30, "cleaner").AsMessage();
EXPECT_EQ(Message::warn, message.Type());
EXPECT_EQ("Contains 10 deleted references and 30 deleted navmeshes. Clean with cleaner.", message.ChooseContent(Language::english).Str());
EXPECT_EQ("Contains 10 deleted references and 30 deleted navmeshes. Clean with cleaner.", message.ChooseContent(Language::english).Text());
message = PluginDirtyInfo(0x12345678, 0, 0, 30, "cleaner").AsMessage();
EXPECT_EQ(Message::warn, message.Type());
EXPECT_EQ("Contains 30 deleted navmeshes. Clean with cleaner.", message.ChooseContent(Language::english).Str());
EXPECT_EQ("Contains 30 deleted navmeshes. Clean with cleaner.", message.ChooseContent(Language::english).Text());
message = PluginDirtyInfo(0x12345678, 0, 10, 0, "cleaner").AsMessage();
EXPECT_EQ(Message::warn, message.Type());
EXPECT_EQ("Contains 10 deleted references. Clean with cleaner.", message.ChooseContent(Language::english).Str());
EXPECT_EQ("Contains 10 deleted references. Clean with cleaner.", message.ChooseContent(Language::english).Text());
message = PluginDirtyInfo(0x12345678, 2, 0, 30, "cleaner").AsMessage();
EXPECT_EQ(Message::warn, message.Type());
EXPECT_EQ("Contains 2 ITM records and 30 deleted navmeshes. Clean with cleaner.", message.ChooseContent(Language::english).Str());
EXPECT_EQ("Contains 2 ITM records and 30 deleted navmeshes. Clean with cleaner.", message.ChooseContent(Language::english).Text());
message = PluginDirtyInfo(0x12345678, 2, 0, 0, "cleaner").AsMessage();
EXPECT_EQ(Message::warn, message.Type());
EXPECT_EQ("Contains 2 ITM records. Clean with cleaner.", message.ChooseContent(Language::english).Str());
EXPECT_EQ("Contains 2 ITM records. Clean with cleaner.", message.ChooseContent(Language::english).Text());
message = PluginDirtyInfo(0x12345678, 2, 10, 0, "cleaner").AsMessage();
EXPECT_EQ(Message::warn, message.Type());
EXPECT_EQ("Contains 2 ITM records and 10 deleted references. Clean with cleaner.", message.ChooseContent(Language::english).Str());
EXPECT_EQ("Contains 2 ITM records and 10 deleted references. Clean with cleaner.", message.ChooseContent(Language::english).Text());
}
TEST_P(PluginDirtyInfoTest, dirtyInfoShouldBeEqualIfCrcValuesAreEqual) {