From: stv Date: Thu, 31 Aug 2006 05:46:38 +0000 (+0000) Subject: Compilation warnings X-Git-Tag: LAST_STABLE_VERSION_21_09_2006_ON_3_2_0~16 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=ba6ef308ff54503544f7d5cf3c605f2f9f643fde;p=modules%2Fgui.git Compilation warnings --- diff --git a/src/LightApp/LightApp_Dialog.h b/src/LightApp/LightApp_Dialog.h index a862d6388..970e6b860 100644 --- a/src/LightApp/LightApp_Dialog.h +++ b/src/LightApp/LightApp_Dialog.h @@ -35,6 +35,10 @@ class QLabel; class SUIT_ResourceMgr; +#ifdef WIN32 +#pragma warning ( disable:4251 ) +#endif + /*! \class LightApp_Dialog Base class for all LightApp dialogs. @@ -286,4 +290,8 @@ private: QPixmap myPixmap; }; +#ifdef WIN32 +#pragma warning ( default:4251 ) +#endif + #endif diff --git a/src/LightApp/LightApp_Module.h b/src/LightApp/LightApp_Module.h index 79fd77fe9..01035d773 100644 --- a/src/LightApp/LightApp_Module.h +++ b/src/LightApp/LightApp_Module.h @@ -24,8 +24,6 @@ #ifndef LIGHTAPP_MODULE_H #define LIGHTAPP_MODULE_H -#pragma warning( disable : 4251 ) - #include "LightApp.h" #include @@ -48,6 +46,10 @@ class QtxPopupMgr; class QString; class QVariant; +#ifdef WIN32 +#pragma warning ( disable:4251 ) +#endif + /*! \class LightApp_Module Base class for all light modules @@ -142,6 +144,8 @@ protected: int myDisplay, myErase, myDisplayOnly, myEraseAll; }; -#pragma warning( default : 4251 ) +#ifdef WIN32 +#pragma warning ( default:4251 ) +#endif #endif diff --git a/src/Qtx/QtxAction.h b/src/Qtx/QtxAction.h index c7b6b7192..af0473f3f 100755 --- a/src/Qtx/QtxAction.h +++ b/src/Qtx/QtxAction.h @@ -27,6 +27,10 @@ #include #include +#ifdef WIN32 +#pragma warning ( disable:4251 ) +#endif + class QTX_EXPORT QtxAction : public QAction { Q_OBJECT @@ -48,4 +52,8 @@ private: QMap myMenuIds; }; +#ifdef WIN32 +#pragma warning ( default:4251 ) +#endif + #endif diff --git a/src/SUIT/SUIT_Application.h b/src/SUIT/SUIT_Application.h index 72dc89363..05e269137 100755 --- a/src/SUIT/SUIT_Application.h +++ b/src/SUIT/SUIT_Application.h @@ -33,6 +33,11 @@ class SUIT_ResourceMgr; class QString; class QIconSet; class QLabel; + +#ifdef WIN32 +#pragma warning ( disable:4251 ) +#endif + /*! \class QObject * \brief For more information see QT documentation. */ @@ -171,4 +176,8 @@ extern "C" #define APP_CREATE_NAME "createApplication" +#ifdef WIN32 +#pragma warning ( default:4251 ) +#endif + #endif diff --git a/src/SVTK/SALOME_Actor.h b/src/SVTK/SALOME_Actor.h index 03c4ca7a7..a44acc9fd 100644 --- a/src/SVTK/SALOME_Actor.h +++ b/src/SVTK/SALOME_Actor.h @@ -57,6 +57,10 @@ class SVTK_InteractorStyle; extern int SALOME_POINT_SIZE; extern int SALOME_LINE_WIDTH; +#ifdef WIN32 +#pragma warning ( disable:4251 ) +#endif + //! The class is a basic one for all SALOME VTK presentation. /*! It provide highlight and prehighlight capabilites, @@ -227,4 +231,8 @@ class SVTK_EXPORT SALOME_Actor : public VTKViewer_Actor vtkSmartPointer myOutline; }; +#ifdef WIN32 +#pragma warning ( default:4251 ) +#endif + #endif // SALOME_ACTOR_H diff --git a/src/SVTK/SVTK_Actor.h b/src/SVTK/SVTK_Actor.h index bb7542da3..e0a8afc02 100644 --- a/src/SVTK/SVTK_Actor.h +++ b/src/SVTK/SVTK_Actor.h @@ -34,6 +34,10 @@ class vtkUnstructuredGrid; class SALOME_Actor; +#ifdef WIN32 +#pragma warning ( disable:4251 ) +#endif + //! This class used for internal SVTK package purpose (highlight and prehighlight) class SVTK_EXPORT SVTK_Actor : public SVTK_DeviceActor { @@ -82,4 +86,8 @@ public: ~SVTK_Actor(); }; +#ifdef WIN32 +#pragma warning ( default:4251 ) +#endif + #endif diff --git a/src/SVTK/SVTK_CubeAxesActor2D.h b/src/SVTK/SVTK_CubeAxesActor2D.h index b9583c642..445f6d71e 100644 --- a/src/SVTK/SVTK_CubeAxesActor2D.h +++ b/src/SVTK/SVTK_CubeAxesActor2D.h @@ -44,6 +44,10 @@ class VTKViewer_Transform; #include "SVTK.h" #include "VTKViewer.h" +#ifdef WIN32 +#pragma warning ( disable:4251 ) +#endif + #ifndef WNT class VTK_HYBRID_EXPORT SVTK_CubeAxesActor2D : public vtkCubeAxesActor2D #else @@ -106,4 +110,8 @@ private: void operator=(const SVTK_CubeAxesActor2D&); // Not implemented. }; +#ifdef WIN32 +#pragma warning ( default:4251 ) +#endif + #endif diff --git a/src/SVTK/SVTK_DeviceActor.h b/src/SVTK/SVTK_DeviceActor.h index c68829de9..e537a46e1 100644 --- a/src/SVTK/SVTK_DeviceActor.h +++ b/src/SVTK/SVTK_DeviceActor.h @@ -59,6 +59,9 @@ namespace SVTK } } +#ifdef WIN32 +#pragma warning ( disable:4251 ) +#endif class SVTK_EXPORT SVTK_DeviceActor: public vtkLODActor { @@ -208,5 +211,8 @@ class SVTK_EXPORT SVTK_DeviceActor: public vtkLODActor }; +#ifdef WIN32 +#pragma warning ( default:4251 ) +#endif #endif //SVTK_DEVICE_ACTOR_H diff --git a/src/SVTK/SVTK_GenericRenderWindowInteractor.h b/src/SVTK/SVTK_GenericRenderWindowInteractor.h index b47705d50..ff5b6cb71 100644 --- a/src/SVTK/SVTK_GenericRenderWindowInteractor.h +++ b/src/SVTK/SVTK_GenericRenderWindowInteractor.h @@ -41,6 +41,9 @@ class QWidget; class SVTK_Selector; class SVTK_Renderer; +#ifdef WIN32 +#pragma warning ( disable:4251 ) +#endif /*! \class QVTK_GenericRenderWindowInteractor @@ -123,4 +126,8 @@ class SVTK_EXPORT SVTK_GenericRenderWindowInteractor: public QVTK_GenericRenderW QWidget* myRenderWidget; //!< Keeps a pointer to QWidget, where vtkRenderWindow maps to. }; +#ifdef WIN32 +#pragma warning ( default:4251 ) +#endif + #endif diff --git a/src/SVTK/SVTK_InteractorStyle.h b/src/SVTK/SVTK_InteractorStyle.h index 93a1b2b6e..90057f5a8 100644 --- a/src/SVTK/SVTK_InteractorStyle.h +++ b/src/SVTK/SVTK_InteractorStyle.h @@ -44,6 +44,11 @@ #include #include + +#ifdef WIN32 +#pragma warning ( disable:4251 ) +#endif + // //! Control the value of increment in SALOME way. /*! @@ -322,4 +327,8 @@ class SVTK_EXPORT SVTK_InteractorStyle: public vtkInteractorStyle vtkSmartPointer myPicker; }; +#ifdef WIN32 +#pragma warning ( default:4251 ) +#endif + #endif diff --git a/src/SVTK/SVTK_RectPicker.h b/src/SVTK/SVTK_RectPicker.h index d70ed0a1a..3a6576edb 100644 --- a/src/SVTK/SVTK_RectPicker.h +++ b/src/SVTK/SVTK_RectPicker.h @@ -38,6 +38,10 @@ class vtkRenderer; +#ifdef WIN32 +#pragma warning ( disable:4251 ) +#endif + /*! \class vtkAbstractPropPicker * \brief For more information see VTK documentation */ @@ -117,6 +121,10 @@ class SVTK_EXPORT SVTK_RectPicker : public vtkAbstractPropPicker vtkRenderer*); }; +#ifdef WIN32 +#pragma warning ( default:4251 ) +#endif + #endif diff --git a/src/SVTK/SVTK_RenderWindowInteractor.h b/src/SVTK/SVTK_RenderWindowInteractor.h index ce1f76a88..dd6a52502 100644 --- a/src/SVTK/SVTK_RenderWindowInteractor.h +++ b/src/SVTK/SVTK_RenderWindowInteractor.h @@ -52,6 +52,10 @@ class vtkObject; class SVTK_Selector; class SVTK_Renderer; +#ifdef WIN32 +#pragma warning ( disable:4251 ) +#endif + /*! \class QVTK_RenderWindowInteractor Implements Qt based vtkRenderWindowInteractor. @@ -253,5 +257,8 @@ class SVTK_EXPORT SVTK_RenderWindowInteractor: public QVTK_RenderWindowInteracto TInteractorStyles myInteractorStyles; }; +#ifdef WIN32 +#pragma warning ( default:4251 ) +#endif #endif diff --git a/src/SVTK/SVTK_Renderer.h b/src/SVTK/SVTK_Renderer.h index c9908539d..7ba43d1d6 100644 --- a/src/SVTK/SVTK_Renderer.h +++ b/src/SVTK/SVTK_Renderer.h @@ -52,6 +52,9 @@ class SVTK_CubeAxesActor2D; class VTKViewer_Actor; class SVTK_Selector; +#ifdef WIN32 +#pragma warning ( disable:4251 ) +#endif /*! \class SVTK_Renderer @@ -248,4 +251,8 @@ class SVTK_EXPORT SVTK_Renderer : public vtkObject vtkFloatingPointType myBndBox[6]; }; +#ifdef WIN32 +#pragma warning ( default:4251 ) +#endif + #endif diff --git a/src/VTKViewer/VTKViewer_Actor.h b/src/VTKViewer/VTKViewer_Actor.h index a0d9c4ba0..28d5af787 100755 --- a/src/VTKViewer/VTKViewer_Actor.h +++ b/src/VTKViewer/VTKViewer_Actor.h @@ -52,6 +52,10 @@ class VTKViewer_PassThroughFilter; extern int VTKViewer_POINT_SIZE; extern int VTKViewer_LINE_WIDTH; +#ifdef WIN32 +#pragma warning ( disable:4251 ) +#endif + /*! \class vtkLODActor * \brief For more information see VTK documentation */ @@ -330,4 +334,8 @@ class VTKVIEWER_EXPORT VTKViewer_Actor : public vtkLODActor bool myIsHighlighted; }; +#ifdef WIN32 +#pragma warning ( default:4251 ) +#endif + #endif // VTKVIEVER_ACTOR_H diff --git a/src/VTKViewer/VTKViewer_AppendFilter.h b/src/VTKViewer/VTKViewer_AppendFilter.h index c9a756381..f7b1a171d 100644 --- a/src/VTKViewer/VTKViewer_AppendFilter.h +++ b/src/VTKViewer/VTKViewer_AppendFilter.h @@ -29,6 +29,10 @@ class vtkPoints; +#ifdef WIN32 +#pragma warning ( disable:4251 ) +#endif + /*! \brief This class used same as vtkAppendFilter. See documentation on VTK for more information. */ class VTKVIEWER_EXPORT VTKViewer_AppendFilter : public vtkAppendFilter @@ -101,4 +105,8 @@ protected: vtkSmartPointer myPoints; }; +#ifdef WIN32 +#pragma warning ( default:4251 ) +#endif + #endif diff --git a/src/VTKViewer/VTKViewer_CellRectPicker.h b/src/VTKViewer/VTKViewer_CellRectPicker.h index f50636ab2..fde6f4dd2 100755 --- a/src/VTKViewer/VTKViewer_CellRectPicker.h +++ b/src/VTKViewer/VTKViewer_CellRectPicker.h @@ -46,6 +46,11 @@ typedef std::map VTKViewer_ActorDataMap; class vtkCell; class vtkGenericCell; class vtkQuad; + +#ifdef WIN32 +#pragma warning ( disable:4251 ) +#endif + /*!Rectangular cell picker class.*/ class VTK_EXPORT VTKViewer_CellRectPicker : public VTKViewer_RectPicker { @@ -93,6 +98,10 @@ private: vtkQuad* Quad2; }; +#ifdef WIN32 +#pragma warning ( default:4251 ) +#endif + #endif diff --git a/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.h b/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.h index f5251a2b2..7a3783a01 100755 --- a/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.h +++ b/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.h @@ -26,6 +26,11 @@ #include #include #include + +#ifdef WIN32 +#pragma warning ( disable:4251 ) +#endif + /*! \class vtkUnstructuredGridToUnstructuredGridFilter * \brief For more information see VTK documentation */ @@ -119,4 +124,8 @@ private: void operator=(const VTKViewer_ExtractUnstructuredGrid&); }; +#ifdef WIN32 +#pragma warning ( default:4251 ) +#endif + #endif diff --git a/src/VTKViewer/VTKViewer_GeometryFilter.cxx b/src/VTKViewer/VTKViewer_GeometryFilter.cxx index a95e47dec..36c1641b4 100755 --- a/src/VTKViewer/VTKViewer_GeometryFilter.cxx +++ b/src/VTKViewer/VTKViewer_GeometryFilter.cxx @@ -814,8 +814,10 @@ VTKViewer_GeometryFilter } -vtkIdType VTKViewer_GeometryFilter::GetElemObjId(int theVtkID){ - if(myVTK2ObjIds.empty() || theVtkID > myVTK2ObjIds.size()) return -1; +vtkIdType VTKViewer_GeometryFilter::GetElemObjId( int theVtkID ) +{ + if( myVTK2ObjIds.empty() || theVtkID > (int)myVTK2ObjIds.size() ) + return -1; #if defined __GNUC_2__ return myVTK2ObjIds[theVtkID]; #else diff --git a/src/VTKViewer/VTKViewer_GeometryFilter.h b/src/VTKViewer/VTKViewer_GeometryFilter.h index a74b70733..9c7425aa3 100755 --- a/src/VTKViewer/VTKViewer_GeometryFilter.h +++ b/src/VTKViewer/VTKViewer_GeometryFilter.h @@ -24,6 +24,11 @@ #include #include + +#ifdef WIN32 +#pragma warning ( disable:4251 ) +#endif + /*! \brief This class used same as vtkGeometryFilter. See documentation on VTK for more information. */ class VTKVIEWER_EXPORT VTKViewer_GeometryFilter : public vtkGeometryFilter @@ -106,4 +111,8 @@ private: int myIsWireframeMode; }; +#ifdef WIN32 +#pragma warning ( default:4251 ) +#endif + #endif diff --git a/src/VTKViewer/VTKViewer_InteractorStyle.h b/src/VTKViewer/VTKViewer_InteractorStyle.h index d9eb4833f..b867f64b3 100644 --- a/src/VTKViewer/VTKViewer_InteractorStyle.h +++ b/src/VTKViewer/VTKViewer_InteractorStyle.h @@ -56,6 +56,10 @@ class VTKViewer_RenderWindowInteractor; #define VTK_INTERACTOR_STYLE_CAMERA_SELECT 6 #define VTK_INTERACTOR_STYLE_CAMERA_GLOBAL_PAN 7 +#ifdef WIN32 +#pragma warning ( disable:4251 ) +#endif + /*! Description:\n * This class must be supplied with a vtkRenderWindowInteractor wrapper or\n * parent. This class should not normally be instantiated by application\n @@ -185,4 +189,8 @@ class VTKVIEWER_EXPORT VTKViewer_InteractorStyle : public QObject, public vtkInt //@} }; +#ifdef WIN32 +#pragma warning ( default:4251 ) +#endif + #endif diff --git a/src/VTKViewer/VTKViewer_ShrinkFilter.h b/src/VTKViewer/VTKViewer_ShrinkFilter.h index 4d2a416bb..336d30636 100755 --- a/src/VTKViewer/VTKViewer_ShrinkFilter.h +++ b/src/VTKViewer/VTKViewer_ShrinkFilter.h @@ -25,6 +25,10 @@ #include +#ifdef WIN32 +#pragma warning ( disable:4251 ) +#endif + /*!Shrink cells composing an arbitrary data set. *\warning It is possible to turn cells inside out or cause self intersection in special cases. */ @@ -57,4 +61,8 @@ private: TVectorId myVTK2ObjIds; }; +#ifdef WIN32 +#pragma warning ( default:4251 ) +#endif + #endif