merge with master

[platform/framework/web/wrt-plugins-common.git] / src / plugin-loading / plugin_container_support.cpp

diff --git a/src/plugin-loading/plugin_container_support.cpp b/src/plugin-loading/plugin_container_support.cpp
index 4518b0f..5565e96 100644 (file)
--- a/src/plugin-loading/plugin_container_support.cpp
+++ b/src/plugin-loading/plugin_container_support.cpp
@@ -36,7 +36,7 @@ using namespace WrtDB;
 
 #include <dpl/wrt-dao-ro/widget_dao_read_only.h>
 
-PluginContainerSupport::PluginContainerSupport(): m_initialized(false)
+PluginContainerSupport::PluginContainerSupport() : m_initialized(false)
 {
     // Reading standard features list from file
     readStandardFeaturesList();
@@ -56,14 +56,14 @@ PluginContainerSupport::~PluginContainerSupport()
 
 void PluginContainerSupport::Initialize(int widgetHandle)
 {
-    if (isInitialized() == false)
-    {
+    if (isInitialized() == false) {
         readAllowedPlugins(widgetHandle);
         readRootPlugins(widgetHandle);
     }
 }
 
-std::list<std::string> PluginContainerSupport::getAllowedFeatures(int widgetHandle) const
+std::list<std::string> PluginContainerSupport::getAllowedFeatures(
+    int widgetHandle) const
 {
     //TODO it has to return LIST NOT SET!!!
     WidgetDAOReadOnly widgetDao(widgetHandle);
@@ -74,7 +74,7 @@ std::list<std::string> PluginContainerSupport::getAllowedFeatures(int widgetHand
         LogInfo("Loading api-feature: " << it->name);
         if (it->rejected) {
             LogWarning("Api-feature was rejected by ace. (Api-feature name: "
-                       << it->name << ")" );
+                       << it->name << ")");
             continue;
         }
 
@@ -93,8 +93,11 @@ void PluginContainerSupport::readAllowedPlugins(int widgetHandle)
     }
 
     FeatureData* dt = NULL;
-    std::map<FeatureHandle, FeatureData> featureDataList = FeatureDAOReadOnly::GetFeatures(allowedFeatures);
-    DeviceCapList deviceCapabilities = FeatureDAOReadOnly::GetDevCapWithFeatureHandle();
+    std::map<FeatureHandle,
+             FeatureData> featureDataList = FeatureDAOReadOnly::GetFeatures(
+            allowedFeatures);
+    DeviceCapList deviceCapabilities =
+        FeatureDAOReadOnly::GetDevCapWithFeatureHandle();
     FOREACH(data, featureDataList) {
         dt = &(data->second);
         registerPluginModel(dt->pluginHandle);
@@ -117,7 +120,11 @@ void PluginContainerSupport::readRootPlugins(int widgetHandle)
     m_initialized = true;
 }
 
-void PluginContainerSupport::registerFeatureModel(FeatureHandle handle, FeatureData* data, DeviceCapList deviceCapabilities)
+void PluginContainerSupport::registerFeatureModel(
+    FeatureHandle handle,
+    FeatureData* data,
+    DeviceCapList
+    deviceCapabilities)
 {
     LogDebug("Analyzing feature: " << handle);
     FeatureModelPtr model = getFeatureModel(handle);
@@ -277,8 +284,7 @@ PluginContainerSupport::getStandardPlugins() const
     FOREACH(it, features)
     {
         auto plugin = getPluginModel(*it);
-        if(!plugin)
-        {
+        if (!plugin) {
             LogError("PluginModel not found");
             continue;
         }
@@ -307,5 +313,5 @@ PluginContainerSupport::getPluginsList() const
 PluginModelPtr
 PluginContainerSupport::getPluginForFeature(const std::string& featureName)
 {
-   return getPluginModel(getFeatureModel(featureName));
+    return getPluginModel(getFeatureModel(featureName));
 }