From 0427f0733297887a3402377de6a083de0e32ce71 Mon Sep 17 00:00:00 2001
From: Adeel Kazmi <adeel.kazmi@samsung.com>
Date: Fri, 16 Dec 2016 13:48:38 +0000
Subject: [PATCH] Fix SVACE error in KeyboardFocusManager

Change-Id: I3655d30201f7e4554cb3b7a141c84b62b1270d97
---
 .../focus-manager/keyboard-focus-manager-impl.cpp       | 17 +++++++++++------
 .../focus-manager/keyboard-focus-manager-impl.h         |  2 --
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp b/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
index 1645dcd..a9822e7 100644
--- a/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
+++ b/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
@@ -110,13 +110,18 @@ Toolkit::KeyboardFocusManager KeyboardFocusManager::Get()
 }
 
 KeyboardFocusManager::KeyboardFocusManager()
-: mCurrentFocusActor(0),
+: mPreFocusChangeSignal(),
+  mFocusChangedSignal(),
+  mFocusGroupChangedSignal(),
+  mFocusedActorEnterKeySignal(),
+  mCurrentFocusActor( 0 ),
   mFocusIndicatorActor(),
-  mFocusGroupLoopEnabled(false),
-  mIsKeyboardFocusEnabled(false),
-  mIsFocusIndicatorEnabled(false),
-  mIsWaitingKeyboardFocusChangeCommit(false),
-  mSlotDelegate(this)
+  mFocusGroupLoopEnabled( false ),
+  mIsKeyboardFocusEnabled( false ),
+  mIsFocusIndicatorEnabled( false ),
+  mIsWaitingKeyboardFocusChangeCommit( false ),
+  mFocusHistory(),
+  mSlotDelegate( this )
 {
   OnPhysicalKeyboardStatusChanged(PhysicalKeyboard::Get());
 
diff --git a/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.h b/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.h
index aa5bcd3..1ece0b1 100644
--- a/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.h
+++ b/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.h
@@ -262,8 +262,6 @@ private:
 
   FocusStack mFocusHistory; ///< Stack to contain pre-focused actor's BaseObject*
 
-  FocusStackIterator mFocusHistoryIter; ///< Iterator for mFocusHistory
-
   SlotDelegate< KeyboardFocusManager > mSlotDelegate;
 
 };
-- 
2.7.4