From 58eb3743a0f7470bf6f9d67e703ef640cab8569b Mon Sep 17 00:00:00 2001
From: Siarhei Fedartsou <siarhei.fedartsou@gmail.com>
Date: Sun, 18 Dec 2022 14:48:30 +0100
Subject: [PATCH] Fix bugprone-use-after-move clang-tidy warnings

Signed-off-by: Siarhei Fedartsou <siarhei.fedartsou@gmail.com>
---
 drape_frontend/drape_engine.cpp                       | 4 ++--
 generator/camera_info_collector.cpp                   | 2 +-
 generator/osm_source.cpp                              | 2 ++
 generator/world_roads_builder/world_roads_builder.cpp | 5 ++++-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/drape_frontend/drape_engine.cpp b/drape_frontend/drape_engine.cpp
index a3b1c59ed9..440aefbbe4 100644
--- a/drape_frontend/drape_engine.cpp
+++ b/drape_frontend/drape_engine.cpp
@@ -92,8 +92,6 @@ DrapeEngine::DrapeEngine(Params && params)
                                     std::move(effects),
                                     params.m_onGraphicsContextInitialized);
 
-  m_frontend = make_unique_dp<FrontendRenderer>(std::move(frParams));
-
   BackendRenderer::Params brParams(params.m_apiVersion,
                                    frParams.m_commutator,
                                    frParams.m_oglContextFactory,
@@ -108,6 +106,8 @@ DrapeEngine::DrapeEngine(Params && params)
                                    params.m_onGraphicsContextInitialized);
 
   m_backend = make_unique_dp<BackendRenderer>(std::move(brParams));
+  m_frontend = make_unique_dp<FrontendRenderer>(std::move(frParams));
+
 
   m_widgetsInfo = std::move(params.m_info);
 
diff --git a/generator/camera_info_collector.cpp b/generator/camera_info_collector.cpp
index aa18987b45..848f97824b 100644
--- a/generator/camera_info_collector.cpp
+++ b/generator/camera_info_collector.cpp
@@ -103,7 +103,6 @@ bool CamerasInfoCollector::ParseIntermediateInfo(
   uint32_t maxSpeedKmPH = 0;
   uint32_t relatedWaysNumber = 0;
 
-  std::vector<routing::SpeedCameraMwmPosition> ways;
   uint32_t latInt = 0;
   double lat = 0;
 
@@ -137,6 +136,7 @@ bool CamerasInfoCollector::ParseIntermediateInfo(
                    "lat(", lat, "), lon(", lon, ")"));
     }
 
+    std::vector<routing::SpeedCameraMwmPosition> ways;
     uint64_t wayOsmId = 0;
     for (uint32_t i = 0; i < relatedWaysNumber; ++i)
     {
diff --git a/generator/osm_source.cpp b/generator/osm_source.cpp
index a3d628b5bf..1704aba9ef 100644
--- a/generator/osm_source.cpp
+++ b/generator/osm_source.cpp
@@ -120,6 +120,7 @@ void ProcessOsmElementsFromXML(SourceReader & stream, std::function<void(OsmElem
   while (processorOsmElementsFromXml.TryRead(element))
   {
     processor(std::move(element));
+    // It is safe to use `element` here as `Clear` will restore the state after the move.
     element.Clear();
   }
 }
@@ -144,6 +145,7 @@ void ProcessOsmElementsFromO5M(SourceReader & stream, std::function<void(OsmElem
   while (processorOsmElementsFromO5M.TryRead(element))
   {
     processor(std::move(element));
+    // It is safe to use `element` here as `Clear` will restore the state after the move.
     element.Clear();
   }
 }
diff --git a/generator/world_roads_builder/world_roads_builder.cpp b/generator/world_roads_builder/world_roads_builder.cpp
index bf3b6ee577..2bf8f9d83c 100644
--- a/generator/world_roads_builder/world_roads_builder.cpp
+++ b/generator/world_roads_builder/world_roads_builder.cpp
@@ -70,7 +70,10 @@ RoadsFromOsm GetRoadsFromOsm(generator::SourceReader & reader,
       std::string const & highway = e.GetTag("highway");
 
       if (!highway.empty() && base::IsExist(highways, highway))
-        roadsFromOsm.m_ways[highway].emplace(e.m_id, RoadData({}, std::move(e)));
+      {
+        auto id = e.m_id;
+        roadsFromOsm.m_ways[highway].emplace(id, RoadData({}, std::move(e)));
+      }
     }
     else if (e.IsNode())
     {