From f2d22180708da70220ffc8e0b0af24b801c9fe31 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 27 Jun 2017 07:15:31 -0400 Subject: [PATCH] Clang: fix warning about implict copy-ctor with explicit move-ctor --- src/libcalamares/Job.cpp | 7 ++++++- src/libcalamares/Job.h | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/libcalamares/Job.cpp b/src/libcalamares/Job.cpp index bf9229f7c..26ee94464 100644 --- a/src/libcalamares/Job.cpp +++ b/src/libcalamares/Job.cpp @@ -21,6 +21,12 @@ namespace Calamares { +JobResult::JobResult( JobResult&& rhs ) : + m_ok( rhs.m_ok ) + , m_message( std::move( rhs.m_message ) ) + , m_details( std::move( rhs.m_details ) ) +{ +} JobResult::operator bool() const { @@ -55,7 +61,6 @@ JobResult::setDetails( const QString& details ) m_details = details; } - JobResult JobResult::ok() { diff --git a/src/libcalamares/Job.h b/src/libcalamares/Job.h index b9d3baf85..218abb72b 100644 --- a/src/libcalamares/Job.h +++ b/src/libcalamares/Job.h @@ -29,6 +29,9 @@ namespace Calamares { class DLLEXPORT JobResult { public: + JobResult( const JobResult& rhs ) = delete; + JobResult( JobResult&& rhs ); + virtual ~JobResult() {} virtual operator bool() const;