From 9fab24f8779fbfc1ab03483d41f41070b3fe9c32 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Tue, 20 Jan 2015 14:49:22 +0100 Subject: [PATCH] QSslEllipticCurve: enable NRVO in *Name() methods Make it easier for the compiler to apply the Named Return Value Optimization (NRVO) in the shortName()/longName() functions by not returning different objects in different return statements. Change-Id: I1b6fa7e6121bc1c843378be33499728c56c97f92 Reviewed-by: Giuseppe D'Angelo --- src/network/ssl/qsslellipticcurve_openssl.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/network/ssl/qsslellipticcurve_openssl.cpp b/src/network/ssl/qsslellipticcurve_openssl.cpp index e77b39f15e..d2821a1c86 100644 --- a/src/network/ssl/qsslellipticcurve_openssl.cpp +++ b/src/network/ssl/qsslellipticcurve_openssl.cpp @@ -52,24 +52,20 @@ QT_BEGIN_NAMESPACE QString QSslEllipticCurve::shortName() const { - if (id == 0) - return QString(); - QString result; #ifndef OPENSSL_NO_EC - result = QString::fromLatin1(q_OBJ_nid2sn(id)); + if (id != 0) + result = QString::fromLatin1(q_OBJ_nid2sn(id)); #endif return result; } QString QSslEllipticCurve::longName() const { - if (id == 0) - return QString(); - QString result; #ifndef OPENSSL_NO_EC - result = QString::fromLatin1(q_OBJ_nid2ln(id)); + if (id != 0) + result = QString::fromLatin1(q_OBJ_nid2ln(id)); #endif return result; }