[Scummvm-cvs-logs] scummvm master -> 8392fe4f058d56d5a16ef5faad76e440ffa13400

lordhoto lordhoto at gmail.com
Sat Dec 12 07:03:58 CET 2015


This automated email contains information about 12 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
5d1df1c293 DEVTOOLS: Prefix varibles in structs/classes with '_' in xcode.[h/cpp].
50807b3b01 DEVTOOLS: Run astyle over xcode.[cpp/h].
3ad5ad57e2 DEVTOOLS: Use default copy constructor.
c9d7299e65 DEVTOOLS: Cleanup code.
d09c3e28a6 DEVTOOLS: Remove 'explicit' keyword from multi parameter constructors.
70a4047a78 DEVTOOLS: Adjust enum constant names to match our conventions.
c09a9aa1bf DEVTOOLS: Replace macro by function call.
2ef9ced7a9 DEVTOOLS: Silence compiler warnings in create_access.
410b5f3d34 DEVTOOLS: Silence compiler warning in convbdf.
e7f54aec7d COMMON: A few formatting fixes.
84ac8fa735 DEVTOOLS: A few formatting fixes.
8392fe4f05 DEVTOOLS: More formatting fixes in create_amazon.


Commit: 5d1df1c2933b110e8edbe94f153c5d4c0ca022d3
    https://github.com/scummvm/scummvm/commit/5d1df1c2933b110e8edbe94f153c5d4c0ca022d3
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2015-12-12T06:54:43+01:00

Commit Message:
DEVTOOLS: Prefix varibles in structs/classes with '_' in xcode.[h/cpp].

This silences some variables and increases consistency with our code
formatting conventions.

Changed paths:
    devtools/create_project/xcode.cpp
    devtools/create_project/xcode.h



diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp
index babd530..657adbc 100644
--- a/devtools/create_project/xcode.cpp
+++ b/devtools/create_project/xcode.cpp
@@ -42,42 +42,42 @@ namespace CreateProjectTool {
 	defines.push_back(name);
 
 #define ADD_SETTING(config, key, value) \
-	config.settings[key] = Setting(value, "", SettingsNoQuote);
+	config._settings[key] = Setting(value, "", SettingsNoQuote);
 
 #define ADD_SETTING_ORDER(config, key, value, order) \
-	config.settings[key] = Setting(value, "", SettingsNoQuote, 0, order);
+	config._settings[key] = Setting(value, "", SettingsNoQuote, 0, order);
 
 #define ADD_SETTING_ORDER_NOVALUE(config, key, comment, order) \
-	config.settings[key] = Setting("", comment, SettingsNoValue, 0, order);
+	config._settings[key] = Setting("", comment, SettingsNoValue, 0, order);
 
 #define ADD_SETTING_QUOTE(config, key, value) \
-	config.settings[key] = Setting(value);
+	config._settings[key] = Setting(value);
 
 #define ADD_SETTING_QUOTE_VAR(config, key, value) \
-	config.settings[key] = Setting(value, "", SettingsQuoteVariable);
+	config._settings[key] = Setting(value, "", SettingsQuoteVariable);
 
 #define ADD_SETTING_LIST(config, key, values, flags, indent) \
-	config.settings[key] = Setting(values, flags, indent);
+	config._settings[key] = Setting(values, flags, indent);
 
 #define REMOVE_SETTING(config, key) \
-	config.settings.erase(key);
+	config._settings.erase(key);
 
 #define ADD_BUILD_FILE(id, name, fileRefId, comment) { \
 	Object *buildFile = new Object(this, id, name, "PBXBuildFile", "PBXBuildFile", comment); \
 	buildFile->addProperty("fileRef", fileRefId, name, SettingsNoValue); \
 	_buildFile.add(buildFile); \
-	_buildFile.flags = SettingsSingleItem; \
+	_buildFile._flags = SettingsSingleItem; \
 }
 
 #define ADD_FILE_REFERENCE(id, name, properties) { \
 	Object *fileRef = new Object(this, id, name, "PBXFileReference", "PBXFileReference", name); \
-	if (!properties.fileEncoding.empty()) fileRef->addProperty("fileEncoding", properties.fileEncoding, "", SettingsNoValue); \
-	if (!properties.lastKnownFileType.empty()) fileRef->addProperty("lastKnownFileType", properties.lastKnownFileType, "", SettingsNoValue|SettingsQuoteVariable); \
-	if (!properties.fileName.empty()) fileRef->addProperty("name", properties.fileName, "", SettingsNoValue|SettingsQuoteVariable); \
-	if (!properties.filePath.empty()) fileRef->addProperty("path", properties.filePath, "", SettingsNoValue|SettingsQuoteVariable); \
-	if (!properties.sourceTree.empty()) fileRef->addProperty("sourceTree", properties.sourceTree, "", SettingsNoValue); \
+	if (!properties._fileEncoding.empty()) fileRef->addProperty("fileEncoding", properties._fileEncoding, "", SettingsNoValue); \
+	if (!properties._lastKnownFileType.empty()) fileRef->addProperty("lastKnownFileType", properties._lastKnownFileType, "", SettingsNoValue|SettingsQuoteVariable); \
+	if (!properties._fileName.empty()) fileRef->addProperty("name", properties._fileName, "", SettingsNoValue|SettingsQuoteVariable); \
+	if (!properties._filePath.empty()) fileRef->addProperty("path", properties._filePath, "", SettingsNoValue|SettingsQuoteVariable); \
+	if (!properties._sourceTree.empty()) fileRef->addProperty("sourceTree", properties._sourceTree, "", SettingsNoValue); \
 	_fileReference.add(fileRef); \
-	_fileReference.flags = SettingsSingleItem; \
+	_fileReference._flags = SettingsSingleItem; \
 }
 
 bool producesObjectFileOnOSX(const std::string &fileName) {
@@ -93,7 +93,7 @@ bool producesObjectFileOnOSX(const std::string &fileName) {
 }
 
 XcodeProvider::Group::Group(XcodeProvider *objectParent, const std::string &groupName, const std::string &uniqueName, const std::string &path) : Object(objectParent, uniqueName, groupName, "PBXGroup", "", groupName) {
-	addProperty("name", name, "", SettingsNoValue|SettingsQuoteVariable);
+	addProperty("name", _name, "", SettingsNoValue|SettingsQuoteVariable);
 	addProperty("sourceTree", "<group>", "", SettingsNoValue|SettingsQuoteVariable);
 	
 	if (path != "") {
@@ -106,43 +106,43 @@ XcodeProvider::Group::Group(XcodeProvider *objectParent, const std::string &grou
 void XcodeProvider::Group::ensureChildExists(const std::string &name) {
 	std::map<std::string, Group*>::iterator it = _childGroups.find(name);
 	if (it == _childGroups.end()) {
-		Group *child = new Group(parent, name, this->_treeName + '/' + name, name);
+		Group *child = new Group(_parent, name, this->_treeName + '/' + name, name);
 		_childGroups[name] = child;
 		addChildGroup(child);
-		parent->_groups.add(child);
+		_parent->_groups.add(child);
 	}
 }
 
 void XcodeProvider::Group::addChildInternal(const std::string &id, const std::string &comment) {
-	if (properties.find("children") == properties.end()) {
+	if (_properties.find("children") == _properties.end()) {
 		Property children;
-		children.hasOrder = true;
-		children.flags = SettingsAsList;
-		properties["children"] = children;
+		children._hasOrder = true;
+		children._flags = SettingsAsList;
+		_properties["children"] = children;
 	}
-	properties["children"].settings[id] = Setting("", comment + " in Sources", SettingsNoValue, 0, _childOrder++);
+	_properties["children"]._settings[id] = Setting("", comment + " in Sources", SettingsNoValue, 0, _childOrder++);
 	if (_childOrder == 1) {
 		// Force children to use () even when there is only 1 child.
 		// Also this enforces the use of "," after the single item, instead of ; (see writeProperty)
-		properties["children"].flags |= SettingsSingleItem;
+		_properties["children"]._flags |= SettingsSingleItem;
 	} else {
-		properties["children"].flags ^= SettingsSingleItem;
+		_properties["children"]._flags ^= SettingsSingleItem;
 	}
 
 }
 
 void XcodeProvider::Group::addChildGroup(const Group* group) {
-	addChildInternal(parent->getHash(group->_treeName), group->_treeName);
+	addChildInternal(_parent->getHash(group->_treeName), group->_treeName);
 }
 
 void XcodeProvider::Group::addChildFile(const std::string &name) {
 	std::string id = "FileReference_" + _treeName + "/" + name;
-	addChildInternal(parent->getHash(id), name);
+	addChildInternal(_parent->getHash(id), name);
 	FileProperty property = FileProperty(name, name, name, "\"<group>\"");
 
-	parent->addFileReference(id, name, property);
+	_parent->addFileReference(id, name, property);
 	if (producesObjectFileOnOSX(name)) {
-		parent->addBuildFile(_treeName + "/" + name, name, parent->getHash(id), name + " in Sources");
+		_parent->addBuildFile(_treeName + "/" + name, name, _parent->getHash(id), name + " in Sources");
 	}
 }
 
@@ -180,13 +180,13 @@ XcodeProvider::Group *XcodeProvider::touchGroupsForPath(const std::string &path)
 
 void XcodeProvider::addFileReference(const std::string &id, const std::string &name, FileProperty properties) {
 	Object *fileRef = new Object(this, id, name, "PBXFileReference", "PBXFileReference", name);
-	if (!properties.fileEncoding.empty()) fileRef->addProperty("fileEncoding", properties.fileEncoding, "", SettingsNoValue);
-	if (!properties.lastKnownFileType.empty()) fileRef->addProperty("lastKnownFileType", properties.lastKnownFileType, "", SettingsNoValue|SettingsQuoteVariable);
-	if (!properties.fileName.empty()) fileRef->addProperty("name", properties.fileName, "", SettingsNoValue|SettingsQuoteVariable);
-	if (!properties.filePath.empty()) fileRef->addProperty("path", properties.filePath, "", SettingsNoValue|SettingsQuoteVariable);
-	if (!properties.sourceTree.empty()) fileRef->addProperty("sourceTree", properties.sourceTree, "", SettingsNoValue);
+	if (!properties._fileEncoding.empty()) fileRef->addProperty("fileEncoding", properties._fileEncoding, "", SettingsNoValue);
+	if (!properties._lastKnownFileType.empty()) fileRef->addProperty("lastKnownFileType", properties._lastKnownFileType, "", SettingsNoValue|SettingsQuoteVariable);
+	if (!properties._fileName.empty()) fileRef->addProperty("name", properties._fileName, "", SettingsNoValue|SettingsQuoteVariable);
+	if (!properties._filePath.empty()) fileRef->addProperty("path", properties._filePath, "", SettingsNoValue|SettingsQuoteVariable);
+	if (!properties._sourceTree.empty()) fileRef->addProperty("sourceTree", properties._sourceTree, "", SettingsNoValue);
 	_fileReference.add(fileRef);
-	_fileReference.flags = SettingsSingleItem;
+	_fileReference._flags = SettingsSingleItem;
 }
 
 void XcodeProvider::addProductFileReference(const std::string &id, const std::string &name) {
@@ -196,7 +196,7 @@ void XcodeProvider::addProductFileReference(const std::string &id, const std::st
 	fileRef->addProperty("path", name, "", SettingsNoValue|SettingsQuoteVariable);
 	fileRef->addProperty("sourceTree", "BUILT_PRODUCTS_DIR", "", SettingsNoValue);
 	_fileReference.add(fileRef);
-	_fileReference.flags = SettingsSingleItem;
+	_fileReference._flags = SettingsSingleItem;
 }
 
 void XcodeProvider::addBuildFile(const std::string &id, const std::string &name, const std::string &fileRefId, const std::string &comment) {
@@ -204,7 +204,7 @@ void XcodeProvider::addBuildFile(const std::string &id, const std::string &name,
 	Object *buildFile = new Object(this, id, name, "PBXBuildFile", "PBXBuildFile", comment);
 	buildFile->addProperty("fileRef", fileRefId, name, SettingsNoValue);
 	_buildFile.add(buildFile);
-	_buildFile.flags = SettingsSingleItem;
+	_buildFile._flags = SettingsSingleItem;
 }
 
 XcodeProvider::XcodeProvider(StringList &global_warnings, std::map<std::string, StringList> &project_warnings, const int version)
@@ -343,14 +343,14 @@ void XcodeProvider::setupCopyFilesBuildPhase() {
  * (each native target has different build rules)
  */
 void XcodeProvider::setupFrameworksBuildPhase() {
-	_frameworksBuildPhase.comment = "PBXFrameworksBuildPhase";
+	_frameworksBuildPhase._comment = "PBXFrameworksBuildPhase";
 
 	// Just use a hardcoded id for the Frameworks-group
 	Group *frameworksGroup = new Group(this, "Frameworks", "PBXGroup_CustomTemplate_Frameworks_", "");
 
 	Property children;
-	children.hasOrder = true;
-	children.flags = SettingsAsList;
+	children._hasOrder = true;
+	children._flags = SettingsAsList;
 
 	// Setup framework file properties
 	std::map<std::string, FileProperty> properties;
@@ -380,7 +380,7 @@ void XcodeProvider::setupFrameworksBuildPhase() {
 	DEF_LOCALLIB_STATIC("libfreetype");
 //	DEF_LOCALLIB_STATIC("libmpeg2");
 
-	frameworksGroup->properties["children"] = children;
+	frameworksGroup->_properties["children"] = children;
 	_groups.add(frameworksGroup);
 	// Force this to be added as a sub-group in the root.
 	_rootSourceGroup->addChildGroup(frameworksGroup);
@@ -398,8 +398,8 @@ void XcodeProvider::setupFrameworksBuildPhase() {
 
 	// List of frameworks
 	Property iPhone_files;
-	iPhone_files.hasOrder = true;
-	iPhone_files.flags = SettingsAsList;
+	iPhone_files._hasOrder = true;
+	iPhone_files._flags = SettingsAsList;
 
 	ValueList frameworks_iPhone;
 	frameworks_iPhone.push_back("CoreAudio.framework");
@@ -423,7 +423,7 @@ void XcodeProvider::setupFrameworksBuildPhase() {
 		ADD_FILE_REFERENCE(*framework, *framework, properties[*framework]);
 	}
 
-	framework_iPhone->properties["files"] = iPhone_files;
+	framework_iPhone->_properties["files"] = iPhone_files;
 
 	_frameworksBuildPhase.add(framework_iPhone);
 #endif
@@ -436,8 +436,8 @@ void XcodeProvider::setupFrameworksBuildPhase() {
 
 	// List of frameworks
 	Property osx_files;
-	osx_files.hasOrder = true;
-	osx_files.flags = SettingsAsList;
+	osx_files._hasOrder = true;
+	osx_files._flags = SettingsAsList;
 
 	ValueList frameworks_osx;
 	frameworks_osx.push_back("CoreFoundation.framework");
@@ -465,7 +465,7 @@ void XcodeProvider::setupFrameworksBuildPhase() {
 		ADD_FILE_REFERENCE(*framework, *framework, properties[*framework]);
 	}
 
-	framework_OSX->properties["files"] = osx_files;
+	framework_OSX->_properties["files"] = osx_files;
 
 	_frameworksBuildPhase.add(framework_OSX);
 #ifdef ENABLE_IOS
@@ -478,8 +478,8 @@ void XcodeProvider::setupFrameworksBuildPhase() {
 
 	// List of frameworks
 	Property simulator_files;
-	simulator_files.hasOrder = true;
-	simulator_files.flags = SettingsAsList;
+	simulator_files._hasOrder = true;
+	simulator_files._flags = SettingsAsList;
 
 	ValueList frameworks_simulator;
 	frameworks_simulator.push_back("CoreAudio.framework");
@@ -500,14 +500,14 @@ void XcodeProvider::setupFrameworksBuildPhase() {
 		ADD_FILE_REFERENCE(*framework, *framework, properties[*framework]);
 	}
 
-	framework_simulator->properties["files"] = simulator_files;
+	framework_simulator->_properties["files"] = simulator_files;
 
 	_frameworksBuildPhase.add(framework_simulator);
 #endif
 }
 
 void XcodeProvider::setupNativeTarget() {
-	_nativeTarget.comment = "PBXNativeTarget";
+	_nativeTarget._comment = "PBXNativeTarget";
 
 	// Just use a hardcoded id for the Products-group
 	Group *productsGroup = new Group(this, "Products", "PBXGroup_CustomTemplate_Products_" , "");
@@ -523,12 +523,12 @@ void XcodeProvider::setupNativeTarget() {
 		target->addProperty("buildConfigurationList", getHash("XCConfigurationList_" + _targets[i]), "Build configuration list for PBXNativeTarget \"" + _targets[i] + "\"", SettingsNoValue);
 
 		Property buildPhases;
-		buildPhases.hasOrder = true;
-		buildPhases.flags = SettingsAsList;
-		buildPhases.settings[getHash("PBXResourcesBuildPhase_" + _targets[i])] = Setting("", "Resources", SettingsNoValue, 0, 0);
-		buildPhases.settings[getHash("PBXSourcesBuildPhase_" + _targets[i])] = Setting("", "Sources", SettingsNoValue, 0, 1);
-		buildPhases.settings[getHash("PBXFrameworksBuildPhase_" + _targets[i])] = Setting("", "Frameworks", SettingsNoValue, 0, 2);
-		target->properties["buildPhases"] = buildPhases;
+		buildPhases._hasOrder = true;
+		buildPhases._flags = SettingsAsList;
+		buildPhases._settings[getHash("PBXResourcesBuildPhase_" + _targets[i])] = Setting("", "Resources", SettingsNoValue, 0, 0);
+		buildPhases._settings[getHash("PBXSourcesBuildPhase_" + _targets[i])] = Setting("", "Sources", SettingsNoValue, 0, 1);
+		buildPhases._settings[getHash("PBXFrameworksBuildPhase_" + _targets[i])] = Setting("", "Frameworks", SettingsNoValue, 0, 2);
+		target->_properties["buildPhases"] = buildPhases;
 
 		target->addProperty("buildRules", "", "", SettingsNoValue|SettingsAsList);
 
@@ -548,7 +548,7 @@ void XcodeProvider::setupNativeTarget() {
 }
 
 void XcodeProvider::setupProject() {
-	_project.comment = "PBXProject";
+	_project._comment = "PBXProject";
 
 	Object *project = new Object(this, "PBXProject", "PBXProject", "PBXProject", "", "Project object");
 
@@ -559,12 +559,12 @@ void XcodeProvider::setupProject() {
 
 	// List of known regions
 	Property regions;
-	regions.flags = SettingsAsList;
+	regions._flags = SettingsAsList;
 	ADD_SETTING_ORDER_NOVALUE(regions, "English", "", 0);
 	ADD_SETTING_ORDER_NOVALUE(regions, "Japanese", "", 1);
 	ADD_SETTING_ORDER_NOVALUE(regions, "French", "", 2);
 	ADD_SETTING_ORDER_NOVALUE(regions, "German", "", 3);
-	project->properties["knownRegions"] = regions;
+	project->_properties["knownRegions"] = regions;
 
 	project->addProperty("mainGroup", _rootSourceGroup->getHashRef(), "CustomTemplate", SettingsNoValue);
 	project->addProperty("projectDirPath", _projectRoot, "", SettingsNoValue|SettingsQuoteVariable);
@@ -572,25 +572,25 @@ void XcodeProvider::setupProject() {
 
 	// List of targets
 	Property targets;
-	targets.flags = SettingsAsList;
+	targets._flags = SettingsAsList;
 #ifdef ENABLE_IOS
-	targets.settings[getHash("PBXNativeTarget_" + _targets[IOS_TARGET])] = Setting("", _targets[IOS_TARGET], SettingsNoValue, 0, 0);
+	targets._settings[getHash("PBXNativeTarget_" + _targets[IOS_TARGET])] = Setting("", _targets[IOS_TARGET], SettingsNoValue, 0, 0);
 #endif
-	targets.settings[getHash("PBXNativeTarget_" + _targets[OSX_TARGET])] = Setting("", _targets[OSX_TARGET], SettingsNoValue, 0, 1);
+	targets._settings[getHash("PBXNativeTarget_" + _targets[OSX_TARGET])] = Setting("", _targets[OSX_TARGET], SettingsNoValue, 0, 1);
 #ifdef ENABLE_IOS
-	targets.settings[getHash("PBXNativeTarget_" + _targets[SIM_TARGET])] = Setting("", _targets[SIM_TARGET], SettingsNoValue, 0, 2);
+	targets._settings[getHash("PBXNativeTarget_" + _targets[SIM_TARGET])] = Setting("", _targets[SIM_TARGET], SettingsNoValue, 0, 2);
 #endif
-	project->properties["targets"] = targets;
+	project->_properties["targets"] = targets;
 #ifndef ENABLE_IOS
 	// Force list even when there is only a single target
-	project->properties["targets"].flags |= SettingsSingleItem;
+	project->_properties["targets"]._flags |= SettingsSingleItem;
 #endif
 
 	_project.add(project);
 }
 
 void XcodeProvider::setupResourcesBuildPhase() {
-	_resourcesBuildPhase.comment = "PBXResourcesBuildPhase";
+	_resourcesBuildPhase._comment = "PBXResourcesBuildPhase";
 
 	// Setup resource file properties
 	std::map<std::string, FileProperty> properties;
@@ -619,8 +619,8 @@ void XcodeProvider::setupResourcesBuildPhase() {
 
 		// Add default files
 		Property files;
-		files.hasOrder = true;
-		files.flags = SettingsAsList;
+		files._hasOrder = true;
+		files._flags = SettingsAsList;
 
 		ValueList files_list;
 		files_list.push_back("scummclassic.zip");
@@ -651,14 +651,14 @@ void XcodeProvider::setupResourcesBuildPhase() {
 
 		// Add custom files depending on the target
 		if (_targets[i] == PROJECT_DESCRIPTION "-OS X") {
-			files.settings[getHash("PBXResources_" PROJECT_NAME ".icns")] = Setting("", PROJECT_NAME ".icns in Resources", SettingsNoValue, 0, 6);
+			files._settings[getHash("PBXResources_" PROJECT_NAME ".icns")] = Setting("", PROJECT_NAME ".icns in Resources", SettingsNoValue, 0, 6);
 
 			// Remove 2 iphone icon files
-			files.settings.erase(getHash("PBXResources_Default.png"));
-			files.settings.erase(getHash("PBXResources_icon.png"));
+			files._settings.erase(getHash("PBXResources_Default.png"));
+			files._settings.erase(getHash("PBXResources_icon.png"));
 		}
 
-		resource->properties["files"] = files;
+		resource->_properties["files"] = files;
 
 		resource->addProperty("runOnlyForDeploymentPostprocessing", "0", "", SettingsNoValue);
 
@@ -667,7 +667,7 @@ void XcodeProvider::setupResourcesBuildPhase() {
 }
 
 void XcodeProvider::setupSourcesBuildPhase() {
-	_sourcesBuildPhase.comment = "PBXSourcesBuildPhase";
+	_sourcesBuildPhase._comment = "PBXSourcesBuildPhase";
 
 	// Setup source file properties
 	std::map<std::string, FileProperty> properties;
@@ -679,19 +679,19 @@ void XcodeProvider::setupSourcesBuildPhase() {
 		source->addProperty("buildActionMask", "2147483647", "", SettingsNoValue);
 
 		Property files;
-		files.hasOrder = true;
-		files.flags = SettingsAsList;
+		files._hasOrder = true;
+		files._flags = SettingsAsList;
 
 		int order = 0;
-		for (std::vector<Object*>::iterator file = _buildFile.objects.begin(); file !=_buildFile.objects.end(); ++file) {
-			if (!producesObjectFileOnOSX((*file)->name)) {
+		for (std::vector<Object*>::iterator file = _buildFile._objects.begin(); file !=_buildFile._objects.end(); ++file) {
+			if (!producesObjectFileOnOSX((*file)->_name)) {
 				continue;
 			}
-			std::string comment = (*file)->name + " in Sources";
-			ADD_SETTING_ORDER_NOVALUE(files, getHash((*file)->id), comment, order++);
+			std::string comment = (*file)->_name + " in Sources";
+			ADD_SETTING_ORDER_NOVALUE(files, getHash((*file)->_id), comment, order++);
 		}
 
-		source->properties["files"] = files;
+		source->_properties["files"] = files;
 
 		source->addProperty("runOnlyForDeploymentPostprocessing", "0", "", SettingsNoValue);
 
@@ -702,8 +702,8 @@ void XcodeProvider::setupSourcesBuildPhase() {
 // Setup all build configurations
 void XcodeProvider::setupBuildConfiguration() {
 
-	_buildConfiguration.comment = "XCBuildConfiguration";
-	_buildConfiguration.flags = SettingsAsList;
+	_buildConfiguration._comment = "XCBuildConfiguration";
+	_buildConfiguration._flags = SettingsAsList;
 
 	///****************************************
 	// * iPhone
@@ -749,7 +749,7 @@ void XcodeProvider::setupBuildConfiguration() {
 	ADD_SETTING_QUOTE(iPhone_Debug, "TARGETED_DEVICE_FAMILY", "1,2");
 
 	iPhone_Debug_Object->addProperty("name", "Debug", "", SettingsNoValue);
-	iPhone_Debug_Object->properties["buildSettings"] = iPhone_Debug;
+	iPhone_Debug_Object->_properties["buildSettings"] = iPhone_Debug;
 
 	// Release
 	Object *iPhone_Release_Object = new Object(this, "XCBuildConfiguration_" PROJECT_DESCRIPTION "-iPhone_Release", _targets[IOS_TARGET] /* ScummVM-iPhone */, "XCBuildConfiguration", "PBXNativeTarget", "Release");
@@ -760,7 +760,7 @@ void XcodeProvider::setupBuildConfiguration() {
 	ADD_SETTING(iPhone_Release, "WRAPPER_EXTENSION", "app");
 
 	iPhone_Release_Object->addProperty("name", "Release", "", SettingsNoValue);
-	iPhone_Release_Object->properties["buildSettings"] = iPhone_Release;
+	iPhone_Release_Object->_properties["buildSettings"] = iPhone_Release;
 
 	_buildConfiguration.add(iPhone_Debug_Object);
 	_buildConfiguration.add(iPhone_Release_Object);
@@ -805,7 +805,7 @@ void XcodeProvider::setupBuildConfiguration() {
 	ADD_SETTING(scummvm_Debug, "SDKROOT", "macosx");
 
 	scummvm_Debug_Object->addProperty("name", "Debug", "", SettingsNoValue);
-	scummvm_Debug_Object->properties["buildSettings"] = scummvm_Debug;
+	scummvm_Debug_Object->_properties["buildSettings"] = scummvm_Debug;
 
 	// Release
 	Object *scummvm_Release_Object = new Object(this, "XCBuildConfiguration_" PROJECT_NAME "_Release", PROJECT_NAME, "XCBuildConfiguration", "PBXProject", "Release");
@@ -816,7 +816,7 @@ void XcodeProvider::setupBuildConfiguration() {
 	REMOVE_SETTING(scummvm_Release, "ONLY_ACTIVE_ARCH");
 
 	scummvm_Release_Object->addProperty("name", "Release", "", SettingsNoValue);
-	scummvm_Release_Object->properties["buildSettings"] = scummvm_Release;
+	scummvm_Release_Object->_properties["buildSettings"] = scummvm_Release;
 
 	_buildConfiguration.add(scummvm_Debug_Object);
 	_buildConfiguration.add(scummvm_Release_Object);
@@ -880,7 +880,7 @@ void XcodeProvider::setupBuildConfiguration() {
 	ADD_SETTING(scummvmOSX_Debug, "PRODUCT_NAME", PROJECT_DESCRIPTION);
 
 	scummvmOSX_Debug_Object->addProperty("name", "Debug", "", SettingsNoValue);
-	scummvmOSX_Debug_Object->properties["buildSettings"] = scummvmOSX_Debug;
+	scummvmOSX_Debug_Object->_properties["buildSettings"] = scummvmOSX_Debug;
 
 	// Release
 	Object *scummvmOSX_Release_Object = new Object(this, "XCBuildConfiguration_" PROJECT_DESCRIPTION "-OSX_Release", _targets[OSX_TARGET] /* ScummVM-OS X */, "XCBuildConfiguration", "PBXNativeTarget", "Release");
@@ -891,7 +891,7 @@ void XcodeProvider::setupBuildConfiguration() {
 	ADD_SETTING(scummvmOSX_Release, "WRAPPER_EXTENSION", "app");
 
 	scummvmOSX_Release_Object->addProperty("name", "Release", "", SettingsNoValue);
-	scummvmOSX_Release_Object->properties["buildSettings"] = scummvmOSX_Release;
+	scummvmOSX_Release_Object->_properties["buildSettings"] = scummvmOSX_Release;
 
 	_buildConfiguration.add(scummvmOSX_Debug_Object);
 	_buildConfiguration.add(scummvmOSX_Release_Object);
@@ -910,7 +910,7 @@ void XcodeProvider::setupBuildConfiguration() {
 	REMOVE_SETTING(scummvmSimulator_Debug, "TARGETED_DEVICE_FAMILY");
 
 	scummvmSimulator_Debug_Object->addProperty("name", "Debug", "", SettingsNoValue);
-	scummvmSimulator_Debug_Object->properties["buildSettings"] = scummvmSimulator_Debug;
+	scummvmSimulator_Debug_Object->_properties["buildSettings"] = scummvmSimulator_Debug;
 
 	// Release
 	Object *scummvmSimulator_Release_Object = new Object(this, "XCBuildConfiguration_" PROJECT_DESCRIPTION "-Simulator_Release", _targets[SIM_TARGET] /* ScummVM-Simulator */, "XCBuildConfiguration", "PBXNativeTarget", "Release");
@@ -921,28 +921,28 @@ void XcodeProvider::setupBuildConfiguration() {
 	ADD_SETTING(scummvmSimulator_Release, "WRAPPER_EXTENSION", "app");
 
 	scummvmSimulator_Release_Object->addProperty("name", "Release", "", SettingsNoValue);
-	scummvmSimulator_Release_Object->properties["buildSettings"] = scummvmSimulator_Release;
+	scummvmSimulator_Release_Object->_properties["buildSettings"] = scummvmSimulator_Release;
 
 	_buildConfiguration.add(scummvmSimulator_Debug_Object);
 	_buildConfiguration.add(scummvmSimulator_Release_Object);
 
 	//////////////////////////////////////////////////////////////////////////
 	// Configuration List
-	_configurationList.comment = "XCConfigurationList";
-	_configurationList.flags = SettingsAsList;
+	_configurationList._comment = "XCConfigurationList";
+	_configurationList._flags = SettingsAsList;
 #endif
 	// Warning: This assumes we have all configurations with a Debug & Release pair
-	for (std::vector<Object *>::iterator config = _buildConfiguration.objects.begin(); config != _buildConfiguration.objects.end(); config++) {
+	for (std::vector<Object *>::iterator config = _buildConfiguration._objects.begin(); config != _buildConfiguration._objects.end(); config++) {
 
-		Object *configList = new Object(this, "XCConfigurationList_" + (*config)->name, (*config)->name, "XCConfigurationList", "", "Build configuration list for " +  (*config)->refType + " \"" + (*config)->name + "\"");
+		Object *configList = new Object(this, "XCConfigurationList_" + (*config)->_name, (*config)->_name, "XCConfigurationList", "", "Build configuration list for " +  (*config)->_refType + " \"" + (*config)->_name + "\"");
 
 		Property buildConfigs;
-		buildConfigs.flags = SettingsAsList;
+		buildConfigs._flags = SettingsAsList;
 
-		buildConfigs.settings[getHash((*config)->id)] = Setting("", "Debug", SettingsNoValue, 0, 0);
-		buildConfigs.settings[getHash((*(++config))->id)] = Setting("", "Release", SettingsNoValue, 0, 1);
+		buildConfigs._settings[getHash((*config)->_id)] = Setting("", "Debug", SettingsNoValue, 0, 0);
+		buildConfigs._settings[getHash((*(++config))->_id)] = Setting("", "Release", SettingsNoValue, 0, 1);
 
-		configList->properties["buildConfigurations"] = buildConfigs;
+		configList->_properties["buildConfigurations"] = buildConfigs;
 
 		configList->addProperty("defaultConfigurationIsVisible", "0", "", SettingsNoValue);
 		configList->addProperty("defaultConfigurationName", "Release", "", SettingsNoValue);
@@ -1034,28 +1034,28 @@ std::string XcodeProvider::writeProperty(const std::string &variable, Property &
 
 	output += (flags & SettingsSingleItem ? "" : "\t\t\t") + variable + " = ";
 
-	if (prop.settings.size() > 1 || (prop.flags & SettingsSingleItem))
-		output += (prop.flags & SettingsAsList) ? "(\n" : "{\n";
+	if (prop._settings.size() > 1 || (prop._flags & SettingsSingleItem))
+		output += (prop._flags & SettingsAsList) ? "(\n" : "{\n";
 
 	OrderedSettingList settings = prop.getOrderedSettingList();
 	for (OrderedSettingList::const_iterator setting = settings.begin(); setting != settings.end(); ++setting) {
-		if (settings.size() > 1 || (prop.flags & SettingsSingleItem))
+		if (settings.size() > 1 || (prop._flags & SettingsSingleItem))
 			output += (flags & SettingsSingleItem ? " " : "\t\t\t\t");
 
 		output += writeSetting((*setting).first, (*setting).second);
 
 		// The combination of SettingsAsList, and SettingsSingleItem should use "," and not ";" (i.e children
 		// in PBXGroup, so we special case that case here.
-		if ((prop.flags & SettingsAsList) && (prop.settings.size() > 1 || (prop.flags & SettingsSingleItem))) {
-			output += (prop.settings.size() > 0) ? ",\n" : "\n";
+		if ((prop._flags & SettingsAsList) && (prop._settings.size() > 1 || (prop._flags & SettingsSingleItem))) {
+			output += (prop._settings.size() > 0) ? ",\n" : "\n";
 		} else {
 			output += ";";
 			output += (flags & SettingsSingleItem ? " " : "\n");
 		}
 	}
 
-	if (prop.settings.size() > 1 || (prop.flags & SettingsSingleItem))
-		output += (prop.flags & SettingsAsList) ? "\t\t\t);\n" : "\t\t\t};\n";
+	if (prop._settings.size() > 1 || (prop._flags & SettingsSingleItem))
+		output += (prop._flags & SettingsAsList) ? "\t\t\t);\n" : "\t\t\t};\n";
 
 	return output;
 }
@@ -1068,32 +1068,32 @@ std::string XcodeProvider::writeSetting(const std::string &variable, std::string
 // XCode project generator pbuilder_pbx.cpp, writeSettings() (under LGPL 2.1)
 std::string XcodeProvider::writeSetting(const std::string &variable, const Setting &setting) const {
 	std::string output;
-	const std::string quote = (setting.flags & SettingsNoQuote) ? "" : "\"";
+	const std::string quote = (setting._flags & SettingsNoQuote) ? "" : "\"";
 	const std::string escape_quote = quote.empty() ? "" : "\\" + quote;
 	std::string newline = "\n";
 
 	// Get indent level
-	for (int i = 0; i < setting.indent; ++i)
+	for (int i = 0; i < setting._indent; ++i)
 		newline += "\t";
 
 	// Setup variable
-	std::string var = (setting.flags & SettingsQuoteVariable) ? "\"" + variable + "\"" : variable;
+	std::string var = (setting._flags & SettingsQuoteVariable) ? "\"" + variable + "\"" : variable;
 
 	// Output a list
-	if (setting.flags & SettingsAsList) {
+	if (setting._flags & SettingsAsList) {
 
-		output += var + ((setting.flags & SettingsNoValue) ? "(" : " = (") + newline;
+		output += var + ((setting._flags & SettingsNoValue) ? "(" : " = (") + newline;
 
-		for (unsigned int i = 0, count = 0; i < setting.entries.size(); ++i) {
+		for (unsigned int i = 0, count = 0; i < setting._entries.size(); ++i) {
 
-			std::string value = setting.entries.at(i).value;
+			std::string value = setting._entries.at(i)._value;
 			if (!value.empty()) {
 				if (count++ > 0)
 					output += "," + newline;
 
 				output += quote + replace(value, quote, escape_quote) + quote;
 
-				std::string comment = setting.entries.at(i).comment;
+				std::string comment = setting._entries.at(i)._comment;
 				if (!comment.empty())
 					output += " /* " + comment + " */";
 			}
@@ -1101,24 +1101,24 @@ std::string XcodeProvider::writeSetting(const std::string &variable, const Setti
 		}
 		// Add closing ")" on new line
 		newline.resize(newline.size() - 1);
-		output += (setting.flags & SettingsNoValue) ? "\t\t\t)" : "," + newline + ")";
+		output += (setting._flags & SettingsNoValue) ? "\t\t\t)" : "," + newline + ")";
 	} else {
 		output += var;
 
-		output += (setting.flags & SettingsNoValue) ? "" : " = " + quote;
+		output += (setting._flags & SettingsNoValue) ? "" : " = " + quote;
 
-		for(unsigned int i = 0; i < setting.entries.size(); ++i) {
-			std::string value = setting.entries.at(i).value;
+		for(unsigned int i = 0; i < setting._entries.size(); ++i) {
+			std::string value = setting._entries.at(i)._value;
 			if(i)
 				output += " ";
 			output += value;
 
-			std::string comment = setting.entries.at(i).comment;
+			std::string comment = setting._entries.at(i)._comment;
 			if (!comment.empty())
 				output += " /* " + comment + " */";
 		}
 
-		output += (setting.flags & SettingsNoValue) ? "" : quote;
+		output += (setting._flags & SettingsNoValue) ? "" : quote;
 	}
 	return output;
 }
diff --git a/devtools/create_project/xcode.h b/devtools/create_project/xcode.h
index 2686d14..00ed9ff 100644
--- a/devtools/create_project/xcode.h
+++ b/devtools/create_project/xcode.h
@@ -56,14 +56,14 @@ private:
 
 	// File properties
 	struct FileProperty {
-		std::string fileEncoding;
-		std::string lastKnownFileType;
-		std::string fileName;
-		std::string filePath;
-		std::string sourceTree;
+		std::string _fileEncoding;
+		std::string _lastKnownFileType;
+		std::string _fileName;
+		std::string _filePath;
+		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)
 		{
 		}
 	};
@@ -73,33 +73,33 @@ private:
 	typedef std::vector<std::string> ValueList;
 
 	struct Entry {
-		std::string value;
-		std::string comment;
+		std::string _value;
+		std::string _comment;
 
-		Entry(std::string val, std::string cmt) : value(val), comment(cmt) {}
+		Entry(std::string val, std::string cmt) : _value(val), _comment(cmt) {}
 	};
 
 	typedef std::vector<Entry> EntryList;
 
 	struct Setting {
-		EntryList entries;
-		int flags;
-		int indent;
-		int order;
+		EntryList _entries;
+		int _flags;
+		int _indent;
+		int _order;
 
-		explicit Setting(std::string value = "", std::string comment = "", int flgs = 0, int idt = 0, int ord = -1) : flags(flgs), indent(idt), order(ord) {
-			entries.push_back(Entry(value, comment));
+		explicit Setting(std::string value = "", std::string comment = "", int flgs = 0, int idt = 0, int ord = -1) : _flags(flgs), _indent(idt), _order(ord) {
+			_entries.push_back(Entry(value, comment));
 		}
 
-		explicit Setting(ValueList values, int flgs = 0, int idt = 0, int ord = -1) : flags(flgs), indent(idt), order(ord) {
+		explicit Setting(ValueList values, int flgs = 0, int idt = 0, int ord = -1) : _flags(flgs), _indent(idt), _order(ord) {
 			for (unsigned int i = 0; i < values.size(); i++)
-				entries.push_back(Entry(values[i], ""));
+				_entries.push_back(Entry(values[i], ""));
 		}
 
-		explicit Setting(EntryList ents, int flgs = 0, int idt = 0, int ord = -1) : entries(ents), flags(flgs), indent(idt), order(ord) {}
+		explicit Setting(EntryList ents, int flgs = 0, int idt = 0, int ord = -1) : _entries(ents), _flags(flgs), _indent(idt), _order(ord) {}
 
 		void addEntry(std::string value, std::string comment = "") {
-			entries.push_back(Entry(value, comment));
+			_entries.push_back(Entry(value, comment));
 		}
 	};
 
@@ -108,45 +108,45 @@ private:
 	typedef std::vector<SettingPair> OrderedSettingList;
 
 	static bool OrderSortPredicate(const SettingPair& s1, const SettingPair& s2) {
-		return s1.second.order < s2.second.order;
+		return s1.second._order < s2.second._order;
 	}
 
 	struct Property {
 	public:
-		SettingList settings;
-		int flags;
-		bool hasOrder;
+		SettingList _settings;
+		int _flags;
+		bool _hasOrder;
 
-		Property() : flags(0), hasOrder(false) {}
+		Property() : _flags(0), _hasOrder(false) {}
 
 		// 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) {
-			Setting setting(value, comment, flags, indent);
+		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;
+			_settings[name] = setting;
 		}
 
-		Property(std::string name, ValueList values, int flgs = 0, int indent = 0, bool order = false) : flags(flgs), hasOrder(order) {
-			Setting setting(values, flags, indent);
+		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;
+			_settings[name] = setting;
 		}
 
 		// Copy constructor
 		Property(const Property &rhs) {
-			settings = rhs.settings;
-			flags = rhs.flags;
+			_settings = rhs._settings;
+			_flags = rhs._flags;
 		}
 
 		OrderedSettingList getOrderedSettingList() {
 			OrderedSettingList list;
 
 			// Prepare vector to sort
-			for (SettingList::const_iterator setting = settings.begin(); setting != settings.end(); ++setting)
+			for (SettingList::const_iterator setting = _settings.begin(); setting != _settings.end(); ++setting)
 				list.push_back(SettingPair(setting->first, setting->second));
 
 			// Sort vector using setting order
-			if (hasOrder)
+			if (_hasOrder)
 				std::sort(list.begin(), list.end(), OrderSortPredicate);
 
 			return list;
@@ -160,16 +160,16 @@ private:
 	// be overkill since we only have to generate a single project
 	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 refType;			// Type of object this references (if any)
-		std::string comment;			// Main comment (empty for no comment)
+		std::string _id;					// Unique identifier for this object
+ 		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)
 
-		PropertyList properties;		// List of object properties, including output configuration
+		PropertyList _properties;		// List of object properties, including output configuration
 
 		// Constructs an object and add a default type property
 		Object(XcodeProvider *objectParent, std::string objectId, std::string objectName, std::string objectType, std::string objectRefType = "", std::string objectComment = "")
-		    : id(objectId), name(objectName), refType(objectRefType), comment(objectComment), parent(objectParent) {
+		    : _id(objectId), _name(objectName), _refType(objectRefType), _comment(objectComment), _parent(objectParent) {
 			assert(objectParent);
 			assert(!objectId.empty());
 			assert(!objectName.empty());
@@ -180,25 +180,25 @@ private:
 
 		// Add a simple Property with just a name and a value
 		void addProperty(std::string propName, std::string propValue, std::string propComment = "", int propFlags = 0, int propIndent = 0) {
-			properties[propName] = Property(propValue, "", propComment, propFlags, propIndent);
+			_properties[propName] = Property(propValue, "", propComment, propFlags, propIndent);
 		}
 
 		std::string toString(int flags = 0) {
 			std::string output;
-			output = "\t\t" + parent->getHash(id) + (comment.empty() ? "" : " /* " + comment + " */") + " = {";
+			output = "\t\t" + _parent->getHash(_id) + (_comment.empty() ? "" : " /* " + _comment + " */") + " = {";
 
 			if (flags & SettingsAsList)
 				output += "\n";
 
 			// Special case: always output the isa property first
-			output += parent->writeProperty("isa", properties["isa"], flags);
+			output += _parent->writeProperty("isa", _properties["isa"], flags);
 
 			// 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")
 					continue;
 
-				output += parent->writeProperty((*property).first, (*property).second, flags);
+				output += _parent->writeProperty((*property).first, (*property).second, flags);
 			}
 
 			if (flags & SettingsAsList)
@@ -211,14 +211,14 @@ private:
 
 	// Slight hack, to allow Group access to parent.
 	protected:
-		XcodeProvider *parent;
+		XcodeProvider *_parent;
 	private:
 		// Returns the type property (should always be the first in the properties map)
 		std::string getType() {
-			assert(!properties.empty());
-			assert(!properties["isa"].settings.empty());
+			assert(!_properties.empty());
+			assert(!_properties["isa"]._settings.empty());
 
-			SettingList::iterator it = properties["isa"].settings.begin();
+			SettingList::iterator it = _properties["isa"]._settings.begin();
 
 			return (*it).first;
 		}
@@ -226,33 +226,33 @@ private:
 
 	struct ObjectList {
 	private:
-		std::map<std::string, bool> objectMap;
+		std::map<std::string, bool> _objectMap;
 
 	public:
-		std::vector<Object *> objects;
-		std::string comment;
-		int flags;
+		std::vector<Object *> _objects;
+		std::string _comment;
+		int _flags;
 
 		void add(Object *obj) {
-			std::map<std::string, bool>::iterator it = objectMap.find(obj->id);
-			if (it != objectMap.end() && it->second == true)
+			std::map<std::string, bool>::iterator it = _objectMap.find(obj->_id);
+			if (it != _objectMap.end() && it->second == true)
 				return;
 
-			objects.push_back(obj);
-			objectMap[obj->id] = true;
+			_objects.push_back(obj);
+			_objectMap[obj->_id] = true;
 		}
 
 		std::string toString() {
 			std::string output;
 
-			if (!comment.empty())
-				output = "\n/* Begin " + comment + " section */\n";
+			if (!_comment.empty())
+				output = "\n/* Begin " + _comment + " section */\n";
 
-			for (std::vector<Object *>::iterator object = objects.begin(); object != objects.end(); ++object)
-				output += (*object)->toString(flags);
+			for (std::vector<Object *>::iterator object = _objects.begin(); object != _objects.end(); ++object)
+				output += (*object)->toString(_flags);
 
-			if (!comment.empty())
-				output += "/* End " + comment + " section */\n";
+			if (!_comment.empty())
+				output += "/* End " + _comment + " section */\n";
 
 			return output;
 		}
@@ -274,7 +274,7 @@ private:
 		void addChildGroup(const Group* group);
 		void ensureChildExists(const std::string &name);
 		Group *getChildGroup(const std::string &name);
-		std::string getHashRef() const { return parent->getHash(id); }
+		std::string getHashRef() const { return _parent->getHash(_id); }
 	};
 
 	// The path used by the root-source group


Commit: 50807b3b0131664db7c073bc7fd14bf828e08e5e
    https://github.com/scummvm/scummvm/commit/50807b3b0131664db7c073bc7fd14bf828e08e5e
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2015-12-12T06:54:57+01:00

Commit Message:
DEVTOOLS: Run astyle over xcode.[cpp/h].

Manual fix up included.

Changed paths:
    devtools/create_project/xcode.cpp
    devtools/create_project/xcode.h



diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp
index 657adbc..27cf88e 100644
--- a/devtools/create_project/xcode.cpp
+++ b/devtools/create_project/xcode.cpp
@@ -93,18 +93,18 @@ bool producesObjectFileOnOSX(const std::string &fileName) {
 }
 
 XcodeProvider::Group::Group(XcodeProvider *objectParent, const std::string &groupName, const std::string &uniqueName, const std::string &path) : Object(objectParent, uniqueName, groupName, "PBXGroup", "", groupName) {
-	addProperty("name", _name, "", SettingsNoValue|SettingsQuoteVariable);
-	addProperty("sourceTree", "<group>", "", SettingsNoValue|SettingsQuoteVariable);
-	
+	addProperty("name", _name, "", SettingsNoValue | SettingsQuoteVariable);
+	addProperty("sourceTree", "<group>", "", SettingsNoValue | SettingsQuoteVariable);
+
 	if (path != "") {
-		addProperty("path", path, "", SettingsNoValue|SettingsQuoteVariable);
+		addProperty("path", path, "", SettingsNoValue | SettingsQuoteVariable);
 	}
 	_childOrder = 0;
 	_treeName = uniqueName;
 }
 
 void XcodeProvider::Group::ensureChildExists(const std::string &name) {
-	std::map<std::string, Group*>::iterator it = _childGroups.find(name);
+	std::map<std::string, Group *>::iterator it = _childGroups.find(name);
 	if (it == _childGroups.end()) {
 		Group *child = new Group(_parent, name, this->_treeName + '/' + name, name);
 		_childGroups[name] = child;
@@ -131,7 +131,7 @@ void XcodeProvider::Group::addChildInternal(const std::string &id, const std::st
 
 }
 
-void XcodeProvider::Group::addChildGroup(const Group* group) {
+void XcodeProvider::Group::addChildGroup(const Group *group) {
 	addChildInternal(_parent->getHash(group->_treeName), group->_treeName);
 }
 
@@ -151,14 +151,14 @@ void XcodeProvider::Group::addChildByHash(const std::string &hash, const std::st
 }
 
 XcodeProvider::Group *XcodeProvider::Group::getChildGroup(const std::string &name) {
-	std::map<std::string, Group*>::iterator it = _childGroups.find(name);
+	std::map<std::string, Group *>::iterator it = _childGroups.find(name);
 	assert(it != _childGroups.end());
 	return it->second;
 }
 
 XcodeProvider::Group *XcodeProvider::touchGroupsForPath(const std::string &path) {
 	if (_rootSourceGroup == NULL) {
-		assert (path == _projectRoot);
+		assert(path == _projectRoot);
 		_rootSourceGroup = new Group(this, "Sources", path, path);
 		_groups.add(_rootSourceGroup);
 		return _rootSourceGroup;
@@ -181,9 +181,9 @@ XcodeProvider::Group *XcodeProvider::touchGroupsForPath(const std::string &path)
 void XcodeProvider::addFileReference(const std::string &id, const std::string &name, FileProperty properties) {
 	Object *fileRef = new Object(this, id, name, "PBXFileReference", "PBXFileReference", name);
 	if (!properties._fileEncoding.empty()) fileRef->addProperty("fileEncoding", properties._fileEncoding, "", SettingsNoValue);
-	if (!properties._lastKnownFileType.empty()) fileRef->addProperty("lastKnownFileType", properties._lastKnownFileType, "", SettingsNoValue|SettingsQuoteVariable);
-	if (!properties._fileName.empty()) fileRef->addProperty("name", properties._fileName, "", SettingsNoValue|SettingsQuoteVariable);
-	if (!properties._filePath.empty()) fileRef->addProperty("path", properties._filePath, "", SettingsNoValue|SettingsQuoteVariable);
+	if (!properties._lastKnownFileType.empty()) fileRef->addProperty("lastKnownFileType", properties._lastKnownFileType, "", SettingsNoValue | SettingsQuoteVariable);
+	if (!properties._fileName.empty()) fileRef->addProperty("name", properties._fileName, "", SettingsNoValue | SettingsQuoteVariable);
+	if (!properties._filePath.empty()) fileRef->addProperty("path", properties._filePath, "", SettingsNoValue | SettingsQuoteVariable);
 	if (!properties._sourceTree.empty()) fileRef->addProperty("sourceTree", properties._sourceTree, "", SettingsNoValue);
 	_fileReference.add(fileRef);
 	_fileReference._flags = SettingsSingleItem;
@@ -191,9 +191,9 @@ void XcodeProvider::addFileReference(const std::string &id, const std::string &n
 
 void XcodeProvider::addProductFileReference(const std::string &id, const std::string &name) {
 	Object *fileRef = new Object(this, id, name, "PBXFileReference", "PBXFileReference", name);
-	fileRef->addProperty("explicitFileType", "compiled.mach-o.executable", "", SettingsNoValue|SettingsQuoteVariable);
+	fileRef->addProperty("explicitFileType", "compiled.mach-o.executable", "", SettingsNoValue | SettingsQuoteVariable);
 	fileRef->addProperty("includeInIndex", "0", "", SettingsNoValue);
-	fileRef->addProperty("path", name, "", SettingsNoValue|SettingsQuoteVariable);
+	fileRef->addProperty("path", name, "", SettingsNoValue | SettingsQuoteVariable);
 	fileRef->addProperty("sourceTree", "BUILT_PRODUCTS_DIR", "", SettingsNoValue);
 	_fileReference.add(fileRef);
 	_fileReference._flags = SettingsSingleItem;
@@ -218,7 +218,7 @@ void XcodeProvider::createWorkspace(const BuildSetup &setup) {
 	createDirectory(workspace);
 	_projectRoot = setup.srcDir;
 	touchGroupsForPath(_projectRoot);
-	
+
 	// Setup global objects
 	setupDefines(setup);
 #ifdef ENABLE_IOS
@@ -333,7 +333,7 @@ void XcodeProvider::setupCopyFilesBuildPhase() {
 
 #define DEF_SYSFRAMEWORK(framework) properties[framework".framework"] = FileProperty("wrapper.framework", framework".framework", "System/Library/Frameworks/" framework ".framework", "SDKROOT"); \
 	ADD_SETTING_ORDER_NOVALUE(children, getHash(framework".framework"), framework".framework", fwOrder++);
-	
+
 #define DEF_LOCALLIB_STATIC(lib) properties[lib".a"] = FileProperty("archive.ar", lib".a", "/opt/local/lib/" lib ".a", "\"<group>\""); \
 	ADD_SETTING_ORDER_NOVALUE(children, getHash(lib".a"), lib".a", fwOrder++);
 
@@ -530,16 +530,16 @@ void XcodeProvider::setupNativeTarget() {
 		buildPhases._settings[getHash("PBXFrameworksBuildPhase_" + _targets[i])] = Setting("", "Frameworks", SettingsNoValue, 0, 2);
 		target->_properties["buildPhases"] = buildPhases;
 
-		target->addProperty("buildRules", "", "", SettingsNoValue|SettingsAsList);
+		target->addProperty("buildRules", "", "", SettingsNoValue | SettingsAsList);
 
-		target->addProperty("dependencies", "", "", SettingsNoValue|SettingsAsList);
+		target->addProperty("dependencies", "", "", SettingsNoValue | SettingsAsList);
 
-		target->addProperty("name", _targets[i], "", SettingsNoValue|SettingsQuoteVariable);
+		target->addProperty("name", _targets[i], "", SettingsNoValue | SettingsQuoteVariable);
 		target->addProperty("productName", PROJECT_NAME, "", SettingsNoValue);
 		addProductFileReference("PBXFileReference_" PROJECT_DESCRIPTION ".app_" + _targets[i], PROJECT_DESCRIPTION ".app");
 		productsGroup->addChildByHash(getHash("PBXFileReference_" PROJECT_DESCRIPTION ".app_" + _targets[i]), PROJECT_DESCRIPTION ".app");
 		target->addProperty("productReference", getHash("PBXFileReference_" PROJECT_DESCRIPTION ".app_" + _targets[i]), PROJECT_DESCRIPTION ".app", SettingsNoValue);
-		target->addProperty("productType", "com.apple.product-type.application", "", SettingsNoValue|SettingsQuoteVariable);
+		target->addProperty("productType", "com.apple.product-type.application", "", SettingsNoValue | SettingsQuoteVariable);
 
 		_nativeTarget.add(target);
 	}
@@ -553,7 +553,7 @@ void XcodeProvider::setupProject() {
 	Object *project = new Object(this, "PBXProject", "PBXProject", "PBXProject", "", "Project object");
 
 	project->addProperty("buildConfigurationList", getHash("XCConfigurationList_scummvm"), "Build configuration list for PBXProject \"" PROJECT_NAME "\"", SettingsNoValue);
-	project->addProperty("compatibilityVersion", "Xcode 3.2", "", SettingsNoValue|SettingsQuoteVariable);
+	project->addProperty("compatibilityVersion", "Xcode 3.2", "", SettingsNoValue | SettingsQuoteVariable);
 	project->addProperty("developmentRegion", "English", "", SettingsNoValue);
 	project->addProperty("hasScannedForEncodings", "1", "", SettingsNoValue);
 
@@ -567,8 +567,8 @@ void XcodeProvider::setupProject() {
 	project->_properties["knownRegions"] = regions;
 
 	project->addProperty("mainGroup", _rootSourceGroup->getHashRef(), "CustomTemplate", SettingsNoValue);
-	project->addProperty("projectDirPath", _projectRoot, "", SettingsNoValue|SettingsQuoteVariable);
-	project->addProperty("projectRoot", "", "", SettingsNoValue|SettingsQuoteVariable);
+	project->addProperty("projectDirPath", _projectRoot, "", SettingsNoValue | SettingsQuoteVariable);
+	project->addProperty("projectRoot", "", "", SettingsNoValue | SettingsQuoteVariable);
 
 	// List of targets
 	Property targets;
@@ -683,7 +683,7 @@ void XcodeProvider::setupSourcesBuildPhase() {
 		files._flags = SettingsAsList;
 
 		int order = 0;
-		for (std::vector<Object*>::iterator file = _buildFile._objects.begin(); file !=_buildFile._objects.end(); ++file) {
+		for (std::vector<Object *>::iterator file = _buildFile._objects.begin(); file != _buildFile._objects.end(); ++file) {
 			if (!producesObjectFileOnOSX((*file)->_name)) {
 				continue;
 			}
@@ -734,7 +734,7 @@ void XcodeProvider::setupBuildConfiguration() {
 	iPhone_HeaderSearchPaths.push_back("$(SRCROOT)/engines/");
 	iPhone_HeaderSearchPaths.push_back("$(SRCROOT)");
 	iPhone_HeaderSearchPaths.push_back("include/");
-	ADD_SETTING_LIST(iPhone_Debug, "HEADER_SEARCH_PATHS", iPhone_HeaderSearchPaths, SettingsAsList|SettingsQuoteVariable, 5);
+	ADD_SETTING_LIST(iPhone_Debug, "HEADER_SEARCH_PATHS", iPhone_HeaderSearchPaths, SettingsAsList | SettingsQuoteVariable, 5);
 	ADD_SETTING(iPhone_Debug, "INFOPLIST_FILE", "Info.plist");
 	ValueList iPhone_LibPaths;
 	iPhone_LibPaths.push_back("$(inherited)");
@@ -787,7 +787,7 @@ void XcodeProvider::setupBuildConfiguration() {
 	ADD_DEFINE(scummvm_defines, "IPHONE");
 	ADD_DEFINE(scummvm_defines, "XCODE");
 	ADD_DEFINE(scummvm_defines, "IPHONE_OFFICIAL");
-	ADD_SETTING_LIST(scummvm_Debug, "GCC_PREPROCESSOR_DEFINITIONS", scummvm_defines, SettingsNoQuote|SettingsAsList, 5);
+	ADD_SETTING_LIST(scummvm_Debug, "GCC_PREPROCESSOR_DEFINITIONS", scummvm_defines, SettingsNoQuote | SettingsAsList, 5);
 	ADD_SETTING(scummvm_Debug, "GCC_THUMB_SUPPORT", "NO");
 	ADD_SETTING(scummvm_Debug, "GCC_USE_GCC3_PFE_SUPPORT", "NO");
 	ADD_SETTING(scummvm_Debug, "GCC_WARN_ABOUT_RETURN_TYPE", "YES");
@@ -796,7 +796,7 @@ void XcodeProvider::setupBuildConfiguration() {
 	scummvm_HeaderPaths.push_back("include/");
 	scummvm_HeaderPaths.push_back("$(SRCROOT)/engines/");
 	scummvm_HeaderPaths.push_back("$(SRCROOT)");
-	ADD_SETTING_LIST(scummvm_Debug, "HEADER_SEARCH_PATHS", scummvm_HeaderPaths, SettingsQuoteVariable|SettingsAsList, 5);
+	ADD_SETTING_LIST(scummvm_Debug, "HEADER_SEARCH_PATHS", scummvm_HeaderPaths, SettingsQuoteVariable | SettingsAsList, 5);
 	ADD_SETTING_QUOTE(scummvm_Debug, "LIBRARY_SEARCH_PATHS", "");
 	ADD_SETTING(scummvm_Debug, "ONLY_ACTIVE_ARCH", "YES");
 	ADD_SETTING_QUOTE(scummvm_Debug, "OTHER_CFLAGS", "");
@@ -844,7 +844,7 @@ void XcodeProvider::setupBuildConfiguration() {
 	ValueList scummvmOSX_defines(_defines);
 	ADD_DEFINE(scummvmOSX_defines, "SDL_BACKEND");
 	ADD_DEFINE(scummvmOSX_defines, "MACOSX");
-	ADD_SETTING_LIST(scummvmOSX_Debug, "GCC_PREPROCESSOR_DEFINITIONS", scummvmOSX_defines, SettingsNoQuote|SettingsAsList, 5);
+	ADD_SETTING_LIST(scummvmOSX_Debug, "GCC_PREPROCESSOR_DEFINITIONS", scummvmOSX_defines, SettingsNoQuote | SettingsAsList, 5);
 	ADD_SETTING_QUOTE(scummvmOSX_Debug, "GCC_VERSION", "");
 	ValueList scummvmOSX_HeaderPaths;
 	scummvmOSX_HeaderPaths.push_back("/opt/local/include/SDL");
@@ -853,14 +853,14 @@ void XcodeProvider::setupBuildConfiguration() {
 	scummvmOSX_HeaderPaths.push_back("include/");
 	scummvmOSX_HeaderPaths.push_back("$(SRCROOT)/engines/");
 	scummvmOSX_HeaderPaths.push_back("$(SRCROOT)");
-	ADD_SETTING_LIST(scummvmOSX_Debug, "HEADER_SEARCH_PATHS", scummvmOSX_HeaderPaths, SettingsQuoteVariable|SettingsAsList, 5);
+	ADD_SETTING_LIST(scummvmOSX_Debug, "HEADER_SEARCH_PATHS", scummvmOSX_HeaderPaths, SettingsQuoteVariable | SettingsAsList, 5);
 	ADD_SETTING_QUOTE(scummvmOSX_Debug, "INFOPLIST_FILE", "$(SRCROOT)/dists/macosx/Info.plist");
 	ValueList scummvmOSX_LibPaths;
 	scummvmOSX_LibPaths.push_back("/sw/lib");
 	scummvmOSX_LibPaths.push_back("/opt/local/lib");
 	scummvmOSX_LibPaths.push_back("\"$(inherited)\"");
 	scummvmOSX_LibPaths.push_back("\"\\\\\\\"$(SRCROOT)/lib\\\\\\\"\"");  // mmmh, all those slashes, it's almost Christmas \o/
-	ADD_SETTING_LIST(scummvmOSX_Debug, "LIBRARY_SEARCH_PATHS", scummvmOSX_LibPaths, SettingsNoQuote|SettingsAsList, 5);
+	ADD_SETTING_LIST(scummvmOSX_Debug, "LIBRARY_SEARCH_PATHS", scummvmOSX_LibPaths, SettingsNoQuote | SettingsAsList, 5);
 	ADD_SETTING_QUOTE(scummvmOSX_Debug, "OTHER_CFLAGS", "");
 	ValueList scummvmOSX_LdFlags;
 	scummvmOSX_LdFlags.push_back("-lSDLmain");
@@ -904,7 +904,7 @@ void XcodeProvider::setupBuildConfiguration() {
 	Object *scummvmSimulator_Debug_Object = new Object(this, "XCBuildConfiguration_" PROJECT_DESCRIPTION "-Simulator_Debug", _targets[SIM_TARGET] /* ScummVM-Simulator */, "XCBuildConfiguration", "PBXNativeTarget", "Debug");
 	Property scummvmSimulator_Debug(iPhone_Debug);
 	ADD_SETTING_QUOTE(scummvmSimulator_Debug, "FRAMEWORK_SEARCH_PATHS", "$(inherited)");
-	ADD_SETTING_LIST(scummvmSimulator_Debug, "GCC_PREPROCESSOR_DEFINITIONS", scummvm_defines, SettingsNoQuote|SettingsAsList, 5);
+	ADD_SETTING_LIST(scummvmSimulator_Debug, "GCC_PREPROCESSOR_DEFINITIONS", scummvm_defines, SettingsNoQuote | SettingsAsList, 5);
 	ADD_SETTING(scummvmSimulator_Debug, "SDKROOT", "iphonesimulator3.2");
 	ADD_SETTING_QUOTE(scummvmSimulator_Debug, "VALID_ARCHS", "i386 x86_64");
 	REMOVE_SETTING(scummvmSimulator_Debug, "TARGETED_DEVICE_FAMILY");
@@ -934,7 +934,7 @@ void XcodeProvider::setupBuildConfiguration() {
 	// Warning: This assumes we have all configurations with a Debug & Release pair
 	for (std::vector<Object *>::iterator config = _buildConfiguration._objects.begin(); config != _buildConfiguration._objects.end(); config++) {
 
-		Object *configList = new Object(this, "XCConfigurationList_" + (*config)->_name, (*config)->_name, "XCConfigurationList", "", "Build configuration list for " +  (*config)->_refType + " \"" + (*config)->_name + "\"");
+		Object *configList = new Object(this, "XCConfigurationList_" + (*config)->_name, (*config)->_name, "XCConfigurationList", "", "Build configuration list for " + (*config)->_refType + " \"" + (*config)->_name + "\"");
 
 		Property buildConfigs;
 		buildConfigs._flags = SettingsAsList;
@@ -959,7 +959,7 @@ void XcodeProvider::setupBuildConfiguration() {
 void XcodeProvider::setupDefines(const BuildSetup &setup) {
 
 	for (StringList::const_iterator i = setup.defines.begin(); i != setup.defines.end(); ++i) {
-		if (*i == "HAVE_NASM")	// Not supported on Mac (TODO: change how it's handled in main class or add it only in MSVC/CodeBlocks providers?)
+		if (*i == "HAVE_NASM")  // Not supported on Mac (TODO: change how it's handled in main class or add it only in MSVC/CodeBlocks providers?)
 			continue;
 
 		ADD_DEFINE(_defines, *i);
@@ -995,7 +995,7 @@ std::string XcodeProvider::getHash(std::string key) {
 #endif
 }
 
-bool isSeparator (char s) { return (s == '-'); }
+bool isSeparator(char s) { return (s == '-'); }
 
 std::string XcodeProvider::newHash() const {
 	std::string hash = createUUID();
@@ -1018,10 +1018,10 @@ std::string replace(std::string input, const std::string find, std::string repla
 	std::string::size_type findLen = find.length();
 	std::string::size_type replaceLen = replaceStr.length();
 
-	if (findLen == 0 )
+	if (findLen == 0)
 		return input;
 
-	for (;(pos = input.find(find, pos)) != std::string::npos;) {
+	for (; (pos = input.find(find, pos)) != std::string::npos;) {
 		input.replace(pos, findLen, replaceStr);
 		pos += replaceLen;
 	}
@@ -1107,9 +1107,9 @@ std::string XcodeProvider::writeSetting(const std::string &variable, const Setti
 
 		output += (setting._flags & SettingsNoValue) ? "" : " = " + quote;
 
-		for(unsigned int i = 0; i < setting._entries.size(); ++i) {
+		for (unsigned int i = 0; i < setting._entries.size(); ++i) {
 			std::string value = setting._entries.at(i)._value;
-			if(i)
+			if (i)
 				output += " ";
 			output += value;
 
diff --git a/devtools/create_project/xcode.h b/devtools/create_project/xcode.h
index 00ed9ff..7a1e540 100644
--- a/devtools/create_project/xcode.h
+++ b/devtools/create_project/xcode.h
@@ -62,9 +62,8 @@ private:
 		std::string _filePath;
 		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)
-		{
+		FileProperty(std::string fileType = "", std::string name = "", std::string path = "", std::string source = "")
+		    : _fileEncoding(""), _lastKnownFileType(fileType), _fileName(name), _filePath(path), _sourceTree(source) {
 		}
 	};
 
@@ -107,7 +106,7 @@ private:
 	typedef std::pair<std::string, Setting> SettingPair;
 	typedef std::vector<SettingPair> OrderedSettingList;
 
-	static bool OrderSortPredicate(const SettingPair& s1, const SettingPair& s2) {
+	static bool OrderSortPredicate(const SettingPair &s1, const SettingPair &s2) {
 		return s1.second._order < s2.second._order;
 	}
 
@@ -160,12 +159,12 @@ private:
 	// be overkill since we only have to generate a single project
 	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 _refType;			// Type of object this references (if any)
-		std::string _comment;			// Main comment (empty for no comment)
+		std::string _id;                // Unique identifier for this object
+		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)
 
-		PropertyList _properties;		// List of object properties, including output configuration
+		PropertyList _properties;       // List of object properties, including output configuration
 
 		// Constructs an object and add a default type property
 		Object(XcodeProvider *objectParent, std::string objectId, std::string objectName, std::string objectType, std::string objectRefType = "", std::string objectComment = "")
@@ -175,7 +174,7 @@ private:
 			assert(!objectName.empty());
 			assert(!objectType.empty());
 
-			addProperty("isa", objectType, "", SettingsNoQuote|SettingsNoValue);
+			addProperty("isa", objectType, "", SettingsNoQuote | SettingsNoValue);
 		}
 
 		// Add a simple Property with just a name and a value
@@ -209,7 +208,7 @@ private:
 			return output;
 		}
 
-	// Slight hack, to allow Group access to parent.
+		// Slight hack, to allow Group access to parent.
 	protected:
 		XcodeProvider *_parent;
 	private:
@@ -271,7 +270,7 @@ private:
 		void addChildFile(const std::string &name);
 		void addChildByHash(const std::string &hash, const std::string &name);
 		// Should be passed the hash for the entry
-		void addChildGroup(const Group* group);
+		void addChildGroup(const Group *group);
 		void ensureChildExists(const std::string &name);
 		Group *getChildGroup(const std::string &name);
 		std::string getHashRef() const { return _parent->getHash(_id); }


Commit: 3ad5ad57e2fdac80cd4c79da958cd5122b941c60
    https://github.com/scummvm/scummvm/commit/3ad5ad57e2fdac80cd4c79da958cd5122b941c60
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2015-12-12T06:54:57+01:00

Commit Message:
DEVTOOLS: Use default copy constructor.

The formerly user supplied copy constructor was not identical to the default
generated, but the output of create_project for xcode is unchanged.

Changed paths:
    devtools/create_project/xcode.h



diff --git a/devtools/create_project/xcode.h b/devtools/create_project/xcode.h
index 7a1e540..3f037eb 100644
--- a/devtools/create_project/xcode.h
+++ b/devtools/create_project/xcode.h
@@ -131,12 +131,6 @@ private:
 			_settings[name] = setting;
 		}
 
-		// Copy constructor
-		Property(const Property &rhs) {
-			_settings = rhs._settings;
-			_flags = rhs._flags;
-		}
-
 		OrderedSettingList getOrderedSettingList() {
 			OrderedSettingList list;
 


Commit: c9d7299e6586fa7baa5badffc6f0c07d6d91c679
    https://github.com/scummvm/scummvm/commit/c9d7299e6586fa7baa5badffc6f0c07d6d91c679
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2015-12-12T06:54:57+01:00

Commit Message:
DEVTOOLS: Cleanup code.

Changed paths:
    devtools/create_project/xcode.cpp
    devtools/create_project/xcode.h



diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp
index 27cf88e..534b67f 100644
--- a/devtools/create_project/xcode.cpp
+++ b/devtools/create_project/xcode.cpp
@@ -1042,7 +1042,7 @@ std::string XcodeProvider::writeProperty(const std::string &variable, Property &
 		if (settings.size() > 1 || (prop._flags & SettingsSingleItem))
 			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
 		// in PBXGroup, so we special case that case here.
diff --git a/devtools/create_project/xcode.h b/devtools/create_project/xcode.h
index 3f037eb..e6295cc 100644
--- a/devtools/create_project/xcode.h
+++ b/devtools/create_project/xcode.h
@@ -120,15 +120,11 @@ private:
 
 		// 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) {
-			Setting setting(value, comment, _flags, indent);
-
-			_settings[name] = setting;
+			_settings[name] = Setting(value, comment, _flags, indent);
 		}
 
 		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;
+			_settings[name] = Setting(values, _flags, indent);
 		}
 
 		OrderedSettingList getOrderedSettingList() {
@@ -188,10 +184,10 @@ private:
 
 			// Write each property
 			for (PropertyList::iterator property = _properties.begin(); property != _properties.end(); ++property) {
-				if ((*property).first == "isa")
+				if (property->first == "isa")
 					continue;
 
-				output += _parent->writeProperty((*property).first, (*property).second, flags);
+				output += _parent->writeProperty(property->first, property->second, flags);
 			}
 
 			if (flags & SettingsAsList)
@@ -212,8 +208,7 @@ private:
 			assert(!_properties["isa"]._settings.empty());
 
 			SettingList::iterator it = _properties["isa"]._settings.begin();
-
-			return (*it).first;
+			return it->first;
 		}
 	};
 


Commit: d09c3e28a641dee96df51a6297e11932cc118253
    https://github.com/scummvm/scummvm/commit/d09c3e28a641dee96df51a6297e11932cc118253
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2015-12-12T06:54:57+01:00

Commit Message:
DEVTOOLS: Remove 'explicit' keyword from multi parameter constructors.

This does not make sense in C++98. For C++11 this only prevents Foo x = {...}
initialization, which we can't use anyway.

Changed paths:
    devtools/create_project/xcode.h



diff --git a/devtools/create_project/xcode.h b/devtools/create_project/xcode.h
index e6295cc..cadd189 100644
--- a/devtools/create_project/xcode.h
+++ b/devtools/create_project/xcode.h
@@ -86,16 +86,16 @@ private:
 		int _indent;
 		int _order;
 
-		explicit Setting(std::string value = "", std::string comment = "", int flgs = 0, int idt = 0, int ord = -1) : _flags(flgs), _indent(idt), _order(ord) {
+		Setting(std::string value = "", std::string comment = "", int flgs = 0, int idt = 0, int ord = -1) : _flags(flgs), _indent(idt), _order(ord) {
 			_entries.push_back(Entry(value, comment));
 		}
 
-		explicit Setting(ValueList values, int flgs = 0, int idt = 0, int ord = -1) : _flags(flgs), _indent(idt), _order(ord) {
+		Setting(ValueList values, int flgs = 0, int idt = 0, int ord = -1) : _flags(flgs), _indent(idt), _order(ord) {
 			for (unsigned int i = 0; i < values.size(); i++)
 				_entries.push_back(Entry(values[i], ""));
 		}
 
-		explicit Setting(EntryList ents, int flgs = 0, int idt = 0, int ord = -1) : _entries(ents), _flags(flgs), _indent(idt), _order(ord) {}
+		Setting(EntryList ents, int flgs = 0, int idt = 0, int ord = -1) : _entries(ents), _flags(flgs), _indent(idt), _order(ord) {}
 
 		void addEntry(std::string value, std::string comment = "") {
 			_entries.push_back(Entry(value, comment));
@@ -119,7 +119,7 @@ private:
 		Property() : _flags(0), _hasOrder(false) {}
 
 		// 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) {
+		Property(std::string name, std::string value = "", std::string comment = "", int flgs = 0, int indent = 0, bool order = false) : _flags(flgs), _hasOrder(order) {
 			_settings[name] = Setting(value, comment, _flags, indent);
 		}
 


Commit: 70a4047a78181a055787baf5b4f6a54e7aa67201
    https://github.com/scummvm/scummvm/commit/70a4047a78181a055787baf5b4f6a54e7aa67201
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2015-12-12T06:54:57+01:00

Commit Message:
DEVTOOLS: Adjust enum constant names to match our conventions.

Changed paths:
    devtools/create_project/xcode.cpp
    devtools/create_project/xcode.h



diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp
index 534b67f..ed3ba0f 100644
--- a/devtools/create_project/xcode.cpp
+++ b/devtools/create_project/xcode.cpp
@@ -42,19 +42,19 @@ namespace CreateProjectTool {
 	defines.push_back(name);
 
 #define ADD_SETTING(config, key, value) \
-	config._settings[key] = Setting(value, "", SettingsNoQuote);
+	config._settings[key] = Setting(value, "", kSettingsNoQuote);
 
 #define ADD_SETTING_ORDER(config, key, value, order) \
-	config._settings[key] = Setting(value, "", SettingsNoQuote, 0, order);
+	config._settings[key] = Setting(value, "", kSettingsNoQuote, 0, order);
 
 #define ADD_SETTING_ORDER_NOVALUE(config, key, comment, order) \
-	config._settings[key] = Setting("", comment, SettingsNoValue, 0, order);
+	config._settings[key] = Setting("", comment, kSettingsNoValue, 0, order);
 
 #define ADD_SETTING_QUOTE(config, key, value) \
 	config._settings[key] = Setting(value);
 
 #define ADD_SETTING_QUOTE_VAR(config, key, value) \
-	config._settings[key] = Setting(value, "", SettingsQuoteVariable);
+	config._settings[key] = Setting(value, "", kSettingsQuoteVariable);
 
 #define ADD_SETTING_LIST(config, key, values, flags, indent) \
 	config._settings[key] = Setting(values, flags, indent);
@@ -64,20 +64,20 @@ namespace CreateProjectTool {
 
 #define ADD_BUILD_FILE(id, name, fileRefId, comment) { \
 	Object *buildFile = new Object(this, id, name, "PBXBuildFile", "PBXBuildFile", comment); \
-	buildFile->addProperty("fileRef", fileRefId, name, SettingsNoValue); \
+	buildFile->addProperty("fileRef", fileRefId, name, kSettingsNoValue); \
 	_buildFile.add(buildFile); \
-	_buildFile._flags = SettingsSingleItem; \
+	_buildFile._flags = kSettingsSingleItem; \
 }
 
 #define ADD_FILE_REFERENCE(id, name, properties) { \
 	Object *fileRef = new Object(this, id, name, "PBXFileReference", "PBXFileReference", name); \
-	if (!properties._fileEncoding.empty()) fileRef->addProperty("fileEncoding", properties._fileEncoding, "", SettingsNoValue); \
-	if (!properties._lastKnownFileType.empty()) fileRef->addProperty("lastKnownFileType", properties._lastKnownFileType, "", SettingsNoValue|SettingsQuoteVariable); \
-	if (!properties._fileName.empty()) fileRef->addProperty("name", properties._fileName, "", SettingsNoValue|SettingsQuoteVariable); \
-	if (!properties._filePath.empty()) fileRef->addProperty("path", properties._filePath, "", SettingsNoValue|SettingsQuoteVariable); \
-	if (!properties._sourceTree.empty()) fileRef->addProperty("sourceTree", properties._sourceTree, "", SettingsNoValue); \
+	if (!properties._fileEncoding.empty()) fileRef->addProperty("fileEncoding", properties._fileEncoding, "", kSettingsNoValue); \
+	if (!properties._lastKnownFileType.empty()) fileRef->addProperty("lastKnownFileType", properties._lastKnownFileType, "", kSettingsNoValue|kSettingsQuoteVariable); \
+	if (!properties._fileName.empty()) fileRef->addProperty("name", properties._fileName, "", kSettingsNoValue|kSettingsQuoteVariable); \
+	if (!properties._filePath.empty()) fileRef->addProperty("path", properties._filePath, "", kSettingsNoValue|kSettingsQuoteVariable); \
+	if (!properties._sourceTree.empty()) fileRef->addProperty("sourceTree", properties._sourceTree, "", kSettingsNoValue); \
 	_fileReference.add(fileRef); \
-	_fileReference._flags = SettingsSingleItem; \
+	_fileReference._flags = kSettingsSingleItem; \
 }
 
 bool producesObjectFileOnOSX(const std::string &fileName) {
@@ -93,11 +93,11 @@ bool producesObjectFileOnOSX(const std::string &fileName) {
 }
 
 XcodeProvider::Group::Group(XcodeProvider *objectParent, const std::string &groupName, const std::string &uniqueName, const std::string &path) : Object(objectParent, uniqueName, groupName, "PBXGroup", "", groupName) {
-	addProperty("name", _name, "", SettingsNoValue | SettingsQuoteVariable);
-	addProperty("sourceTree", "<group>", "", SettingsNoValue | SettingsQuoteVariable);
+	addProperty("name", _name, "", kSettingsNoValue | kSettingsQuoteVariable);
+	addProperty("sourceTree", "<group>", "", kSettingsNoValue | kSettingsQuoteVariable);
 
 	if (path != "") {
-		addProperty("path", path, "", SettingsNoValue | SettingsQuoteVariable);
+		addProperty("path", path, "", kSettingsNoValue | kSettingsQuoteVariable);
 	}
 	_childOrder = 0;
 	_treeName = uniqueName;
@@ -117,16 +117,16 @@ void XcodeProvider::Group::addChildInternal(const std::string &id, const std::st
 	if (_properties.find("children") == _properties.end()) {
 		Property children;
 		children._hasOrder = true;
-		children._flags = SettingsAsList;
+		children._flags = kSettingsAsList;
 		_properties["children"] = children;
 	}
-	_properties["children"]._settings[id] = Setting("", comment + " in Sources", SettingsNoValue, 0, _childOrder++);
+	_properties["children"]._settings[id] = Setting("", comment + " in Sources", kSettingsNoValue, 0, _childOrder++);
 	if (_childOrder == 1) {
 		// Force children to use () even when there is only 1 child.
 		// Also this enforces the use of "," after the single item, instead of ; (see writeProperty)
-		_properties["children"]._flags |= SettingsSingleItem;
+		_properties["children"]._flags |= kSettingsSingleItem;
 	} else {
-		_properties["children"]._flags ^= SettingsSingleItem;
+		_properties["children"]._flags ^= kSettingsSingleItem;
 	}
 
 }
@@ -180,31 +180,31 @@ XcodeProvider::Group *XcodeProvider::touchGroupsForPath(const std::string &path)
 
 void XcodeProvider::addFileReference(const std::string &id, const std::string &name, FileProperty properties) {
 	Object *fileRef = new Object(this, id, name, "PBXFileReference", "PBXFileReference", name);
-	if (!properties._fileEncoding.empty()) fileRef->addProperty("fileEncoding", properties._fileEncoding, "", SettingsNoValue);
-	if (!properties._lastKnownFileType.empty()) fileRef->addProperty("lastKnownFileType", properties._lastKnownFileType, "", SettingsNoValue | SettingsQuoteVariable);
-	if (!properties._fileName.empty()) fileRef->addProperty("name", properties._fileName, "", SettingsNoValue | SettingsQuoteVariable);
-	if (!properties._filePath.empty()) fileRef->addProperty("path", properties._filePath, "", SettingsNoValue | SettingsQuoteVariable);
-	if (!properties._sourceTree.empty()) fileRef->addProperty("sourceTree", properties._sourceTree, "", SettingsNoValue);
+	if (!properties._fileEncoding.empty()) fileRef->addProperty("fileEncoding", properties._fileEncoding, "", kSettingsNoValue);
+	if (!properties._lastKnownFileType.empty()) fileRef->addProperty("lastKnownFileType", properties._lastKnownFileType, "", kSettingsNoValue | kSettingsQuoteVariable);
+	if (!properties._fileName.empty()) fileRef->addProperty("name", properties._fileName, "", kSettingsNoValue | kSettingsQuoteVariable);
+	if (!properties._filePath.empty()) fileRef->addProperty("path", properties._filePath, "", kSettingsNoValue | kSettingsQuoteVariable);
+	if (!properties._sourceTree.empty()) fileRef->addProperty("sourceTree", properties._sourceTree, "", kSettingsNoValue);
 	_fileReference.add(fileRef);
-	_fileReference._flags = SettingsSingleItem;
+	_fileReference._flags = kSettingsSingleItem;
 }
 
 void XcodeProvider::addProductFileReference(const std::string &id, const std::string &name) {
 	Object *fileRef = new Object(this, id, name, "PBXFileReference", "PBXFileReference", name);
-	fileRef->addProperty("explicitFileType", "compiled.mach-o.executable", "", SettingsNoValue | SettingsQuoteVariable);
-	fileRef->addProperty("includeInIndex", "0", "", SettingsNoValue);
-	fileRef->addProperty("path", name, "", SettingsNoValue | SettingsQuoteVariable);
-	fileRef->addProperty("sourceTree", "BUILT_PRODUCTS_DIR", "", SettingsNoValue);
+	fileRef->addProperty("explicitFileType", "compiled.mach-o.executable", "", kSettingsNoValue | kSettingsQuoteVariable);
+	fileRef->addProperty("includeInIndex", "0", "", kSettingsNoValue);
+	fileRef->addProperty("path", name, "", kSettingsNoValue | kSettingsQuoteVariable);
+	fileRef->addProperty("sourceTree", "BUILT_PRODUCTS_DIR", "", kSettingsNoValue);
 	_fileReference.add(fileRef);
-	_fileReference._flags = SettingsSingleItem;
+	_fileReference._flags = kSettingsSingleItem;
 }
 
 void XcodeProvider::addBuildFile(const std::string &id, const std::string &name, const std::string &fileRefId, const std::string &comment) {
 
 	Object *buildFile = new Object(this, id, name, "PBXBuildFile", "PBXBuildFile", comment);
-	buildFile->addProperty("fileRef", fileRefId, name, SettingsNoValue);
+	buildFile->addProperty("fileRef", fileRefId, name, kSettingsNoValue);
 	_buildFile.add(buildFile);
-	_buildFile._flags = SettingsSingleItem;
+	_buildFile._flags = kSettingsSingleItem;
 }
 
 XcodeProvider::XcodeProvider(StringList &global_warnings, std::map<std::string, StringList> &project_warnings, const int version)
@@ -274,10 +274,10 @@ void XcodeProvider::ouputMainProjectFile(const BuildSetup &setup) {
 	// Header
 	project << "// !$*UTF8*$!\n"
 	           "{\n"
-	           "\t" << writeSetting("archiveVersion", "1", "", SettingsNoQuote) << ";\n"
+	           "\t" << writeSetting("archiveVersion", "1", "", kSettingsNoQuote) << ";\n"
 	           "\tclasses = {\n"
 	           "\t};\n"
-	           "\t" << writeSetting("objectVersion", "46", "", SettingsNoQuote) << ";\n"
+	           "\t" << writeSetting("objectVersion", "46", "", kSettingsNoQuote) << ";\n"
 	           "\tobjects = {\n";
 
 	//////////////////////////////////////////////////////////////////////////
@@ -297,7 +297,7 @@ void XcodeProvider::ouputMainProjectFile(const BuildSetup &setup) {
 	//////////////////////////////////////////////////////////////////////////
 	// Footer
 	project << "\t};\n"
-	           "\t" << writeSetting("rootObject", getHash("PBXProject"), "Project object", SettingsNoQuote) << ";\n"
+	           "\t" << writeSetting("rootObject", getHash("PBXProject"), "Project object", kSettingsNoQuote) << ";\n"
 	           "}\n";
 
 }
@@ -350,7 +350,7 @@ void XcodeProvider::setupFrameworksBuildPhase() {
 
 	Property children;
 	children._hasOrder = true;
-	children._flags = SettingsAsList;
+	children._flags = kSettingsAsList;
 
 	// Setup framework file properties
 	std::map<std::string, FileProperty> properties;
@@ -393,13 +393,13 @@ void XcodeProvider::setupFrameworksBuildPhase() {
 	// iPhone
 	Object *framework_iPhone = new Object(this, "PBXFrameworksBuildPhase_" + _targets[IOS_TARGET], "PBXFrameworksBuildPhase", "PBXFrameworksBuildPhase", "", "Frameworks");
 
-	framework_iPhone->addProperty("buildActionMask", "2147483647", "", SettingsNoValue);
-	framework_iPhone->addProperty("runOnlyForDeploymentPostprocessing", "0", "", SettingsNoValue);
+	framework_iPhone->addProperty("buildActionMask", "2147483647", "", kSettingsNoValue);
+	framework_iPhone->addProperty("runOnlyForDeploymentPostprocessing", "0", "", kSettingsNoValue);
 
 	// List of frameworks
 	Property iPhone_files;
 	iPhone_files._hasOrder = true;
-	iPhone_files._flags = SettingsAsList;
+	iPhone_files._flags = kSettingsAsList;
 
 	ValueList frameworks_iPhone;
 	frameworks_iPhone.push_back("CoreAudio.framework");
@@ -431,13 +431,13 @@ void XcodeProvider::setupFrameworksBuildPhase() {
 	// ScummVM-OS X
 	Object *framework_OSX = new Object(this, "PBXFrameworksBuildPhase_" + _targets[OSX_TARGET], "PBXFrameworksBuildPhase", "PBXFrameworksBuildPhase", "", "Frameworks");
 
-	framework_OSX->addProperty("buildActionMask", "2147483647", "", SettingsNoValue);
-	framework_OSX->addProperty("runOnlyForDeploymentPostprocessing", "0", "", SettingsNoValue);
+	framework_OSX->addProperty("buildActionMask", "2147483647", "", kSettingsNoValue);
+	framework_OSX->addProperty("runOnlyForDeploymentPostprocessing", "0", "", kSettingsNoValue);
 
 	// List of frameworks
 	Property osx_files;
 	osx_files._hasOrder = true;
-	osx_files._flags = SettingsAsList;
+	osx_files._flags = kSettingsAsList;
 
 	ValueList frameworks_osx;
 	frameworks_osx.push_back("CoreFoundation.framework");
@@ -473,13 +473,13 @@ void XcodeProvider::setupFrameworksBuildPhase() {
 	// Simulator
 	Object *framework_simulator = new Object(this, "PBXFrameworksBuildPhase_" + _targets[SIM_TARGET], "PBXFrameworksBuildPhase", "PBXFrameworksBuildPhase", "", "Frameworks");
 
-	framework_simulator->addProperty("buildActionMask", "2147483647", "", SettingsNoValue);
-	framework_simulator->addProperty("runOnlyForDeploymentPostprocessing", "0", "", SettingsNoValue);
+	framework_simulator->addProperty("buildActionMask", "2147483647", "", kSettingsNoValue);
+	framework_simulator->addProperty("runOnlyForDeploymentPostprocessing", "0", "", kSettingsNoValue);
 
 	// List of frameworks
 	Property simulator_files;
 	simulator_files._hasOrder = true;
-	simulator_files._flags = SettingsAsList;
+	simulator_files._flags = kSettingsAsList;
 
 	ValueList frameworks_simulator;
 	frameworks_simulator.push_back("CoreAudio.framework");
@@ -520,26 +520,26 @@ void XcodeProvider::setupNativeTarget() {
 #endif
 		Object *target = new Object(this, "PBXNativeTarget_" + _targets[i], "PBXNativeTarget", "PBXNativeTarget", "", _targets[i]);
 
-		target->addProperty("buildConfigurationList", getHash("XCConfigurationList_" + _targets[i]), "Build configuration list for PBXNativeTarget \"" + _targets[i] + "\"", SettingsNoValue);
+		target->addProperty("buildConfigurationList", getHash("XCConfigurationList_" + _targets[i]), "Build configuration list for PBXNativeTarget \"" + _targets[i] + "\"", kSettingsNoValue);
 
 		Property buildPhases;
 		buildPhases._hasOrder = true;
-		buildPhases._flags = SettingsAsList;
-		buildPhases._settings[getHash("PBXResourcesBuildPhase_" + _targets[i])] = Setting("", "Resources", SettingsNoValue, 0, 0);
-		buildPhases._settings[getHash("PBXSourcesBuildPhase_" + _targets[i])] = Setting("", "Sources", SettingsNoValue, 0, 1);
-		buildPhases._settings[getHash("PBXFrameworksBuildPhase_" + _targets[i])] = Setting("", "Frameworks", SettingsNoValue, 0, 2);
+		buildPhases._flags = kSettingsAsList;
+		buildPhases._settings[getHash("PBXResourcesBuildPhase_" + _targets[i])] = Setting("", "Resources", kSettingsNoValue, 0, 0);
+		buildPhases._settings[getHash("PBXSourcesBuildPhase_" + _targets[i])] = Setting("", "Sources", kSettingsNoValue, 0, 1);
+		buildPhases._settings[getHash("PBXFrameworksBuildPhase_" + _targets[i])] = Setting("", "Frameworks", kSettingsNoValue, 0, 2);
 		target->_properties["buildPhases"] = buildPhases;
 
-		target->addProperty("buildRules", "", "", SettingsNoValue | SettingsAsList);
+		target->addProperty("buildRules", "", "", kSettingsNoValue | kSettingsAsList);
 
-		target->addProperty("dependencies", "", "", SettingsNoValue | SettingsAsList);
+		target->addProperty("dependencies", "", "", kSettingsNoValue | kSettingsAsList);
 
-		target->addProperty("name", _targets[i], "", SettingsNoValue | SettingsQuoteVariable);
-		target->addProperty("productName", PROJECT_NAME, "", SettingsNoValue);
+		target->addProperty("name", _targets[i], "", kSettingsNoValue | kSettingsQuoteVariable);
+		target->addProperty("productName", PROJECT_NAME, "", kSettingsNoValue);
 		addProductFileReference("PBXFileReference_" PROJECT_DESCRIPTION ".app_" + _targets[i], PROJECT_DESCRIPTION ".app");
 		productsGroup->addChildByHash(getHash("PBXFileReference_" PROJECT_DESCRIPTION ".app_" + _targets[i]), PROJECT_DESCRIPTION ".app");
-		target->addProperty("productReference", getHash("PBXFileReference_" PROJECT_DESCRIPTION ".app_" + _targets[i]), PROJECT_DESCRIPTION ".app", SettingsNoValue);
-		target->addProperty("productType", "com.apple.product-type.application", "", SettingsNoValue | SettingsQuoteVariable);
+		target->addProperty("productReference", getHash("PBXFileReference_" PROJECT_DESCRIPTION ".app_" + _targets[i]), PROJECT_DESCRIPTION ".app", kSettingsNoValue);
+		target->addProperty("productType", "com.apple.product-type.application", "", kSettingsNoValue | kSettingsQuoteVariable);
 
 		_nativeTarget.add(target);
 	}
@@ -552,38 +552,38 @@ void XcodeProvider::setupProject() {
 
 	Object *project = new Object(this, "PBXProject", "PBXProject", "PBXProject", "", "Project object");
 
-	project->addProperty("buildConfigurationList", getHash("XCConfigurationList_scummvm"), "Build configuration list for PBXProject \"" PROJECT_NAME "\"", SettingsNoValue);
-	project->addProperty("compatibilityVersion", "Xcode 3.2", "", SettingsNoValue | SettingsQuoteVariable);
-	project->addProperty("developmentRegion", "English", "", SettingsNoValue);
-	project->addProperty("hasScannedForEncodings", "1", "", SettingsNoValue);
+	project->addProperty("buildConfigurationList", getHash("XCConfigurationList_scummvm"), "Build configuration list for PBXProject \"" PROJECT_NAME "\"", kSettingsNoValue);
+	project->addProperty("compatibilityVersion", "Xcode 3.2", "", kSettingsNoValue | kSettingsQuoteVariable);
+	project->addProperty("developmentRegion", "English", "", kSettingsNoValue);
+	project->addProperty("hasScannedForEncodings", "1", "", kSettingsNoValue);
 
 	// List of known regions
 	Property regions;
-	regions._flags = SettingsAsList;
+	regions._flags = kSettingsAsList;
 	ADD_SETTING_ORDER_NOVALUE(regions, "English", "", 0);
 	ADD_SETTING_ORDER_NOVALUE(regions, "Japanese", "", 1);
 	ADD_SETTING_ORDER_NOVALUE(regions, "French", "", 2);
 	ADD_SETTING_ORDER_NOVALUE(regions, "German", "", 3);
 	project->_properties["knownRegions"] = regions;
 
-	project->addProperty("mainGroup", _rootSourceGroup->getHashRef(), "CustomTemplate", SettingsNoValue);
-	project->addProperty("projectDirPath", _projectRoot, "", SettingsNoValue | SettingsQuoteVariable);
-	project->addProperty("projectRoot", "", "", SettingsNoValue | SettingsQuoteVariable);
+	project->addProperty("mainGroup", _rootSourceGroup->getHashRef(), "CustomTemplate", kSettingsNoValue);
+	project->addProperty("projectDirPath", _projectRoot, "", kSettingsNoValue | kSettingsQuoteVariable);
+	project->addProperty("projectRoot", "", "", kSettingsNoValue | kSettingsQuoteVariable);
 
 	// List of targets
 	Property targets;
-	targets._flags = SettingsAsList;
+	targets._flags = kSettingsAsList;
 #ifdef ENABLE_IOS
-	targets._settings[getHash("PBXNativeTarget_" + _targets[IOS_TARGET])] = Setting("", _targets[IOS_TARGET], SettingsNoValue, 0, 0);
+	targets._settings[getHash("PBXNativeTarget_" + _targets[IOS_TARGET])] = Setting("", _targets[IOS_TARGET], kSettingsNoValue, 0, 0);
 #endif
-	targets._settings[getHash("PBXNativeTarget_" + _targets[OSX_TARGET])] = Setting("", _targets[OSX_TARGET], SettingsNoValue, 0, 1);
+	targets._settings[getHash("PBXNativeTarget_" + _targets[OSX_TARGET])] = Setting("", _targets[OSX_TARGET], kSettingsNoValue, 0, 1);
 #ifdef ENABLE_IOS
-	targets._settings[getHash("PBXNativeTarget_" + _targets[SIM_TARGET])] = Setting("", _targets[SIM_TARGET], SettingsNoValue, 0, 2);
+	targets._settings[getHash("PBXNativeTarget_" + _targets[SIM_TARGET])] = Setting("", _targets[SIM_TARGET], kSettingsNoValue, 0, 2);
 #endif
 	project->_properties["targets"] = targets;
 #ifndef ENABLE_IOS
 	// Force list even when there is only a single target
-	project->_properties["targets"]._flags |= SettingsSingleItem;
+	project->_properties["targets"]._flags |= kSettingsSingleItem;
 #endif
 
 	_project.add(project);
@@ -615,12 +615,12 @@ void XcodeProvider::setupResourcesBuildPhase() {
 	for (unsigned int i = 0; i < _targets.size(); i++) {
 		Object *resource = new Object(this, "PBXResourcesBuildPhase_" + _targets[i], "PBXResourcesBuildPhase", "PBXResourcesBuildPhase", "", "Resources");
 
-		resource->addProperty("buildActionMask", "2147483647", "", SettingsNoValue);
+		resource->addProperty("buildActionMask", "2147483647", "", kSettingsNoValue);
 
 		// Add default files
 		Property files;
 		files._hasOrder = true;
-		files._flags = SettingsAsList;
+		files._flags = kSettingsAsList;
 
 		ValueList files_list;
 		files_list.push_back("scummclassic.zip");
@@ -651,7 +651,7 @@ void XcodeProvider::setupResourcesBuildPhase() {
 
 		// Add custom files depending on the target
 		if (_targets[i] == PROJECT_DESCRIPTION "-OS X") {
-			files._settings[getHash("PBXResources_" PROJECT_NAME ".icns")] = Setting("", PROJECT_NAME ".icns in Resources", SettingsNoValue, 0, 6);
+			files._settings[getHash("PBXResources_" PROJECT_NAME ".icns")] = Setting("", PROJECT_NAME ".icns in Resources", kSettingsNoValue, 0, 6);
 
 			// Remove 2 iphone icon files
 			files._settings.erase(getHash("PBXResources_Default.png"));
@@ -660,7 +660,7 @@ void XcodeProvider::setupResourcesBuildPhase() {
 
 		resource->_properties["files"] = files;
 
-		resource->addProperty("runOnlyForDeploymentPostprocessing", "0", "", SettingsNoValue);
+		resource->addProperty("runOnlyForDeploymentPostprocessing", "0", "", kSettingsNoValue);
 
 		_resourcesBuildPhase.add(resource);
 	}
@@ -676,11 +676,11 @@ void XcodeProvider::setupSourcesBuildPhase() {
 	for (unsigned int i = 0; i < _targets.size(); i++) {
 		Object *source = new Object(this, "PBXSourcesBuildPhase_" + _targets[i], "PBXSourcesBuildPhase", "PBXSourcesBuildPhase", "", "Sources");
 
-		source->addProperty("buildActionMask", "2147483647", "", SettingsNoValue);
+		source->addProperty("buildActionMask", "2147483647", "", kSettingsNoValue);
 
 		Property files;
 		files._hasOrder = true;
-		files._flags = SettingsAsList;
+		files._flags = kSettingsAsList;
 
 		int order = 0;
 		for (std::vector<Object *>::iterator file = _buildFile._objects.begin(); file != _buildFile._objects.end(); ++file) {
@@ -693,7 +693,7 @@ void XcodeProvider::setupSourcesBuildPhase() {
 
 		source->_properties["files"] = files;
 
-		source->addProperty("runOnlyForDeploymentPostprocessing", "0", "", SettingsNoValue);
+		source->addProperty("runOnlyForDeploymentPostprocessing", "0", "", kSettingsNoValue);
 
 		_sourcesBuildPhase.add(source);
 	}
@@ -703,7 +703,7 @@ void XcodeProvider::setupSourcesBuildPhase() {
 void XcodeProvider::setupBuildConfiguration() {
 
 	_buildConfiguration._comment = "XCBuildConfiguration";
-	_buildConfiguration._flags = SettingsAsList;
+	_buildConfiguration._flags = kSettingsAsList;
 
 	///****************************************
 	// * iPhone
@@ -721,7 +721,7 @@ void XcodeProvider::setupBuildConfiguration() {
 	ValueList iPhone_FrameworkSearchPaths;
 	iPhone_FrameworkSearchPaths.push_back("$(inherited)");
 	iPhone_FrameworkSearchPaths.push_back("\"$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks\"");
-	ADD_SETTING_LIST(iPhone_Debug, "FRAMEWORK_SEARCH_PATHS", iPhone_FrameworkSearchPaths, SettingsAsList, 5);
+	ADD_SETTING_LIST(iPhone_Debug, "FRAMEWORK_SEARCH_PATHS", iPhone_FrameworkSearchPaths, kSettingsAsList, 5);
 	ADD_SETTING(iPhone_Debug, "GCC_DYNAMIC_NO_PIC", "NO");
 	ADD_SETTING(iPhone_Debug, "GCC_ENABLE_CPP_EXCEPTIONS", "NO");
 	ADD_SETTING(iPhone_Debug, "GCC_ENABLE_FIX_AND_CONTINUE", "NO");
@@ -734,12 +734,12 @@ void XcodeProvider::setupBuildConfiguration() {
 	iPhone_HeaderSearchPaths.push_back("$(SRCROOT)/engines/");
 	iPhone_HeaderSearchPaths.push_back("$(SRCROOT)");
 	iPhone_HeaderSearchPaths.push_back("include/");
-	ADD_SETTING_LIST(iPhone_Debug, "HEADER_SEARCH_PATHS", iPhone_HeaderSearchPaths, SettingsAsList | SettingsQuoteVariable, 5);
+	ADD_SETTING_LIST(iPhone_Debug, "HEADER_SEARCH_PATHS", iPhone_HeaderSearchPaths, kSettingsAsList | kSettingsQuoteVariable, 5);
 	ADD_SETTING(iPhone_Debug, "INFOPLIST_FILE", "Info.plist");
 	ValueList iPhone_LibPaths;
 	iPhone_LibPaths.push_back("$(inherited)");
 	iPhone_LibPaths.push_back("\"$(SRCROOT)/lib\"");
-	ADD_SETTING_LIST(iPhone_Debug, "LIBRARY_SEARCH_PATHS", iPhone_LibPaths, SettingsAsList, 5);
+	ADD_SETTING_LIST(iPhone_Debug, "LIBRARY_SEARCH_PATHS", iPhone_LibPaths, kSettingsAsList, 5);
 	ADD_SETTING(iPhone_Debug, "ONLY_ACTIVE_ARCH", "YES");
 	ADD_SETTING(iPhone_Debug, "PREBINDING", "NO");
 	ADD_SETTING(iPhone_Debug, "PRODUCT_NAME", PROJECT_DESCRIPTION);
@@ -748,7 +748,7 @@ void XcodeProvider::setupBuildConfiguration() {
 	ADD_SETTING(iPhone_Debug, "SDKROOT", "iphoneos4.0");
 	ADD_SETTING_QUOTE(iPhone_Debug, "TARGETED_DEVICE_FAMILY", "1,2");
 
-	iPhone_Debug_Object->addProperty("name", "Debug", "", SettingsNoValue);
+	iPhone_Debug_Object->addProperty("name", "Debug", "", kSettingsNoValue);
 	iPhone_Debug_Object->_properties["buildSettings"] = iPhone_Debug;
 
 	// Release
@@ -759,7 +759,7 @@ void XcodeProvider::setupBuildConfiguration() {
 	REMOVE_SETTING(iPhone_Release, "GCC_DYNAMIC_NO_PIC");
 	ADD_SETTING(iPhone_Release, "WRAPPER_EXTENSION", "app");
 
-	iPhone_Release_Object->addProperty("name", "Release", "", SettingsNoValue);
+	iPhone_Release_Object->addProperty("name", "Release", "", kSettingsNoValue);
 	iPhone_Release_Object->_properties["buildSettings"] = iPhone_Release;
 
 	_buildConfiguration.add(iPhone_Debug_Object);
@@ -787,7 +787,7 @@ void XcodeProvider::setupBuildConfiguration() {
 	ADD_DEFINE(scummvm_defines, "IPHONE");
 	ADD_DEFINE(scummvm_defines, "XCODE");
 	ADD_DEFINE(scummvm_defines, "IPHONE_OFFICIAL");
-	ADD_SETTING_LIST(scummvm_Debug, "GCC_PREPROCESSOR_DEFINITIONS", scummvm_defines, SettingsNoQuote | SettingsAsList, 5);
+	ADD_SETTING_LIST(scummvm_Debug, "GCC_PREPROCESSOR_DEFINITIONS", scummvm_defines, kSettingsNoQuote | kSettingsAsList, 5);
 	ADD_SETTING(scummvm_Debug, "GCC_THUMB_SUPPORT", "NO");
 	ADD_SETTING(scummvm_Debug, "GCC_USE_GCC3_PFE_SUPPORT", "NO");
 	ADD_SETTING(scummvm_Debug, "GCC_WARN_ABOUT_RETURN_TYPE", "YES");
@@ -796,7 +796,7 @@ void XcodeProvider::setupBuildConfiguration() {
 	scummvm_HeaderPaths.push_back("include/");
 	scummvm_HeaderPaths.push_back("$(SRCROOT)/engines/");
 	scummvm_HeaderPaths.push_back("$(SRCROOT)");
-	ADD_SETTING_LIST(scummvm_Debug, "HEADER_SEARCH_PATHS", scummvm_HeaderPaths, SettingsQuoteVariable | SettingsAsList, 5);
+	ADD_SETTING_LIST(scummvm_Debug, "HEADER_SEARCH_PATHS", scummvm_HeaderPaths, kSettingsQuoteVariable | kSettingsAsList, 5);
 	ADD_SETTING_QUOTE(scummvm_Debug, "LIBRARY_SEARCH_PATHS", "");
 	ADD_SETTING(scummvm_Debug, "ONLY_ACTIVE_ARCH", "YES");
 	ADD_SETTING_QUOTE(scummvm_Debug, "OTHER_CFLAGS", "");
@@ -804,7 +804,7 @@ void XcodeProvider::setupBuildConfiguration() {
 	ADD_SETTING(scummvm_Debug, "PREBINDING", "NO");
 	ADD_SETTING(scummvm_Debug, "SDKROOT", "macosx");
 
-	scummvm_Debug_Object->addProperty("name", "Debug", "", SettingsNoValue);
+	scummvm_Debug_Object->addProperty("name", "Debug", "", kSettingsNoValue);
 	scummvm_Debug_Object->_properties["buildSettings"] = scummvm_Debug;
 
 	// Release
@@ -815,7 +815,7 @@ void XcodeProvider::setupBuildConfiguration() {
 	REMOVE_SETTING(scummvm_Release, "GCC_WARN_UNUSED_VARIABLE");
 	REMOVE_SETTING(scummvm_Release, "ONLY_ACTIVE_ARCH");
 
-	scummvm_Release_Object->addProperty("name", "Release", "", SettingsNoValue);
+	scummvm_Release_Object->addProperty("name", "Release", "", kSettingsNoValue);
 	scummvm_Release_Object->_properties["buildSettings"] = scummvm_Release;
 
 	_buildConfiguration.add(scummvm_Debug_Object);
@@ -844,7 +844,7 @@ void XcodeProvider::setupBuildConfiguration() {
 	ValueList scummvmOSX_defines(_defines);
 	ADD_DEFINE(scummvmOSX_defines, "SDL_BACKEND");
 	ADD_DEFINE(scummvmOSX_defines, "MACOSX");
-	ADD_SETTING_LIST(scummvmOSX_Debug, "GCC_PREPROCESSOR_DEFINITIONS", scummvmOSX_defines, SettingsNoQuote | SettingsAsList, 5);
+	ADD_SETTING_LIST(scummvmOSX_Debug, "GCC_PREPROCESSOR_DEFINITIONS", scummvmOSX_defines, kSettingsNoQuote | kSettingsAsList, 5);
 	ADD_SETTING_QUOTE(scummvmOSX_Debug, "GCC_VERSION", "");
 	ValueList scummvmOSX_HeaderPaths;
 	scummvmOSX_HeaderPaths.push_back("/opt/local/include/SDL");
@@ -853,14 +853,14 @@ void XcodeProvider::setupBuildConfiguration() {
 	scummvmOSX_HeaderPaths.push_back("include/");
 	scummvmOSX_HeaderPaths.push_back("$(SRCROOT)/engines/");
 	scummvmOSX_HeaderPaths.push_back("$(SRCROOT)");
-	ADD_SETTING_LIST(scummvmOSX_Debug, "HEADER_SEARCH_PATHS", scummvmOSX_HeaderPaths, SettingsQuoteVariable | SettingsAsList, 5);
+	ADD_SETTING_LIST(scummvmOSX_Debug, "HEADER_SEARCH_PATHS", scummvmOSX_HeaderPaths, kSettingsQuoteVariable | kSettingsAsList, 5);
 	ADD_SETTING_QUOTE(scummvmOSX_Debug, "INFOPLIST_FILE", "$(SRCROOT)/dists/macosx/Info.plist");
 	ValueList scummvmOSX_LibPaths;
 	scummvmOSX_LibPaths.push_back("/sw/lib");
 	scummvmOSX_LibPaths.push_back("/opt/local/lib");
 	scummvmOSX_LibPaths.push_back("\"$(inherited)\"");
 	scummvmOSX_LibPaths.push_back("\"\\\\\\\"$(SRCROOT)/lib\\\\\\\"\"");  // mmmh, all those slashes, it's almost Christmas \o/
-	ADD_SETTING_LIST(scummvmOSX_Debug, "LIBRARY_SEARCH_PATHS", scummvmOSX_LibPaths, SettingsNoQuote | SettingsAsList, 5);
+	ADD_SETTING_LIST(scummvmOSX_Debug, "LIBRARY_SEARCH_PATHS", scummvmOSX_LibPaths, kSettingsNoQuote | kSettingsAsList, 5);
 	ADD_SETTING_QUOTE(scummvmOSX_Debug, "OTHER_CFLAGS", "");
 	ValueList scummvmOSX_LdFlags;
 	scummvmOSX_LdFlags.push_back("-lSDLmain");
@@ -875,11 +875,11 @@ void XcodeProvider::setupBuildConfiguration() {
 	scummvmOSX_LdFlags.push_back("-lFLAC");
 	scummvmOSX_LdFlags.push_back("-lSDL");
 	scummvmOSX_LdFlags.push_back("-lz");
-	ADD_SETTING_LIST(scummvmOSX_Debug, "OTHER_LDFLAGS", scummvmOSX_LdFlags, SettingsAsList, 5);
+	ADD_SETTING_LIST(scummvmOSX_Debug, "OTHER_LDFLAGS", scummvmOSX_LdFlags, kSettingsAsList, 5);
 	ADD_SETTING(scummvmOSX_Debug, "PREBINDING", "NO");
 	ADD_SETTING(scummvmOSX_Debug, "PRODUCT_NAME", PROJECT_DESCRIPTION);
 
-	scummvmOSX_Debug_Object->addProperty("name", "Debug", "", SettingsNoValue);
+	scummvmOSX_Debug_Object->addProperty("name", "Debug", "", kSettingsNoValue);
 	scummvmOSX_Debug_Object->_properties["buildSettings"] = scummvmOSX_Debug;
 
 	// Release
@@ -890,7 +890,7 @@ void XcodeProvider::setupBuildConfiguration() {
 	REMOVE_SETTING(scummvmOSX_Release, "GCC_OPTIMIZATION_LEVEL");
 	ADD_SETTING(scummvmOSX_Release, "WRAPPER_EXTENSION", "app");
 
-	scummvmOSX_Release_Object->addProperty("name", "Release", "", SettingsNoValue);
+	scummvmOSX_Release_Object->addProperty("name", "Release", "", kSettingsNoValue);
 	scummvmOSX_Release_Object->_properties["buildSettings"] = scummvmOSX_Release;
 
 	_buildConfiguration.add(scummvmOSX_Debug_Object);
@@ -904,12 +904,12 @@ void XcodeProvider::setupBuildConfiguration() {
 	Object *scummvmSimulator_Debug_Object = new Object(this, "XCBuildConfiguration_" PROJECT_DESCRIPTION "-Simulator_Debug", _targets[SIM_TARGET] /* ScummVM-Simulator */, "XCBuildConfiguration", "PBXNativeTarget", "Debug");
 	Property scummvmSimulator_Debug(iPhone_Debug);
 	ADD_SETTING_QUOTE(scummvmSimulator_Debug, "FRAMEWORK_SEARCH_PATHS", "$(inherited)");
-	ADD_SETTING_LIST(scummvmSimulator_Debug, "GCC_PREPROCESSOR_DEFINITIONS", scummvm_defines, SettingsNoQuote | SettingsAsList, 5);
+	ADD_SETTING_LIST(scummvmSimulator_Debug, "GCC_PREPROCESSOR_DEFINITIONS", scummvm_defines, kSettingsNoQuote | kSettingsAsList, 5);
 	ADD_SETTING(scummvmSimulator_Debug, "SDKROOT", "iphonesimulator3.2");
 	ADD_SETTING_QUOTE(scummvmSimulator_Debug, "VALID_ARCHS", "i386 x86_64");
 	REMOVE_SETTING(scummvmSimulator_Debug, "TARGETED_DEVICE_FAMILY");
 
-	scummvmSimulator_Debug_Object->addProperty("name", "Debug", "", SettingsNoValue);
+	scummvmSimulator_Debug_Object->addProperty("name", "Debug", "", kSettingsNoValue);
 	scummvmSimulator_Debug_Object->_properties["buildSettings"] = scummvmSimulator_Debug;
 
 	// Release
@@ -920,7 +920,7 @@ void XcodeProvider::setupBuildConfiguration() {
 	REMOVE_SETTING(scummvmSimulator_Release, "GCC_DYNAMIC_NO_PIC");
 	ADD_SETTING(scummvmSimulator_Release, "WRAPPER_EXTENSION", "app");
 
-	scummvmSimulator_Release_Object->addProperty("name", "Release", "", SettingsNoValue);
+	scummvmSimulator_Release_Object->addProperty("name", "Release", "", kSettingsNoValue);
 	scummvmSimulator_Release_Object->_properties["buildSettings"] = scummvmSimulator_Release;
 
 	_buildConfiguration.add(scummvmSimulator_Debug_Object);
@@ -929,7 +929,7 @@ void XcodeProvider::setupBuildConfiguration() {
 	//////////////////////////////////////////////////////////////////////////
 	// Configuration List
 	_configurationList._comment = "XCConfigurationList";
-	_configurationList._flags = SettingsAsList;
+	_configurationList._flags = kSettingsAsList;
 #endif
 	// Warning: This assumes we have all configurations with a Debug & Release pair
 	for (std::vector<Object *>::iterator config = _buildConfiguration._objects.begin(); config != _buildConfiguration._objects.end(); config++) {
@@ -937,15 +937,15 @@ void XcodeProvider::setupBuildConfiguration() {
 		Object *configList = new Object(this, "XCConfigurationList_" + (*config)->_name, (*config)->_name, "XCConfigurationList", "", "Build configuration list for " + (*config)->_refType + " \"" + (*config)->_name + "\"");
 
 		Property buildConfigs;
-		buildConfigs._flags = SettingsAsList;
+		buildConfigs._flags = kSettingsAsList;
 
-		buildConfigs._settings[getHash((*config)->_id)] = Setting("", "Debug", SettingsNoValue, 0, 0);
-		buildConfigs._settings[getHash((*(++config))->_id)] = Setting("", "Release", SettingsNoValue, 0, 1);
+		buildConfigs._settings[getHash((*config)->_id)] = Setting("", "Debug", kSettingsNoValue, 0, 0);
+		buildConfigs._settings[getHash((*(++config))->_id)] = Setting("", "Release", kSettingsNoValue, 0, 1);
 
 		configList->_properties["buildConfigurations"] = buildConfigs;
 
-		configList->addProperty("defaultConfigurationIsVisible", "0", "", SettingsNoValue);
-		configList->addProperty("defaultConfigurationName", "Release", "", SettingsNoValue);
+		configList->addProperty("defaultConfigurationIsVisible", "0", "", kSettingsNoValue);
+		configList->addProperty("defaultConfigurationName", "Release", "", kSettingsNoValue);
 
 		_configurationList.add(configList);
 	}
@@ -1032,30 +1032,30 @@ std::string replace(std::string input, const std::string find, std::string repla
 std::string XcodeProvider::writeProperty(const std::string &variable, Property &prop, int flags) const {
 	std::string output;
 
-	output += (flags & SettingsSingleItem ? "" : "\t\t\t") + variable + " = ";
+	output += (flags & kSettingsSingleItem ? "" : "\t\t\t") + variable + " = ";
 
-	if (prop._settings.size() > 1 || (prop._flags & SettingsSingleItem))
-		output += (prop._flags & SettingsAsList) ? "(\n" : "{\n";
+	if (prop._settings.size() > 1 || (prop._flags & kSettingsSingleItem))
+		output += (prop._flags & kSettingsAsList) ? "(\n" : "{\n";
 
 	OrderedSettingList settings = prop.getOrderedSettingList();
 	for (OrderedSettingList::const_iterator setting = settings.begin(); setting != settings.end(); ++setting) {
-		if (settings.size() > 1 || (prop._flags & SettingsSingleItem))
-			output += (flags & SettingsSingleItem ? " " : "\t\t\t\t");
+		if (settings.size() > 1 || (prop._flags & kSettingsSingleItem))
+			output += (flags & kSettingsSingleItem ? " " : "\t\t\t\t");
 
 		output += writeSetting(setting->first, setting->second);
 
-		// The combination of SettingsAsList, and SettingsSingleItem should use "," and not ";" (i.e children
+		// The combination of kSettingsAsList, and kSettingsSingleItem should use "," and not ";" (i.e children
 		// in PBXGroup, so we special case that case here.
-		if ((prop._flags & SettingsAsList) && (prop._settings.size() > 1 || (prop._flags & SettingsSingleItem))) {
+		if ((prop._flags & kSettingsAsList) && (prop._settings.size() > 1 || (prop._flags & kSettingsSingleItem))) {
 			output += (prop._settings.size() > 0) ? ",\n" : "\n";
 		} else {
 			output += ";";
-			output += (flags & SettingsSingleItem ? " " : "\n");
+			output += (flags & kSettingsSingleItem ? " " : "\n");
 		}
 	}
 
-	if (prop._settings.size() > 1 || (prop._flags & SettingsSingleItem))
-		output += (prop._flags & SettingsAsList) ? "\t\t\t);\n" : "\t\t\t};\n";
+	if (prop._settings.size() > 1 || (prop._flags & kSettingsSingleItem))
+		output += (prop._flags & kSettingsAsList) ? "\t\t\t);\n" : "\t\t\t};\n";
 
 	return output;
 }
@@ -1068,7 +1068,7 @@ std::string XcodeProvider::writeSetting(const std::string &variable, std::string
 // XCode project generator pbuilder_pbx.cpp, writeSettings() (under LGPL 2.1)
 std::string XcodeProvider::writeSetting(const std::string &variable, const Setting &setting) const {
 	std::string output;
-	const std::string quote = (setting._flags & SettingsNoQuote) ? "" : "\"";
+	const std::string quote = (setting._flags & kSettingsNoQuote) ? "" : "\"";
 	const std::string escape_quote = quote.empty() ? "" : "\\" + quote;
 	std::string newline = "\n";
 
@@ -1077,12 +1077,12 @@ std::string XcodeProvider::writeSetting(const std::string &variable, const Setti
 		newline += "\t";
 
 	// Setup variable
-	std::string var = (setting._flags & SettingsQuoteVariable) ? "\"" + variable + "\"" : variable;
+	std::string var = (setting._flags & kSettingsQuoteVariable) ? "\"" + variable + "\"" : variable;
 
 	// Output a list
-	if (setting._flags & SettingsAsList) {
+	if (setting._flags & kSettingsAsList) {
 
-		output += var + ((setting._flags & SettingsNoValue) ? "(" : " = (") + newline;
+		output += var + ((setting._flags & kSettingsNoValue) ? "(" : " = (") + newline;
 
 		for (unsigned int i = 0, count = 0; i < setting._entries.size(); ++i) {
 
@@ -1101,11 +1101,11 @@ std::string XcodeProvider::writeSetting(const std::string &variable, const Setti
 		}
 		// Add closing ")" on new line
 		newline.resize(newline.size() - 1);
-		output += (setting._flags & SettingsNoValue) ? "\t\t\t)" : "," + newline + ")";
+		output += (setting._flags & kSettingsNoValue) ? "\t\t\t)" : "," + newline + ")";
 	} else {
 		output += var;
 
-		output += (setting._flags & SettingsNoValue) ? "" : " = " + quote;
+		output += (setting._flags & kSettingsNoValue) ? "" : " = " + quote;
 
 		for (unsigned int i = 0; i < setting._entries.size(); ++i) {
 			std::string value = setting._entries.at(i)._value;
@@ -1118,7 +1118,7 @@ std::string XcodeProvider::writeSetting(const std::string &variable, const Setti
 				output += " /* " + comment + " */";
 		}
 
-		output += (setting._flags & SettingsNoValue) ? "" : quote;
+		output += (setting._flags & kSettingsNoValue) ? "" : quote;
 	}
 	return output;
 }
diff --git a/devtools/create_project/xcode.h b/devtools/create_project/xcode.h
index cadd189..d48f11c 100644
--- a/devtools/create_project/xcode.h
+++ b/devtools/create_project/xcode.h
@@ -47,11 +47,11 @@ protected:
 	                            const StringList &duplicate, const std::string &objPrefix, const std::string &filePrefix);
 private:
 	enum {
-		SettingsAsList        = 0x01,
-		SettingsSingleItem    = 0x02,
-		SettingsNoQuote       = 0x04,
-		SettingsQuoteVariable = 0x08,
-		SettingsNoValue       = 0x10
+		kSettingsAsList        = 0x01,
+		kSettingsSingleItem    = 0x02,
+		kSettingsNoQuote       = 0x04,
+		kSettingsQuoteVariable = 0x08,
+		kSettingsNoValue       = 0x10
 	};
 
 	// File properties
@@ -164,7 +164,7 @@ private:
 			assert(!objectName.empty());
 			assert(!objectType.empty());
 
-			addProperty("isa", objectType, "", SettingsNoQuote | SettingsNoValue);
+			addProperty("isa", objectType, "", kSettingsNoQuote | kSettingsNoValue);
 		}
 
 		// Add a simple Property with just a name and a value
@@ -176,7 +176,7 @@ private:
 			std::string output;
 			output = "\t\t" + _parent->getHash(_id) + (_comment.empty() ? "" : " /* " + _comment + " */") + " = {";
 
-			if (flags & SettingsAsList)
+			if (flags & kSettingsAsList)
 				output += "\n";
 
 			// Special case: always output the isa property first
@@ -190,7 +190,7 @@ private:
 				output += _parent->writeProperty(property->first, property->second, flags);
 			}
 
-			if (flags & SettingsAsList)
+			if (flags & kSettingsAsList)
 				output += "\t\t";
 
 			output += "};\n";


Commit: c09a9aa1bf2e84186d5bd7256670a7b361d95f0f
    https://github.com/scummvm/scummvm/commit/c09a9aa1bf2e84186d5bd7256670a7b361d95f0f
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2015-12-12T06:54:57+01:00

Commit Message:
DEVTOOLS: Replace macro by function call.

Changed paths:
    devtools/create_project/xcode.cpp



diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp
index ed3ba0f..c5c433c 100644
--- a/devtools/create_project/xcode.cpp
+++ b/devtools/create_project/xcode.cpp
@@ -69,17 +69,6 @@ namespace CreateProjectTool {
 	_buildFile._flags = kSettingsSingleItem; \
 }
 
-#define ADD_FILE_REFERENCE(id, name, properties) { \
-	Object *fileRef = new Object(this, id, name, "PBXFileReference", "PBXFileReference", name); \
-	if (!properties._fileEncoding.empty()) fileRef->addProperty("fileEncoding", properties._fileEncoding, "", kSettingsNoValue); \
-	if (!properties._lastKnownFileType.empty()) fileRef->addProperty("lastKnownFileType", properties._lastKnownFileType, "", kSettingsNoValue|kSettingsQuoteVariable); \
-	if (!properties._fileName.empty()) fileRef->addProperty("name", properties._fileName, "", kSettingsNoValue|kSettingsQuoteVariable); \
-	if (!properties._filePath.empty()) fileRef->addProperty("path", properties._filePath, "", kSettingsNoValue|kSettingsQuoteVariable); \
-	if (!properties._sourceTree.empty()) fileRef->addProperty("sourceTree", properties._sourceTree, "", kSettingsNoValue); \
-	_fileReference.add(fileRef); \
-	_fileReference._flags = kSettingsSingleItem; \
-}
-
 bool producesObjectFileOnOSX(const std::string &fileName) {
 	std::string n, ext;
 	splitFilename(fileName, n, ext);
@@ -420,7 +409,7 @@ void XcodeProvider::setupFrameworksBuildPhase() {
 
 		ADD_SETTING_ORDER_NOVALUE(iPhone_files, getHash(id), comment, order++);
 		ADD_BUILD_FILE(id, *framework, getHash(*framework), comment);
-		ADD_FILE_REFERENCE(*framework, *framework, properties[*framework]);
+		addFileReference(*framework, *framework, properties[*framework]);
 	}
 
 	framework_iPhone->_properties["files"] = iPhone_files;
@@ -462,7 +451,7 @@ void XcodeProvider::setupFrameworksBuildPhase() {
 
 		ADD_SETTING_ORDER_NOVALUE(osx_files, getHash(id), comment, order++);
 		ADD_BUILD_FILE(id, *framework, getHash(*framework), comment);
-		ADD_FILE_REFERENCE(*framework, *framework, properties[*framework]);
+		addFileReference(*framework, *framework, properties[*framework]);
 	}
 
 	framework_OSX->_properties["files"] = osx_files;
@@ -497,7 +486,7 @@ void XcodeProvider::setupFrameworksBuildPhase() {
 
 		ADD_SETTING_ORDER_NOVALUE(simulator_files, getHash(id), comment, order++);
 		ADD_BUILD_FILE(id, *framework, getHash(*framework), comment);
-		ADD_FILE_REFERENCE(*framework, *framework, properties[*framework]);
+		addFileReference(*framework, *framework, properties[*framework]);
 	}
 
 	framework_simulator->_properties["files"] = simulator_files;
@@ -646,7 +635,7 @@ void XcodeProvider::setupResourcesBuildPhase() {
 			ADD_SETTING_ORDER_NOVALUE(files, getHash(id), comment, order++);
 			// TODO Fix crash when adding build file for data
 			//ADD_BUILD_FILE(id, *file, comment);
-			ADD_FILE_REFERENCE(*file, *file, properties[*file]);
+			addFileReference(*file, *file, properties[*file]);
 		}
 
 		// Add custom files depending on the target


Commit: 2ef9ced7a9a8a2d95f0b017292cca37f681ef4ea
    https://github.com/scummvm/scummvm/commit/2ef9ced7a9a8a2d95f0b017292cca37f681ef4ea
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2015-12-12T06:54:58+01:00

Commit Message:
DEVTOOLS: Silence compiler warnings in create_access.

Changed paths:
    devtools/create_access/amazon_resources.cpp
    devtools/create_access/amazon_resources.h
    devtools/create_access/create_access_dat.cpp
    devtools/create_access/martian_resources.cpp
    devtools/create_access/martian_resources.h



diff --git a/devtools/create_access/amazon_resources.cpp b/devtools/create_access/amazon_resources.cpp
index 50b8f33..8156894 100644
--- a/devtools/create_access/amazon_resources.cpp
+++ b/devtools/create_access/amazon_resources.cpp
@@ -754,4 +754,4 @@ const char *const IQLABELS_ENG[9] = {
 
 const char *const CANT_GET_THERE_ENG = "YOU CAN'T GET THERE FROM HERE.";
 
-};
+} // End of namespace Amazon
diff --git a/devtools/create_access/amazon_resources.h b/devtools/create_access/amazon_resources.h
index fa281f8..aae27ce 100644
--- a/devtools/create_access/amazon_resources.h
+++ b/devtools/create_access/amazon_resources.h
@@ -57,6 +57,6 @@ extern const char *const HELPLVLTXT_ENG[3];
 extern const char *const IQLABELS_ENG[9];
 extern const char *const CANT_GET_THERE_ENG;
 
-};
+} // End of namespace Amazon
 
 #endif
diff --git a/devtools/create_access/create_access_dat.cpp b/devtools/create_access/create_access_dat.cpp
index 0e57f76..af9ab02 100644
--- a/devtools/create_access/create_access_dat.cpp
+++ b/devtools/create_access/create_access_dat.cpp
@@ -160,7 +160,7 @@ void writeMartianCommonData() {
 	}
 }
 
-bool processExecutable(int idx, const char *name) {
+bool processExecutable(int exeIdx, const char *name) {
 	uint dataSegmentOffset;
 	uint filenamesOffset, numFilenames;
 	uint charsStart, charsEnd;
@@ -291,7 +291,7 @@ bool processExecutable(int idx, const char *name) {
 
 	// Write out header entry
 	uint outputOffset = outputFile.size();
-	outputFile.seek(8 + idx * 8);
+	outputFile.seek(8 + exeIdx * 8);
 	outputFile.writeByte(gameId);
 	outputFile.writeByte(discType);
 	outputFile.writeByte(demoType);
diff --git a/devtools/create_access/martian_resources.cpp b/devtools/create_access/martian_resources.cpp
index 2a726a7..f631ce7 100644
--- a/devtools/create_access/martian_resources.cpp
+++ b/devtools/create_access/martian_resources.cpp
@@ -179,4 +179,4 @@ const char *const INVENTORY_NAMES_ENG[55] = {
 	"MONKEY WRENCH", "BIG DICK CARD", "BRA", "BOLT", nullptr
 };
 
-};
+} // End of namespace Amazon
diff --git a/devtools/create_access/martian_resources.h b/devtools/create_access/martian_resources.h
index c3dfc2a..f80f4c1 100644
--- a/devtools/create_access/martian_resources.h
+++ b/devtools/create_access/martian_resources.h
@@ -47,6 +47,6 @@ extern const char *const HELPLVLTXT_ENG[3];
 extern const char *const IQLABELS_ENG[9];
 extern const char *const CANT_GET_THERE_ENG;
 
-};
+} // End of namespace Amazon
 
 #endif


Commit: 410b5f3d342e1e2e4b06c8c7ae219212d2e5426f
    https://github.com/scummvm/scummvm/commit/410b5f3d342e1e2e4b06c8c7ae219212d2e5426f
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2015-12-12T06:54:58+01:00

Commit Message:
DEVTOOLS: Silence compiler warning in convbdf.

Changed paths:
    devtools/convbdf.cpp



diff --git a/devtools/convbdf.cpp b/devtools/convbdf.cpp
index 21c8af8..6852fc2 100644
--- a/devtools/convbdf.cpp
+++ b/devtools/convbdf.cpp
@@ -392,7 +392,7 @@ int main(int argc, char *argv[]) {
 
 		for (int y = 0; y < box.height; ++y) {
 			printf("// |");
-			unsigned char data;
+			unsigned char data = 0;
 			for (int x = 0; x < box.width; ++x) {
 				if (!(x % 8))
 					data = *bitmap++;


Commit: e7f54aec7db6924c6c01b3c9d96a2e738decb421
    https://github.com/scummvm/scummvm/commit/e7f54aec7db6924c6c01b3c9d96a2e738decb421
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2015-12-12T06:54:58+01:00

Commit Message:
COMMON: A few formatting fixes.

Changed paths:
    common/scummsys.h



diff --git a/common/scummsys.h b/common/scummsys.h
index b8cf767..7c2978f 100644
--- a/common/scummsys.h
+++ b/common/scummsys.h
@@ -23,8 +23,8 @@
 #ifndef COMMON_SCUMMSYS_H
 #define COMMON_SCUMMSYS_H
 
-#ifndef __has_feature         // Optional of course.
-  #define __has_feature(x) 0  // Compatibility with non-clang compilers.
+#ifndef __has_feature           // Optional of course.
+	#define __has_feature(x) 0  // Compatibility with non-clang compilers.
 #endif
 
 // This is a convenience macro to test whether the compiler used is a GCC
@@ -367,11 +367,11 @@
 #endif
 
 #ifndef STRINGBUFLEN
-  #if defined(__N64__) || defined(__DS__)
-    #define STRINGBUFLEN 256
-  #else
-    #define STRINGBUFLEN 1024
-  #endif
+	#if defined(__N64__) || defined(__DS__)
+		#define STRINGBUFLEN 256
+	#else
+		#define STRINGBUFLEN 1024
+	#endif
 #endif
 
 #ifndef MAXPATHLEN


Commit: 84ac8fa7354c4adfa7e2f8914cd564bc7f3927d6
    https://github.com/scummvm/scummvm/commit/84ac8fa7354c4adfa7e2f8914cd564bc7f3927d6
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2015-12-12T06:54:58+01:00

Commit Message:
DEVTOOLS: A few formatting fixes.

Changed paths:
    devtools/convbdf.cpp
    devtools/create_project/create_project.h
    devtools/create_translations/create_translations.h



diff --git a/devtools/convbdf.cpp b/devtools/convbdf.cpp
index 6852fc2..59ea5cc 100644
--- a/devtools/convbdf.cpp
+++ b/devtools/convbdf.cpp
@@ -21,7 +21,7 @@
  */
 
 #ifndef __has_feature         // Optional of course.
-  #define __has_feature(x) 0  // Compatibility with non-clang compilers.
+#define __has_feature(x) 0    // Compatibility with non-clang compilers.
 #endif
 
 #include <fstream>
diff --git a/devtools/create_project/create_project.h b/devtools/create_project/create_project.h
index 459342a6..1a28946 100644
--- a/devtools/create_project/create_project.h
+++ b/devtools/create_project/create_project.h
@@ -23,8 +23,8 @@
 #ifndef TOOLS_CREATE_PROJECT_H
 #define TOOLS_CREATE_PROJECT_H
 
-#ifndef __has_feature         // Optional of course.
-  #define __has_feature(x) 0  // Compatibility with non-clang compilers.
+#ifndef __has_feature       // Optional of course.
+#define __has_feature(x) 0  // Compatibility with non-clang compilers.
 #endif
 
 #include <map>
diff --git a/devtools/create_translations/create_translations.h b/devtools/create_translations/create_translations.h
index 34a7991..e87e392 100644
--- a/devtools/create_translations/create_translations.h
+++ b/devtools/create_translations/create_translations.h
@@ -26,10 +26,10 @@
 typedef unsigned char   uint8;
 typedef unsigned short uint16;
 typedef unsigned int   uint32;
-typedef signed short int16;
+typedef signed short    int16;
 
-#ifndef __has_feature         // Optional of course.
-  #define __has_feature(x) 0  // Compatibility with non-clang compilers.
+#ifndef __has_feature       // Optional of course.
+#define __has_feature(x) 0  // Compatibility with non-clang compilers.
 #endif
 
 #endif /* CREATE_TRANSLATIONS_H */


Commit: 8392fe4f058d56d5a16ef5faad76e440ffa13400
    https://github.com/scummvm/scummvm/commit/8392fe4f058d56d5a16ef5faad76e440ffa13400
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2015-12-12T07:02:02+01:00

Commit Message:
DEVTOOLS: More formatting fixes in create_amazon.

Powered by astyle.

Changed paths:
    devtools/create_access/amazon_resources.cpp
    devtools/create_access/create_access_dat.cpp
    devtools/create_access/create_access_dat.h
    devtools/create_access/martian_resources.cpp



diff --git a/devtools/create_access/amazon_resources.cpp b/devtools/create_access/amazon_resources.cpp
index 8156894..f4b642f 100644
--- a/devtools/create_access/amazon_resources.cpp
+++ b/devtools/create_access/amazon_resources.cpp
@@ -267,7 +267,7 @@ const byte *const CURSORS[AMAZON_NUM_CURSORS] = {
 };
 const uint CURSOR_SIZES[AMAZON_NUM_CURSORS] = {
 	sizeof(MOUSE0), sizeof(MOUSE1), sizeof(MOUSE2), sizeof(MOUSE3), sizeof(CURSEYE),
-	sizeof(CURSHAND), sizeof(CURSGET), sizeof(CURSCLIMB), sizeof(CURSTALK),	sizeof(CURSHELP)
+	sizeof(CURSHAND), sizeof(CURSGET), sizeof(CURSCLIMB), sizeof(CURSTALK), sizeof(CURSHELP)
 };
 
 
@@ -731,7 +731,7 @@ const int COMBO_TABLE[85][4] = {
 };
 
 const char *const NO_HELP_MESSAGE_ENG =
-"WE ARE UNABLE TO PROVIDE YOU WITH ANY MORE HINTS.  YOUR IQ \
+	"WE ARE UNABLE TO PROVIDE YOU WITH ANY MORE HINTS.  YOUR IQ \
 HAS DECREASED SO FAR THAT WE CAN NO LONGER PUT THE HINTS IN TERMS \
 YOU CAN UNDERSTAND.";
 const char *const NO_HINTS_MESSAGE_ENG = "THE HELP SYSTEM HAS BEEN TURNED OFF FOR THIS GAME.";
diff --git a/devtools/create_access/create_access_dat.cpp b/devtools/create_access/create_access_dat.cpp
index af9ab02..a1591ef 100644
--- a/devtools/create_access/create_access_dat.cpp
+++ b/devtools/create_access/create_access_dat.cpp
@@ -46,7 +46,7 @@
  * Series of index entries identifying each game:
  * 1 byte  - Game type: 1 = Amazon, 2 = Martian Memorandum, 3 = Noctropolis
  * 1 byte  - disc type: 0 = Floppy, 1 = CD, 2 = Common data shared across
- *			all variations of the given game
+ *           all variations of the given game
  * 1 byte  - Is Demo: 0 = Full game, 1 = Demo
  * 1 byte  - Language (Common::Language)
  * 4 bytes - File offset for the data for the game
@@ -98,7 +98,7 @@ void writeHeader(int numExecutables) {
 
 	// Write out version number
 	outputFile.writeWord(VERSION_NUMBER);
-	
+
 	// Write out the number of entries the data file will contain
 	outputFile.writeWord(numExecutables);
 
@@ -109,8 +109,8 @@ void writeHeader(int numExecutables) {
 void writeAmazonCommonData() {
 	// Write out the header entry
 	outputFile.seek(8);
-	outputFile.writeByte(1);	// Amazon
-	outputFile.writeByte(2);	// Common data
+	outputFile.writeByte(1);    // Amazon
+	outputFile.writeByte(2);    // Common data
 	outputFile.writeByte(0);
 	outputFile.writeByte(0);
 	outputFile.writeLong(outputFile.size());
@@ -144,8 +144,8 @@ void writeAmazonCommonData() {
 void writeMartianCommonData() {
 	// Write out the header entry
 	outputFile.seek(16);
-	outputFile.writeByte(2);	// Martian
-	outputFile.writeByte(2);	// Common data
+	outputFile.writeByte(2);    // Martian
+	outputFile.writeByte(2);    // Common data
 	outputFile.writeByte(0);
 	outputFile.writeByte(0);
 	outputFile.writeLong(outputFile.size());
@@ -304,7 +304,7 @@ bool processExecutable(int exeIdx, const char *name) {
 	for (uint idx = 0; idx < numFilenames; ++idx) {
 		exeFile.seek(filenamesOffset + idx * 2);
 		uint nameOffset = exeFile.readWord();
-		
+
 		exeFile.seek(dataSegmentOffset + nameOffset);
 		outputFile.writeString(exeFile);
 	}
@@ -319,7 +319,7 @@ bool processExecutable(int exeIdx, const char *name) {
 		charOffsets.push_back(exeFile.readWord());
 
 	outputFile.writeWord(charOffsets.size());
-	charOffsets.push_back(charsEnd);	
+	charOffsets.push_back(charsEnd);
 	for (uint idx = 0; idx < charOffsets.size() - 1; ++idx) {
 		if (charOffsets[idx] == 0) {
 			outputFile.writeWord(0);
@@ -353,7 +353,7 @@ bool processExecutable(int exeIdx, const char *name) {
 		travelPos.push_back(Common::Point(xp, yp));
 	}
 
-	outputFile.writeWord(numRooms);	
+	outputFile.writeWord(numRooms);
 	for (uint idx = 0; idx < numRooms; ++idx) {
 		uint dataSize = 0;
 
diff --git a/devtools/create_access/create_access_dat.h b/devtools/create_access/create_access_dat.h
index 8b2af6b..4976ede 100644
--- a/devtools/create_access/create_access_dat.h
+++ b/devtools/create_access/create_access_dat.h
@@ -166,11 +166,9 @@ public:
 			uint32 result = pos();
 			fseek(_f, currentPos, SEEK_SET);
 			return result;
-		}
-		else if (_memPtr) {
+		} else if (_memPtr) {
 			return _size;
-		}
-		else {
+		} else {
 			return 0;
 		}
 	}
diff --git a/devtools/create_access/martian_resources.cpp b/devtools/create_access/martian_resources.cpp
index f631ce7..381b79a 100644
--- a/devtools/create_access/martian_resources.cpp
+++ b/devtools/create_access/martian_resources.cpp
@@ -118,8 +118,8 @@ const byte MOUSE3[] = {
 	0, 0
 };
 
-const byte *const CURSORS[MARTIAN_NUM_CURSORS] = { 
-	MOUSE0, MOUSE1, MOUSE2, MOUSE3 
+const byte *const CURSORS[MARTIAN_NUM_CURSORS] = {
+	MOUSE0, MOUSE1, MOUSE2, MOUSE3
 };
 const uint CURSOR_SIZES[MARTIAN_NUM_CURSORS] = {
 	sizeof(MOUSE0), sizeof(MOUSE1), sizeof(MOUSE2), sizeof(MOUSE3)






More information about the Scummvm-git-logs mailing list