Check NULL pointer dereference of the return value

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

diff --git a/adaptors/common/application-impl.h b/adaptors/common/application-impl.h
index 64ce521..aeadb17 100644 (file)
--- a/adaptors/common/application-impl.h
+++ b/adaptors/common/application-impl.h
@@ -2,7 +2,7 @@
 #define __DALI_INTERNAL_APPLICATION_H__
 
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 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.
@@ -28,6 +28,7 @@
 
 #include <framework.h>
 #include <window-impl.h>
+#include <base/environment-options.h>
 
 namespace Dali
 {
@@ -53,29 +54,20 @@ typedef IntrusivePtr<Application> ApplicationPtr;
 class Application : public BaseObject, public Framework::Observer
 {
 public:
-
   typedef Dali::Application::AppSignalType AppSignalType;
   typedef Dali::Application::AppControlSignalType AppControlSignalType;
+  typedef Dali::Application::WINDOW_MODE WINDOW_MODE;
 
   /**
-   * Constructor
-   * @param[in]  app         The public instance of the Application
+   * Create a new application
    * @param[in]  argc        A pointer to the number of arguments
    * @param[in]  argv        A pointer to the argument list
-   * @param[in]  name        A name of application
-   * @param[in]  baseLayout  The base layout that the application has been written for
+   * @param[in]  stylesheet  The path to user defined theme file
    * @param[in]  windowMode  A member of Dali::Application::WINDOW_MODE
+   * @param[in]  applicationType  A member of Dali::Framework::Type
    */
-  static ApplicationPtr New(int* argc, char **argv[], const std::string& name,
-                            const DeviceLayout& baseLayout,
-                            Dali::Application::WINDOW_MODE windowMode);
-
-  Application( int* argc, char **argv[], const std::string& name, const DeviceLayout& baseLayout, Dali::Application::WINDOW_MODE windowMode );
-
-  /**
-   * Destructor
-   */
-  virtual ~Application();
+  static ApplicationPtr New( int* argc, char **argv[], const std::string& stylesheet,
+    WINDOW_MODE windowMode, Framework::Type applicationType );
 
 public:
 
@@ -110,19 +102,14 @@ public:
   Dali::Window GetWindow();
 
   /**
-   * @copydoc Dali::Application::GetTheme();
+   * @copydoc Dali::Application::ReplaceWindow();
    */
-  const std::string& GetTheme();
+  void ReplaceWindow(PositionSize windowPosition, const std::string& name);
 
   /**
-   * @copydoc Dali::Application::SetTheme();
+   * @copydoc Dali::Application::GetResourcePath();
    */
-  void SetTheme(const std::string& themeFilePath);
-
-  /**
-   * @copydoc Dali::Application::ReplaceWindow();
-   */
-  void ReplaceWindow(PositionSize windowPosition, const std::string& name);
+  static std::string GetResourcePath();
 
 public: // Stereoscopy
 
@@ -146,6 +133,33 @@ public: // Stereoscopy
    */
   float GetStereoBase() const;
 
+public: // Lifecycle functionality
+
+  /**
+   * Called when OnInit is called or the framework is initialised.
+   */
+  void DoInit();
+
+  /**
+   * Called when OnTerminate is called or the framework is terminated.
+   */
+  void DoTerminate();
+
+  /**
+   * Called when OnPause is called or the framework is paused.
+   */
+  void DoPause();
+
+  /**
+   * Called when OnResume is called or the framework resumes from a paused state.
+   */
+  void DoResume();
+
+  /**
+   * Called when OnLanguageChanged is called or the framework informs the application that the language of the device has changed.
+   */
+  void DoLanguageChange();
+
 public: // From Framework::Observer
 
   /**
@@ -264,13 +278,27 @@ public:  // Signals
   */
   Dali::Application::AppSignalType& MemoryLowSignal() { return mMemoryLowSignal; }
 
-private:
+protected:
+
+  /**
+   * Private Constructor
+   * @param[in]  argc        A pointer to the number of arguments
+   * @param[in]  argv        A pointer to the argument list
+   * @param[in]  stylesheet  The path to user defined theme file
+   * @param[in]  windowMode  A member of Dali::Application::WINDOW_MODE
+   */
+  Application( int* argc, char **argv[], const std::string& stylesheet,
+      WINDOW_MODE windowMode, Framework::Type applicationType );
+
+  /**
+   * Destructor
+   */
+  virtual ~Application();
 
   // Undefined
   Application(const Application&);
   Application& operator=(Application&);
 
-private:
   /**
    * Creates the window
    */
@@ -300,7 +328,6 @@ private:
   AppSignalType                           mBatteryLowSignal;
   AppSignalType                           mMemoryLowSignal;
 
-
   EventLoop*                            mEventLoop;
   Framework*                            mFramework;
 
@@ -312,9 +339,9 @@ private:
   Dali::Window                          mWindow;
   Dali::Application::WINDOW_MODE        mWindowMode;
   std::string                           mName;
-
-  bool                                  mInitialized;
-  DeviceLayout                          mBaseLayout;
+  std::string                           mStylesheet;
+  EnvironmentOptions                    mEnvironmentOptions;
+  bool                                  mUseRemoteSurface;
 
   SlotDelegate< Application >           mSlotDelegate;
 };