From 7315f325ff7ada3d6bd85a471058fdaeaff8cdb0 Mon Sep 17 00:00:00 2001 From: Jochen Nitschke Date: Sat, 12 Aug 2017 00:30:32 +0200 Subject: use more default copy ctors if ctor should be private or protected explicitly default them. boost::optional has copy ctors, so use them. Change-Id: If1855626b297e739afef0dc5ad57958f7ad199bc Reviewed-on: https://gerrit.libreoffice.org/42363 Tested-by: Jenkins Reviewed-by: Noel Grandin --- configmgr/source/localizedvaluenode.cxx | 4 ---- configmgr/source/localizedvaluenode.hxx | 2 +- configmgr/source/propertynode.cxx | 7 ------- configmgr/source/propertynode.hxx | 2 +- 4 files changed, 2 insertions(+), 13 deletions(-) (limited to 'configmgr/source') diff --git a/configmgr/source/localizedvaluenode.cxx b/configmgr/source/localizedvaluenode.cxx index 3c7bbdce5d25..a0772979e19d 100644 --- a/configmgr/source/localizedvaluenode.cxx +++ b/configmgr/source/localizedvaluenode.cxx @@ -53,10 +53,6 @@ void LocalizedValueNode::setValue(int layer, css::uno::Any const & value) value_ = value; } -LocalizedValueNode::LocalizedValueNode(LocalizedValueNode const & other): - Node(other), value_(other.value_) -{} - LocalizedValueNode::~LocalizedValueNode() {} Node::Kind LocalizedValueNode::kind() const { diff --git a/configmgr/source/localizedvaluenode.hxx b/configmgr/source/localizedvaluenode.hxx index 441d32bbb6ca..7a23ac1c0928 100644 --- a/configmgr/source/localizedvaluenode.hxx +++ b/configmgr/source/localizedvaluenode.hxx @@ -49,7 +49,7 @@ public: void setValue(int layer, css::uno::Any const & value); private: - LocalizedValueNode(LocalizedValueNode const & other); + LocalizedValueNode(LocalizedValueNode const&) = default; virtual ~LocalizedValueNode() override; diff --git a/configmgr/source/propertynode.cxx b/configmgr/source/propertynode.cxx index 6dcc1bad18b4..39ddccfa11ff 100644 --- a/configmgr/source/propertynode.cxx +++ b/configmgr/source/propertynode.cxx @@ -81,13 +81,6 @@ void PropertyNode::setExternal(int layer, OUString const & descriptor) { externalDescriptor_ = descriptor; } - -PropertyNode::PropertyNode(PropertyNode const & other): - Node(other), staticType_(other.staticType_), nillable_(other.nillable_), - extension_(other.extension_), externalDescriptor_(other.externalDescriptor_), - value_(other.value_) -{} - PropertyNode::~PropertyNode() {} Node::Kind PropertyNode::kind() const { diff --git a/configmgr/source/propertynode.hxx b/configmgr/source/propertynode.hxx index 0a442a1d21f8..2760df946110 100644 --- a/configmgr/source/propertynode.hxx +++ b/configmgr/source/propertynode.hxx @@ -55,7 +55,7 @@ public: bool isExtension() const { return extension_;} private: - PropertyNode(PropertyNode const & other); + PropertyNode(PropertyNode const&) = default; virtual ~PropertyNode() override; -- cgit