tizen 2.4 release

[framework/web/wrt-commons.git] / modules / localization / include / dpl / localization / w3c_file_localization.h

diff --git a/modules_wearable/localization/include/dpl/localization/w3c_file_localization.h b/modules/localization/include/dpl/localization/w3c_file_localization.h
similarity index 89%
rename from modules_wearable/localization/include/dpl/localization/w3c_file_localization.h
rename to modules/localization/include/dpl/localization/w3c_file_localization.h
index 7a437d8..2b187c1 100755 (executable)
--- a/modules_wearable/localization/include/dpl/localization/w3c_file_localization.h
+++ b/modules/localization/include/dpl/localization/w3c_file_localization.h
@@ -23,8 +23,8 @@
 #define W3C_FILE_LOCALIZATION_H
 
 #include <dpl/wrt-dao-ro/widget_dao_read_only.h>
-#include <dpl/optional.h>
 #include <dpl/string.h>
+#include <dpl/optional_typedefs.h>
 #include <list>
 
 #include <dpl/localization/localization_utils.h>
@@ -35,18 +35,18 @@
 namespace W3CFileLocalization {
 typedef std::list<WidgetIcon> WidgetIconList;
 
-DPL::Optional<DPL::String> getFilePathInWidgetPackageFromUrl(
+DPL::OptionalString getFilePathInWidgetPackageFromUrl(
     const WrtDB::TizenAppId &tzAppId,
     const DPL::String &url);
-DPL::Optional<DPL::String> getFilePathInWidgetPackageFromUrl(
+DPL::OptionalString getFilePathInWidgetPackageFromUrl(
     WrtDB::WidgetDAOReadOnlyPtr dao,
     const DPL::String &url);
 std::string getFilePathInWidgetPackageFromUrl(const std::string &tzAppId, const std::string &url);
 
-DPL::Optional<DPL::String> getFilePathInWidgetPackage(
+DPL::OptionalString getFilePathInWidgetPackage(
     const WrtDB::TizenAppId &tzAppId,
     const DPL::String& file);
-DPL::Optional<DPL::String> getFilePathInWidgetPackage(
+DPL::OptionalString getFilePathInWidgetPackage(
     WrtDB::WidgetDAOReadOnlyPtr dao,
     const DPL::String& file);