From ffc5bc702dff5369e352cbdf21a0913251d4fb13 Mon Sep 17 00:00:00 2001 From: David Wagner Date: Fri, 26 Feb 2016 15:52:58 +0100 Subject: [PATCH 1/2] Use `override` when necessary Some compilers complain when failing to use the `override` specifier when overriding a method. clang-tidy can help automatically add it to relevant methods. It also does a lot of cleanup by removing `virtual` when both `virtual` and `override` are specified. Same with `override` and `final`: final methods are implicitly overrides and thus makes the `override` specifier redundant. For reference, this was done with clang-tidy-3.8: ls parameter/*cpp | xargs -n1 clang-tidy-3.8 \ -checks=modernize-use-override -fix -p= \ -header-filter=parameter and CMake was ran with the `-DCMAKE_EXPORT_COMPILE_COMMANDS=1` option. Note the use of xargs: when running clang-tidy on multiple files at once, strange things happen and the files are left in state that wouldn't compile. clang-format also needs to be run after clang-tidy. Signed-off-by: David Wagner --- parameter/ArrayParameter.h | 20 ++++---- parameter/BaseParameter.h | 12 ++--- parameter/BitParameter.h | 18 +++---- parameter/BitParameterBlock.h | 9 ++-- parameter/BitParameterBlockType.h | 11 +++-- parameter/BitParameterType.h | 11 +++-- parameter/BitwiseAreaConfiguration.h | 4 +- parameter/BooleanParameterType.h | 28 +++++------ parameter/Component.h | 2 +- parameter/ComponentInstance.h | 17 +++---- parameter/ComponentLibrary.h | 7 +-- parameter/ComponentType.h | 17 +++---- parameter/CompoundRule.h | 13 ++--- parameter/ConfigurableDomain.h | 15 +++--- parameter/ConfigurableDomains.h | 6 +-- parameter/ConfigurableElement.h | 12 ++--- parameter/ConfigurationAccessContext.h | 2 +- parameter/DefaultElementLibrary.h | 2 +- parameter/DomainConfiguration.h | 4 +- parameter/Element.h | 7 +-- parameter/ElementBuilderTemplate.h | 2 +- parameter/EnumParameterType.h | 29 ++++++------ parameter/EnumValuePair.h | 7 +-- parameter/FileIncluderElementBuilder.h | 2 +- parameter/FixedPointParameterType.h | 29 ++++++------ parameter/FloatingPointParameterType.h | 29 ++++++------ parameter/FormattedSubsystemObject.h | 4 +- parameter/FrameworkConfigurationGroup.h | 2 +- parameter/FrameworkConfigurationLocation.h | 3 +- parameter/HardwareBackSynchronizer.h | 2 +- parameter/InstanceConfigurableElement.h | 14 +++--- parameter/InstanceDefinition.h | 6 +-- parameter/IntegerParameterType.h | 47 ++++++++++--------- parameter/KindElement.h | 2 +- parameter/KindElementBuilderTemplate.h | 2 +- parameter/LinearParameterAdaptation.h | 9 ++-- parameter/LogarithmicParameterAdaptation.h | 9 ++-- parameter/LoggingElementBuilderTemplate.h | 2 +- parameter/NamedElementBuilderTemplate.h | 2 +- parameter/Parameter.h | 18 +++---- parameter/ParameterAdaptation.h | 7 +-- parameter/ParameterBlock.h | 2 +- parameter/ParameterBlockType.h | 8 ++-- parameter/ParameterFrameworkConfiguration.h | 7 +-- parameter/ParameterMgr.h | 6 +-- parameter/ParameterMgrLogger.h | 4 +- parameter/ParameterType.h | 13 ++--- parameter/PluginLocation.h | 3 +- parameter/SelectionCriteria.h | 2 +- parameter/SelectionCriteriaDefinition.h | 2 +- parameter/SelectionCriterion.h | 12 ++--- parameter/SelectionCriterionLibrary.h | 2 +- parameter/SelectionCriterionRule.h | 11 +++-- parameter/SelectionCriterionType.h | 14 +++--- parameter/SimulatedBackSynchronizer.h | 2 +- parameter/StringParameter.h | 14 +++--- parameter/StringParameterType.h | 11 +++-- parameter/Subsystem.h | 20 ++++---- parameter/SubsystemElementBuilder.h | 2 +- parameter/SubsystemLibrary.h | 2 +- parameter/SubsystemObject.h | 5 +- parameter/SubsystemPlugins.h | 2 +- parameter/SystemClass.h | 6 +-- parameter/TypeElement.h | 9 ++-- parameter/VirtualSubsystem.h | 10 ++-- parameter/VirtualSyncer.h | 3 +- parameter/XmlFileIncluderElement.h | 3 +- remote-processor/AnswerMessage.h | 6 +-- .../BackgroundRemoteProcessorServer.h | 2 +- .../RemoteCommandHandlerTemplate.h | 4 +- remote-processor/RequestMessage.h | 18 +++---- xmlserializer/XmlMemoryDocSink.h | 3 +- xmlserializer/XmlMemoryDocSource.h | 2 +- xmlserializer/XmlStreamDocSink.h | 3 +- 74 files changed, 341 insertions(+), 316 deletions(-) diff --git a/parameter/ArrayParameter.h b/parameter/ArrayParameter.h index b2018c291..6410dbc36 100644 --- a/parameter/ArrayParameter.h +++ b/parameter/ArrayParameter.h @@ -37,30 +37,30 @@ class CArrayParameter : public CParameter CArrayParameter(const std::string &strName, const CTypeElement *pTypeElement); // Instantiation, allocation - virtual size_t getFootPrint() const; + size_t getFootPrint() const override; /// Value access using CBaseParameter::access; bool access(std::vector &abValues, bool bSet, - CParameterAccessContext ¶meterAccessContext) const override final; + CParameterAccessContext ¶meterAccessContext) const final; bool access(std::vector &auiValues, bool bSet, - CParameterAccessContext ¶meterAccessContext) const override final; + CParameterAccessContext ¶meterAccessContext) const final; bool access(std::vector &aiValues, bool bSet, - CParameterAccessContext ¶meterAccessContext) const override final; + CParameterAccessContext ¶meterAccessContext) const final; bool access(std::vector &adValues, bool bSet, - CParameterAccessContext ¶meterAccessContext) const override final; + CParameterAccessContext ¶meterAccessContext) const final; bool access(std::vector &astrValues, bool bSet, - CParameterAccessContext ¶meterAccessContext) const override final; + CParameterAccessContext ¶meterAccessContext) const final; protected: // User set/get - virtual bool accessValue(CPathNavigator &pathNavigator, std::string &strValue, bool bSet, - CParameterAccessContext ¶meterAccessContext) const; + bool accessValue(CPathNavigator &pathNavigator, std::string &strValue, bool bSet, + CParameterAccessContext ¶meterAccessContext) const override; // Used for simulation and virtual subsystems - virtual void setDefaultValues(CParameterAccessContext ¶meterAccessContext) const; + void setDefaultValues(CParameterAccessContext ¶meterAccessContext) const override; // Element properties - virtual void showProperties(std::string &strResult) const; + void showProperties(std::string &strResult) const override; private: // Array length diff --git a/parameter/BaseParameter.h b/parameter/BaseParameter.h index 1b80fb825..1efe902e7 100644 --- a/parameter/BaseParameter.h +++ b/parameter/BaseParameter.h @@ -43,12 +43,12 @@ class CBaseParameter : public CInstanceConfigurableElement CBaseParameter(const std::string &strName, const CTypeElement *pTypeElement); // XML configuration settings parsing/composing - virtual bool serializeXmlSettings( + bool serializeXmlSettings( CXmlElement &xmlConfigurationSettingsElementContent, - CConfigurationAccessContext &configurationAccessContext) const; + CConfigurationAccessContext &configurationAccessContext) const override; // Check element is a parameter - virtual bool isParameter() const; + bool isParameter() const override; // Boolean access virtual bool access(bool &bValue, bool bSet, @@ -85,12 +85,12 @@ class CBaseParameter : public CInstanceConfigurableElement CParameterAccessContext ¶meterAccessContext) const; void structureToXml(CXmlElement &xmlElement, - CXmlSerializingContext &serializingContext) const override final; + CXmlSerializingContext &serializingContext) const final; protected: // Parameter Access - virtual bool accessValue(CPathNavigator &pathNavigator, std::string &strValue, bool bSet, - CParameterAccessContext ¶meterAccessContext) const; + bool accessValue(CPathNavigator &pathNavigator, std::string &strValue, bool bSet, + CParameterAccessContext ¶meterAccessContext) const override; // Actual value access (to be implemented by derived) virtual bool doSetValue(const std::string &strValue, size_t offset, diff --git a/parameter/BitParameter.h b/parameter/BitParameter.h index cbe071e45..0487cb45a 100644 --- a/parameter/BitParameter.h +++ b/parameter/BitParameter.h @@ -39,22 +39,22 @@ class CBitParameter : public CBaseParameter CBitParameter(const std::string &strName, const CTypeElement *pTypeElement); // Instantiation, allocation - virtual size_t getFootPrint() const; + size_t getFootPrint() const override; // Type - virtual Type getType() const; + Type getType() const override; /// Value access // Boolean access bool access(bool &bValue, bool bSet, - CParameterAccessContext ¶meterAccessContext) const override final; + CParameterAccessContext ¶meterAccessContext) const final; // Integer Access bool access(uint32_t &uiValue, bool bSet, - CParameterAccessContext ¶meterAccessContext) const override final; + CParameterAccessContext ¶meterAccessContext) const final; // AreaConfiguration creation - virtual CAreaConfiguration *createAreaConfiguration(const CSyncerSet *pSyncerSet) const; + CAreaConfiguration *createAreaConfiguration(const CSyncerSet *pSyncerSet) const override; // Size size_t getBelongingBlockSize() const; @@ -64,10 +64,10 @@ class CBitParameter : public CBaseParameter private: // String Access - virtual bool doSetValue(const std::string &strValue, size_t offset, - CParameterAccessContext ¶meterAccessContext) const; - virtual void doGetValue(std::string &strValue, size_t offset, - CParameterAccessContext ¶meterAccessContext) const; + bool doSetValue(const std::string &strValue, size_t offset, + CParameterAccessContext ¶meterAccessContext) const override; + void doGetValue(std::string &strValue, size_t offset, + CParameterAccessContext ¶meterAccessContext) const override; // Generic Access template diff --git a/parameter/BitParameterBlock.h b/parameter/BitParameterBlock.h index f1068f628..e1e965c7d 100644 --- a/parameter/BitParameterBlock.h +++ b/parameter/BitParameterBlock.h @@ -37,18 +37,19 @@ class CBitParameterBlock : public CInstanceConfigurableElement CBitParameterBlock(const std::string &strName, const CTypeElement *pTypeElement); // Instantiation, allocation - virtual size_t getFootPrint() const; + size_t getFootPrint() const override; // Type - virtual Type getType() const; + Type getType() const override; // Size size_t getSize() const; // Used for simulation and virtual subsystems - virtual void setDefaultValues(CParameterAccessContext ¶meterAccessContext) const; + void setDefaultValues(CParameterAccessContext ¶meterAccessContext) const override; - void structureToXml(CXmlElement &xmlElement, CXmlSerializingContext &serializingContext) const + void structureToXml(CXmlElement &xmlElement, + CXmlSerializingContext &serializingContext) const override { xmlElement.setAttribute("Size", getSize() * 8); CInstanceConfigurableElement::structureToXml(xmlElement, serializingContext); diff --git a/parameter/BitParameterBlockType.h b/parameter/BitParameterBlockType.h index 419d7aa67..58b42d4e8 100644 --- a/parameter/BitParameterBlockType.h +++ b/parameter/BitParameterBlockType.h @@ -42,18 +42,19 @@ class CBitParameterBlockType : public CTypeElement size_t getSize() const; // From IXmlSink - virtual bool fromXml(const CXmlElement &xmlElement, CXmlSerializingContext &serializingContext); + bool fromXml(const CXmlElement &xmlElement, + CXmlSerializingContext &serializingContext) override; // From IXmlSource - virtual void toXml(CXmlElement &xmlElement, CXmlSerializingContext &serializingContext) const; + void toXml(CXmlElement &xmlElement, CXmlSerializingContext &serializingContext) const override; // CElement - virtual std::string getKind() const; + std::string getKind() const override; private: - virtual bool childrenAreDynamic() const; + bool childrenAreDynamic() const override; // Instantiation - virtual CInstanceConfigurableElement *doInstantiate() const; + CInstanceConfigurableElement *doInstantiate() const override; // Size in bytes size_t _size{0}; diff --git a/parameter/BitParameterType.h b/parameter/BitParameterType.h index f8d67eded..bf6955573 100644 --- a/parameter/BitParameterType.h +++ b/parameter/BitParameterType.h @@ -44,10 +44,11 @@ class CBitParameterType : public CTypeElement CBitParameterType(const std::string &strName); // From IXmlSink - virtual bool fromXml(const CXmlElement &xmlElement, CXmlSerializingContext &serializingContext); + bool fromXml(const CXmlElement &xmlElement, + CXmlSerializingContext &serializingContext) override; // From IXmlSource - virtual void toXml(CXmlElement &xmlElement, CXmlSerializingContext &serializingContext) const; + void toXml(CXmlElement &xmlElement, CXmlSerializingContext &serializingContext) const override; /// Conversion // String bool toBlackboard(const std::string &strValue, uint64_t &uiValue, @@ -66,10 +67,10 @@ class CBitParameterType : public CTypeElement size_t getBitSize() const; // Element properties - virtual void showProperties(std::string &strResult) const; + void showProperties(std::string &strResult) const override; // CElement - virtual std::string getKind() const; + std::string getKind() const override; /** * Get the position of the bit within the bit parameter block. @@ -80,7 +81,7 @@ class CBitParameterType : public CTypeElement size_t getBitPos() const { return _bitPos; } private: // Instantiation - virtual CInstanceConfigurableElement *doInstantiate() const; + CInstanceConfigurableElement *doInstantiate() const override; // Max encodable value uint64_t getMaxEncodableValue() const; // Biwise mask diff --git a/parameter/BitwiseAreaConfiguration.h b/parameter/BitwiseAreaConfiguration.h index 4a10c2cd6..5cb0e1bdb 100644 --- a/parameter/BitwiseAreaConfiguration.h +++ b/parameter/BitwiseAreaConfiguration.h @@ -41,6 +41,6 @@ class CBitwiseAreaConfiguration : public CAreaConfiguration private: // Blackboard copies - virtual void copyTo(CParameterBlackboard *pToBlackboard, size_t offset) const; - virtual void copyFrom(const CParameterBlackboard *pFromBlackboard, size_t offset); + void copyTo(CParameterBlackboard *pToBlackboard, size_t offset) const override; + void copyFrom(const CParameterBlackboard *pFromBlackboard, size_t offset) override; }; diff --git a/parameter/BooleanParameterType.h b/parameter/BooleanParameterType.h index 6a884880c..bc6c4c976 100644 --- a/parameter/BooleanParameterType.h +++ b/parameter/BooleanParameterType.h @@ -37,25 +37,25 @@ class CBooleanParameterType : public CParameterType { public: CBooleanParameterType(const std::string &strName); - virtual ~CBooleanParameterType() = default; + ~CBooleanParameterType() override = default; // Kind - virtual std::string getKind() const; + std::string getKind() const override; /// Conversion // String - virtual bool toBlackboard(const std::string &strValue, uint32_t &uiValue, - CParameterAccessContext ¶meterAccessContext) const; - virtual bool fromBlackboard(std::string &strValue, const uint32_t &uiValue, - CParameterAccessContext ¶meterAccessContext) const; + bool toBlackboard(const std::string &strValue, uint32_t &uiValue, + CParameterAccessContext ¶meterAccessContext) const override; + bool fromBlackboard(std::string &strValue, const uint32_t &uiValue, + CParameterAccessContext ¶meterAccessContext) const override; // Boolean - virtual bool toBlackboard(bool bUserValue, uint32_t &uiValue, - CParameterAccessContext ¶meterAccessContext) const; - virtual bool fromBlackboard(bool &bUserValue, uint32_t uiValue, - CParameterAccessContext ¶meterAccessContext) const; + bool toBlackboard(bool bUserValue, uint32_t &uiValue, + CParameterAccessContext ¶meterAccessContext) const override; + bool fromBlackboard(bool &bUserValue, uint32_t uiValue, + CParameterAccessContext ¶meterAccessContext) const override; // Integer - virtual bool toBlackboard(uint32_t uiUserValue, uint32_t &uiValue, - CParameterAccessContext ¶meterAccessContext) const; - virtual bool fromBlackboard(uint32_t &uiUserValue, uint32_t uiValue, - CParameterAccessContext ¶meterAccessContext) const; + bool toBlackboard(uint32_t uiUserValue, uint32_t &uiValue, + CParameterAccessContext ¶meterAccessContext) const override; + bool fromBlackboard(uint32_t &uiUserValue, uint32_t uiValue, + CParameterAccessContext ¶meterAccessContext) const override; }; diff --git a/parameter/Component.h b/parameter/Component.h index b89ea0bbc..e200b46f6 100644 --- a/parameter/Component.h +++ b/parameter/Component.h @@ -42,5 +42,5 @@ class CComponent : public CInstanceConfigurableElement } // Type - virtual Type getType() const { return EComponent; } + Type getType() const override { return EComponent; } }; diff --git a/parameter/ComponentInstance.h b/parameter/ComponentInstance.h index 27af96322..3f71a5426 100644 --- a/parameter/ComponentInstance.h +++ b/parameter/ComponentInstance.h @@ -41,26 +41,27 @@ class CComponentInstance : public CTypeElement CComponentInstance(const std::string &strName); // Mapping info - virtual bool getMappingData(const std::string &strKey, const std::string *&pStrValue) const; - virtual bool hasMappingData() const; + bool getMappingData(const std::string &strKey, const std::string *&pStrValue) const override; + bool hasMappingData() const override; /** * Returns the mapping associated to the current TypeElement instance * * @return A std::string containing the mapping as a comma separated key value pairs */ - virtual std::string getFormattedMapping() const; + std::string getFormattedMapping() const override; // From IXmlSink - virtual bool fromXml(const CXmlElement &xmlElement, CXmlSerializingContext &serializingContext); + bool fromXml(const CXmlElement &xmlElement, + CXmlSerializingContext &serializingContext) override; // CElement - virtual std::string getKind() const; + std::string getKind() const override; std::string getXmlElementName() const override; private: - virtual bool childrenAreDynamic() const; - virtual CInstanceConfigurableElement *doInstantiate() const; - virtual void populate(CElement *pElement) const; + bool childrenAreDynamic() const override; + CInstanceConfigurableElement *doInstantiate() const override; + void populate(CElement *pElement) const override; // Related component type const CComponentType *_pComponentType{nullptr}; diff --git a/parameter/ComponentLibrary.h b/parameter/ComponentLibrary.h index 572b0622f..a58a50948 100644 --- a/parameter/ComponentLibrary.h +++ b/parameter/ComponentLibrary.h @@ -42,11 +42,12 @@ class CComponentLibrary : public CElement public: const CComponentType *getComponentType(const std::string &strName) const; - virtual std::string getKind() const; + std::string getKind() const override; // From IXmlSink - virtual bool fromXml(const CXmlElement &xmlElement, CXmlSerializingContext &serializingContext); + bool fromXml(const CXmlElement &xmlElement, + CXmlSerializingContext &serializingContext) override; private: - virtual bool childrenAreDynamic() const; + bool childrenAreDynamic() const override; }; diff --git a/parameter/ComponentType.h b/parameter/ComponentType.h index e8c7fff68..4e621e804 100644 --- a/parameter/ComponentType.h +++ b/parameter/ComponentType.h @@ -41,28 +41,29 @@ class CComponentType : public CTypeElement CComponentType(const std::string &strName); // Object creation - virtual void populate(CElement *pElement) const; + void populate(CElement *pElement) const override; // Mapping info - virtual bool getMappingData(const std::string &strKey, const std::string *&pStrValue) const; - virtual bool hasMappingData() const; + bool getMappingData(const std::string &strKey, const std::string *&pStrValue) const override; + bool hasMappingData() const override; /** * Returns the mapping associated to the current TypeElement instance * * @return A std::string containing the mapping as a comma separated key value pairs */ - virtual std::string getFormattedMapping() const; + std::string getFormattedMapping() const override; // From IXmlSink - virtual bool fromXml(const CXmlElement &xmlElement, CXmlSerializingContext &serializingContext); + bool fromXml(const CXmlElement &xmlElement, + CXmlSerializingContext &serializingContext) override; // CElement - virtual std::string getKind() const; + std::string getKind() const override; private: // CElement - virtual bool childrenAreDynamic() const; + bool childrenAreDynamic() const override; // Component creation - virtual CInstanceConfigurableElement *doInstantiate() const; + CInstanceConfigurableElement *doInstantiate() const override; // Ref const CComponentType *_pExtendsComponentType{nullptr}; diff --git a/parameter/CompoundRule.h b/parameter/CompoundRule.h index 712ff7044..bc3ef3542 100644 --- a/parameter/CompoundRule.h +++ b/parameter/CompoundRule.h @@ -37,29 +37,30 @@ class CCompoundRule : public CRule { public: // Parse - virtual bool parse(CRuleParser &ruleParser, std::string &strError); + bool parse(CRuleParser &ruleParser, std::string &strError) override; // Dump std::string dump() const override; // Rule check - virtual bool matches() const; + bool matches() const override; // From IXmlSink - virtual bool fromXml(const CXmlElement &xmlElement, CXmlSerializingContext &serializingContext); + bool fromXml(const CXmlElement &xmlElement, + CXmlSerializingContext &serializingContext) override; // From IXmlSource - virtual void toXml(CXmlElement &xmlElement, CXmlSerializingContext &serializingContext) const; + void toXml(CXmlElement &xmlElement, CXmlSerializingContext &serializingContext) const override; // Class kind - virtual std::string getKind() const; + std::string getKind() const override; private: // Content dumping std::string logValue(utility::ErrorContext &errorContext) const override; // Returns true if children dynamic creation is to be dealt with - virtual bool childrenAreDynamic() const; + bool childrenAreDynamic() const override; // Type bool _bTypeAll{false}; diff --git a/parameter/ConfigurableDomain.h b/parameter/ConfigurableDomain.h index 256e602e3..fd4a49979 100644 --- a/parameter/ConfigurableDomain.h +++ b/parameter/ConfigurableDomain.h @@ -53,7 +53,7 @@ class CConfigurableDomain : public CElement public: CConfigurableDomain() = default; CConfigurableDomain(const std::string &strName); - virtual ~CConfigurableDomain(); + ~CConfigurableDomain() override; // Sequence awareness void setSequenceAwareness(bool bSequenceAware); @@ -146,15 +146,16 @@ class CConfigurableDomain : public CElement bool isApplicableConfigurationValid(const CConfigurableElement *pConfigurableElement) const; // From IXmlSink - virtual bool fromXml(const CXmlElement &xmlElement, CXmlSerializingContext &serializingContext); + bool fromXml(const CXmlElement &xmlElement, + CXmlSerializingContext &serializingContext) override; // From IXmlSource - virtual void toXml(CXmlElement &xmlElement, CXmlSerializingContext &serializingContext) const; - virtual void childrenToXml(CXmlElement &xmlElement, - CXmlSerializingContext &serializingContext) const; + void toXml(CXmlElement &xmlElement, CXmlSerializingContext &serializingContext) const override; + void childrenToXml(CXmlElement &xmlElement, + CXmlSerializingContext &serializingContext) const override; // Class kind - virtual std::string getKind() const; + std::string getKind() const override; protected: // Content dumping @@ -169,7 +170,7 @@ class CConfigurableDomain : public CElement // Returns true if children dynamic creation is to be dealt with (here, will allow child // deletion upon clean) - virtual bool childrenAreDynamic() const; + bool childrenAreDynamic() const override; // Ensure validity on areas related to configurable element void validateAreas(const CConfigurableElement *pConfigurableElement, diff --git a/parameter/ConfigurableDomains.h b/parameter/ConfigurableDomains.h index 70e943b70..5a096a5ac 100644 --- a/parameter/ConfigurableDomains.h +++ b/parameter/ConfigurableDomains.h @@ -161,7 +161,7 @@ class CConfigurableDomains : public CElement std::string &strError) const; // From IXmlSource - virtual void toXml(CXmlElement &xmlElement, CXmlSerializingContext &serializingContext) const; + void toXml(CXmlElement &xmlElement, CXmlSerializingContext &serializingContext) const override; // Ensure validity on whole domains from main blackboard void validate(const CParameterBlackboard *pMainBlackboard); @@ -177,7 +177,7 @@ class CConfigurableDomains : public CElement core::Results &infos) const; // Class kind - virtual std::string getKind() const; + std::string getKind() const override; private: /** Delete a domain @@ -189,7 +189,7 @@ class CConfigurableDomains : public CElement */ void deleteDomain(CConfigurableDomain &configurableDomain); // Returns true if children dynamic creation is to be dealt with - virtual bool childrenAreDynamic() const; + bool childrenAreDynamic() const override; // Gather owned configurable elements owned by any domain void gatherAllOwnedConfigurableElements( std::set &configurableElementSet) const; diff --git a/parameter/ConfigurableElement.h b/parameter/ConfigurableElement.h index e511447a5..b17521da7 100644 --- a/parameter/ConfigurableElement.h +++ b/parameter/ConfigurableElement.h @@ -53,7 +53,7 @@ class PARAMETER_EXPORT CConfigurableElement : public CElement public: CConfigurableElement(const std::string &strName = ""); - virtual ~CConfigurableElement() = default; + ~CConfigurableElement() override = default; // Offset in main blackboard void setOffset(size_t offset); @@ -143,7 +143,7 @@ class PARAMETER_EXPORT CConfigurableElement : public CElement virtual void setDefaultValues(CParameterAccessContext ¶meterAccessContext) const; // Element properties - virtual void showProperties(std::string &strResult) const; + void showProperties(std::string &strResult) const override; /** * Get the value associated to a mapping key in the object's mapping @@ -165,11 +165,9 @@ class PARAMETER_EXPORT CConfigurableElement : public CElement CXmlElement &xmlConfigurationSettingsElementContent, CConfigurationAccessContext &configurationAccessContext) const; - bool fromXml(const CXmlElement &xmlElement, - CXmlSerializingContext &serializingContext) override final; + bool fromXml(const CXmlElement &xmlElement, CXmlSerializingContext &serializingContext) final; - void toXml(CXmlElement &xmlElement, - CXmlSerializingContext &serializingContext) const override final; + void toXml(CXmlElement &xmlElement, CXmlSerializingContext &serializingContext) const final; /** Deserialize the structure from xml. */ virtual bool structureFromXml(const CXmlElement &xmlElement, @@ -210,7 +208,7 @@ class PARAMETER_EXPORT CConfigurableElement : public CElement // Elements should be called with the overloaded version taking a // "Parameter Access Context" (The name is misleading as it is actually // used to access any Configurable Element). - std::string logValue(utility::ErrorContext &errorContext) const override final; + std::string logValue(utility::ErrorContext &errorContext) const final; virtual std::string logValue(CParameterAccessContext &context) const; // Configurable domain association diff --git a/parameter/ConfigurationAccessContext.h b/parameter/ConfigurationAccessContext.h index 10ffd4f1f..d433cc4c4 100644 --- a/parameter/ConfigurationAccessContext.h +++ b/parameter/ConfigurationAccessContext.h @@ -45,7 +45,7 @@ class CConfigurationAccessContext : public CParameterAccessContext // Serialization direction bool serializeOut() const; - bool serializeSettings() const override final { return true; } + bool serializeSettings() const final { return true; } private: // Serialization direction diff --git a/parameter/DefaultElementLibrary.h b/parameter/DefaultElementLibrary.h index 9223021f2..bd8facd59 100644 --- a/parameter/DefaultElementLibrary.h +++ b/parameter/DefaultElementLibrary.h @@ -47,7 +47,7 @@ template class CDefaultElementLibrary : public CElementLibrary { public: - virtual ~CDefaultElementLibrary() = default; + ~CDefaultElementLibrary() override = default; /** Set the default builder used in fallback mechanism. * @see createElement() for more detail on this mechanism. diff --git a/parameter/DomainConfiguration.h b/parameter/DomainConfiguration.h index f45c155a9..9c1e656bd 100644 --- a/parameter/DomainConfiguration.h +++ b/parameter/DomainConfiguration.h @@ -122,7 +122,7 @@ class CDomainConfiguration : public CElement CXmlDomainExportContext &context) const; // Class kind - virtual std::string getKind() const; + std::string getKind() const override; private: using AreaConfiguration = std::unique_ptr; @@ -130,7 +130,7 @@ class CDomainConfiguration : public CElement // Returns true if children dynamic creation is to be dealt with (here, will allow child // deletion upon clean) - virtual bool childrenAreDynamic() const; + bool childrenAreDynamic() const override; // XML configuration settings serializing bool importOneConfigurableElementSettings(CAreaConfiguration *areaConfiguration, CXmlElement &xmlConfigurableElementSettingsElement, diff --git a/parameter/Element.h b/parameter/Element.h index 11d41b537..7a7515ae4 100644 --- a/parameter/Element.h +++ b/parameter/Element.h @@ -49,7 +49,7 @@ class PARAMETER_EXPORT CElement : public IXmlSink, public IXmlSource { public: CElement(const std::string &strName = ""); - virtual ~CElement(); + ~CElement() override; // Description void setDescription(const std::string &strDescription); @@ -106,10 +106,11 @@ class PARAMETER_EXPORT CElement : public IXmlSink, public IXmlSource bool isDescendantOf(const CElement *pCandidateAscendant) const; // From IXmlSink - virtual bool fromXml(const CXmlElement &xmlElement, CXmlSerializingContext &serializingContext); + bool fromXml(const CXmlElement &xmlElement, + CXmlSerializingContext &serializingContext) override; // From IXmlSource - virtual void toXml(CXmlElement &xmlElement, CXmlSerializingContext &serializingContext) const; + void toXml(CXmlElement &xmlElement, CXmlSerializingContext &serializingContext) const override; /** * Serialize the children to XML diff --git a/parameter/ElementBuilderTemplate.h b/parameter/ElementBuilderTemplate.h index 8f7c44f72..86f8b0354 100644 --- a/parameter/ElementBuilderTemplate.h +++ b/parameter/ElementBuilderTemplate.h @@ -35,5 +35,5 @@ template class TElementBuilderTemplate : public CElementBuilder { public: - virtual CElement *createElement(const CXmlElement & /*elem*/) const { return new ElementType; } + CElement *createElement(const CXmlElement & /*elem*/) const override { return new ElementType; } }; diff --git a/parameter/EnumParameterType.h b/parameter/EnumParameterType.h index b8f67f4ec..2103377ee 100644 --- a/parameter/EnumParameterType.h +++ b/parameter/EnumParameterType.h @@ -39,31 +39,32 @@ class CEnumParameterType : public CParameterType CEnumParameterType(const std::string &strName); // From IXmlSink - virtual bool fromXml(const CXmlElement &xmlElement, CXmlSerializingContext &serializingContext); + bool fromXml(const CXmlElement &xmlElement, + CXmlSerializingContext &serializingContext) override; // From IXmlSource - virtual void toXml(CXmlElement &xmlElement, CXmlSerializingContext &serializingContext) const; + void toXml(CXmlElement &xmlElement, CXmlSerializingContext &serializingContext) const override; /// Conversion // String - virtual bool toBlackboard(const std::string &strValue, uint32_t &uiValue, - CParameterAccessContext ¶meterAccessContext) const; - virtual bool fromBlackboard(std::string &strValue, const uint32_t &uiValue, - CParameterAccessContext ¶meterAccessContext) const; + bool toBlackboard(const std::string &strValue, uint32_t &uiValue, + CParameterAccessContext ¶meterAccessContext) const override; + bool fromBlackboard(std::string &strValue, const uint32_t &uiValue, + CParameterAccessContext ¶meterAccessContext) const override; // Integer - virtual bool toBlackboard(int32_t iUserValue, uint32_t &uiValue, - CParameterAccessContext ¶meterAccessContext) const; - virtual bool fromBlackboard(int32_t &iUserValue, uint32_t uiValue, - CParameterAccessContext ¶meterAccessContext) const; + bool toBlackboard(int32_t iUserValue, uint32_t &uiValue, + CParameterAccessContext ¶meterAccessContext) const override; + bool fromBlackboard(int32_t &iUserValue, uint32_t uiValue, + CParameterAccessContext ¶meterAccessContext) const override; // Default value handling (simulation only) - virtual uint32_t getDefaultValue() const; + uint32_t getDefaultValue() const override; // Element properties - virtual void showProperties(std::string &strResult) const; + void showProperties(std::string &strResult) const override; // CElement - virtual std::string getKind() const; + std::string getKind() const override; private: // Specialized version of toBlackboard in case the access context is in raw @@ -72,7 +73,7 @@ class CEnumParameterType : public CParameterType CParameterAccessContext ¶meterAccessContext) const; // Returns true if children dynamic creation is to be dealt with - virtual bool childrenAreDynamic() const; + bool childrenAreDynamic() const override; // Literal - numerical conversions bool getLiteral(int32_t iNumerical, std::string &strLiteral) const; diff --git a/parameter/EnumValuePair.h b/parameter/EnumValuePair.h index 46d557879..8a7100d1a 100644 --- a/parameter/EnumValuePair.h +++ b/parameter/EnumValuePair.h @@ -39,13 +39,14 @@ class CEnumValuePair : public CElement std::string getNumericalAsString() const; // From IXmlSink - virtual bool fromXml(const CXmlElement &xmlElement, CXmlSerializingContext &serializingContext); + bool fromXml(const CXmlElement &xmlElement, + CXmlSerializingContext &serializingContext) override; // From IXmlSource - virtual void toXml(CXmlElement &xmlElement, CXmlSerializingContext &serializingContext) const; + void toXml(CXmlElement &xmlElement, CXmlSerializingContext &serializingContext) const override; // CElement - virtual std::string getKind() const; + std::string getKind() const override; protected: // Content dumping diff --git a/parameter/FileIncluderElementBuilder.h b/parameter/FileIncluderElementBuilder.h index d66065c18..eb71c9003 100644 --- a/parameter/FileIncluderElementBuilder.h +++ b/parameter/FileIncluderElementBuilder.h @@ -47,7 +47,7 @@ class CFileIncluderElementBuilder : public CElementBuilder { } - virtual CElement *createElement(const CXmlElement &xmlElement) const + CElement *createElement(const CXmlElement &xmlElement) const override { return new CXmlFileIncluderElement(xmlElement.getNameAttribute(), xmlElement.getType(), _bValidateWithSchemas, _schemaBaseUri); diff --git a/parameter/FixedPointParameterType.h b/parameter/FixedPointParameterType.h index d4e96b6a2..943992ad2 100644 --- a/parameter/FixedPointParameterType.h +++ b/parameter/FixedPointParameterType.h @@ -39,34 +39,35 @@ class CFixedPointParameterType : public CParameterType CFixedPointParameterType(const std::string &strName); // From IXmlSink - virtual bool fromXml(const CXmlElement &xmlElement, CXmlSerializingContext &serializingContext); + bool fromXml(const CXmlElement &xmlElement, + CXmlSerializingContext &serializingContext) override; // From IXmlSource - virtual void toXml(CXmlElement &xmlElement, CXmlSerializingContext &serializingContext) const; + void toXml(CXmlElement &xmlElement, CXmlSerializingContext &serializingContext) const override; // XML Serialization value space handling // Value space handling for configuration import - virtual void handleValueSpaceAttribute( + void handleValueSpaceAttribute( CXmlElement &xmlConfigurableElementSettingsElement, - CConfigurationAccessContext &configurationAccessContext) const; + CConfigurationAccessContext &configurationAccessContext) const override; /// Conversion // String - virtual bool toBlackboard(const std::string &strValue, uint32_t &uiValue, - CParameterAccessContext ¶meterAccessContext) const; - virtual bool fromBlackboard(std::string &strValue, const uint32_t &uiValue, - CParameterAccessContext ¶meterAccessContext) const; + bool toBlackboard(const std::string &strValue, uint32_t &uiValue, + CParameterAccessContext ¶meterAccessContext) const override; + bool fromBlackboard(std::string &strValue, const uint32_t &uiValue, + CParameterAccessContext ¶meterAccessContext) const override; // Double - virtual bool toBlackboard(double dUserValue, uint32_t &uiValue, - CParameterAccessContext ¶meterAccessContext) const; - virtual bool fromBlackboard(double &dUserValue, uint32_t uiValue, - CParameterAccessContext ¶meterAccessContext) const; + bool toBlackboard(double dUserValue, uint32_t &uiValue, + CParameterAccessContext ¶meterAccessContext) const override; + bool fromBlackboard(double &dUserValue, uint32_t uiValue, + CParameterAccessContext ¶meterAccessContext) const override; // Element properties - virtual void showProperties(std::string &strResult) const; + void showProperties(std::string &strResult) const override; // CElement - virtual std::string getKind() const; + std::string getKind() const override; private: // Util size diff --git a/parameter/FloatingPointParameterType.h b/parameter/FloatingPointParameterType.h index aafb5e253..b56c9aaf2 100644 --- a/parameter/FloatingPointParameterType.h +++ b/parameter/FloatingPointParameterType.h @@ -37,25 +37,26 @@ class CFloatingPointParameterType : public CParameterType public: CFloatingPointParameterType(const std::string &strName); - virtual bool fromXml(const CXmlElement &xmlElement, CXmlSerializingContext &serializingContext); - virtual void toXml(CXmlElement &xmlElement, CXmlSerializingContext &serializingContext) const; + bool fromXml(const CXmlElement &xmlElement, + CXmlSerializingContext &serializingContext) override; + void toXml(CXmlElement &xmlElement, CXmlSerializingContext &serializingContext) const override; - virtual void handleValueSpaceAttribute( + void handleValueSpaceAttribute( CXmlElement &xmlConfigurableElementSettingsElement, - CConfigurationAccessContext &configurationAccessContext) const; + CConfigurationAccessContext &configurationAccessContext) const override; - virtual bool toBlackboard(const std::string &strValue, uint32_t &uiValue, - CParameterAccessContext ¶meterAccessContext) const; - virtual bool fromBlackboard(std::string &strValue, const uint32_t &uiValue, - CParameterAccessContext ¶meterAccessContext) const; - virtual bool toBlackboard(double dUserValue, uint32_t &uiValue, - CParameterAccessContext ¶meterAccessContext) const; - virtual bool fromBlackboard(double &dUserValue, uint32_t uiValue, - CParameterAccessContext ¶meterAccessContext) const; + bool toBlackboard(const std::string &strValue, uint32_t &uiValue, + CParameterAccessContext ¶meterAccessContext) const override; + bool fromBlackboard(std::string &strValue, const uint32_t &uiValue, + CParameterAccessContext ¶meterAccessContext) const override; + bool toBlackboard(double dUserValue, uint32_t &uiValue, + CParameterAccessContext ¶meterAccessContext) const override; + bool fromBlackboard(double &dUserValue, uint32_t uiValue, + CParameterAccessContext ¶meterAccessContext) const override; - virtual void showProperties(std::string &strResult) const; + void showProperties(std::string &strResult) const override; - virtual std::string getKind() const; + std::string getKind() const override; private: typedef CParameterType base; diff --git a/parameter/FormattedSubsystemObject.h b/parameter/FormattedSubsystemObject.h index 47936351b..4a4bceab8 100644 --- a/parameter/FormattedSubsystemObject.h +++ b/parameter/FormattedSubsystemObject.h @@ -71,14 +71,14 @@ class PARAMETER_EXPORT CFormattedSubsystemObject : public CSubsystemObject core::log::Logger &logger, const std::string &strMappingValue, size_t firstAmendKey, size_t nbAmendKeys, const CMappingContext &context); - virtual ~CFormattedSubsystemObject() = default; + ~CFormattedSubsystemObject() override = default; /** * Returns the formatted mapping value associated to the element. * * @return A std::string containing the mapping */ - virtual std::string getFormattedMappingValue() const; + std::string getFormattedMappingValue() const override; private: /** diff --git a/parameter/FrameworkConfigurationGroup.h b/parameter/FrameworkConfigurationGroup.h index 551cb5eef..27fdc18a8 100644 --- a/parameter/FrameworkConfigurationGroup.h +++ b/parameter/FrameworkConfigurationGroup.h @@ -42,5 +42,5 @@ class CFrameworkConfigurationGroup : public CKindElement } private: - virtual bool childrenAreDynamic() const { return true; } + bool childrenAreDynamic() const override { return true; } }; diff --git a/parameter/FrameworkConfigurationLocation.h b/parameter/FrameworkConfigurationLocation.h index 7182db923..bafa2c7c4 100644 --- a/parameter/FrameworkConfigurationLocation.h +++ b/parameter/FrameworkConfigurationLocation.h @@ -43,7 +43,8 @@ class CFrameworkConfigurationLocation : public CKindElement const std::string &getUri() const; // From IXmlSink - virtual bool fromXml(const CXmlElement &xmlElement, CXmlSerializingContext &serializingContext); + bool fromXml(const CXmlElement &xmlElement, + CXmlSerializingContext &serializingContext) override; private: std::string _configurationUri; diff --git a/parameter/HardwareBackSynchronizer.h b/parameter/HardwareBackSynchronizer.h index fd2e70da4..03aaa04f6 100644 --- a/parameter/HardwareBackSynchronizer.h +++ b/parameter/HardwareBackSynchronizer.h @@ -39,7 +39,7 @@ class CHardwareBackSynchronizer : public CBackSynchronizer CParameterBlackboard *pParameterBlackboard); // Back synchronization - virtual void sync(); + void sync() override; private: // Back syncer set diff --git a/parameter/InstanceConfigurableElement.h b/parameter/InstanceConfigurableElement.h index 0b4a7f95f..d1b52f1eb 100644 --- a/parameter/InstanceConfigurableElement.h +++ b/parameter/InstanceConfigurableElement.h @@ -59,7 +59,7 @@ class PARAMETER_EXPORT CInstanceConfigurableElement : public CConfigurableElemen // Instantiated type const CTypeElement *getTypeElement() const; - virtual bool getMappingData(const std::string &strKey, const std::string *&pStrValue) const; + bool getMappingData(const std::string &strKey, const std::string *&pStrValue) const override; /** * Returns the mapping data associated to the type element of the current @@ -70,7 +70,7 @@ class PARAMETER_EXPORT CInstanceConfigurableElement : public CConfigurableElemen std::string getFormattedMapping() const override; // From CElement - virtual std::string getKind() const; + std::string getKind() const override; std::string getXmlElementName() const override; // Syncer to/from HW @@ -84,7 +84,7 @@ class PARAMETER_EXPORT CInstanceConfigurableElement : public CConfigurableElemen bool map(IMapper &mapper, std::string &strError); // Element properties - virtual void showProperties(std::string &strResult) const; + void showProperties(std::string &strResult) const override; // Scalar or Array? bool isScalar() const; @@ -92,14 +92,14 @@ class PARAMETER_EXPORT CInstanceConfigurableElement : public CConfigurableElemen // Array Length size_t getArrayLength() const; - virtual void structureToXml(CXmlElement &xmlElement, - CXmlSerializingContext &serializingContext) const; + void structureToXml(CXmlElement &xmlElement, + CXmlSerializingContext &serializingContext) const override; protected: // Syncer - virtual ISyncer *getSyncer() const; + ISyncer *getSyncer() const override; // Syncer set (descendant) - virtual void fillSyncerSetFromDescendant(CSyncerSet &syncerSet) const; + void fillSyncerSetFromDescendant(CSyncerSet &syncerSet) const override; /** * Performs the sync if the AutoSync is enabled. diff --git a/parameter/InstanceDefinition.h b/parameter/InstanceDefinition.h index 212c535ff..0624c945d 100644 --- a/parameter/InstanceDefinition.h +++ b/parameter/InstanceDefinition.h @@ -38,9 +38,9 @@ class CInstanceDefinition : public CTypeElement public: void createInstances(CElement *pFatherElement); - virtual std::string getKind() const; + std::string getKind() const override; private: - virtual bool childrenAreDynamic() const; - virtual CInstanceConfigurableElement *doInstantiate() const; + bool childrenAreDynamic() const override; + CInstanceConfigurableElement *doInstantiate() const override; }; diff --git a/parameter/IntegerParameterType.h b/parameter/IntegerParameterType.h index 5eea40b41..bf7bc973e 100644 --- a/parameter/IntegerParameterType.h +++ b/parameter/IntegerParameterType.h @@ -42,48 +42,49 @@ class CIntegerParameterType : public CParameterType CIntegerParameterType(const std::string &strName); // From IXmlSink - virtual bool fromXml(const CXmlElement &xmlElement, CXmlSerializingContext &serializingContext); + bool fromXml(const CXmlElement &xmlElement, + CXmlSerializingContext &serializingContext) override; // From IXmlSource - virtual void toXml(CXmlElement &xmlElement, CXmlSerializingContext &serializingContext) const; + void toXml(CXmlElement &xmlElement, CXmlSerializingContext &serializingContext) const override; /// Conversion // String - virtual bool toBlackboard(const std::string &strValue, uint32_t &uiValue, - CParameterAccessContext ¶meterAccessContext) const; - virtual bool fromBlackboard(std::string &strValue, const uint32_t &uiValue, - CParameterAccessContext ¶meterAccessContext) const; + bool toBlackboard(const std::string &strValue, uint32_t &uiValue, + CParameterAccessContext ¶meterAccessContext) const override; + bool fromBlackboard(std::string &strValue, const uint32_t &uiValue, + CParameterAccessContext ¶meterAccessContext) const override; // Integer - virtual bool toBlackboard(uint32_t uiUserValue, uint32_t &uiValue, - CParameterAccessContext ¶meterAccessContext) const; - virtual bool fromBlackboard(uint32_t &uiUserValue, uint32_t uiValue, - CParameterAccessContext ¶meterAccessContext) const; + bool toBlackboard(uint32_t uiUserValue, uint32_t &uiValue, + CParameterAccessContext ¶meterAccessContext) const override; + bool fromBlackboard(uint32_t &uiUserValue, uint32_t uiValue, + CParameterAccessContext ¶meterAccessContext) const override; // Signed Integer - virtual bool toBlackboard(int32_t iUserValue, uint32_t &uiValue, - CParameterAccessContext ¶meterAccessContext) const; - virtual bool fromBlackboard(int32_t &iUserValue, uint32_t uiValue, - CParameterAccessContext ¶meterAccessContext) const; + bool toBlackboard(int32_t iUserValue, uint32_t &uiValue, + CParameterAccessContext ¶meterAccessContext) const override; + bool fromBlackboard(int32_t &iUserValue, uint32_t uiValue, + CParameterAccessContext ¶meterAccessContext) const override; // Double - virtual bool toBlackboard(double dUserValue, uint32_t &uiValue, - CParameterAccessContext ¶meterAccessContext) const; - virtual bool fromBlackboard(double &dUserValue, uint32_t uiValue, - CParameterAccessContext ¶meterAccessContext) const; + bool toBlackboard(double dUserValue, uint32_t &uiValue, + CParameterAccessContext ¶meterAccessContext) const override; + bool fromBlackboard(double &dUserValue, uint32_t uiValue, + CParameterAccessContext ¶meterAccessContext) const override; // Default value handling (simulation only) - virtual uint32_t getDefaultValue() const; + uint32_t getDefaultValue() const override; // Element properties - virtual void showProperties(std::string &strResult) const; + void showProperties(std::string &strResult) const override; // Integer conversion - virtual int toPlainInteger(int iSizeOptimizedData) const; + int toPlainInteger(int iSizeOptimizedData) const override; // CElement - virtual std::string getKind() const; + std::string getKind() const override; private: // Returns true if children dynamic creation is to be dealt with - virtual bool childrenAreDynamic() const; + bool childrenAreDynamic() const override; // Conversion from std::string bool convertValueFromString(const std::string &strValue, int64_t &iData, diff --git a/parameter/KindElement.h b/parameter/KindElement.h index 848180a37..608a83226 100644 --- a/parameter/KindElement.h +++ b/parameter/KindElement.h @@ -41,7 +41,7 @@ class CKindElement : public CElement { } - virtual std::string getKind() const { return _strKind; } + std::string getKind() const override { return _strKind; } private: std::string _strKind; }; diff --git a/parameter/KindElementBuilderTemplate.h b/parameter/KindElementBuilderTemplate.h index ffce47522..22666e688 100644 --- a/parameter/KindElementBuilderTemplate.h +++ b/parameter/KindElementBuilderTemplate.h @@ -37,7 +37,7 @@ class TKindElementBuilderTemplate : public CElementBuilder public: TKindElementBuilderTemplate() : CElementBuilder() {} - virtual CElement *createElement(const CXmlElement &xmlElement) const + CElement *createElement(const CXmlElement &xmlElement) const override { return new ElementType(xmlElement.getNameAttribute(), xmlElement.getType()); } diff --git a/parameter/LinearParameterAdaptation.h b/parameter/LinearParameterAdaptation.h index 0c6ff5e4d..ac349af72 100644 --- a/parameter/LinearParameterAdaptation.h +++ b/parameter/LinearParameterAdaptation.h @@ -40,14 +40,15 @@ class CLinearParameterAdaptation : public CParameterAdaptation CLinearParameterAdaptation(const std::string &strType); // Conversions - virtual int64_t fromUserValue(double dValue) const; - virtual double toUserValue(int64_t iValue) const; + int64_t fromUserValue(double dValue) const override; + double toUserValue(int64_t iValue) const override; // Element properties - virtual void showProperties(std::string &strResult) const; + void showProperties(std::string &strResult) const override; // From IXmlSink - virtual bool fromXml(const CXmlElement &xmlElement, CXmlSerializingContext &serializingContext); + bool fromXml(const CXmlElement &xmlElement, + CXmlSerializingContext &serializingContext) override; private: // Slope attributes diff --git a/parameter/LogarithmicParameterAdaptation.h b/parameter/LogarithmicParameterAdaptation.h index 9c2553b5a..fc3d3d6dc 100644 --- a/parameter/LogarithmicParameterAdaptation.h +++ b/parameter/LogarithmicParameterAdaptation.h @@ -53,12 +53,13 @@ class CLogarithmicParameterAdaptation : public CLinearParameterAdaptation * f'(y) * log(base) = log (x) * exp(f'(y)*log(base)) = x */ - virtual int64_t fromUserValue(double dValue) const; - virtual double toUserValue(int64_t iValue) const; + int64_t fromUserValue(double dValue) const override; + double toUserValue(int64_t iValue) const override; - virtual void showProperties(std::string &strResult) const; + void showProperties(std::string &strResult) const override; - virtual bool fromXml(const CXmlElement &xmlElement, CXmlSerializingContext &serializingContext); + bool fromXml(const CXmlElement &xmlElement, + CXmlSerializingContext &serializingContext) override; private: /** diff --git a/parameter/LoggingElementBuilderTemplate.h b/parameter/LoggingElementBuilderTemplate.h index 1bfff0633..47243ce6e 100644 --- a/parameter/LoggingElementBuilderTemplate.h +++ b/parameter/LoggingElementBuilderTemplate.h @@ -85,7 +85,7 @@ class TLoggingElementBuilderTemplate : public CElementBuilder * * @return pointer to the generated element */ - virtual CElement *createElement(const CXmlElement &xmlElement) const + CElement *createElement(const CXmlElement &xmlElement) const override { return new ElementType(details::getName(xmlElement), mLogger); } diff --git a/parameter/NamedElementBuilderTemplate.h b/parameter/NamedElementBuilderTemplate.h index 8c2295676..26bff2628 100644 --- a/parameter/NamedElementBuilderTemplate.h +++ b/parameter/NamedElementBuilderTemplate.h @@ -35,7 +35,7 @@ template class TNamedElementBuilderTemplate : public CElementBuilder { public: - virtual CElement *createElement(const CXmlElement &xmlElement) const + CElement *createElement(const CXmlElement &xmlElement) const override { return new ElementType(xmlElement.getNameAttribute()); } diff --git a/parameter/Parameter.h b/parameter/Parameter.h index 2c974095a..f6fa60a19 100644 --- a/parameter/Parameter.h +++ b/parameter/Parameter.h @@ -41,15 +41,15 @@ class CParameter : public CBaseParameter CParameter(const std::string &strName, const CTypeElement *pTypeElement); // Instantiation, allocation - virtual size_t getFootPrint() const; + size_t getFootPrint() const override; // Type - virtual Type getType() const; + Type getType() const override; // XML configuration settings parsing/composing - virtual bool serializeXmlSettings( + bool serializeXmlSettings( CXmlElement &xmlConfigurationSettingsElementContent, - CConfigurationAccessContext &configurationAccessContext) const; + CConfigurationAccessContext &configurationAccessContext) const override; // Boolean access bool access(bool &bValue, bool bSet, @@ -69,13 +69,13 @@ class CParameter : public CBaseParameter protected: // Used for simulation and virtual subsystems - virtual void setDefaultValues(CParameterAccessContext ¶meterAccessContext) const; + void setDefaultValues(CParameterAccessContext ¶meterAccessContext) const override; // Actual value access - virtual bool doSetValue(const std::string &strValue, size_t offset, - CParameterAccessContext ¶meterAccessContext) const; - virtual void doGetValue(std::string &strValue, size_t offset, - CParameterAccessContext ¶meterAccessContext) const; + bool doSetValue(const std::string &strValue, size_t offset, + CParameterAccessContext ¶meterAccessContext) const override; + void doGetValue(std::string &strValue, size_t offset, + CParameterAccessContext ¶meterAccessContext) const override; // Value space handling for configuration import void handleValueSpaceAttribute(CXmlElement &xmlConfigurableElementSettingsElement, diff --git a/parameter/ParameterAdaptation.h b/parameter/ParameterAdaptation.h index d9cbe4b83..d600161b5 100644 --- a/parameter/ParameterAdaptation.h +++ b/parameter/ParameterAdaptation.h @@ -39,17 +39,18 @@ class CParameterAdaptation : public CElement CParameterAdaptation(const std::string &strType); // Element properties - virtual void showProperties(std::string &strResult) const; + void showProperties(std::string &strResult) const override; // From IXmlSink - virtual bool fromXml(const CXmlElement &xmlElement, CXmlSerializingContext &serializingContext); + bool fromXml(const CXmlElement &xmlElement, + CXmlSerializingContext &serializingContext) override; // Conversions virtual int64_t fromUserValue(double dValue) const; virtual double toUserValue(int64_t iValue) const; // CElement - virtual std::string getKind() const; + std::string getKind() const override; protected: // Attributes diff --git a/parameter/ParameterBlock.h b/parameter/ParameterBlock.h index 0ebfdbe1c..a1d037c16 100644 --- a/parameter/ParameterBlock.h +++ b/parameter/ParameterBlock.h @@ -42,5 +42,5 @@ class CParameterBlock : public CInstanceConfigurableElement } // Type - virtual Type getType() const { return EParameterBlock; } + Type getType() const override { return EParameterBlock; } }; diff --git a/parameter/ParameterBlockType.h b/parameter/ParameterBlockType.h index 6d81ee884..3662a0f70 100644 --- a/parameter/ParameterBlockType.h +++ b/parameter/ParameterBlockType.h @@ -39,12 +39,12 @@ class CParameterBlockType : public CTypeElement CParameterBlockType(const std::string &strName); // CElement - virtual std::string getKind() const; + std::string getKind() const override; private: - virtual bool childrenAreDynamic() const; + bool childrenAreDynamic() const override; // Instantiation - virtual CInstanceConfigurableElement *doInstantiate() const; + CInstanceConfigurableElement *doInstantiate() const override; // Population - virtual void populate(CElement *pElement) const; + void populate(CElement *pElement) const override; }; diff --git a/parameter/ParameterFrameworkConfiguration.h b/parameter/ParameterFrameworkConfiguration.h index a94f7efa7..8972bebe6 100644 --- a/parameter/ParameterFrameworkConfiguration.h +++ b/parameter/ParameterFrameworkConfiguration.h @@ -46,11 +46,12 @@ class CParameterFrameworkConfiguration : public CElement uint16_t getServerPort() const; // From IXmlSink - virtual bool fromXml(const CXmlElement &xmlElement, CXmlSerializingContext &serializingContext); + bool fromXml(const CXmlElement &xmlElement, + CXmlSerializingContext &serializingContext) override; private: - virtual std::string getKind() const; - virtual bool childrenAreDynamic() const; + std::string getKind() const override; + bool childrenAreDynamic() const override; // System class name std::string _strSystemClassName; diff --git a/parameter/ParameterMgr.h b/parameter/ParameterMgr.h index 784f55fd2..bc0726dfe 100644 --- a/parameter/ParameterMgr.h +++ b/parameter/ParameterMgr.h @@ -85,7 +85,7 @@ class CParameterMgr : private CElement public: // Construction CParameterMgr(const std::string &strConfigurationFilePath, core::log::ILogger &logger); - virtual ~CParameterMgr(); + ~CParameterMgr() override; /** Load plugins, structures and settings from the config file given. * @@ -388,14 +388,14 @@ class CParameterMgr : private CElement std::string &strResult) const; // CElement - virtual std::string getKind() const; + std::string getKind() const override; private: CParameterMgr(const CParameterMgr &); CParameterMgr &operator=(const CParameterMgr &); // Init - virtual bool init(std::string &strError); + bool init(std::string &strError) override; // Version std::string getVersion() const; diff --git a/parameter/ParameterMgrLogger.h b/parameter/ParameterMgrLogger.h index aafb76a47..778a203d4 100644 --- a/parameter/ParameterMgrLogger.h +++ b/parameter/ParameterMgrLogger.h @@ -43,9 +43,9 @@ class CParameterMgrLogger : public core::log::ILogger, private utility::NonCopya public: CParameterMgrLogger(T ¶meterMgrConnector) : _parameterMgrConnector(parameterMgrConnector) {} - virtual void info(const std::string &log) { _parameterMgrConnector.info(log); } + void info(const std::string &log) override { _parameterMgrConnector.info(log); } - virtual void warning(const std::string &log) { _parameterMgrConnector.warning(log); } + void warning(const std::string &log) override { _parameterMgrConnector.warning(log); } private: // Log destination diff --git a/parameter/ParameterType.h b/parameter/ParameterType.h index 5cb32d9a5..b3a568516 100644 --- a/parameter/ParameterType.h +++ b/parameter/ParameterType.h @@ -45,7 +45,7 @@ class PARAMETER_EXPORT CParameterType : public CTypeElement { public: CParameterType(const std::string &strName); - virtual ~CParameterType() = default; + ~CParameterType() override = default; // Size size_t getSize() const; @@ -55,10 +55,11 @@ class PARAMETER_EXPORT CParameterType : public CTypeElement void setUnit(const std::string &strUnit); // From IXmlSink - virtual bool fromXml(const CXmlElement &xmlElement, CXmlSerializingContext &serializingContext); + bool fromXml(const CXmlElement &xmlElement, + CXmlSerializingContext &serializingContext) override; // From IXmlSource - virtual void toXml(CXmlElement &xmlElement, CXmlSerializingContext &serializingContext) const; + void toXml(CXmlElement &xmlElement, CXmlSerializingContext &serializingContext) const override; /// Conversions // String @@ -104,7 +105,7 @@ class PARAMETER_EXPORT CParameterType : public CTypeElement CConfigurationAccessContext &configurationAccessContext) const; // Element properties - virtual void showProperties(std::string &strResult) const; + void showProperties(std::string &strResult) const override; // Default value handling (simulation only) virtual uint32_t getDefaultValue() const; @@ -125,7 +126,7 @@ class PARAMETER_EXPORT CParameterType : public CTypeElement protected: // Object creation - virtual void populate(CElement *pElement) const; + void populate(CElement *pElement) const override; // Size void setSize(size_t size); @@ -151,7 +152,7 @@ class PARAMETER_EXPORT CParameterType : public CTypeElement void setXmlUnitAttribute(CXmlElement &xmlElement) const; // Instantiation - virtual CInstanceConfigurableElement *doInstantiate() const; + CInstanceConfigurableElement *doInstantiate() const override; // Generic Access template void doSignExtend(type &data) const; diff --git a/parameter/PluginLocation.h b/parameter/PluginLocation.h index 2a663d292..cf7d4db8b 100644 --- a/parameter/PluginLocation.h +++ b/parameter/PluginLocation.h @@ -39,7 +39,8 @@ class CPluginLocation : public CKindElement CPluginLocation(const std::string &strName, const std::string &strKind); // From IXmlSink - virtual bool fromXml(const CXmlElement &xmlElement, CXmlSerializingContext &serializingContext); + bool fromXml(const CXmlElement &xmlElement, + CXmlSerializingContext &serializingContext) override; // Folder const std::string &getFolder() const; diff --git a/parameter/SelectionCriteria.h b/parameter/SelectionCriteria.h index 22f4de1c4..daa1b952a 100644 --- a/parameter/SelectionCriteria.h +++ b/parameter/SelectionCriteria.h @@ -68,7 +68,7 @@ class CSelectionCriteria : public CElement bool bHumanReadable) const; // Base - virtual std::string getKind() const; + std::string getKind() const override; // Reset the modified status of the children void resetModifiedStatus(); diff --git a/parameter/SelectionCriteriaDefinition.h b/parameter/SelectionCriteriaDefinition.h index a8fa75ab7..1d9a64884 100644 --- a/parameter/SelectionCriteriaDefinition.h +++ b/parameter/SelectionCriteriaDefinition.h @@ -52,7 +52,7 @@ class CSelectionCriteriaDefinition : public CElement bool bHumanReadable) const; // Base - virtual std::string getKind() const; + std::string getKind() const override; // Reset the modified status of the children void resetModifiedStatus(); diff --git a/parameter/SelectionCriterion.h b/parameter/SelectionCriterion.h index 76ec0ff70..9c2dfe296 100644 --- a/parameter/SelectionCriterion.h +++ b/parameter/SelectionCriterion.h @@ -47,12 +47,12 @@ class CSelectionCriterion : public CElement, /// From ISelectionCriterionInterface // State - virtual void setCriterionState(int iState); - virtual int getCriterionState() const; + void setCriterionState(int iState) override; + int getCriterionState() const override; // Name - virtual std::string getCriterionName() const; + std::string getCriterionName() const override; // Type - virtual const ISelectionCriterionTypeInterface *getCriterionType() const; + const ISelectionCriterionTypeInterface *getCriterionType() const override; // Modified status bool hasBeenModified() const; void resetModifiedStatus(); @@ -67,7 +67,7 @@ class CSelectionCriterion : public CElement, std::string getFormattedDescription(bool bWithTypeInfo, bool bHumanReadable) const; /// From CElement - virtual std::string getKind() const; + std::string getKind() const override; /** * Export to XML @@ -76,7 +76,7 @@ class CSelectionCriterion : public CElement, * @param[in] serializingContext The serializing context * */ - virtual void toXml(CXmlElement &xmlElement, CXmlSerializingContext &serializingContext) const; + void toXml(CXmlElement &xmlElement, CXmlSerializingContext &serializingContext) const override; private: // Current state diff --git a/parameter/SelectionCriterionLibrary.h b/parameter/SelectionCriterionLibrary.h index a1522583f..0ff9ac9f4 100644 --- a/parameter/SelectionCriterionLibrary.h +++ b/parameter/SelectionCriterionLibrary.h @@ -39,5 +39,5 @@ class CSelectionCriterionLibrary : public CElement CSelectionCriterionType *createSelectionCriterionType(bool bIsInclusive); // CElement - virtual std::string getKind() const; + std::string getKind() const override; }; diff --git a/parameter/SelectionCriterionRule.h b/parameter/SelectionCriterionRule.h index c51bfa2e2..7dac34372 100644 --- a/parameter/SelectionCriterionRule.h +++ b/parameter/SelectionCriterionRule.h @@ -56,22 +56,23 @@ class CSelectionCriterionRule : public CRule public: // Parse - virtual bool parse(CRuleParser &ruleParser, std::string &strError); + bool parse(CRuleParser &ruleParser, std::string &strError) override; // Dump std::string dump() const override; // Rule check - virtual bool matches() const; + bool matches() const override; // From IXmlSink - virtual bool fromXml(const CXmlElement &xmlElement, CXmlSerializingContext &serializingContext); + bool fromXml(const CXmlElement &xmlElement, + CXmlSerializingContext &serializingContext) override; // From IXmlSource - virtual void toXml(CXmlElement &xmlElement, CXmlSerializingContext &serializingContext) const; + void toXml(CXmlElement &xmlElement, CXmlSerializingContext &serializingContext) const override; // Class kind - virtual std::string getKind() const; + std::string getKind() const override; protected: // Content dumping diff --git a/parameter/SelectionCriterionType.h b/parameter/SelectionCriterionType.h index 5c13c8f92..4b2f767b5 100644 --- a/parameter/SelectionCriterionType.h +++ b/parameter/SelectionCriterionType.h @@ -42,7 +42,7 @@ class CSelectionCriterionType : public CElement, public ISelectionCriterionTypeI CSelectionCriterionType(bool bIsInclusive); // From ISelectionCriterionTypeInterface - virtual bool addValuePair(int iValue, const std::string &strValue, std::string &strError); + bool addValuePair(int iValue, const std::string &strValue, std::string &strError) override; /** * Retrieve the numerical value from the std::string representation of the criterion type. * @@ -53,15 +53,15 @@ class CSelectionCriterionType : public CElement, public ISelectionCriterionTypeI * * @return true if integer value retrieved from the std::string one, false otherwise. */ - virtual bool getNumericalValue(const std::string &strValue, int &iValue) const; - virtual bool getLiteralValue(int iValue, std::string &strValue) const; - virtual bool isTypeInclusive() const; + bool getNumericalValue(const std::string &strValue, int &iValue) const override; + bool getLiteralValue(int iValue, std::string &strValue) const override; + bool isTypeInclusive() const override; // Value list std::string listPossibleValues() const; // Formatted state - virtual std::string getFormattedState(int iValue) const; + std::string getFormattedState(int iValue) const override; /** * Export to XML @@ -70,10 +70,10 @@ class CSelectionCriterionType : public CElement, public ISelectionCriterionTypeI * @param[in] serializingContext The serializing context * */ - virtual void toXml(CXmlElement &xmlElement, CXmlSerializingContext &serializingContext) const; + void toXml(CXmlElement &xmlElement, CXmlSerializingContext &serializingContext) const override; // From CElement - virtual std::string getKind() const; + std::string getKind() const override; private: /** diff --git a/parameter/SimulatedBackSynchronizer.h b/parameter/SimulatedBackSynchronizer.h index f561b89f2..e8e15f53b 100644 --- a/parameter/SimulatedBackSynchronizer.h +++ b/parameter/SimulatedBackSynchronizer.h @@ -43,7 +43,7 @@ class CSimulatedBackSynchronizer : public CBackSynchronizer CParameterBlackboard *pParameterBlackboard); // Back synchronization - virtual void sync(); + void sync() override; private: // Fake error for parameter context creation diff --git a/parameter/StringParameter.h b/parameter/StringParameter.h index 6adede984..a7bba8e60 100644 --- a/parameter/StringParameter.h +++ b/parameter/StringParameter.h @@ -39,20 +39,20 @@ class CStringParameter : public CBaseParameter CStringParameter(const std::string &strName, const CTypeElement *pTypeElement); // Instantiation, allocation - virtual size_t getFootPrint() const; + size_t getFootPrint() const override; // Type - virtual Type getType() const; + Type getType() const override; protected: // Used for simulation and virtual subsystems - virtual void setDefaultValues(CParameterAccessContext ¶meterAccessContext) const; + void setDefaultValues(CParameterAccessContext ¶meterAccessContext) const override; // Actual value access (tuning) - virtual bool doSetValue(const std::string &strValue, size_t offset, - CParameterAccessContext ¶meterAccessContext) const; - virtual void doGetValue(std::string &strValue, size_t offset, - CParameterAccessContext ¶meterAccessContext) const; + bool doSetValue(const std::string &strValue, size_t offset, + CParameterAccessContext ¶meterAccessContext) const override; + void doGetValue(std::string &strValue, size_t offset, + CParameterAccessContext ¶meterAccessContext) const override; // Size size_t getSize() const; diff --git a/parameter/StringParameterType.h b/parameter/StringParameterType.h index 9d8786fc8..9e00ec561 100644 --- a/parameter/StringParameterType.h +++ b/parameter/StringParameterType.h @@ -44,20 +44,21 @@ class CStringParameterType : public CTypeElement size_t getMaxLength() const; // From IXmlSink - virtual bool fromXml(const CXmlElement &xmlElement, CXmlSerializingContext &serializingContext); + bool fromXml(const CXmlElement &xmlElement, + CXmlSerializingContext &serializingContext) override; // From IXmlSource - virtual void toXml(CXmlElement &xmlElement, CXmlSerializingContext &serializingContext) const; + void toXml(CXmlElement &xmlElement, CXmlSerializingContext &serializingContext) const override; // Element properties - virtual void showProperties(std::string &strResult) const; + void showProperties(std::string &strResult) const override; // CElement - virtual std::string getKind() const; + std::string getKind() const override; private: // Instantiation - virtual CInstanceConfigurableElement *doInstantiate() const; + CInstanceConfigurableElement *doInstantiate() const override; // Max length in bytes size_t _maxLength{0}; diff --git a/parameter/Subsystem.h b/parameter/Subsystem.h index af7e1fb87..fa18ce759 100644 --- a/parameter/Subsystem.h +++ b/parameter/Subsystem.h @@ -61,10 +61,10 @@ class PARAMETER_EXPORT CSubsystem : public CConfigurableElement, private IMapper * @param[in] logger the main logger of the application */ CSubsystem(const std::string &strName, core::log::Logger &logger); - virtual ~CSubsystem(); + ~CSubsystem() override; - virtual bool structureFromXml(const CXmlElement &xmlElement, - CXmlSerializingContext &serializingContext); + bool structureFromXml(const CXmlElement &xmlElement, + CXmlSerializingContext &serializingContext) override; // Susbsystem sanity virtual bool isAlive() const; @@ -73,9 +73,9 @@ class PARAMETER_EXPORT CSubsystem : public CConfigurableElement, private IMapper virtual bool needResync(bool bClear); // from CElement - virtual std::string getKind() const; + std::string getKind() const override; - virtual bool getMappingData(const std::string &strKey, const std::string *&pStrValue) const; + bool getMappingData(const std::string &strKey, const std::string *&pStrValue) const override; std::string getFormattedMapping() const override; /** @@ -98,7 +98,7 @@ class PARAMETER_EXPORT CSubsystem : public CConfigurableElement, private IMapper protected: // Used for simulation and virtual subsystems - virtual void setDefaultValues(CParameterAccessContext ¶meterAccessContext) const; + void setDefaultValues(CParameterAccessContext ¶meterAccessContext) const override; /// Functionality intendedn for derived Subsystems // Subsystem context mapping keys publication @@ -111,7 +111,7 @@ class PARAMETER_EXPORT CSubsystem : public CConfigurableElement, private IMapper CSubsystem &operator=(const CSubsystem &); // Belonging subsystem - virtual const CSubsystem *getBelongingSubsystem() const; + const CSubsystem *getBelongingSubsystem() const override; // Mapping execution bool mapSubsystemElements(std::string &strError); @@ -130,9 +130,9 @@ class PARAMETER_EXPORT CSubsystem : public CConfigurableElement, private IMapper * * @return true on success, false on failure */ - virtual bool mapBegin(CInstanceConfigurableElement *pInstanceConfigurableElement, - bool &bKeepDiving, std::string &strError); - virtual void mapEnd(); + bool mapBegin(CInstanceConfigurableElement *pInstanceConfigurableElement, bool &bKeepDiving, + std::string &strError) override; + void mapEnd() override; // Mapping access /** diff --git a/parameter/SubsystemElementBuilder.h b/parameter/SubsystemElementBuilder.h index 4dfe78fec..2a6e0a631 100644 --- a/parameter/SubsystemElementBuilder.h +++ b/parameter/SubsystemElementBuilder.h @@ -38,7 +38,7 @@ class CSubsystemElementBuilder : public CElementBuilder public: CSubsystemElementBuilder(const CSubsystemLibrary *pSubsystemLibrary); - virtual CElement *createElement(const CXmlElement &xmlElement) const; + CElement *createElement(const CXmlElement &xmlElement) const override; private: const CSubsystemLibrary *_pSubsystemLibrary; diff --git a/parameter/SubsystemLibrary.h b/parameter/SubsystemLibrary.h index f3082e26f..fa73da82e 100644 --- a/parameter/SubsystemLibrary.h +++ b/parameter/SubsystemLibrary.h @@ -48,7 +48,7 @@ class CSubsystemLibrary { private: // Builder type (based on element's name attribute) - virtual std::string getBuilderType(const CXmlElement &xmlElement) const + std::string getBuilderType(const CXmlElement &xmlElement) const override { // Xml element's name attribute std::string type; diff --git a/parameter/SubsystemObject.h b/parameter/SubsystemObject.h index 24005738f..11d829918 100644 --- a/parameter/SubsystemObject.h +++ b/parameter/SubsystemObject.h @@ -46,7 +46,7 @@ class PARAMETER_EXPORT CSubsystemObject : private ISyncer public: CSubsystemObject(CInstanceConfigurableElement *pInstanceConfigurableElement, core::log::Logger &logger); - virtual ~CSubsystemObject(); + ~CSubsystemObject() override; /** * Return the mapping value of the SubystemObject. @@ -100,8 +100,7 @@ class PARAMETER_EXPORT CSubsystemObject : private ISyncer /** This method is not supposed to be overridden by plugins * as if not called, plugins will not work (sets _blackboard). */ - bool sync(CParameterBlackboard ¶meterBlackboard, bool bBack, - std::string &strError) override final; + bool sync(CParameterBlackboard ¶meterBlackboard, bool bBack, std::string &strError) final; // Default back synchronization void setDefaultValues(CParameterBlackboard ¶meterBlackboard) const; diff --git a/parameter/SubsystemPlugins.h b/parameter/SubsystemPlugins.h index c5eb1c67e..5123c281c 100644 --- a/parameter/SubsystemPlugins.h +++ b/parameter/SubsystemPlugins.h @@ -42,5 +42,5 @@ class CSubsystemPlugins : public CKindElement } private: - virtual bool childrenAreDynamic() const { return true; } + bool childrenAreDynamic() const override { return true; } }; diff --git a/parameter/SystemClass.h b/parameter/SystemClass.h index 43a581b68..bb9a8aa4d 100644 --- a/parameter/SystemClass.h +++ b/parameter/SystemClass.h @@ -48,7 +48,7 @@ class CSystemClass final : public CConfigurableElement * it need to be given to the subsystem library */ CSystemClass(core::log::Logger &logger); - virtual ~CSystemClass(); + ~CSystemClass() override; /** Load subsystem plugin and fill the corresponding libraries. * @@ -81,7 +81,7 @@ class CSystemClass final : public CConfigurableElement void cleanSubsystemsNeedToResync(); // base - virtual std::string getKind() const; + std::string getKind() const override; bool getMappingData(const std::string &strKey, const std::string *&pStrValue) const override; std::string getFormattedMapping() const override; @@ -90,7 +90,7 @@ class CSystemClass final : public CConfigurableElement CSystemClass(const CSystemClass &); CSystemClass &operator=(const CSystemClass &); // base - virtual bool childrenAreDynamic() const; + bool childrenAreDynamic() const override; /** Load shared libraries subsystem plugins. * diff --git a/parameter/TypeElement.h b/parameter/TypeElement.h index 9d8f46f39..e73987cc3 100644 --- a/parameter/TypeElement.h +++ b/parameter/TypeElement.h @@ -41,7 +41,7 @@ class PARAMETER_EXPORT CTypeElement : public CElement { public: CTypeElement(const std::string &strName = ""); - virtual ~CTypeElement(); + ~CTypeElement() override; // Instantiation CInstanceConfigurableElement *instantiate() const; @@ -58,13 +58,14 @@ class PARAMETER_EXPORT CTypeElement : public CElement virtual std::string getFormattedMapping() const; // Element properties - virtual void showProperties(std::string &strResult) const; + void showProperties(std::string &strResult) const override; // From IXmlSink - virtual bool fromXml(const CXmlElement &xmlElement, CXmlSerializingContext &serializingContext); + bool fromXml(const CXmlElement &xmlElement, + CXmlSerializingContext &serializingContext) override; // From IXmlSource - virtual void toXml(CXmlElement &xmlElement, CXmlSerializingContext &serializingContext) const; + void toXml(CXmlElement &xmlElement, CXmlSerializingContext &serializingContext) const override; // Scalar or Array? bool isScalar() const; diff --git a/parameter/VirtualSubsystem.h b/parameter/VirtualSubsystem.h index 859036148..1b3f63f6f 100644 --- a/parameter/VirtualSubsystem.h +++ b/parameter/VirtualSubsystem.h @@ -43,11 +43,11 @@ class CVirtualSubsystem final : public CSubsystem * @param[in] logger the main logger of the application */ CVirtualSubsystem(const std::string &strName, core::log::Logger &logger); - virtual ~CVirtualSubsystem(); + ~CVirtualSubsystem() override; protected: // Syncer - virtual ISyncer *getSyncer() const; + ISyncer *getSyncer() const override; /** * Fill Syncer Set From descendant nodes @@ -59,9 +59,9 @@ class CVirtualSubsystem final : public CSubsystem private: // From IMapper - virtual bool mapBegin(CInstanceConfigurableElement *pInstanceConfigurableElement, - bool &bKeepDiving, std::string &strError); - virtual void mapEnd(); + bool mapBegin(CInstanceConfigurableElement *pInstanceConfigurableElement, bool &bKeepDiving, + std::string &strError) override; + void mapEnd() override; // Subsystem level dummy syncer CVirtualSyncer *_pVirtualSyncer; diff --git a/parameter/VirtualSyncer.h b/parameter/VirtualSyncer.h index 3942678ee..1139f0cdf 100644 --- a/parameter/VirtualSyncer.h +++ b/parameter/VirtualSyncer.h @@ -39,7 +39,8 @@ class CVirtualSyncer : public ISyncer CVirtualSyncer(const CConfigurableElement *pConfigurableElement); // from ISyncer - virtual bool sync(CParameterBlackboard ¶meterBlackboard, bool bBack, std::string &strError); + bool sync(CParameterBlackboard ¶meterBlackboard, bool bBack, + std::string &strError) override; private: const CConfigurableElement *_pConfigurableElement; diff --git a/parameter/XmlFileIncluderElement.h b/parameter/XmlFileIncluderElement.h index 144e078bf..ab864e65a 100644 --- a/parameter/XmlFileIncluderElement.h +++ b/parameter/XmlFileIncluderElement.h @@ -40,7 +40,8 @@ class CXmlFileIncluderElement : public CKindElement CXmlFileIncluderElement(const std::string &strName, const std::string &strKind, bool bValidateWithSchemas, const std::string &schemaBaseUri); // From IXmlSink - virtual bool fromXml(const CXmlElement &xmlElement, CXmlSerializingContext &serializingContext); + bool fromXml(const CXmlElement &xmlElement, + CXmlSerializingContext &serializingContext) override; private: // Element type diff --git a/remote-processor/AnswerMessage.h b/remote-processor/AnswerMessage.h index 8275d5d58..2bc51477c 100644 --- a/remote-processor/AnswerMessage.h +++ b/remote-processor/AnswerMessage.h @@ -47,13 +47,13 @@ class REMOTE_PROCESSOR_EXPORT CAnswerMessage : public CMessage private: // Fill data to send - virtual void fillDataToSend(); + void fillDataToSend() override; // Collect received data - virtual void collectReceivedData(); + void collectReceivedData() override; /** @return size of the answer message in bytes */ - virtual size_t getDataSize() const; + size_t getDataSize() const override; // Answer void setAnswer(const std::string &strAnswer); diff --git a/remote-processor/BackgroundRemoteProcessorServer.h b/remote-processor/BackgroundRemoteProcessorServer.h index 1c17fca82..221c08b5c 100644 --- a/remote-processor/BackgroundRemoteProcessorServer.h +++ b/remote-processor/BackgroundRemoteProcessorServer.h @@ -43,7 +43,7 @@ class REMOTE_PROCESSOR_EXPORT BackgroundRemoteProcessorServer final BackgroundRemoteProcessorServer(uint16_t uiPort, std::unique_ptr &&commandHandler); - ~BackgroundRemoteProcessorServer(); + ~BackgroundRemoteProcessorServer() override; bool start(std::string &error) override; diff --git a/remote-processor/RemoteCommandHandlerTemplate.h b/remote-processor/RemoteCommandHandlerTemplate.h index db59a5b3f..1a9a2fad6 100644 --- a/remote-processor/RemoteCommandHandlerTemplate.h +++ b/remote-processor/RemoteCommandHandlerTemplate.h @@ -118,7 +118,7 @@ class TRemoteCommandHandlerTemplate : public IRemoteCommandHandler // Help Command addCommandParser("help", NULL, 0, "", "Show commands description and usage"); } - ~TRemoteCommandHandlerTemplate() + ~TRemoteCommandHandlerTemplate() override { // FIXME use unique_ptr for (auto *parser : _remoteCommandParserVector) { @@ -147,7 +147,7 @@ class TRemoteCommandHandlerTemplate : public IRemoteCommandHandler private: // Command processing - bool remoteCommandProcess(const IRemoteCommand &remoteCommand, std::string &strResult) + bool remoteCommandProcess(const IRemoteCommand &remoteCommand, std::string &strResult) override { // Dispatch const CRemoteCommandParserItem *pRemoteCommandParserItem = diff --git a/remote-processor/RequestMessage.h b/remote-processor/RequestMessage.h index 7c78db655..6c9dfcba3 100644 --- a/remote-processor/RequestMessage.h +++ b/remote-processor/RequestMessage.h @@ -44,14 +44,14 @@ class REMOTE_PROCESSOR_EXPORT CRequestMessage : public CMessage, public IRemoteC // Command Name void setCommand(const std::string &strCommand); - virtual const std::string &getCommand() const; + const std::string &getCommand() const override; // Arguments - virtual void addArgument(const std::string &strArgument); - virtual size_t getArgumentCount() const; - virtual const std::string &getArgument(size_t argument) const; - virtual const std::vector &getArguments() const; - virtual const std::string packArguments(size_t startArgument, size_t nbArguments) const; + void addArgument(const std::string &strArgument) override; + size_t getArgumentCount() const override; + const std::string &getArgument(size_t argument) const override; + const std::vector &getArguments() const override; + const std::string packArguments(size_t startArgument, size_t nbArguments) const override; private: /** @@ -62,14 +62,14 @@ class REMOTE_PROCESSOR_EXPORT CRequestMessage : public CMessage, public IRemoteC static const char *const gacDelimiters; // Fill data to send - virtual void fillDataToSend(); + void fillDataToSend() override; // Collect received data - virtual void collectReceivedData(); + void collectReceivedData() override; // Size /** * @return size of the request message in bytes */ - virtual size_t getDataSize() const; + size_t getDataSize() const override; // Trim input std::string static std::string trim(const std::string &strToTrim); diff --git a/xmlserializer/XmlMemoryDocSink.h b/xmlserializer/XmlMemoryDocSink.h index b91c2aa95..5562878f0 100644 --- a/xmlserializer/XmlMemoryDocSink.h +++ b/xmlserializer/XmlMemoryDocSink.h @@ -57,7 +57,8 @@ class CXmlMemoryDocSink : public CXmlDocSink * * @return false if any error occurs */ - virtual bool doProcess(CXmlDocSource &xmlDocSource, CXmlSerializingContext &serializingContext); + bool doProcess(CXmlDocSource &xmlDocSource, + CXmlSerializingContext &serializingContext) override; // Xml Sink IXmlSink *_pXmlSink; diff --git a/xmlserializer/XmlMemoryDocSource.h b/xmlserializer/XmlMemoryDocSource.h index c8a0d5554..be92ca2fc 100644 --- a/xmlserializer/XmlMemoryDocSource.h +++ b/xmlserializer/XmlMemoryDocSource.h @@ -61,7 +61,7 @@ class CXmlMemoryDocSource : public CXmlDocSource * * @return false if any error occurs */ - virtual bool populate(CXmlSerializingContext &serializingContext); + bool populate(CXmlSerializingContext &serializingContext) override; private: /** diff --git a/xmlserializer/XmlStreamDocSink.h b/xmlserializer/XmlStreamDocSink.h index 368505da7..32e1e81f4 100644 --- a/xmlserializer/XmlStreamDocSink.h +++ b/xmlserializer/XmlStreamDocSink.h @@ -55,7 +55,8 @@ class CXmlStreamDocSink : public CXmlDocSink * * @return false if any error occurs */ - virtual bool doProcess(CXmlDocSource &xmlDocSource, CXmlSerializingContext &serializingContext); + bool doProcess(CXmlDocSource &xmlDocSource, + CXmlSerializingContext &serializingContext) override; /** * Result ostream containing the XML informations From 8e7dc9351a832061c0174b24e7d29f31226469df Mon Sep 17 00:00:00 2001 From: David Wagner Date: Wed, 24 Feb 2016 11:00:39 +0100 Subject: [PATCH 2/2] Travis: preliminary OSX builds support Travis has OSX builders in addition to Linux builders. This commit enables some build steps on OSX builders. OSX has some differences with Linux, one important difference being how packages are installed. Current limitations that will be lifter later: - no tests (because some test code does not compile) - no client-simulator (because of issues in detecting the Python libraries) Signed-off-by: David Wagner --- .travis.yml | 66 +++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 51 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index cf2dc1f37..5d4060ba3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,16 +1,32 @@ +os: + - linux + - osx # Use travis docker infrastructure sudo: false +# Use a recent OSX image +# cf. +# https://docs.travis-ci.com/user/languages/objective-c/#Supported-OS-X-iOS-SDK-versions +osx_image: xcode7.2 language: cpp cache: ccache env: global: - PREFIX=$HOME/prefix + - MY_CMAKE_OPTIONS="-DCMAKE_PREFIX_PATH=$PREFIX -DCMAKE_INSTALL_PREFIX=$HOME/install" + - CTEST_OUTPUT_ON_FAILURE=1 + - LINUX=false + - OSX=false compiler: - gcc - clang +matrix: + exclude: + - os: osx + compiler: gcc + # Install a recent gcc and gcov, # it will not be necessary once travis worker is based on ubuntu > 12.04. # Install SWIG for bindings generation @@ -36,6 +52,12 @@ addons: - python3-dev - clang-format-3.8 +before_install: + # OS detection + # TODO: an explicit build matrix may be better but it has limitation, e.g. + # each matrix entry may only define a single env variable. + - if [ $TRAVIS_OS_NAME = linux ]; then export LINUX=true; fi + - if [ $TRAVIS_OS_NAME = osx ]; then export OSX=true; fi install: - wget https://codecov.io/bash -O $HOME/codecov; chmod +x $HOME/codecov # This version of catch is known to work. @@ -43,6 +65,19 @@ install: https://raw.github.com/philsquared/Catch/v1.2.1/single_include/catch.hpp - wget 'https://01.org/sites/default/files/asio-1.10.6.tar.gz' - tar xf asio-1.10.6.tar.gz -C $PREFIX --strip-components=1 + # Current limitations on OSX builds: no testing, no client-simulator + # (because we haven't found a straightforward way to have CMake find the + # python libraries (find_package(PythonLibs)). + - if $OSX; then + brew update; + for package in cmake; do + if brew list $package; then + brew outdated $package || brew upgrade $package; + else + brew install $package; + fi; + done; + fi before_script: - coverage=OFF @@ -54,41 +89,42 @@ before_script: coverage=ON; export CCACHE_CPP2=1; fi + - if $OSX; then export MY_CMAKE_OPTIONS+=" -DBUILD_TESTING=OFF -DPYTHON_BINDINGS=OFF"; fi # how to build script: # Check coding style - - git ls-files | grep -E '\.[ch](pp)?$' | xargs clang-format-3.8 -i && - git diff --exit-code || { git reset --hard; false; } + - if $LINUX; then (git ls-files | grep -E '\.[ch](pp)?$' | xargs clang-format-3.8 -i && + git diff --exit-code || { git reset --hard; false; }); fi - ( mkdir build_debug && cd build_debug && - cmake -DCMAKE_PREFIX_PATH=$PREFIX -DCMAKE_BUILD_TYPE=Debug -DCOVERAGE=${coverage} .. && + cmake $MY_CMAKE_OPTIONS -DCMAKE_BUILD_TYPE=Debug -DCOVERAGE=${coverage} .. && make -j$(nproc) && - CTEST_OUTPUT_ON_FAILURE=1 make ExperimentalTest ExperimentalMemCheck ) + (if $LINUX; then make ExperimentalTest ExperimentalMemCheck; fi) ) - ( mkdir build && cd build && - cmake -DCMAKE_PREFIX_PATH=$PREFIX -DCMAKE_INSTALL_PREFIX=../install -DCMAKE_BUILD_TYPE=Release .. && + cmake $MY_CMAKE_OPTIONS -DCMAKE_BUILD_TYPE=Release .. && make -j$(nproc) && - CTEST_OUTPUT_ON_FAILURE=1 make test && + (if $LINUX; then make test; fi) && make install && - cpack --verbose -G DEB && dpkg --info *.deb) + (if $LINUX; then cpack --verbose -G DEB && dpkg --info *.deb; fi) ) - ( cd skeleton-subsystem && - cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../install . && + cmake $MY_CMAKE_OPTIONS -DCMAKE_BUILD_TYPE=Release . && make -j$(nproc) && - CTEST_OUTPUT_ON_FAILURE=1 make ExperimentalTest ExperimentalMemCheck && + (if $LINUX; then make ExperimentalTest ExperimentalMemCheck; fi) && make install ) - - ( cd tools/clientSimulator && - echo "TODO - install the generated .deb instead of using ../install." + - if $LINUX; then ( cd tools/clientSimulator && + echo "TODO - install the generated .deb instead of using \$HOME/install." "This would permit to test the packaging" && - cmake -DCMAKE_INSTALL_PREFIX=../install . && + cmake $MY_CMAKE_OPTIONS . && make && - make install ) + make install ); fi # Keep this last - ( mkdir build_less_features && cd build_less_features && rm -rf $PREFIX/asio-1.10.6 && - cmake -DCMAKE_PREFIX_PATH=$PREFIX -DCMAKE_BUILD_TYPE=Debug + cmake $MY_CMAKE_OPTIONS -DCMAKE_BUILD_TYPE=Debug -DNETWORKING=OFF -DPYTHON_BINDINGS=OFF -DC_BINDINGS=OFF .. && make -j$(nproc) && - CTEST_OUTPUT_ON_FAILURE=1 make test ) + (if $LINUX; then make test; fi) ) after_success: # Push coverage info on codecov.io.