From 93f9fa168b89cda5c9c02e480326b212f30ebe15 Mon Sep 17 00:00:00 2001 From: Oliver Hamlet Date: Mon, 11 Jul 2016 19:07:47 +0100 Subject: [PATCH] Rename MessageContent.Str() to Text() --- src/api/api.cpp | 2 +- src/api/loot_db.cpp | 2 +- src/backend/metadata/message.cpp | 4 ++-- src/backend/metadata/message.h | 2 +- src/backend/metadata/message_content.cpp | 8 ++++---- src/backend/metadata/message_content.h | 4 ++-- .../backend/metadata/message_content_test.h | 10 +++++----- src/tests/backend/metadata/message_test.h | 2 +- .../backend/metadata/plugin_dirty_info_test.h | 16 ++++++++-------- 9 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/api/api.cpp b/src/api/api.cpp index 223d5257..593c26e7 100644 --- a/src/api/api.cpp +++ b/src/api/api.cpp @@ -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; } diff --git a/src/api/loot_db.cpp b/src/api/loot_db.cpp index d7e0ed55..2edf4d66 100644 --- a/src/api/loot_db.cpp +++ b/src/api/loot_db.cpp @@ -102,7 +102,7 @@ void loot_db::setPluginMessages(const std::list& 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(); diff --git a/src/backend/metadata/message.cpp b/src/backend/metadata/message.cpp index 69654f21..ca0d38ce 100644 --- a/src/backend/metadata/message.cpp +++ b/src/backend/metadata/message.cpp @@ -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(); diff --git a/src/backend/metadata/message.h b/src/backend/metadata/message.h index 374ce24c..3c5999fb 100644 --- a/src/backend/metadata/message.h +++ b/src/backend/metadata/message.h @@ -124,7 +124,7 @@ namespace YAML { if (node["subs"]) { std::vector subs = node["subs"].as>(); for (auto& mc : content) { - boost::format f(mc.Str()); + boost::format f(mc.Text()); for (const auto& sub : subs) { f = f % sub; diff --git a/src/backend/metadata/message_content.cpp b/src/backend/metadata/message_content.cpp index 6154a7b3..a715781f 100644 --- a/src/backend/metadata/message_content.cpp +++ b/src/backend/metadata/message_content.cpp @@ -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; diff --git a/src/backend/metadata/message_content.h b/src/backend/metadata/message_content.h index 28883894..215c72fc 100644 --- a/src/backend/metadata/message_content.h +++ b/src/backend/metadata/message_content.h @@ -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; diff --git a/src/tests/backend/metadata/message_content_test.h b/src/tests/backend/metadata/message_content_test.h index 3b6bc4fc..8879f557 100644 --- a/src/tests/backend/metadata/message_content_test.h +++ b/src/tests/backend/metadata/message_content_test.h @@ -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()); + EXPECT_EQ(content.Text(), node["str"].as()); EXPECT_EQ(Language(Language::french).Locale(), node["lang"].as()); } @@ -95,7 +95,7 @@ namespace loot { YAML::Node node = YAML::Load("{str: content, lang: de}"); MessageContent content = node.as(); - EXPECT_EQ("content", content.Str()); + EXPECT_EQ("content", content.Text()); EXPECT_EQ(Language::german, content.Language()); } diff --git a/src/tests/backend/metadata/message_test.h b/src/tests/backend/metadata/message_test.h index 1c6e2c3a..69010e43 100644 --- a/src/tests/backend/metadata/message_test.h +++ b/src/tests/backend/metadata/message_test.h @@ -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()); diff --git a/src/tests/backend/metadata/plugin_dirty_info_test.h b/src/tests/backend/metadata/plugin_dirty_info_test.h index fca0b811..a72160c5 100644 --- a/src/tests/backend/metadata/plugin_dirty_info_test.h +++ b/src/tests/backend/metadata/plugin_dirty_info_test.h @@ -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) {