Remove non-touch related deprecated APIs

Change-Id: I2fc0c3b4745b465c75b2785b069faa918fd4dcdb

diff --git a/automated-tests/src/dali/utc-Dali-FrameBuffer.cpp b/automated-tests/src/dali/utc-Dali-FrameBuffer.cpp
index 8185600..8ae9f0a 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-FrameBuffer.cpp
+++ b/automated-tests/src/dali/utc-Dali-FrameBuffer.cpp
@@ -127,7 +127,7 @@ int UtcDaliFrameBufferNew06(void)
 
   unsigned int width(64);
   unsigned int height(64);
-  FrameBuffer frameBuffer = FrameBuffer::New( width, height, FrameBuffer::Attachment::DEPTH | FrameBuffer::Attachment::STENCIL );
+  FrameBuffer frameBuffer = FrameBuffer::New( width, height, static_cast<FrameBuffer::Attachment::Mask>( FrameBuffer::Attachment::DEPTH | FrameBuffer::Attachment::STENCIL ) );
 
   DALI_TEST_CHECK( frameBuffer );
 
@@ -349,7 +349,7 @@ int UtcDaliFrameBufferAttachColorTexture04(void)
 
   unsigned int width(64);
   unsigned int height(64);
-  FrameBuffer frameBuffer = FrameBuffer::New( width, height, FrameBuffer::Attachment::DEPTH | FrameBuffer::Attachment::STENCIL );
+  FrameBuffer frameBuffer = FrameBuffer::New( width, height, static_cast<FrameBuffer::Attachment::Mask>( FrameBuffer::Attachment::DEPTH | FrameBuffer::Attachment::STENCIL ) );
   Texture texture = Texture::New( TextureType::TEXTURE_2D, Pixel::RGBA8888, width, height );
   frameBuffer.AttachColorTexture( texture );
 

diff --git a/dali/public-api/actors/layer.h b/dali/public-api/actors/layer.h
index 0bb936e..3794634 100644 (file)
--- a/dali/public-api/actors/layer.h
+++ b/dali/public-api/actors/layer.h
@@ -213,17 +213,6 @@ public:
   };
 
   /**
-   * @DEPRECATED_1_2.26. Not intended for application use.
-   *
-   * @brief Enumeration for TREE_DEPTH_MULTIPLIER is used by the rendering sorting algorithm to decide which actors to render first.
-   * @SINCE_1_0.0
-   */
-  enum TreeDepthMultiplier
-  {
-    TREE_DEPTH_MULTIPLIER = 10000,
-  };
-
-  /**
    * @brief The sort function type.
    *
    * @SINCE_1_0.0

diff --git a/dali/public-api/common/view-mode.h b/dali/public-api/common/view-mode.h
deleted file mode 100644 (file)
index ee66ff0..0000000
--- a/dali/public-api/common/view-mode.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#ifndef DALI_VIEW_MODE_H
-#define DALI_VIEW_MODE_H
-
-/*
- * Copyright (c) 2019 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-namespace Dali
-{
-/**
- * @addtogroup dali_core_common
- * @{
- */
-
-/**
- * @brief Enumeration for stereoscopic view modes.
- * @SINCE_1_0.0
- */
-enum ViewMode
-{
-  MONO,              ///< Monoscopic (single camera). This is the default. @SINCE_1_0.0
-  STEREO_HORIZONTAL, ///< @DEPRECATED_1_3_39 Stereoscopic. This mode presents the left image on the top half of the screen and the right image on the bottom half. @SINCE_1_0.0
-  STEREO_VERTICAL    ///< @DEPRECATED_1_3_39 Stereoscopic. This mode renders the left image on the left half of the screen and the right image on the right half. @SINCE_1_0.0
-};
-
-/**
- * @}
- */
-} // namespace Dali
-
-#endif // DALI_VIEW_MODE_H

diff --git a/dali/public-api/file.list b/dali/public-api/file.list
index 12c49bd..6199c19 100644 (file)
--- a/dali/public-api/file.list
+++ b/dali/public-api/file.list
@@ -129,7 +129,6 @@ SET( public_api_core_common_header_files
   ${public_api_src_dir}/common/type-traits.h
   ${public_api_src_dir}/common/list-wrapper.h
   ${public_api_src_dir}/common/vector-wrapper.h
-  ${public_api_src_dir}/common/view-mode.h
 )
 
 

diff --git a/dali/public-api/rendering/frame-buffer.cpp b/dali/public-api/rendering/frame-buffer.cpp
index 2ddd912..f9a2ba3 100644 (file)
--- a/dali/public-api/rendering/frame-buffer.cpp
+++ b/dali/public-api/rendering/frame-buffer.cpp
@@ -57,14 +57,6 @@ FrameBuffer FrameBuffer::New( uint32_t width, uint32_t height, Attachment::Mask
   return FrameBuffer( frameBuffer.Get() );
 }
 
-FrameBuffer FrameBuffer::New( uint32_t width, uint32_t height, uint32_t attachments )
-{
-  DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: FrameBuffer::New(uint32_t,uint32_t,uint32_t) is deprecated and will be removed from next release. use New(uint32_t, uint32_t,Attachment::Mask) instead.\n" );
-  // have to static cast, which according to standard since C++11 is undefined behaviour, hence this variant is deprecated
-  Internal::FrameBufferPtr frameBuffer = Internal::FrameBuffer::New( width, height, static_cast<Attachment::Mask>( attachments ) );
-  return FrameBuffer( frameBuffer.Get() );
-}
-
 FrameBuffer::FrameBuffer()
 {
 }

diff --git a/dali/public-api/rendering/frame-buffer.h b/dali/public-api/rendering/frame-buffer.h
index ea72349..a3fafe2 100644 (file)
--- a/dali/public-api/rendering/frame-buffer.h
+++ b/dali/public-api/rendering/frame-buffer.h
@@ -97,19 +97,6 @@ public:
   static FrameBuffer New( uint32_t width, uint32_t height, Attachment::Mask attachments );
 
   /**
-   * @DEPRECATED_1_4.0 use New( uint32_t width, uint32_t height ) or New( uint32_t width, uint32_t height, Attachment::Mask attachments ) instead
-   * @brief Creates a new FrameBuffer object.
-   *
-   * @SINCE_1_1.43
-   *
-   * @param[in] width The width of the FrameBuffer
-   * @param[in] height The height of the FrameBuffer
-   * @param[in] attachments The attachments comprising the format of the FrameBuffer (the type is int to allow multiple bitmasks to be ORd)
-   * @return A handle to a newly allocated FrameBuffer
-   */
-  static FrameBuffer New( uint32_t width, uint32_t height, uint32_t attachments );
-
-  /**
    * @brief Default constructor, creates an empty handle.
    */
   FrameBuffer();