thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

DEVTOOLS: Cleanup code.

Browse source
This commit is contained in:
Johannes Schickel 2015-12-12 06:13:48 +01:00
parent 3ad5ad57e2
commit c9d7299e65
2 changed files with 6 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
devtools/create_project/xcode.cpp
View file

@ -1042,7 +1042,7 @@ std::string XcodeProvider::writeProperty(const std::string &variable, Property &
if (settings.size() > 1 || (prop._flags & SettingsSingleItem)) if (settings.size() > 1 || (prop._flags & SettingsSingleItem))
output += (flags & SettingsSingleItem ? " " : "\t\t\t\t"); output += (flags & SettingsSingleItem ? " " : "\t\t\t\t");
output += writeSetting((*setting).first, (*setting).second); output += writeSetting(setting->first, setting->second);
// The combination of SettingsAsList, and SettingsSingleItem should use "," and not ";" (i.e children // The combination of SettingsAsList, and SettingsSingleItem should use "," and not ";" (i.e children
// in PBXGroup, so we special case that case here. // in PBXGroup, so we special case that case here.

15
devtools/create_project/xcode.h
View file

@ -120,15 +120,11 @@ private:
// Constructs a simple Property // Constructs a simple Property
explicit Property(std::string name, std::string value = "", std::string comment = "", int flgs = 0, int indent = 0, bool order = false) : _flags(flgs), _hasOrder(order) { explicit Property(std::string name, std::string value = "", std::string comment = "", int flgs = 0, int indent = 0, bool order = false) : _flags(flgs), _hasOrder(order) {
Setting setting(value, comment, _flags, indent); _settings[name] = Setting(value, comment, _flags, indent);
_settings[name] = setting;
} }
Property(std::string name, ValueList values, int flgs = 0, int indent = 0, bool order = false) : _flags(flgs), _hasOrder(order) { Property(std::string name, ValueList values, int flgs = 0, int indent = 0, bool order = false) : _flags(flgs), _hasOrder(order) {
Setting setting(values, _flags, indent); _settings[name] = Setting(values, _flags, indent);
_settings[name] = setting;
} }
OrderedSettingList getOrderedSettingList() { OrderedSettingList getOrderedSettingList() {
@ -188,10 +184,10 @@ private:
// Write each property // Write each property
for (PropertyList::iterator property = _properties.begin(); property != _properties.end(); ++property) { for (PropertyList::iterator property = _properties.begin(); property != _properties.end(); ++property) {
if ((*property).first == "isa") if (property->first == "isa")
continue; continue;
output += _parent->writeProperty((*property).first, (*property).second, flags); output += _parent->writeProperty(property->first, property->second, flags);
} }
if (flags & SettingsAsList) if (flags & SettingsAsList)
@ -212,8 +208,7 @@ private:
assert(!_properties["isa"]._settings.empty()); assert(!_properties["isa"]._settings.empty());
SettingList::iterator it = _properties["isa"]._settings.begin(); SettingList::iterator it = _properties["isa"]._settings.begin();
return it->first;
return (*it).first;
} }
}; };