diff --git a/android-project/.gitignore b/android-project/.gitignore index e156aaf..cc5f013 100644 --- a/android-project/.gitignore +++ b/android-project/.gitignore @@ -34,3 +34,5 @@ google-services.json # Android Profiling *.hprof + +app/release diff --git a/src/DrawingProgram/DrawingProgram.cpp b/src/DrawingProgram/DrawingProgram.cpp index 055ec27..c4735b9 100644 --- a/src/DrawingProgram/DrawingProgram.cpp +++ b/src/DrawingProgram/DrawingProgram.cpp @@ -49,7 +49,6 @@ #include "../CanvasComponents/ImageCanvasComponent.hpp" #include "Layers/DrawingProgramLayer.hpp" #include "Layers/DrawingProgramLayerListItem.hpp" -#include #include "../ScaleUpCanvas.hpp" #include "Tools/EraserTool.hpp" diff --git a/src/DrawingProgram/Tools/EraserTool.cpp b/src/DrawingProgram/Tools/EraserTool.cpp index dffb305..bf5864d 100644 --- a/src/DrawingProgram/Tools/EraserTool.cpp +++ b/src/DrawingProgram/Tools/EraserTool.cpp @@ -30,7 +30,6 @@ #include "../../GUIStuff/ElementHelpers/RadioButtonHelpers.hpp" #include "../../GUIStuff/ElementHelpers/CheckBoxHelpers.hpp" #include "Helpers/NetworkingObjects/NetObjOrderedList.hpp" -#include "Helpers/Parallel.hpp" EraserTool::EraserTool(DrawingProgram& initDrawP): DrawingProgramToolBase(initDrawP) @@ -224,7 +223,7 @@ void EraserTool::commit_erase() { bool placedNewObject = false; std::unordered_map>> newObjectsToPlace; - parallel_loop_container_mutable(updatedComponents, [&](auto& compPair) { + std::for_each(updatedComponents.begin(), updatedComponents.end(), [&](auto& compPair) { compPair.second.splitComps = compPair.first->obj->get_comp().attempt_split(drawP); }); @@ -253,7 +252,7 @@ void EraserTool::commit_erase() { if(objectsToErase) drawP.layerMan.erase_component_container(erasedComponents, !placedNewObject); bool first = !objectsToErase && !placedNewObject; - parallel_loop_container(updatedComponents, [&](auto& compPair) { + std::for_each(updatedComponents.begin(), updatedComponents.end(), [&](auto& compPair) { auto& [comp, oldData] = compPair; comp->obj->get_comp().simplify_paths(); comp->obj->normalize_object_coordinates();