[Scummvm-git-logs] scummvm master -> b9f4e1a6bd5cb3024bc24159d96e473b59842ee8

[lolbot-iichan]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
080b8dad89 GUI: Remove mistakenly used _("string")
b9f4e1a6bd ACHIEVEMENTS: Mark const methods as const


Commit: 080b8dad896c87b7391958798c951e850dbe5d36
    https://github.com/scummvm/scummvm/commit/080b8dad896c87b7391958798c951e850dbe5d36
Author: lb_ii (lolbot_iichan at mail.ru)
Date: 2021-06-02T01:21:37+03:00

Commit Message:
GUI: Remove mistakenly used _("string")

Changed paths:
    gui/options.cpp


diff --git a/gui/options.cpp b/gui/options.cpp
index 73fb6a4719..3744d1374a 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -1283,7 +1283,7 @@ void OptionsDialog::addStatisticsControls(GuiObject *boss, const Common::String
 
 		Common::String value = AchMan.getStatRaw(info.stats[idx].id);
 
-		Common::U32String str = Common::U32String::format(_("%s: %s"), key.c_str(), value.c_str());
+		Common::U32String str = Common::U32String::format("%s: %s", key.c_str(), value.c_str());
 		new StaticTextWidget(scrollContainer, lineHeight, yPos, width, yStep, str, Graphics::kTextAlignStart);
 
 		yPos += yStep;


Commit: b9f4e1a6bd5cb3024bc24159d96e473b59842ee8
    https://github.com/scummvm/scummvm/commit/b9f4e1a6bd5cb3024bc24159d96e473b59842ee8
Author: lb_ii (lolbot_iichan at mail.ru)
Date: 2021-06-02T01:21:37+03:00

Commit Message:
ACHIEVEMENTS: Mark const methods as const

Changed paths:
    common/achievements.cpp
    common/achievements.h


diff --git a/common/achievements.cpp b/common/achievements.cpp
index 09f91f41b9..d2e1033f05 100644
--- a/common/achievements.cpp
+++ b/common/achievements.cpp
@@ -151,7 +151,7 @@ bool AchievementsManager::clearAchievement(const String &id) {
 }
 
 
-bool AchievementsManager::setStatFloatEx(const String &id, float value, const String &section) {
+bool AchievementsManager::setStatFloatEx(const String &id, float value, const String &section) const {
 	if (!isReady()) {
 		return false;
 	}
@@ -163,7 +163,7 @@ bool AchievementsManager::setStatFloatEx(const String &id, float value, const St
 }
 
 
-float AchievementsManager::getStatFloatEx(const String &id, const String &section) {
+float AchievementsManager::getStatFloatEx(const String &id, const String &section) const {
 	if (!isReady()) {
 		return 0.0;
 	}
@@ -179,7 +179,7 @@ bool AchievementsManager::setStatFloat(const String &id, float value) {
 }
 
 
-float AchievementsManager::getStatFloat(const String &id) {
+float AchievementsManager::getStatFloat(const String &id) const {
 	return getStatFloatEx(id, "statistics");
 }
 
@@ -199,7 +199,7 @@ bool AchievementsManager::updateAverageRateStatFloat(const String &id, float cou
 }
 
 
-float AchievementsManager::getAverageRateStatFloat(const String &id) {
+float AchievementsManager::getAverageRateStatFloat(const String &id) const {
 	if (!isReady()) {
 		return 0.0;
 	}
@@ -223,7 +223,7 @@ bool AchievementsManager::setStatInt(String const &id, int value) {
 }
 
 
-int AchievementsManager::getStatInt(String const &id) {
+int AchievementsManager::getStatInt(String const &id) const {
 	if (!isReady()) {
 		return 0;
 	}
@@ -234,7 +234,7 @@ int AchievementsManager::getStatInt(String const &id) {
 }
 
 
-const String AchievementsManager::getStatRaw(String const &id) {
+const String AchievementsManager::getStatRaw(String const &id) const {
 	if (!isReady()) {
 		return "";
 	}
diff --git a/common/achievements.h b/common/achievements.h
index 61dd49aeec..3512c2ece3 100644
--- a/common/achievements.h
+++ b/common/achievements.h
@@ -136,7 +136,7 @@ public:
 	 *
 	 * @param[in] id Internal ID of the achievement.
 	 */
-	int getStatInt(const String &id);
+	int getStatInt(const String &id) const;
 
 	/**
 	 * Set a statistic to an integer number.
@@ -151,7 +151,7 @@ public:
 	 *
 	 * @param[in] id	Internal ID of the achievement.
 	 */
-	float getStatFloat(const String &id);
+	float getStatFloat(const String &id) const;
 
 	/**
 	 * Set a statistic to a float number.
@@ -166,7 +166,7 @@ public:
 	 *
 	 * @param[in] id	Internal ID of the achievement.
 	 */
-	const String getStatRaw(const String &id);
+	const String getStatRaw(const String &id) const;
 
 	/**
 	 * Get an average rate statistic (float).
@@ -174,7 +174,7 @@ public:
 	 *
 	 * @param[in] id	Internal ID of the achievement.
 	 */
-	float getAverageRateStatFloat(const String &id);
+	float getAverageRateStatFloat(const String &id) const;
 
 	/**
 	 * Update an average rate statistic (float). 
@@ -213,8 +213,8 @@ public:
 	/** @} */
 
 private:
-	float getStatFloatEx(const String &id, const String &section);
-	bool setStatFloatEx(const String &id, float value, const String &section);
+	float getStatFloatEx(const String &id, const String &section) const;
+	bool setStatFloatEx(const String &id, float value, const String &section) const;
 
 	INIFile *_iniFile;
 	String _iniFileName;