From 976617d342b456b15c50847d3b76a56cb9d38d17 Mon Sep 17 00:00:00 2001
From: Dan Paulat <dpaulat@gmail.com>
Date: Sat, 8 Oct 2022 00:03:47 -0500
Subject: [PATCH] Don't use std::move when returning a local variable, allow
 NRVO

---
 scwx-qt/source/scwx/qt/config/radar_site.cpp  | 2 +-
 scwx-qt/source/scwx/qt/util/texture_atlas.cpp | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scwx-qt/source/scwx/qt/config/radar_site.cpp b/scwx-qt/source/scwx/qt/config/radar_site.cpp
index 1e82f3de..1a3c6166 100644
--- a/scwx-qt/source/scwx/qt/config/radar_site.cpp
+++ b/scwx-qt/source/scwx/qt/config/radar_site.cpp
@@ -157,7 +157,7 @@ std::vector<std::shared_ptr<RadarSite>> RadarSite::GetAll()
       radarSites.push_back(site.second);
    }
 
-   return std::move(radarSites);
+   return radarSites;
 }
 
 std::string GetRadarIdFromSiteId(const std::string& siteId)
diff --git a/scwx-qt/source/scwx/qt/util/texture_atlas.cpp b/scwx-qt/source/scwx/qt/util/texture_atlas.cpp
index 22a7f0f7..5a7181c4 100644
--- a/scwx-qt/source/scwx/qt/util/texture_atlas.cpp
+++ b/scwx-qt/source/scwx/qt/util/texture_atlas.cpp
@@ -260,7 +260,7 @@ TextureAtlas::Impl::LoadImage(const std::string& imagePath)
    if (!imageFile.isOpen())
    {
       logger_->error("Could not open image: {}", imagePath);
-      return std::move(image);
+      return image;
    }
 
    boost::iostreams::stream<util::IoDeviceSource> dataStream(imageFile);
@@ -275,10 +275,10 @@ TextureAtlas::Impl::LoadImage(const std::string& imagePath)
    catch (const std::exception& ex)
    {
       logger_->error("Error reading image: {}", ex.what());
-      return std::move(image);
+      return image;
    }
 
-   return std::move(image);
+   return image;
 }
 
 TextureAtlas& TextureAtlas::Instance()