From a75b97e702f83f6502a06a497504b3909c0bf41b Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Thu, 9 Jul 2015 11:30:01 +0200 Subject: [PATCH] CustomToolChain: use default copy constructor and remove unused constructor This copies over the parser, c++11 flags, etc. that were missed in the existing implementation. Change-Id: Icbff37b943bb02bf71cdeb1cf01245d9f6e62688 Reviewed-by: Daniel Teske --- src/plugins/projectexplorer/customtoolchain.cpp | 13 ------------- src/plugins/projectexplorer/customtoolchain.h | 3 +-- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/src/plugins/projectexplorer/customtoolchain.cpp b/src/plugins/projectexplorer/customtoolchain.cpp index 52b59eaaeb1..dd445dbdd91 100644 --- a/src/plugins/projectexplorer/customtoolchain.cpp +++ b/src/plugins/projectexplorer/customtoolchain.cpp @@ -82,19 +82,6 @@ CustomToolChain::CustomToolChain(Detection d) : m_outputParser(Gcc) { } -CustomToolChain::CustomToolChain(const QByteArray &id, Detection d) : - ToolChain(id, d) -{ } - -CustomToolChain::CustomToolChain(const CustomToolChain &tc) : - ToolChain(tc), - m_compilerCommand(tc.m_compilerCommand), - m_makeCommand(tc.m_makeCommand), - m_targetAbi(tc.m_targetAbi), - m_predefinedMacros(tc.m_predefinedMacros), - m_systemHeaderPaths(tc.m_systemHeaderPaths) -{ } - QString CustomToolChain::type() const { return QLatin1String("custom"); diff --git a/src/plugins/projectexplorer/customtoolchain.h b/src/plugins/projectexplorer/customtoolchain.h index eaac3687696..4993f1e0543 100644 --- a/src/plugins/projectexplorer/customtoolchain.h +++ b/src/plugins/projectexplorer/customtoolchain.h @@ -124,8 +124,7 @@ public: static QString parserName(OutputParser parser); protected: - explicit CustomToolChain(const QByteArray &id, Detection d); - CustomToolChain(const CustomToolChain &); + CustomToolChain(const CustomToolChain &) = default; private: explicit CustomToolChain(Detection d);