From 01b2c8d82403674be312f3ba7975312826509652 Mon Sep 17 00:00:00 2001 From: Ji-hoon Lee Date: Mon, 23 Nov 2020 12:11:02 +0900 Subject: [PATCH] Reorganize directory structure Change-Id: Ide6e34f653e78ec0e5474015dca62e277fa81645 --- CMakeLists.txt | 5 ++--- src/sclconnection-isf.cpp | 2 +- src/sclcoreui-efl.h | 2 +- src/{legacy_support => }/web_helper_agent.cpp | 0 src/{legacy_support => }/web_helper_agent.h | 0 src/{legacy_support => }/websocket.cpp | 0 src/{legacy_support => }/websocket.h | 0 7 files changed, 4 insertions(+), 5 deletions(-) rename src/{legacy_support => }/web_helper_agent.cpp (100%) rename src/{legacy_support => }/web_helper_agent.h (100%) rename src/{legacy_support => }/websocket.cpp (100%) rename src/{legacy_support => }/websocket.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2fe6e33..928a940 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,7 +22,6 @@ MESSAGE(STATUS "Build type: ${CMAKE_BUILD_TYPE}") INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/include - ${CMAKE_SOURCE_DIR}/src/legacy_support ) INCLUDE(FindPkgConfig) @@ -47,8 +46,8 @@ ENDIF(with_wayland) IF (with_websocket) ADD_DEFINITIONS("-DWEBSOCKET") SET(SRCS ${SRCS} - src/legacy_support/websocket.cpp - src/legacy_support/web_helper_agent.cpp) + src/websocket.cpp + src/web_helper_agent.cpp) SET(PKGS_CHECK_MODULES ${PKGS_CHECK_MODULES} libwebsockets) ENDIF(with_websocket) diff --git a/src/sclconnection-isf.cpp b/src/sclconnection-isf.cpp index d00c7ce..74b13e3 100644 --- a/src/sclconnection-isf.cpp +++ b/src/sclconnection-isf.cpp @@ -21,7 +21,7 @@ #include #ifdef WEBSOCKET -#include "legacy_support/websocket.h" +#include "websocket.h" extern CWebHelperAgentWebSocket g_websocket; #endif diff --git a/src/sclcoreui-efl.h b/src/sclcoreui-efl.h index 82d03af..7358590 100644 --- a/src/sclcoreui-efl.h +++ b/src/sclcoreui-efl.h @@ -23,7 +23,7 @@ #include #ifdef WEBSOCKET -#include "legacy_support/websocket.h" +#include "websocket.h" #endif //SCL_BEGIN_DECLS diff --git a/src/legacy_support/web_helper_agent.cpp b/src/web_helper_agent.cpp similarity index 100% rename from src/legacy_support/web_helper_agent.cpp rename to src/web_helper_agent.cpp diff --git a/src/legacy_support/web_helper_agent.h b/src/web_helper_agent.h similarity index 100% rename from src/legacy_support/web_helper_agent.h rename to src/web_helper_agent.h diff --git a/src/legacy_support/websocket.cpp b/src/websocket.cpp similarity index 100% rename from src/legacy_support/websocket.cpp rename to src/websocket.cpp diff --git a/src/legacy_support/websocket.h b/src/websocket.h similarity index 100% rename from src/legacy_support/websocket.h rename to src/websocket.h -- 2.34.1