Merge branch 'devel/master' into sandbox/dkdk/tizen

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

diff --git a/dali/internal/adaptor/common/application-impl.h b/dali/internal/adaptor/common/application-impl.h
old mode 100755 (executable)
new mode 100644 (file)
index 82826cd..4d3a4eb
--- 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) 2018 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.
@@ -99,7 +99,7 @@ public:
   /**
    * @copydoc Dali::Application::MainLoop()
    */
-  void MainLoop(Dali::Configuration::ContextLoss configuration);
+  void MainLoop();
 
   /**
    * @copydoc Dali::Application::Lower()
@@ -137,9 +137,9 @@ public:
   std::string GetLanguage() const;
 
   /**
-   * @copydoc Dali::Application::ReplaceWindow();
+   * @copydoc Dali::Application::GetObjectRegistry();
    */
-  void ReplaceWindow( const PositionSize& positionSize, const std::string& name);
+  Dali::ObjectRegistry GetObjectRegistry() const;
 
   /**
    * @copydoc Dali::Application::GetResourcePath();
@@ -158,100 +158,72 @@ public:
    */
   static ApplicationPtr GetPreInitializedApplication();
 
-public: // Stereoscopy
-
-  /**
-   * @copydoc Dali::Application::SetViewMode()
-   */
-  void SetViewMode( ViewMode viewMode );
-
-  /**
-   * @copydoc Dali::Application::GetViewMode()
-   */
-  ViewMode GetViewMode() const;
-
-  /**
-   * @copydoc Dali::Application::SetStereoBase()
-   */
-  void SetStereoBase( float stereoBase );
-
-  /**
-   * @copydoc Dali::Application::GetStereoBase()
-   */
-  float GetStereoBase() const;
-
 public: // From Framework::Observer
 
   /**
    * Called when the framework is initialised.
    */
-  virtual void OnInit();
+  void OnInit() override;
 
   /**
    * Called when the framework is terminated.
    */
-  virtual void OnTerminate();
+  void OnTerminate() override;
 
   /**
    * Called when the framework is paused.
    */
-  virtual void OnPause();
+  void OnPause() override;
 
   /**
    * Called when the framework resumes from a paused state.
    */
-  virtual void OnResume();
+  void OnResume() override;
 
   /**
   * Called when the framework received AppControlSignal.
   * @param[in] The bundle data of AppControl event.
   */
-  virtual void OnAppControl(void *data);
+  void OnAppControl(void *data) override;
 
   /**
    * Called when the framework informs the application that it should reset itself.
    */
-  virtual void OnReset();
+  void OnReset() override;
 
   /**
    * Called when the framework informs the application that the language of the device has changed.
    */
-  virtual void OnLanguageChanged();
+  void OnLanguageChanged() override;
 
   /**
   * Called when the framework informs the application that the region of the device has changed.
   */
-  virtual void OnRegionChanged();
+  void OnRegionChanged() override;
 
   /**
   * Called when the framework informs the application that the battery level of the device is low.
   */
-  virtual void OnBatteryLow( Dali::DeviceStatus::Battery::Status status );
+  void OnBatteryLow( Dali::DeviceStatus::Battery::Status status ) override;
 
   /**
   * Called when the framework informs the application that the memory level of the device is low.
   */
-  virtual void OnMemoryLow( Dali::DeviceStatus::Memory::Status status );
+  void OnMemoryLow( Dali::DeviceStatus::Memory::Status status ) override;
 
   /**
    * Called when the framework informs the application that the platform surface is created.
    */
-  virtual void OnSurfaceCreated( Any newSurface );
+  void OnSurfaceCreated( Any newSurface ) override;
 
   /**
    * Called when the framework informs the application that the platform surface is destroyed.
    */
-  virtual void OnSurfaceDestroyed( Any newSurface );
+  void OnSurfaceDestroyed( Any newSurface ) override;
 
 public:
 
   /**
-   * Signal handler when the adaptor's window resizes itself.
-   * @param[in]  adaptor  The adaptor
-   */
-  void OnResize(Dali::Adaptor& adaptor);
-
-  /**
    * Sets a user defined theme file.
    * This should be called before initialization.
    * @param[in] stylesheet The path to user defined theme file
@@ -299,11 +271,6 @@ public:  // Signals
   Dali::Application::AppControlSignalType& AppControlSignal() { return mAppControlSignal; }
 
   /**
-   * @copydoc Dali::Application::ResizeSignal()
-   */
-  Dali::Application::AppSignalType& ResizeSignal() { return mResizeSignal; }
-
-  /**
    * @copydoc Dali::Application::LanguageChangedSignal()
    */
   Dali::Application::AppSignalType& LanguageChangedSignal() { return mLanguageChangedSignal; }
@@ -314,16 +281,6 @@ public:  // Signals
   Dali::Application::AppSignalType& RegionChangedSignal() { return mRegionChangedSignal; }
 
   /**
-  * @copydoc Dali::Application::BatteryLowSignal()
-  */
-  Dali::Application::AppSignalType& BatteryLowSignal() { return mBatteryLowSignal; }
-
-  /**
-  * @copydoc Dali::Application::MemoryLowSignal()
-  */
-  Dali::Application::AppSignalType& MemoryLowSignal() { return mMemoryLowSignal; }
-
-  /**
   * @copydoc Dali::Application::LowBatterySignal()
   */
   Dali::Application::LowBatterySignalType& LowBatterySignal() { return mLowBatterySignal; }
@@ -350,7 +307,7 @@ protected:
   /**
    * Destructor
    */
-  virtual ~Application();
+  ~Application() override;
 
   // Undefined
   Application(const Application&);
@@ -383,19 +340,15 @@ private:
   AppSignalType                         mPauseSignal;
   AppSignalType                         mResumeSignal;
   AppSignalType                         mResetSignal;
-  AppSignalType                         mResizeSignal;
   AppControlSignalType                  mAppControlSignal;
   AppSignalType                         mLanguageChangedSignal;
   AppSignalType                         mRegionChangedSignal;
-  AppSignalType                         mBatteryLowSignal;
-  AppSignalType                         mMemoryLowSignal;
   LowBatterySignalType                  mLowBatterySignal;
   LowMemorySignalType                   mLowMemorySignal;
 
   EventLoop*                            mEventLoop;
   Framework*                            mFramework;
 
-  Dali::Configuration::ContextLoss      mContextLossConfiguration;
   CommandLineOptions*                   mCommandLineOptions;
 
   Dali::Internal::Adaptor::AdaptorBuilder* mAdaptorBuilder;   ///< The adaptor builder
@@ -407,8 +360,6 @@ 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
 
-  bool                                     mMainWindowReplaced;   ///< Whether the main window has been replaced
-
   std::string                              mStylesheet;
   EnvironmentOptions                       mEnvironmentOptions;
   PositionSize                             mWindowPositionSize;
@@ -417,9 +368,6 @@ private:
 
   SlotDelegate< Application >              mSlotDelegate;
 
-  ViewMode                                 mViewMode;
-  float                                    mStereoBase;
-
   static ApplicationPtr                    gPreInitializedApplication;
 };