From 1cb21f0a4bbd0c6a33befdb4ebb46ce5d9dc3fbf Mon Sep 17 00:00:00 2001 From: Mat Sutcliffe Date: Sat, 2 Mar 2019 18:12:47 +0000 Subject: [PATCH] Ref T545 Removed redundant constructors that are now inherited. --- src/blackgui/components/downloadcomponent.cpp | 2 +- src/blackmisc/aviation/aircraftpartslist.cpp | 4 ---- src/blackmisc/aviation/aircraftpartslist.h | 3 --- .../aviation/aircraftsituationchangelist.cpp | 4 ---- src/blackmisc/aviation/aircraftsituationchangelist.h | 3 --- src/blackmisc/aviation/aircraftsituationlist.cpp | 4 ---- src/blackmisc/aviation/aircraftsituationlist.h | 3 --- src/blackmisc/aviation/callsignset.h | 3 --- src/blackmisc/geo/coordinategeodeticlist.cpp | 4 ---- src/blackmisc/geo/coordinategeodeticlist.h | 3 --- src/blackmisc/input/actionhotkeylist.h | 3 --- src/blackmisc/input/hotkeycombination.cpp | 2 +- src/blackmisc/input/joystickbuttonlist.h | 3 --- src/blackmisc/input/keyboardkeylist.cpp | 5 ----- src/blackmisc/input/keyboardkeylist.h | 6 ------ src/blackmisc/logcategorylist.h | 12 ------------ src/blackmisc/network/rawfsdmessagelist.cpp | 4 ---- src/blackmisc/network/rawfsdmessagelist.h | 3 --- src/blackmisc/network/remotefilelist.cpp | 5 ----- src/blackmisc/network/remotefilelist.h | 3 --- src/blackmisc/network/urllist.cpp | 8 ++------ src/blackmisc/network/urllist.h | 5 +---- src/blackmisc/platformset.cpp | 3 --- src/blackmisc/platformset.h | 3 --- src/blackmisc/propertyindexvariantmap.cpp | 2 +- src/blackmisc/variantlist.cpp | 3 --- src/blackmisc/variantlist.h | 3 --- src/blackmisc/variantmap.h | 3 --- src/blackmisc/weather/cloudlayerlist.h | 3 --- src/blackmisc/weather/temperaturelayerlist.h | 3 --- src/blackmisc/weather/visibilitylayerlist.h | 3 --- src/blackmisc/weather/weathergrid.h | 3 --- src/blackmisc/weather/windlayerlist.h | 3 --- 33 files changed, 6 insertions(+), 118 deletions(-) diff --git a/src/blackgui/components/downloadcomponent.cpp b/src/blackgui/components/downloadcomponent.cpp index a756de8fb..bd9cbe4b9 100644 --- a/src/blackgui/components/downloadcomponent.cpp +++ b/src/blackgui/components/downloadcomponent.cpp @@ -62,7 +62,7 @@ namespace BlackGui bool CDownloadComponent::setDownloadFile(const CRemoteFile &remoteFile) { - return this->setDownloadFiles(CRemoteFileList(remoteFile)); + return this->setDownloadFiles(CRemoteFileList { remoteFile }); } bool CDownloadComponent::setDownloadFiles(const CRemoteFileList &remoteFiles) diff --git a/src/blackmisc/aviation/aircraftpartslist.cpp b/src/blackmisc/aviation/aircraftpartslist.cpp index 00967a77d..880ac1f25 100644 --- a/src/blackmisc/aviation/aircraftpartslist.cpp +++ b/src/blackmisc/aviation/aircraftpartslist.cpp @@ -21,10 +21,6 @@ namespace BlackMisc CSequence(other) { } - CAircraftPartsList::CAircraftPartsList(std::initializer_list il) : - CSequence(il) - { } - int CAircraftPartsList::setOnGround(bool onGround) { int c = 0; diff --git a/src/blackmisc/aviation/aircraftpartslist.h b/src/blackmisc/aviation/aircraftpartslist.h index ec04958f6..025f3b977 100644 --- a/src/blackmisc/aviation/aircraftpartslist.h +++ b/src/blackmisc/aviation/aircraftpartslist.h @@ -41,9 +41,6 @@ namespace BlackMisc //! Construct from a base class object. CAircraftPartsList(const CSequence &other); - //! Construct from initializer list. - CAircraftPartsList(std::initializer_list il); - //! Set on ground for all entries int setOnGround(bool onGround); }; diff --git a/src/blackmisc/aviation/aircraftsituationchangelist.cpp b/src/blackmisc/aviation/aircraftsituationchangelist.cpp index 8de0b1e8e..61cd76de7 100644 --- a/src/blackmisc/aviation/aircraftsituationchangelist.cpp +++ b/src/blackmisc/aviation/aircraftsituationchangelist.cpp @@ -19,10 +19,6 @@ namespace BlackMisc CSequence(other) { } - CAircraftSituationChangeList::CAircraftSituationChangeList(std::initializer_list il) : - CSequence(il) - { } - CAircraftSituationChange CAircraftSituationChangeList::frontOrNull() const { if (this->isEmpty()) { return CAircraftSituationChange::null(); } diff --git a/src/blackmisc/aviation/aircraftsituationchangelist.h b/src/blackmisc/aviation/aircraftsituationchangelist.h index fb77cd3a9..49bbdb993 100644 --- a/src/blackmisc/aviation/aircraftsituationchangelist.h +++ b/src/blackmisc/aviation/aircraftsituationchangelist.h @@ -38,9 +38,6 @@ namespace BlackMisc //! Construct from a base class object. CAircraftSituationChangeList(const CSequence &other); - //! Construct from initializer list. - CAircraftSituationChangeList(std::initializer_list il); - //! Front or NULL CAircraftSituationChange frontOrNull() const; diff --git a/src/blackmisc/aviation/aircraftsituationlist.cpp b/src/blackmisc/aviation/aircraftsituationlist.cpp index fbbacef0f..7e23c3ee7 100644 --- a/src/blackmisc/aviation/aircraftsituationlist.cpp +++ b/src/blackmisc/aviation/aircraftsituationlist.cpp @@ -33,10 +33,6 @@ namespace BlackMisc CSequence(other) { } - CAircraftSituationList::CAircraftSituationList(std::initializer_list il) : - CSequence(il) - { } - CAircraftSituation CAircraftSituationList::frontOrNull() const { if (this->isEmpty()) { return CAircraftSituation::null(); } diff --git a/src/blackmisc/aviation/aircraftsituationlist.h b/src/blackmisc/aviation/aircraftsituationlist.h index 81a457e60..5c8268eba 100644 --- a/src/blackmisc/aviation/aircraftsituationlist.h +++ b/src/blackmisc/aviation/aircraftsituationlist.h @@ -53,9 +53,6 @@ namespace BlackMisc //! Construct from a base class object. CAircraftSituationList(const CSequence &other); - //! Construct from initializer list. - CAircraftSituationList(std::initializer_list il); - //! Front or NULL CAircraftSituation frontOrNull() const; diff --git a/src/blackmisc/aviation/callsignset.h b/src/blackmisc/aviation/callsignset.h index 9a1019062..9b507db04 100644 --- a/src/blackmisc/aviation/callsignset.h +++ b/src/blackmisc/aviation/callsignset.h @@ -36,9 +36,6 @@ namespace BlackMisc //! Construct from single callsign CCallsignSet(const CCallsign &callsign); - //! Initializer list constructor. - CCallsignSet(std::initializer_list il) : CCollection(il) {} - //! Construct from a base class object. CCallsignSet(const CCollection &other); diff --git a/src/blackmisc/geo/coordinategeodeticlist.cpp b/src/blackmisc/geo/coordinategeodeticlist.cpp index afda53cd1..7f42fc69c 100644 --- a/src/blackmisc/geo/coordinategeodeticlist.cpp +++ b/src/blackmisc/geo/coordinategeodeticlist.cpp @@ -22,9 +22,5 @@ namespace BlackMisc CCoordinateGeodeticList::CCoordinateGeodeticList(const CSequence &other) : CSequence(other) { } - - CCoordinateGeodeticList::CCoordinateGeodeticList(std::initializer_list il) : - CSequence(il) - { } } // namespace } // namespace diff --git a/src/blackmisc/geo/coordinategeodeticlist.h b/src/blackmisc/geo/coordinategeodeticlist.h index 07204b17e..78a114bab 100644 --- a/src/blackmisc/geo/coordinategeodeticlist.h +++ b/src/blackmisc/geo/coordinategeodeticlist.h @@ -41,9 +41,6 @@ namespace BlackMisc //! Default constructor. CCoordinateGeodeticList(); - //! Construct by coordinates - CCoordinateGeodeticList(std::initializer_list coordinates); - //! Construct from a base class object. CCoordinateGeodeticList(const CSequence &other); }; diff --git a/src/blackmisc/input/actionhotkeylist.h b/src/blackmisc/input/actionhotkeylist.h index 079f559a4..79d5de5fa 100644 --- a/src/blackmisc/input/actionhotkeylist.h +++ b/src/blackmisc/input/actionhotkeylist.h @@ -38,9 +38,6 @@ namespace BlackMisc //! Default constructor CActionHotkeyList() = default; - //! Construct from std::initializer_list - CActionHotkeyList(std::initializer_list il) : CSequence(il) {} - //! Construct from a base class object. CActionHotkeyList(const CSequence &baseClass); diff --git a/src/blackmisc/input/hotkeycombination.cpp b/src/blackmisc/input/hotkeycombination.cpp index bd982e765..6383cd0de 100644 --- a/src/blackmisc/input/hotkeycombination.cpp +++ b/src/blackmisc/input/hotkeycombination.cpp @@ -19,7 +19,7 @@ namespace BlackMisc { namespace Input { - CHotkeyCombination::CHotkeyCombination(CKeyboardKey key) : CHotkeyCombination(CKeyboardKeyList(key)) + CHotkeyCombination::CHotkeyCombination(CKeyboardKey key) : CHotkeyCombination(CKeyboardKeyList { key }) { } CHotkeyCombination::CHotkeyCombination(const CKeyboardKeyList &keys) : m_keyboardKeys(keys) diff --git a/src/blackmisc/input/joystickbuttonlist.h b/src/blackmisc/input/joystickbuttonlist.h index 161df84b1..170893ded 100644 --- a/src/blackmisc/input/joystickbuttonlist.h +++ b/src/blackmisc/input/joystickbuttonlist.h @@ -39,9 +39,6 @@ namespace BlackMisc //! Construct from a base class object. CJoystickButtonList(const CSequence &baseClass); - - //! Initializer list constructor. - CJoystickButtonList(std::initializer_list il) : CSequence(il) {} }; } //namespace diff --git a/src/blackmisc/input/keyboardkeylist.cpp b/src/blackmisc/input/keyboardkeylist.cpp index cd8e8c219..eeef8bbf8 100644 --- a/src/blackmisc/input/keyboardkeylist.cpp +++ b/src/blackmisc/input/keyboardkeylist.cpp @@ -15,11 +15,6 @@ namespace BlackMisc { CKeyboardKeyList::CKeyboardKeyList() { } - CKeyboardKeyList::CKeyboardKeyList(CKeyboardKey key) - { - this->push_back(key); - } - CKeyboardKeyList::CKeyboardKeyList(const CSequence &baseClass) : CSequence(baseClass) { } diff --git a/src/blackmisc/input/keyboardkeylist.h b/src/blackmisc/input/keyboardkeylist.h index b93132d5a..d67ec3593 100644 --- a/src/blackmisc/input/keyboardkeylist.h +++ b/src/blackmisc/input/keyboardkeylist.h @@ -38,15 +38,9 @@ namespace BlackMisc //! Default constructor CKeyboardKeyList(); - //! Init by single key - CKeyboardKeyList(CKeyboardKey key); - //! Construct from a base class object. CKeyboardKeyList(const CSequence &baseClass); - //! Initializer list constructor. - CKeyboardKeyList(std::initializer_list il) : CSequence(il) {} - //! All key strings QStringList getKeyStrings() const; diff --git a/src/blackmisc/logcategorylist.h b/src/blackmisc/logcategorylist.h index e6df14455..7e4cb97b1 100644 --- a/src/blackmisc/logcategorylist.h +++ b/src/blackmisc/logcategorylist.h @@ -45,24 +45,12 @@ namespace BlackMisc //! By single element CLogCategoryList(const CLogCategory &category) { this->push_back(category); } - //! Copy constructor. - CLogCategoryList(const CLogCategoryList &) = default; - //! Copy construct from superclass instance. CLogCategoryList(const CSequence &other) : CSequence(other) {} - //! Initializer list constructor. - CLogCategoryList(std::initializer_list il) : CSequence(il) {} - //! Prevent accidental use of the initializer list constructor. CLogCategoryList(std::nullptr_t) = delete; - //! Copy assignment. - CLogCategoryList &operator =(const CLogCategoryList &) = default; - - //! Copy assign from superclass instance. - CLogCategoryList &operator =(const CSequence &other) { CSequence::operator =(other); return *this; } - /*! * Construct by extracting categories from a class T. * diff --git a/src/blackmisc/network/rawfsdmessagelist.cpp b/src/blackmisc/network/rawfsdmessagelist.cpp index 5049921d6..c460ef932 100644 --- a/src/blackmisc/network/rawfsdmessagelist.cpp +++ b/src/blackmisc/network/rawfsdmessagelist.cpp @@ -17,10 +17,6 @@ namespace BlackMisc CRawFsdMessageList::CRawFsdMessageList(const CSequence &other) : CSequence(other) { } - CRawFsdMessageList::CRawFsdMessageList(std::initializer_list il) : - CSequence(il) - { } - CRawFsdMessageList CRawFsdMessageList::findByPacketType(const QString &type) const { return this->findBy([ & ](const CRawFsdMessage &rawFsdMessage) diff --git a/src/blackmisc/network/rawfsdmessagelist.h b/src/blackmisc/network/rawfsdmessagelist.h index e0fc266b1..84384779f 100644 --- a/src/blackmisc/network/rawfsdmessagelist.h +++ b/src/blackmisc/network/rawfsdmessagelist.h @@ -41,9 +41,6 @@ namespace BlackMisc //! Construct from a base class object. CRawFsdMessageList(const CSequence &other); - //! Construct from initializer list. - CRawFsdMessageList(std::initializer_list il); - //! Find by a given list of raw messages which are type CRawFsdMessageList findByPacketType(const QString &type) const; diff --git a/src/blackmisc/network/remotefilelist.cpp b/src/blackmisc/network/remotefilelist.cpp index 2c3ddde41..6d5b4176a 100644 --- a/src/blackmisc/network/remotefilelist.cpp +++ b/src/blackmisc/network/remotefilelist.cpp @@ -24,11 +24,6 @@ namespace BlackMisc CSequence(other) { } - CRemoteFileList::CRemoteFileList(const CRemoteFile &remoteFile) - { - this->push_back(remoteFile); - } - QStringList CRemoteFileList::getNames(bool sorted) const { QStringList fileNames; diff --git a/src/blackmisc/network/remotefilelist.h b/src/blackmisc/network/remotefilelist.h index 8e411bcd7..005e9bfd3 100644 --- a/src/blackmisc/network/remotefilelist.h +++ b/src/blackmisc/network/remotefilelist.h @@ -41,9 +41,6 @@ namespace BlackMisc //! Construct from a base class object. CRemoteFileList(const CSequence &other); - //! From single file - CRemoteFileList(const CRemoteFile &remoteFile); - //! All file names QStringList getNames(bool sorted = true) const; diff --git a/src/blackmisc/network/urllist.cpp b/src/blackmisc/network/urllist.cpp index 75bb2b5f8..d69666b79 100644 --- a/src/blackmisc/network/urllist.cpp +++ b/src/blackmisc/network/urllist.cpp @@ -129,12 +129,8 @@ namespace BlackMisc CUrlList(listOfUrls), m_maxTrials(maxTrials) { } - CFailoverUrlList::CFailoverUrlList(const CSequence &other, int maxTrials) : - CUrlList(other), m_maxTrials(maxTrials) - { } - - CFailoverUrlList::CFailoverUrlList(const CUrlList &urlIst) : - CUrlList(urlIst) + CFailoverUrlList::CFailoverUrlList(const CUrlList &urlIst, int maxTrials) : + CUrlList(urlIst), m_maxTrials(maxTrials) { } CUrlList CFailoverUrlList::getWithoutFailed() const diff --git a/src/blackmisc/network/urllist.h b/src/blackmisc/network/urllist.h index 53fda0278..dcdc537df 100644 --- a/src/blackmisc/network/urllist.h +++ b/src/blackmisc/network/urllist.h @@ -78,11 +78,8 @@ namespace BlackMisc //! By list of URLs explicit CFailoverUrlList(const QStringList &listOfUrls, int maxTrials = 2); - //! Construct from a base class object. - CFailoverUrlList(const CSequence &other, int maxTrials = 2); - //! From url list - CFailoverUrlList(const CUrlList &urlIst); + CFailoverUrlList(const CUrlList &urlIst, int maxTrials = 2); //! All failed URLs const CUrlList &getFailedUrls() const { return m_failedUrls; } diff --git a/src/blackmisc/platformset.cpp b/src/blackmisc/platformset.cpp index 0b4efa2e4..4a0c4a469 100644 --- a/src/blackmisc/platformset.cpp +++ b/src/blackmisc/platformset.cpp @@ -21,9 +21,6 @@ namespace BlackMisc { CPlatformSet::CPlatformSet() { } - CPlatformSet::CPlatformSet(std::initializer_list il) : CCollection(il) - { } - CPlatformSet::CPlatformSet(const CCollection &other) : CCollection(other) { } diff --git a/src/blackmisc/platformset.h b/src/blackmisc/platformset.h index 2013e8c40..53541b91e 100644 --- a/src/blackmisc/platformset.h +++ b/src/blackmisc/platformset.h @@ -30,9 +30,6 @@ namespace BlackMisc //! Default constructor. CPlatformSet(); - //! Initializer list constructor. - CPlatformSet(std::initializer_list il); - //! Construct from a base class object. CPlatformSet(const CCollection &other); diff --git a/src/blackmisc/propertyindexvariantmap.cpp b/src/blackmisc/propertyindexvariantmap.cpp index 19cb645f7..62eb3ca78 100644 --- a/src/blackmisc/propertyindexvariantmap.cpp +++ b/src/blackmisc/propertyindexvariantmap.cpp @@ -116,7 +116,7 @@ namespace BlackMisc CPropertyIndexList CPropertyIndexVariantMap::indexes() const { - return CSequence(m_values.keys()); + return m_values.keys(); } int CPropertyIndexVariantMap::size() const diff --git a/src/blackmisc/variantlist.cpp b/src/blackmisc/variantlist.cpp index 2b901b393..8f41e09f1 100644 --- a/src/blackmisc/variantlist.cpp +++ b/src/blackmisc/variantlist.cpp @@ -12,7 +12,4 @@ namespace BlackMisc { CVariantList::CVariantList(const CSequence &other) : CSequence(other) {} - - CVariantList::CVariantList(std::initializer_list il) : CSequence(il) - {} } // ns diff --git a/src/blackmisc/variantlist.h b/src/blackmisc/variantlist.h index f3919a965..4ef6927ef 100644 --- a/src/blackmisc/variantlist.h +++ b/src/blackmisc/variantlist.h @@ -33,9 +33,6 @@ namespace BlackMisc //! Construct from a base class object. CVariantList(const CSequence &other); - - //! Initializer list constructor. - CVariantList(std::initializer_list il); }; } diff --git a/src/blackmisc/variantmap.h b/src/blackmisc/variantmap.h index 721724d34..0e32bd1d3 100644 --- a/src/blackmisc/variantmap.h +++ b/src/blackmisc/variantmap.h @@ -43,9 +43,6 @@ namespace BlackMisc //! Default constructor. CVariantMap() {} - //! Initializer list constructor. - CVariantMap(std::initializer_list> il) : CDictionary(il) {} - //! Copy constructor. CVariantMap(const CVariantMap &) = default; diff --git a/src/blackmisc/weather/cloudlayerlist.h b/src/blackmisc/weather/cloudlayerlist.h index 42787df28..b8f99ff64 100644 --- a/src/blackmisc/weather/cloudlayerlist.h +++ b/src/blackmisc/weather/cloudlayerlist.h @@ -40,9 +40,6 @@ namespace BlackMisc //! Default constructor. CCloudLayerList() = default; - //! Initializer list constructor. - CCloudLayerList(std::initializer_list il) : CSequence(il) {} - //! Construct from a base class object. CCloudLayerList(const CSequence &other); diff --git a/src/blackmisc/weather/temperaturelayerlist.h b/src/blackmisc/weather/temperaturelayerlist.h index 5cfda949b..317bcc442 100644 --- a/src/blackmisc/weather/temperaturelayerlist.h +++ b/src/blackmisc/weather/temperaturelayerlist.h @@ -41,9 +41,6 @@ namespace BlackMisc //! Default constructor. CTemperatureLayerList() = default; - //! Initializer list constructor. - CTemperatureLayerList(std::initializer_list il) : CSequence(il) {} - //! Construct from a base class object. CTemperatureLayerList(const CSequence &other); diff --git a/src/blackmisc/weather/visibilitylayerlist.h b/src/blackmisc/weather/visibilitylayerlist.h index 6fba6d5d5..f2a943175 100644 --- a/src/blackmisc/weather/visibilitylayerlist.h +++ b/src/blackmisc/weather/visibilitylayerlist.h @@ -40,9 +40,6 @@ namespace BlackMisc //! Default constructor. CVisibilityLayerList() = default; - //! Initializer list constructor. - CVisibilityLayerList(std::initializer_list il) : CSequence(il) {} - //! Construct from a base class object. CVisibilityLayerList(const CSequence &other); diff --git a/src/blackmisc/weather/weathergrid.h b/src/blackmisc/weather/weathergrid.h index 6a2a453df..3fb12c7b5 100644 --- a/src/blackmisc/weather/weathergrid.h +++ b/src/blackmisc/weather/weathergrid.h @@ -41,9 +41,6 @@ namespace BlackMisc //! Default constructor. CWeatherGrid() = default; - //! Initializer list constructor. - CWeatherGrid(std::initializer_list il) : CSequence(il) {} - //! Construct from a base class object. CWeatherGrid(const CSequence &other); diff --git a/src/blackmisc/weather/windlayerlist.h b/src/blackmisc/weather/windlayerlist.h index d36bd6be7..3a8541730 100644 --- a/src/blackmisc/weather/windlayerlist.h +++ b/src/blackmisc/weather/windlayerlist.h @@ -40,9 +40,6 @@ namespace BlackMisc //! Default constructor. CWindLayerList() = default; - //! Initializer list constructor. - CWindLayerList(std::initializer_list il) : CSequence(il) {} - //! Construct from a base class object. CWindLayerList(const CSequence &other);