aboutsummaryrefslogtreecommitdiff
path: root/src/common/Configuration/Config.h
diff options
context:
space:
mode:
authorariel- <ariel-@users.noreply.github.com>2017-06-19 23:20:06 -0300
committerariel- <ariel-@users.noreply.github.com>2017-06-19 23:20:06 -0300
commit85a7d5ce9ac68b30da2277cc91d4b70358f1880d (patch)
treedf3d2084ee2e35008903c03178039b9c986e2d08 /src/common/Configuration/Config.h
parent052fc24315ace866ea1cf610e85df119b68100c9 (diff)
Core: ported headers cleanup from master branch
Diffstat (limited to 'src/common/Configuration/Config.h')
-rw-r--r--src/common/Configuration/Config.h16
1 files changed, 3 insertions, 13 deletions
diff --git a/src/common/Configuration/Config.h b/src/common/Configuration/Config.h
index 1e0f558b007..df82a4e6668 100644
--- a/src/common/Configuration/Config.h
+++ b/src/common/Configuration/Config.h
@@ -20,12 +20,8 @@
#define CONFIG_H
#include "Define.h"
-
#include <string>
-#include <list>
#include <vector>
-#include <mutex>
-#include <boost/property_tree/ptree.hpp>
class TC_COMMON_API ConfigMgr
{
@@ -36,8 +32,7 @@ class TC_COMMON_API ConfigMgr
public:
/// Method used only for loading main configuration files (authserver.conf and worldserver.conf)
- bool LoadInitial(std::string const& file, std::vector<std::string> args,
- std::string& error);
+ bool LoadInitial(std::string const& file, std::vector<std::string> args, std::string& error);
static ConfigMgr* instance();
@@ -49,15 +44,10 @@ public:
float GetFloatDefault(std::string const& name, float def) const;
std::string const& GetFilename();
- std::vector<std::string> const& GetArguments() const { return _args; }
- std::list<std::string> GetKeysByString(std::string const& name);
+ std::vector<std::string> const& GetArguments() const;
+ std::vector<std::string> GetKeysByString(std::string const& name);
private:
- std::string _filename;
- std::vector<std::string> _args;
- boost::property_tree::ptree _config;
- std::mutex _configLock;
-
template<class T>
T GetValueDefault(std::string const& name, T def) const;
};