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

Introjucer: removed a couple of bits of C++11 code

Browse source
This commit is contained in:
jules 2015-11-06 10:14:37 +00:00
parent 4e4f8767fe
commit a2a2db98a3
2 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

12
extras/Introjucer/Source/Project Saving/jucer_ProjectExport_Android.h
View file

@ -591,17 +591,17 @@ private:
overwriteFileIfDifferentOrThrow (file, mo);
}
struct ShouldFileBeCompiledPredicate
{
bool operator() (const Project::Item& projectItem) const { return projectItem.shouldBeCompiled(); }
};
void writeAndroidMk (const File& file) const
{
Array<RelativePath> files;
struct Predicate
{
bool operator() (const Project::Item& projectItem) const { return projectItem.shouldBeCompiled(); }
};
for (int i = 0; i < getAllGroups().size(); ++i)
findAllProjectItemsWithPredicate (getAllGroups().getReference(i), files, Predicate());
findAllProjectItemsWithPredicate (getAllGroups().getReference(i), files, ShouldFileBeCompiledPredicate());
MemoryOutputStream mo;
writeAndroidMk (mo, files);

14
extras/Introjucer/Source/Project Saving/jucer_ProjectExport_AndroidStudio.h
View file

@ -247,7 +247,7 @@ private:
{
if (path.startsWith ("~"))
{
const String homeFolder (File::getSpecialLocation (File::SpecialLocationType::userHomeDirectory).getFullPathName());
const String homeFolder (File::getSpecialLocation (File::userHomeDirectory).getFullPathName());
path = path.replaceSection (0, 1, homeFolder);
}
@ -366,6 +366,11 @@ private:
return result;
}
struct ShouldBeAddedToProjectPredicate
{
bool operator() (const Project::Item& projectItem) const { return projectItem.shouldBeAddedToTargetProject(); }
};
StringArray getCPPFlags() const
{
StringArray result;
@ -401,13 +406,8 @@ private:
Array<RelativePath> cppFiles;
const Array<Project::Item>& groups = getAllGroups();
struct Predicate
{
bool operator() (const Project::Item& projectItem) const { return projectItem.shouldBeAddedToTargetProject(); }
};
for (int i = 0; i < groups.size(); ++i)
findAllProjectItemsWithPredicate (groups.getReference (i), cppFiles, Predicate());
findAllProjectItemsWithPredicate (groups.getReference (i), cppFiles, ShouldBeAddedToProjectPredicate());
for (int i = 0; i < cppFiles.size(); ++i)
{