parameter-framework: improvements and corrections
BZ: 6721
- Bug correction concerning selection criteria display (inclusive type)
- Adapted XML format to allow for only on parameter to be associated to
a domain
- Removed unused files in parameter project
Change-Id: I9f42d08ff8cb60354714fe3d6b0f0b321ad0a7bf
Orig-Change-Id: I837e553070f5acf2d275082c986ba29433493e31
Signed-off-by: Patrick Benavoli <patrickx.benavoli@intel.com>
Reviewed-on: http://android.intel.com:8080/16878
Reviewed-by: Mahe, Erwan <erwan.mahe@intel.com>
Tested-by: Barthes, FabienX <fabienx.barthes@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>
diff --git a/parameter/FrameworkConfigurationLocation.cpp b/parameter/FrameworkConfigurationLocation.cpp
index 77c8d71..22f1c7f 100644
--- a/parameter/FrameworkConfigurationLocation.cpp
+++ b/parameter/FrameworkConfigurationLocation.cpp
@@ -51,6 +51,7 @@
return true;
}
+// File path
string CFrameworkConfigurationLocation::getFilePath(const string& strBaseFolder) const
{
if (isPathRelative()) {
@@ -60,11 +61,7 @@
return _strPath;
}
-bool CFrameworkConfigurationLocation::isPathRelative() const
-{
- return _strPath[0] != '/';
-}
-
+// Folder path
string CFrameworkConfigurationLocation::getFolderPath(const string& strBaseFolder) const
{
uint32_t uiSlashPos = _strPath.rfind('/', -1);
@@ -93,17 +90,8 @@
}
}
-#if 0
-string CFrameworkConfigurationLocation::getFileName() const
+// Detect relative path
+bool CFrameworkConfigurationLocation::isPathRelative() const
{
- uint32_t uiSlashPos = _strPath.rfind('/', -1);
-
- if (uiSlashPos != (uint32_t)-1) {
-
- return _strPath.substr(uiSlashPos + 1, _strPath.size() - uiSlashPos - 1);
- } else {
-
- return _strPath;
- }
+ return _strPath[0] != '/';
}
-#endif