[Tizen] Remove graphics-api relative codes in public-api/application.h

graphics-api is not public.
so when someone try to include #include<dali/dali.h>, It occure compile error
due to dali/graphics-api/graphics-controller.h is not exist.

This patch remove that temperal codes, and make it compilable

Change-Id: Ia42c53ceadfd7341bd060923b9036a2df94e321e
Signed-off-by: Eunki, Hong <eunkiki.hong@samsung.com>

diff --git a/automated-tests/src/dali-adaptor/utc-Dali-Application.cpp b/automated-tests/src/dali-adaptor/utc-Dali-Application.cpp
index 0091f14..0c0323f 100644 (file)
--- a/automated-tests/src/dali-adaptor/utc-Dali-Application.cpp
+++ b/automated-tests/src/dali-adaptor/utc-Dali-Application.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 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.
@@ -573,23 +573,6 @@ int UtcDaliApplicationGetObjectRegistryN(void)
   END_TEST;
 }
 
-int UtcDaliApplicationGetControllerN(void)
-{
-  Application application;
-
-  try
-  {
-    application.GetController();
-    DALI_TEST_CHECK(false); // Should not get here
-  }
-  catch(...)
-  {
-    DALI_TEST_CHECK(true);
-  }
-
-  END_TEST;
-}
-
 int UtcDaliApplicationAddIdleWithReturnValueN(void)
 {
   Application application;

diff --git a/dali/internal/adaptor/common/application-impl.cpp b/dali/internal/adaptor/common/application-impl.cpp
index 4e08ba1..dc75854 100644 (file)
--- a/dali/internal/adaptor/common/application-impl.cpp
+++ b/dali/internal/adaptor/common/application-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 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.
@@ -462,12 +462,6 @@ ApplicationPtr Application::GetPreInitializedApplication()
   return application;
 }
 
-Graphics::Controller& Application::GetController()
-{
-  auto& adaptor = Internal::Adaptor::Adaptor::GetImplementation(*mAdaptor);
-  return adaptor.GetGraphicsInterface().GetController();
-}
-
 } // namespace Adaptor
 
 } // namespace Internal

diff --git a/dali/internal/adaptor/common/application-impl.h b/dali/internal/adaptor/common/application-impl.h
index 7693c51..ed03bfa 100644 (file)
--- a/dali/internal/adaptor/common/application-impl.h
+++ b/dali/internal/adaptor/common/application-impl.h
@@ -2,7 +2,7 @@
 #define DALI_INTERNAL_APPLICATION_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 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.
@@ -324,9 +324,6 @@ public: // Signals
     return mLowMemorySignal;
   }
 
-  // Temporary to test GFXApi
-  Graphics::Controller& GetController();
-
 protected:
   /**
    * Private Constructor
@@ -400,12 +397,12 @@ private:
   Dali::Application::WINDOW_MODE mMainWindowMode; ///< Window mode of the main window
   std::string                    mMainWindowName; ///< Name of the main window as obtained from environment options
 
-  std::string          mStylesheet;
-  EnvironmentOptions   mEnvironmentOptions;
-  PositionSize         mWindowPositionSize;
-  Launchpad::State     mLaunchpadState;
-  bool                 mUseRemoteSurface;
-  WindowType           mDefaultWindowType;         ///< Default window's type. It is used when Application is created.
+  std::string        mStylesheet;
+  EnvironmentOptions mEnvironmentOptions;
+  PositionSize       mWindowPositionSize;
+  Launchpad::State   mLaunchpadState;
+  bool               mUseRemoteSurface;
+  WindowType         mDefaultWindowType; ///< Default window's type. It is used when Application is created.
 
   SlotDelegate<Application> mSlotDelegate;
 

diff --git a/dali/public-api/adaptor-framework/application.cpp b/dali/public-api/adaptor-framework/application.cpp
index 9542dff..17403d2 100644 (file)
--- a/dali/public-api/adaptor-framework/application.cpp
+++ b/dali/public-api/adaptor-framework/application.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 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.
@@ -229,11 +229,6 @@ Application::LowMemorySignalType& Application::LowMemorySignal()
   return Internal::Adaptor::GetImplementation(*this).LowMemorySignal();
 }
 
-Graphics::Controller& Application::GetController()
-{
-  return Internal::Adaptor::GetImplementation(*this).GetController();
-}
-
 Application::Application(Internal::Adaptor::Application* application)
 : BaseHandle(application)
 {

diff --git a/dali/public-api/adaptor-framework/application.h b/dali/public-api/adaptor-framework/application.h
index 1b349b1..90ed7b5 100644 (file)
--- a/dali/public-api/adaptor-framework/application.h
+++ b/dali/public-api/adaptor-framework/application.h
@@ -2,7 +2,7 @@
 #define DALI_APPLICATION_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 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.
@@ -19,7 +19,6 @@
  */
 
 // EXTERNAL INCLUDES
-#include <dali/graphics-api/graphics-controller.h>
 #include <dali/public-api/object/base-handle.h>
 #include <dali/public-api/signals/callback.h>
 
@@ -397,9 +396,6 @@ public: // Signals
    */
   LowMemorySignalType& LowMemorySignal();
 
-  // TEMPORARY TO TEST GFXAPI
-  Graphics::Controller& GetController();
-
 public: // Not intended for application developers
   /// @cond internal
   /**