X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=modules%2Futils%2Fsrc%2Fwidget_version.cpp;fp=modules_wearable%2Futils%2Fsrc%2Fwidget_version.cpp;h=6e2ed4a9171e18b82ed28d202c51cd1942ded5e8;hb=3a034abb4dca58ff0940687d8dd2b829ce2e226f;hp=6ba79330bdf41d72f9f498a2c2bc338d6517b8c8;hpb=58be0971049907f3166ce56a6ad509769565158f;p=framework%2Fweb%2Fwrt-commons.git

diff --git a/modules_wearable/utils/src/widget_version.cpp b/modules/utils/src/widget_version.cpp
similarity index 87%
rename from modules_wearable/utils/src/widget_version.cpp
rename to modules/utils/src/widget_version.cpp
index 6ba7933..6e2ed4a 100644
--- a/modules_wearable/utils/src/widget_version.cpp
+++ b/modules/utils/src/widget_version.cpp
@@ -22,7 +22,7 @@
 #include <stddef.h>
 #include <dpl/utils/widget_version.h>
 #include <dpl/assert.h>
-#include <dpl/log/log.h>
+#include <dpl/log/wrt_log.h>
 #include <ctype.h>
 #include <list>
 
@@ -136,14 +136,14 @@ WidgetVersion::WidgetVersion(const DPL::String &str) :
     m_isWac(false),
     m_raw(str)
 {
-    LogDebug("Parsing version string: " << str);
+    WrtLogD("Parsing version string: %ls", str.c_str());
 
     // Split optional an mandatory parts
     size_t optionalPartPosition = str.find(
             WAC_CERTIFY_MANDATORY_VS_OPTIONAL_SPLIT_CHAR);
 
     DPL::String mandatoryPart;
-    DPL::Optional<DPL::String> optionalPart;
+    DPL::OptionalString optionalPart;
 
     if (optionalPartPosition == DPL::String::npos) {
         mandatoryPart = str;
@@ -152,8 +152,9 @@ WidgetVersion::WidgetVersion(const DPL::String &str) :
         optionalPart = str.substr(optionalPartPosition + 1, DPL::String::npos);
     }
 
-    LogDebug("Mandatory part is: " << mandatoryPart);
-    LogDebug("Optional part is: " << optionalPart);
+    WrtLogD("Mandatory part is: %ls", mandatoryPart.c_str());
+    WrtLogD("Optional part is: %ls",
+        optionalPart.get_value_or(DPL::String()).c_str());
 
     // Split string and construct version
     std::vector<DPL::String> parts;
@@ -162,7 +163,7 @@ WidgetVersion::WidgetVersion(const DPL::String &str) :
                   std::back_inserter(parts),
                   false);
 
-    LogDebug("Tokenized mandatory parts: " << parts.size());
+    WrtLogD("Tokenized mandatory parts: %i", parts.size());
 
     if (parts.size() != WAC_CERTIFY_MANDATORY_PART_LOW_COUNT &&
         parts.size() != WAC_CERTIFY_MANDATORY_PART_HIGH_COUNT)
@@ -172,7 +173,7 @@ WidgetVersion::WidgetVersion(const DPL::String &str) :
 
     DPL::String major;
     DPL::String minor;
-    DPL::Optional<DPL::String> micro;
+    DPL::OptionalString micro;
 
     // Certify for Wac
     major = parts[WAC_CERTIFY_MANDATORY_PART_MAJOR_INDEX];
@@ -187,8 +188,8 @@ WidgetVersion::WidgetVersion(const DPL::String &str) :
 
 WidgetVersion::WidgetVersion(const DPL::String &major,
                              const DPL::String &minor,
-                             const DPL::Optional<DPL::String> &micro,
-                             const DPL::Optional<DPL::String> &optional) :
+                             const DPL::OptionalString &micro,
+                             const DPL::OptionalString &optional) :
     m_isWac(false)
 {
     // Create Raw version
@@ -212,36 +213,37 @@ WidgetVersion::WidgetVersion(const DPL::String &major,
 
 void WidgetVersion::WacCertify(const DPL::String &major,
                                const DPL::String &minor,
-                               const DPL::Optional<DPL::String> &micro,
-                               const DPL::Optional<DPL::String> &optional)
+                               const DPL::OptionalString &micro,
+                               const DPL::OptionalString &optional)
 {
-    LogDebug("Certyfing...");
+    WrtLogD("Certyfing...");
 
-    LogDebug("Major candidate: " << major);
-    LogDebug("Minor candidate: " << minor);
-    LogDebug("Micro candidate: " << micro);
-    LogDebug("Optional candidate: " << optional);
+    WrtLogD("Major candidate: %ls", major.c_str());
+    WrtLogD("Minor candidate: %ls", minor.c_str());
+    WrtLogD("Micro candidate: %ls", micro.get_value_or(DPL::String()).c_str());
+    WrtLogD("Optional candidate: %ls",
+        optional.get_value_or(DPL::String()).c_str());
 
     // Check strings
     if (major.empty() || !WacCertifyNumberString(major)) {
-        LogDebug("Major version not certified!");
+        WrtLogD("Major version not certified!");
         return;
     }
 
     if (minor.empty() || !WacCertifyNumberString(minor)) {
-        LogDebug("Minor version not certified!");
+        WrtLogD("Minor version not certified!");
         return;
     }
 
     if (!!micro && (micro->empty() || !WacCertifyNumberString(*micro))) {
-        LogDebug("Microversion not certified!");
+        WrtLogD("Microversion not certified!");
         return;
     }
 
     if (!!optional &&
         (optional->empty() || !WacCertifyAlphaNumberStringSpace(*optional)))
     {
-        LogDebug("Optional version not certified!");
+        WrtLogD("Optional version not certified!");
         return;
     }
 
@@ -253,7 +255,7 @@ void WidgetVersion::WacCertify(const DPL::String &major,
 
     m_isWac = true;
 
-    LogDebug("Certified.");
+    WrtLogD("Certified.");
 }
 
 bool WidgetVersion::IsWac() const
@@ -276,12 +278,12 @@ const DPL::String &WidgetVersion::Minor() const
     return m_minor;
 }
 
-const DPL::Optional<DPL::String> &WidgetVersion::Micro() const
+const DPL::OptionalString &WidgetVersion::Micro() const
 {
     return m_micro;
 }
 
-const DPL::Optional<DPL::String> &WidgetVersion::Optional() const
+const DPL::OptionalString &WidgetVersion::Optional() const
 {
     return m_optional;
 }