diff --git a/include/Application.h b/include/Application.h index 7cee5e654b..15a9b94bb2 100644 --- a/include/Application.h +++ b/include/Application.h @@ -39,14 +39,14 @@ class Application : NoCopy * can assume that it is safe to access this without checking whether it is * initialised. */ - std::shared_ptr communication_{ nullptr }; + std::shared_ptr communication_; /* * \brief The slice that is currently ongoing. * * If no slice has started yet, this will be a nullptr. */ - std::shared_ptr current_slice_{ nullptr }; + std::shared_ptr current_slice_; /*! * \brief ThreadPool with lifetime tied to Application diff --git a/include/communication/EmscriptenCommunication.h b/include/communication/EmscriptenCommunication.h index 225ff4efd3..fc2a6897df 100644 --- a/include/communication/EmscriptenCommunication.h +++ b/include/communication/EmscriptenCommunication.h @@ -19,6 +19,7 @@ namespace cura */ class EmscriptenCommunication : public CommandLine { +private: std::string progress_handler_; ///< Handler for progress messages. std::string slice_info_handler_; ///< Handler for slice information messages. diff --git a/src/communication/EmscriptenCommunication.cpp b/src/communication/EmscriptenCommunication.cpp index b6a3260e28..140f47316d 100644 --- a/src/communication/EmscriptenCommunication.cpp +++ b/src/communication/EmscriptenCommunication.cpp @@ -87,7 +87,7 @@ std::string EmscriptenCommunication::createSliceInfoMessage() } doc.AddMember("material_estimates", material_estimates_json, allocator); - // Set CureEngine information + // Set CuraEngine information rapidjson::Value slicer_info_json(rapidjson::kObjectType); rapidjson::Value slicer_version(CURA_ENGINE_VERSION, allocator); doc.AddMember("slicer_info", slicer_info_json, allocator); diff --git a/stress_benchmark/stress_benchmark.cpp b/stress_benchmark/stress_benchmark.cpp index ba4dc1d79d..cd3cd4ce33 100644 --- a/stress_benchmark/stress_benchmark.cpp +++ b/stress_benchmark/stress_benchmark.cpp @@ -195,7 +195,7 @@ void createAndWriteJson(const std::filesystem::path& out_file, double stress_lev { rapidjson::Document doc; doc.SetArray(); - rapidjson::Document::AllocatorType& allocator = doc.GetAllocator(); + rapidjson::Document::AllocatorType& allocator = doc.GetAllocator(); auto no_test_cases_obj = createRapidJSONObject(allocator, "Number of test cases", no_test_cases, "-", ""); doc.PushBack(no_test_cases_obj, allocator);