Revert "[Tizen] Add GlWindow"

[platform/core/uifw/dali-adaptor.git] / dali / internal / offscreen / common / offscreen-application-impl.h

diff --git a/dali/internal/offscreen/common/offscreen-application-impl.h b/dali/internal/offscreen/common/offscreen-application-impl.h
index 2fcada4..fdd5fa8 100644 (file)
--- a/dali/internal/offscreen/common/offscreen-application-impl.h
+++ b/dali/internal/offscreen/common/offscreen-application-impl.h
@@ -20,17 +20,13 @@
 
 // EXTERNAL INCLUDES
 #include <memory>
-
-#include <dali/integration-api/adaptor-framework/scene-holder-impl.h>
 #include <dali/public-api/common/intrusive-ptr.h>
 #include <dali/public-api/object/base-object.h>
-#include <dali/public-api/signals/connection-tracker.h>
 
 // INTERNAL INCLUDES
 #include <dali/devel-api/adaptor-framework/offscreen-application.h>
 #include <dali/devel-api/adaptor-framework/offscreen-window.h>
-
-using RenderMode = Dali::OffscreenApplication::RenderMode;
+#include <dali/integration-api/adaptor-framework/scene-holder-impl.h>
 
 namespace Dali
 {
@@ -42,12 +38,11 @@ namespace Internal
 /**
  * Implementation of the OffscreenApplication class.
  */
-class OffscreenApplication : public BaseObject,
-                   public ConnectionTracker
+class OffscreenApplication : public BaseObject
 {
 public:
 
-  typedef Dali::OffscreenApplication::OffscreenApplicationSignalType OffscreenApplicationSignalType;
+  using OffscreenApplicationSignalType = Dali::OffscreenApplication::OffscreenApplicationSignalType;
 
   /**
    * @brief Create a new OffscreenApplication
@@ -55,12 +50,18 @@ public:
    * @param[in] height The height of the default OffscreenWindow
    * @param[in] surface The native surface handle to create the default OffscreenWindow
    * @param[in] isTranslucent Whether the OffscreenWindow is translucent or not
+   * @param[in] renderMode The RenderMode of the OffscreenApplication
    */
-  static IntrusivePtr<OffscreenApplication> New( uint16_t width, uint16_t height, Dali::Any surface, bool isTranslucent, RenderMode renderMode);
+  static IntrusivePtr<OffscreenApplication> New( uint16_t width, uint16_t height, Dali::Any surface, bool isTranslucent, Dali::OffscreenApplication::RenderMode renderMode);
 
 public:
 
   /**
+   * Destructor
+   */
+  virtual ~OffscreenApplication() = default;
+
+  /**
    * @copydoc Dali::OffscreenApplication::Start()
    */
   void Start();
@@ -105,21 +106,16 @@ private:
    * @param[in] height The height of the OffscreenApplication
    * @param[in] surface The native surface handle to create the default OffscreenWindow
    * @param[in] isTranslucent Whether the OffscreenWindow is translucent or not
+   * @param[in] renderMode The RenderMode of the OffscreenApplication
    */
-  OffscreenApplication( uint16_t width, uint16_t height, Dali::Any surface, bool isTranslucent, RenderMode renderMode );
-
-
-  /**
-   * Destructor
-   */
-  virtual ~OffscreenApplication();
+  OffscreenApplication( uint16_t width, uint16_t height, Dali::Any surface, bool isTranslucent, Dali::OffscreenApplication::RenderMode renderMode );
 
   // Undefined
   OffscreenApplication( const OffscreenApplication& );
   OffscreenApplication& operator=( OffscreenApplication& );
 
 private:
-  Dali::Adaptor*                           mAdaptor;
+  std::unique_ptr< Dali::Adaptor >          mAdaptor;
   Dali::OffscreenWindow                     mDefaultWindow;
 
   OffscreenApplicationSignalType              mInitSignal;