summaryrefslogtreecommitdiffstats
path: root/parameter/ConfigurableDomain.cpp
diff options
context:
space:
mode:
authorPatrick Benavoli <patrick.benavoli@intel.com>2014-07-23 01:27:00 +0200
committerEric Laurent <elaurent@google.com>2015-04-24 13:39:13 -0700
commit911844b16c6b627f421bc3368de427de3ca9f60c (patch)
tree223697b3ea168eca090cd06a673c7dbb7dea27de /parameter/ConfigurableDomain.cpp
parent9ad87f08eb4cfa8752f4b9e7b9deb3bd219ff591 (diff)
downloadexternal_parameter-framework-911844b16c6b627f421bc3368de427de3ca9f60c.zip
external_parameter-framework-911844b16c6b627f421bc3368de427de3ca9f60c.tar.gz
external_parameter-framework-911844b16c6b627f421bc3368de427de3ca9f60c.tar.bz2
Type mismatch corrections (Windows 64 bits)
This patch removes the type mismatch warnings revealed by Windows 64 compiler. Wherever necessary, used size_t type for size related data. Change-Id: Ie045ce95940cd83fe8d681168ac9526fc6028d43 Signed-off-by: Patrick Benavoli <patrick.benavoli@intel.com>
Diffstat (limited to 'parameter/ConfigurableDomain.cpp')
-rw-r--r--parameter/ConfigurableDomain.cpp46
1 files changed, 23 insertions, 23 deletions
diff --git a/parameter/ConfigurableDomain.cpp b/parameter/ConfigurableDomain.cpp
index 35acb9c..aa9da51 100644
--- a/parameter/ConfigurableDomain.cpp
+++ b/parameter/ConfigurableDomain.cpp
@@ -190,8 +190,8 @@ void CConfigurableDomain::composeSettings(CXmlElement& xmlElement, CXmlSerializi
xmlElement.createChild(xmlSettingsElement, "Settings");
// Serialize out all configurations settings
- uint32_t uiNbConfigurations = getNbChildren();
- uint32_t uiChildConfiguration;
+ size_t uiNbConfigurations = getNbChildren();
+ size_t uiChildConfiguration;
for (uiChildConfiguration = 0; uiChildConfiguration < uiNbConfigurations; uiChildConfiguration++) {
@@ -466,7 +466,7 @@ bool CConfigurableDomain::split(CConfigurableElement* pConfigurableElement, stri
log_info("Splitting configurable element \"%s\" domain \"%s\"", pConfigurableElement->getPath().c_str(), getName().c_str());
// Create sub domain areas for all configurable element's children
- uint32_t uiNbConfigurableElementChildren = pConfigurableElement->getNbChildren();
+ size_t uiNbConfigurableElementChildren = pConfigurableElement->getNbChildren();
if (!uiNbConfigurableElementChildren) {
@@ -475,7 +475,7 @@ bool CConfigurableDomain::split(CConfigurableElement* pConfigurableElement, stri
return false;
}
- uint32_t uiChild;
+ size_t uiChild;
for (uiChild = 0; uiChild < uiNbConfigurableElementChildren; uiChild++) {
@@ -485,7 +485,7 @@ bool CConfigurableDomain::split(CConfigurableElement* pConfigurableElement, stri
}
// Delegate to configurations
- uint32_t uiNbConfigurations = getNbChildren();
+ size_t uiNbConfigurations = getNbChildren();
for (uiChild = 0; uiChild < uiNbConfigurations; uiChild++) {
@@ -833,8 +833,8 @@ void CConfigurableDomain::validate(const CParameterBlackboard* pMainBlackboard)
{
// Propagate
- uint32_t uiNbConfigurations = getNbChildren();
- uint32_t uiChild;
+ size_t uiNbConfigurations = getNbChildren();
+ size_t uiChild;
for (uiChild = 0; uiChild < uiNbConfigurations; uiChild++) {
@@ -850,8 +850,8 @@ void CConfigurableDomain::validateAreas(const CConfigurableElement* pConfigurabl
log_info("Validating domain \"" + getName() + "\" against main blackboard for configurable element \"" + pConfigurableElement->getPath() + "\"");
// Propagate
- uint32_t uiNbConfigurations = getNbChildren();
- uint32_t uiChild;
+ size_t uiNbConfigurations = getNbChildren();
+ size_t uiChild;
for (uiChild = 0; uiChild < uiNbConfigurations; uiChild++) {
@@ -890,8 +890,8 @@ void CConfigurableDomain::autoValidateAreas(const CConfigurableElement* pConfigu
}
// Validate all other configurations against found one, if any
- uint32_t uiNbConfigurations = getNbChildren();
- uint32_t uiChild;
+ size_t uiNbConfigurations = getNbChildren();
+ size_t uiChild;
for (uiChild = 0; uiChild < uiNbConfigurations; uiChild++) {
@@ -908,8 +908,8 @@ void CConfigurableDomain::autoValidateAreas(const CConfigurableElement* pConfigu
bool CConfigurableDomain::autoValidateConfiguration(CDomainConfiguration* pDomainConfiguration)
{
// Find another configuration than this one, that ought to be valid!
- uint32_t uiNbConfigurations = getNbChildren();
- uint32_t uiChild;
+ size_t uiNbConfigurations = getNbChildren();
+ size_t uiChild;
for (uiChild = 0; uiChild < uiNbConfigurations; uiChild++) {
@@ -929,8 +929,8 @@ bool CConfigurableDomain::autoValidateConfiguration(CDomainConfiguration* pDomai
// Search for a valid configuration for given configurable element
const CDomainConfiguration* CConfigurableDomain::findValidDomainConfiguration(const CConfigurableElement* pConfigurableElement) const
{
- uint32_t uiNbConfigurations = getNbChildren();
- uint32_t uiChild;
+ size_t uiNbConfigurations = getNbChildren();
+ size_t uiChild;
for (uiChild = 0; uiChild < uiNbConfigurations; uiChild++) {
@@ -947,8 +947,8 @@ const CDomainConfiguration* CConfigurableDomain::findValidDomainConfiguration(co
// Search for an applicable configuration
const CDomainConfiguration* CConfigurableDomain::findApplicableDomainConfiguration() const
{
- uint32_t uiNbConfigurations = getNbChildren();
- uint32_t uiChild;
+ size_t uiNbConfigurations = getNbChildren();
+ size_t uiChild;
for (uiChild = 0; uiChild < uiNbConfigurations; uiChild++) {
@@ -1023,8 +1023,8 @@ void CConfigurableDomain::mergeAlreadyAssociatedDescendantConfigurableElements(C
void CConfigurableDomain::mergeConfigurations(CConfigurableElement* pToConfigurableElement, CConfigurableElement* pFromConfigurableElement)
{
// Propagate to domain configurations
- uint32_t uiNbConfigurations = getNbChildren();
- uint32_t uiChild;
+ size_t uiNbConfigurations = getNbChildren();
+ size_t uiChild;
for (uiChild = 0; uiChild < uiNbConfigurations; uiChild++) {
@@ -1054,8 +1054,8 @@ void CConfigurableDomain::doAddConfigurableElement(CConfigurableElement* pConfig
_syncerSet += *pSyncerSet;
// Inform configurations
- uint32_t uiNbConfigurations = getNbChildren();
- uint32_t uiChild;
+ size_t uiNbConfigurations = getNbChildren();
+ size_t uiChild;
for (uiChild = 0; uiChild < uiNbConfigurations; uiChild++) {
@@ -1094,8 +1094,8 @@ void CConfigurableDomain::doRemoveConfigurableElement(CConfigurableElement* pCon
pConfigurableElement->removeAttachedConfigurableDomain(this);
// Inform configurations
- uint32_t uiNbConfigurations = getNbChildren();
- uint32_t uiChild;
+ size_t uiNbConfigurations = getNbChildren();
+ size_t uiChild;
for (uiChild = 0; uiChild < uiNbConfigurations; uiChild++) {