tizen 2.4 release

[framework/web/wrt-commons.git] / modules / utils / include / dpl / utils / widget_version.h

diff --git a/modules_wearable/utils/include/dpl/utils/widget_version.h b/modules/utils/include/dpl/utils/widget_version.h
similarity index 90%
rename from modules_wearable/utils/include/dpl/utils/widget_version.h
rename to modules/utils/include/dpl/utils/widget_version.h
index de3d3aa..7ded2d5 100644 (file)
--- a/modules_wearable/utils/include/dpl/utils/widget_version.h
+++ b/modules/utils/include/dpl/utils/widget_version.h
@@ -23,7 +23,7 @@
 #define WIDGET_VERSION_H
 
 #include <dpl/string.h>
-#include <dpl/optional.h>
+#include <dpl/optional_typedefs.h>
 #include <ostream>
 
 /*
@@ -89,28 +89,28 @@ class WidgetVersion
 
     DPL::String m_major;
     DPL::String m_minor;
-    DPL::Optional<DPL::String> m_micro;
-    DPL::Optional<DPL::String> m_optional;
+    DPL::OptionalString m_micro;
+    DPL::OptionalString m_optional;
 
     void 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);
 
   public:
     explicit WidgetVersion(const DPL::String &str = DPL::String());
     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);
 
     bool IsWac() const;
     const DPL::String &Raw() const;
 
     const DPL::String &Major() const;
     const DPL::String &Minor() const;
-    const DPL::Optional<DPL::String> &Micro() const;
-    const DPL::Optional<DPL::String> &Optional() const;
+    const DPL::OptionalString &Micro() const;
+    const DPL::OptionalString &Optional() const;
 };
 
 bool operator<(const WidgetVersion &left,