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.

diff --git a/samples/qt/AndroidQt/src/AndroidQt.cxx b/samples/qt/AndroidQt/src/AndroidQt.cxx
index 54a339c37b18c7cdb496d48362dbece76abed9f1..c73d00a5efc8c80941738c24e99bb60b378273cc 100644 (file)
--- 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();
   }

diff --git a/samples/qt/AndroidQt/src/AndroidQt.h b/samples/qt/AndroidQt/src/AndroidQt.h
index 0e5462e0c8a056bf4afd1ad98f22ad3038fa8a4b..4b6059fc2415dc92053467c053aecb10ede7812b 100644 (file)
--- 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.

diff --git a/samples/qt/AndroidQt/src/AndroidQt_TouchParameters.h b/samples/qt/AndroidQt/src/AndroidQt_TouchParameters.h
index 1debd061673ff7fd1c945aeaece33c957eafb45b..bd62f63646e34d43a0d20f141d3c71e9ce7d285a 100644 (file)
--- 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

diff --git a/samples/qt/AndroidQt/src/Main.cxx b/samples/qt/AndroidQt/src/Main.cxx
index 51ae7c1a06da8c0502e9e7c3245b3937fd6b9ad7..89160d1e7c118bf67358b111faa3c959002b2cf2 100644 (file)
--- 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"
 

diff --git a/samples/qt/Common/src/ApplicationCommon.cxx b/samples/qt/Common/src/ApplicationCommon.cxx
index a3e94903ab26b3147e1ad4b9dd7cda1d8ff59584..2dfc5ed3e1e3e7dbed3f8f703367a4eb7650b954 100755 (executable)
--- 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>

diff --git a/samples/qt/Common/src/ApplicationCommon.h b/samples/qt/Common/src/ApplicationCommon.h
index cdc8802c2ccda2aafdde934cad234423e70c2c43..a0d7e4ea31765351d029e2c1b45e2c002977508f 100755 (executable)
--- 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

diff --git a/samples/qt/Common/src/Common-icon.ts b/samples/qt/Common/src/Common-icon.ts
index 23469bcef57fca24cd50bc900cf024696c021e0a..972e6d450dbedb0af2213243dbcdeb8e10808a6a 100755 (executable)
--- 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>

diff --git a/samples/qt/Common/src/DocumentCommon.cxx b/samples/qt/Common/src/DocumentCommon.cxx
index f19194ec2d18ee431e28cb1a864dffad89ab0e35..e4903bb69c74ec20f358c9c67672c137549d4c3a 100755 (executable)
--- 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 );

diff --git a/samples/qt/Common/src/DocumentCommon.h b/samples/qt/Common/src/DocumentCommon.h
index 150de48f9fe5759eecccf1df9224627bcadb1e39..120cb2f9d53bcb55ba3aebf70f84fe99288ac678 100755 (executable)
--- 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>

diff --git a/samples/qt/Common/src/MDIWindow.cxx b/samples/qt/Common/src/MDIWindow.cxx
index f09bce40642402c23bbadd13c4d47558bada408d..87498eab00161b40dcc158f61b3e0b564dc73601 100755 (executable)
--- 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, 

diff --git a/samples/qt/Common/src/MDIWindow.h b/samples/qt/Common/src/MDIWindow.h
index bf8902690ce5c3064c2124f94e6e16253da67c86..06f75501bbf61c1e497e67088c54c04f4257a4b9 100755 (executable)
--- 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;

diff --git a/samples/qt/Common/src/Material.cxx b/samples/qt/Common/src/Material.cxx
index 748d93f76ea5d5c20d6d74456cb007eb35d7ae34..650174d457b90244d71c9474a583b0c10918d817 100755 (executable)
--- 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>
 

diff --git a/samples/qt/Common/src/Material.h b/samples/qt/Common/src/Material.h
index a773a7beb2a68dcfe975dea408eb56de3d370979..ab8fcf68e73b7e809055e9251422cf3cf32ec0b5 100755 (executable)
--- 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>
 

diff --git a/samples/qt/Common/src/OcctWindow.h b/samples/qt/Common/src/OcctWindow.h
index b111656032087def693586dae3450136683e13fe..34ad07774e96386ecec8500c0e8a2439648f208f 100644 (file)
--- 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;
 
 /*

diff --git a/samples/qt/Common/src/Transparency.cxx b/samples/qt/Common/src/Transparency.cxx
index a34fbf8a3f116ff3d376f793d640b488f3ad4c6c..192198bcfeb9fbde7362e2e3901149b627c5ee03 100755 (executable)
--- 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 )

diff --git a/samples/qt/Common/src/Transparency.h b/samples/qt/Common/src/Transparency.h
index b37dd8918de98c071108538c906997c1658255eb..a8948c4340f5f1dc2689d0ebc8bd72d90ffb9ddf 100755 (executable)
--- 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

diff --git a/samples/qt/Common/src/View.cxx b/samples/qt/Common/src/View.cxx
index 5a3550c898071930ecd8a6fb45bd0e519b5f4251..718bc4486484769ae5235df00863a66509170ad3 100755 (executable)
--- 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);
 

diff --git a/samples/qt/Common/src/View.h b/samples/qt/Common/src/View.h
index 6bd672057fb6130f52957de6c62c60aa0d5b8f12..82744543d8f02a20811702aedc5a131f6cb4e2da 100755 (executable)
--- 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>

diff --git a/samples/qt/FuncDemo/src/FThread.cpp b/samples/qt/FuncDemo/src/FThread.cpp
index 48221dce62c30b9b63ce47359cf0fc58c835e5ea..3a639432dbc713894ffdc0f3424cf12b0a5e1558 100644 (file)
--- 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

diff --git a/samples/qt/FuncDemo/src/FThread.h b/samples/qt/FuncDemo/src/FThread.h
index 30bd2702fa41cf6a836d7a4dfd91803e02ed184c..e7ab7ac0764cae4c425b818fef6f998b7012f5f8 100644 (file)
--- 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>

diff --git a/samples/qt/FuncDemo/src/edge.cpp b/samples/qt/FuncDemo/src/edge.cpp
index e5ad124082dd250a889454e88300969d85611687..983b64a21b74bef504b8dcce4ed1fa1556bacdbd 100644 (file)
--- 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"

diff --git a/samples/qt/FuncDemo/src/edge.h b/samples/qt/FuncDemo/src/edge.h
index acfe2f1484ba54cc231d2300db9bd175f00c73e9..5662ef00ab0169c3e1dea94e9e6bc8babfd84c35 100644 (file)
--- 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;
 

diff --git a/samples/qt/FuncDemo/src/graphwidget.cpp b/samples/qt/FuncDemo/src/graphwidget.cpp
index 7555a2b20257352bb8c82eb10227237618df0e4d..1ee3a6609e1638e25661d8d266fbdee67fb14d85 100644 (file)
--- 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>
 

diff --git a/samples/qt/FuncDemo/src/graphwidget.h b/samples/qt/FuncDemo/src/graphwidget.h
index c1b21d5968ad25eb4321ecfd136a6d69188d1256..d4205e6bc2b96cbaaadbd0278a8730a1de99edcd 100644 (file)
--- 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"
 

diff --git a/samples/qt/FuncDemo/src/main.cpp b/samples/qt/FuncDemo/src/main.cpp
index 4f35cca9eaca4d175467a0b5360552ae6fc49e45..4fad9cf43f5d2011ce274542f5cf25d9042197aa 100644 (file)
--- 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>

diff --git a/samples/qt/FuncDemo/src/mainwindow.cpp b/samples/qt/FuncDemo/src/mainwindow.cpp
index 40c9152d6b84dafb3e92ad3a85e13716984a5e66..0668b353846a82c4921ad6fa312b4f6fb1382d4a 100644 (file)
--- 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

diff --git a/samples/qt/FuncDemo/src/mainwindow.h b/samples/qt/FuncDemo/src/mainwindow.h
index 5455bb9f667594f6b2b12a64c35926b5fe011fac..ca2b7a83d9ddfd142e00b2ecff250cf7efda9618 100644 (file)
--- 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;

diff --git a/samples/qt/FuncDemo/src/node.cpp b/samples/qt/FuncDemo/src/node.cpp
index f72680a9a788f1c5bd6ae2c67d597c2e4fc23258..9271222fbc8419ebc6a2fd9f9b6e6db71c78dcf9 100644 (file)
--- 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"

diff --git a/samples/qt/FuncDemo/src/node.h b/samples/qt/FuncDemo/src/node.h
index 1319e26aa83eb80b986cc956b08992c490432fde..393cc1f09b6c33fd4c289a222cea080594fd6809 100644 (file)
--- 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>
 

diff --git a/samples/qt/IESample/src/Main.cxx b/samples/qt/IESample/src/Main.cxx
index 87b7924d9790f0a94b30e842ecf6371f6451a39e..45561b5502c0667cffe641e0978d859137f56a4c 100755 (executable)
--- 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[] )

diff --git a/samples/qt/Interface/src/Application.cxx b/samples/qt/Interface/src/Application.cxx
index ec3cdca222aa44a4be211383e374100880b4cb6f..c99739cebda2db44885b96aabea827978a1e5a90 100755 (executable)
--- 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()

diff --git a/samples/qt/Interface/src/Translate.cxx b/samples/qt/Interface/src/Translate.cxx
index 1b2bdb440bd1cf1ce1068e0b2ad7b693ad432f71..13eec9b8158192c60a62b074e5d84b4a4b2f5f8e 100755 (executable)
--- 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 );

diff --git a/samples/qt/Interface/src/Translate.h b/samples/qt/Interface/src/Translate.h
index f7a9e19ea03f8bb3c2d1f598ca28615bcb13fd0a..a19d5f9bf211ba5ba110864479379e6f84a74f11 100755 (executable)
--- 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>

diff --git a/samples/qt/Tutorial/src/ApplicationTut.cxx b/samples/qt/Tutorial/src/ApplicationTut.cxx
index 5be0008f5c7fd5422b2b0fcb1ba4021063d54d4d..e2ea797705f1abd1810774a9f28149789718b9d5 100755 (executable)
--- 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( )

diff --git a/samples/qt/Tutorial/src/DocumentTut.cxx b/samples/qt/Tutorial/src/DocumentTut.cxx
index df00e6222b23b03439e06c26fa9f8947c4584eac..8a579a85b0f6975de23c10555f022a534c8f60e7 100755 (executable)
--- 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>

diff --git a/samples/qt/Tutorial/src/Main.cxx b/samples/qt/Tutorial/src/Main.cxx
index 1603de271d31e49071aa91ab3d2de9b23a6272b8..c9a08d8823c8c92784a40be2658c7dbf0e38c619 100755 (executable)
--- 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[] )
 {