Overriding virtual destructors are marked as 'override'.

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / builder / builder-impl.h

diff --git a/dali-toolkit/internal/builder/builder-impl.h b/dali-toolkit/internal/builder/builder-impl.h
old mode 100755 (executable)
new mode 100644 (file)
index 2eb4a2b..049b3ce
--- a/dali-toolkit/internal/builder/builder-impl.h
+++ b/dali-toolkit/internal/builder/builder-impl.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_INTERNAL_BUILDER_H
 
 /*
- * Copyright (c) 2019 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.
@@ -22,7 +22,6 @@
 #include <string>
 #include <list>
 #include <map>
-#include <dali/public-api/common/stage.h>
 #include <dali/public-api/common/vector-wrapper.h>
 #include <dali/public-api/actors/actor.h>
 #include <dali/public-api/object/base-object.h>
@@ -188,16 +187,6 @@ public:
   void CreateRenderTask( const std::string &name );
 
   /**
-   * @copydoc Toolkit::Builder::GetFrameBufferImage
-   */
-  FrameBufferImage GetFrameBufferImage( const std::string &name );
-
-  /**
-   * @copydoc Toolkit::Builder::GetFrameBufferImage
-   */
-  FrameBufferImage GetFrameBufferImage( const std::string &name, const Replacement& constant );
-
-  /**
    * @copydoc Toolkit::Builder::GetPath
    */
   Path GetPath( const std::string &name );
@@ -241,7 +230,7 @@ public:
 
 protected:
 
-  virtual ~Builder();
+  ~Builder() override;
 
 private:
   typedef std::vector<const char*> KeyStack;
@@ -251,7 +240,6 @@ private:
   typedef struct{ std::string name; Dali::PathConstrainer pathConstrainer; } PathConstrainerEntry;
   typedef std::vector<PathConstrainerEntry> PathConstrainerLut;
   typedef std::map<const std::string, Path> PathLut;
-  typedef std::map<const std::string, FrameBufferImage> ImageLut;
 
 private:
   // Undefined
@@ -385,7 +373,6 @@ private:
 
 private:
   Toolkit::JsonParser                 mParser;
-  ImageLut                            mFrameBufferImageLut;
   PathLut                             mPathLut;
   PathConstrainerLut                  mPathConstrainerLut;
   LinearConstrainerLut                mLinearConstrainerLut;