Fixed the god-awful indentation

This commit is contained in:
mathusummut
2018-05-06 00:01:36 +02:00
parent 643e3820f5
commit 35b7b1f1a6
459 changed files with 204893 additions and 217545 deletions

View File

@@ -22,99 +22,127 @@ using std::vector;
using std::string;
using std::pair;
namespace Shared{ namespace Util{
namespace Shared {
namespace Util {
// =====================================================
// class Properties
//
/// ini-like file loader
// =====================================================
// =====================================================
// class Properties
//
/// ini-like file loader
// =====================================================
class Properties {
private:
static const int maxLine= 4096;
class Properties {
private:
static const int maxLine = 4096;
public:
typedef pair<string, string> PropertyPair;
typedef map<string, string> PropertyMap;
typedef vector<PropertyPair> PropertyVector;
public:
typedef pair<string, string> PropertyPair;
typedef map<string, string> PropertyMap;
typedef vector<PropertyPair> PropertyVector;
private:
PropertyVector propertyVector;
PropertyMap propertyMap;
PropertyVector propertyVectorTmp;
PropertyMap propertyMapTmp;
private:
PropertyVector propertyVector;
PropertyMap propertyMap;
PropertyVector propertyVectorTmp;
PropertyMap propertyMapTmp;
string path;
static string applicationPath;
static string applicationDataPath;
static string gameVersion;
string path;
static string applicationPath;
static string applicationDataPath;
static string gameVersion;
static string techtreePath;
static string scenarioPath;
static string tutorialPath;
static string techtreePath;
static string scenarioPath;
static string tutorialPath;
protected:
void processTextLine(bool is_utf8_language, char *lineBuffer);
protected:
void processTextLine(bool is_utf8_language, char *lineBuffer);
public:
static void setApplicationPath(string value) { applicationPath=value; }
static string getApplicationPath() { return applicationPath; }
public:
static void setApplicationPath(string value) {
applicationPath = value;
}
static string getApplicationPath() {
return applicationPath;
}
static void setApplicationDataPath(string value) { applicationDataPath=value; }
static string getApplicationDataPath() { return applicationDataPath; }
static void setApplicationDataPath(string value) {
applicationDataPath = value;
}
static string getApplicationDataPath() {
return applicationDataPath;
}
static void setGameVersion(string value) { gameVersion=value; }
static string getGameVersion() { return gameVersion; }
static void setGameVersion(string value) {
gameVersion = value;
}
static string getGameVersion() {
return gameVersion;
}
static void setTechtreePath(string value) { techtreePath=value; }
static string getTechtreePath() { return techtreePath; }
static void setScenarioPath(string value) { scenarioPath=value; }
static string getScenarioPath() { return scenarioPath; }
static void setTutorialPath(string value) { tutorialPath=value; }
static string getTutorialPath() { return tutorialPath; }
static void setTechtreePath(string value) {
techtreePath = value;
}
static string getTechtreePath() {
return techtreePath;
}
static void setScenarioPath(string value) {
scenarioPath = value;
}
static string getScenarioPath() {
return scenarioPath;
}
static void setTutorialPath(string value) {
tutorialPath = value;
}
static string getTutorialPath() {
return tutorialPath;
}
void clear();
void clear();
void loadFromText(const string &text);
void load(const string &path,bool clearCurrentProperties=true);
void save(const string &path);
void loadFromText(const string &text);
void load(const string &path, bool clearCurrentProperties = true);
void save(const string &path);
int getPropertyCount() const;
string getKey(int i) const;
string getString(int i) const;
int getPropertyCount() const;
string getKey(int i) const;
string getString(int i) const;
bool getBool(const string &key, const char *defaultValueIfNotFound=NULL) const;
int getInt(const string &key, const char *defaultValueIfNotFound=NULL) const;
int getInt(const string &key, int min, int max, const char *defaultValueIfNotFound=NULL) const;
float getFloat(const string &key, const char *defaultValueIfNotFound=NULL) const;
float getFloat(const string &key, float min, float max, const char *defaultValueIfNotFound=NULL) const;
bool getBool(const string &key, const char *defaultValueIfNotFound = NULL) const;
int getInt(const string &key, const char *defaultValueIfNotFound = NULL) const;
int getInt(const string &key, int min, int max, const char *defaultValueIfNotFound = NULL) const;
float getFloat(const string &key, const char *defaultValueIfNotFound = NULL) const;
float getFloat(const string &key, float min, float max, const char *defaultValueIfNotFound = NULL) const;
const string getString(const string &key, const char *defaultValueIfNotFound=NULL) const;
const string getString(const string &key, const char *defaultValueIfNotFound = NULL) const;
int getInt(const char *key,const char *defaultValueIfNotFound=NULL) const;
bool getBool(const char *key,const char *defaultValueIfNotFound=NULL) const;
float getFloat(const char *key,const char *defaultValueIfNotFound=NULL) const;
const string getString(const char *key,const char *defaultValueIfNotFound=NULL) const;
const string getRandomKey(const bool realrandom) const;
int getInt(const char *key, const char *defaultValueIfNotFound = NULL) const;
bool getBool(const char *key, const char *defaultValueIfNotFound = NULL) const;
float getFloat(const char *key, const char *defaultValueIfNotFound = NULL) const;
const string getString(const char *key, const char *defaultValueIfNotFound = NULL) const;
const string getRandomKey(const bool realrandom) const;
void setInt(const string &key, int value);
void setBool(const string &key, bool value);
void setFloat(const string &key, float value);
void setString(const string &key, const string &value);
void setInt(const string &key, int value);
void setBool(const string &key, bool value);
void setFloat(const string &key, float value);
void setString(const string &key, const string &value);
bool hasString(const string &key) const;
bool hasString(const string &key) const;
static bool applyTagsToValue(string &value, const std::map<string,string> *mapTagReplacementValues=NULL, bool skipUpdatePathClimbingParts=false);
static std::map<string,string> getTagReplacementValues(std::map<string,string> *mapExtraTagReplacementValues=NULL);
static bool isValuePathVariable(const string &value);
static void updateValuePathVariable(string &value, bool skipUpdatePathClimbingParts=false);
static bool applyTagsToValue(string &value, const std::map<string, string> *mapTagReplacementValues = NULL, bool skipUpdatePathClimbingParts = false);
static std::map<string, string> getTagReplacementValues(std::map<string, string> *mapExtraTagReplacementValues = NULL);
static bool isValuePathVariable(const string &value);
static void updateValuePathVariable(string &value, bool skipUpdatePathClimbingParts = false);
string getpath() const { return path;}
string getpath() const {
return path;
}
string toString();
};
string toString();
};
}}//end namespace
}
}//end namespace
#endif