0028934: Coding - Eliminate compiler warnings in OCCT samples

- 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.
2025-04-03 17:56:21 +03:00 · 2018-04-04 06:25:02 +03:00 · 2018-04-04 06:25:02 +03:00 · 55a40de890
commit 55a40de890
parent 41bf7e0b3c
36 changed files with 103 additions and 32 deletions
--- a/samples/qt/AndroidQt/src/AndroidQt.cxx
+++ b/samples/qt/AndroidQt/src/AndroidQt.cxx
@ -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();
  }
--- a/samples/qt/AndroidQt/src/AndroidQt.h
+++ b/samples/qt/AndroidQt/src/AndroidQt.h
@ -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.
--- a/samples/qt/AndroidQt/src/AndroidQt_TouchParameters.h
+++ b/samples/qt/AndroidQt/src/AndroidQt_TouchParameters.h
@ -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
--- a/samples/qt/AndroidQt/src/Main.cxx
+++ b/samples/qt/AndroidQt/src/Main.cxx
@ -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"

--- a/samples/qt/Common/src/ApplicationCommon.cxx
+++ b/samples/qt/Common/src/ApplicationCommon.cxx
@ -3,6 +3,7 @@
 #include "DocumentCommon.h"
 #include "View.h"

+#include <Standard_WarningsDisable.hxx>
 #include <QFrame>
 #include <QVBoxLayout>
 #include <QMenuBar>
@ -12,6 +13,7 @@
 #include <QMessageBox>
 #include <QApplication>
 #include <QSignalMapper>
+#include <Standard_WarningsRestore.hxx>

 #include <Graphic3d_GraphicDriver.hxx>
 #include <OpenGl_GraphicDriver.hxx>
--- a/samples/qt/Common/src/ApplicationCommon.h
+++ b/samples/qt/Common/src/ApplicationCommon.h
@ -3,12 +3,14 @@

 #include "DocumentCommon.h"

+#include <Standard_WarningsDisable.hxx>
 #include <QMainWindow>
 #include <QAction>
 #include <QToolBar>
 #include <QMenu>
 #include <QMdiArea>
 #include <QList>
+#include <Standard_WarningsRestore.hxx>


 class COMMONSAMPLE_EXPORT ApplicationCommonWindow: public QMainWindow
--- a/samples/qt/Common/src/Common-icon.ts
+++ b/samples/qt/Common/src/Common-icon.ts
@ -134,10 +134,6 @@
        <source>ICON_TOOL_SHADOWS</source>
        <translation>shadows.png</translation>
    </message>
-    <message>
-        <source>ICON_TOOL_RAYTRACING</source>
-        <translation>shadows.png</translation>
-    </message>
    <message>
        <source>ICON_TOOL_REFLECTIONS</source>
        <translation>reflections.png</translation>
--- a/samples/qt/Common/src/DocumentCommon.cxx
+++ b/samples/qt/Common/src/DocumentCommon.cxx
@ -4,10 +4,12 @@
 #include "Transparency.h"
 #include "Material.h"

+#include <Standard_WarningsDisable.hxx>
 #include <QStatusBar>
 #include <QApplication>
 #include <QColor>
 #include <QColorDialog>
+#include <Standard_WarningsRestore.hxx>

 #include <Aspect_DisplayConnection.hxx>
 #include <AIS_InteractiveObject.hxx>
@ -188,7 +190,8 @@ void DocumentCommon::onColor()
    {
        Quantity_Color aShapeColor;
        myContext->Color( Current, aShapeColor );
-        aColor.setRgb( aShapeColor.Red() * 255, aShapeColor.Green() * 255, aShapeColor.Blue() * 255 );
+        aColor.setRgb( (Standard_Integer)(aShapeColor.Red() * 255), (Standard_Integer)(aShapeColor.Green() * 255),
+                       (Standard_Integer)(aShapeColor.Blue() * 255));
    }
    else
        aColor.setRgb( 255, 255, 255 );
--- a/samples/qt/Common/src/DocumentCommon.h
+++ b/samples/qt/Common/src/DocumentCommon.h
@ -4,8 +4,10 @@
 #include "MDIWindow.h"
 //#include "IESample.h"

+#include <Standard_WarningsDisable.hxx>
 #include <QObject>
 #include <QList>
+#include <Standard_WarningsRestore.hxx>

 #include <AIS_InteractiveContext.hxx>
 #include <V3d_Viewer.hxx>
--- a/samples/qt/Common/src/MDIWindow.cxx
+++ b/samples/qt/Common/src/MDIWindow.cxx
@ -4,6 +4,7 @@
 #include "DocumentCommon.h"
 #include "ApplicationCommon.h"

+#include <Standard_WarningsDisable.hxx>
 #include <QFrame>
 #include <QToolBar>
 #include <QFileDialog>
@ -14,6 +15,7 @@
 #include <QFileInfo>
 #include <QMainWindow> 
 #include <QVBoxLayout>
+#include <Standard_WarningsRestore.hxx>

 MDIWindow::MDIWindow(View* aView,
                     DocumentCommon* aDocument, 
--- a/samples/qt/Common/src/MDIWindow.h
+++ b/samples/qt/Common/src/MDIWindow.h
@ -1,7 +1,10 @@
 #ifndef MDIWINDOW_H
 #define MDIWINDOW_H

+#include <Standard_WarningsDisable.hxx>
 #include <QMainWindow>
+#include <Standard_WarningsRestore.hxx>
+
 #include "CommonSample.h"

 class DocumentCommon;
--- a/samples/qt/Common/src/Material.cxx
+++ b/samples/qt/Common/src/Material.cxx
@ -1,8 +1,10 @@
 #include "Material.h"

+#include <Standard_WarningsDisable.hxx>
 #include <QPushButton>
 #include <QLayout>
 #include <QSignalMapper>
+#include <Standard_WarningsRestore.hxx>

 #include <Graphic3d_NameOfMaterial.hxx>

--- a/samples/qt/Common/src/Material.h
+++ b/samples/qt/Common/src/Material.h
@ -1,9 +1,11 @@
 #ifndef MATERIAL_H
 #define MATERIAL_H

+#include <Standard_WarningsDisable.hxx>
 #include <QDialog>
 #include <QList>
 #include <QPushButton>
+#include <Standard_WarningsRestore.hxx>

 #include <AIS_InteractiveContext.hxx>

--- a/samples/qt/Common/src/OcctWindow.h
+++ b/samples/qt/Common/src/OcctWindow.h
@ -3,7 +3,10 @@

 #include <Aspect_Window.hxx>

+#include <Standard_WarningsDisable.hxx>
 #include <QWidget>
+#include <Standard_WarningsRestore.hxx>
+
 class OcctWindow;

 /*
--- a/samples/qt/Common/src/Transparency.cxx
+++ b/samples/qt/Common/src/Transparency.cxx
@ -1,7 +1,9 @@
 #include "Transparency.h"

+#include <Standard_WarningsDisable.hxx>
 #include <QHBoxLayout>
 #include <QSpinBox>
+#include <Standard_WarningsRestore.hxx>

 DialogTransparency::DialogTransparency( QWidget* parent, Qt::WindowFlags f, bool modal )
 : QDialog( parent, f )
--- a/samples/qt/Common/src/Transparency.h
+++ b/samples/qt/Common/src/Transparency.h
@ -1,5 +1,8 @@
+#include <Standard_WarningsDisable.hxx>
 #include <QDialog>
 #include <QWidget>
+#include <Standard_WarningsRestore.hxx>
+
 #include <AIS_InteractiveContext.hxx>

 class DialogTransparency : public QDialog
--- a/samples/qt/Common/src/View.cxx
+++ b/samples/qt/Common/src/View.cxx
@ -5,6 +5,7 @@
 #include "View.h"
 #include "ApplicationCommon.h"

+#include <Standard_WarningsDisable.hxx>
 #include <QApplication>
 #include <QPainter>
 #include <QMenu>
@ -19,6 +20,7 @@
 #if !defined(_WIN32) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX)) && QT_VERSION < 0x050000
  #include <QX11Info>
 #endif
+#include <Standard_WarningsRestore.hxx>


 #include <Graphic3d_ExportFormat.hxx>
@ -997,7 +999,7 @@ void View::onBackground()
    Standard_Real G1;
    Standard_Real B1;
    myView->BackgroundColor(Quantity_TOC_RGB,R1,G1,B1);
-    aColor.setRgb(R1*255,G1*255,B1*255);
+    aColor.setRgb((Standard_Integer)(R1 * 255), (Standard_Integer)(G1 * 255), (Standard_Integer)(B1 * 255));

    QColor aRetColor = QColorDialog::getColor(aColor);

--- a/samples/qt/Common/src/View.h
+++ b/samples/qt/Common/src/View.h
@ -1,9 +1,11 @@
 #ifndef VIEW_H
 #define VIEW_H

+#include <Standard_WarningsDisable.hxx>
 #include <QWidget>
 #include <QAction>
 #include <QList>
+#include <Standard_WarningsRestore.hxx>

 #include <AIS_InteractiveContext.hxx>
 #include <V3d_View.hxx>
--- a/samples/qt/FuncDemo/src/FThread.cpp
+++ b/samples/qt/FuncDemo/src/FThread.cpp
@ -19,24 +19,24 @@ FThread::~FThread()

 }

-void FThread::setIterator(const TFunction_Iterator& itr)
+void FThread::setIterator(const TFunction_Iterator& theItr)
 {
-    this->itr = itr;
+    this->itr = theItr;
 }

-void FThread::setLogbook(const Handle(TFunction_Logbook)& log)
+void FThread::setLogbook(const Handle(TFunction_Logbook)& theLog)
 {
-    this->log = log;
+    this->log = theLog;
 }

-void FThread::setGraph(GraphWidget* graph)
+void FThread::setGraph(GraphWidget* theGraph)
 {
-    this->graph = graph;
+    this->graph = theGraph;
 }

-void FThread::setThreadIndex(const int thread_index)
+void FThread::setThreadIndex(const int theIndex)
 {
-    this->thread_index = thread_index;
+    this->thread_index = theIndex;
 }

 // Returns any free (not executed yet) function
--- a/samples/qt/FuncDemo/src/FThread.h
+++ b/samples/qt/FuncDemo/src/FThread.h
@ -1,7 +1,9 @@
 #ifndef _FTHREAD_H_
 #define _FTHREAD_H_

+#include <Standard_WarningsDisable.hxx>
 #include <QThread>
+#include <Standard_WarningsRestore.hxx>

 #include <TFunction_Logbook.hxx>
 #include <TFunction_Iterator.hxx>
--- a/samples/qt/FuncDemo/src/edge.cpp
+++ b/samples/qt/FuncDemo/src/edge.cpp
@ -38,7 +38,9 @@
 **
 ****************************************************************************/

+#include <Standard_WarningsDisable.hxx>
 #include <QPainter>
+#include <Standard_WarningsRestore.hxx>

 #include "edge.h"
 #include "node.h"
--- a/samples/qt/FuncDemo/src/edge.h
+++ b/samples/qt/FuncDemo/src/edge.h
@ -41,7 +41,9 @@
 #ifndef EDGE_H
 #define EDGE_H

+#include <Standard_WarningsDisable.hxx>
 #include <QGraphicsItem>
+#include <Standard_WarningsRestore.hxx>

 class Node;

--- a/samples/qt/FuncDemo/src/graphwidget.cpp
+++ b/samples/qt/FuncDemo/src/graphwidget.cpp
@ -42,10 +42,12 @@
 #include "edge.h"
 #include "node.h"

+#include <Standard_WarningsDisable.hxx>
 #include <QDebug>
 #include <QGraphicsScene>
 #include <QWheelEvent>
 #include <QApplication>
+#include <Standard_WarningsRestore.hxx>

 #include <math.h>

--- a/samples/qt/FuncDemo/src/graphwidget.h
+++ b/samples/qt/FuncDemo/src/graphwidget.h
@ -41,7 +41,9 @@
 #ifndef GRAPHWIDGET_H
 #define GRAPHWIDGET_H

+#include <Standard_WarningsDisable.hxx>
 #include <QGraphicsView>
+#include <Standard_WarningsRestore.hxx>

 #include "FThread.h"

--- a/samples/qt/FuncDemo/src/main.cpp
+++ b/samples/qt/FuncDemo/src/main.cpp
@ -38,7 +38,9 @@
 **
 ****************************************************************************/

+#include <Standard_WarningsDisable.hxx>
 #include <QApplication>
+#include <Standard_WarningsRestore.hxx>
 #include "mainwindow.h"

 #include <OSD_Environment.hxx>
--- a/samples/qt/FuncDemo/src/mainwindow.cpp
+++ b/samples/qt/FuncDemo/src/mainwindow.cpp
@ -38,12 +38,6 @@
 **
 ****************************************************************************/

-#include <QtGui>
-#include <QtGlobal>
-#if QT_VERSION > QT_VERSION_CHECK(5, 0, 0)
-#include <QtWidgets>
-#endif
-
 #include "mainwindow.h"
 #include "graphwidget.h"
 #include "node.h"
@ -77,6 +71,15 @@
 #include <TDataStd_Name.hxx>
 #include <TDataStd_Real.hxx>
 #include <TDataStd_RealArray.hxx>
+
+#include <Standard_WarningsDisable.hxx>
+#include <QtGui>
+#include <QtGlobal>
+#if QT_VERSION > QT_VERSION_CHECK(5, 0, 0)
+#include <QtWidgets>
+#endif
+#include <Standard_WarningsRestore.hxx>
+
 #ifdef __GNUC__
 #include <unistd.h>
 #endif
--- a/samples/qt/FuncDemo/src/mainwindow.h
+++ b/samples/qt/FuncDemo/src/mainwindow.h
@ -41,7 +41,10 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H

+#include <Standard_WarningsDisable.hxx>
 #include <QMainWindow>
+#include <Standard_WarningsRestore.hxx>
+
 #include <AppStd_Application.hxx>

 class QAction;
--- a/samples/qt/FuncDemo/src/node.cpp
+++ b/samples/qt/FuncDemo/src/node.cpp
@ -38,10 +38,12 @@
 **
 ****************************************************************************/

+#include <Standard_WarningsDisable.hxx>
 #include <QGraphicsScene>
 #include <QGraphicsSceneMouseEvent>
 #include <QPainter>
 #include <QStyleOption>
+#include <Standard_WarningsRestore.hxx>

 #include "edge.h"
 #include "node.h"
--- a/samples/qt/FuncDemo/src/node.h
+++ b/samples/qt/FuncDemo/src/node.h
@ -41,8 +41,10 @@
 #ifndef NODE_H
 #define NODE_H

+#include <Standard_WarningsDisable.hxx>
 #include <QGraphicsItem>
 #include <QList>
+#include <Standard_WarningsRestore.hxx>

 #include <TDF_Label.hxx>

--- a/samples/qt/IESample/src/Main.cxx
+++ b/samples/qt/IESample/src/Main.cxx
@ -2,10 +2,12 @@

 #include <OSD_Environment.hxx>

+#include <Standard_WarningsDisable.hxx>
 #include <QApplication>
 #include <QTranslator>
 #include <QPixmap>
 #include <QLocale>
+#include <Standard_WarningsRestore.hxx>
  

 int main ( int argc, char* argv[] )
--- a/samples/qt/Interface/src/Application.cxx
+++ b/samples/qt/Interface/src/Application.cxx
@ -2,12 +2,15 @@

 #include "Translate.h"

+#include <Standard_WarningsDisable.hxx>
 #include <QMessageBox>
-#include <stdlib.h>
 #include <QMdiSubWindow>
+#include <Standard_WarningsRestore.hxx>

 #include <OSD_Environment.hxx>

+#include <stdlib.h>
+
 ApplicationWindow::ApplicationWindow()
    : ApplicationCommonWindow( ),
      myImportPopup( 0 ),
@ -200,13 +203,13 @@ void ApplicationWindow::onSelectionChanged()
  QMdiArea* ws = getWorkspace();
  DocumentCommon* doc = qobject_cast<MDIWindow*>( ws->activeSubWindow()->widget() )->getDocument();
  Handle(AIS_InteractiveContext) context = doc->getContext();
-  int numSel = context->NbSelected();
+  bool anEnabled = (context->NbSelected() > 0);

-  myCasCadeTranslateActions.at( FileExportBREPId )->setEnabled( numSel );
-  myCasCadeTranslateActions.at( FileExportIGESId )->setEnabled( numSel );
-  myCasCadeTranslateActions.at( FileExportSTEPId )->setEnabled( numSel );
-  myCasCadeTranslateActions.at( FileExportSTLId )->setEnabled( numSel );
-  myCasCadeTranslateActions.at( FileExportVRMLId )->setEnabled( numSel );
+  myCasCadeTranslateActions.at( FileExportBREPId )->setEnabled( anEnabled );
+  myCasCadeTranslateActions.at( FileExportIGESId )->setEnabled( anEnabled );
+  myCasCadeTranslateActions.at( FileExportSTEPId )->setEnabled( anEnabled );
+  myCasCadeTranslateActions.at( FileExportSTLId )->setEnabled( anEnabled );
+  myCasCadeTranslateActions.at( FileExportVRMLId )->setEnabled( anEnabled );
 }

 QString ApplicationWindow::getIEResourceDir()
--- a/samples/qt/Interface/src/Translate.cxx
+++ b/samples/qt/Interface/src/Translate.cxx
@ -2,6 +2,7 @@

 #include "Application.h"

+#include <Standard_WarningsDisable.hxx>
 #include <QDir>
 #include <QLayout>
 #include <QComboBox>
@ -12,6 +13,7 @@
 #include <QApplication>
 #include <QWidget>
 #include <QStyleFactory>
+#include <Standard_WarningsRestore.hxx>

 #include <AIS_Shape.hxx>
 #include <AIS_InteractiveObject.hxx>
@ -305,7 +307,7 @@ QString Translate::selectFileName( const int format, const bool import )
    if ( idx != -1 )
    {
      QString tail = selFilter.mid( idx + 3 );
-			int idx = tail.indexOf( " " );
+			idx = tail.indexOf( " " );
      if ( idx == -1 )
        idx = tail.indexOf( ")" );
      QString ext = tail.left( idx );
--- a/samples/qt/Interface/src/Translate.h
+++ b/samples/qt/Interface/src/Translate.h
@ -2,7 +2,9 @@
 #define TRANSLATE_H
 #include "IESample.h"

+#include <Standard_WarningsDisable.hxx>
 #include <QObject>
+#include <Standard_WarningsRestore.hxx>

 #include <AIS_InteractiveContext.hxx>
 #include <TopTools_HSequenceOfShape.hxx>
--- a/samples/qt/Tutorial/src/ApplicationTut.cxx
+++ b/samples/qt/Tutorial/src/ApplicationTut.cxx
@ -3,9 +3,11 @@

 #include <OSD_Environment.hxx>

+#include <Standard_WarningsDisable.hxx>
 #include <QFileDialog>
 #include <QStatusBar>
 #include <QMdiSubWindow>
+#include <Standard_WarningsRestore.hxx>

 ApplicationTut::ApplicationTut()
    : ApplicationCommonWindow( )
--- a/samples/qt/Tutorial/src/DocumentTut.cxx
+++ b/samples/qt/Tutorial/src/DocumentTut.cxx
@ -1,8 +1,10 @@
 #include "DocumentTut.h"

+#include <Standard_WarningsDisable.hxx>
 #include <QFileDialog>
 #include <QMessageBox>
 #include <QApplication>
+#include <Standard_WarningsRestore.hxx>

 #include <TopoDS_Shape.hxx>
 #include <AIS_Shape.hxx>
--- a/samples/qt/Tutorial/src/Main.cxx
+++ b/samples/qt/Tutorial/src/Main.cxx
@ -2,8 +2,10 @@

 #include <OSD_Environment.hxx>

+#include <Standard_WarningsDisable.hxx>
 #include <QApplication>
 #include <QTranslator>
+#include <Standard_WarningsRestore.hxx>

 int main ( int argc, char* argv[] )
 {