Removing copy&paste code, part 1

[Issue#] N/A
[Problem] Duplicated code
[Cause] Copy&paste
[Solution] Extract common code, generalise it
[Verification] Build the package and run all tests

Changes:
- In test_collector:
    - Created a macro for "OK" test result message
    - Moved parsing of "--file" argument to a common function
- In widget dao ro, extracted namespaces from inside the methods to file level
  and removed unnecessary namespace selection in variable declarations
- In popup_renderer, instead of duplicating code for adding 1, 2 or 3 buttons
  to a popup, DoRender(btn1,btn2,btn3) now uses DoRender(btn1,btn2) to add first
  two buttons, which in turn used DoRender(btn1) to add the first button.
- In security_origin_dao, hadResult now calls getResult instead of duplicating
  the same select statement.
- Removed modules/widget_dao/dao/bind_to_dao.h - it wasn't used anywhere and it
  was a copy of modules/event/include/dpl/event/model_bind_to_dao.h

Change-Id: I3fef08333844963b5987125dc36045fa185e4699

diff --git a/modules/popup/src/popup_renderer.cpp b/modules/popup/src/popup_renderer.cpp
index b702faa..aa5b214 100644 (file)
--- a/modules/popup/src/popup_renderer.cpp
+++ b/modules/popup/src/popup_renderer.cpp
@@ -192,35 +192,28 @@ class PopupRenderer::Impl
 
         elm_object_text_set(btn, object.getLabel().c_str());
         elm_object_part_content_set(parent, POPUP_PART_BUTTON1, btn);
-       btn.ConnectMemberSmartCallback(BUTTON_CLICKED_CALLBACK_NAME,
+        btn.ConnectMemberSmartCallback(BUTTON_CLICKED_CALLBACK_NAME,
                                        &Impl::ButtonCallback,
                                        this,
                                        reinterpret_cast<void*>(object.getLabelId()));
-       m_createdObjects.push_back(btn);
+        m_createdObjects.push_back(btn);
     }
 
     void DoRender(const PopupObject::Button& object1,
             const PopupObject::Button& object2,
             EvasObject &parent)
     {
-        EvasObject btn1(elm_button_add(parent));
-        EvasObject btn2(elm_button_add(parent));
+        DoRender(object1, parent);
 
-        elm_object_text_set(btn1, object1.getLabel().c_str());
-        elm_object_part_content_set(parent, POPUP_PART_BUTTON1, btn1);
-       btn1.ConnectMemberSmartCallback(BUTTON_CLICKED_CALLBACK_NAME,
-                                        &Impl::ButtonCallback,
-                                        this,
-                                        reinterpret_cast<void*>(object1.getLabelId()));
+        EvasObject btn2(elm_button_add(parent));
 
         elm_object_text_set(btn2, object2.getLabel().c_str());
         elm_object_part_content_set(parent, POPUP_PART_BUTTON2, btn2);
-       btn2.ConnectMemberSmartCallback(BUTTON_CLICKED_CALLBACK_NAME,
+        btn2.ConnectMemberSmartCallback(BUTTON_CLICKED_CALLBACK_NAME,
                                         &Impl::ButtonCallback,
                                         this,
                                         reinterpret_cast<void*>(object2.getLabelId()));
-       m_createdObjects.push_back(btn1);
-       m_createdObjects.push_back(btn2);
+        m_createdObjects.push_back(btn2);
     }
 
     void DoRender(const PopupObject::Button& object1,
@@ -228,33 +221,17 @@ class PopupRenderer::Impl
             const PopupObject::Button& object3,
             EvasObject &parent)
     {
-        EvasObject btn1(elm_button_add(parent));
-        EvasObject btn2(elm_button_add(parent));
-        EvasObject btn3(elm_button_add(parent));
+        DoRender(object1, object2, parent);
 
-        elm_object_text_set(btn1, object1.getLabel().c_str());
-        elm_object_part_content_set(parent, POPUP_PART_BUTTON1, btn1);
-       btn1.ConnectMemberSmartCallback(BUTTON_CLICKED_CALLBACK_NAME,
-                                        &Impl::ButtonCallback,
-                                        this,
-                                        reinterpret_cast<void*>(object1.getLabelId()));
-
-        elm_object_text_set(btn2, object2.getLabel().c_str());
-        elm_object_part_content_set(parent, POPUP_PART_BUTTON2, btn2);
-       btn2.ConnectMemberSmartCallback(BUTTON_CLICKED_CALLBACK_NAME,
-                                        &Impl::ButtonCallback,
-                                        this,
-                                        reinterpret_cast<void*>(object2.getLabelId()));
+        EvasObject btn3(elm_button_add(parent));
 
         elm_object_text_set(btn3, object3.getLabel().c_str());
         elm_object_part_content_set(parent, POPUP_PART_BUTTON3, btn3);
-       btn3.ConnectMemberSmartCallback(BUTTON_CLICKED_CALLBACK_NAME,
+        btn3.ConnectMemberSmartCallback(BUTTON_CLICKED_CALLBACK_NAME,
                                         &Impl::ButtonCallback,
                                         this,
                                         reinterpret_cast<void*>(object3.getLabelId()));
-       m_createdObjects.push_back(btn1);
-       m_createdObjects.push_back(btn2);
-       m_createdObjects.push_back(btn3);
+        m_createdObjects.push_back(btn3);
     }
 
     EvasObject getBaseObject()

diff --git a/modules/security_origin_dao/dao/security_origin_dao.cpp b/modules/security_origin_dao/dao/security_origin_dao.cpp
index c3b24c6..33093dc 100644 (file)
--- a/modules/security_origin_dao/dao/security_origin_dao.cpp
+++ b/modules/security_origin_dao/dao/security_origin_dao.cpp
@@ -223,20 +223,8 @@ void SecurityOriginDAO::removeSecurityOriginData(
 
 bool SecurityOriginDAO::hasResult(const SecurityOriginData &securityOriginData)
 {
-    SQL_CONNECTION_EXCEPTION_HANDLER_BEGIN
-    {
-        SECURITY_ORIGIN_DB_SELECT(select, SecurityOriginInfo, &m_securityOriginDBInterface);
-        select->Where(
-            And(And(And(Equals<SecurityOriginInfo::feature>(securityOriginData.feature),
-                        Equals<SecurityOriginInfo::scheme>(securityOriginData.origin.scheme)),
-                    Equals<SecurityOriginInfo::host>(securityOriginData.origin.host)),
-                Equals<SecurityOriginInfo::port>(securityOriginData.origin.port)));
-
-        SecurityOriginInfo::Select::RowList rows = select->GetRowList();
-
-        return !rows.empty();
-    }
-    SQL_CONNECTION_EXCEPTION_HANDLER_END("Failed to get result for security origin")
+    Result res=getResult(securityOriginData);
+    return (res != RESULT_UNKNOWN);
 }
 
 #undef SQL_CONNECTION_EXCEPTION_HANDLER_BEGIN

diff --git a/modules/test/src/test_results_collector.cpp b/modules/test/src/test_results_collector.cpp
index 029393d..7daf3c6 100644 (file)
--- a/modules/test/src/test_results_collector.cpp
+++ b/modules/test/src/test_results_collector.cpp
@@ -32,6 +32,8 @@
 #include <sstream>
 #include <cstdlib>
 
+#define GREEN_RESULT_OK "[%s%s%s]\n", BOLD_GREEN_BEGIN, "   OK   ", BOLD_GREEN_END
+
 namespace DPL
 {
 namespace Test
@@ -43,6 +45,16 @@ const char *DEFAULT_HTML_FILE_NAME = "index.html";
 const char *DEFAULT_TAP_FILE_NAME = "results.tap";
 const char *DEFAULT_XML_FILE_NAME = "results.xml";
 
+bool ParseCollectorFileArg(const std::string &arg, std::string &filename)
+{
+    const std::string argname = "--file=";
+    if (0 == arg.find(argname)) {
+        filename = arg.substr(argname.size());
+        return true;
+    }
+    return false;
+}
+
 class Statistic
 {
   public:
@@ -125,7 +137,7 @@ class ConsoleCollector
         printf("Running test case %-60s", tmp.c_str());
         switch(status) {
             case TestResultsCollectorBase::FailStatus::NONE:
-                printf("[%s%s%s]\n", BOLD_GREEN_BEGIN, "   OK   ", BOLD_GREEN_END); break;
+                printf(GREEN_RESULT_OK); break;
             case TestResultsCollectorBase::FailStatus::FAILED:
                 PrintfErrorMessage(  " FAILED ", reason, true); break;
             case TestResultsCollectorBase::FailStatus::IGNORED:
@@ -265,13 +277,7 @@ class HtmlCollector
 
     virtual bool ParseCollectorSpecificArg(const std::string& arg)
     {
-        const std::string argname = "--file=";
-        if (0 == arg.find(argname)) {
-            m_filename = arg.substr(argname.size());
-            return true;
-        } else {
-            return false;
-        }
+        return ParseCollectorFileArg(arg, m_filename);
     }
 
     virtual void CollectResult(const std::string& id,
@@ -285,7 +291,7 @@ class HtmlCollector
         fprintf(m_fp.Get(), "Running test case %-100s", tmp.c_str());
         switch(status) {
             case TestResultsCollectorBase::FailStatus::NONE:
-                fprintf(m_fp.Get(), "[%s%s%s]\n", BOLD_GREEN_BEGIN, "   OK   ", BOLD_GREEN_END); break;
+                fprintf(m_fp.Get(), GREEN_RESULT_OK); break;
             case TestResultsCollectorBase::FailStatus::FAILED:
                 PrintfErrorMessage(  " FAILED ", reason, true); break;
             case TestResultsCollectorBase::FailStatus::IGNORED:
@@ -443,13 +449,7 @@ class XmlCollector
 
     virtual bool ParseCollectorSpecificArg(const std::string& arg)
     {
-        const std::string argname = "--file=";
-        if (0 == arg.find(argname)) {
-            m_filename = arg.substr(argname.size());
-            return true;
-        } else {
-            return false;
-        }
+        return ParseCollectorFileArg(arg, m_filename);
     }
 
     virtual void CollectResult(const std::string& id,
@@ -698,17 +698,9 @@ class TAPCollector
 
     virtual bool ParseCollectorSpecificArg(const std::string& arg)
     {
-        const std::string argname = "--file=";
-        if (0 == arg.find(argname)) {
-            m_filename = arg.substr(argname.size());
-            return true;
-        } else {
-            return false;
-        }
+        return ParseCollectorFileArg(arg, m_filename);
     }
 
-
-
     virtual void CollectResult(const std::string& id,
                                const std::string& description,
                                const FailStatus::Type status = FailStatus::NONE,
@@ -832,3 +824,4 @@ int RegisterCollectorConstructors()
 
 }
 }
+#undef GREEN_RESULT_OK

diff --git a/modules/widget_dao/dao/bind_to_dao.h b/modules/widget_dao/dao/bind_to_dao.h
deleted file mode 100644 (file)
index 9b9c2d3..0000000
--- a/modules/widget_dao/dao/bind_to_dao.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2011 Samsung Electronics Co., Ltd All Rights Reserved
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-/**
- * @file    bind_to_dao.h
- * @author  Grzegorz Krawczyk (g.krawczyk@samsung.com)
- * @version 1.0
- * @brief
- */
-
-#ifndef WRT_SRC_CONFIGURATION_BIND_TO_DAO_H_
-#define WRT_SRC_CONFIGURATION_BIND_TO_DAO_H_
-
-namespace WrtDB {
-
-/**
- * @param ObjectType type of object used as delegate argument
- * @param RetType Type returned from the external function
- * @param ExtArg Type of argument required by external fun
- * @param getterFun Object Type method which returns value of type ExtArg
- * used as argument for external function
- * */
-//STATIC FUNCTION
-template <
-    typename ObjectType,
-    typename ValueType,
-    typename ExtArg,
-    ExtArg(ObjectType::*argGetter) () const,
-    ValueType(*externalGetter) (ExtArg)
-    >
-struct BindToDAO_Static
-{
-    static ValueType Get(DPL::Model* obj)
-    {
-        ObjectType* instance = static_cast<ObjectType*>(obj);
-
-        return externalGetter((instance->*argGetter)());
-    }
-};
-
-template <
-    typename ObjectType,
-    typename ValueType,
-    typename ExtArg,
-    typename ExtObject,
-    ExtArg(ObjectType::*argGetter) () const,
-    ValueType(ExtObject::*externalGetter) () const
-    >
-struct BindToDAO
-{
-    static ValueType Get(DPL::Model* obj)
-    {
-        ObjectType* instance = static_cast<ObjectType*>(obj);
-        ExtObject extObject((instance->*argGetter)());
-        return (extObject.*externalGetter)();
-    }
-};
-
-} // namespace WrtDB
-
-#endif

diff --git a/modules/widget_dao/dao/widget_dao_read_only.cpp b/modules/widget_dao/dao/widget_dao_read_only.cpp
index 7dda9ef..4671cb0 100644 (file)
--- a/modules/widget_dao/dao/widget_dao_read_only.cpp
+++ b/modules/widget_dao/dao/widget_dao_read_only.cpp
@@ -70,13 +70,14 @@ typedef DPL::DB::ORM::wrt::WidgetSecuritySettings::Row
 
 namespace {
 
+using namespace DPL::DB::ORM;
+using namespace DPL::DB::ORM::wrt;
+
 WidgetInfoRow getWidgetInfoRow(int widgetHandle)
 {
     LogDebug("Getting WidgetInfo row. Handle: " << widgetHandle);
     SQL_CONNECTION_EXCEPTION_HANDLER_BEGIN
     {
-        using namespace DPL::DB::ORM;
-        using namespace DPL::DB::ORM::wrt;
         WRT_DB_SELECT(select, WidgetInfo, &WrtDatabase::interface())
         select->Where(Equals<WidgetInfo::app_id>(widgetHandle));
 
@@ -150,8 +151,6 @@ DbWidgetHandle WidgetDAOReadOnly::getHandle(const WidgetGUID GUID)
 
     SQL_CONNECTION_EXCEPTION_HANDLER_BEGIN
     {
-        using namespace DPL::DB::ORM;
-        using namespace DPL::DB::ORM::wrt;
         WRT_DB_SELECT(select, WidgetInfo, &WrtDatabase::interface())
         select->Where(Equals<WidgetInfo::widget_id>(GUID));
         WidgetInfo::Select::RowList rowList = select->GetRowList();
@@ -174,8 +173,6 @@ DbWidgetHandle WidgetDAOReadOnly::getHandle(const DPL::String pkgName)
 
     SQL_CONNECTION_EXCEPTION_HANDLER_BEGIN
     {
-        using namespace DPL::DB::ORM;
-        using namespace DPL::DB::ORM::wrt;
         WRT_DB_SELECT(select, WidgetInfo, &WrtDatabase::interface())
         select->Where(Equals<WidgetInfo::pkgname>(pkgName));
         WidgetInfo::Select::RowList rowList = select->GetRowList();
@@ -243,11 +240,9 @@ WidgetLocalizedInfo
     LogDebug("Getting Localized Info. Handle: " << m_widgetHandle);
     SQL_CONNECTION_EXCEPTION_HANDLER_BEGIN
     {
-        DPL::DB::ORM::wrt::ScopedTransaction transaction(&WrtDatabase::interface());
+        ScopedTransaction transaction(&WrtDatabase::interface());
         CHECK_WIDGET_EXISTENCE(transaction, m_widgetHandle)
 
-        using namespace DPL::DB::ORM;
-        using namespace DPL::DB::ORM::wrt;
         WRT_DB_SELECT(select, LocalizedWidgetInfo, &WrtDatabase::interface())
         select->Where(
             And(Equals<LocalizedWidgetInfo::app_id>(m_widgetHandle),
@@ -272,16 +267,14 @@ DbWidgetFeatureSet WidgetDAOReadOnly::getFeaturesList() const
     LogDebug("Getting FeaturesList. Handle: " << m_widgetHandle);
     SQL_CONNECTION_EXCEPTION_HANDLER_BEGIN
     {
-        DPL::DB::ORM::wrt::ScopedTransaction transaction(&WrtDatabase::interface());
+        ScopedTransaction transaction(&WrtDatabase::interface());
         CHECK_WIDGET_EXISTENCE(transaction, m_widgetHandle)
 
-        using namespace DPL::DB::ORM;
-        using namespace DPL::DB::ORM::wrt;
-        WRT_DB_SELECT(select, DPL::DB::ORM::wrt::WidgetFeature, &WrtDatabase::interface())
-        select->Where(Equals<DPL::DB::ORM::wrt::WidgetFeature::app_id>(m_widgetHandle));
+        WRT_DB_SELECT(select, WidgetFeature, &WrtDatabase::interface())
+        select->Where(Equals<WidgetFeature::app_id>(m_widgetHandle));
 
         DbWidgetFeatureSet resultSet;
-        typedef std::list<DPL::DB::ORM::wrt::WidgetFeature::Row> RowList;
+        typedef std::list<WidgetFeature::Row> RowList;
         RowList list = select->GetRowList();
 
         for (RowList::iterator i = list.begin(); i != list.end(); ++i) {
@@ -306,14 +299,12 @@ WidgetParamMap WidgetDAOReadOnly::getFeatureParams(int id)
     LogDebug("Getting feature Params. featureId: " << widgetFeatureId);
     SQL_CONNECTION_EXCEPTION_HANDLER_BEGIN
     {
-        using namespace DPL::DB::ORM;
-        using namespace DPL::DB::ORM::wrt;
-        WRT_DB_SELECT(select, DPL::DB::ORM::wrt::FeatureParam, &WrtDatabase::interface())
-        select->Where(Equals<DPL::DB::ORM::wrt::FeatureParam::widget_feature_id>(
+        WRT_DB_SELECT(select, FeatureParam, &WrtDatabase::interface())
+        select->Where(Equals<FeatureParam::widget_feature_id>(
                           widgetFeatureId));
 
         WidgetParamMap resultMap;
-        typedef std::list<DPL::DB::ORM::wrt::FeatureParam::Row> RowList;
+        typedef std::list<FeatureParam::Row> RowList;
         RowList list = select->GetRowList();
 
         FOREACH(i, list)
@@ -331,11 +322,9 @@ bool WidgetDAOReadOnly::hasFeature(const std::string& featureName) const
         m_widgetHandle);
     SQL_CONNECTION_EXCEPTION_HANDLER_BEGIN
     {
-        DPL::DB::ORM::wrt::ScopedTransaction transaction(&WrtDatabase::interface());
+        ScopedTransaction transaction(&WrtDatabase::interface());
         CHECK_WIDGET_EXISTENCE(transaction, m_widgetHandle)
 
-        using namespace DPL::DB::ORM;
-        using namespace DPL::DB::ORM::wrt;
         WRT_DB_SELECT(select, wrt::WidgetFeature, &WrtDatabase::interface())
         select->Where(And(Equals<wrt::WidgetFeature::app_id>(m_widgetHandle),
                           Equals<wrt::WidgetFeature::name>(
@@ -353,11 +342,9 @@ HostList WidgetDAOReadOnly::getAccessHostList() const
     LogDebug("Getting AccessHostList. Handle: " << m_widgetHandle);
     SQL_CONNECTION_EXCEPTION_HANDLER_BEGIN
     {
-        DPL::DB::ORM::wrt::ScopedTransaction transaction(&WrtDatabase::interface());
+        ScopedTransaction transaction(&WrtDatabase::interface());
         CHECK_WIDGET_EXISTENCE(transaction, m_widgetHandle)
 
-        using namespace DPL::DB::ORM;
-        using namespace DPL::DB::ORM::wrt;
         WRT_DB_SELECT(select, WidgetAccessHost, &WrtDatabase::interface())
         select->Where(Equals<WidgetAccessHost::app_id>(m_widgetHandle));
         std::list<WidgetAccessHost::host::ColumnType> values =
@@ -384,8 +371,6 @@ DbWidgetHandleList WidgetDAOReadOnly::getHandleList()
     LogDebug("Getting DbWidgetHandle List");
     SQL_CONNECTION_EXCEPTION_HANDLER_BEGIN
     {
-        using namespace DPL::DB::ORM;
-        using namespace DPL::DB::ORM::wrt;
         WRT_DB_SELECT(select, WidgetInfo, &WrtDatabase::interface())
         return select->GetValueList<WidgetInfo::app_id>();
     }
@@ -397,8 +382,6 @@ WidgetPkgNameList WidgetDAOReadOnly::getPkgnameList()
     LogDebug("Getting Pkgname List");
     SQL_CONNECTION_EXCEPTION_HANDLER_BEGIN
     {
-        using namespace DPL::DB::ORM;
-        using namespace DPL::DB::ORM::wrt;
         WRT_DB_SELECT(select, WidgetInfo, &WrtDatabase::interface())
         return select->GetValueList<WidgetInfo::pkgname>();
     }
@@ -420,8 +403,6 @@ bool WidgetDAOReadOnly::isWidgetInstalled(DbWidgetHandle handle)
     LogDebug("Checking if widget exist. Handle: " << handle);
     SQL_CONNECTION_EXCEPTION_HANDLER_BEGIN
     {
-        using namespace DPL::DB::ORM;
-        using namespace DPL::DB::ORM::wrt;
         WRT_DB_SELECT(select, WidgetInfo, &WrtDatabase::interface())
         select->Where(Equals<WidgetInfo::app_id>(handle));
 
@@ -437,8 +418,6 @@ bool WidgetDAOReadOnly::isWidgetInstalled(const WidgetPkgName & pkgName)
     LogDebug("Checking if widget exist. package name " << pkgName);
     SQL_CONNECTION_EXCEPTION_HANDLER_BEGIN
     {
-        using namespace DPL::DB::ORM;
-        using namespace DPL::DB::ORM::wrt;
         WRT_DB_SELECT(select, WidgetInfo, &WrtDatabase::interface())
         select->Where(Equals<WidgetInfo::pkgname>(pkgName));
 
@@ -455,8 +434,6 @@ ExternalLocationList WidgetDAOReadOnly::getWidgetExternalLocations() const
     ExternalLocationList result;
     SQL_CONNECTION_EXCEPTION_HANDLER_BEGIN
     {
-        using namespace DPL::DB::ORM;
-        using namespace DPL::DB::ORM::wrt;
         WRT_DB_SELECT(select, WidgetExternalLocations, &WrtDatabase::interface());
         select->Where(Equals<WidgetExternalLocations::app_id>(m_widgetHandle));
         WidgetExternalLocations::Select::RowList rows = select->GetRowList();
@@ -472,15 +449,13 @@ ExternalLocationList WidgetDAOReadOnly::getWidgetExternalLocations() const
 CertificateChainList WidgetDAOReadOnly::getWidgetCertificate(
         CertificateSource source) const
 {
-    using namespace DPL::DB::ORM;
-    using namespace DPL::DB::ORM::wrt;
     WRT_DB_SELECT(select, WidgetCertificate, &WrtDatabase::interface())
     select->Where(
         And(
             Equals<WidgetCertificate::app_id>(m_widgetHandle),
             Equals<WidgetCertificate::cert_source>(source)));
 
-    std::list<DPL::DB::ORM::wrt::WidgetCertificate::Row> chainList = select->GetRowList();
+    std::list<WidgetCertificate::Row> chainList = select->GetRowList();
 
     CertificateChainList result;
 
@@ -563,8 +538,6 @@ std::string WidgetDAOReadOnly::getShareHref() const
 {
     SQL_CONNECTION_EXCEPTION_HANDLER_BEGIN
     {
-        using namespace DPL::DB::ORM;
-        using namespace DPL::DB::ORM::wrt;
         WRT_DB_SELECT(select, WidgetExtendedInfo, &WrtDatabase::interface())
         select->Where(Equals<WidgetExtendedInfo::app_id>(m_widgetHandle));
         WidgetExtendedInfo::Select::RowList rows = select->GetRowList();
@@ -630,8 +603,6 @@ bool WidgetDAOReadOnly::isTrusted() const
 bool WidgetDAOReadOnly::isTestWidget() const
 {
     Try {
-        using namespace DPL::DB::ORM;
-        using namespace DPL::DB::ORM::wrt;
         WRT_DB_SELECT(select, WidgetExtendedInfo, &WrtDatabase::interface())
         select->Where(Equals<WidgetExtendedInfo::app_id>(m_widgetHandle));
 
@@ -661,8 +632,6 @@ time_t WidgetDAOReadOnly::getInstallTime() const
 {
     SQL_CONNECTION_EXCEPTION_HANDLER_BEGIN
     {
-        using namespace DPL::DB::ORM;
-        using namespace DPL::DB::ORM::wrt;
         WRT_DB_SELECT(select, WidgetExtendedInfo, &WrtDatabase::interface())
         select->Where(Equals<WidgetExtendedInfo::app_id>(m_widgetHandle));
 
@@ -681,8 +650,6 @@ DPL::OptionalString WidgetDAOReadOnly::getSplashImgSrc() const
 {
     SQL_CONNECTION_EXCEPTION_HANDLER_BEGIN
     {
-        using namespace DPL::DB::ORM;
-        using namespace DPL::DB::ORM::wrt;
         WRT_DB_SELECT(select, WidgetExtendedInfo, &WrtDatabase::interface())
         select->Where(Equals<WidgetExtendedInfo::app_id>(m_widgetHandle));
 
@@ -707,12 +674,10 @@ WidgetDAOReadOnly::WidgetLocalizedIconList WidgetDAOReadOnly::getLocalizedIconLi
     //TODO check widget existance??
     SQL_CONNECTION_EXCEPTION_HANDLER_BEGIN
     {
-        using namespace DPL::DB::ORM;
-        using namespace DPL::DB::ORM::wrt;
         WRT_DB_SELECT(select, WidgetLocalizedIcon, &WrtDatabase::interface())
         select->Where(Equals<WidgetLocalizedIcon::app_id>(m_widgetHandle));
 
-        std::list<DPL::DB::ORM::wrt::WidgetLocalizedIcon::Row> list =
+        std::list<WidgetLocalizedIcon::Row> list =
                 select->GetRowList();
         WidgetLocalizedIconList ret;
         FOREACH(it,list)
@@ -732,12 +697,10 @@ WidgetDAOReadOnly::WidgetIconList WidgetDAOReadOnly::getIconList() const
     //TODO check widget existance
     SQL_CONNECTION_EXCEPTION_HANDLER_BEGIN
     {
-        using namespace DPL::DB::ORM;
-        using namespace DPL::DB::ORM::wrt;
         WRT_DB_SELECT(select, wrt::WidgetIcon, &WrtDatabase::interface())
         select->Where(Equals<wrt::WidgetIcon::app_id>(m_widgetHandle));
 
-        std::list<DPL::DB::ORM::wrt::WidgetIcon::Row> list =
+        std::list<WidgetIcon::Row> list =
                 select->GetRowList();
         WidgetIconList ret;
         FOREACH(it,list)
@@ -759,14 +722,12 @@ WidgetDAOReadOnly::LocalizedStartFileList WidgetDAOReadOnly::getLocalizedStartFi
     //TODO check widget existance
     SQL_CONNECTION_EXCEPTION_HANDLER_BEGIN
     {
-        using namespace DPL::DB::ORM;
-        using namespace DPL::DB::ORM::wrt;
         WRT_DB_SELECT(select, WidgetLocalizedStartFile, &WrtDatabase::interface())
         select->Where(Equals<WidgetLocalizedStartFile::app_id>(
                           m_widgetHandle));
         select->OrderBy("start_file_id ASC");
 
-        std::list<DPL::DB::ORM::wrt::WidgetLocalizedStartFile::Row> list =
+        std::list<WidgetLocalizedStartFile::Row> list =
                 select->GetRowList();
         LocalizedStartFileList ret;
         FOREACH(it,list)
@@ -788,13 +749,11 @@ WidgetDAOReadOnly::WidgetStartFileList WidgetDAOReadOnly::getStartFileList() con
     //TODO check widget existance
     SQL_CONNECTION_EXCEPTION_HANDLER_BEGIN
     {
-        using namespace DPL::DB::ORM;
-        using namespace DPL::DB::ORM::wrt;
         WRT_DB_SELECT(select, WidgetStartFile, &WrtDatabase::interface())
         select->Where(Equals<WidgetStartFile::app_id>(m_widgetHandle));
         select->OrderBy("start_file_id ASC");
 
-        std::list<DPL::DB::ORM::wrt::WidgetStartFile::Row> list =
+        std::list<WidgetStartFile::Row> list =
                 select->GetRowList();
         WidgetStartFileList ret;
         FOREACH(it,list)
@@ -814,8 +773,6 @@ WindowModeList WidgetDAOReadOnly::getWindowModes() const
     //TODO check widget existance
     SQL_CONNECTION_EXCEPTION_HANDLER_BEGIN
     {
-        using namespace DPL::DB::ORM;
-        using namespace DPL::DB::ORM::wrt;
         WRT_DB_SELECT(select, WidgetWindowModes, &WrtDatabase::interface())
         select->Where(Equals<WidgetWindowModes::app_id>(m_widgetHandle));
 
@@ -845,8 +802,6 @@ WidgetCertificateDataList WidgetDAOReadOnly::getCertificateDataList() const
     //TODO check widget existance
     SQL_CONNECTION_EXCEPTION_HANDLER_BEGIN
     {
-        using namespace DPL::DB::ORM;
-        using namespace DPL::DB::ORM::wrt;
         WRT_DB_SELECT(select, WidgetCertificateFingerprint, &WrtDatabase::interface())
         select->Where(Equals<WidgetCertificateFingerprint::app_id>(
                           m_widgetHandle));
@@ -888,8 +843,6 @@ FingerPrintList WidgetDAOReadOnly::getKeyFingerprints(
     //TODO check widget existance
     SQL_CONNECTION_EXCEPTION_HANDLER_BEGIN
     {
-        using namespace DPL::DB::ORM;
-        using namespace DPL::DB::ORM::wrt;
         WRT_DB_SELECT(select, WidgetCertificateFingerprint, &WrtDatabase::interface())
         select->Where(And(And(
             Equals<WidgetCertificateFingerprint::app_id>(m_widgetHandle),
@@ -923,8 +876,6 @@ WidgetCertificateCNList WidgetDAOReadOnly::getKeyCommonNameList(
     //TODO check widget existance
     SQL_CONNECTION_EXCEPTION_HANDLER_BEGIN
     {
-        using namespace DPL::DB::ORM;
-        using namespace DPL::DB::ORM::wrt;
         WRT_DB_SELECT(select, WidgetCertificateFingerprint, &WrtDatabase::interface())
         select->Where(And(And(
             Equals<WidgetCertificateFingerprint::app_id>(m_widgetHandle),
@@ -948,14 +899,12 @@ WidgetCertificateCNList WidgetDAOReadOnly::getKeyCommonNameList(
 ResourceAttributeList WidgetDAOReadOnly::getResourceAttribute(
         const std::string &resourceId) const
 {
-    using namespace DPL::DB::ORM;
-    using namespace DPL::DB::ORM::wrt;
-    WRT_DB_SELECT(select, DPL::DB::ORM::wrt::WidgetFeature, &WrtDatabase::interface())
-    select->Where(And(Equals<DPL::DB::ORM::wrt::WidgetFeature::app_id>(m_widgetHandle),
-                      Equals<DPL::DB::ORM::wrt::WidgetFeature::name>(
+    WRT_DB_SELECT(select, WidgetFeature, &WrtDatabase::interface())
+    select->Where(And(Equals<WidgetFeature::app_id>(m_widgetHandle),
+                      Equals<WidgetFeature::name>(
                           DPL::FromUTF8String(resourceId))));
 
-    std::list<DPL::DB::ORM::wrt::WidgetFeature::Row> list = select->GetRowList();
+    std::list<WidgetFeature::Row> list = select->GetRowList();
     ResourceAttributeList result;
     if (!list.empty()) {
         int widgetFeatureId = list.begin()->Get_widget_feature_id();
@@ -973,8 +922,6 @@ void WidgetDAOReadOnly::getWidgetAccessInfo(
     //TODO check widget existance
     SQL_CONNECTION_EXCEPTION_HANDLER_BEGIN
     {
-        using namespace DPL::DB::ORM;
-        using namespace DPL::DB::ORM::wrt;
         WRT_DB_SELECT(select, WidgetWARPInfo, &WrtDatabase::interface())
         select->Where(Equals<WidgetWARPInfo::app_id>(m_widgetHandle));
 
@@ -1003,8 +950,6 @@ LanguageTags WidgetDAOReadOnly::getLanguageTags() const
     //TODO check widget existance
     SQL_CONNECTION_EXCEPTION_HANDLER_BEGIN
     {
-        using namespace DPL::DB::ORM;
-        using namespace DPL::DB::ORM::wrt;
         WRT_DB_SELECT(select, LocalizedWidgetInfo, &WrtDatabase::interface())
         select->Where(Equals<LocalizedWidgetInfo::app_id>(m_widgetHandle));
         return select->GetValueList<LocalizedWidgetInfo::widget_locale>();
@@ -1015,8 +960,6 @@ LanguageTags WidgetDAOReadOnly::getLanguageTags() const
 LanguageTags WidgetDAOReadOnly::getIconLanguageTags() const
 {
     //TODO check widget existance
-    using namespace DPL::DB::ORM;
-    using namespace DPL::DB::ORM::wrt;
     WRT_DB_SELECT(select, WidgetLocalizedIcon, &WrtDatabase::interface())
     select->Where(Equals<WidgetLocalizedIcon::app_id>(m_widgetHandle));
     select->Distinct();
@@ -1053,8 +996,6 @@ void WidgetDAOReadOnly::getWidgetSettings(
     //TODO check widget existance
     SQL_CONNECTION_EXCEPTION_HANDLER_BEGIN
     {
-        using namespace DPL::DB::ORM;
-        using namespace DPL::DB::ORM::wrt;
         WRT_DB_SELECT(select, SettingsList, &WrtDatabase::interface())
         select->Where(Equals<SettingsList::appId>(m_widgetHandle));
 
@@ -1078,11 +1019,9 @@ void WidgetDAOReadOnly::getAppServiceList(
     LogDebug("Getting getAppServiceList. Handle: " << m_widgetHandle);
     SQL_CONNECTION_EXCEPTION_HANDLER_BEGIN
     {
-        DPL::DB::ORM::wrt::ScopedTransaction transaction(&WrtDatabase::interface());
+        ScopedTransaction transaction(&WrtDatabase::interface());
         CHECK_WIDGET_EXISTENCE(transaction, m_widgetHandle)
 
-        using namespace DPL::DB::ORM;
-        using namespace DPL::DB::ORM::wrt;
         WRT_DB_SELECT(select, ApplicationServiceInfo, &WrtDatabase::interface())
         select->Where(Equals<ApplicationServiceInfo::app_id>(m_widgetHandle));
 
@@ -1117,12 +1056,10 @@ PackagingType WidgetDAOReadOnly::getPackagingType() const
 void WidgetDAOReadOnly::getEncryptedFileList(EncryptedFileList& filesList) const
 {
     //TODO check widget existance
-    using namespace DPL::DB::ORM;
-    using namespace DPL::DB::ORM::wrt;
     WRT_DB_SELECT(select, EncryptedResourceList, &WrtDatabase::interface())
     select->Where(Equals<EncryptedResourceList::app_id>(m_widgetHandle));
 
-    typedef std::list<DPL::DB::ORM::wrt::EncryptedResourceList::Row> RowList;
+    typedef std::list<EncryptedResourceList::Row> RowList;
     RowList list = select->GetRowList();
 
     FOREACH(it, list) {
@@ -1137,8 +1074,6 @@ DPL::OptionalString WidgetDAOReadOnly::getBackgroundPage() const
 {
     SQL_CONNECTION_EXCEPTION_HANDLER_BEGIN
     {
-        using namespace DPL::DB::ORM;
-        using namespace DPL::DB::ORM::wrt;
         WRT_DB_SELECT(select, WidgetExtendedInfo, &WrtDatabase::interface())
         select->Where(Equals<WidgetExtendedInfo::app_id>(m_widgetHandle));