From 909148fda924fa608c8f5b154c483a447b484492 Mon Sep 17 00:00:00 2001 From: Mu-Woong Lee Date: Thu, 30 Jun 2016 10:18:02 +0900 Subject: [PATCH] sensor: reorganize the folder structure Sub-folders for pedometer & pressure recorders are created. Change-Id: Ic4adeb1d52b257f5228e4176886841ef88f95d4c Signed-off-by: Mu-Woong Lee --- src/sensor/CMakeLists.txt | 2 +- src/sensor/CreateProvider.cpp | 4 ++-- src/sensor/{ => pedometer}/Pedometer.cpp | 2 +- src/sensor/{ => pedometer}/Pedometer.h | 2 +- src/sensor/{ => pedometer}/PedometerLogger.cpp | 4 ++-- src/sensor/{ => pedometer}/PedometerLogger.h | 4 ++-- src/sensor/{ => pedometer}/PedometerQuerier.cpp | 2 +- src/sensor/{ => pedometer}/PedometerQuerier.h | 2 +- src/sensor/{ => pressure}/Pressure.cpp | 2 +- src/sensor/{ => pressure}/Pressure.h | 2 +- src/sensor/{ => pressure}/PressureLogger.cpp | 4 ++-- src/sensor/{ => pressure}/PressureLogger.h | 4 ++-- src/sensor/{ => pressure}/PressureQuerier.cpp | 2 +- src/sensor/{ => pressure}/PressureQuerier.h | 2 +- 14 files changed, 19 insertions(+), 19 deletions(-) rename src/sensor/{ => pedometer}/Pedometer.cpp (98%) rename src/sensor/{ => pedometer}/Pedometer.h (97%) rename src/sensor/{ => pedometer}/PedometerLogger.cpp (98%) rename src/sensor/{ => pedometer}/PedometerLogger.h (95%) rename src/sensor/{ => pedometer}/PedometerQuerier.cpp (98%) rename src/sensor/{ => pedometer}/PedometerQuerier.h (97%) rename src/sensor/{ => pressure}/Pressure.cpp (97%) rename src/sensor/{ => pressure}/Pressure.h (96%) rename src/sensor/{ => pressure}/PressureLogger.cpp (97%) rename src/sensor/{ => pressure}/PressureLogger.h (95%) rename src/sensor/{ => pressure}/PressureQuerier.cpp (98%) rename src/sensor/{ => pressure}/PressureQuerier.h (97%) diff --git a/src/sensor/CMakeLists.txt b/src/sensor/CMakeLists.txt index c00256a..5c489b3 100644 --- a/src/sensor/CMakeLists.txt +++ b/src/sensor/CMakeLists.txt @@ -4,7 +4,7 @@ SET(DEPS ${DEPS} sensor ) -FILE(GLOB SRCS *.cpp) +FILE(GLOB_RECURSE SRCS *.cpp) INCLUDE(FindPkgConfig) PKG_CHECK_MODULES(PKG_SENSOR REQUIRED ${DEPS}) diff --git a/src/sensor/CreateProvider.cpp b/src/sensor/CreateProvider.cpp index 47d5ee9..141ea0e 100644 --- a/src/sensor/CreateProvider.cpp +++ b/src/sensor/CreateProvider.cpp @@ -16,8 +16,8 @@ #include #include -#include "Pedometer.h" -#include "Pressure.h" +#include "pedometer/Pedometer.h" +#include "pressure/Pressure.h" using namespace ctx; diff --git a/src/sensor/Pedometer.cpp b/src/sensor/pedometer/Pedometer.cpp similarity index 98% rename from src/sensor/Pedometer.cpp rename to src/sensor/pedometer/Pedometer.cpp index cac1e89..8752754 100644 --- a/src/sensor/Pedometer.cpp +++ b/src/sensor/pedometer/Pedometer.cpp @@ -16,7 +16,7 @@ #include #include -#include "TypesInternal.h" +#include "../TypesInternal.h" #include "PedometerLogger.h" #include "PedometerQuerier.h" #include "Pedometer.h" diff --git a/src/sensor/Pedometer.h b/src/sensor/pedometer/Pedometer.h similarity index 97% rename from src/sensor/Pedometer.h rename to src/sensor/pedometer/Pedometer.h index d4773fe..7fee01f 100644 --- a/src/sensor/Pedometer.h +++ b/src/sensor/pedometer/Pedometer.h @@ -17,7 +17,7 @@ #ifndef __CONTEXT_PEDOMETER_PROVIDER_H__ #define __CONTEXT_PEDOMETER_PROVIDER_H__ -#include "SensorProvider.h" +#include "../SensorProvider.h" namespace ctx { diff --git a/src/sensor/PedometerLogger.cpp b/src/sensor/pedometer/PedometerLogger.cpp similarity index 98% rename from src/sensor/PedometerLogger.cpp rename to src/sensor/pedometer/PedometerLogger.cpp index b091e58..ed73b2a 100644 --- a/src/sensor/PedometerLogger.cpp +++ b/src/sensor/pedometer/PedometerLogger.cpp @@ -16,8 +16,8 @@ #include #include -#include "TypesInternal.h" -#include "ClientInfo.h" +#include "../TypesInternal.h" +#include "../ClientInfo.h" #include "PedometerLogger.h" using namespace ctx; diff --git a/src/sensor/PedometerLogger.h b/src/sensor/pedometer/PedometerLogger.h similarity index 95% rename from src/sensor/PedometerLogger.h rename to src/sensor/pedometer/PedometerLogger.h index e1d021b..57832f9 100644 --- a/src/sensor/PedometerLogger.h +++ b/src/sensor/pedometer/PedometerLogger.h @@ -17,8 +17,8 @@ #ifndef __CONTEXT_PEDOMETER_LOGGER_H__ #define __CONTEXT_PEDOMETER_LOGGER_H__ -#include "SensorLogger.h" -#include "SensorProxy.h" +#include "../SensorLogger.h" +#include "../SensorProxy.h" namespace ctx { diff --git a/src/sensor/PedometerQuerier.cpp b/src/sensor/pedometer/PedometerQuerier.cpp similarity index 98% rename from src/sensor/PedometerQuerier.cpp rename to src/sensor/pedometer/PedometerQuerier.cpp index 37fa7de..020e868 100644 --- a/src/sensor/PedometerQuerier.cpp +++ b/src/sensor/pedometer/PedometerQuerier.cpp @@ -16,7 +16,7 @@ #include #include -#include "TypesInternal.h" +#include "../TypesInternal.h" #include "PedometerQuerier.h" #define PROJECTION \ diff --git a/src/sensor/PedometerQuerier.h b/src/sensor/pedometer/PedometerQuerier.h similarity index 97% rename from src/sensor/PedometerQuerier.h rename to src/sensor/pedometer/PedometerQuerier.h index 5cdc506..0cce36b 100644 --- a/src/sensor/PedometerQuerier.h +++ b/src/sensor/pedometer/PedometerQuerier.h @@ -17,7 +17,7 @@ #ifndef __CONTEXT_PEDOMETER_QUERIER_H__ #define __CONTEXT_PEDOMETER_QUERIER_H__ -#include "Querier.h" +#include "../Querier.h" namespace ctx { diff --git a/src/sensor/Pressure.cpp b/src/sensor/pressure/Pressure.cpp similarity index 97% rename from src/sensor/Pressure.cpp rename to src/sensor/pressure/Pressure.cpp index b50caa2..76b60f4 100644 --- a/src/sensor/Pressure.cpp +++ b/src/sensor/pressure/Pressure.cpp @@ -16,7 +16,7 @@ #include #include -#include "TypesInternal.h" +#include "../TypesInternal.h" #include "PressureLogger.h" #include "PressureQuerier.h" #include "Pressure.h" diff --git a/src/sensor/Pressure.h b/src/sensor/pressure/Pressure.h similarity index 96% rename from src/sensor/Pressure.h rename to src/sensor/pressure/Pressure.h index d12efac..419cfba 100644 --- a/src/sensor/Pressure.h +++ b/src/sensor/pressure/Pressure.h @@ -17,7 +17,7 @@ #ifndef __CONTEXT_PRESSURE_PROVIDER_H__ #define __CONTEXT_PRESSURE_PROVIDER_H__ -#include "SensorProvider.h" +#include "../SensorProvider.h" namespace ctx { diff --git a/src/sensor/PressureLogger.cpp b/src/sensor/pressure/PressureLogger.cpp similarity index 97% rename from src/sensor/PressureLogger.cpp rename to src/sensor/pressure/PressureLogger.cpp index 0dcaca9..e301165 100644 --- a/src/sensor/PressureLogger.cpp +++ b/src/sensor/pressure/PressureLogger.cpp @@ -16,8 +16,8 @@ #include #include -#include "TypesInternal.h" -#include "ClientInfo.h" +#include "../TypesInternal.h" +#include "../ClientInfo.h" #include "PressureLogger.h" #define INSERTION_THRESHOLD 20000 diff --git a/src/sensor/PressureLogger.h b/src/sensor/pressure/PressureLogger.h similarity index 95% rename from src/sensor/PressureLogger.h rename to src/sensor/pressure/PressureLogger.h index 45d0c68..3f8995a 100644 --- a/src/sensor/PressureLogger.h +++ b/src/sensor/pressure/PressureLogger.h @@ -17,8 +17,8 @@ #ifndef __CONTEXT_PRESSURE_LOGGER_H__ #define __CONTEXT_PRESSURE_LOGGER_H__ -#include "SensorLogger.h" -#include "SensorProxy.h" +#include "../SensorLogger.h" +#include "../SensorProxy.h" namespace ctx { diff --git a/src/sensor/PressureQuerier.cpp b/src/sensor/pressure/PressureQuerier.cpp similarity index 98% rename from src/sensor/PressureQuerier.cpp rename to src/sensor/pressure/PressureQuerier.cpp index 5e01662..43d3457 100644 --- a/src/sensor/PressureQuerier.cpp +++ b/src/sensor/pressure/PressureQuerier.cpp @@ -16,7 +16,7 @@ #include #include -#include "TypesInternal.h" +#include "../TypesInternal.h" #include "PressureQuerier.h" #define PROJECTION \ diff --git a/src/sensor/PressureQuerier.h b/src/sensor/pressure/PressureQuerier.h similarity index 97% rename from src/sensor/PressureQuerier.h rename to src/sensor/pressure/PressureQuerier.h index be1788c..1bd9aa6 100644 --- a/src/sensor/PressureQuerier.h +++ b/src/sensor/pressure/PressureQuerier.h @@ -17,7 +17,7 @@ #ifndef __CONTEXT_PRESSURE_QUERIER_H__ #define __CONTEXT_PRESSURE_QUERIER_H__ -#include "Querier.h" +#include "../Querier.h" namespace ctx { -- 2.34.1