2011-10-12 12:53:38 +02:00
|
|
|
/*
|
2013-02-24 18:40:43 +01:00
|
|
|
Minetest
|
2013-02-24 19:38:45 +01:00
|
|
|
Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
|
2011-10-12 12:53:38 +02:00
|
|
|
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
2012-06-05 16:56:56 +02:00
|
|
|
it under the terms of the GNU Lesser General Public License as published by
|
|
|
|
the Free Software Foundation; either version 2.1 of the License, or
|
2011-10-12 12:53:38 +02:00
|
|
|
(at your option) any later version.
|
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
2012-06-05 16:56:56 +02:00
|
|
|
GNU Lesser General Public License for more details.
|
2011-10-12 12:53:38 +02:00
|
|
|
|
2012-06-05 16:56:56 +02:00
|
|
|
You should have received a copy of the GNU Lesser General Public License along
|
2011-10-12 12:53:38 +02:00
|
|
|
with this program; if not, write to the Free Software Foundation, Inc.,
|
|
|
|
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#ifndef SETTINGS_HEADER
|
|
|
|
#define SETTINGS_HEADER
|
|
|
|
|
2012-06-17 03:00:31 +02:00
|
|
|
#include "irrlichttypes_bloated.h"
|
2013-08-11 04:09:45 +02:00
|
|
|
#include "exceptions.h"
|
2011-10-12 12:53:38 +02:00
|
|
|
#include <string>
|
|
|
|
#include <jmutex.h>
|
|
|
|
#include <jmutexautolock.h>
|
|
|
|
#include "strfnd.h"
|
|
|
|
#include <iostream>
|
|
|
|
#include <fstream>
|
|
|
|
#include <sstream>
|
|
|
|
#include "debug.h"
|
2011-10-16 13:57:53 +02:00
|
|
|
#include "log.h"
|
2012-06-17 01:40:36 +02:00
|
|
|
#include "util/string.h"
|
2013-01-18 20:12:19 +01:00
|
|
|
#include "porting.h"
|
2012-12-20 18:19:49 +01:00
|
|
|
#include <list>
|
|
|
|
#include <map>
|
|
|
|
#include <set>
|
2013-08-13 19:15:06 +02:00
|
|
|
#include "filesys.h"
|
2011-10-12 12:53:38 +02:00
|
|
|
|
|
|
|
enum ValueType
|
|
|
|
{
|
|
|
|
VALUETYPE_STRING,
|
|
|
|
VALUETYPE_FLAG // Doesn't take any arguments
|
|
|
|
};
|
|
|
|
|
|
|
|
struct ValueSpec
|
|
|
|
{
|
|
|
|
ValueSpec(ValueType a_type, const char *a_help=NULL)
|
|
|
|
{
|
|
|
|
type = a_type;
|
|
|
|
help = a_help;
|
|
|
|
}
|
|
|
|
ValueType type;
|
|
|
|
const char *help;
|
|
|
|
};
|
|
|
|
|
|
|
|
class Settings
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
Settings()
|
|
|
|
{
|
|
|
|
m_mutex.Init();
|
|
|
|
}
|
|
|
|
|
|
|
|
void writeLines(std::ostream &os)
|
|
|
|
{
|
|
|
|
JMutexAutoLock lock(m_mutex);
|
2012-12-31 08:01:16 +01:00
|
|
|
|
2012-12-20 18:19:49 +01:00
|
|
|
for(std::map<std::string, std::string>::iterator
|
|
|
|
i = m_settings.begin();
|
|
|
|
i != m_settings.end(); ++i)
|
2011-10-12 12:53:38 +02:00
|
|
|
{
|
2012-12-20 18:19:49 +01:00
|
|
|
std::string name = i->first;
|
|
|
|
std::string value = i->second;
|
2011-10-12 12:53:38 +02:00
|
|
|
os<<name<<" = "<<value<<"\n";
|
|
|
|
}
|
|
|
|
}
|
2012-12-08 18:10:54 +01:00
|
|
|
|
|
|
|
// return all keys used
|
|
|
|
std::vector<std::string> getNames(){
|
|
|
|
std::vector<std::string> names;
|
2012-12-20 18:19:49 +01:00
|
|
|
for(std::map<std::string, std::string>::iterator
|
|
|
|
i = m_settings.begin();
|
|
|
|
i != m_settings.end(); ++i)
|
2012-12-08 18:10:54 +01:00
|
|
|
{
|
2012-12-20 18:19:49 +01:00
|
|
|
names.push_back(i->first);
|
2012-12-08 18:10:54 +01:00
|
|
|
}
|
|
|
|
return names;
|
|
|
|
}
|
|
|
|
|
|
|
|
// remove a setting
|
|
|
|
bool remove(const std::string& name)
|
|
|
|
{
|
2012-12-20 18:19:49 +01:00
|
|
|
return m_settings.erase(name);
|
2012-12-08 18:10:54 +01:00
|
|
|
}
|
|
|
|
|
2011-10-12 12:53:38 +02:00
|
|
|
|
|
|
|
bool parseConfigLine(const std::string &line)
|
|
|
|
{
|
|
|
|
JMutexAutoLock lock(m_mutex);
|
2012-12-31 08:01:16 +01:00
|
|
|
|
2011-10-12 12:53:38 +02:00
|
|
|
std::string trimmedline = trim(line);
|
2012-12-31 08:01:16 +01:00
|
|
|
|
2011-11-29 13:13:57 +01:00
|
|
|
// Ignore empty lines and comments
|
|
|
|
if(trimmedline.size() == 0 || trimmedline[0] == '#')
|
2011-10-12 12:53:38 +02:00
|
|
|
return true;
|
|
|
|
|
2011-10-16 13:57:53 +02:00
|
|
|
//infostream<<"trimmedline=\""<<trimmedline<<"\""<<std::endl;
|
2011-10-12 12:53:38 +02:00
|
|
|
|
|
|
|
Strfnd sf(trim(line));
|
|
|
|
|
|
|
|
std::string name = sf.next("=");
|
|
|
|
name = trim(name);
|
|
|
|
|
|
|
|
if(name == "")
|
|
|
|
return true;
|
2012-12-31 08:01:16 +01:00
|
|
|
|
2011-10-12 12:53:38 +02:00
|
|
|
std::string value = sf.next("\n");
|
|
|
|
value = trim(value);
|
|
|
|
|
2011-10-16 13:57:53 +02:00
|
|
|
/*infostream<<"Config name=\""<<name<<"\" value=\""
|
2011-10-12 12:53:38 +02:00
|
|
|
<<value<<"\""<<std::endl;*/
|
2012-12-31 08:01:16 +01:00
|
|
|
|
2011-10-12 12:53:38 +02:00
|
|
|
m_settings[name] = value;
|
2012-12-31 08:01:16 +01:00
|
|
|
|
2011-10-12 12:53:38 +02:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2011-10-15 01:28:57 +02:00
|
|
|
void parseConfigLines(std::istream &is, const std::string &endstring)
|
|
|
|
{
|
|
|
|
for(;;){
|
|
|
|
if(is.eof())
|
|
|
|
break;
|
|
|
|
std::string line;
|
|
|
|
std::getline(is, line);
|
|
|
|
std::string trimmedline = trim(line);
|
|
|
|
if(endstring != ""){
|
|
|
|
if(trimmedline == endstring)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
parseConfigLine(line);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-10-12 12:53:38 +02:00
|
|
|
// Returns false on EOF
|
|
|
|
bool parseConfigObject(std::istream &is)
|
|
|
|
{
|
|
|
|
if(is.eof())
|
|
|
|
return false;
|
2012-12-31 08:01:16 +01:00
|
|
|
|
2011-10-12 12:53:38 +02:00
|
|
|
/*
|
|
|
|
NOTE: This function might be expanded to allow multi-line
|
|
|
|
settings.
|
|
|
|
*/
|
|
|
|
std::string line;
|
|
|
|
std::getline(is, line);
|
2011-10-16 13:57:53 +02:00
|
|
|
//infostream<<"got line: \""<<line<<"\""<<std::endl;
|
2011-10-12 12:53:38 +02:00
|
|
|
|
|
|
|
return parseConfigLine(line);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
Read configuration file
|
|
|
|
|
|
|
|
Returns true on success
|
|
|
|
*/
|
|
|
|
bool readConfigFile(const char *filename)
|
|
|
|
{
|
|
|
|
std::ifstream is(filename);
|
|
|
|
if(is.good() == false)
|
|
|
|
return false;
|
|
|
|
|
2012-05-20 16:19:48 +02:00
|
|
|
/*infostream<<"Parsing configuration file: \""
|
|
|
|
<<filename<<"\""<<std::endl;*/
|
2012-12-31 08:01:16 +01:00
|
|
|
|
2011-10-12 12:53:38 +02:00
|
|
|
while(parseConfigObject(is));
|
2012-12-31 08:01:16 +01:00
|
|
|
|
2011-10-12 12:53:38 +02:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
Reads a configuration object from stream (usually a single line)
|
|
|
|
and adds it to dst.
|
2012-12-31 08:01:16 +01:00
|
|
|
|
2011-10-12 12:53:38 +02:00
|
|
|
Preserves comments and empty lines.
|
|
|
|
|
|
|
|
Settings that were added to dst are also added to updated.
|
|
|
|
key of updated is setting name, value of updated is dummy.
|
|
|
|
|
|
|
|
Returns false on EOF
|
|
|
|
*/
|
|
|
|
bool getUpdatedConfigObject(std::istream &is,
|
2012-12-20 18:19:49 +01:00
|
|
|
std::list<std::string> &dst,
|
|
|
|
std::set<std::string> &updated,
|
2012-03-10 23:53:39 +01:00
|
|
|
bool &value_changed)
|
2011-10-12 12:53:38 +02:00
|
|
|
{
|
|
|
|
JMutexAutoLock lock(m_mutex);
|
2012-12-31 08:01:16 +01:00
|
|
|
|
2011-10-12 12:53:38 +02:00
|
|
|
if(is.eof())
|
|
|
|
return false;
|
2012-12-31 08:01:16 +01:00
|
|
|
|
2011-10-12 12:53:38 +02:00
|
|
|
// NOTE: This function will be expanded to allow multi-line settings
|
|
|
|
std::string line;
|
|
|
|
std::getline(is, line);
|
|
|
|
|
|
|
|
std::string trimmedline = trim(line);
|
|
|
|
|
|
|
|
std::string line_end = "";
|
|
|
|
if(is.eof() == false)
|
|
|
|
line_end = "\n";
|
2012-12-31 08:01:16 +01:00
|
|
|
|
2011-11-29 13:13:57 +01:00
|
|
|
// Ignore empty lines and comments
|
|
|
|
if(trimmedline.size() == 0 || trimmedline[0] == '#')
|
2011-10-12 12:53:38 +02:00
|
|
|
{
|
|
|
|
dst.push_back(line+line_end);
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
Strfnd sf(trim(line));
|
|
|
|
|
|
|
|
std::string name = sf.next("=");
|
|
|
|
name = trim(name);
|
|
|
|
|
|
|
|
if(name == "")
|
|
|
|
{
|
|
|
|
dst.push_back(line+line_end);
|
|
|
|
return true;
|
|
|
|
}
|
2012-12-31 08:01:16 +01:00
|
|
|
|
2011-10-12 12:53:38 +02:00
|
|
|
std::string value = sf.next("\n");
|
|
|
|
value = trim(value);
|
2012-12-31 08:01:16 +01:00
|
|
|
|
2012-12-20 18:19:49 +01:00
|
|
|
if(m_settings.find(name) != m_settings.end())
|
2011-10-12 12:53:38 +02:00
|
|
|
{
|
|
|
|
std::string newvalue = m_settings[name];
|
2012-12-31 08:01:16 +01:00
|
|
|
|
2011-10-12 12:53:38 +02:00
|
|
|
if(newvalue != value)
|
|
|
|
{
|
2011-10-16 13:57:53 +02:00
|
|
|
infostream<<"Changing value of \""<<name<<"\" = \""
|
2011-10-12 12:53:38 +02:00
|
|
|
<<value<<"\" -> \""<<newvalue<<"\""
|
|
|
|
<<std::endl;
|
2012-03-10 23:53:39 +01:00
|
|
|
value_changed = true;
|
2011-10-12 12:53:38 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
dst.push_back(name + " = " + newvalue + line_end);
|
|
|
|
|
2012-12-20 18:19:49 +01:00
|
|
|
updated.insert(name);
|
2011-10-12 12:53:38 +02:00
|
|
|
}
|
2013-01-22 19:00:48 +01:00
|
|
|
else //file contains a setting which is not in m_settings
|
|
|
|
value_changed=true;
|
|
|
|
|
2011-10-12 12:53:38 +02:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
Updates configuration file
|
|
|
|
|
|
|
|
Returns true on success
|
|
|
|
*/
|
|
|
|
bool updateConfigFile(const char *filename)
|
|
|
|
{
|
2011-10-16 13:57:53 +02:00
|
|
|
infostream<<"Updating configuration file: \""
|
2011-10-12 12:53:38 +02:00
|
|
|
<<filename<<"\""<<std::endl;
|
2012-12-31 08:01:16 +01:00
|
|
|
|
2012-12-20 18:19:49 +01:00
|
|
|
std::list<std::string> objects;
|
|
|
|
std::set<std::string> updated;
|
2012-03-10 23:53:39 +01:00
|
|
|
bool something_actually_changed = false;
|
2012-12-31 08:01:16 +01:00
|
|
|
|
2011-10-12 12:53:38 +02:00
|
|
|
// Read and modify stuff
|
|
|
|
{
|
|
|
|
std::ifstream is(filename);
|
|
|
|
if(is.good() == false)
|
|
|
|
{
|
2011-10-16 13:57:53 +02:00
|
|
|
infostream<<"updateConfigFile():"
|
2011-10-12 12:53:38 +02:00
|
|
|
" Error opening configuration file"
|
|
|
|
" for reading: \""
|
|
|
|
<<filename<<"\""<<std::endl;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2012-03-10 23:53:39 +01:00
|
|
|
while(getUpdatedConfigObject(is, objects, updated,
|
|
|
|
something_actually_changed));
|
2011-10-12 12:53:38 +02:00
|
|
|
}
|
|
|
|
}
|
2012-12-31 08:01:16 +01:00
|
|
|
|
2011-10-12 12:53:38 +02:00
|
|
|
JMutexAutoLock lock(m_mutex);
|
2012-12-31 08:01:16 +01:00
|
|
|
|
2012-03-10 23:53:39 +01:00
|
|
|
// If something not yet determined to have been changed, check if
|
|
|
|
// any new stuff was added
|
|
|
|
if(!something_actually_changed){
|
2012-12-20 18:19:49 +01:00
|
|
|
for(std::map<std::string, std::string>::iterator
|
|
|
|
i = m_settings.begin();
|
|
|
|
i != m_settings.end(); ++i)
|
2012-03-10 23:53:39 +01:00
|
|
|
{
|
2012-12-20 18:19:49 +01:00
|
|
|
if(updated.find(i->first) != updated.end())
|
2012-03-10 23:53:39 +01:00
|
|
|
continue;
|
|
|
|
something_actually_changed = true;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2012-12-31 08:01:16 +01:00
|
|
|
|
2012-03-10 23:53:39 +01:00
|
|
|
// If nothing was actually changed, skip writing the file
|
|
|
|
if(!something_actually_changed){
|
|
|
|
infostream<<"Skipping writing of "<<filename
|
|
|
|
<<" because content wouldn't be modified"<<std::endl;
|
|
|
|
return true;
|
|
|
|
}
|
2012-12-31 08:01:16 +01:00
|
|
|
|
2011-10-12 12:53:38 +02:00
|
|
|
// Write stuff back
|
|
|
|
{
|
2013-08-13 19:15:06 +02:00
|
|
|
std::ostringstream ss(std::ios_base::binary);
|
2012-12-31 08:01:16 +01:00
|
|
|
|
2011-10-12 12:53:38 +02:00
|
|
|
/*
|
|
|
|
Write updated stuff
|
|
|
|
*/
|
2012-12-20 18:19:49 +01:00
|
|
|
for(std::list<std::string>::iterator
|
2011-10-12 12:53:38 +02:00
|
|
|
i = objects.begin();
|
2012-12-20 18:19:49 +01:00
|
|
|
i != objects.end(); ++i)
|
2011-10-12 12:53:38 +02:00
|
|
|
{
|
2013-08-13 19:15:06 +02:00
|
|
|
ss<<(*i);
|
2011-10-12 12:53:38 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
Write stuff that was not already in the file
|
|
|
|
*/
|
2012-12-20 18:19:49 +01:00
|
|
|
for(std::map<std::string, std::string>::iterator
|
|
|
|
i = m_settings.begin();
|
|
|
|
i != m_settings.end(); ++i)
|
2011-10-12 12:53:38 +02:00
|
|
|
{
|
2012-12-20 18:19:49 +01:00
|
|
|
if(updated.find(i->first) != updated.end())
|
2011-10-12 12:53:38 +02:00
|
|
|
continue;
|
2012-12-20 18:19:49 +01:00
|
|
|
std::string name = i->first;
|
|
|
|
std::string value = i->second;
|
2011-10-16 13:57:53 +02:00
|
|
|
infostream<<"Adding \""<<name<<"\" = \""<<value<<"\""
|
2011-10-12 12:53:38 +02:00
|
|
|
<<std::endl;
|
2013-08-13 19:15:06 +02:00
|
|
|
ss<<name<<" = "<<value<<"\n";
|
|
|
|
}
|
|
|
|
|
|
|
|
if(!fs::safeWriteToFile(filename, ss.str()))
|
|
|
|
{
|
|
|
|
errorstream<<"Error writing configuration file: \""
|
|
|
|
<<filename<<"\""<<std::endl;
|
|
|
|
return false;
|
2011-10-12 12:53:38 +02:00
|
|
|
}
|
|
|
|
}
|
2012-12-31 08:01:16 +01:00
|
|
|
|
2011-10-12 12:53:38 +02:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
NOTE: Types of allowed_options are ignored
|
|
|
|
|
|
|
|
returns true on success
|
|
|
|
*/
|
|
|
|
bool parseCommandLine(int argc, char *argv[],
|
2012-12-20 18:19:49 +01:00
|
|
|
std::map<std::string, ValueSpec> &allowed_options)
|
2011-10-12 12:53:38 +02:00
|
|
|
{
|
2012-03-13 00:32:21 +01:00
|
|
|
int nonopt_index = 0;
|
2011-10-12 12:53:38 +02:00
|
|
|
int i=1;
|
|
|
|
for(;;)
|
|
|
|
{
|
|
|
|
if(i >= argc)
|
|
|
|
break;
|
|
|
|
std::string argname = argv[i];
|
|
|
|
if(argname.substr(0, 2) != "--")
|
|
|
|
{
|
2012-03-13 00:32:21 +01:00
|
|
|
// If option doesn't start with -, read it in as nonoptX
|
|
|
|
if(argname[0] != '-'){
|
|
|
|
std::string name = "nonopt";
|
|
|
|
name += itos(nonopt_index);
|
|
|
|
set(name, argname);
|
|
|
|
nonopt_index++;
|
|
|
|
i++;
|
|
|
|
continue;
|
|
|
|
}
|
2011-10-16 13:57:53 +02:00
|
|
|
errorstream<<"Invalid command-line parameter \""
|
2011-10-12 12:53:38 +02:00
|
|
|
<<argname<<"\": --<option> expected."<<std::endl;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
i++;
|
|
|
|
|
|
|
|
std::string name = argname.substr(2);
|
|
|
|
|
2012-12-20 18:19:49 +01:00
|
|
|
std::map<std::string, ValueSpec>::iterator n;
|
2011-10-12 12:53:38 +02:00
|
|
|
n = allowed_options.find(name);
|
2012-12-20 18:19:49 +01:00
|
|
|
if(n == allowed_options.end())
|
2011-10-12 12:53:38 +02:00
|
|
|
{
|
2011-10-16 13:57:53 +02:00
|
|
|
errorstream<<"Unknown command-line parameter \""
|
2011-10-12 12:53:38 +02:00
|
|
|
<<argname<<"\""<<std::endl;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2012-12-20 18:19:49 +01:00
|
|
|
ValueType type = n->second.type;
|
2011-10-12 12:53:38 +02:00
|
|
|
|
|
|
|
std::string value = "";
|
2012-12-31 08:01:16 +01:00
|
|
|
|
2011-10-12 12:53:38 +02:00
|
|
|
if(type == VALUETYPE_FLAG)
|
|
|
|
{
|
|
|
|
value = "true";
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if(i >= argc)
|
|
|
|
{
|
2011-10-16 13:57:53 +02:00
|
|
|
errorstream<<"Invalid command-line parameter \""
|
2011-10-12 12:53:38 +02:00
|
|
|
<<name<<"\": missing value"<<std::endl;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
value = argv[i];
|
|
|
|
i++;
|
|
|
|
}
|
2012-12-31 08:01:16 +01:00
|
|
|
|
2011-10-12 12:53:38 +02:00
|
|
|
|
2011-10-16 13:57:53 +02:00
|
|
|
infostream<<"Valid command-line parameter: \""
|
2011-10-12 12:53:38 +02:00
|
|
|
<<name<<"\" = \""<<value<<"\""
|
|
|
|
<<std::endl;
|
|
|
|
set(name, value);
|
|
|
|
}
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
void set(std::string name, std::string value)
|
|
|
|
{
|
|
|
|
JMutexAutoLock lock(m_mutex);
|
2012-12-31 08:01:16 +01:00
|
|
|
|
2011-10-12 12:53:38 +02:00
|
|
|
m_settings[name] = value;
|
|
|
|
}
|
|
|
|
|
|
|
|
void set(std::string name, const char *value)
|
|
|
|
{
|
|
|
|
JMutexAutoLock lock(m_mutex);
|
|
|
|
|
|
|
|
m_settings[name] = value;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void setDefault(std::string name, std::string value)
|
|
|
|
{
|
|
|
|
JMutexAutoLock lock(m_mutex);
|
2012-12-31 08:01:16 +01:00
|
|
|
|
2011-10-12 12:53:38 +02:00
|
|
|
m_defaults[name] = value;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool exists(std::string name)
|
|
|
|
{
|
|
|
|
JMutexAutoLock lock(m_mutex);
|
2012-12-31 08:01:16 +01:00
|
|
|
|
2012-12-20 18:19:49 +01:00
|
|
|
return (m_settings.find(name) != m_settings.end() || m_defaults.find(name) != m_defaults.end());
|
2011-10-12 12:53:38 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
std::string get(std::string name)
|
|
|
|
{
|
|
|
|
JMutexAutoLock lock(m_mutex);
|
2012-12-31 08:01:16 +01:00
|
|
|
|
2012-12-20 18:19:49 +01:00
|
|
|
std::map<std::string, std::string>::iterator n;
|
2011-10-12 12:53:38 +02:00
|
|
|
n = m_settings.find(name);
|
2012-12-20 18:19:49 +01:00
|
|
|
if(n == m_settings.end())
|
2011-10-12 12:53:38 +02:00
|
|
|
{
|
|
|
|
n = m_defaults.find(name);
|
2012-12-20 18:19:49 +01:00
|
|
|
if(n == m_defaults.end())
|
2011-10-12 12:53:38 +02:00
|
|
|
{
|
2013-03-12 21:41:14 +01:00
|
|
|
throw SettingNotFoundException(("Setting [" + name + "] not found ").c_str());
|
2011-10-12 12:53:38 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-12-20 18:19:49 +01:00
|
|
|
return n->second;
|
2011-10-12 12:53:38 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
bool getBool(std::string name)
|
|
|
|
{
|
|
|
|
return is_yes(get(name));
|
|
|
|
}
|
2012-12-31 08:01:16 +01:00
|
|
|
|
2011-10-12 12:53:38 +02:00
|
|
|
bool getFlag(std::string name)
|
|
|
|
{
|
|
|
|
try
|
|
|
|
{
|
|
|
|
return getBool(name);
|
|
|
|
}
|
|
|
|
catch(SettingNotFoundException &e)
|
|
|
|
{
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Asks if empty
|
|
|
|
bool getBoolAsk(std::string name, std::string question, bool def)
|
|
|
|
{
|
|
|
|
// If it is in settings
|
|
|
|
if(exists(name))
|
|
|
|
return getBool(name);
|
2012-12-31 08:01:16 +01:00
|
|
|
|
2011-10-12 12:53:38 +02:00
|
|
|
std::string s;
|
|
|
|
char templine[10];
|
|
|
|
std::cout<<question<<" [y/N]: ";
|
|
|
|
std::cin.getline(templine, 10);
|
|
|
|
s = templine;
|
|
|
|
|
|
|
|
if(s == "")
|
|
|
|
return def;
|
|
|
|
|
|
|
|
return is_yes(s);
|
|
|
|
}
|
|
|
|
|
|
|
|
float getFloat(std::string name)
|
|
|
|
{
|
|
|
|
return stof(get(name));
|
|
|
|
}
|
|
|
|
|
|
|
|
u16 getU16(std::string name)
|
|
|
|
{
|
|
|
|
return stoi(get(name), 0, 65535);
|
|
|
|
}
|
|
|
|
|
|
|
|
u16 getU16Ask(std::string name, std::string question, u16 def)
|
|
|
|
{
|
|
|
|
// If it is in settings
|
|
|
|
if(exists(name))
|
|
|
|
return getU16(name);
|
2012-12-31 08:01:16 +01:00
|
|
|
|
2011-10-12 12:53:38 +02:00
|
|
|
std::string s;
|
|
|
|
char templine[10];
|
|
|
|
std::cout<<question<<" ["<<def<<"]: ";
|
|
|
|
std::cin.getline(templine, 10);
|
|
|
|
s = templine;
|
|
|
|
|
|
|
|
if(s == "")
|
|
|
|
return def;
|
|
|
|
|
|
|
|
return stoi(s, 0, 65535);
|
|
|
|
}
|
|
|
|
|
|
|
|
s16 getS16(std::string name)
|
|
|
|
{
|
|
|
|
return stoi(get(name), -32768, 32767);
|
|
|
|
}
|
|
|
|
|
|
|
|
s32 getS32(std::string name)
|
|
|
|
{
|
|
|
|
return stoi(get(name));
|
|
|
|
}
|
|
|
|
|
|
|
|
v3f getV3F(std::string name)
|
|
|
|
{
|
|
|
|
v3f value;
|
|
|
|
Strfnd f(get(name));
|
|
|
|
f.next("(");
|
|
|
|
value.X = stof(f.next(","));
|
|
|
|
value.Y = stof(f.next(","));
|
|
|
|
value.Z = stof(f.next(")"));
|
|
|
|
return value;
|
|
|
|
}
|
|
|
|
|
2011-10-15 01:28:57 +02:00
|
|
|
v2f getV2F(std::string name)
|
|
|
|
{
|
|
|
|
v2f value;
|
|
|
|
Strfnd f(get(name));
|
|
|
|
f.next("(");
|
|
|
|
value.X = stof(f.next(","));
|
|
|
|
value.Y = stof(f.next(")"));
|
|
|
|
return value;
|
|
|
|
}
|
|
|
|
|
2011-10-12 12:53:38 +02:00
|
|
|
u64 getU64(std::string name)
|
|
|
|
{
|
|
|
|
u64 value = 0;
|
|
|
|
std::string s = get(name);
|
|
|
|
std::istringstream ss(s);
|
|
|
|
ss>>value;
|
|
|
|
return value;
|
|
|
|
}
|
|
|
|
|
2013-02-05 21:01:33 +01:00
|
|
|
u32 getFlagStr(std::string name, FlagDesc *flagdesc)
|
|
|
|
{
|
|
|
|
std::string val = get(name);
|
|
|
|
return (isdigit(val[0])) ? stoi(val) : readFlagString(val, flagdesc);
|
|
|
|
}
|
|
|
|
|
2013-05-19 05:26:27 +02:00
|
|
|
bool getStruct(std::string name, std::string format, void *out, size_t olen)
|
2012-12-31 08:01:16 +01:00
|
|
|
{
|
2013-05-19 05:26:27 +02:00
|
|
|
size_t len = olen;
|
2012-12-31 08:01:16 +01:00
|
|
|
std::vector<std::string *> strs_alloced;
|
|
|
|
std::string *str;
|
2013-01-06 20:40:24 +01:00
|
|
|
std::string valstr = get(name);
|
|
|
|
char *s = &valstr[0];
|
2013-05-19 05:26:27 +02:00
|
|
|
char *buf = new char[len];
|
|
|
|
char *bufpos = buf;
|
2012-12-31 08:01:16 +01:00
|
|
|
char *f, *snext;
|
|
|
|
size_t pos;
|
|
|
|
|
2013-01-06 20:40:24 +01:00
|
|
|
char *fmtpos, *fmt = &format[0];
|
|
|
|
while ((f = strtok_r(fmt, ",", &fmtpos)) && s) {
|
|
|
|
fmt = NULL;
|
|
|
|
|
2012-12-31 08:01:16 +01:00
|
|
|
bool is_unsigned = false;
|
|
|
|
int width = 0;
|
|
|
|
char valtype = *f;
|
|
|
|
|
|
|
|
width = (int)strtol(f + 1, &f, 10);
|
|
|
|
if (width && valtype == 's')
|
|
|
|
valtype = 'i';
|
|
|
|
|
2013-01-06 20:40:24 +01:00
|
|
|
switch (valtype) {
|
2012-12-31 08:01:16 +01:00
|
|
|
case 'u':
|
|
|
|
is_unsigned = true;
|
|
|
|
/* FALLTHROUGH */
|
|
|
|
case 'i':
|
|
|
|
if (width == 16) {
|
|
|
|
bufpos += PADDING(bufpos, u16);
|
2013-05-19 05:26:27 +02:00
|
|
|
if ((bufpos - buf) + sizeof(u16) <= len) {
|
2012-12-31 08:01:16 +01:00
|
|
|
if (is_unsigned)
|
|
|
|
*(u16 *)bufpos = (u16)strtoul(s, &s, 10);
|
|
|
|
else
|
|
|
|
*(s16 *)bufpos = (s16)strtol(s, &s, 10);
|
|
|
|
}
|
|
|
|
bufpos += sizeof(u16);
|
|
|
|
} else if (width == 32) {
|
|
|
|
bufpos += PADDING(bufpos, u32);
|
2013-05-19 05:26:27 +02:00
|
|
|
if ((bufpos - buf) + sizeof(u32) <= len) {
|
2012-12-31 08:01:16 +01:00
|
|
|
if (is_unsigned)
|
|
|
|
*(u32 *)bufpos = (u32)strtoul(s, &s, 10);
|
|
|
|
else
|
|
|
|
*(s32 *)bufpos = (s32)strtol(s, &s, 10);
|
|
|
|
}
|
|
|
|
bufpos += sizeof(u32);
|
|
|
|
} else if (width == 64) {
|
|
|
|
bufpos += PADDING(bufpos, u64);
|
2013-05-19 05:26:27 +02:00
|
|
|
if ((bufpos - buf) + sizeof(u64) <= len) {
|
2012-12-31 08:01:16 +01:00
|
|
|
if (is_unsigned)
|
|
|
|
*(u64 *)bufpos = (u64)strtoull(s, &s, 10);
|
|
|
|
else
|
|
|
|
*(s64 *)bufpos = (s64)strtoll(s, &s, 10);
|
|
|
|
}
|
|
|
|
bufpos += sizeof(u64);
|
|
|
|
}
|
|
|
|
s = strchr(s, ',');
|
|
|
|
break;
|
|
|
|
case 'b':
|
|
|
|
snext = strchr(s, ',');
|
|
|
|
if (snext)
|
|
|
|
*snext++ = 0;
|
|
|
|
|
|
|
|
bufpos += PADDING(bufpos, bool);
|
2013-05-19 05:26:27 +02:00
|
|
|
if ((bufpos - buf) + sizeof(bool) <= len)
|
2012-12-31 08:01:16 +01:00
|
|
|
*(bool *)bufpos = is_yes(std::string(s));
|
|
|
|
bufpos += sizeof(bool);
|
|
|
|
|
|
|
|
s = snext;
|
|
|
|
break;
|
|
|
|
case 'f':
|
|
|
|
bufpos += PADDING(bufpos, float);
|
2013-05-19 05:26:27 +02:00
|
|
|
if ((bufpos - buf) + sizeof(float) <= len)
|
2012-12-31 08:01:16 +01:00
|
|
|
*(float *)bufpos = strtof(s, &s);
|
|
|
|
bufpos += sizeof(float);
|
|
|
|
|
|
|
|
s = strchr(s, ',');
|
|
|
|
break;
|
|
|
|
case 's':
|
|
|
|
while (*s == ' ' || *s == '\t')
|
|
|
|
s++;
|
|
|
|
if (*s++ != '"') //error, expected string
|
|
|
|
goto fail;
|
|
|
|
snext = s;
|
|
|
|
|
|
|
|
while (snext[0] && !(snext[-1] != '\\' && snext[0] == '"'))
|
|
|
|
snext++;
|
|
|
|
*snext++ = 0;
|
|
|
|
|
|
|
|
bufpos += PADDING(bufpos, std::string *);
|
|
|
|
|
|
|
|
str = new std::string(s);
|
|
|
|
pos = 0;
|
|
|
|
while ((pos = str->find("\\\"", pos)) != std::string::npos)
|
|
|
|
str->erase(pos, 1);
|
|
|
|
|
2013-05-19 05:26:27 +02:00
|
|
|
if ((bufpos - buf) + sizeof(std::string *) <= len)
|
2012-12-31 08:01:16 +01:00
|
|
|
*(std::string **)bufpos = str;
|
|
|
|
bufpos += sizeof(std::string *);
|
|
|
|
strs_alloced.push_back(str);
|
|
|
|
|
|
|
|
s = *snext ? snext + 1 : NULL;
|
|
|
|
break;
|
|
|
|
case 'v':
|
|
|
|
while (*s == ' ' || *s == '\t')
|
|
|
|
s++;
|
|
|
|
if (*s++ != '(') //error, expected vector
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
if (width == 2) {
|
|
|
|
bufpos += PADDING(bufpos, v2f);
|
|
|
|
|
2013-05-19 05:26:27 +02:00
|
|
|
if ((bufpos - buf) + sizeof(v2f) <= len) {
|
2012-12-31 08:01:16 +01:00
|
|
|
v2f *v = (v2f *)bufpos;
|
|
|
|
v->X = strtof(s, &s);
|
|
|
|
s++;
|
|
|
|
v->Y = strtof(s, &s);
|
|
|
|
}
|
|
|
|
|
|
|
|
bufpos += sizeof(v2f);
|
|
|
|
} else if (width == 3) {
|
|
|
|
bufpos += PADDING(bufpos, v3f);
|
2013-05-19 05:26:27 +02:00
|
|
|
if ((bufpos - buf) + sizeof(v3f) <= len) {
|
2012-12-31 08:01:16 +01:00
|
|
|
v3f *v = (v3f *)bufpos;
|
|
|
|
v->X = strtof(s, &s);
|
|
|
|
s++;
|
|
|
|
v->Y = strtof(s, &s);
|
|
|
|
s++;
|
|
|
|
v->Z = strtof(s, &s);
|
|
|
|
}
|
|
|
|
|
|
|
|
bufpos += sizeof(v3f);
|
|
|
|
}
|
|
|
|
s = strchr(s, ',');
|
|
|
|
break;
|
|
|
|
default: //error, invalid format specifier
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (s && *s == ',')
|
|
|
|
s++;
|
|
|
|
|
2013-05-19 05:26:27 +02:00
|
|
|
if ((size_t)(bufpos - buf) > len) //error, buffer too small
|
2012-12-31 08:01:16 +01:00
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (f && *f) { //error, mismatched number of fields and values
|
|
|
|
fail:
|
2013-05-19 05:26:27 +02:00
|
|
|
for (size_t i = 0; i != strs_alloced.size(); i++)
|
2012-12-31 08:01:16 +01:00
|
|
|
delete strs_alloced[i];
|
2013-05-19 05:26:27 +02:00
|
|
|
delete[] buf;
|
|
|
|
return false;
|
2012-12-31 08:01:16 +01:00
|
|
|
}
|
|
|
|
|
2013-05-19 05:26:27 +02:00
|
|
|
memcpy(out, buf, olen);
|
|
|
|
delete[] buf;
|
|
|
|
return true;
|
2012-12-31 08:01:16 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
bool setStruct(std::string name, std::string format, void *value)
|
|
|
|
{
|
|
|
|
char sbuf[2048];
|
|
|
|
int sbuflen = sizeof(sbuf) - 1;
|
|
|
|
sbuf[sbuflen] = 0;
|
|
|
|
std::string str;
|
|
|
|
int pos = 0;
|
|
|
|
size_t fpos;
|
|
|
|
char *f;
|
|
|
|
|
|
|
|
char *bufpos = (char *)value;
|
2013-01-06 20:40:24 +01:00
|
|
|
char *fmtpos, *fmt = &format[0];
|
|
|
|
while ((f = strtok_r(fmt, ",", &fmtpos))) {
|
|
|
|
fmt = NULL;
|
2012-12-31 08:01:16 +01:00
|
|
|
bool is_unsigned = false;
|
2013-01-06 20:40:24 +01:00
|
|
|
int width = 0, nprinted = 0;
|
2012-12-31 08:01:16 +01:00
|
|
|
char valtype = *f;
|
|
|
|
|
|
|
|
width = (int)strtol(f + 1, &f, 10);
|
|
|
|
if (width && valtype == 's')
|
|
|
|
valtype = 'i';
|
|
|
|
|
|
|
|
switch (valtype) {
|
|
|
|
case 'u':
|
|
|
|
is_unsigned = true;
|
|
|
|
/* FALLTHROUGH */
|
|
|
|
case 'i':
|
|
|
|
if (width == 16) {
|
|
|
|
bufpos += PADDING(bufpos, u16);
|
|
|
|
nprinted = snprintf(sbuf + pos, sbuflen,
|
|
|
|
is_unsigned ? "%u, " : "%d, ",
|
|
|
|
*((u16 *)bufpos));
|
|
|
|
bufpos += sizeof(u16);
|
|
|
|
} else if (width == 32) {
|
|
|
|
bufpos += PADDING(bufpos, u32);
|
|
|
|
nprinted = snprintf(sbuf + pos, sbuflen,
|
|
|
|
is_unsigned ? "%u, " : "%d, ",
|
|
|
|
*((u32 *)bufpos));
|
|
|
|
bufpos += sizeof(u32);
|
|
|
|
} else if (width == 64) {
|
|
|
|
bufpos += PADDING(bufpos, u64);
|
|
|
|
nprinted = snprintf(sbuf + pos, sbuflen,
|
|
|
|
is_unsigned ? "%llu, " : "%lli, ",
|
2013-01-06 20:40:24 +01:00
|
|
|
(unsigned long long)*((u64 *)bufpos));
|
2012-12-31 08:01:16 +01:00
|
|
|
bufpos += sizeof(u64);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 'b':
|
|
|
|
bufpos += PADDING(bufpos, bool);
|
|
|
|
nprinted = snprintf(sbuf + pos, sbuflen, "%s, ",
|
|
|
|
*((bool *)bufpos) ? "true" : "false");
|
|
|
|
bufpos += sizeof(bool);
|
|
|
|
break;
|
|
|
|
case 'f':
|
|
|
|
bufpos += PADDING(bufpos, float);
|
|
|
|
nprinted = snprintf(sbuf + pos, sbuflen, "%f, ",
|
|
|
|
*((float *)bufpos));
|
|
|
|
bufpos += sizeof(float);
|
|
|
|
break;
|
|
|
|
case 's':
|
|
|
|
bufpos += PADDING(bufpos, std::string *);
|
|
|
|
str = **((std::string **)bufpos);
|
|
|
|
|
|
|
|
fpos = 0;
|
|
|
|
while ((fpos = str.find('"', fpos)) != std::string::npos) {
|
|
|
|
str.insert(fpos, 1, '\\');
|
|
|
|
fpos += 2;
|
|
|
|
}
|
|
|
|
|
|
|
|
nprinted = snprintf(sbuf + pos, sbuflen, "\"%s\", ",
|
|
|
|
(*((std::string **)bufpos))->c_str());
|
|
|
|
bufpos += sizeof(std::string *);
|
|
|
|
break;
|
|
|
|
case 'v':
|
|
|
|
if (width == 2) {
|
|
|
|
bufpos += PADDING(bufpos, v2f);
|
|
|
|
v2f *v = (v2f *)bufpos;
|
|
|
|
nprinted = snprintf(sbuf + pos, sbuflen,
|
|
|
|
"(%f, %f), ", v->X, v->Y);
|
|
|
|
bufpos += sizeof(v2f);
|
|
|
|
} else {
|
|
|
|
bufpos += PADDING(bufpos, v3f);
|
|
|
|
v3f *v = (v3f *)bufpos;
|
|
|
|
nprinted = snprintf(sbuf + pos, sbuflen,
|
|
|
|
"(%f, %f, %f), ", v->X, v->Y, v->Z);
|
|
|
|
bufpos += sizeof(v3f);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
if (nprinted < 0) //error, buffer too small
|
|
|
|
return false;
|
|
|
|
pos += nprinted;
|
|
|
|
sbuflen -= nprinted;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (pos >= 2)
|
|
|
|
sbuf[pos - 2] = 0;
|
|
|
|
|
|
|
|
set(name, std::string(sbuf));
|
|
|
|
return true;
|
|
|
|
}
|
2013-02-05 21:01:33 +01:00
|
|
|
|
|
|
|
void setFlagStr(std::string name, u32 flags, FlagDesc *flagdesc)
|
|
|
|
{
|
|
|
|
set(name, writeFlagString(flags, flagdesc));
|
|
|
|
}
|
2012-12-31 08:01:16 +01:00
|
|
|
|
2011-10-12 12:53:38 +02:00
|
|
|
void setBool(std::string name, bool value)
|
|
|
|
{
|
|
|
|
if(value)
|
|
|
|
set(name, "true");
|
|
|
|
else
|
|
|
|
set(name, "false");
|
|
|
|
}
|
|
|
|
|
|
|
|
void setFloat(std::string name, float value)
|
|
|
|
{
|
|
|
|
set(name, ftos(value));
|
|
|
|
}
|
|
|
|
|
|
|
|
void setV3F(std::string name, v3f value)
|
|
|
|
{
|
|
|
|
std::ostringstream os;
|
|
|
|
os<<"("<<value.X<<","<<value.Y<<","<<value.Z<<")";
|
|
|
|
set(name, os.str());
|
|
|
|
}
|
|
|
|
|
2011-10-15 01:28:57 +02:00
|
|
|
void setV2F(std::string name, v2f value)
|
|
|
|
{
|
|
|
|
std::ostringstream os;
|
|
|
|
os<<"("<<value.X<<","<<value.Y<<")";
|
|
|
|
set(name, os.str());
|
|
|
|
}
|
|
|
|
|
2012-11-26 03:16:48 +01:00
|
|
|
void setS16(std::string name, s16 value)
|
|
|
|
{
|
|
|
|
set(name, itos(value));
|
|
|
|
}
|
|
|
|
|
|
|
|
void setS32(std::string name, s32 value)
|
|
|
|
{
|
|
|
|
set(name, itos(value));
|
|
|
|
}
|
|
|
|
|
2011-10-12 12:53:38 +02:00
|
|
|
void setU64(std::string name, u64 value)
|
|
|
|
{
|
|
|
|
std::ostringstream os;
|
|
|
|
os<<value;
|
|
|
|
set(name, os.str());
|
|
|
|
}
|
|
|
|
|
|
|
|
void clear()
|
|
|
|
{
|
|
|
|
JMutexAutoLock lock(m_mutex);
|
2012-12-31 08:01:16 +01:00
|
|
|
|
2011-10-12 12:53:38 +02:00
|
|
|
m_settings.clear();
|
|
|
|
m_defaults.clear();
|
|
|
|
}
|
|
|
|
|
2011-10-15 01:28:57 +02:00
|
|
|
void updateValue(Settings &other, const std::string &name)
|
|
|
|
{
|
|
|
|
JMutexAutoLock lock(m_mutex);
|
2012-12-31 08:01:16 +01:00
|
|
|
|
2011-10-15 01:28:57 +02:00
|
|
|
if(&other == this)
|
|
|
|
return;
|
|
|
|
|
|
|
|
try{
|
|
|
|
std::string val = other.get(name);
|
|
|
|
m_settings[name] = val;
|
|
|
|
} catch(SettingNotFoundException &e){
|
|
|
|
}
|
|
|
|
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
void update(Settings &other)
|
|
|
|
{
|
|
|
|
JMutexAutoLock lock(m_mutex);
|
|
|
|
JMutexAutoLock lock2(other.m_mutex);
|
2012-12-31 08:01:16 +01:00
|
|
|
|
2011-10-15 01:28:57 +02:00
|
|
|
if(&other == this)
|
|
|
|
return;
|
|
|
|
|
2012-12-20 18:19:49 +01:00
|
|
|
m_settings.insert(other.m_settings.begin(), other.m_settings.end());
|
|
|
|
m_defaults.insert(other.m_defaults.begin(), other.m_defaults.end());
|
2011-10-15 01:28:57 +02:00
|
|
|
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2011-10-12 12:53:38 +02:00
|
|
|
Settings & operator+=(Settings &other)
|
|
|
|
{
|
|
|
|
JMutexAutoLock lock(m_mutex);
|
|
|
|
JMutexAutoLock lock2(other.m_mutex);
|
2012-12-31 08:01:16 +01:00
|
|
|
|
2011-10-12 12:53:38 +02:00
|
|
|
if(&other == this)
|
|
|
|
return *this;
|
|
|
|
|
2012-12-20 18:19:49 +01:00
|
|
|
update(other);
|
2011-10-12 12:53:38 +02:00
|
|
|
|
|
|
|
return *this;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
Settings & operator=(Settings &other)
|
|
|
|
{
|
|
|
|
JMutexAutoLock lock(m_mutex);
|
|
|
|
JMutexAutoLock lock2(other.m_mutex);
|
2012-12-31 08:01:16 +01:00
|
|
|
|
2011-10-12 12:53:38 +02:00
|
|
|
if(&other == this)
|
|
|
|
return *this;
|
|
|
|
|
|
|
|
clear();
|
|
|
|
(*this) += other;
|
2012-12-31 08:01:16 +01:00
|
|
|
|
2011-10-12 12:53:38 +02:00
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
|
|
|
|
private:
|
2012-12-20 18:19:49 +01:00
|
|
|
std::map<std::string, std::string> m_settings;
|
|
|
|
std::map<std::string, std::string> m_defaults;
|
2011-10-12 12:53:38 +02:00
|
|
|
// All methods that access m_settings/m_defaults directly should lock this.
|
|
|
|
JMutex m_mutex;
|
|
|
|
};
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|