DEVTOOL: Cleanup

This commit is contained in:
Vincent Bénony 2016-01-06 15:11:40 +01:00
parent a3346064ac
commit 4687ff6d6d
2 changed files with 6 additions and 5 deletions

View File

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

View File

@ -65,7 +65,7 @@ private:
std::string _sourceTree;
FileProperty(std::string fileType = "", std::string name = "", std::string path = "", std::string source = "")
: _fileEncoding(""), _lastKnownFileType(fileType), _fileName(name), _filePath(path), _sourceTree(source) {
: _fileEncoding(""), _lastKnownFileType(fileType), _fileName(name), _filePath(path), _sourceTree(source) {
}
};
@ -152,7 +152,7 @@ private:
struct Object {
public:
std::string _id; // Unique identifier for this object
std::string _name; // Name (may not be unique - for ex. configuration entries)
std::string _name; // Name (may not be unique - for ex. configuration entries)
std::string _refType; // Type of object this references (if any)
std::string _comment; // Main comment (empty for no comment)
@ -210,6 +210,7 @@ private:
assert(!_properties["isa"]._settings.empty());
SettingList::iterator it = _properties["isa"]._settings.begin();
return it->first;
}
};
@ -233,8 +234,8 @@ private:
}
Object *find(std::string id) {
for (std::vector<Object *>::iterator it = objects.begin(); it != objects.end(); ++it) {
if ((*it)->id == id) {
for (std::vector<Object *>::iterator it = _objects.begin(); it != _objects.end(); ++it) {
if ((*it)->_id == id) {
return *it;
}
}