DSCore: put std header files to DSCore.h

Change-Id: I78dbecc1194c8d299644e732de7fd3a0c5d6e7d6

diff --git a/src/DSBuffer/IDSBufferQueue.h b/src/DSBuffer/IDSBufferQueue.h
index 4750374..b158072 100644 (file)
--- a/src/DSBuffer/IDSBufferQueue.h
+++ b/src/DSBuffer/IDSBufferQueue.h
@@ -1,8 +1,7 @@
-#ifndef __I_DS_BUFFER_QUEUE_H_
-#define __I_DS_BUFFER_QUEUE_H_
+#ifndef __I_DS_BUFFER_QUEUE_H__
+#define __I_DS_BUFFER_QUEUE_H__
 
 #include "IDSBuffer.h"
-#include <memory>
 
 namespace display_server
 {

diff --git a/src/DSCanvas/DSCanvas.h b/src/DSCanvas/DSCanvas.h
index 1be8ead..830f615 100644 (file)
--- a/src/DSCanvas/DSCanvas.h
+++ b/src/DSCanvas/DSCanvas.h
@@ -5,7 +5,6 @@
 #include <DSObject.h>
 #include <DSPolicyArea.h>
 #include <DSDisplayArea.h>
-#include <memory>
 
 namespace display_server
 {

diff --git a/src/DSCompositor/DSCompositorPrivate.h b/src/DSCompositor/DSCompositorPrivate.h
index e84424c..6df74b7 100644 (file)
--- a/src/DSCompositor/DSCompositorPrivate.h
+++ b/src/DSCompositor/DSCompositorPrivate.h
@@ -5,7 +5,6 @@
 #include "DSEventLoop.h"
 #include "IDSDisplayDevice.h"
 #include "DSBufferManager.h"
-#include <memory>
 
 namespace display_server
 {

diff --git a/src/DSCore/DSCore.h b/src/DSCore/DSCore.h
index 799257d..e47fe64 100644 (file)
--- a/src/DSCore/DSCore.h
+++ b/src/DSCore/DSCore.h
@@ -2,10 +2,13 @@
 #define __DS_CORE_H__
 
 #include <DSDebugLog.h>
+#include <iostream>
+#include <string>
 #include <list>
 #include <memory>
 #include <functional>
 #include <cassert>
+#include <variant>
 
 /* Macros for visibility */
 #define DS_DECL_EXPORT __attribute__((visibility("default")))

diff --git a/src/DSDisplayArea/DSDisplayArea.h b/src/DSDisplayArea/DSDisplayArea.h
index d644cdc..8097d5c 100644 (file)
--- a/src/DSDisplayArea/DSDisplayArea.h
+++ b/src/DSDisplayArea/DSDisplayArea.h
@@ -4,7 +4,6 @@
 #include <DSCore.h>
 #include <DSObject.h>
 #include <IDSOutput.h>
-#include <memory>
 
 namespace display_server
 {

diff --git a/src/DSDisplayArea/DSDisplayAreaPrivate.h b/src/DSDisplayArea/DSDisplayAreaPrivate.h
index b298f80..7323552 100644 (file)
--- a/src/DSDisplayArea/DSDisplayAreaPrivate.h
+++ b/src/DSDisplayArea/DSDisplayAreaPrivate.h
@@ -9,7 +9,6 @@
 #include "IDSDisplayDeviceOutput.h"
 #include "IDSDisplayDeviceHWC.h"
 #include "DSEventLoop.h"
-#include <memory>
 
 namespace display_server
 {

diff --git a/src/DSDisplayDevice/IDSDisplayDeviceHWC.h b/src/DSDisplayDevice/IDSDisplayDeviceHWC.h
index 8d6c77c..e6abd81 100644 (file)
--- a/src/DSDisplayDevice/IDSDisplayDeviceHWC.h
+++ b/src/DSDisplayDevice/IDSDisplayDeviceHWC.h
@@ -3,7 +3,6 @@
 
 #include "IDSDisplayDeviceHWCWindow.h"
 #include "IDSBufferQueue.h"
-#include <memory>
 
 namespace display_server
 {

diff --git a/src/DSInput/DSInput.h b/src/DSInput/DSInput.h
index 3555256..72b88a8 100644 (file)
--- a/src/DSInput/DSInput.h
+++ b/src/DSInput/DSInput.h
@@ -3,12 +3,7 @@
 
 #include <DSCore.h>
 #include <DSObject.h>
-#include <iostream>
-#include <string>
-#include <memory>
 #include <DSSignal.h>
-#include <functional>
-
 #include <Ecore.h>
 
 namespace display_server

diff --git a/src/DSObject/DSObject.h b/src/DSObject/DSObject.h
index 1548b3f..bfefe32 100644 (file)
--- a/src/DSObject/DSObject.h
+++ b/src/DSObject/DSObject.h
@@ -1,12 +1,10 @@
 #ifndef __DS_OBJECT_H_
 #define __DS_OBJECT_H_
 
+#include "DSCore.h"
 #include "IDSObjectObserver.h"
 #include "DSObjectPrivate.h"
 #include "DSProperty.h"
-#include <iostream>
-#include <memory>
-#include <string>
 
 namespace display_server
 {

diff --git a/src/DSOutput/IDSOutput.h b/src/DSOutput/IDSOutput.h
index c3c8fc5..53a068d 100644 (file)
--- a/src/DSOutput/IDSOutput.h
+++ b/src/DSOutput/IDSOutput.h
@@ -1,8 +1,6 @@
 #ifndef __I_DS_OUTPUT_H__
 #define __I_DS_OUTPUT_H__
 
-#include <memory>
-
 namespace display_server
 {
 

diff --git a/src/DSPolicyArea/DSPolicyArea.h b/src/DSPolicyArea/DSPolicyArea.h
index bb0a91b..506ebb2 100644 (file)
--- a/src/DSPolicyArea/DSPolicyArea.h
+++ b/src/DSPolicyArea/DSPolicyArea.h
@@ -4,7 +4,6 @@
 #include <DSCore.h>
 #include <DSObject.h>
 #include <DSSeat.h>
-#include <memory>
 
 namespace display_server
 {

diff --git a/src/DSProperty/DSProperty.h b/src/DSProperty/DSProperty.h
index bba4454..306b6f5 100644 (file)
--- a/src/DSProperty/DSProperty.h
+++ b/src/DSProperty/DSProperty.h
@@ -1,11 +1,8 @@
 #ifndef __DS_PROPERTY_H_
 #define __DS_PROPERTY_H_
 
+#include "DSCore.h"
 #include "DSPropertyPrivate.h"
-#include <iostream>
-#include <memory>
-#include <string>
-#include <variant>
 
 namespace display_server
 {

diff --git a/src/DSProperty/DSPropertyPrivate.h b/src/DSProperty/DSPropertyPrivate.h
index b7de8b7..5044991 100644 (file)
--- a/src/DSProperty/DSPropertyPrivate.h
+++ b/src/DSProperty/DSPropertyPrivate.h
@@ -1,11 +1,8 @@
 #ifndef __DS_PROPERTY_PRIVATE_H_
 #define __DS_PROPERTY_PRIVATE_H_
 
+#include "DSCore.h"
 #include "DSProperty.h"
-#include <iostream>
-#include <memory>
-#include <string>
-#include <variant>
 
 namespace display_server
 {

diff --git a/src/DSRender/DSRenderView.h b/src/DSRender/DSRenderView.h
index d7b2e88..b6eb9c2 100644 (file)
--- a/src/DSRender/DSRenderView.h
+++ b/src/DSRender/DSRenderView.h
@@ -3,7 +3,6 @@
 
 #include "IDSBuffer.h"
 #include "DSWindow.h"
-#include <memory>
 
 namespace display_server
 {

diff --git a/src/DSRender/IDSRenderEngine.h b/src/DSRender/IDSRenderEngine.h
index 02f906d..2891ea0 100644 (file)
--- a/src/DSRender/IDSRenderEngine.h
+++ b/src/DSRender/IDSRenderEngine.h
@@ -3,7 +3,6 @@
 
 #include "DSRenderView.h"
 #include "DSWindow.h"
-#include <memory>
 
 namespace display_server
 {

diff --git a/src/DSSeat/DSSeat.h b/src/DSSeat/DSSeat.h
index d98f28e..3c8ea65 100644 (file)
--- a/src/DSSeat/DSSeat.h
+++ b/src/DSSeat/DSSeat.h
@@ -4,7 +4,6 @@
 #include "DSCore.h"
 #include "DSObject.h"
 #include "DSSignal.h"
-#include <memory>
 #include <Ecore.h>
 
 namespace display_server

diff --git a/src/DSSignal/DSSignal.h b/src/DSSignal/DSSignal.h
index eedf0a7..05209f9 100644 (file)
--- a/src/DSSignal/DSSignal.h
+++ b/src/DSSignal/DSSignal.h
@@ -2,11 +2,6 @@
 #define __DS_SIGNAL_H_
 
 #include "DSObject.h"
-#include <iostream>
-#include <string>
-#include <list>
-#include <memory>
-#include <functional>
 
 namespace display_server
 {

diff --git a/src/DSWaylandServer/DSWaylandCompositorPrivate.h b/src/DSWaylandServer/DSWaylandCompositorPrivate.h
index af99b70..cbc7dd9 100644 (file)
--- a/src/DSWaylandServer/DSWaylandCompositorPrivate.h
+++ b/src/DSWaylandServer/DSWaylandCompositorPrivate.h
@@ -8,7 +8,6 @@
 #include "DSDebugLog.h"
 
 #include <wayland-server-core.h>
-#include <memory>
 #include <Ecore.h>
 
 namespace display_server