remove QT_NAMESPACE

Author: skvark

patches/patch1.patch

@@ -1,6 +1,6 @@
 --- opencv/modules/highgui/src/window_QT.h	2018-06-28 13:13:55.119434000 +0300
-+++ opencv/modules/highgui/src/window_QT_patched.h	2018-06-30 16:11:10.233722700 +0300
-@@ -46,58 +46,64 @@
++++ opencv/modules/highgui/src/window_QT_patched.h	2018-06-30 16:46:55.848126700 +0300
+@@ -46,43 +46,50 @@
  #define QT_NO_DEBUG_OUTPUT
  #endif
 
@@ -72,6 +72,7 @@
 +class QDate;
 +class QFileDialog;
 +class QToolBar;
++class QHBoxLayout;
 +
 +class QAction;
 +class QButtonGroup;
@@ -81,28 +82,3 @@
 
  //start private enum
  enum { CV_MODE_NORMAL = 0, CV_MODE_OPENGL = 1 };
- 
- //we can change the keyboard shortcuts from here !
--enum {	shortcut_zoom_normal 	= Qt::CTRL + Qt::Key_Z,
--        shortcut_zoom_imgRegion = Qt::CTRL + Qt::Key_X,
--        shortcut_save_img		= Qt::CTRL + Qt::Key_S,
--        shortcut_properties_win	= Qt::CTRL + Qt::Key_P,
--        shortcut_zoom_in 		= Qt::CTRL + Qt::Key_Plus,//QKeySequence(QKeySequence::ZoomIn),
--        shortcut_zoom_out		= Qt::CTRL + Qt::Key_Minus,//QKeySequence(QKeySequence::ZoomOut),
--        shortcut_panning_left 	= Qt::CTRL + Qt::Key_Left,
--        shortcut_panning_right 	= Qt::CTRL + Qt::Key_Right,
--        shortcut_panning_up 	= Qt::CTRL + Qt::Key_Up,
--        shortcut_panning_down 	= Qt::CTRL + Qt::Key_Down
-+enum {	shortcut_zoom_normal 	= QT_NAMESPACE::CTRL + QT_NAMESPACE::Key_Z,
-+        shortcut_zoom_imgRegion = QT_NAMESPACE::CTRL + QT_NAMESPACE::Key_X,
-+        shortcut_save_img		= QT_NAMESPACE::CTRL + QT_NAMESPACE::Key_S,
-+        shortcut_properties_win	= QT_NAMESPACE::CTRL + QT_NAMESPACE::Key_P,
-+        shortcut_zoom_in 		= QT_NAMESPACE::CTRL + QT_NAMESPACE::Key_Plus,//QKeySequence(QKeySequence::ZoomIn),
-+        shortcut_zoom_out		= QT_NAMESPACE::CTRL + QT_NAMESPACE::Key_Minus,//QKeySequence(QKeySequence::ZoomOut),
-+        shortcut_panning_left 	= QT_NAMESPACE::CTRL + QT_NAMESPACE::Key_Left,
-+        shortcut_panning_right 	= QT_NAMESPACE::CTRL + QT_NAMESPACE::Key_Right,
-+        shortcut_panning_up 	= QT_NAMESPACE::CTRL + QT_NAMESPACE::Key_Up,
-+        shortcut_panning_down 	= QT_NAMESPACE::CTRL + QT_NAMESPACE::Key_Down
-     };
- //end enum
-