apps: apply CV_OVERRIDE/CV_FINAL

diff --git a/apps/interactive-calibration/frameProcessor.hpp b/apps/interactive-calibration/frameProcessor.hpp
index 222b83143f3c47f1e2a550d14e8fc54fdd24aed2..6fd788dc7fe3d4484f76d426c77abe3745421e62 100644 (file)
--- a/apps/interactive-calibration/frameProcessor.hpp
+++ b/apps/interactive-calibration/frameProcessor.hpp
@@ -61,10 +61,10 @@ protected:
 
 public:
     CalibProcessor(cv::Ptr<calibrationData> data, captureParameters& capParams);
-    virtual cv::Mat processFrame(const cv::Mat& frame);
-    virtual bool isProcessed() const;
-    virtual void resetState();
-    ~CalibProcessor();
+    virtual cv::Mat processFrame(const cv::Mat& frame) CV_OVERRIDE;
+    virtual bool isProcessed() const CV_OVERRIDE;
+    virtual void resetState() CV_OVERRIDE;
+    ~CalibProcessor() CV_OVERRIDE;
 };
 
 enum visualisationMode {Grid, Window};
@@ -84,9 +84,9 @@ protected:
     void drawGridPoints(const cv::Mat& frame);
 public:
     ShowProcessor(cv::Ptr<calibrationData> data, cv::Ptr<calibController> controller, TemplateType board);
-    virtual cv::Mat processFrame(const cv::Mat& frame);
-    virtual bool isProcessed() const;
-    virtual void resetState();
+    virtual cv::Mat processFrame(const cv::Mat& frame) CV_OVERRIDE;
+    virtual bool isProcessed() const CV_OVERRIDE;
+    virtual void resetState() CV_OVERRIDE;
 
     void setVisualizationMode(visualisationMode mode);
     void switchVisualizationMode();
@@ -95,7 +95,7 @@ public:
 
     void switchUndistort();
     void setUndistort(bool isEnabled);
-    ~ShowProcessor();
+    ~ShowProcessor() CV_OVERRIDE;
 };
 
 }

diff --git a/apps/traincascade/CMakeLists.txt b/apps/traincascade/CMakeLists.txt
index e4d65483c34f62976bb5e5dc72eba346c72093b6..96b97810678c4ea34c958b078906ee6fd1ee0a3c 100644 (file)
--- a/apps/traincascade/CMakeLists.txt
+++ b/apps/traincascade/CMakeLists.txt
@@ -8,7 +8,9 @@ endif()
 project(traincascade)
 set(the_target opencv_traincascade)
 
-ocv_warnings_disable(CMAKE_CXX_FLAGS -Woverloaded-virtual)
+ocv_warnings_disable(CMAKE_CXX_FLAGS -Woverloaded-virtual
+                                     -Winconsistent-missing-override -Wsuggest-override
+)
 
 ocv_target_include_directories(${the_target} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}" "${OpenCV_SOURCE_DIR}/include/opencv")
 ocv_target_include_modules_recurse(${the_target} ${OPENCV_TRAINCASCADE_DEPS})