Reorganize directory structure

Change-Id: Ide6e34f653e78ec0e5474015dca62e277fa81645

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2fe6e33..928a940 100644 (file)
--- 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 (file)
--- a/src/sclconnection-isf.cpp
+++ b/src/sclconnection-isf.cpp
@@ -21,7 +21,7 @@
 #include <dlog.h>
 
 #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 (file)
--- a/src/sclcoreui-efl.h
+++ b/src/sclcoreui-efl.h
@@ -23,7 +23,7 @@
 #include <Ecore.h>
 
 #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