godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-15 13:51:40 +00:00
Code Releases Wiki Activity

Bring that Whole New World to the Old Continent too

Browse Source 
Applies the clang-format style to the 2.1 branch as done for master in
5dbf1809c6.
This commit is contained in:
Rémi Verschelde
2017-03-19 00:36:26 +01:00
parent 1d418afe86
commit f8db8a3faa
1308 changed files with 147754 additions and 174357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

126
core/io/config_file.cpp
View File

@@ -27,8 +27,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "config_file.h"
#include "os/keyboard.h"
#include "os/file_access.h"
#include "os/keyboard.h"
#include "variant_parser.h"
StringArray ConfigFile::_get_sections() const {
@@ -37,35 +37,33 @@ StringArray ConfigFile::_get_sections() const {
get_sections(&s);
StringArray arr;
arr.resize(s.size());
int idx=0;
for(const List<String>::Element *E=s.front();E;E=E->next()) {
int idx = 0;
for (const List<String>::Element *E = s.front(); E; E = E->next()) {
arr.set(idx++,E->get());
arr.set(idx++, E->get());
}
return arr;
}
StringArray ConfigFile::_get_section_keys(const String& p_section) const{
StringArray ConfigFile::_get_section_keys(const String &p_section) const {
List<String> s;
get_section_keys(p_section,&s);
get_section_keys(p_section, &s);
StringArray arr;
arr.resize(s.size());
int idx=0;
for(const List<String>::Element *E=s.front();E;E=E->next()) {
int idx = 0;
for (const List<String>::Element *E = s.front(); E; E = E->next()) {
arr.set(idx++,E->get());
arr.set(idx++, E->get());
}
return arr;
}
void ConfigFile::set_value(const String &p_section, const String &p_key, const Variant &p_value) {
void ConfigFile::set_value(const String& p_section, const String& p_key, const Variant& p_value){
if (p_value.get_type()==Variant::NIL) {
if (p_value.get_type() == Variant::NIL) {
//erase
if (!values.has(p_section))
return; // ?
@@ -76,55 +74,49 @@ void ConfigFile::set_value(const String& p_section, const String& p_key, const V
} else {
if (!values.has(p_section)) {
values[p_section]=Map<String, Variant>();
values[p_section] = Map<String, Variant>();
}
values[p_section][p_key]=p_value;
values[p_section][p_key] = p_value;
}
}
Variant ConfigFile::get_value(const String& p_section, const String& p_key, Variant p_default) const {
Variant ConfigFile::get_value(const String &p_section, const String &p_key, Variant p_default) const {
ERR_FAIL_COND_V(!values.has(p_section),p_default);
ERR_FAIL_COND_V(!values[p_section].has(p_key),p_default);
ERR_FAIL_COND_V(!values.has(p_section), p_default);
ERR_FAIL_COND_V(!values[p_section].has(p_key), p_default);
return values[p_section][p_key];
}
bool ConfigFile::has_section(const String& p_section) const {
bool ConfigFile::has_section(const String &p_section) const {
return values.has(p_section);
}
bool ConfigFile::has_section_key(const String& p_section,const String& p_key) const {
bool ConfigFile::has_section_key(const String &p_section, const String &p_key) const {
if (!values.has(p_section))
return false;
return values[p_section].has(p_key);
}
void ConfigFile::get_sections(List<String> *r_sections) const{
void ConfigFile::get_sections(List<String> *r_sections) const {
for(const Map< String, Map<String, Variant> >::Element *E=values.front();E;E=E->next()) {
for (const Map<String, Map<String, Variant> >::Element *E = values.front(); E; E = E->next()) {
r_sections->push_back(E->key());
}
}
void ConfigFile::get_section_keys(const String& p_section,List<String> *r_keys) const{
void ConfigFile::get_section_keys(const String &p_section, List<String> *r_keys) const {
ERR_FAIL_COND(!values.has(p_section));
for(const Map<String, Variant> ::Element *E=values[p_section].front();E;E=E->next()) {
for (const Map<String, Variant>::Element *E = values[p_section].front(); E; E = E->next()) {
r_keys->push_back(E->key());
}
}
Error ConfigFile::save(const String& p_path){
Error ConfigFile::save(const String &p_path) {
Error err;
FileAccess *file = FileAccess::open(p_path,FileAccess::WRITE,&err);
FileAccess *file = FileAccess::open(p_path, FileAccess::WRITE, &err);
if (err) {
if (file)
@@ -132,18 +124,17 @@ Error ConfigFile::save(const String& p_path){
return err;
}
for (Map<String, Map<String, Variant> >::Element *E = values.front(); E; E = E->next()) {
for(Map< String, Map<String, Variant> >::Element *E=values.front();E;E=E->next()) {
if (E!=values.front())
if (E != values.front())
file->store_string("\n");
file->store_string("["+E->key()+"]\n\n");
file->store_string("[" + E->key() + "]\n\n");
for(Map<String, Variant>::Element *F=E->get().front();F;F=F->next()) {
for (Map<String, Variant>::Element *F = E->get().front(); F; F = F->next()) {
String vstr;
VariantWriter::write_to_string(F->get(),vstr);
file->store_string(F->key()+"="+vstr+"\n");
VariantWriter::write_to_string(F->get(), vstr);
file->store_string(F->key() + "=" + vstr + "\n");
}
}
@@ -152,48 +143,46 @@ Error ConfigFile::save(const String& p_path){
return OK;
}
Error ConfigFile::load(const String& p_path) {
Error ConfigFile::load(const String &p_path) {
Error err;
FileAccess *f= FileAccess::open(p_path,FileAccess::READ,&err);
FileAccess *f = FileAccess::open(p_path, FileAccess::READ, &err);
if (!f)
return ERR_CANT_OPEN;
VariantParser::StreamFile stream;
stream.f=f;
stream.f = f;
String assign;
Variant value;
VariantParser::Tag next_tag;
int lines=0;
int lines = 0;
String error_text;
String section;
while(true) {
while (true) {
assign=Variant();
assign = Variant();
next_tag.fields.clear();
next_tag.name=String();
next_tag.name = String();
err = VariantParser::parse_tag_assign_eof(&stream,lines,error_text,next_tag,assign,value,NULL,true);
if (err==ERR_FILE_EOF) {
err = VariantParser::parse_tag_assign_eof(&stream, lines, error_text, next_tag, assign, value, NULL, true);
if (err == ERR_FILE_EOF) {
memdelete(f);
return OK;
}
else if (err!=OK) {
ERR_PRINTS("ConfgFile::load - "+p_path+":"+itos(lines)+" error: "+error_text);
} else if (err != OK) {
ERR_PRINTS("ConfgFile::load - " + p_path + ":" + itos(lines) + " error: " + error_text);
memdelete(f);
return err;
}
if (assign!=String()) {
set_value(section,assign,value);
} else if (next_tag.name!=String()) {
section=next_tag.name;
if (assign != String()) {
set_value(section, assign, value);
} else if (next_tag.name != String()) {
section = next_tag.name;
}
}
@@ -202,25 +191,20 @@ Error ConfigFile::load(const String& p_path) {
return OK;
}
void ConfigFile::_bind_methods() {
ObjectTypeDB::bind_method(_MD("set_value", "section", "key", "value"), &ConfigFile::set_value);
ObjectTypeDB::bind_method(_MD("get_value:Variant", "section", "key", "default"), &ConfigFile::get_value, DEFVAL(Variant()));
void ConfigFile::_bind_methods(){
ObjectTypeDB::bind_method(_MD("has_section", "section"), &ConfigFile::has_section);
ObjectTypeDB::bind_method(_MD("has_section_key", "section", "key"), &ConfigFile::has_section_key);
ObjectTypeDB::bind_method(_MD("set_value","section","key","value"),&ConfigFile::set_value);
ObjectTypeDB::bind_method(_MD("get_value:Variant","section","key","default"),&ConfigFile::get_value,DEFVAL(Variant()));
ObjectTypeDB::bind_method(_MD("has_section","section"),&ConfigFile::has_section);
ObjectTypeDB::bind_method(_MD("has_section_key","section","key"),&ConfigFile::has_section_key);
ObjectTypeDB::bind_method(_MD("get_sections"),&ConfigFile::_get_sections);
ObjectTypeDB::bind_method(_MD("get_section_keys","section"),&ConfigFile::_get_section_keys);
ObjectTypeDB::bind_method(_MD("load:Error","path"),&ConfigFile::load);
ObjectTypeDB::bind_method(_MD("save:Error","path"),&ConfigFile::save);
ObjectTypeDB::bind_method(_MD("get_sections"), &ConfigFile::_get_sections);
ObjectTypeDB::bind_method(_MD("get_section_keys", "section"), &ConfigFile::_get_section_keys);
ObjectTypeDB::bind_method(_MD("load:Error", "path"), &ConfigFile::load);
ObjectTypeDB::bind_method(_MD("save:Error", "path"), &ConfigFile::save);
}
ConfigFile::ConfigFile()
{
ConfigFile::ConfigFile() {
}