merge with master

[framework/web/wrt-plugins-common.git] / src / modules / tizen / WidgetInterfaceDAO / WidgetInterfaceDAO.cpp

diff --git a/src/modules/tizen/WidgetInterfaceDAO/WidgetInterfaceDAO.cpp b/src/modules/tizen/WidgetInterfaceDAO/WidgetInterfaceDAO.cpp
index f78ab4a..f560fdd 100644 (file)
--- a/src/modules/tizen/WidgetInterfaceDAO/WidgetInterfaceDAO.cpp
+++ b/src/modules/tizen/WidgetInterfaceDAO/WidgetInterfaceDAO.cpp
@@ -44,7 +44,6 @@ const char *KEY_WIDGET_ARG = "widget_arg";
 }
 
 namespace WrtDeviceApis {
-
 WidgetInterfaceDAO::WidgetInterfaceDAO(int widgetHandle) :
     m_widgetHandle(widgetHandle),
     m_databaseInterface(databaseFileName(widgetHandle), DATABASE_FLAGS)
@@ -66,7 +65,6 @@ bool WidgetInterfaceDAO::checkDatabase()
     std::string databaseFile = databaseFileName(m_widgetHandle);
     struct stat buffer;
     if (stat(databaseFile.c_str(), &buffer) != 0) {
-
         //Create fresh database
 
         LogInfo("Creating database " << databaseFile);
@@ -86,7 +84,7 @@ bool WidgetInterfaceDAO::checkDatabase()
         Try
         {
             DPL::DB::SqlConnection con(databaseFile,
-                DATABASE_FLAGS, DATABASE_OPTIONS);
+                                       DATABASE_FLAGS, DATABASE_OPTIONS);
             con.ExecCommand(buffer.str().c_str());
         }
         Catch(DPL::DB::SqlConnection::Exception::Base)
@@ -169,7 +167,7 @@ void WidgetInterfaceDAO::setItem(const std::string& key,
             Equals<Properties::key>(DPL::FromUTF8String(key)));
         std::list<Properties::Row> rows = select.GetRowList();
 
-        if (rows.size() == 0) {
+        if (rows.empty()) {
             Properties::Insert insert(&m_databaseInterface);
             Properties::Row row;
             row.Set_key(DPL::FromUTF8String(key));
@@ -178,8 +176,7 @@ void WidgetInterfaceDAO::setItem(const std::string& key,
             row.Set_configxml(fromConfigXml ? 1 : 0);
             insert.Values(row);
             insert.Execute();
-        }
-        else {
+        } else {
             Assert(rows.size() == 1);
             Properties::Row row = rows.front();
             if (row.Get_readonly() != 0) {
@@ -199,7 +196,6 @@ void WidgetInterfaceDAO::setItem(const std::string& key,
         LogError("Cannot set item " << key << " with value " << value);
         ReThrow(Commons::PlatformException);
     }
-
 }
 
 void WidgetInterfaceDAO::removeItem(const std::string& key)
@@ -214,7 +210,7 @@ void WidgetInterfaceDAO::removeItem(const std::string& key)
         bool readonly = select.GetSingleValue<Properties::readonly>();
         if (readonly) {
             ThrowMsg(Commons::LocalStorageValueNoModifableException,
-                "Cannot delete item. Item is readonly");
+                     "Cannot delete item. Item is readonly");
         }
         Properties::Delete deleteItem(&m_databaseInterface);
         deleteItem.Where(Equals<Properties::key>(DPL::FromUTF8String(key)));
@@ -228,7 +224,7 @@ void WidgetInterfaceDAO::removeItem(const std::string& key)
 }
 
 DPL::Optional<std::string> WidgetInterfaceDAO::getValue(
-        const std::string& key) const
+    const std::string& key) const
 {
     using namespace DPL::DB::ORM;
     using namespace DPL::DB::ORM::widget_interface;
@@ -238,7 +234,7 @@ DPL::Optional<std::string> WidgetInterfaceDAO::getValue(
         Properties::Select select(&m_databaseInterface);
         select.Where(Equals<Properties::key>(DPL::FromUTF8String(key)));
         std::list<DPL::String> value = select.GetValueList<Properties::value>();
-        if (value.size() == 0) {
+        if (value.empty()) {
             return DPL::Optional<std::string>();
         }
         return DPL::Optional<std::string>(DPL::ToUTF8String(value.front()));
@@ -327,9 +323,9 @@ std::string WidgetInterfaceDAO::databaseFileName(int widgetHandle)
     Try
     {
         WrtDB::WidgetDAOReadOnly widgetDAO(widgetHandle);
-        WrtDB::WidgetPkgName pkgname = widgetDAO.getPkgName();
+        WrtDB::TizenPkgId pkgid = widgetDAO.getTizenPkgId();
 
-        filename << GetWidgetPersistentStoragePath(pkgname)
+        filename << GetWidgetPersistentStoragePath(pkgid)
                  << "/"
                  << GetWidgetInterfaceDatabaseFile();
     }
@@ -341,5 +337,4 @@ std::string WidgetInterfaceDAO::databaseFileName(int widgetHandle)
     WrtDB::WrtDatabase::detachFromThread();
     return filename.str();
 }
-
 }