Revert "[Tizen](ATSPI) squashed implementation"

[platform/core/uifw/dali-toolkit.git] / automated-tests / src / dali-toolkit / dali-toolkit-test-utils / toolkit-adaptor.cpp

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor.cpp
index 6300ddb..9b5d8cf 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor.cpp
@@ -24,14 +24,12 @@
 #include <dali/integration-api/adaptors/adaptor.h>
 
 #include <dali/integration-api/adaptors/scene-holder.h>
-#include <toolkit-scene-holder-impl.h>
 
 #include <toolkit-adaptor-impl.h>
 #include <dali/integration-api/debug.h>
 #include <dali/integration-api/scene.h>
 #include <test-application.h>
 #include <test-render-surface.h>
-#include <toolkit-test-application.h>
 
 namespace Dali
 {
@@ -97,7 +95,11 @@ Adaptor::~Adaptor()
 
 void Adaptor::Start( Dali::Window window )
 {
-  AddWindow( &GetImplementation( window ) );
+  if ( window )
+  {
+    mWindows.push_back( window );
+    mWindowCreatedSignal.Emit( window );
+  }
 }
 
 Integration::Scene Adaptor::GetScene( Dali::Window window )
@@ -151,53 +153,6 @@ Dali::WindowContainer Adaptor::GetWindows()
   return windows;
 }
 
-Dali::SceneHolderList Adaptor::GetSceneHolders()
-{
-  Dali::SceneHolderList sceneHolderList;
-
-  for( auto iter = mWindows.begin(); iter != mWindows.end(); ++iter )
-  {
-    sceneHolderList.push_back( Dali::Integration::SceneHolder( *iter ) );
-  }
-
-  return sceneHolderList;
-}
-
-Dali::Internal::Adaptor::SceneHolder* Adaptor::GetWindow( Dali::Actor& actor )
-{
-  Dali::Integration::Scene scene = Dali::Integration::Scene::Get( actor );
-
-  for( auto window : mWindows )
-  {
-    if ( scene == window->GetScene() )
-    {
-      return window;
-    }
-  }
-
-  return nullptr;
-}
-
-void Adaptor::AddWindow( Internal::Adaptor::SceneHolder* window )
-{
-  if ( window )
-  {
-    mWindows.push_back( window );
-
-    Dali::Integration::SceneHolder newWindow( window );
-    mWindowCreatedSignal.Emit( newWindow );
-  }
-}
-
-void Adaptor::RemoveWindow( Internal::Adaptor::SceneHolder* window )
-{
-  auto iter = std::find( mWindows.begin(), mWindows.end(), window );
-  if( iter != mWindows.end() )
-  {
-    mWindows.erase( iter );
-  }
-}
-
 Dali::Adaptor::AdaptorSignalType& Adaptor::ResizedSignal()
 {
   return mResizedSignal;
@@ -292,11 +247,6 @@ Dali::WindowContainer Adaptor::GetWindows() const
   return mImpl->GetWindows();
 }
 
-Dali::SceneHolderList Adaptor::GetSceneHolders() const
-{
-  return mImpl->GetSceneHolders();
-}
-
 Any Adaptor::GetNativeWindowHandle()
 {
   Any window;
@@ -350,24 +300,6 @@ void Adaptor::SceneCreated()
 {
 }
 
-class LogFactory : public LogFactoryInterface
-{
-public:
-  virtual void InstallLogFunction() const
-  {
-    Dali::Integration::Log::LogFunction logFunction(&ToolkitTestApplication::LogMessage);
-    Dali::Integration::Log::InstallLogFunction(logFunction);
-  }
-
-  LogFactory()
-  {
-  }
-  virtual ~LogFactory()
-  {
-  }
-};
-
-LogFactory* gLogFactory = NULL;
 const LogFactoryInterface& Adaptor::GetLogFactory()
 {
   if( gLogFactory == NULL )