From 38ef37c48eda7298c4a7b2d6cb274a4f0f80bd51 Mon Sep 17 00:00:00 2001
From: Unknown <robots_only_adrido@gmx.com>
Date: Fri, 22 Feb 2019 13:52:27 +0100
Subject: [PATCH] Use const ref in Settings Class

---
 Minetestmapper/Settings.cpp | 10 +++++-----
 Minetestmapper/Settings.h   | 12 ++++++------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Minetestmapper/Settings.cpp b/Minetestmapper/Settings.cpp
index 11d473b..0b3dfa6 100644
--- a/Minetestmapper/Settings.cpp
+++ b/Minetestmapper/Settings.cpp
@@ -2,14 +2,14 @@
 #include <iostream>
 #include "Settings.h"
 
-static std::string trim(const std::string s)
+static std::string trim(const std::string &s)
 {
     size_t start = s.find_first_not_of(" \t\r\n");
     size_t end = s.find_last_not_of(" \t\r\n");
     return s.substr(start, (end-start+1));
 }
 
-Settings::Settings(std::string filename, std::string msgName)
+Settings::Settings(const std::string &filename, const std::string &msgName)
 	:  m_filename(filename),
 	   m_messageName(msgName)
 {
@@ -25,7 +25,7 @@ Settings::~Settings(void)
 	m_file.close();
 }
 
-std::string Settings::get(std::string key)
+std::string Settings::get(const std::string &key)
 {
 	std::string value;
 	if (getGeneric(key, &value))
@@ -34,7 +34,7 @@ std::string Settings::get(std::string key)
 		throw std::runtime_error(std::string("Failed to read key '") + key + "' from file '" + m_messageName + "'");
 }
 
-std::string Settings::get(std::string key, std::string defaultValue)
+std::string Settings::get(const std::string &key, const std::string &defaultValue)
 {
 	std::string value;
 	if (getGeneric(key, &value))
@@ -43,7 +43,7 @@ std::string Settings::get(std::string key, std::string defaultValue)
 		return defaultValue;
 }
 
-bool Settings::getGeneric(std::string key, std::string *pvalue)
+bool Settings::getGeneric(const std::string &key, std::string *pvalue)
 {
 	std::string line;
 	int linenr = 0;
diff --git a/Minetestmapper/Settings.h b/Minetestmapper/Settings.h
index e8beade..e7cccaf 100644
--- a/Minetestmapper/Settings.h
+++ b/Minetestmapper/Settings.h
@@ -8,18 +8,18 @@
 
 class Settings {
 public:
-	Settings(std::string filename, std::string msgName = "");
+	Settings(const std::string &filename, const std::string &msgName = "");
 	~Settings(void);
-	std::string get(std::string key);
-	std::string get(std::string key, std::string defaultValue);
-	bool check(std::string key) { return getGeneric(key); }
-	bool check(std::string key, std::string &value) { return getGeneric(key, &value); }
+	std::string get(const std::string &key);
+	std::string get(const std::string &key, const std::string &defaultValue);
+	bool check(const std::string &key) { return getGeneric(key); }
+	bool check(const std::string &key, std::string &value) { return getGeneric(key, &value); }
 private:
 	std::string m_filename;
 	std::string m_messageName;
 	std::ifstream m_file;
 
-	bool getGeneric(std::string key, std::string *pvalue = NULL);
+	bool getGeneric(const std::string &key, std::string *pvalue = nullptr);
 };
 
 #endif // _SETTINGS_H_