From a9be2d378b7ad84e679a48efa81f42fb54f85d9a Mon Sep 17 00:00:00 2001
From: Jean-Michel Trivi <jmtrivi@google.com>
Date: Wed, 15 Jul 2015 15:37:57 -0700
Subject: Drop release v2.6.0+no-stlport

Bug 246391

Change-Id: I662b7b0f90c97cb169978e1b64ad1fe32c440cf5
Signed-off-by: Jean-Michel Trivi <jmtrivi@google.com>
---
 parameter/Element.h | 38 ++++++++++++++++++++++++++++----------
 1 file changed, 28 insertions(+), 10 deletions(-)

(limited to 'parameter/Element.h')

diff --git a/parameter/Element.h b/parameter/Element.h
index 8423e32..d3844e6 100644
--- a/parameter/Element.h
+++ b/parameter/Element.h
@@ -49,8 +49,8 @@ public:
     virtual ~CElement();
 
     // Logging
-    void log_info(const std::string& strMessage, ...) const;
-    void log_warning(const std::string& strMessage, ...) const;
+    void log_info(const char* strMessage, ...) const;
+    void log_warning(const char* strMessage, ...) const;
     void log_table(bool bIsWarning, const std::list<std::string> lstrMessage) const;
 
     // Description
@@ -133,22 +133,38 @@ public:
     // Element properties
     virtual void showProperties(std::string& strResult) const;
 
-    // Conversion utilities
-    static std::string toString(uint32_t uiValue);
-    static std::string toString(uint64_t uiValue);
-    static std::string toString(int32_t iValue);
-    static std::string toString(double dValue);
-
     // Checksum for integrity checks
     uint8_t computeStructureChecksum() const;
 
     // Class kind
     virtual std::string getKind() const = 0;
+
+    /**
+     * Fill the Description field of the Xml Element during XML composing.
+     *
+     * @param[in,out] xmlElement to fill with the description
+     */
+    void setXmlDescriptionAttribute(CXmlElement& xmlElement) const;
+
+    /**
+     * Extract the Description field from the Xml Element during XML decomposing.
+     *
+     * @param[in] xmlElement to extract the description from.
+     *
+     * @return description represented as a string, empty if not found
+     */
+    std::string getXmlDescriptionAttribute(const CXmlElement &xmlElement) const;
+
+    /**
+     * Appends if found human readable description property.
+     *
+     * @param[out] strResult in which the description is wished to be appended.
+     */
+    void showDescriptionProperty(std::string &strResult) const;
+
 protected:
     // Content dumping
     virtual void logValue(std::string& strValue, CErrorContext& errorContext) const;
-    // Utility to underline
-    static void appendTitle(std::string& strTo, const std::string& strTitle);
 
     // Hierarchy
     CElement* getParent();
@@ -193,4 +209,6 @@ private:
     std::vector<CElement*> _childArray;
     // Parent
     CElement* _pParent;
+
+    static const std::string gDescriptionPropertyName;
 };
-- 
cgit v1.1