From ff78f313abd4839b77f17255b79dd4499bce0512 Mon Sep 17 00:00:00 2001 From: Renaud G Date: Sat, 24 Feb 2018 17:06:10 +0100 Subject: -remove warnings --- result/scalarresult.cpp | 7 ++++++- result/stringresult.cpp | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'result') diff --git a/result/scalarresult.cpp b/result/scalarresult.cpp index 67624ba..1722cd2 100644 --- a/result/scalarresult.cpp +++ b/result/scalarresult.cpp @@ -33,7 +33,12 @@ void ScalarResult::setValue(qreal i) } QVariant ScalarResult::getResult(Result::RESULT_TYPE type) { - return m_value; + if(SCALAR == type) + { + return m_value; + } + else + return {}; } QString ScalarResult::toString(bool wl) diff --git a/result/stringresult.cpp b/result/stringresult.cpp index 55df6a8..2d9214d 100644 --- a/result/stringresult.cpp +++ b/result/stringresult.cpp @@ -43,9 +43,9 @@ QVariant StringResult::getResult(RESULT_TYPE type) case SCALAR: return getText().toInt(); break; - + default: + return QVariant(); } - return QVariant(); } QString StringResult::toString(bool wl) { -- cgit v1.2.3-70-g09d2