Remove unnecessary heading guard. 48/262348/2
authorSeungho Baek <sbsh.baek@samsung.com>
Mon, 9 Aug 2021 03:01:39 +0000 (12:01 +0900)
committerSeungho Baek <sbsh.baek@samsung.com>
Mon, 9 Aug 2021 03:06:19 +0000 (12:06 +0900)
Change-Id: I16eef0840fffb084fd9721c26bc251ef10acab60
Signed-off-by: Seungho Baek <sbsh.baek@samsung.com>
42 files changed:
dali-csharp-binder/src/adaptor-wrap.cpp
dali-csharp-binder/src/animation-wrap.cpp
dali-csharp-binder/src/application-wrap.cpp
dali-csharp-binder/src/atspi-wrap.cpp
dali-csharp-binder/src/callbackbase-wrap.cpp
dali-csharp-binder/src/canvas-view-wrap.cpp
dali-csharp-binder/src/capabilities-wrap.cpp
dali-csharp-binder/src/capture-wrap.cpp
dali-csharp-binder/src/component-application-wrap.cpp
dali-csharp-binder/src/constraint-wrap.cpp
dali-csharp-binder/src/control-devel-wrap.h
dali-csharp-binder/src/dali-wrap.h
dali-csharp-binder/src/devel-property-wrap.cpp
dali-csharp-binder/src/event-thread-callback-wrap.cpp
dali-csharp-binder/src/extents-wrap.cpp
dali-csharp-binder/src/fade-wrap.cpp
dali-csharp-binder/src/flex-layout-wrap.cpp
dali-csharp-binder/src/font-client-wrap.cpp
dali-csharp-binder/src/gestures-wrap.cpp
dali-csharp-binder/src/gl-window-wrap.cpp
dali-csharp-binder/src/input-method-context-wrap.cpp
dali-csharp-binder/src/input-options-wrap.cpp
dali-csharp-binder/src/keyboard-focus-manager-wrap.cpp
dali-csharp-binder/src/processor-controller.h
dali-csharp-binder/src/rive-animation-view-wrap.cpp
dali-csharp-binder/src/rotation-wrap.cpp
dali-csharp-binder/src/text-editor-wrap.cpp
dali-csharp-binder/src/text-field-wrap.cpp
dali-csharp-binder/src/text-label-wrap.cpp
dali-csharp-binder/src/text-utils-wrap.cpp
dali-csharp-binder/src/tizen-dependency-wrap.cpp
dali-csharp-binder/src/transition-base-wrap.cpp
dali-csharp-binder/src/transition-effects-wrap.cpp
dali-csharp-binder/src/transition-set-wrap.cpp
dali-csharp-binder/src/transition-wrap.cpp
dali-csharp-binder/src/tts-player-wrap.cpp
dali-csharp-binder/src/watch-view-wrap.cpp
dali-csharp-binder/src/watch-wrap.cpp
dali-csharp-binder/src/web-view-wrap.cpp
dali-csharp-binder/src/widget-view-manager-wrap.cpp
dali-csharp-binder/src/widget-view-wrap.cpp
dali-csharp-binder/src/window-wrap.cpp

index a201565..6b2e975 100755 (executable)
  *
  */
 
-#ifndef CSHARP_ADAPTOR
-#define CSHARP_ADAPTOR
-#endif
-
 #include "common.h"
 #include <dali/integration-api/adaptor-framework/adaptor.h>
 // #include <dali/public-api/adaptor-framework/application-configuration.h>
index c819876..bda63b4 100755 (executable)
  *
  */
 
-#ifndef CSHARP_ANIMATION
-#define CSHARP_ANIMATION
-#endif
-
 #include "common.h"
 #include <dali/public-api/animation/animation.h>
 #include <dali/devel-api/animation/animation-devel.h>
index d4ea458..c6c16e8 100755 (executable)
 *
 */
 
-#ifndef CSHARP_APPLICATION
-#define CSHARP_APPLICATION
-#endif
-
 #include "common.h"
 #include "string"
 #include <dali/public-api/adaptor-framework/application.h>
index 8f9eb04..6b2f353 100755 (executable)
 *
 */
 
-#ifndef CSHARP_ATSPI
-#define CSHARP_ATSPI
-#endif
-
 #include "common.h"
 #include <dali/devel-api/adaptor-framework/atspi-accessibility.h>
 #include <dali/integration-api/debug.h>
index 84f8158..891a04a 100755 (executable)
  *
  */
 
-#ifndef CSHARP_CALLBACK_BASE
-#define CSHARP_CALLBACK_BASE
-#endif
-
 #include "common.h"
 
 #ifdef __cplusplus
index 0c57dd4..2bd2aff 100644 (file)
@@ -1,7 +1,3 @@
-#ifndef CSHARP_CANVAS_VIEW
-#define CSHARP_CANVAS_VIEW
-#endif
-
 #define SWIGSTDCALL
 
 // INCLUDES
index 3bffd79..10a1b49 100644 (file)
@@ -1,5 +1,3 @@
-#ifndef CSHARP_CAPABILITIES
-#define CSHARP_CAPABILITIES
 
 /*
  * Copyright (c) 2020 Samsung Electronics Co., Ltd.
@@ -58,6 +56,4 @@ SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_IsBlendEquationSupported( int blendEquat
 
 #ifdef __cplusplus
 }
-#endif
-
 #endif
\ No newline at end of file
index 22b2b36..aa83b47 100755 (executable)
  *
  */
 
-#ifndef CSHARP_CAPTURE
-#define CSHARP_CAPTURE
-#endif
-
 #include <string.h>
 #include "common.h"
 #include <dali/public-api/capture/capture.h>
index 2ea4cda..50b7db8 100644 (file)
 *\r
 */\r
 \r
-#ifndef CSHARP_COMPONENT_APPLICATION_WRAP\r
-#define CSHARP_COMPONENT_APPLICATION_WRAP\r
-#endif\r
-\r
 #include "common.h"\r
 #include <dali/dali.h>\r
 #include <dali/devel-api/adaptor-framework/component-application.h>\r
index ecbf825..030156f 100755 (executable)
@@ -1,7 +1,3 @@
-#ifndef CSHARP_CONSTRAINT
-#define CSHARP_CONSTRAINT
-#endif
-
 /*
  * Copyright (c) 2021 Samsung Electronics Co., Ltd.
  *
index e6b96c7..5ab805e 100644 (file)
@@ -1,5 +1,5 @@
-#ifndef __CONTROL_DEVEL_WRAP_H__
-#define __CONTROL_DEVEL_WRAP_H__
+#ifndef CONTROL_DEVEL_WRAP_H
+#define CONTROL_DEVEL_WRAP_H
 /*
  * Copyright (c) 2020 Samsung Electronics Co., Ltd.
  *
@@ -64,5 +64,5 @@ inline void try_catch(const std::function<void(void)> &func) {
 
 } // anonymous namespace
 
-#endif // __CONTROL_DEVEL_WRAP_H__
+#endif // CONTROL_DEVEL_WRAP_H
 
index 2fe5a81..023b5d2 100755 (executable)
@@ -8,8 +8,8 @@
  * interface file instead.
  * ----------------------------------------------------------------------------- */
 
-#ifndef SWIG_NDalic_WRAP_H_
-#define SWIG_NDalic_WRAP_H_
+#ifndef SWIG_NDalic_WRAP_H
+#define SWIG_NDalic_WRAP_H
 
 class SwigDirector_WidgetImpl : public Dali::Internal::Adaptor::Widget, public Swig::Director {
 
index 0d71f0b..55fb8f2 100755 (executable)
  *
  */
 
-#ifndef CSHARP_DEVEL_PROPERTY
-#define CSHARP_DEVEL_PROPERTY
-#endif
-
 #include "common.h"
 
 #include <dali-toolkit/devel-api/controls/buttons/button-devel.h>
index 81c5932..a6cf4e0 100755 (executable)
  *
  */
 
-#ifndef CSHARP_EVENT_THREAD_CALLBACK
-#define CSHARP_EVENT_THREAD_CALLBACK
-#endif
-
 #include "common.h"
 #include <dali/devel-api/adaptor-framework/event-thread-callback.h>
 
index 2192697..1522a06 100755 (executable)
@@ -1,7 +1,3 @@
-#ifndef CSHARP_EXTENTS
-#define CSHARP_EXTENTS
-#endif
-
 #include "common.h"
 #include <dali/public-api/common/extents.h>
 
index a402bc0..b90aabd 100755 (executable)
  *
  */
 
-#ifndef CSHARP_FADE
-#define CSHARP_FADE
-#endif
-
 #include <string.h>
 #include "common.h"
 #include <dali-toolkit/public-api/transition/fade.h>
index 77a873c..bbf241f 100755 (executable)
@@ -1,7 +1,3 @@
-#ifndef CSHARP_FLEX_LAYOUT
-#define CSHARP_FLEX_LAYOUT
-#endif
-
 #include "common.h"
 #include <dali-toolkit/devel-api/layouting/flex-node.h>
 #include <iostream>
index c2ab8a4..6aea8db 100755 (executable)
@@ -13,9 +13,6 @@
 * limitations under the License.
 *
 */
-#ifndef CSHARP_FONT_CLIENT
-#define CSHARP_FONT_CLIENT
-#endif
 
 #include "common.h"
 #include <dali/public-api/common/type-traits.h>
index 68ab335..e379e83 100755 (executable)
  *
  */
 
-#ifndef CSHARP_GESTURES
-#define CSHARP_GESTURES
-#endif
-
 #include "common.h"
 #include <dali/public-api/events/rotation-gesture.h>
 #include <dali/public-api/events/rotation-gesture-detector.h>
index d2c7c34..2220c39 100644 (file)
 *
 */
 
-#ifndef CSHARP_GL_WINDOW
-#define CSHARP_GL_WINDOW
-#endif
-
 #include "common.h"
 #include <dali/devel-api/adaptor-framework/gl-window.h>
 #include <dali/integration-api/adaptor-framework/adaptor.h>
index 761af6b..b92be45 100755 (executable)
 *
 */
 
-#ifndef CSHARP_INPUT_METHOD_CONTEXT
-#define CSHARP_INPUT_METHOD_CONTEXT
-#endif
-
 #include "common.h"
 #include <dali/devel-api/adaptor-framework/input-method-context.h>
 #include <dali/devel-api/common/stage.h>
index b047d52..bd5a19c 100644 (file)
@@ -1,7 +1,3 @@
-#ifndef CSHARP_INPUT_OPTIONS\r
-#define CSHARP_INPUT_OPTIONS\r
-#endif\r
-\r
 /*\r
  * Copyright (c) 2021 Samsung Electronics Co., Ltd.\r
  *\r
index 5bd2fe0..ce5d1fc 100755 (executable)
  *
  */
 
-#ifndef CSHARP_KEYBOARD_FOCUS_MANAGER
-#define CSHARP_KEYBOARD_FOCUS_MANAGER
-#endif
-
 #include "common.h"
 
 SWIGINTERN bool Dali_Signal_Sl_Dali_Actor_Sp_Dali_Actor_Sc_Dali_Actor_Sc_Dali_Toolkit_Control_KeyboardFocus_Direction_SP__Sg__Empty(Dali::Signal< Dali::Actor (Dali::Actor,Dali::Actor,Dali::Toolkit::Control::KeyboardFocus::Direction) > const *self){
index f1d8a43..56db578 100644 (file)
@@ -1,3 +1,6 @@
+#ifndef CSHARP_PROCESSOR_CONTROLLER_H
+#define CSHARP_PROCESSOR_CONTROLLER_H
+
 /*
  * Copyright (c) 2021 Samsung Electronics Co., Ltd.
  *
@@ -67,4 +70,6 @@ public:
 private:
 
   ProcessorControllerProcessCallback mHandler;
-};
\ No newline at end of file
+};
+
+#endif // CSHARP_PROCESSOR_CONTROLLER_H
\ No newline at end of file
index 52e34b4..75ae1c6 100644 (file)
@@ -1,7 +1,3 @@
-#ifndef CSHARP_RIVE_ANIMATION_VIEW
-#define CSHARP_RIVE_ANIMATION_VIEW
-#endif
-
 #define SWIGSTDCALL
 
 // INCLUDES
index ec606ed..a1b91a1 100644 (file)
@@ -1,7 +1,3 @@
-#ifndef CSHARP_ROTATION
-#define CSHARP_ROTATION
-#endif
-
 /*
  * Copyright (c) 2021 Samsung Electronics Co., Ltd.
  *
index 295a143..e0346e2 100755 (executable)
 *
 */
 
-#ifndef CSHARP_TEXT_EDITOR
-#define CSHARP_TEXT_EDITOR
-#endif
-
 #include "common.h"
 #include <dali-toolkit/public-api/controls/text-controls/text-editor.h>
 #include <dali-toolkit/devel-api/controls/text-controls/text-editor-devel.h>
index 5e3453c..bf050ff 100755 (executable)
 *
 */
 
-#ifndef CSHARP_TEXT_FIELD
-#define CSHARP_TEXT_FIELD
-#endif
-
 #include "common.h"
 #include <dali-toolkit/public-api/controls/text-controls/text-field.h>
 #include <dali-toolkit/devel-api/controls/text-controls/text-field-devel.h>
index dd1b329..f03db27 100755 (executable)
@@ -1,8 +1,3 @@
-
-#ifndef CSHARP_TEXT_LABEL
-#define CSHARP_TEXT_LABEL
-#endif
-
 #include "common.h"
 #include <dali-toolkit/public-api/controls/text-controls/text-label.h>
 #include <dali-toolkit/devel-api/controls/text-controls/text-label-devel.h>
index 30e1896..6ade759 100755 (executable)
 *\r
 */\r
 \r
-#ifndef CSHARP_TEXT_UTILS\r
-#define CSHARP_TEXT_UTILS\r
-#endif\r
-\r
 #include "common.h"\r
 #include <dali/dali.h>\r
 #include <dali-toolkit/devel-api/text/text-utils-devel.h>\r
index 5baaf60..fffd91b 100644 (file)
 *\r
 */\r
 \r
-#ifndef CSHARP_TIZEN_DEPENDENCY_WRAP\r
-#define CSHARP_TIZEN_DEPENDENCY_WRAP\r
-#endif\r
-\r
 #include "common.h"\r
 #include <dali/dali.h>\r
 \r
@@ -43,21 +39,21 @@ SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_new_Texture_TbmSurface(tbm_surface_h tb
     mNativeImageSrc = Dali::NativeImageSource::New(source);\r
     mNativeTexture = Dali::Texture::New( *mNativeImageSrc );\r
     } catch (std::out_of_range& e) {\r
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (Dali::DaliException e) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0;
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
-      };
+      {\r
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;\r
+      };\r
+    } catch (std::exception& e) {\r
+      {\r
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;\r
+      };\r
+    } catch (Dali::DaliException e) {\r
+      {\r
+        SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0;\r
+      };\r
+    } catch (...) {\r
+      {\r
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;\r
+      };\r
     }\r
 \r
   jresult = new Dali::Texture((const Dali::Texture &)mNativeTexture);\r
index ed105c7..4015b68 100755 (executable)
  *
  */
 
-#ifndef CSHARP_TRANSITION_BASE
-#define CSHARP_TRANSITION_BASE
-#endif
-
 #include <string.h>
 #include "common.h"
 #include <dali-toolkit/public-api/transition/transition-base.h>
index eb0e3eb..93fabcf 100755 (executable)
 *\r
 */\r
 \r
-#ifndef CSHARP_TRANSITION_EFFECTS\r
-#define CSHARP_TRANSITION_EFFECTS\r
-#endif\r
-\r
 #include "common.h"\r
 #include <dali-toolkit/devel-api/transition-effects/cube-transition-effect.h>\r
 #include <dali-toolkit/devel-api/transition-effects/cube-transition-cross-effect.h>\r
index 0f5598a..fcdac54 100755 (executable)
  *
  */
 
-#ifndef CSHARP_TRANSITION_SET
-#define CSHARP_TRANSITION_SET
-#endif
-
 #include <string.h>
 #include "common.h"
 #include <dali-toolkit/public-api/transition/transition-set.h>
index 7f1e7a6..ca76ef1 100755 (executable)
  *
  */
 
-#ifndef CSHARP_TRANSITION
-#define CSHARP_TRANSITION
-#endif
-
 #include <string.h>
 #include "common.h"
 #include <dali-toolkit/public-api/transition/transition.h>
index 5bb0570..b3befe1 100755 (executable)
 *
 */
 
-#ifndef CSHARP_TTS_PLAYER
-#define CSHARP_TTS_PLAYER
-#endif
-
 #include "common.h"
 #include <dali/public-api/adaptor-framework/tts-player.h>
 
index 870e0f1..df7e96f 100755 (executable)
 *
 */
 
-#ifndef CSHARP_WATCH_VIEW
-#define CSHARP_WATCH_VIEW
-#endif
-
 #include "common.h"
 
 #include <watch_viewer_dali/public_api/watch_view/watch_view.h>
index 733a3af..a1cf821 100755 (executable)
 *
 */
 
-#ifndef CSHARP_WATCH
-#define CSHARP_WATCH
-#endif
-
 #include "common.h"
 #include <dali/public-api/watch/watch-time.h>
 #include <dali/public-api/watch/watch-application.h>
index 1e92761..f12074b 100755 (executable)
  *
  */
 
-#ifndef CSHARP_WEB_VIEW
-#define CSHARP_WEB_VIEW
-#endif
-
 // EXTERNAL INCLUDES
 #include "common.h"
 
index b403e24..e84f469 100755 (executable)
 *
 */
 
-#ifndef CSHARP_WIDGET_VIEW_MANAGER
-#define CSHARP_WIDGET_VIEW_MANAGER
-#endif
-
 #include "common.h"
 #include <widget_viewer_dali/public_api/widget_view_manager/widget_view_manager.h>
 #include <widget_viewer_dali/public_api/widget_view/widget_view.h>
index 4d862d4..d7b11eb 100755 (executable)
 *
 */
 
-#ifndef CSHARP_WIDGET_VIEW
-#define CSHARP_WIDGET_VIEW
-#endif
-
 #include "common.h"
 
 #include <widget_viewer_dali/public_api/widget_view/widget_view.h>
index 8ad1eaf..66139d8 100644 (file)
 *
 */
 
-#ifndef CSHARP_WINDOW
-#define CSHARP_WINDOW
-#endif
-
 #include "common.h"
 #include <dali/devel-api/adaptor-framework/window-devel.h>
 #include <dali/public-api/adaptor-framework/window.h>