[my-place] Small SVACE fixes. 63/88463/1
authorMarcin Masternak <m.masternak@samsung.com>
Wed, 14 Sep 2016 15:31:21 +0000 (17:31 +0200)
committerMarcin Masternak <m.masternak@samsung.com>
Wed, 14 Sep 2016 15:33:36 +0000 (17:33 +0200)
Change-Id: Iceb1c004934a013021a0bae5bcaa8b3ad726b41c
Signed-off-by: Marcin Masternak <m.masternak@samsung.com>
src/my-place/facade/UserPlaces.h
src/my-place/visit-detector/LocationLogger.h
src/my-place/visit-detector/VisitDetector.h
src/my-place/visit-detector/WifiLogger.cpp

index a760a5f..31bac72 100644 (file)
@@ -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();
index c3a145c..b901dee 100644 (file)
@@ -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 */
index 33faacb..98bbda3 100644 (file)
@@ -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();
index be688dc..2baa24c 100644 (file)
@@ -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)),