diff options
| author | Mu-Woong Lee <muwoong.lee@samsung.com> | 2016-04-02 21:57:20 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.vlan103.tizen.org> | 2016-04-02 21:57:20 -0700 |
| commit | a8a5cb352fbdc06f61ec0025459b38d203b3f6d0 (patch) | |
| tree | f7818a7146f922413b2f847b191916497c68b723 | |
| parent | f25efbf31355d4c99adcc2b2ed9607a58ce80e84 (diff) | |
| parent | ea058fa04ad8714eb91a38e05fdf8864c2bbf43c (diff) | |
| download | sensor-tm1-a8a5cb352fbdc06f61ec0025459b38d203b3f6d0.tar.gz sensor-tm1-a8a5cb352fbdc06f61ec0025459b38d203b3f6d0.tar.bz2 sensor-tm1-a8a5cb352fbdc06f61ec0025459b38d203b3f6d0.zip | |
Merge "sensor-hal-tm1: rename sensor_logs.h to sensor_log.h" into devel/tizen_3.0
| -rw-r--r-- | src/accel/accel.cpp | 2 | ||||
| -rw-r--r-- | src/create.cpp | 2 | ||||
| -rw-r--r-- | src/proxi/proxi.cpp | 2 | ||||
| -rw-r--r-- | src/sensor_log.h (renamed from src/sensor_logs.h) | 0 | ||||
| -rw-r--r-- | src/sensorhub/dbus_util.cpp | 2 | ||||
| -rw-r--r-- | src/sensorhub/sensorhub.cpp | 2 | ||||
| -rw-r--r-- | src/sensorhub/sensorhub_controller.cpp | 2 | ||||
| -rw-r--r-- | src/sensorhub/sensorhub_manager.h | 2 | ||||
| -rw-r--r-- | src/sensorhub/sensorhub_sensor.cpp | 2 | ||||
| -rw-r--r-- | src/sensorhub/system_state.cpp | 2 | ||||
| -rw-r--r-- | src/sensorhub/wristup.cpp | 2 | ||||
| -rw-r--r-- | src/util.cpp | 2 |
12 files changed, 11 insertions, 11 deletions
diff --git a/src/accel/accel.cpp b/src/accel/accel.cpp index cc856b4..97b1db5 100644 --- a/src/accel/accel.cpp +++ b/src/accel/accel.cpp @@ -21,7 +21,7 @@ #include <sys/stat.h> #include <linux/input.h> #include <util.h> -#include <sensor_logs.h> +#include <sensor_log.h> #include "accel.h" diff --git a/src/create.cpp b/src/create.cpp index 33f54fc..6ed9bbd 100644 --- a/src/create.cpp +++ b/src/create.cpp @@ -16,7 +16,7 @@ */ #include <sensor/sensor_hal.h> -#include <sensor_logs.h> +#include <sensor_log.h> #include <vector> #include "accel/accel.h" diff --git a/src/proxi/proxi.cpp b/src/proxi/proxi.cpp index 819a5b6..8a8ce64 100644 --- a/src/proxi/proxi.cpp +++ b/src/proxi/proxi.cpp @@ -21,7 +21,7 @@ #include <sys/stat.h> #include <linux/input.h> #include <util.h> -#include <sensor_logs.h> +#include <sensor_log.h> #include "proxi.h" diff --git a/src/sensor_logs.h b/src/sensor_log.h index 395abb1..395abb1 100644 --- a/src/sensor_logs.h +++ b/src/sensor_log.h diff --git a/src/sensorhub/dbus_util.cpp b/src/sensorhub/dbus_util.cpp index adeaf57..c617090 100644 --- a/src/sensorhub/dbus_util.cpp +++ b/src/sensorhub/dbus_util.cpp @@ -16,7 +16,7 @@ */ #include <gio/gio.h> -#include <sensor_logs.h> +#include <sensor_log.h> #include "dbus_util.h" void init_dbus(void) diff --git a/src/sensorhub/sensorhub.cpp b/src/sensorhub/sensorhub.cpp index f9b335d..fe63177 100644 --- a/src/sensorhub/sensorhub.cpp +++ b/src/sensorhub/sensorhub.cpp @@ -16,7 +16,7 @@ */ #include <algorithm> -#include <sensor_logs.h> +#include <sensor_log.h> #include "sensorhub.h" #include "sensorhub_controller.h" diff --git a/src/sensorhub/sensorhub_controller.cpp b/src/sensorhub/sensorhub_controller.cpp index 9d7b7fb..d8ee72a 100644 --- a/src/sensorhub/sensorhub_controller.cpp +++ b/src/sensorhub/sensorhub_controller.cpp @@ -24,7 +24,7 @@ #include <sys/ioctl.h> #include <fstream> -#include <sensor_logs.h> +#include <sensor_log.h> #include <util.h> #include "sensorhub_controller.h" diff --git a/src/sensorhub/sensorhub_manager.h b/src/sensorhub/sensorhub_manager.h index 8d3a38f..6ee16a2 100644 --- a/src/sensorhub/sensorhub_manager.h +++ b/src/sensorhub/sensorhub_manager.h @@ -20,7 +20,7 @@ #include <map> #include <vector> -#include <sensor_logs.h> +#include <sensor_log.h> #include "sensorhub_controller.h" #include "sensorhub_sensor.h" diff --git a/src/sensorhub/sensorhub_sensor.cpp b/src/sensorhub/sensorhub_sensor.cpp index 56656b5..528f4c6 100644 --- a/src/sensorhub/sensorhub_sensor.cpp +++ b/src/sensorhub/sensorhub_sensor.cpp @@ -15,7 +15,7 @@ * */ -#include <sensor_logs.h> +#include <sensor_log.h> #include <time.h> #include "sensorhub_controller.h" #include "sensorhub_sensor.h" diff --git a/src/sensorhub/system_state.cpp b/src/sensorhub/system_state.cpp index 70703d2..5fdce86 100644 --- a/src/sensorhub/system_state.cpp +++ b/src/sensorhub/system_state.cpp @@ -15,7 +15,7 @@ * */ -#include <sensor_logs.h> +#include <sensor_log.h> #include "dbus_util.h" #include "system_state.h" diff --git a/src/sensorhub/wristup.cpp b/src/sensorhub/wristup.cpp index 346f807..fcbecac 100644 --- a/src/sensorhub/wristup.cpp +++ b/src/sensorhub/wristup.cpp @@ -17,7 +17,7 @@ #include <algorithm> #include <sensor/sensor_hal.h> -#include <sensor_logs.h> +#include <sensor_log.h> #include "sensorhub_manager.h" #include "system_state.h" diff --git a/src/util.cpp b/src/util.cpp index 15195b9..19790f9 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -20,7 +20,7 @@ #include <string.h> #include <fstream> #include <util.h> -#include <sensor_logs.h> +#include <sensor_log.h> using std::ifstream; using std::ofstream; |