8000 remove QT_NAMESPACE · programersibuhuan/opencv-python@f3ad7d0 · GitHub
[go: up one dir, main page]
Skip to content

Commit f3ad7d0

Browse files
skvarkskvark
committed
remove QT_NAMESPACE
1 parent 72f3e5d commit f3ad7d0

File tree

2 files changed

+4
-447
lines changed

2 files changed

+4
-447
lines changed

‎patches/patch1.patch

Lines changed: 3 additions & 27 deletions
Original file line numberDiff line numberDiff line change
< 10000 div class="hunk-kebab-icon pr-2 pb-1 hunk-kebab-icon-unified">
@@ -1,6 +1,6 @@
11
--- opencv/modules/highgui/src/window_QT.h 2018-06-28 13:13:55.119434000 +0300
2-
+++ opencv/modules/highgui/src/window_QT_patched.h 2018-06-30 16:11:10.233722700 +0300
3-
@@ -46,58 +46,64 @@
2+
+++ opencv/modules/highgui/src/window_QT_patched.h 2018-06-30 16:46:55.848126700 +0300
3+
@@ -46,43 +46,50 @@
44
#define QT_NO_DEBUG_OUTPUT
55
#endif
66

@@ -72,6 +72,7 @@
7272
+class QDate;
7373
+class QFileDialog;
7474
+class QToolBar;
75+
+class QHBoxLayout;
7576
+
7677
+class QAction;
7778
+class QButtonGroup;
@@ -81,28 +82,3 @@
8182

8283
//start private enum
8384
enum { CV_MODE_NORMAL = 0, CV_MODE_OPENGL = 1 };
84-
85-
//we can change the keyboard shortcuts from here !
86-
-enum { shortcut_zoom_normal = Qt::CTRL + Qt::Key_Z,
87-
- shortcut_zoom_imgRegion = Qt::CTRL + Qt::Key_X,
88-
- shortcut_save_img = Qt::CTRL + Qt::Key_S,
89-
- shortcut_properties_win = Qt::CTRL + Qt::Key_P,
90-
- shortcut_zoom_in = Qt::CTRL + Qt::Key_Plus,//QKeySequence(QKeySequence::ZoomIn),
91-
- shortcut_zoom_out = Qt::CTRL + Qt::Key_Minus,//QKeySequence(QKeySequence::ZoomOut),
92-
- shortcut_panning_left = Qt::CTRL + Qt::Key_Left,
93-
- shortcut_panning_right = Qt::CTRL + Qt::Key_Right,
94-
- shortcut_panning_up = Qt::CTRL + Qt::Key_Up,
95-
- shortcut_panning_down = Qt::CTRL + Qt::Key_Down
96-
+enum { shortcut_zoom_normal = QT_NAMESPACE::CTRL + QT_NAMESPACE::Key_Z,
97-
+ shortcut_zoom_imgRegion = QT_NAMESPACE::CTRL + QT_NAMESPACE::Key_X,
98-
+ shortcut_save_img = QT_NAMESPACE::CTRL + QT_NAMESPACE::Key_S,
99-
+ shortcut_properties_win = QT_NAMESPACE::CTRL + QT_NAMESPACE::Key_P,
100-
+ shortcut_zoom_in = QT_NAMESPACE::CTRL + QT_NAMESPACE::Key_Plus,//QKeySequence(QKeySequence::ZoomIn),
101-
+ shortcut_zoom_out = QT_NAMESPACE::CTRL + QT_NAMESPACE::Key_Minus,//QKeySequence(QKeySequence::ZoomOut),
102-
+ shortcut_panning_left = QT_NAMESPACE::CTRL + QT_NAMESPACE::Key_Left,
103-
+ shortcut_panning_right = QT_NAMESPACE::CTRL + QT_NAMESPACE::Key_Right,
104-
+ shortcut_panning_up = QT_NAMESPACE::CTRL + QT_NAMESPACE::Key_Up,
105-
+ shortcut_panning_down = QT_NAMESPACE::CTRL + QT_NAMESPACE::Key_Down
106-
};
107-
//end enum
108-

0 commit comments

Comments
 (0)
0