Purge underscored header file barriers

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / filters / emboss-filter.h

diff --git a/dali-toolkit/internal/filters/emboss-filter.h b/dali-toolkit/internal/filters/emboss-filter.h
index c912428..d61a823 100644 (file)
--- a/dali-toolkit/internal/filters/emboss-filter.h
+++ b/dali-toolkit/internal/filters/emboss-filter.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TOOLKIT_INTERNAL_EMBOSS_FILTER_H__
-#define __DALI_TOOLKIT_INTERNAL_EMBOSS_FILTER_H__
+#ifndef DALI_TOOLKIT_INTERNAL_EMBOSS_FILTER_H
+#define DALI_TOOLKIT_INTERNAL_EMBOSS_FILTER_H
 
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * 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.
@@ -19,11 +19,9 @@
  */
 
 // EXTERNAL INCLUDES
-#include <dali/public-api/actors/camera-actor.h>
-#include <dali/public-api/actors/image-actor.h>
 #include <dali/public-api/render-tasks/render-task.h>
-
-// INTERNAL INCLUDES
+#include <dali-toolkit/public-api/controls/image-view/image-view.h>
+#include <dali-toolkit/devel-api/visual-factory/visual-base.h>
 #include "image-filter.h"
 
 namespace Dali
@@ -66,11 +64,6 @@ public: // From ImageFilter
 
 private:
   /**
-   * Setup position and parameters for camera
-   */
-  void SetupCamera();
-
-  /**
    * Setup render tasks for blur
    */
   void CreateRenderTasks();
@@ -81,17 +74,16 @@ private:
 
 private: // Attributes
 
-  RenderTask       mRenderTaskForEmboss1;
-  RenderTask       mRenderTaskForEmboss2;
-  RenderTask       mRenderTaskForOutput;
-  FrameBufferImage mImageForEmboss1;
-  FrameBufferImage mImageForEmboss2;
-  CameraActor      mCameraActor;
-  ImageActor       mActorForInput1;
-  ImageActor       mActorForInput2;
-  ImageActor       mActorForEmboss1;
-  ImageActor       mActorForEmboss2;
-  Actor            mActorForComposite;
+  RenderTask            mRenderTaskForEmboss1;
+  RenderTask            mRenderTaskForEmboss2;
+  RenderTask            mRenderTaskForOutput;
+  FrameBufferImage      mImageForEmboss1;
+  FrameBufferImage      mImageForEmboss2;
+  Toolkit::ImageView    mActorForInput1;
+  Toolkit::ImageView    mActorForInput2;
+  Toolkit::Visual::Base mVisualForEmboss1;
+  Toolkit::Visual::Base mVisualForEmboss2;
+  Actor                 mActorForComposite;
 }; // class EmbossFilter
 
 } // namespace Internal
@@ -100,5 +92,5 @@ private: // Attributes
 
 } // namespace Dali
 
-#endif // __DALI_TOOLKIT_INTERNAL_EMBOSS_FILTER_H__
+#endif // DALI_TOOLKIT_INTERNAL_EMBOSS_FILTER_H