From 26505d5222395d8e21a8d46f3506f73fc1553783 Mon Sep 17 00:00:00 2001 From: Marcin Masternak Date: Wed, 14 Sep 2016 17:31:21 +0200 Subject: [PATCH] [my-place] Small SVACE fixes. Change-Id: Iceb1c004934a013021a0bae5bcaa8b3ad726b41c Signed-off-by: Marcin Masternak --- src/my-place/facade/UserPlaces.h | 3 +++ src/my-place/visit-detector/LocationLogger.h | 11 +++++++---- src/my-place/visit-detector/VisitDetector.h | 3 +++ src/my-place/visit-detector/WifiLogger.cpp | 1 + 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/my-place/facade/UserPlaces.h b/src/my-place/facade/UserPlaces.h index a760a5f..31bac72 100644 --- a/src/my-place/facade/UserPlaces.h +++ b/src/my-place/facade/UserPlaces.h @@ -57,6 +57,9 @@ namespace ctx { bool onTimerExpired(int timerId); + UserPlaces(const UserPlaces&) = delete; + UserPlaces& operator=(const UserPlaces&) = delete; + public: UserPlaces(PlaceRecogMode energyMode = PLACE_RECOG_HIGH_ACCURACY_MODE); ~UserPlaces(); diff --git a/src/my-place/visit-detector/LocationLogger.h b/src/my-place/visit-detector/LocationLogger.h index c3a145c..b901dee 100644 --- a/src/my-place/visit-detector/LocationLogger.h +++ b/src/my-place/visit-detector/LocationLogger.h @@ -64,10 +64,6 @@ namespace ctx { class LocationLogger : public ITimerListener, public IVisitListener { - public: - LocationLogger(ILocationListener *listener = nullptr); - ~LocationLogger(); - private: /* INPUT */ void onVisitStart(); @@ -156,6 +152,13 @@ namespace ctx { double direction, double climb, void *userData); bool __locationManagerRequestSingleLocation(); + LocationLogger(const LocationLogger&) = delete; + LocationLogger& operator=(const LocationLogger&) = delete; + + public: + LocationLogger(ILocationListener *listener = nullptr); + ~LocationLogger(); + }; /* class LocationLogger */ } /* namespace ctx */ diff --git a/src/my-place/visit-detector/VisitDetector.h b/src/my-place/visit-detector/VisitDetector.h index 33faacb..98bbda3 100644 --- a/src/my-place/visit-detector/VisitDetector.h +++ b/src/my-place/visit-detector/VisitDetector.h @@ -92,6 +92,9 @@ namespace ctx { void __categorize(Visit &visit); + VisitDetector(const VisitDetector&) = delete; + VisitDetector& operator=(const VisitDetector&) = delete; + public: VisitDetector(time_t startScan, PlaceRecogMode energyMode = PLACE_RECOG_HIGH_ACCURACY_MODE, bool testMode = false); ~VisitDetector(); diff --git a/src/my-place/visit-detector/WifiLogger.cpp b/src/my-place/visit-detector/WifiLogger.cpp index be688dc..2baa24c 100644 --- a/src/my-place/visit-detector/WifiLogger.cpp +++ b/src/my-place/visit-detector/WifiLogger.cpp @@ -69,6 +69,7 @@ int ctx::WifiLogger::__dbInsertLogs() ctx::WifiLogger::WifiLogger(IWifiListener * listener, PlaceRecogMode energyMode) : __timerOn(false), + __timerId(-1), __intervalMinutes(WIFI_LOGGER_INTERVAL_MINUTES_HIGH_ACCURACY), __listener(listener), __lastScanTime(time_t(0)), -- 2.34.1