X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Ffocus-manager%2Fkeyinput-focus-manager.h;h=856f4e3c75fb3682d91282511b896728f1a2228f;hb=443e920238427ac044e165b0e6f9c58ae67d62e0;hp=31619907a15e8fe4aec304af2663c705241a102b;hpb=aa906fd49430568986b95c51bd29f3a58c33272f;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/devel-api/focus-manager/keyinput-focus-manager.h b/dali-toolkit/devel-api/focus-manager/keyinput-focus-manager.h index 3161990..856f4e3 100644 --- a/dali-toolkit/devel-api/focus-manager/keyinput-focus-manager.h +++ b/dali-toolkit/devel-api/focus-manager/keyinput-focus-manager.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_KEYINPUT_FOCUS_MANAGER_H__ -#define __DALI_TOOLKIT_KEYINPUT_FOCUS_MANAGER_H__ +#ifndef DALI_TOOLKIT_KEYINPUT_FOCUS_MANAGER_H +#define DALI_TOOLKIT_KEYINPUT_FOCUS_MANAGER_H /* - * Copyright (c) 2015 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. @@ -23,10 +23,8 @@ namespace Dali { - namespace Toolkit { - namespace Internal DALI_INTERNAL { class KeyInputFocusManager; @@ -45,15 +43,13 @@ class KeyInputFocusManager; * |----------------------|-----------------------------------| * | keyInputFocusChanged | @ref KeyInputFocusChangedSignal() | */ -class DALI_IMPORT_API KeyInputFocusManager : public BaseHandle +class DALI_TOOLKIT_API KeyInputFocusManager : public BaseHandle { public: - // KeyInputFocusChanged - typedef Signal< void (Control, Control) > KeyInputFocusChangedSignalType; + typedef Signal KeyInputFocusChangedSignalType; public: - /** * Create a KeyInputFocusManager handle; this can be initialised with KeyInputFocusManager::Get() * Calling member functions with an uninitialised handle is not allowed. @@ -100,7 +96,6 @@ public: void RemoveFocus(Control control); public: // Signals - /** * This signal is emitted when the key input focus control changes. * Two control parameters are sent as part of this signal, the first being the signal that now has the focus, the second @@ -114,8 +109,7 @@ public: // Signals KeyInputFocusChangedSignalType& KeyInputFocusChangedSignal(); private: - - explicit DALI_INTERNAL KeyInputFocusManager(Internal::KeyInputFocusManager *impl); + explicit DALI_INTERNAL KeyInputFocusManager(Internal::KeyInputFocusManager* impl); }; // class KeyInputFocusManager @@ -123,4 +117,4 @@ private: } // namespace Dali -#endif // __DALI_TOOLKIT_KEYINPUT_FOCUS_MANAGER_H__ +#endif // DALI_TOOLKIT_KEYINPUT_FOCUS_MANAGER_H