Merge pull request #1793 from mshabunin:fix-minor-warnings

alalek · alalek · commit aa688fb6d5b3 · 2018-09-25T13:18:50.000Z
diff --git a/modules/cvv/CMakeLists.txt b/modules/cvv/CMakeLists.txt
@@ -1,18 +1,11 @@
-if(NOT HAVE_QT5)
+if(NOT HAVE_QT5 OR NOT HAVE_CXX11)
   ocv_module_disable(cvv)
   return()
 endif()
 
 set(the_description "Debug visualization framework")
 ocv_add_module(cvv opencv_core opencv_imgproc opencv_features2d WRAP python)
 
-# we need C++11 and want warnings:
-if(MSVC)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Qstd=c++11 /W4")
-  add_definitions(/D__func__=__FUNCTION__)
-else()
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wextra -pedantic")
-endif()
 ocv_warnings_disable(CMAKE_CXX_FLAGS -Wshadow -Wmissing-declarations)
 
 # Qt5
diff --git a/modules/cvv/src/gui/call_window.hpp b/modules/cvv/src/gui/call_window.hpp
@@ -153,7 +153,7 @@ private slots:
 
 	void initFooter();
 
-	void closeEvent(QCloseEvent *event);
+    void closeEvent(QCloseEvent *event) CV_OVERRIDE;
 
 	size_t getCallTabIdByTabIndex(int index);
 
diff --git a/modules/cvv/src/gui/main_call_window.hpp b/modules/cvv/src/gui/main_call_window.hpp
@@ -56,7 +56,7 @@ class MainCallWindow : public CallWindow
 	void hideCloseWindow();
 
       protected:
-	void closeEvent(QCloseEvent *event);
+    void closeEvent(QCloseEvent *event) CV_OVERRIDE;
 
       private:
 	OverviewPanel *ovPanel;
diff --git a/modules/cvv/src/gui/overview_group_subtable.hpp b/modules/cvv/src/gui/overview_group_subtable.hpp
@@ -78,7 +78,7 @@ class OverviewGroupSubtable : public QWidget
 	void setRowGroup(stfl::ElementGroup<OverviewTableRow> &newGroup);
 	
 protected:
-	void resizeEvent(QResizeEvent *event);
+    void resizeEvent(QResizeEvent *event) CV_OVERRIDE;
 
 private slots:
 	void rowClicked(int row, int collumn);
diff --git a/modules/cvv/src/qtutil/filter/diffFilterWidget.hpp b/modules/cvv/src/qtutil/filter/diffFilterWidget.hpp
@@ -54,13 +54,13 @@ class DiffFilterFunction : public FilterFunctionWidget<2, 1>
 	* @param in Array of input matrices
 	* @param out Array of output matrices
 	*/
-	void applyFilter(InputArray in, OutputArray out) const;
+    void applyFilter(InputArray in, OutputArray out) const CV_OVERRIDE;
 
 	/**
 	* @brief Checks whether matrices in 'in' can be processed by this
 	* DiffFilter
 	*/
-	std::pair<bool, QString> checkInput(InputArray in) const;
+    std::pair<bool, QString> checkInput(InputArray in) const CV_OVERRIDE;
 
       private:
 	DiffFilterType filterType_;
diff --git a/modules/cvv/src/qtutil/filter/overlayfilterwidget.hpp b/modules/cvv/src/qtutil/filter/overlayfilterwidget.hpp
@@ -44,15 +44,15 @@ class OverlayFilterWidget : public FilterFunctionWidget<2, 1>
 	* @param in Array of input matrices
 	* @param out Array of output matrices
 	*/
-	void applyFilter(InputArray in, OutputArray out) const;
+    void applyFilter(InputArray in, OutputArray out) const CV_OVERRIDE;
 
 	/**
 	* Checks whether the matrices have the same size and same number of
 	* channels.
 	* @brief Checks whether matrices in "in" can be processed by Overlayfilter
 	* @param in Array of input matrices
 	*/
-	std::pair<bool, QString> checkInput(InputArray in) const;
+    std::pair<bool, QString> checkInput(InputArray in) const CV_OVERRIDE;
 
       private:
 	double opacityOfFilterImg_;
diff --git a/modules/cvv/src/qtutil/matchview/cvvkeypoint.hpp b/modules/cvv/src/qtutil/matchview/cvvkeypoint.hpp
@@ -52,7 +52,7 @@ class CVVKeyPoint : public QGraphicsObject,public cv::KeyPoint
 	 * @brief boundingRect
 	 * @return the boundingRect
 	 */
-	QRectF boundingRect() const;
+    QRectF boundingRect() const CV_OVERRIDE;
 
 	/**
 	 * @brief returns the keypoint
@@ -65,7 +65,7 @@ class CVVKeyPoint : public QGraphicsObject,public cv::KeyPoint
 	 * @brief the paint function.
 	 */
 	void paint(QPainter *painter, const QStyleOptionGraphicsItem *,
-		   QWidget *);
+           QWidget *) CV_OVERRIDE;
 
 	/**
 	 * @brief returns true if this keypoint is in the visble area of its
diff --git a/modules/cvv/src/qtutil/matchview/cvvmatch.hpp b/modules/cvv/src/qtutil/matchview/cvvmatch.hpp
@@ -48,13 +48,13 @@ class CVVMatch : public QGraphicsObject,public cv::DMatch
 	 * @brief returns the boundingrect of this Mathc
 	 * @return the boundingrect of this Mathc
 	 */
-	virtual QRectF boundingRect() const;
+    virtual QRectF boundingRect() const CV_OVERRIDE;
 
 	/**
 	 * @brief the paint function
 	 */
 	virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *,
-			   QWidget *);
+               QWidget *) CV_OVERRIDE;
 
 	/**
 	 * @brief returns the left keypoint.
diff --git a/modules/cvv/src/qtutil/matchview/keypointmanagement.hpp b/modules/cvv/src/qtutil/matchview/keypointmanagement.hpp
@@ -36,7 +36,7 @@ class KeyPointManagement : public KeyPointSettings
 	/**
 	 * @brief set the settings if this KeyPoint is selected
 	 */
-	virtual void setSettings(CVVKeyPoint &match);
+    virtual void setSettings(CVVKeyPoint &match) CV_OVERRIDE;
 
 	/**
 	 * @brief add the given KeyPointSettingsSelector to the list
diff --git a/modules/cvv/src/qtutil/matchview/keypointselectionselector.hpp b/modules/cvv/src/qtutil/matchview/keypointselectionselector.hpp
@@ -28,7 +28,7 @@ class KeyPointSelectionSelector:public KeyPointSelection,public RegisterHelper<K
 	 * @brief select keypoint of the given selection
 	 * @return the selected matches
 	 */
-	std::vector<cv::KeyPoint> select(const std::vector<cv::KeyPoint>& selection);
+    std::vector<cv::KeyPoint> select(const std::vector<cv::KeyPoint>& selection) CV_OVERRIDE;
 
 public slots:
 	/**
diff --git a/modules/cvv/src/qtutil/matchview/matchmanagement.hpp b/modules/cvv/src/qtutil/matchview/matchmanagement.hpp
@@ -35,7 +35,7 @@ class MatchManagement : public MatchSettings
 	/**
 	 * @brief set the settings if this match is selected
 	 */
-	virtual void setSettings(CVVMatch &match);
+    virtual void setSettings(CVVMatch &match) CV_OVERRIDE;
 
 	/**
 	 * @brief add the given MatchSettingsSelector to the list
diff --git a/modules/cvv/src/qtutil/matchview/matchselectionselector.hpp b/modules/cvv/src/qtutil/matchview/matchselectionselector.hpp
@@ -28,7 +28,7 @@ class MatchSelectionSelector:public MatchSelection,public RegisterHelper<MatchSe
 	 * @brief select matches of the given selection
 	 * @return the selected matches
 	 */
-	std::vector<cv::DMatch> select(const std::vector<cv::DMatch>& selection);
+    std::vector<cv::DMatch> select(const std::vector<cv::DMatch>& selection) CV_OVERRIDE;
 
 public slots:
 	/**
diff --git a/modules/cvv/src/qtutil/matchview/showinrawviewwidget.hpp b/modules/cvv/src/qtutil/matchview/showinrawviewwidget.hpp
@@ -41,9 +41,9 @@ class ShowInRawView:public QWidget{
 	~ShowInRawView();
 
 protected:
-	virtual void hideEvent(QHideEvent * );
+    virtual void hideEvent(QHideEvent * ) CV_OVERRIDE;
 
-	virtual void showEvent(QShowEvent *);
+    virtual void showEvent(QShowEvent *) CV_OVERRIDE;
 
 private slots:
 
diff --git a/modules/cvv/src/qtutil/matchview/zoomableproxyobject.hpp b/modules/cvv/src/qtutil/matchview/zoomableproxyobject.hpp
@@ -20,17 +20,17 @@ class ZoomableProxyObject : public QGraphicsProxyWidget
       public:
 	ZoomableProxyObject(ZoomableImage *zoom);
 
-	~ZoomableProxyObject()
+    ~ZoomableProxyObject() CV_OVERRIDE
 	{
 	}
 
       protected:
-	virtual void contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
+    virtual void contextMenuEvent(QGraphicsSceneContextMenuEvent *event) CV_OVERRIDE
 	{
 		event->ignore();
 	}
 
-	virtual void wheelEvent(QGraphicsSceneWheelEvent *event);
+    virtual void wheelEvent(QGraphicsSceneWheelEvent *event) CV_OVERRIDE;
 
       private:
 	ZoomableImage *image_;
diff --git a/modules/cvv/src/qtutil/stfl_query_widget_lineedit.hpp b/modules/cvv/src/qtutil/stfl_query_widget_lineedit.hpp
@@ -6,6 +6,7 @@
 #include <QKeyEvent>
 #include <QAbstractItemView>
 
+#include "opencv2/core/cvdef.h"
 #include "stfl_query_widget_completer.hpp"
 
 namespace cvv
@@ -41,7 +42,7 @@ class STFLQueryWidgetLineEdit : public QLineEdit
 	void showSuggestions(QStringList suggestions);
 
       protected:
-	void keyPressEvent(QKeyEvent *e);
+    void keyPressEvent(QKeyEvent *e) CV_OVERRIDE;
 
 signals:
 	/**
diff --git a/modules/cvv/src/view/rawview.hpp b/modules/cvv/src/view/rawview.hpp
@@ -88,9 +88,9 @@ class Rawview : public MatchView
 	 */
 	bool doesShowShowInViewMenu();
 
-	virtual std::vector<cv::DMatch> getMatchSelection();
+    virtual std::vector<cv::DMatch> getMatchSelection() CV_OVERRIDE;
 
-	virtual std::vector<cv::KeyPoint> getKeyPointSelection();
+    virtual std::vector<cv::KeyPoint> getKeyPointSelection() CV_OVERRIDE;
 
 signals:
 	/**
@@ -139,9 +139,9 @@ public slots:
 	void selectKeyPoints(const std::vector<cv::KeyPoint> &keyPoints);
 
 
-	virtual void setMatchSelection(std::vector<cv::DMatch> matches);
+    virtual void setMatchSelection(std::vector<cv::DMatch> matches) CV_OVERRIDE;
 
-	virtual void setKeyPointSelection(std::vector<cv::KeyPoint> keyPoints);
+    virtual void setKeyPointSelection(std::vector<cv::KeyPoint> keyPoints) CV_OVERRIDE;
 
 	/**
 	 * @brief Issues the matchesSelected and the keyPointsSelected signal.
diff --git a/modules/ovis/src/ovis.cpp b/modules/ovis/src/ovis.cpp
diff --git a/modules/sfm/CMakeLists.txt b/modules/sfm/CMakeLists.txt
