mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-16 00:34:19 +00:00
Code Activity

Introjucer: fix for a situation where project groups could get duplicate IDs.

Browse source
This commit is contained in:
jules 2013-08-05 17:11:26 +01:00
parent 24f5fdea22
commit 53ae95b730
5 changed files with 26 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

13
extras/Introjucer/Source/Project/jucer_Project.cpp
View file

@ -471,8 +471,8 @@ void Project::findAllImageItems (OwnedArray<Project::Item>& items)
}
//==============================================================================
Project::Item::Item (Project& project_, const ValueTree& state_)
: project (project_), state (state_)
Project::Item::Item (Project& p, const ValueTree& s)
: project (p), state (s)
{
}
@ -748,7 +748,7 @@ Project::Item Project::Item::addNewSubGroup (const String& name, int insertIndex
String newID (createGUID (getID() + name + String (getNumChildren())));
int n = 0;
while (findItemWithID (newID).isValid())
while (project.getMainGroup().findItemWithID (newID).isValid())
newID = createGUID (newID + String (++n));
Item group (createGroup (project, name, newID));
@ -767,12 +767,9 @@ bool Project::Item::addFile (const File& file, int insertIndex, const bool shoul
{
Item group (addNewSubGroup (file.getFileNameWithoutExtension(), insertIndex));
DirectoryIterator iter (file, false, "*", File::findFilesAndDirectories);
while (iter.next())
{
for (DirectoryIterator iter (file, false, "*", File::findFilesAndDirectories); iter.next();)
if (! project.getMainGroup().findItemForFile (iter.getFile()).isValid())
group.addFile (iter.getFile(), -1, shouldCompile);
}
group.sortAlphabetically (false);
}
@ -1005,7 +1002,7 @@ String Project::getFileTemplate (const String& templateName)
}
//==============================================================================
Project::ExporterIterator::ExporterIterator (Project& project_) : index (-1), project (project_) {}
Project::ExporterIterator::ExporterIterator (Project& p) : index (-1), project (p) {}
Project::ExporterIterator::~ExporterIterator() {}
bool Project::ExporterIterator::next()