From 3fe01cdca79488560ddce2f2a548d45b16f49dc9 Mon Sep 17 00:00:00 2001 From: jules Date: Tue, 1 Oct 2013 13:49:18 +0100 Subject: [PATCH] Removed some duplicated code. --- .../jucer_ProjectExport_XCode.h | 29 ------------------- .../Source/Utility/jucer_MiscUtilities.cpp | 8 ++--- 2 files changed, 3 insertions(+), 34 deletions(-) diff --git a/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_XCode.h b/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_XCode.h index 7b73598f86..abe918f9eb 100644 --- a/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_XCode.h +++ b/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_XCode.h @@ -857,35 +857,6 @@ private: output << "\t};\n\trootObject = " << createID ("__root") << ";\n}\n"; } - static void addPlistDictionaryKey (XmlElement* xml, const String& key, const String& value) - { - forEachXmlChildElementWithTagName (*xml, e, "key") - { - if (e->getAllSubText().trim().equalsIgnoreCase (key)) - { - if (e->getNextElement() != nullptr && e->getNextElement()->hasTagName ("key")) - { - // try to fix broken plist format.. - xml->removeChildElement (e, true); - break; - } - else - { - return; // (value already exists) - } - } - } - - xml->createNewChildElement ("key") ->addTextElement (key); - xml->createNewChildElement ("string")->addTextElement (value); - } - - static void addPlistDictionaryKeyBool (XmlElement* xml, const String& key, const bool value) - { - xml->createNewChildElement ("key")->addTextElement (key); - xml->createNewChildElement (value ? "true" : "false"); - } - String addBuildFile (const String& path, const String& fileRefID, bool addToSourceBuildPhase, bool inhibitWarnings) const { String fileID (createID (path + "buildref")); diff --git a/extras/Introjucer/Source/Utility/jucer_MiscUtilities.cpp b/extras/Introjucer/Source/Utility/jucer_MiscUtilities.cpp index 79ff1ff5aa..79c902ccce 100644 --- a/extras/Introjucer/Source/Utility/jucer_MiscUtilities.cpp +++ b/extras/Introjucer/Source/Utility/jucer_MiscUtilities.cpp @@ -183,14 +183,12 @@ void addPlistDictionaryKey (XmlElement* xml, const String& key, const String& va xml->removeChildElement (e, true); break; } - else - { - return; // (value already exists) - } + + return; // (value already exists) } } - xml->createNewChildElement ("key") ->addTextElement (key); + xml->createNewChildElement ("key")->addTextElement (key); xml->createNewChildElement ("string")->addTextElement (value); }