From 78f3f299d5fa2ba126c50b9cd26b793c786927b2 Mon Sep 17 00:00:00 2001 From: ed Date: Tue, 12 Mar 2019 11:27:44 +0000 Subject: [PATCH] Projucer: Tidy up a couple of places not using ValueWithDefault objects in the Xcode exporter --- .../Source/ProjectSaving/jucer_ProjectExport_Xcode.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h index 40d7505545..9c813e2d25 100644 --- a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h +++ b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h @@ -158,6 +158,10 @@ public: bool isDocumentBrowserEnabled() const { return uiSupportsDocumentBrowserValue.get(); } bool isStatusBarHidden() const { return uiStatusBarHiddenValue.get(); } + String getDocumentExtensionsString() const { return documentExtensionsValue.get(); } + + bool shouldKeepCustomXcodeSchemes() const { return keepCustomXcodeSchemesValue.get(); } + String getIosDevelopmentTeamIDString() const { return iosDevelopmentTeamIDValue.get(); } String getAppGroupIdString() const { return iosAppGroupsIDValue.get(); } @@ -1466,8 +1470,8 @@ public: addPlistDictionaryKey (dict, "NSHumanReadableCopyright", owner.project.getCompanyCopyrightString()); addPlistDictionaryKeyBool (dict, "NSHighResolutionCapable", true); - auto documentExtensions = StringArray::fromTokens (replacePreprocessorDefs (owner.getAllPreprocessorDefs(), owner.settings ["documentExtensions"]), - ",", {}); + auto documentExtensions = StringArray::fromTokens (replacePreprocessorDefs (owner.getAllPreprocessorDefs(), + owner.getDocumentExtensionsString()), ",", {}); documentExtensions.trim(); documentExtensions.removeEmptyStrings (true); @@ -3265,7 +3269,7 @@ private: //============================================================================== void removeMismatchedXcuserdata() const { - if (settings ["keepCustomXcodeSchemes"]) + if (shouldKeepCustomXcodeSchemes()) return; auto xcuserdata = getProjectBundle().getChildFile ("xcuserdata");