25 files changed, 71 insertions, 457 deletions
diff --git a/parameter/Android.mk b/parameter/Android.mk
index 145bb0c..778fed9 100644
--- a/parameter/Android.mk
+++ b/parameter/Android.mk
@@ -44,7 +44,6 @@ common_src_files := \
         PathNavigator.cpp \
         Element.cpp \
         SystemClass.cpp \
-        Component.cpp \
         ParameterMgr.cpp \
         SelectionCriteria.cpp \
         SelectionCriterionLibrary.cpp \
@@ -52,10 +51,8 @@ common_src_files := \
         SelectionCriterionType.cpp \
         ElementLibrary.cpp \
         SubsystemElementBuilder.cpp \
-        SubsystemLibrary.cpp \
         SelectionCriterion.cpp \
         ComponentLibrary.cpp \
-        ParameterBlock.cpp \
         ConfigurableElement.cpp \
         MappingData.cpp \
         ParameterBlackboard.cpp \
@@ -75,11 +72,8 @@ common_src_files := \
         ParameterAccessContext.cpp \
         XmlFileIncluderElement.cpp \
         ParameterFrameworkConfiguration.cpp \
-        FrameworkConfigurationGroup.cpp \
-        SubsystemPlugins.cpp \
         FrameworkConfigurationLocation.cpp \
         PluginLocation.cpp \
-        KindElement.cpp \
         ElementLibrarySet.cpp \
         ErrorContext.cpp \
         AreaConfiguration.cpp \
@@ -101,11 +95,9 @@ common_src_files := \
         ElementLocator.cpp \
         ParameterMgrLogger.cpp \
         AutoLog.cpp \
-        Rule.cpp \
         CompoundRule.cpp \
         SelectionCriterionRule.cpp \
         ConfigurableElementAggregator.cpp \
-        BackSynchronizer.cpp \
         HardwareBackSynchronizer.cpp \
         SimulatedBackSynchronizer.cpp \
         MappingContext.cpp \
@@ -113,7 +105,6 @@ common_src_files := \
         FormattedSubsystemObject.cpp \
         SubsystemObjectCreator.cpp \
         BaseParameter.cpp \
-        AutoLock.cpp \
         StringParameterType.cpp \
         StringParameter.cpp \
         EnumParameterType.cpp \
diff --git a/parameter/AutoLock.cpp b/parameter/AutoLock.cpp
deleted file mode 100644
index 7c7bae4..0000000
--- a/parameter/AutoLock.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2011-2014, Intel Corporation
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation and/or
- * other materials provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its contributors
- * may be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-#include "AutoLock.h"
-
-CAutoLock::CAutoLock(pthread_mutex_t* pMutex) : _pMutex(pMutex)
-{
-    pthread_mutex_lock(_pMutex);
-}
-
-CAutoLock::~CAutoLock()
-{
-    pthread_mutex_unlock(_pMutex);
-}
diff --git a/parameter/AutoLock.h b/parameter/AutoLock.h
index d3a0625..ab24a94 100644
--- a/parameter/AutoLock.h
+++ b/parameter/AutoLock.h
@@ -34,8 +34,15 @@
 class CAutoLock
 {
 public:
-    CAutoLock(pthread_mutex_t* pMutex);
-    ~CAutoLock();
+    CAutoLock(pthread_mutex_t* pMutex) : _pMutex(pMutex)
+    {
+         pthread_mutex_lock(_pMutex);
+    }
+
+    ~CAutoLock()
+    {
+        pthread_mutex_unlock(_pMutex);
+    }
 
 private:
     pthread_mutex_t* _pMutex;
diff --git a/parameter/BackSynchronizer.cpp b/parameter/BackSynchronizer.cpp
deleted file mode 100644
index 3daeb2d..0000000
--- a/parameter/BackSynchronizer.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2011-2014, Intel Corporation
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation and/or
- * other materials provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its contributors
- * may be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-#include "BackSynchronizer.h"
-#include "ConfigurableElement.h"
-
-CBackSynchronizer::CBackSynchronizer(const CConfigurableElement* pConfigurableElement)
-    : _configurableElementAggregator(_needingBackSyncList, &CConfigurableElement::hasNoValidDomainAssociated)
-{
-    // Aggegate elements
-    _configurableElementAggregator.aggegate(pConfigurableElement);
-}
diff --git a/parameter/BackSynchronizer.h b/parameter/BackSynchronizer.h
index a2cabea..9e5ad9e 100644
--- a/parameter/BackSynchronizer.h
+++ b/parameter/BackSynchronizer.h
@@ -30,6 +30,7 @@
 #pragma once
 
 #include "ConfigurableElementAggregator.h"
+#include "ConfigurableElement.h"
 #include <string>
 
 using namespace std;
@@ -39,7 +40,12 @@ class CParameterBlackboard;
 class CBackSynchronizer
 {
 public:
-    CBackSynchronizer(const CConfigurableElement* pConfigurableElement);
+    CBackSynchronizer(const CConfigurableElement* pConfigurableElement)
+        : _configurableElementAggregator(_needingBackSyncList, &CConfigurableElement::hasNoValidDomainAssociated)
+    {
+        // Aggegate elements
+        _configurableElementAggregator.aggegate(pConfigurableElement);
+    }
 
     // Back synchronization
     virtual void sync() = 0;
diff --git a/parameter/CMakeLists.txt b/parameter/CMakeLists.txt
index ff04c1d..f98848f 100644
--- a/parameter/CMakeLists.txt
+++ b/parameter/CMakeLists.txt
@@ -31,7 +31,6 @@ add_library(parameter SHARED
     PathNavigator.cpp
     Element.cpp
     SystemClass.cpp
-    Component.cpp
     ParameterMgr.cpp
     SelectionCriteria.cpp
     SelectionCriterionLibrary.cpp
@@ -39,10 +38,8 @@ add_library(parameter SHARED
     SelectionCriterionType.cpp
     ElementLibrary.cpp
     SubsystemElementBuilder.cpp
-    SubsystemLibrary.cpp
     SelectionCriterion.cpp
     ComponentLibrary.cpp
-    ParameterBlock.cpp
     ConfigurableElement.cpp
     MappingData.cpp
     ParameterBlackboard.cpp
@@ -62,11 +59,8 @@ add_library(parameter SHARED
     ParameterAccessContext.cpp
     XmlFileIncluderElement.cpp
     ParameterFrameworkConfiguration.cpp
-    FrameworkConfigurationGroup.cpp
-    SubsystemPlugins.cpp
     FrameworkConfigurationLocation.cpp
     PluginLocation.cpp
-    KindElement.cpp
     ElementLibrarySet.cpp
     ErrorContext.cpp
     AreaConfiguration.cpp
@@ -88,11 +82,9 @@ add_library(parameter SHARED
     ElementLocator.cpp
     ParameterMgrLogger.cpp
     AutoLog.cpp
-    Rule.cpp
     CompoundRule.cpp
     SelectionCriterionRule.cpp
     ConfigurableElementAggregator.cpp
-    BackSynchronizer.cpp
     HardwareBackSynchronizer.cpp
     SimulatedBackSynchronizer.cpp
     MappingContext.cpp
@@ -100,7 +92,6 @@ add_library(parameter SHARED
     FormattedSubsystemObject.cpp
     SubsystemObjectCreator.cpp
     BaseParameter.cpp
-    AutoLock.cpp
     StringParameterType.cpp
     StringParameter.cpp
     EnumParameterType.cpp
@@ -115,7 +106,6 @@ add_library(parameter SHARED
     PathNavigator.cpp
     Element.cpp
     SystemClass.cpp
-    Component.cpp
     ParameterMgr.cpp
     SelectionCriteria.cpp
     SelectionCriterionLibrary.cpp
@@ -123,10 +113,8 @@ add_library(parameter SHARED
     SelectionCriterionType.cpp
     ElementLibrary.cpp
     SubsystemElementBuilder.cpp
-    SubsystemLibrary.cpp
     SelectionCriterion.cpp
     ComponentLibrary.cpp
-    ParameterBlock.cpp
     ConfigurableElement.cpp
     MappingData.cpp
     ParameterBlackboard.cpp
@@ -146,11 +134,8 @@ add_library(parameter SHARED
     ParameterAccessContext.cpp
     XmlFileIncluderElement.cpp
     ParameterFrameworkConfiguration.cpp
-    FrameworkConfigurationGroup.cpp
-    SubsystemPlugins.cpp
     FrameworkConfigurationLocation.cpp
     PluginLocation.cpp
-    KindElement.cpp
     ElementLibrarySet.cpp
     ErrorContext.cpp
     AreaConfiguration.cpp
@@ -172,11 +157,9 @@ add_library(parameter SHARED
     ElementLocator.cpp
     ParameterMgrLogger.cpp
     AutoLog.cpp
-    Rule.cpp
     CompoundRule.cpp
     SelectionCriterionRule.cpp
     ConfigurableElementAggregator.cpp
-    BackSynchronizer.cpp
     HardwareBackSynchronizer.cpp
     SimulatedBackSynchronizer.cpp
     MappingContext.cpp
@@ -184,7 +167,6 @@ add_library(parameter SHARED
     FormattedSubsystemObject.cpp
     SubsystemObjectCreator.cpp
     BaseParameter.cpp
-    AutoLock.cpp
     StringParameterType.cpp
     StringParameter.cpp
     EnumParameterType.cpp
diff --git a/parameter/Component.cpp b/parameter/Component.cpp
deleted file mode 100644
index f7e51d9..0000000
--- a/parameter/Component.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2011-2014, Intel Corporation
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation and/or
- * other materials provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its contributors
- * may be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-#include "Component.h"
-#include "ComponentLibrary.h"
-#include "Mapper.h"
-
-#define base CInstanceConfigurableElement
-
-CComponent::CComponent(const string& strName, const CTypeElement* pTypeElement) : base(strName, pTypeElement)
-{
-}
-
-CInstanceConfigurableElement::Type CComponent::getType() const
-{
-    return EComponent;
-}
diff --git a/parameter/Component.h b/parameter/Component.h
index 850b7a6..2950912 100644
--- a/parameter/Component.h
+++ b/parameter/Component.h
@@ -34,10 +34,14 @@
 class CComponent : public CInstanceConfigurableElement
 {
 public:
-    CComponent(const string& strName, const CTypeElement* pTypeElement);
+    CComponent(const string& strName, const CTypeElement* pTypeElement) : CInstanceConfigurableElement(strName, pTypeElement)
+    {
+    }
 
     // Type
-    virtual Type getType() const;
-private:
+    virtual Type getType() const
+    {
+        return EComponent;
+    }
 };
 
diff --git a/parameter/FrameworkConfigurationGroup.cpp b/parameter/FrameworkConfigurationGroup.cpp
deleted file mode 100644
index 8bac191..0000000
--- a/parameter/FrameworkConfigurationGroup.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2011-2014, Intel Corporation
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation and/or
- * other materials provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its contributors
- * may be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-#include "FrameworkConfigurationGroup.h"
-
-#define base CKindElement
-
-CFrameworkConfigurationGroup::CFrameworkConfigurationGroup(const string& strName, const string& strKind) : base(strName, strKind)
-{
-}
-
-bool CFrameworkConfigurationGroup::childrenAreDynamic() const
-{
-    return true;
-}
-
diff --git a/parameter/FrameworkConfigurationGroup.h b/parameter/FrameworkConfigurationGroup.h
index 76a38f2..fe47dbf 100644
--- a/parameter/FrameworkConfigurationGroup.h
+++ b/parameter/FrameworkConfigurationGroup.h
@@ -34,8 +34,15 @@
 class CFrameworkConfigurationGroup : public CKindElement
 {
 public:
-    CFrameworkConfigurationGroup(const string& strName, const string& strKind);
+    CFrameworkConfigurationGroup(const string& strName, const string& strKind) : CKindElement(strName, strKind)
+    {
+    }
 
 private:
-    virtual bool childrenAreDynamic() const;
+    virtual bool childrenAreDynamic() const
+    {
+        return true;
+    }
+
+
 };
diff --git a/parameter/KindElement.cpp b/parameter/KindElement.cpp
deleted file mode 100644
index 2a59d8d..0000000
--- a/parameter/KindElement.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2011-2014, Intel Corporation
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation and/or
- * other materials provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its contributors
- * may be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-#include "KindElement.h"
-
-#define base CElement
-
-CKindElement::CKindElement(const string& strName, const string& strKind) : base(strName), _strKind(strKind)
-{
-}
-
-string CKindElement::getKind() const
-{
-    return _strKind;
-}
diff --git a/parameter/KindElement.h b/parameter/KindElement.h
index 656e133..fa8eaaa 100644
--- a/parameter/KindElement.h
+++ b/parameter/KindElement.h
@@ -34,9 +34,14 @@
 class CKindElement : public CElement
 {
 public:
-    CKindElement(const string& strName, const string& strKind);
+    CKindElement(const string& strName, const string& strKind) : CElement(strName), _strKind(strKind)
+    {
+    }
 
-    virtual string getKind() const;
+    virtual string getKind() const
+    {
+        return _strKind;
+    }
 private:
 
     string _strKind;
diff --git a/parameter/ParameterBlock.cpp b/parameter/ParameterBlock.cpp
deleted file mode 100644
index 4ac2594..0000000
--- a/parameter/ParameterBlock.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2011-2014, Intel Corporation
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation and/or
- * other materials provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its contributors
- * may be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-#include "ParameterBlock.h"
-
-#define base CInstanceConfigurableElement
-
-CParameterBlock::CParameterBlock(const string& strName, const CTypeElement* pTypeElement) : base(strName, pTypeElement)
-{
-}
-
-CInstanceConfigurableElement::Type CParameterBlock::getType() const
-{
-    return EParameterBlock;
-}
diff --git a/parameter/ParameterBlock.h b/parameter/ParameterBlock.h
index 580b0b4..d65b75c 100644
--- a/parameter/ParameterBlock.h
+++ b/parameter/ParameterBlock.h
@@ -34,9 +34,15 @@
 class CParameterBlock : public CInstanceConfigurableElement
 {
 public:
-    CParameterBlock(const string& strName, const CTypeElement* pTypeElement);
+    CParameterBlock(const string& strName, const CTypeElement* pTypeElement)
+        : CInstanceConfigurableElement(strName, pTypeElement)
+    {
+    }
 
     // Type
-    virtual Type getType() const;
+    virtual Type getType() const
+    {
+        return EParameterBlock;
+    }
 };
 
diff --git a/parameter/Rule.cpp b/parameter/Rule.cpp
deleted file mode 100644
index 9a53d50..0000000
--- a/parameter/Rule.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2011-2014, Intel Corporation
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation and/or
- * other materials provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its contributors
- * may be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-#include "Rule.h"
-
-#define base CElement
-
-CRule::CRule()
-{
-}
-
diff --git a/parameter/Rule.h b/parameter/Rule.h
index 1fa33a1..7fcbb53 100644
--- a/parameter/Rule.h
+++ b/parameter/Rule.h
@@ -37,8 +37,6 @@ class CRule : public CElement
 {
 
 public:
-    CRule();
-
     // Parse
     virtual bool parse(CRuleParser& ruleParser, string& strError) = 0;
 
diff --git a/parameter/SubsystemLibrary.cpp b/parameter/SubsystemLibrary.cpp
deleted file mode 100644
index 3792850..0000000
--- a/parameter/SubsystemLibrary.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2011-2014, Intel Corporation
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation and/or
- * other materials provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its contributors
- * may be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-#include "SubsystemLibrary.h"
-#include "XmlElement.h"
-
-string CSubsystemLibrary::getBuilderType(const CXmlElement& xmlElement) const
-{
-    // Xml element's name attribute
-    return xmlElement.getAttributeString("Type");
-}
diff --git a/parameter/SubsystemLibrary.h b/parameter/SubsystemLibrary.h
index 60367f3..78a497e 100644
--- a/parameter/SubsystemLibrary.h
+++ b/parameter/SubsystemLibrary.h
@@ -39,5 +39,9 @@ class CSubsystemLibrary :
 {
 private:
     // Builder type (based on element's name attribute)
-    virtual std::string getBuilderType(const CXmlElement& xmlElement) const;
+    virtual std::string getBuilderType(const CXmlElement& xmlElement) const
+    {
+        // Xml element's name attribute
+        return xmlElement.getAttributeString("Type");
+    }
 };
diff --git a/parameter/SubsystemObjectFactory.h b/parameter/SubsystemObjectFactory.h
index bef69d6..3ac7835 100644
--- a/parameter/SubsystemObjectFactory.h
+++ b/parameter/SubsystemObjectFactory.h
@@ -30,15 +30,16 @@
 #pragma once
 
 #include "SubsystemObjectCreator.h"
+#include <string>
 
 template <class SubsystemObjectType>
 class TSubsystemObjectFactory : public CSubsystemObjectCreator
 {
 public:
-    TSubsystemObjectFactory(const string& strMappingKey, uint32_t uiAncestorIdMask, uint32_t uiMaxConfigurableElementSize = -1) : CSubsystemObjectCreator(strMappingKey, uiAncestorIdMask, uiMaxConfigurableElementSize) {}
+    TSubsystemObjectFactory(const std::string& strMappingKey, uint32_t uiAncestorIdMask, uint32_t uiMaxConfigurableElementSize = -1) : CSubsystemObjectCreator(strMappingKey, uiAncestorIdMask, uiMaxConfigurableElementSize) {}
 
     // Object creation
-    virtual CSubsystemObject* objectCreate(const string& strMappingValue, CInstanceConfigurableElement* pInstanceConfigurableElement, const CMappingContext& context) const
+    virtual CSubsystemObject* objectCreate(const std::string& strMappingValue, CInstanceConfigurableElement* pInstanceConfigurableElement, const CMappingContext& context) const
     {
         return new SubsystemObjectType(strMappingValue, pInstanceConfigurableElement, context);
     }
diff --git a/parameter/SubsystemPlugins.cpp b/parameter/SubsystemPlugins.cpp
deleted file mode 100644
index 8289992..0000000
--- a/parameter/SubsystemPlugins.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2011-2014, Intel Corporation
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation and/or
- * other materials provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its contributors
- * may be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-#include "SubsystemPlugins.h"
-
-#define base CKindElement
-
-CSubsystemPlugins::CSubsystemPlugins(const string& strName, const string& strKind) : base(strName, strKind)
-{
-}
-
-bool CSubsystemPlugins::childrenAreDynamic() const
-{
-    return true;
-}
-
diff --git a/parameter/SubsystemPlugins.h b/parameter/SubsystemPlugins.h
index 334ec55..f60ad0b 100644
--- a/parameter/SubsystemPlugins.h
+++ b/parameter/SubsystemPlugins.h
@@ -36,9 +36,13 @@ class CSubsystemPlugins : public CKindElement
 {
 
 public:
-    CSubsystemPlugins(const string& strName, const string& strKind);
+    CSubsystemPlugins(const string& strName, const string& strKind) : CKindElement(strName, strKind)
+    {
+    }
 
 private:
-    virtual bool childrenAreDynamic() const;
-
+    virtual bool childrenAreDynamic() const
+    {
+        return true;
+    }
 };
diff --git a/xmlserializer/Android.mk b/xmlserializer/Android.mk
index e6b06c1..7109bf9 100644
--- a/xmlserializer/Android.mk
+++ b/xmlserializer/Android.mk
@@ -35,7 +35,6 @@ common_src_files := \
         XmlElement.cpp \
         XmlSerializingContext.cpp \
         XmlDocSource.cpp \
-        XmlDocSink.cpp \
         XmlMemoryDocSink.cpp \
         XmlMemoryDocSource.cpp \
         XmlStringDocSink.cpp \
diff --git a/xmlserializer/CMakeLists.txt b/xmlserializer/CMakeLists.txt
index 06f3c68..074bbcc 100644
--- a/xmlserializer/CMakeLists.txt
+++ b/xmlserializer/CMakeLists.txt
@@ -30,7 +30,6 @@ add_library(xmlserializer SHARED
     XmlElement.cpp
     XmlSerializingContext.cpp
     XmlDocSource.cpp
-    XmlDocSink.cpp
     XmlMemoryDocSink.cpp
     XmlMemoryDocSource.cpp
     XmlStringDocSink.cpp
diff --git a/xmlserializer/XmlDocSink.cpp b/xmlserializer/XmlDocSink.cpp
deleted file mode 100644
index b54b415..0000000
--- a/xmlserializer/XmlDocSink.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2011-2014, Intel Corporation
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation and/or
- * other materials provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its contributors
- * may be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "XmlDocSink.h"
-
-CXmlDocSink::CXmlDocSink()
-{
-}
-
-bool CXmlDocSink::process(CXmlDocSource& xmlDocSource, CXmlSerializingContext& serializingContext)
-{
-    if (!xmlDocSource.populate(serializingContext)) {
-        return false;
-    }
-
-    return doProcess(xmlDocSource, serializingContext);
-}
diff --git a/xmlserializer/XmlDocSink.h b/xmlserializer/XmlDocSink.h
index 4868d9a..f7a87b9 100644
--- a/xmlserializer/XmlDocSink.h
+++ b/xmlserializer/XmlDocSink.h
@@ -42,8 +42,6 @@
 class CXmlDocSink
 {
 public:
-    CXmlDocSink();
-
     /**
       * Method to be called to use an xmlDocSource.
       * Any subclass of XmlDocSink must implement the doProcess
@@ -54,7 +52,15 @@ public:
       *
       * @return true is there was no error during the processing of xmlDocSource
       */
-    bool process(CXmlDocSource& xmlDocSource, CXmlSerializingContext& serializingContext);
+    bool process(CXmlDocSource& xmlDocSource, CXmlSerializingContext& serializingContext)
+    {
+        if (!xmlDocSource.populate(serializingContext)) {
+            return false;
+        }
+
+        return doProcess(xmlDocSource, serializingContext);
+    }
+
     virtual ~CXmlDocSink() {}
 
 private: