From 7441f370c0adf6d436c92ca54ea7b936ceb030ed Mon Sep 17 00:00:00 2001
From: Richard Heck <rgheck@comcast.net>
Date: Sun, 18 Jul 2010 12:09:06 +0000
Subject: [PATCH] Revert r34969.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34973 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/frontends/qt4/GuiWorkArea.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/frontends/qt4/GuiWorkArea.cpp b/src/frontends/qt4/GuiWorkArea.cpp
index 006597ebac..1e87434ad1 100644
--- a/src/frontends/qt4/GuiWorkArea.cpp
+++ b/src/frontends/qt4/GuiWorkArea.cpp
@@ -820,16 +820,16 @@ void GuiWorkArea::wheelEvent(QWheelEvent * ev)
 	bool zoom = false;
 	switch (lyxrc.scroll_whell_zoom) {
 	case LyXRC::SCROLL_WHEEL_ZOOM_CTRL:
-		zoom = ev->modifiers() && Qt::ControlModifier;
-		zoom &= !(ev->modifiers() && (Qt::ShiftModifier || Qt::AltModifier));
+		zoom = ev->modifiers() & Qt::ControlModifier;
+		zoom &= !(ev->modifiers() & (Qt::ShiftModifier || Qt::AltModifier));
 		break;
 	case LyXRC::SCROLL_WHEEL_ZOOM_SHIFT:
-		zoom = ev->modifiers() && Qt::ShiftModifier;
-		zoom &= !(ev->modifiers() && (Qt::ControlModifier || Qt::AltModifier));
+		zoom = ev->modifiers() & Qt::ShiftModifier;
+		zoom &= !(ev->modifiers() & (Qt::ControlModifier || Qt::AltModifier));
 		break;
 	case LyXRC::SCROLL_WHEEL_ZOOM_ALT:
-		zoom = ev->modifiers() && Qt::AltModifier;
-		zoom &= !(ev->modifiers() && (Qt::ShiftModifier || Qt::ControlModifier));
+		zoom = ev->modifiers() & Qt::AltModifier;
+		zoom &= !(ev->modifiers() & (Qt::ShiftModifier || Qt::ControlModifier));
 		break;
 	case LyXRC::SCROLL_WHEEL_ZOOM_OFF:
 		break;