Re: changeset/3495 - trunk uncompilable

[Peter Kümmel]

Uwe Stöhr wrote:
> Hello Stephan,
> 
> your new code does not compile, neither with CMake nor SCons:

Patch attached, but I don't know if it's correct.

Peter

> 
> D:\LyXSVN\lyx-devel\src\frontends\qt4\GuiWorkArea.cpp(824) : error C2666: 
> 'QFlag
> s<Enum>::operator &' : 3 overloads have similar conversions
>          with
>          [
>              Enum=Qt::KeyboardModifier
>          ]
>          d:\qt\include\qtcore\../../src/corelib/global/qglobal.h(2184): could 
> be
> 'QFlags<Enum> QFlags<Enum>::operator &(uint) const'
>          with
>          [
>              Enum=Qt::KeyboardModifier
>          ]
>          d:\qt\include\qtcore\../../src/corelib/global/qglobal.h(2183): or
> 'QFlags<Enum> QFlags<Enum>::operator &(int) const'
>          with
>          [
>              Enum=Qt::KeyboardModifier
>          ]
>          or       'built-in C++ operator&(int, bool)'
>          while trying to match the argument list '(Qt::KeyboardModifiers, 
> bool)'
> D:\LyXSVN\lyx-devel\src\frontends\qt4\GuiWorkArea.cpp(828) : error C2666: 
> 'QFlag
> s<Enum>::operator &' : 3 overloads have similar conversions
>          with
>          [
>              Enum=Qt::KeyboardModifier
>          ]
>          d:\qt\include\qtcore\../../src/corelib/global/qglobal.h(2184): could 
> be
> 'QFlags<Enum> QFlags<Enum>::operator &(uint) const'
>          with
>          [
>              Enum=Qt::KeyboardModifier
>          ]
>          d:\qt\include\qtcore\../../src/corelib/global/qglobal.h(2183): or
> 'QFlags<Enum> QFlags<Enum>::operator &(int) const'
>          with
>          [
>              Enum=Qt::KeyboardModifier
>          ]
>          or       'built-in C++ operator&(int, bool)'
>          while trying to match the argument list '(Qt::KeyboardModifiers, 
> bool)'
> D:\LyXSVN\lyx-devel\src\frontends\qt4\GuiWorkArea.cpp(832) : error C2666: 
> 'QFlag
> s<Enum>::operator &' : 3 overloads have similar conversions
>          with
>          [
>              Enum=Qt::KeyboardModifier
>          ]
>          d:\qt\include\qtcore\../../src/corelib/global/qglobal.h(2184): could 
> be
> 'QFlags<Enum> QFlags<Enum>::operator &(uint) const'
>          with
>          [
>              Enum=Qt::KeyboardModifier
>          ]
>          d:\qt\include\qtcore\../../src/corelib/global/qglobal.h(2183): or
> 'QFlags<Enum> QFlags<Enum>::operator &(int) const'
>          with
>          [
>              Enum=Qt::KeyboardModifier
>          ]
>          or       'built-in C++ operator&(int, bool)'
>          while trying to match the argument list '(Qt::KeyboardModifiers, 
> bool)'
> 
> regards Uwe
> 

 ADD_CUSTOM_TARGET(update_po_files DEPENDS ${LYX_UPDATED_PO_FILES})
Index: src/frontends/qt4/GuiWorkArea.cpp
===================================================================
--- src/frontends/qt4/GuiWorkArea.cpp   (Revision 34964)
+++ src/frontends/qt4/GuiWorkArea.cpp   (Arbeitskopie)
@@ -821,15 +821,15 @@
        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::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::ControlModifier || 
Qt::AltModifier));
                break;
        case LyXRC::SCROLL_WHEEL_ZOOM_OPTION:
                zoom = ev->modifiers() & Qt::AltModifier;
-               zoom &= !(ev->modifiers() & (Qt::ShiftModifier || 
Qt::ControlModifier));
+               zoom &= !(ev->modifiers() && (Qt::ShiftModifier || 
Qt::ControlModifier));
                break;
        case LyXRC::SCROLL_WHEEL_ZOOM_OFF:
                break;