OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-29 14:00:49 +03:00
Code Activity

0028934: Coding - Eliminate compiler warnings in OCCT samples

Browse Source 
- covering Qt warnings for compilation under MSVC 2013 and greater
- avoid warning about 'M_PI'(and others) redefinition warning of math.h: includes of QtWidgets should follow after other includes.
This commit is contained in:
nds
2018-04-04 06:25:02 +03:00
committed by bugmaster
parent 41bf7e0b3c
commit 55a40de890
36 changed files with 103 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
samples/qt/AndroidQt/src/AndroidQt.cxx
View File

@@ -34,7 +34,10 @@
#include <WNT_Window.hxx>
#include <EGL/egl.h>
#include <Standard_WarningsDisable.hxx>
#include <QFileInfo>
#include <Standard_WarningsRestore.hxx>
// =======================================================================
// function : AndroidQt
@@ -218,8 +221,8 @@ void AndroidQt::paint()
if (Abs (myTouchPoint.DevX()) + Abs (myTouchPoint.DevY()) > 1)
{
myView->StartRotation (myTouchPoint.X().first, myTouchPoint.Y().first);
myView->Rotation (myTouchPoint.X().second, myTouchPoint.Y().second);
myView->StartRotation ((Standard_Integer)myTouchPoint.X().first, (Standard_Integer)myTouchPoint.Y().first);
myView->Rotation ((Standard_Integer)myTouchPoint.X().second, (Standard_Integer)myTouchPoint.Y().second);
myTouchPoint.ClearDev();
}

5
samples/qt/AndroidQt/src/AndroidQt.h
View File

@@ -16,19 +16,20 @@
#include <OpenGl_Context.hxx>
#include <Standard_WarningsDisable.hxx>
// workaround broken definitions in Qt
#define GLdouble GLdouble
#include <QMutex>
#include <QtQuick/qquickwindow.h>
#include <QtQuick/QQuickItem>
#undef GLdouble
#include <Standard_WarningsRestore.hxx>
#include <AIS_InteractiveContext.hxx>
#include <V3d_View.hxx>
#include <QMutex>
#include "AndroidQt_TouchParameters.h"
//! QML item with embedded OCCT viewer.

2
samples/qt/AndroidQt/src/AndroidQt_TouchParameters.h
View File

@@ -14,7 +14,9 @@
#ifndef ANDROIDQT_TOUCHPARAMETERS_H
#define ANDROIDQT_TOUCHPARAMETERS_H
#include <Standard_WarningsDisable.hxx>
#include <QPair>
#include <Standard_WarningsRestore.hxx>
//! Class holding touch event state.
class AndroidQt_TouchParameters

2
samples/qt/AndroidQt/src/Main.cxx
View File

@@ -11,8 +11,10 @@
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#include <Standard_WarningsDisable.hxx>
#include <QApplication>
#include <QQmlApplicationEngine>
#include <Standard_WarningsRestore.hxx>
#include "AndroidQt.h"