From 4a129e8b8d0f1648b6bea1fa8c2c473b81412432 Mon Sep 17 00:00:00 2001 From: Mu-Woong Lee Date: Fri, 15 Apr 2016 16:27:17 +0900 Subject: [PATCH] Replace types_internal.h with Types.h Change-Id: I0c33aba00bd9194b6420cdac9d8ebdd47da3b423 Signed-off-by: Mu-Woong Lee --- src/custom/CustomBase.h | 2 +- src/custom/CustomContextProvider.cpp | 2 +- src/device/DeviceContextProvider.cpp | 2 +- src/device/DeviceProviderBase.h | 2 +- src/device/activity/ActivityBase.cpp | 2 +- src/place/PlaceContextProvider.cpp | 2 +- src/place/geofence/GeofenceMonitorHandle.cpp | 2 +- src/place/geofence/PlaceGeofenceProvider.cpp | 2 +- src/place/recognition/place_recognition.cpp | 2 +- src/place/recognition/user_places/debug_utils.cpp | 2 +- src/place/recognition/user_places/location_logger.cpp | 2 +- src/place/recognition/user_places/mahal.cpp | 2 +- src/place/recognition/user_places/median.cpp | 2 +- src/place/recognition/user_places/piecewise_lin.cpp | 2 +- src/place/recognition/user_places/place_categer.cpp | 2 +- src/place/recognition/user_places/places_detector.cpp | 2 +- src/place/recognition/user_places/user_places.cpp | 2 +- src/place/recognition/user_places/user_places_types.cpp | 2 +- src/place/recognition/user_places/visit_categer.cpp | 2 +- src/place/recognition/user_places/visit_detector.cpp | 2 +- src/place/recognition/user_places/wifi_logger.cpp | 2 +- src/statistics/StatisticsContextProvider.cpp | 2 +- src/statistics/app/ActiveWindowMonitor.cpp | 2 +- src/statistics/app/AppStatisticsProvider.cpp | 2 +- src/statistics/app/DbHandle.cpp | 2 +- src/statistics/app/DbInit.cpp | 2 +- src/statistics/app/InstallMonitor.cpp | 2 +- .../app/app_inactive_detector/app_inactive_detector.cpp | 2 +- src/statistics/app/app_inactive_detector/inactive_detector.cpp | 2 +- .../app_inactive_detector/inactive_detector_classificator.cpp | 2 +- .../inactive_detector_classificator_kmeans.cpp | 2 +- .../app/app_inactive_detector/inactive_detector_storage.cpp | 2 +- .../app/app_inactive_detector/inactive_detector_weight.cpp | 2 +- src/statistics/media/DbHandle.cpp | 2 +- src/statistics/media/MediaContentMonitor.cpp | 2 +- src/statistics/shared/DbHandleBase.cpp | 2 +- src/statistics/shared/SystemInfo.cpp | 2 +- src/statistics/social/DbHandle.cpp | 2 +- src/statistics/social/LogAggregator.cpp | 2 +- src/statistics/social/SocialStatisticsProvider.cpp | 2 +- 40 files changed, 40 insertions(+), 40 deletions(-) diff --git a/src/custom/CustomBase.h b/src/custom/CustomBase.h index c95ba5c..07504ec 100644 --- a/src/custom/CustomBase.h +++ b/src/custom/CustomBase.h @@ -19,7 +19,7 @@ #include #include -#include +#include namespace ctx { diff --git a/src/custom/CustomContextProvider.cpp b/src/custom/CustomContextProvider.cpp index b6e251b..13371b5 100644 --- a/src/custom/CustomContextProvider.cpp +++ b/src/custom/CustomContextProvider.cpp @@ -16,7 +16,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/device/DeviceContextProvider.cpp b/src/device/DeviceContextProvider.cpp index b4c657e..0f31ed6 100644 --- a/src/device/DeviceContextProvider.cpp +++ b/src/device/DeviceContextProvider.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include #include #include #include diff --git a/src/device/DeviceProviderBase.h b/src/device/DeviceProviderBase.h index 3d81233..323abe7 100644 --- a/src/device/DeviceProviderBase.h +++ b/src/device/DeviceProviderBase.h @@ -17,7 +17,7 @@ #ifndef _CONTEXT_DEVICE_PROVIDER_BASE_H_ #define _CONTEXT_DEVICE_PROVIDER_BASE_H_ -#include +#include #include #include diff --git a/src/device/activity/ActivityBase.cpp b/src/device/activity/ActivityBase.cpp index 67cd4e3..8b16c28 100644 --- a/src/device/activity/ActivityBase.cpp +++ b/src/device/activity/ActivityBase.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include #include #include "ActivityTypes.h" #include "ActivityBase.h" diff --git a/src/place/PlaceContextProvider.cpp b/src/place/PlaceContextProvider.cpp index 8eb7596..dabdac0 100644 --- a/src/place/PlaceContextProvider.cpp +++ b/src/place/PlaceContextProvider.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include #include #include #include diff --git a/src/place/geofence/GeofenceMonitorHandle.cpp b/src/place/geofence/GeofenceMonitorHandle.cpp index cdb60ee..0e031bf 100644 --- a/src/place/geofence/GeofenceMonitorHandle.cpp +++ b/src/place/geofence/GeofenceMonitorHandle.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include #include #include #include "PlaceGeofenceTypes.h" diff --git a/src/place/geofence/PlaceGeofenceProvider.cpp b/src/place/geofence/PlaceGeofenceProvider.cpp index a1a5b5f..91b0785 100644 --- a/src/place/geofence/PlaceGeofenceProvider.cpp +++ b/src/place/geofence/PlaceGeofenceProvider.cpp @@ -16,7 +16,7 @@ #include -#include +#include #include #include #include "PlaceGeofenceProvider.h" diff --git a/src/place/recognition/place_recognition.cpp b/src/place/recognition/place_recognition.cpp index 76c09e1..bca18be 100644 --- a/src/place/recognition/place_recognition.cpp +++ b/src/place/recognition/place_recognition.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include #include #include "place_recognition.h" #include "user_places/user_places.h" diff --git a/src/place/recognition/user_places/debug_utils.cpp b/src/place/recognition/user_places/debug_utils.cpp index 064e41b..b5fccf2 100644 --- a/src/place/recognition/user_places/debug_utils.cpp +++ b/src/place/recognition/user_places/debug_utils.cpp @@ -15,7 +15,7 @@ */ #include "debug_utils.h" -#include +#include std::string ctx::DebugUtils::humanReadableDateTime(time_t timestamp, std::string format, size_t size, bool utc) { diff --git a/src/place/recognition/user_places/location_logger.cpp b/src/place/recognition/user_places/location_logger.cpp index 193002c..0994734 100644 --- a/src/place/recognition/user_places/location_logger.cpp +++ b/src/place/recognition/user_places/location_logger.cpp @@ -15,7 +15,7 @@ */ #include -#include +#include #include #include #include "../place_recognition_types.h" diff --git a/src/place/recognition/user_places/mahal.cpp b/src/place/recognition/user_places/mahal.cpp index cd7ff78..ccc7f9f 100644 --- a/src/place/recognition/user_places/mahal.cpp +++ b/src/place/recognition/user_places/mahal.cpp @@ -16,7 +16,7 @@ #include "mahal.h" #include -#include +#include ctx::num_t ctx::MahalModel::distance(const std::vector &v1, const std::vector &v2, const std::vector &m) { diff --git a/src/place/recognition/user_places/median.cpp b/src/place/recognition/user_places/median.cpp index 557c294..f0463b3 100644 --- a/src/place/recognition/user_places/median.cpp +++ b/src/place/recognition/user_places/median.cpp @@ -15,7 +15,7 @@ */ #include -#include +#include #include "median.h" ctx::num_t ctx::median(std::vector &v) diff --git a/src/place/recognition/user_places/piecewise_lin.cpp b/src/place/recognition/user_places/piecewise_lin.cpp index 2222c16..638af66 100644 --- a/src/place/recognition/user_places/piecewise_lin.cpp +++ b/src/place/recognition/user_places/piecewise_lin.cpp @@ -15,7 +15,7 @@ */ #include "piecewise_lin.h" -#include +#include ctx::PiecewiseLin::PiecewiseLin(std::vector xs, std::vector vs) : __xs(xs), diff --git a/src/place/recognition/user_places/place_categer.cpp b/src/place/recognition/user_places/place_categer.cpp index f71fe2c..1b4c975 100644 --- a/src/place/recognition/user_places/place_categer.cpp +++ b/src/place/recognition/user_places/place_categer.cpp @@ -20,7 +20,7 @@ #include "user_places_params.h" #include "user_places_types.h" #include -#include +#include void ctx::PlaceCateger::reduceOutliers(ctx::Visits &visits) { diff --git a/src/place/recognition/user_places/places_detector.cpp b/src/place/recognition/user_places/places_detector.cpp index 525fc43..a48e395 100644 --- a/src/place/recognition/user_places/places_detector.cpp +++ b/src/place/recognition/user_places/places_detector.cpp @@ -15,7 +15,7 @@ */ #include -#include +#include #include #include "similarity.h" #include "places_detector.h" diff --git a/src/place/recognition/user_places/user_places.cpp b/src/place/recognition/user_places/user_places.cpp index 1b927c3..ca237ea 100644 --- a/src/place/recognition/user_places/user_places.cpp +++ b/src/place/recognition/user_places/user_places.cpp @@ -16,7 +16,7 @@ #include #include -#include +#include #include "user_places.h" #include "places_detector.h" #include "../place_recognition_types.h" diff --git a/src/place/recognition/user_places/user_places_types.cpp b/src/place/recognition/user_places/user_places_types.cpp index 7efd948..14b1355 100644 --- a/src/place/recognition/user_places/user_places_types.cpp +++ b/src/place/recognition/user_places/user_places_types.cpp @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include "user_places_types.h" #include "user_places_params.h" #include "debug_utils.h" diff --git a/src/place/recognition/user_places/visit_categer.cpp b/src/place/recognition/user_places/visit_categer.cpp index 7c6ab7d..1d4c0c6 100644 --- a/src/place/recognition/user_places/visit_categer.cpp +++ b/src/place/recognition/user_places/visit_categer.cpp @@ -19,7 +19,7 @@ #include #include "../place_recognition_types.h" #include "prob_features_model.h" -#include +#include // categorizer model parameters trained offline (implemented in python): const std::map ctx::VisitCateger::__models({ diff --git a/src/place/recognition/user_places/visit_detector.cpp b/src/place/recognition/user_places/visit_detector.cpp index d63febf..e0ba642 100644 --- a/src/place/recognition/user_places/visit_detector.cpp +++ b/src/place/recognition/user_places/visit_detector.cpp @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include "../place_recognition_types.h" #include "visit_detector.h" diff --git a/src/place/recognition/user_places/wifi_logger.cpp b/src/place/recognition/user_places/wifi_logger.cpp index e1d1428..3367276 100644 --- a/src/place/recognition/user_places/wifi_logger.cpp +++ b/src/place/recognition/user_places/wifi_logger.cpp @@ -15,7 +15,7 @@ */ #include -#include +#include #include #include "../place_recognition_types.h" #include "debug_utils.h" diff --git a/src/statistics/StatisticsContextProvider.cpp b/src/statistics/StatisticsContextProvider.cpp index 762cb60..63bc618 100644 --- a/src/statistics/StatisticsContextProvider.cpp +++ b/src/statistics/StatisticsContextProvider.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include +#include #include #include #include diff --git a/src/statistics/app/ActiveWindowMonitor.cpp b/src/statistics/app/ActiveWindowMonitor.cpp index db8b753..c8d3120 100644 --- a/src/statistics/app/ActiveWindowMonitor.cpp +++ b/src/statistics/app/ActiveWindowMonitor.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include "../shared/SystemInfo.h" #include "AppStatisticsTypes.h" #include "ActiveWindowMonitor.h" diff --git a/src/statistics/app/AppStatisticsProvider.cpp b/src/statistics/app/AppStatisticsProvider.cpp index 49fe480..a7d4211 100644 --- a/src/statistics/app/AppStatisticsProvider.cpp +++ b/src/statistics/app/AppStatisticsProvider.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include #include #include #include "AppStatisticsProvider.h" diff --git a/src/statistics/app/DbHandle.cpp b/src/statistics/app/DbHandle.cpp index bf58209..b83c137 100644 --- a/src/statistics/app/DbHandle.cpp +++ b/src/statistics/app/DbHandle.cpp @@ -15,7 +15,7 @@ */ #include -#include +#include #include #include "AppStatisticsTypes.h" #include "DbHandle.h" diff --git a/src/statistics/app/DbInit.cpp b/src/statistics/app/DbInit.cpp index a2a5912..9c4ec24 100644 --- a/src/statistics/app/DbInit.cpp +++ b/src/statistics/app/DbInit.cpp @@ -16,7 +16,7 @@ #include #include -#include +#include #include "AppStatisticsTypes.h" #include "DbInit.h" diff --git a/src/statistics/app/InstallMonitor.cpp b/src/statistics/app/InstallMonitor.cpp index 4dea409..af5169f 100644 --- a/src/statistics/app/InstallMonitor.cpp +++ b/src/statistics/app/InstallMonitor.cpp @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include "AppStatisticsTypes.h" #include "InstallMonitor.h" diff --git a/src/statistics/app/app_inactive_detector/app_inactive_detector.cpp b/src/statistics/app/app_inactive_detector/app_inactive_detector.cpp index 3e36f7d..ef5c23a 100644 --- a/src/statistics/app/app_inactive_detector/app_inactive_detector.cpp +++ b/src/statistics/app/app_inactive_detector/app_inactive_detector.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include #include #include #include "app_inactive_detector.h" diff --git a/src/statistics/app/app_inactive_detector/inactive_detector.cpp b/src/statistics/app/app_inactive_detector/inactive_detector.cpp index f6e82f9..5da86fe 100644 --- a/src/statistics/app/app_inactive_detector/inactive_detector.cpp +++ b/src/statistics/app/app_inactive_detector/inactive_detector.cpp @@ -15,7 +15,7 @@ */ #include -#include +#include #include "inactive_detector.h" #include "inactive_detector_weight.h" #include "inactive_detector_storage.h" diff --git a/src/statistics/app/app_inactive_detector/inactive_detector_classificator.cpp b/src/statistics/app/app_inactive_detector/inactive_detector_classificator.cpp index 9f85f94..adcf699 100644 --- a/src/statistics/app/app_inactive_detector/inactive_detector_classificator.cpp +++ b/src/statistics/app/app_inactive_detector/inactive_detector_classificator.cpp @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include #include "inactive_detector.h" #include "app_inactive_detector_types.h" #include "inactive_detector_classificator.h" diff --git a/src/statistics/app/app_inactive_detector/inactive_detector_classificator_kmeans.cpp b/src/statistics/app/app_inactive_detector/inactive_detector_classificator_kmeans.cpp index f020875..298f60d 100644 --- a/src/statistics/app/app_inactive_detector/inactive_detector_classificator_kmeans.cpp +++ b/src/statistics/app/app_inactive_detector/inactive_detector_classificator_kmeans.cpp @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include #include "app_inactive_detector_types.h" #include "inactive_detector_classificator_kmeans.h" #include "inactive_detector_classificator_kmeans_types.h" diff --git a/src/statistics/app/app_inactive_detector/inactive_detector_storage.cpp b/src/statistics/app/app_inactive_detector/inactive_detector_storage.cpp index 9e278102..3cfcb2d 100644 --- a/src/statistics/app/app_inactive_detector/inactive_detector_storage.cpp +++ b/src/statistics/app/app_inactive_detector/inactive_detector_storage.cpp @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include "inactive_detector.h" #include "inactive_detector_storage.h" #include "inactive_detector_storage_queries.h" diff --git a/src/statistics/app/app_inactive_detector/inactive_detector_weight.cpp b/src/statistics/app/app_inactive_detector/inactive_detector_weight.cpp index 5b21c1e..52ed158 100644 --- a/src/statistics/app/app_inactive_detector/inactive_detector_weight.cpp +++ b/src/statistics/app/app_inactive_detector/inactive_detector_weight.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include #include "inactive_detector_weight.h" #include "inactive_detector_storage.h" diff --git a/src/statistics/media/DbHandle.cpp b/src/statistics/media/DbHandle.cpp index 5eeb81e..ec1e252 100644 --- a/src/statistics/media/DbHandle.cpp +++ b/src/statistics/media/DbHandle.cpp @@ -15,7 +15,7 @@ */ #include -#include +#include #include #include "../shared/SystemInfo.h" #include "MediaStatisticsTypes.h" diff --git a/src/statistics/media/MediaContentMonitor.cpp b/src/statistics/media/MediaContentMonitor.cpp index 74b59a8..78ff0ef 100644 --- a/src/statistics/media/MediaContentMonitor.cpp +++ b/src/statistics/media/MediaContentMonitor.cpp @@ -15,7 +15,7 @@ */ #include -#include +#include #include "../shared/SystemInfo.h" #include "MediaStatisticsTypes.h" #include "DbHandle.h" diff --git a/src/statistics/shared/DbHandleBase.cpp b/src/statistics/shared/DbHandleBase.cpp index b2917b5..77982aa 100644 --- a/src/statistics/shared/DbHandleBase.cpp +++ b/src/statistics/shared/DbHandleBase.cpp @@ -15,7 +15,7 @@ */ #include -#include +#include #include #include "CommonTypes.h" #include "DbHandleBase.h" diff --git a/src/statistics/shared/SystemInfo.cpp b/src/statistics/shared/SystemInfo.cpp index ad6b1f2..369d5c3 100644 --- a/src/statistics/shared/SystemInfo.cpp +++ b/src/statistics/shared/SystemInfo.cpp @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include "SystemInfo.h" diff --git a/src/statistics/social/DbHandle.cpp b/src/statistics/social/DbHandle.cpp index 9886e48..03c7dab 100644 --- a/src/statistics/social/DbHandle.cpp +++ b/src/statistics/social/DbHandle.cpp @@ -16,7 +16,7 @@ #include #include -#include +#include #include #include "SocialStatisticsTypes.h" #include "DbHandle.h" diff --git a/src/statistics/social/LogAggregator.cpp b/src/statistics/social/LogAggregator.cpp index dd6db76..dac092d 100644 --- a/src/statistics/social/LogAggregator.cpp +++ b/src/statistics/social/LogAggregator.cpp @@ -16,7 +16,7 @@ #include #include -#include +#include #include "SocialStatisticsTypes.h" #include "LogAggregator.h" diff --git a/src/statistics/social/SocialStatisticsProvider.cpp b/src/statistics/social/SocialStatisticsProvider.cpp index 0a33725..f240296 100644 --- a/src/statistics/social/SocialStatisticsProvider.cpp +++ b/src/statistics/social/SocialStatisticsProvider.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include #include #include #include "SocialStatisticsProvider.h" -- 2.34.1