From 4263b55ffa68c45f28857854fbba5271502050a9 Mon Sep 17 00:00:00 2001 From: Peter Gal Date: Thu, 8 Jun 2017 14:47:51 +0200 Subject: [PATCH] Fix enum flag usages in the qrenderdoc There are a few places where the logical 'and' operator was used to check if a given flag is enabled however that is not the correct operator. The binary 'and' operator should be used where the enum acts as a flag. --- qrenderdoc/Widgets/Extended/RDTextEdit.cpp | 4 ++-- qrenderdoc/Windows/BufferViewer.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qrenderdoc/Widgets/Extended/RDTextEdit.cpp b/qrenderdoc/Widgets/Extended/RDTextEdit.cpp index 82c4956c1..0649641ce 100644 --- a/qrenderdoc/Widgets/Extended/RDTextEdit.cpp +++ b/qrenderdoc/Widgets/Extended/RDTextEdit.cpp @@ -49,11 +49,11 @@ void RDTextEdit::focusOutEvent(QFocusEvent *e) void RDTextEdit::keyPressEvent(QKeyEvent *e) { // add ctrl-end and ctrl-home shortcuts, which aren't implemented for read-only edits - if(e->key() == Qt::Key_End && e->modifiers() && Qt::ControlModifier) + if(e->key() == Qt::Key_End && (e->modifiers() & Qt::ControlModifier)) { verticalScrollBar()->setValue(verticalScrollBar()->maximum()); } - else if(e->key() == Qt::Key_Home && e->modifiers() && Qt::ControlModifier) + else if(e->key() == Qt::Key_Home && (e->modifiers() & Qt::ControlModifier)) { verticalScrollBar()->setValue(verticalScrollBar()->minimum()); } diff --git a/qrenderdoc/Windows/BufferViewer.cpp b/qrenderdoc/Windows/BufferViewer.cpp index 2e26b3ec2..e997816cc 100644 --- a/qrenderdoc/Windows/BufferViewer.cpp +++ b/qrenderdoc/Windows/BufferViewer.cpp @@ -70,7 +70,7 @@ public: if(e->key() == Qt::Key_W || e->key() == Qt::Key_S) setMove(Direction::Fwd, 0); - if(e->modifiers() && Qt::ShiftModifier) + if(e->modifiers() & Qt::ShiftModifier) m_CurrentSpeed = 3.0f; else m_CurrentSpeed = 1.0f; @@ -91,7 +91,7 @@ public: if(e->key() == Qt::Key_A) setMove(Direction::Horiz, -1); - if(e->modifiers() && Qt::ShiftModifier) + if(e->modifiers() & Qt::ShiftModifier) m_CurrentSpeed = 3.0f; else m_CurrentSpeed = 1.0f;