Merge branch 'devel/master' into sandbox/dkdk/tizen

[platform/core/uifw/dali-adaptor.git] / dali / devel-api / adaptor-framework / input-method-options.cpp

diff --git a/dali/devel-api/adaptor-framework/input-method-options.cpp b/dali/devel-api/adaptor-framework/input-method-options.cpp
index f354933..a93b9f0 100644 (file)
--- a/dali/devel-api/adaptor-framework/input-method-options.cpp
+++ b/dali/devel-api/adaptor-framework/input-method-options.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,31 +18,27 @@
 // CLASS HEADER
 #include <dali/devel-api/adaptor-framework/input-method-options.h>
 
-// INTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/input-method-devel.h>
-
 using namespace Dali::InputMethod;
 using namespace Dali::InputMethod::Category;
 
 namespace Dali
 {
-
 #define TOKEN_STRING(x) #x
 
 struct InputMethodOptions::Impl
 {
   Impl()
   {
-    mPanelLayout = PanelLayout::NORMAL;
-    mAutoCapital = AutoCapital::SENTENCE;
-    mActionButton = ActionButtonTitle::DEFAULT;
-    mVariation = NormalLayout::NORMAL;
+    mPanelLayout  = PanelLayout::NORMAL;
+    mAutoCapital  = AutoCapital::SENTENCE;
+    mButtonAction = ButtonAction::DEFAULT;
+    mVariation    = NormalLayout::NORMAL;
   }
 
-  PanelLayout::Type mPanelLayout;
-  AutoCapital::Type mAutoCapital;
-  ActionButtonTitle::Type mActionButton;
-  int mVariation:4;
+  PanelLayout::Type  mPanelLayout;
+  AutoCapital::Type  mAutoCapital;
+  ButtonAction::Type mButtonAction;
+  int                mVariation : 4;
 };
 
 InputMethodOptions::InputMethodOptions()
@@ -56,52 +52,52 @@ InputMethodOptions::~InputMethodOptions()
   // for unique_ptr to work with forward declaration
 }
 
-bool InputMethodOptions::IsPassword()
+bool InputMethodOptions::IsPassword() const
 {
   return (mImpl->mPanelLayout == Dali::InputMethod::PanelLayout::PASSWORD);
 }
 
-void InputMethodOptions::ApplyProperty( const Property::Map& settings )
+void InputMethodOptions::ApplyProperty(const Property::Map& settings)
 {
-  for ( unsigned int i = 0, count = settings.Count(); i < count; ++i )
+  for(unsigned int i = 0, count = settings.Count(); i < count; ++i)
   {
-    Property::Key key = settings.GetKeyAt( i );
-    if( key.type == Property::Key::INDEX )
+    Property::Key key = settings.GetKeyAt(i);
+    if(key.type == Property::Key::INDEX)
     {
       continue;
     }
 
     Property::Value item = settings.GetValue(i);
 
-    if( key == TOKEN_STRING( PANEL_LAYOUT ) )
+    if(key == TOKEN_STRING(PANEL_LAYOUT))
     {
-      if( item.GetType() == Property::INTEGER )
+      if(item.GetType() == Property::INTEGER)
       {
-        int value = item.Get< int >();
+        int value           = item.Get<int>();
         mImpl->mPanelLayout = static_cast<InputMethod::PanelLayout::Type>(value);
       }
     }
-    else if ( key == TOKEN_STRING( AUTO_CAPITALISE ) )
+    else if(key == TOKEN_STRING(BUTTON_ACTION))
     {
-      if ( item.GetType() == Property::INTEGER )
+      if(item.GetType() == Property::INTEGER)
       {
-        int value = item.Get< int >();
-        mImpl->mAutoCapital = static_cast<InputMethod::AutoCapital::Type>(value);
+        int value            = item.Get<int>();
+        mImpl->mButtonAction = static_cast<InputMethod::ButtonAction::Type>(value);
       }
     }
-    else if ( key == TOKEN_STRING( ACTION_BUTTON ) )
+    else if(key == TOKEN_STRING(AUTO_CAPITALIZE))
     {
-      if ( item.GetType() == Property::INTEGER )
+      if(item.GetType() == Property::INTEGER)
       {
-        int value = item.Get< int >();
-        mImpl->mActionButton = static_cast<InputMethod::ActionButtonTitle::Type>(value);
+        int value           = item.Get<int>();
+        mImpl->mAutoCapital = static_cast<InputMethod::AutoCapital::Type>(value);
       }
     }
-    else if( key == TOKEN_STRING( VARIATION ) )
+    else if(key == TOKEN_STRING(VARIATION))
     {
-      if( item.GetType() == Property::INTEGER )
+      if(item.GetType() == Property::INTEGER)
       {
-        int value = item.Get< int >();
+        int value         = item.Get<int>();
         mImpl->mVariation = value;
       }
     }
@@ -111,57 +107,57 @@ void InputMethodOptions::ApplyProperty( const Property::Map& settings )
   }
 }
 
-void InputMethodOptions::RetrieveProperty( Property::Map& settings )
+void InputMethodOptions::RetrieveProperty(Property::Map& settings)
 {
-  settings[TOKEN_STRING( PANEL_LAYOUT )] = mImpl->mPanelLayout;
-  settings[TOKEN_STRING( AUTO_CAPITALISE )] = mImpl->mAutoCapital;
-  settings[TOKEN_STRING( ACTION_BUTTON )] = mImpl->mActionButton;
-  settings[TOKEN_STRING( VARIATION )] = mImpl->mVariation;
+  settings[TOKEN_STRING(PANEL_LAYOUT)]    = mImpl->mPanelLayout;
+  settings[TOKEN_STRING(BUTTON_ACTION)]   = mImpl->mButtonAction;
+  settings[TOKEN_STRING(AUTO_CAPITALIZE)] = mImpl->mAutoCapital;
+  settings[TOKEN_STRING(VARIATION)]       = mImpl->mVariation;
 }
 
-bool InputMethodOptions::CompareAndSet( InputMethod::Category::Type type, const InputMethodOptions& options, int& index)
+bool InputMethodOptions::CompareAndSet(InputMethod::Category::Type type, const InputMethodOptions& options, int& index)
 {
   bool updated = false;
 
-  switch (type)
+  switch(type)
   {
     case PANEL_LAYOUT:
     {
-      if ( options.mImpl->mPanelLayout != mImpl->mPanelLayout )
+      if(options.mImpl->mPanelLayout != mImpl->mPanelLayout)
       {
         mImpl->mPanelLayout = options.mImpl->mPanelLayout;
-        index = static_cast<int>(mImpl->mPanelLayout);
-        updated = true;
+        index               = static_cast<int>(mImpl->mPanelLayout);
+        updated             = true;
       }
       break;
     }
-    case AUTO_CAPITALISE:
+    case BUTTON_ACTION:
     {
-      if ( options.mImpl->mAutoCapital != mImpl->mAutoCapital )
+      if(options.mImpl->mButtonAction != mImpl->mButtonAction)
       {
-        mImpl->mAutoCapital = options.mImpl->mAutoCapital;
-        index = static_cast<int>(mImpl->mAutoCapital);
-        updated = true;
+        mImpl->mButtonAction = options.mImpl->mButtonAction;
+        index                = static_cast<int>(mImpl->mButtonAction);
+        updated              = true;
       }
       break;
     }
-    case ACTION_BUTTON_TITLE:
+    case AUTO_CAPITALIZE:
     {
-      if ( options.mImpl->mActionButton != mImpl->mActionButton )
+      if(options.mImpl->mAutoCapital != mImpl->mAutoCapital)
       {
-        mImpl->mActionButton = options.mImpl->mActionButton;
-        index = static_cast<int>(mImpl->mActionButton);
-        updated = true;
+        mImpl->mAutoCapital = options.mImpl->mAutoCapital;
+        index               = static_cast<int>(mImpl->mAutoCapital);
+        updated             = true;
       }
       break;
     }
     case VARIATION:
     {
-      if ( options.mImpl->mVariation != mImpl->mVariation )
+      if(options.mImpl->mVariation != mImpl->mVariation)
       {
         mImpl->mVariation = options.mImpl->mVariation;
-        index = static_cast<int>(mImpl->mVariation);
-        updated = true;
+        index             = static_cast<int>(mImpl->mVariation);
+        updated           = true;
       }
       break;
     }