From 0b2afd117b32abd1187a80ea9ab17dbdd72acdf8 Mon Sep 17 00:00:00 2001
From: Emmanuel Lepage Vallee <elv1313@gmail.com>
Date: Fri, 28 Apr 2017 05:17:11 -0400
Subject: [PATCH] call: Initialize m_pParentCall using C++11 paradigm
Minor one. Call has multiple constructor and all of them init
the pointer to nullptr in the constructor body. Still enough
to fire a CI warning.
Change-Id: Ia1a9c532262cf6b1b28dc1bd95090a4d54bcb4da
---
src/call.cpp | 2 --
src/private/call_p.h | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/call.cpp b/src/call.cpp
index 5097d0ee..3e0c5bae 100644
--- a/src/call.cpp
+++ b/src/call.cpp
@@ -317,7 +317,6 @@ Call::Call(Call::State startState, const QString& peerName, ContactMethod* numbe
d_ptr->m_Account = account;
d_ptr->m_PeerName = peerName;
d_ptr->m_pPeerContactMethod = number;
- d_ptr->m_pParentCall = nullptr;
emit changed();
}
@@ -331,7 +330,6 @@ Call::Call(const QString& confId, const QString& account)
d_ptr->m_Account = AccountModel::instance().getById(account.toLatin1());
d_ptr->m_Type = (!confId.isEmpty())?Call::Type::CONFERENCE:Call::Type::CALL;
d_ptr->m_DringId = confId;
- d_ptr->m_pParentCall = nullptr;
setObjectName("Conf:"+confId);
diff --git a/src/private/call_p.h b/src/private/call_p.h
index eff44202..2e56b019 100644
--- a/src/private/call_p.h
+++ b/src/private/call_p.h
@@ -126,7 +126,7 @@ public:
Call::Type m_Type ;
Certificate* m_pCertificate ;
FlagPack<Call::HoldFlags> m_fHoldFlags ;
- Call* m_pParentCall ;
+ Call* m_pParentCall {nullptr};
QDateTime* m_pDateTime {nullptr};
QDate* m_pDateOnly {nullptr};
QString m_FormattedDate ;
--
GitLab