OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-11-02 09:00:14 -06:00
Code Issues Packages Projects Releases Wiki Activity

CMake : Improve handling of compiler flags (#8486)

Browse Source 
#8478 Code cleanup to fix some warnings

Several adjustments to improve the specification and usage of compile flags.
This commit is contained in:
Magne Sjaastad authored and GitHub committed 2022-01-26 10:08:28 +01:00
1 parent d5b17976ed
commit 2d2bf0bbc7
24 files changed
+190 -64
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Fwk/AppFwk/cafViewer/cafCadNavigation.cpp
+3 -3
View File
@@ -74,7 +74,7 @@ bool caf::CadNavigation::handleInputEvent( QInputEvent* inputEvent )
int translatedMousePosX, translatedMousePosY;
cvfEventPos( me->x(), me->y(), &translatedMousePosX, &translatedMousePosY );
if ( me->button() == Qt::MidButton && me->modifiers() == Qt::NoModifier && isRotationEnabled() )
if ( me->button() == Qt::MiddleButton && me->modifiers() == Qt::NoModifier && isRotationEnabled() )
{
this->pickAndSetPointOfInterest( me->x(), me->y() );
@@ -85,7 +85,7 @@ bool caf::CadNavigation::handleInputEvent( QInputEvent* inputEvent )
m_hasMovedMouseDuringNavigation = false;
isEventHandled = true;
}
else if ( me->button() == Qt::MidButton && ( me->modifiers() & Qt::ShiftModifier ) )
else if ( me->button() == Qt::MiddleButton && ( me->modifiers() & Qt::ShiftModifier ) )
{
m_trackball->startNavigation( cvf::ManipulatorTrackball::PAN, translatedMousePosX, translatedMousePosY );
m_isNavigating = true;
@@ -100,7 +100,7 @@ bool caf::CadNavigation::handleInputEvent( QInputEvent* inputEvent )
if ( m_isNavigating )
{
QMouseEvent* me = static_cast<QMouseEvent*>( inputEvent );
if ( me->button() == Qt::MidButton )
if ( me->button() == Qt::MiddleButton )
{
m_trackball->endNavigation();
Fwk/AppFwk/cafViewer/cafCeetronNavigation.cpp
+1 -1
View File
@@ -229,7 +229,7 @@ ManipulatorTrackball::NavigationType caf::CeetronNavigation::getNavigationTypeFr
{
return ManipulatorTrackball::ROTATE;
}
else if ( mouseButtons == Qt::MidButton || mouseButtons == ( Qt::LeftButton | Qt::RightButton ) )
else if ( mouseButtons == Qt::MiddleButton || mouseButtons == ( Qt::LeftButton | Qt::RightButton ) )
{
return ManipulatorTrackball::WALK;
}
Fwk/AppFwk/cafViewer/cafCeetronPlusNavigation.cpp
+2 -2
View File
@@ -98,7 +98,7 @@ bool caf::CeetronPlusNavigation::handleInputEvent( QInputEvent* inputEvent )
isEventHandled = true;
}
}
else if ( me->button() == Qt::MidButton )
else if ( me->button() == Qt::MiddleButton )
{
if ( me->modifiers() == Qt::NoModifier )
{
@@ -130,7 +130,7 @@ bool caf::CeetronPlusNavigation::handleInputEvent( QInputEvent* inputEvent )
if ( m_hasMovedMouseDuringNavigation ) isEventHandled = true;
m_hasMovedMouseDuringNavigation = false;
}
else if ( me->button() == Qt::MidButton )
else if ( me->button() == Qt::MiddleButton )
{
m_isZooming = false;