Merge "CanvasRenderer:: Add Picture class" into devel/master

[platform/core/uifw/dali-adaptor.git] / dali / dali.h

diff --git a/dali/dali.h b/dali/dali.h
index e53d86c..ff3b7df 100644 (file)
--- a/dali/dali.h
+++ b/dali/dali.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_H__
-#define __DALI_H__
+#ifndef DALI_H
+#define DALI_H
 
 /*
- * Copyright (c) 2018 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.
@@ -24,14 +24,14 @@
 #include <dali/public-api/adaptor-framework/application.h>
 #include <dali/public-api/adaptor-framework/device-status.h>
 #include <dali/public-api/adaptor-framework/input-method.h>
-#include <dali/public-api/adaptor-framework/key.h>
 #include <dali/public-api/adaptor-framework/key-grab.h>
+#include <dali/public-api/adaptor-framework/key.h>
+#include <dali/public-api/adaptor-framework/native-image-source.h>
 #include <dali/public-api/adaptor-framework/timer.h>
 #include <dali/public-api/adaptor-framework/tts-player.h>
-#include <dali/public-api/adaptor-framework/native-image-source.h>
 #include <dali/public-api/adaptor-framework/widget-application.h>
 #include <dali/public-api/adaptor-framework/widget-impl.h>
 #include <dali/public-api/adaptor-framework/widget.h>
 #include <dali/public-api/dali-adaptor-version.h>
 
-#endif //__DALI_H__
+#endif //DALI_H