Merge "Cleanup for removal of ImageAttributes from public API" into tizen

[platform/core/uifw/dali-toolkit.git] / automated-tests / src / dali-toolkit / dali-toolkit-test-utils / toolkit-accessibility-manager.h

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-accessibility-manager.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-accessibility-manager.h
index 5365e77..6a4b122 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-accessibility-manager.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-accessibility-manager.h
@@ -4,26 +4,28 @@
 #ifndef __DALI_TOOLKIT_ACCESSIBILITY_MANAGER_H__
 #define __DALI_TOOLKIT_ACCESSIBILITY_MANAGER_H__
 
-//
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Flora License, Version 1.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://floralicense.org/license/
-//
-// 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.
-//
+/*
+ * Copyright (c) 2014 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.
+ * 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.
+ *
+ */
 
 // EXTERNAL INCLUDES
 #include <string>
-
-#include <dali/dali.h>
+#include <dali/public-api/object/base-handle.h>
+#include <dali/public-api/signals/dali-signal.h>
+#include <dali/public-api/events/touch-point.h>
 
 namespace Dali
 {
@@ -44,11 +46,11 @@ class TouchPoint;
 class AccessibilityManager : public BaseHandle
 {
 public: // Typedefs
-  typedef SignalV2< bool ( AccessibilityManager& ) > AccessibilityActionSignalV2;
+  typedef Signal< bool ( AccessibilityManager& ) > AccessibilityActionSignalType;
 
 public: // Construction & Destruction
   AccessibilityManager();
-  virtual ~AccessibilityManager();
+  ~AccessibilityManager();
 
 public: // Getters
   static AccessibilityManager Get();
@@ -71,18 +73,18 @@ public: // Getters
   void HandleActionDisableEvent();
 
 public:  // Signals
-  AccessibilityActionSignalV2& StatusChangedSignal();
-  AccessibilityActionSignalV2& ActionNextSignal();
-  AccessibilityActionSignalV2& ActionPreviousSignal();
-  AccessibilityActionSignalV2& ActionActivateSignal();
-  AccessibilityActionSignalV2& ActionReadSignal();
-  AccessibilityActionSignalV2& ActionOverSignal();
-  AccessibilityActionSignalV2& ActionReadNextSignal();
-  AccessibilityActionSignalV2& ActionReadPreviousSignal();
-  AccessibilityActionSignalV2& ActionUpSignal();
-  AccessibilityActionSignalV2& ActionDownSignal();
-  AccessibilityActionSignalV2& ActionClearFocusSignal();
-  AccessibilityActionSignalV2& ActionBackSignal();
+  AccessibilityActionSignalType& StatusChangedSignal();
+  AccessibilityActionSignalType& ActionNextSignal();
+  AccessibilityActionSignalType& ActionPreviousSignal();
+  AccessibilityActionSignalType& ActionActivateSignal();
+  AccessibilityActionSignalType& ActionReadSignal();
+  AccessibilityActionSignalType& ActionOverSignal();
+  AccessibilityActionSignalType& ActionReadNextSignal();
+  AccessibilityActionSignalType& ActionReadPreviousSignal();
+  AccessibilityActionSignalType& ActionUpSignal();
+  AccessibilityActionSignalType& ActionDownSignal();
+  AccessibilityActionSignalType& ActionClearFocusSignal();
+  AccessibilityActionSignalType& ActionBackSignal();
 
   AccessibilityManager( Internal::Adaptor::AccessibilityManager* manager );
 };