Move DEPRECATED tags to the top of the description

[platform/core/uifw/dali-adaptor.git] / dali / public-api / adaptor-framework / application.h

diff --git a/dali/public-api/adaptor-framework/application.h b/dali/public-api/adaptor-framework/application.h
index 5757300..e661684 100644 (file)
--- a/dali/public-api/adaptor-framework/application.h
+++ b/dali/public-api/adaptor-framework/application.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_APPLICATION_H__
-#define __DALI_APPLICATION_H__
+#ifndef DALI_APPLICATION_H
+#define DALI_APPLICATION_H
 
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 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 <string>
 #include <dali/public-api/common/view-mode.h>
 #include <dali/public-api/object/base-handle.h>
 #include <dali/public-api/signals/callback.h>
@@ -104,7 +103,7 @@ class Application;
  * When the above options are found, they are stripped from argv, and argc is updated appropriately.
  * @SINCE_1_0.0
  */
-class DALI_IMPORT_API Application : public BaseHandle
+class DALI_ADAPTOR_API Application : public BaseHandle
 {
 public:
 
@@ -267,6 +266,7 @@ public:
    * @code
    *   void MyFunction();
    * @endcode
+   * This callback will be deleted once it is called.
    *
    * @note Ownership of the callback is passed onto this class.
    */
@@ -321,6 +321,7 @@ public:
 public: // Stereoscopy
 
   /**
+   * @DEPRECATED_1_3_51
    * @brief Sets the viewing mode for the application.
    * @SINCE_1_0.0
    * @param[in] viewMode The new viewing mode
@@ -328,6 +329,7 @@ public: // Stereoscopy
   void SetViewMode( ViewMode viewMode );
 
   /**
+   * @DEPRECATED_1_3_51
    * @brief Gets the current viewing mode.
    * @SINCE_1_0.0
    * @return The current viewing mode
@@ -335,6 +337,7 @@ public: // Stereoscopy
   ViewMode GetViewMode() const;
 
   /**
+   * @DEPRECATED_1_3_51
    * @brief Sets the stereo base (eye separation) for Stereoscopic 3D.
    *
    * The stereo base is the distance in millimetres between the eyes. Typical values are
@@ -345,6 +348,7 @@ public: // Stereoscopy
   void SetStereoBase( float stereoBase );
 
   /**
+   * @DEPRECATED_1_3_51
    * @brief Gets the stereo base (eye separation) for Stereoscopic 3D.
    *
    * @SINCE_1_0.0
@@ -394,7 +398,7 @@ public:  // Signals
   AppSignalType& ResetSignal();
 
   /**
-   * @DEPRECATED_1_1.43 Use Window::ResizedSignal() instead.
+   * @DEPRECATED_1_4.6 Use Window::ResizedSignal() instead.
    * @brief This signal is emitted when the window application rendering on is resized.
    * @SINCE_1_0.0
    * @return The signal to connect to
@@ -470,4 +474,4 @@ public: // Not intended for application developers
  */
 } // namespace Dali
 
-#endif // __DALI_APPLICATION_H__
+#endif // DALI_APPLICATION_H