diff --git a/Src/Utility/IConfig.h b/Src/Utility/IConfig.h index 0d470213b582d761c8ee380e767cbe756079e5ad..c33ecb09e941b29f531d58c460f90cea9a259ab6 100644 --- a/Src/Utility/IConfig.h +++ b/Src/Utility/IConfig.h @@ -1,6 +1,7 @@ #pragma once #include <QString> -#include <cv.h> +#include <opencv2/opencv.hpp> + class IConfig { public: diff --git a/Src/Utility/TrackedComponents/TrackedElement.h b/Src/Utility/TrackedComponents/TrackedElement.h index 21edb059f0883eb7ff291799b371136e0d596c74..f08cf8b130a2a7db7f784e97c85ebeb383b74247 100644 --- a/Src/Utility/TrackedComponents/TrackedElement.h +++ b/Src/Utility/TrackedComponents/TrackedElement.h @@ -3,7 +3,7 @@ #include "QGraphicsItem" #include "Interfaces/IModel/IModelTrackedComponent.h" #include "QString" -#include <cv.h> +#include <opencv2/opencv.hpp> #include <qdatetime.h> #include <ctime> @@ -41,7 +41,6 @@ public: _timeSysclck = t; }; virtual void setTime(qint64 t) override { - std::string::size_type sz = 0; long long ll = t / 1000; std::time_t tm(ll); _timeSysclck = std::chrono::system_clock::from_time_t(tm); @@ -93,7 +92,7 @@ public: // ITrackedPoint interface public: - void operate(); + void operate() override; private: std::chrono::system_clock::time_point _timeSysclck; diff --git a/Src/Utility/TrackedComponents/TrackedTrajectory.h b/Src/Utility/TrackedComponents/TrackedTrajectory.h index 0f9511f4643cd4d26681e31b1a8753996f07533c..ea010337aa8c89c1f47d2d820bc72c54e0339779 100644 --- a/Src/Utility/TrackedComponents/TrackedTrajectory.h +++ b/Src/Utility/TrackedComponents/TrackedTrajectory.h @@ -21,7 +21,7 @@ class TrackedTrajectory : public IModelTrackedTrajectory { // ITrackedComponent interface public: - void operate(); + void operate() override; // ITrackedObject interface public: diff --git a/Src/Utility/misc.h b/Src/Utility/misc.h index c354ab41ac0f36b304b31e37253f550de9f3a11e..6cc6db0a65ef067473affd2c9d5b23f525d6d5a4 100644 --- a/Src/Utility/misc.h +++ b/Src/Utility/misc.h @@ -2,7 +2,7 @@ #define MISC_H #include <string> #include <time.h> -#include <cv.h> +#include <opencv2/opencv.hpp> #include <QPoint> namespace BioTrackerUtilsMisc{