From 559ee47d3639101d3e582424257bdde1d9c417ce Mon Sep 17 00:00:00 2001 From: sln Date: Mon, 19 Jul 2010 14:04:09 +0000 Subject: [PATCH] #pragma warning ( default: 4251 ) strings are removed because they are activated warning even it is disabled by default --- src/CAF/CAF_Application.h | 2 +- src/CAF/CAF_Study.h | 2 +- src/CAM/CAM_Application.h | 2 +- src/CAM/CAM_Module.h | 2 +- src/CAM/CAM_Study.h | 2 +- src/GLViewer/GLViewer_AspectLine.h | 2 +- src/GLViewer/GLViewer_BaseDrawers.h | 2 +- src/GLViewer/GLViewer_BaseObjects.h | 2 +- src/GLViewer/GLViewer_Compass.h | 2 +- src/GLViewer/GLViewer_Context.h | 2 +- src/GLViewer/GLViewer_CoordSystem.h | 2 +- src/GLViewer/GLViewer_Drawer.h | 2 +- src/GLViewer/GLViewer_Geom.h | 2 +- src/GLViewer/GLViewer_Grid.h | 2 +- src/GLViewer/GLViewer_MimeData.h | 2 +- src/GLViewer/GLViewer_Object.h | 2 +- src/GLViewer/GLViewer_Text.h | 2 +- src/GLViewer/GLViewer_ViewFrame.h | 2 +- src/GLViewer/GLViewer_ViewPort.h | 2 +- src/GLViewer/GLViewer_ViewPort2d.h | 2 +- src/GLViewer/GLViewer_Viewer.h | 2 +- src/GLViewer/GLViewer_Viewer2d.h | 2 +- src/LightApp/LightApp_Application.h | 2 +- src/LightApp/LightApp_Dialog.h | 2 +- src/LightApp/LightApp_EventFilter.h | 2 +- src/LightApp/LightApp_Module.h | 2 +- src/LogWindow/LogWindow.h | 2 +- src/Plot2d/Plot2d_ViewWindow.h | 2 +- src/QDS/QDS_ComboBox.h | 2 +- src/QDS/QDS_RadioBox.h | 2 +- src/Qtx/QtxAction.h | 10 +++++----- src/Qtx/QtxActionGroup.h | 2 +- src/Qtx/QtxActionSet.h | 2 +- src/Qtx/QtxColorButton.h | 4 ++++ src/Qtx/QtxColorScale.h | 2 +- src/Qtx/QtxComboBox.h | 2 +- src/Qtx/QtxDialog.h | 2 +- src/Qtx/QtxDockAction.h | 2 +- src/Qtx/QtxListAction.h | 10 ++++++++-- src/Qtx/QtxListBox.h | 2 +- src/Qtx/QtxLogoMgr.h | 6 +----- src/Qtx/QtxMultiAction.h | 4 ++++ src/Qtx/QtxPagePrefMgr.cxx | 8 ++++---- src/Qtx/QtxPagePrefMgr.h | 1 - src/Qtx/QtxPathDialog.h | 2 +- src/Qtx/QtxPathEdit.h | 4 ++++ src/Qtx/QtxPreferenceMgr.h | 2 +- src/Qtx/QtxTreeView.h | 2 +- src/Qtx/QtxWorkspace.h | 2 +- src/Qtx/QtxWorkspaceAction.h | 2 +- src/Qtx/QtxWorkstack.h | 10 +++++----- src/Qtx/QtxWorkstackAction.h | 2 +- src/SPlot2d/SPlot2d_ViewWindow.h | 2 +- src/STD/STD_Application.h | 2 +- src/STD/STD_MDIDesktop.h | 2 +- src/STD/STD_TabDesktop.h | 2 +- src/SUIT/SUIT_Application.h | 2 +- src/SUIT/SUIT_DataObject.h | 2 +- src/SUIT/SUIT_DataOwner.h | 4 ++-- src/SUIT/SUIT_LicenseDlg.h | 2 +- src/SUIT/SUIT_Operation.h | 2 +- src/SUIT/SUIT_SelectionMgr.h | 2 +- src/SUIT/SUIT_Study.h | 2 +- src/SUIT/SUIT_TreeModel.h | 2 +- src/SUIT/SUIT_ViewManager.h | 2 +- src/SUIT/SUIT_ViewModel.h | 2 +- src/SVTK/SALOME_Actor.h | 2 +- src/SVTK/SVTK_Actor.h | 2 +- src/SVTK/SVTK_CubeAxesActor2D.h | 2 +- src/SVTK/SVTK_DeviceActor.h | 2 +- src/SVTK/SVTK_GenericRenderWindowInteractor.h | 2 +- src/SVTK/SVTK_InteractorStyle.h | 2 +- src/SVTK/SVTK_RectPicker.h | 2 +- src/SVTK/SVTK_RenderWindowInteractor.h | 2 +- src/SVTK/SVTK_Renderer.h | 2 +- src/SVTK/SVTK_View.h | 2 +- src/SVTK/SVTK_ViewWindow.h | 2 +- src/VTKViewer/VTKViewer_Actor.h | 2 +- src/VTKViewer/VTKViewer_AppendFilter.h | 2 +- src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.h | 2 +- src/VTKViewer/VTKViewer_GeometryFilter.h | 2 +- src/VTKViewer/VTKViewer_InteractorStyle.h | 2 +- src/VTKViewer/VTKViewer_ShrinkFilter.h | 2 +- src/VTKViewer/VTKViewer_ViewWindow.h | 2 +- 84 files changed, 111 insertions(+), 98 deletions(-) diff --git a/src/CAF/CAF_Application.h b/src/CAF/CAF_Application.h index 176293995..16470aa86 100755 --- a/src/CAF/CAF_Application.h +++ b/src/CAF/CAF_Application.h @@ -72,7 +72,7 @@ private: }; #if defined WIN32 -#pragma warning ( default: 4251 ) +//#pragma warning ( default: 4251 ) #endif #endif diff --git a/src/CAF/CAF_Study.h b/src/CAF/CAF_Study.h index f56d7bd49..fb9f10ba1 100755 --- a/src/CAF/CAF_Study.h +++ b/src/CAF/CAF_Study.h @@ -81,7 +81,7 @@ private: }; #if defined WIN32 -#pragma warning ( default: 4251 ) +//#pragma warning ( default: 4251 ) #endif #endif diff --git a/src/CAM/CAM_Application.h b/src/CAM/CAM_Application.h index 53aa04ccc..4415e787f 100755 --- a/src/CAM/CAM_Application.h +++ b/src/CAM/CAM_Application.h @@ -95,7 +95,7 @@ private: }; #ifdef WIN32 -#pragma warning( default:4251 ) +//#pragma warning( default:4251 ) #endif #endif diff --git a/src/CAM/CAM_Module.h b/src/CAM/CAM_Module.h index 38f00862d..27239c2ae 100755 --- a/src/CAM/CAM_Module.h +++ b/src/CAM/CAM_Module.h @@ -138,7 +138,7 @@ private: }; #ifdef WIN32 -#pragma warning( default: 4251 ) +//#pragma warning( default: 4251 ) #endif extern "C" diff --git a/src/CAM/CAM_Study.h b/src/CAM/CAM_Study.h index 5d520d39a..ba2256c13 100755 --- a/src/CAM/CAM_Study.h +++ b/src/CAM/CAM_Study.h @@ -66,7 +66,7 @@ private: }; #ifdef WIN32 -#pragma warning( default:4251 ) +//#pragma warning( default:4251 ) #endif #endif diff --git a/src/GLViewer/GLViewer_AspectLine.h b/src/GLViewer/GLViewer_AspectLine.h index 69b8d987b..b2380f716 100644 --- a/src/GLViewer/GLViewer_AspectLine.h +++ b/src/GLViewer/GLViewer_AspectLine.h @@ -114,7 +114,7 @@ protected: }; #ifdef WIN32 -#pragma warning ( default:4251 ) +//#pragma warning ( default:4251 ) #endif #endif diff --git a/src/GLViewer/GLViewer_BaseDrawers.h b/src/GLViewer/GLViewer_BaseDrawers.h index c0e1abedf..b35fc6a26 100644 --- a/src/GLViewer/GLViewer_BaseDrawers.h +++ b/src/GLViewer/GLViewer_BaseDrawers.h @@ -88,7 +88,7 @@ public: }; #ifdef WIN32 -#pragma warning ( default:4251 ) +//#pragma warning ( default:4251 ) #endif #endif diff --git a/src/GLViewer/GLViewer_BaseObjects.h b/src/GLViewer/GLViewer_BaseObjects.h index 051e13f9f..b1346e8c5 100644 --- a/src/GLViewer/GLViewer_BaseObjects.h +++ b/src/GLViewer/GLViewer_BaseObjects.h @@ -248,7 +248,7 @@ protected: }; #ifdef WIN32 -#pragma warning ( default:4251 ) +//#pragma warning ( default:4251 ) #endif #endif diff --git a/src/GLViewer/GLViewer_Compass.h b/src/GLViewer/GLViewer_Compass.h index ee52be281..35ec2b2c2 100644 --- a/src/GLViewer/GLViewer_Compass.h +++ b/src/GLViewer/GLViewer_Compass.h @@ -145,7 +145,7 @@ protected: }; #ifdef WIN32 -#pragma warning ( default:4251 ) +//#pragma warning ( default:4251 ) #endif #endif diff --git a/src/GLViewer/GLViewer_Context.h b/src/GLViewer/GLViewer_Context.h index aa367366c..0e583c1fb 100644 --- a/src/GLViewer/GLViewer_Context.h +++ b/src/GLViewer/GLViewer_Context.h @@ -200,7 +200,7 @@ protected: }; #ifdef WIN32 -#pragma warning ( default:4251 ) +//#pragma warning ( default:4251 ) #endif #endif diff --git a/src/GLViewer/GLViewer_CoordSystem.h b/src/GLViewer/GLViewer_CoordSystem.h index 83d7b55e1..dc69854ea 100644 --- a/src/GLViewer/GLViewer_CoordSystem.h +++ b/src/GLViewer/GLViewer_CoordSystem.h @@ -101,7 +101,7 @@ protected: }; #ifdef WIN32 -#pragma warning ( default:4251 ) +//#pragma warning ( default:4251 ) #endif #endif diff --git a/src/GLViewer/GLViewer_Drawer.h b/src/GLViewer/GLViewer_Drawer.h index 220e62ac3..56f3d21f4 100644 --- a/src/GLViewer/GLViewer_Drawer.h +++ b/src/GLViewer/GLViewer_Drawer.h @@ -442,7 +442,7 @@ protected: }; #ifdef WIN32 -#pragma warning ( default:4251 ) +//#pragma warning ( default:4251 ) #endif #endif // GLVIEWER_DRAWER_H diff --git a/src/GLViewer/GLViewer_Geom.h b/src/GLViewer/GLViewer_Geom.h index 6b9f4612d..39b67c006 100644 --- a/src/GLViewer/GLViewer_Geom.h +++ b/src/GLViewer/GLViewer_Geom.h @@ -202,7 +202,7 @@ private: }; #ifdef WIN32 -#pragma warning ( default:4251 ) +//#pragma warning ( default:4251 ) #endif #endif diff --git a/src/GLViewer/GLViewer_Grid.h b/src/GLViewer/GLViewer_Grid.h index d4ff7b6a4..80f5b33bb 100644 --- a/src/GLViewer/GLViewer_Grid.h +++ b/src/GLViewer/GLViewer_Grid.h @@ -116,7 +116,7 @@ protected: }; #ifdef WIN32 -#pragma warning ( default:4251 ) +//#pragma warning ( default:4251 ) #endif #endif diff --git a/src/GLViewer/GLViewer_MimeData.h b/src/GLViewer/GLViewer_MimeData.h index 1a5f816fb..5338f1311 100644 --- a/src/GLViewer/GLViewer_MimeData.h +++ b/src/GLViewer/GLViewer_MimeData.h @@ -66,7 +66,7 @@ private: }; #ifdef WIN32 -#pragma warning ( default:4251 ) +//#pragma warning ( default:4251 ) #endif #endif diff --git a/src/GLViewer/GLViewer_Object.h b/src/GLViewer/GLViewer_Object.h index 8175d0040..d2bc9845c 100644 --- a/src/GLViewer/GLViewer_Object.h +++ b/src/GLViewer/GLViewer_Object.h @@ -312,7 +312,7 @@ protected: }; #ifdef WIN32 -#pragma warning ( default:4251 ) +//#pragma warning ( default:4251 ) #endif #endif diff --git a/src/GLViewer/GLViewer_Text.h b/src/GLViewer/GLViewer_Text.h index fefe786b5..d6c037fe8 100644 --- a/src/GLViewer/GLViewer_Text.h +++ b/src/GLViewer/GLViewer_Text.h @@ -107,7 +107,7 @@ protected: }; #ifdef WIN32 -#pragma warning ( default:4251 ) +//#pragma warning ( default:4251 ) #endif #endif diff --git a/src/GLViewer/GLViewer_ViewFrame.h b/src/GLViewer/GLViewer_ViewFrame.h index ddc7eb537..f9953bd1b 100644 --- a/src/GLViewer/GLViewer_ViewFrame.h +++ b/src/GLViewer/GLViewer_ViewFrame.h @@ -122,7 +122,7 @@ private: #ifdef WIN32 -#pragma warning ( default:4251 ) +//#pragma warning ( default:4251 ) #endif #endif diff --git a/src/GLViewer/GLViewer_ViewPort.h b/src/GLViewer/GLViewer_ViewPort.h index 524f8d3d0..b5d45b03e 100644 --- a/src/GLViewer/GLViewer_ViewPort.h +++ b/src/GLViewer/GLViewer_ViewPort.h @@ -171,7 +171,7 @@ private: }; #ifdef WIN32 -#pragma warning ( default:4251 ) +//#pragma warning ( default:4251 ) #endif #endif diff --git a/src/GLViewer/GLViewer_ViewPort2d.h b/src/GLViewer/GLViewer_ViewPort2d.h index 6aee4ddda..51a6c937d 100644 --- a/src/GLViewer/GLViewer_ViewPort2d.h +++ b/src/GLViewer/GLViewer_ViewPort2d.h @@ -251,7 +251,7 @@ protected: }; #ifdef WIN32 -#pragma warning ( default:4251 ) +//#pragma warning ( default:4251 ) #endif #endif diff --git a/src/GLViewer/GLViewer_Viewer.h b/src/GLViewer/GLViewer_Viewer.h index c03557351..f1d333415 100644 --- a/src/GLViewer/GLViewer_Viewer.h +++ b/src/GLViewer/GLViewer_Viewer.h @@ -235,7 +235,7 @@ protected: }; #ifdef WIN32 -#pragma warning ( default:4251 ) +//#pragma warning ( default:4251 ) #endif #endif diff --git a/src/GLViewer/GLViewer_Viewer2d.h b/src/GLViewer/GLViewer_Viewer2d.h index 5f7148b5c..7b7956fe7 100644 --- a/src/GLViewer/GLViewer_Viewer2d.h +++ b/src/GLViewer/GLViewer_Viewer2d.h @@ -247,7 +247,7 @@ protected: }; #ifdef WIN32 -#pragma warning ( default:4251 ) +//#pragma warning ( default:4251 ) #endif #endif diff --git a/src/LightApp/LightApp_Application.h b/src/LightApp/LightApp_Application.h index 305246b40..e13cfadbd 100644 --- a/src/LightApp/LightApp_Application.h +++ b/src/LightApp/LightApp_Application.h @@ -266,7 +266,7 @@ protected: }; #ifdef WIN32 -#pragma warning( default:4251 ) +//#pragma warning( default:4251 ) #endif #endif diff --git a/src/LightApp/LightApp_Dialog.h b/src/LightApp/LightApp_Dialog.h index 2a0eb5fc9..60cc1ec34 100644 --- a/src/LightApp/LightApp_Dialog.h +++ b/src/LightApp/LightApp_Dialog.h @@ -292,7 +292,7 @@ private: }; #ifdef WIN32 -#pragma warning ( default:4251 ) +//#pragma warning ( default:4251 ) #endif #endif diff --git a/src/LightApp/LightApp_EventFilter.h b/src/LightApp/LightApp_EventFilter.h index 32c30fa19..e35c61554 100644 --- a/src/LightApp/LightApp_EventFilter.h +++ b/src/LightApp/LightApp_EventFilter.h @@ -50,7 +50,7 @@ private: }; #if defined WIN32 -#pragma warning( default: 4251 ) +//#pragma warning( default: 4251 ) #endif #endif diff --git a/src/LightApp/LightApp_Module.h b/src/LightApp/LightApp_Module.h index 0bb886f6a..e7891b8d2 100644 --- a/src/LightApp/LightApp_Module.h +++ b/src/LightApp/LightApp_Module.h @@ -152,7 +152,7 @@ protected: }; #ifdef WIN32 -#pragma warning ( default:4251 ) +//#pragma warning ( default:4251 ) #endif #endif diff --git a/src/LogWindow/LogWindow.h b/src/LogWindow/LogWindow.h index 3461d0a68..f9ad49cad 100755 --- a/src/LogWindow/LogWindow.h +++ b/src/LogWindow/LogWindow.h @@ -119,7 +119,7 @@ private: }; #ifdef WIN32 -#pragma warning( default:4251 ) +//#pragma warning( default:4251 ) #endif #endif // LOGWINDOW_H diff --git a/src/Plot2d/Plot2d_ViewWindow.h b/src/Plot2d/Plot2d_ViewWindow.h index 4cdb7c429..3de5066f9 100755 --- a/src/Plot2d/Plot2d_ViewWindow.h +++ b/src/Plot2d/Plot2d_ViewWindow.h @@ -110,7 +110,7 @@ private: }; #ifdef WIN32 -#pragma warning( default:4251 ) +//#pragma warning( default:4251 ) #endif #endif // PLOT2D_VIEWWINDOW_H diff --git a/src/QDS/QDS_ComboBox.h b/src/QDS/QDS_ComboBox.h index f08910ce7..b3b882b40 100644 --- a/src/QDS/QDS_ComboBox.h +++ b/src/QDS/QDS_ComboBox.h @@ -106,7 +106,7 @@ private: }; #ifdef WIN32 -#pragma warning( default:4251 ) +//#pragma warning( default:4251 ) #endif #endif diff --git a/src/QDS/QDS_RadioBox.h b/src/QDS/QDS_RadioBox.h index 3863e905e..45f57dd2b 100644 --- a/src/QDS/QDS_RadioBox.h +++ b/src/QDS/QDS_RadioBox.h @@ -90,7 +90,7 @@ private: }; #ifdef WIN32 -#pragma warning( default:4251 ) +//#pragma warning( default:4251 ) #endif #endif diff --git a/src/Qtx/QtxAction.h b/src/Qtx/QtxAction.h index c1a206110..567a3bc6a 100755 --- a/src/Qtx/QtxAction.h +++ b/src/Qtx/QtxAction.h @@ -24,14 +24,14 @@ #include "Qtx.h" -#include - -class QIcon; - #ifdef WIN32 #pragma warning ( disable:4251 ) #endif +#include + +class QIcon; + class QTX_EXPORT QtxAction : public QWidgetAction { Q_OBJECT @@ -54,7 +54,7 @@ protected: }; #ifdef WIN32 -#pragma warning ( default:4251 ) +//#pragma warning ( default:4251 ) #endif #endif diff --git a/src/Qtx/QtxActionGroup.h b/src/Qtx/QtxActionGroup.h index 108d40a53..d70905123 100644 --- a/src/Qtx/QtxActionGroup.h +++ b/src/Qtx/QtxActionGroup.h @@ -76,7 +76,7 @@ private: }; #ifdef WIN32 -#pragma warning( default:4251 ) +//#pragma warning( default:4251 ) #endif #endif diff --git a/src/Qtx/QtxActionSet.h b/src/Qtx/QtxActionSet.h index 652ae6c15..acd2effb6 100644 --- a/src/Qtx/QtxActionSet.h +++ b/src/Qtx/QtxActionSet.h @@ -87,7 +87,7 @@ private: }; #ifdef WIN32 -#pragma warning( default:4251 ) +//#pragma warning( default:4251 ) #endif #endif diff --git a/src/Qtx/QtxColorButton.h b/src/Qtx/QtxColorButton.h index c34529807..0c47f084b 100644 --- a/src/Qtx/QtxColorButton.h +++ b/src/Qtx/QtxColorButton.h @@ -29,6 +29,10 @@ #include #include +#if defined WIN32 +#pragma warning ( disable: 4251 ) +#endif + class QPaintDevice; class QTX_EXPORT QtxColorButton : public QToolButton diff --git a/src/Qtx/QtxColorScale.h b/src/Qtx/QtxColorScale.h index d5b74c685..701ea552b 100755 --- a/src/Qtx/QtxColorScale.h +++ b/src/Qtx/QtxColorScale.h @@ -169,7 +169,7 @@ private: }; #ifdef WIN32 -#pragma warning( default:4251 ) +//#pragma warning( default:4251 ) #endif #endif // QTXCOLORSCALE_H diff --git a/src/Qtx/QtxComboBox.h b/src/Qtx/QtxComboBox.h index f1b4f91ec..e5a142915 100755 --- a/src/Qtx/QtxComboBox.h +++ b/src/Qtx/QtxComboBox.h @@ -77,7 +77,7 @@ private: }; #ifdef WIN32 -#pragma warning( default:4251 ) +//#pragma warning( default:4251 ) #endif #endif diff --git a/src/Qtx/QtxDialog.h b/src/Qtx/QtxDialog.h index 86006f547..db5f34941 100755 --- a/src/Qtx/QtxDialog.h +++ b/src/Qtx/QtxDialog.h @@ -197,7 +197,7 @@ private: }; #ifdef WIN32 -#pragma warning( default:4251 ) +//#pragma warning( default:4251 ) #endif #endif diff --git a/src/Qtx/QtxDockAction.h b/src/Qtx/QtxDockAction.h index 293e3351d..fa62b17f4 100755 --- a/src/Qtx/QtxDockAction.h +++ b/src/Qtx/QtxDockAction.h @@ -78,7 +78,7 @@ private: }; #ifdef WIN32 -#pragma warning( default:4251 ) +//#pragma warning( default:4251 ) #endif #endif // QTXDOCKACTION_H diff --git a/src/Qtx/QtxListAction.h b/src/Qtx/QtxListAction.h index d4553a0fc..af08c35c0 100755 --- a/src/Qtx/QtxListAction.h +++ b/src/Qtx/QtxListAction.h @@ -23,13 +23,19 @@ #define QTXLISTACTION_H #include "Qtx.h" + +#ifdef WIN32 +#pragma warning( disable:4251 ) +#endif + #include "QtxAction.h" -#include #ifdef WIN32 #pragma warning( disable:4251 ) #endif +#include + class QTX_EXPORT QtxListAction : public QtxAction { Q_OBJECT @@ -89,7 +95,7 @@ private: }; #ifdef WIN32 -#pragma warning( default:4251 ) +//#pragma warning( default:4251 ) #endif #endif diff --git a/src/Qtx/QtxListBox.h b/src/Qtx/QtxListBox.h index 8cb06c064..a5a30ac33 100755 --- a/src/Qtx/QtxListBox.h +++ b/src/Qtx/QtxListBox.h @@ -106,7 +106,7 @@ private: }; #ifdef WIN32 -#pragma warning( default:4251 ) +//#pragma warning( default:4251 ) #endif #endif diff --git a/src/Qtx/QtxLogoMgr.h b/src/Qtx/QtxLogoMgr.h index 73b49ee5a..f7e090f07 100644 --- a/src/Qtx/QtxLogoMgr.h +++ b/src/Qtx/QtxLogoMgr.h @@ -31,10 +31,6 @@ class QMenuBar; class QMovie; -#ifdef WIN32 -#pragma warning( disable : 4251 ) -#endif - class QTX_EXPORT QtxLogoMgr : public QObject { Q_OBJECT @@ -74,7 +70,7 @@ private: }; #ifdef WIN32 -#pragma warning( default : 4251 ) +//#pragma warning( default : 4251 ) #endif #endif // QTXLOGOMGR_H diff --git a/src/Qtx/QtxMultiAction.h b/src/Qtx/QtxMultiAction.h index a4d9683bd..4ab9d7c35 100644 --- a/src/Qtx/QtxMultiAction.h +++ b/src/Qtx/QtxMultiAction.h @@ -27,6 +27,10 @@ class QToolButton; +#ifdef WIN32 +#pragma warning ( disable:4251 ) +#endif + class QTX_EXPORT QtxMultiAction : public QtxActionSet { Q_OBJECT diff --git a/src/Qtx/QtxPagePrefMgr.cxx b/src/Qtx/QtxPagePrefMgr.cxx index 30a08cea6..315920253 100644 --- a/src/Qtx/QtxPagePrefMgr.cxx +++ b/src/Qtx/QtxPagePrefMgr.cxx @@ -2233,7 +2233,7 @@ void QtxPagePrefSelectItem::setInputType( const int type ) QStringList QtxPagePrefSelectItem::strings() const { QStringList res; - for ( uint i = 0; i < mySelector->count(); i++ ) + for ( uint i = 0; i < (uint)mySelector->count(); i++ ) res.append( mySelector->itemText( i ) ); return res; } @@ -2246,7 +2246,7 @@ QStringList QtxPagePrefSelectItem::strings() const QList QtxPagePrefSelectItem::numbers() const { QList res; - for ( uint i = 0; i < mySelector->count(); i++ ) + for ( uint i = 0; i < (uint)mySelector->count(); i++ ) { if ( mySelector->hasId( i ) ) res.append( mySelector->id( i ) ); @@ -2273,7 +2273,7 @@ void QtxPagePrefSelectItem::setStrings( const QStringList& lst ) void QtxPagePrefSelectItem::setNumbers( const QList& ids ) { uint i = 0; - for ( QList::const_iterator it = ids.begin(); it != ids.end() && i < mySelector->count(); ++it, i++ ) + for ( QList::const_iterator it = ids.begin(); it != ids.end() && i < (uint)mySelector->count(); ++it, i++ ) mySelector->setId( i, *it ); } @@ -2310,7 +2310,7 @@ void QtxPagePrefSelectItem::retrieve() idx = mySelector->index( num ); else { - for ( uint i = 0; i < mySelector->count() && idx == -1; i++ ) + for ( uint i = 0; i < (uint)mySelector->count() && idx == -1; i++ ) { if ( mySelector->itemText( i ) == txt ) idx = i; diff --git a/src/Qtx/QtxPagePrefMgr.h b/src/Qtx/QtxPagePrefMgr.h index 40d0dd992..cc7a511b5 100644 --- a/src/Qtx/QtxPagePrefMgr.h +++ b/src/Qtx/QtxPagePrefMgr.h @@ -23,7 +23,6 @@ #define QTXPAGEPREFMGR_H #include "QtxPreferenceMgr.h" - #include "QtxPathEdit.h" #include "QtxPathListEdit.h" diff --git a/src/Qtx/QtxPathDialog.h b/src/Qtx/QtxPathDialog.h index 29dbac051..a1789bf6b 100755 --- a/src/Qtx/QtxPathDialog.h +++ b/src/Qtx/QtxPathDialog.h @@ -112,7 +112,7 @@ private: }; #ifdef WIN32 -#pragma warning( default:4251 ) +//#pragma warning( default:4251 ) #endif #endif diff --git a/src/Qtx/QtxPathEdit.h b/src/Qtx/QtxPathEdit.h index c4fe189c6..d1c51f5d5 100644 --- a/src/Qtx/QtxPathEdit.h +++ b/src/Qtx/QtxPathEdit.h @@ -24,6 +24,10 @@ #include "Qtx.h" +#if defined WIN32 +#pragma warning ( disable: 4251 ) +#endif + #include class QLineEdit; diff --git a/src/Qtx/QtxPreferenceMgr.h b/src/Qtx/QtxPreferenceMgr.h index 244d6b360..ddf5fed78 100644 --- a/src/Qtx/QtxPreferenceMgr.h +++ b/src/Qtx/QtxPreferenceMgr.h @@ -182,7 +182,7 @@ private: }; #ifdef WIN32 -#pragma warning( default:4251 ) +//#pragma warning( default:4251 ) #endif #endif diff --git a/src/Qtx/QtxTreeView.h b/src/Qtx/QtxTreeView.h index e8e7b090c..885e8330d 100644 --- a/src/Qtx/QtxTreeView.h +++ b/src/Qtx/QtxTreeView.h @@ -75,7 +75,7 @@ private: }; #ifdef WIN32 -#pragma warning( default:4251 ) +//#pragma warning( default:4251 ) #endif #endif // QTXTREEVIEW_H diff --git a/src/Qtx/QtxWorkspace.h b/src/Qtx/QtxWorkspace.h index 224d729c1..32137340a 100644 --- a/src/Qtx/QtxWorkspace.h +++ b/src/Qtx/QtxWorkspace.h @@ -44,7 +44,7 @@ public slots: }; #ifdef WIN32 -#pragma warning( default:4251 ) +//#pragma warning( default:4251 ) #endif #endif diff --git a/src/Qtx/QtxWorkspaceAction.h b/src/Qtx/QtxWorkspaceAction.h index a4ade9c06..8b872ef66 100644 --- a/src/Qtx/QtxWorkspaceAction.h +++ b/src/Qtx/QtxWorkspaceAction.h @@ -91,7 +91,7 @@ private: }; #ifdef WIN32 -#pragma warning( default:4251 ) +//#pragma warning( default:4251 ) #endif #endif diff --git a/src/Qtx/QtxWorkstack.h b/src/Qtx/QtxWorkstack.h index 71965266c..431eebf24 100644 --- a/src/Qtx/QtxWorkstack.h +++ b/src/Qtx/QtxWorkstack.h @@ -24,6 +24,10 @@ #include "Qtx.h" +#ifdef WIN32 +#pragma warning( disable:4251 ) +#endif + #include #include #include @@ -41,10 +45,6 @@ class QtxWorkstackDrag; class QtxWorkstackChild; class QtxWorkstackTabBar; -#ifdef WIN32 -#pragma warning( disable:4251 ) -#endif - class QTX_EXPORT QtxWorkstack : public QWidget { Q_OBJECT @@ -371,7 +371,7 @@ private: }; #ifdef WIN32 -#pragma warning( default:4251 ) +//#pragma warning( default:4251 ) #endif #endif // QTXWORKSTACK_H diff --git a/src/Qtx/QtxWorkstackAction.h b/src/Qtx/QtxWorkstackAction.h index a9228a507..0a137da67 100644 --- a/src/Qtx/QtxWorkstackAction.h +++ b/src/Qtx/QtxWorkstackAction.h @@ -83,7 +83,7 @@ private: }; #ifdef WIN32 -#pragma warning( default:4251 ) +//#pragma warning( default:4251 ) #endif #endif diff --git a/src/SPlot2d/SPlot2d_ViewWindow.h b/src/SPlot2d/SPlot2d_ViewWindow.h index a11b45a64..05f97377c 100644 --- a/src/SPlot2d/SPlot2d_ViewWindow.h +++ b/src/SPlot2d/SPlot2d_ViewWindow.h @@ -40,7 +40,7 @@ protected: }; #ifdef WIN32 -#pragma warning( default:4251 ) +//#pragma warning( default:4251 ) #endif #endif diff --git a/src/STD/STD_Application.h b/src/STD/STD_Application.h index 96e295240..7a382226b 100755 --- a/src/STD/STD_Application.h +++ b/src/STD/STD_Application.h @@ -171,7 +171,7 @@ private: }; #if defined WIN32 -#pragma warning( default: 4251 ) +//#pragma warning( default: 4251 ) #endif #endif diff --git a/src/STD/STD_MDIDesktop.h b/src/STD/STD_MDIDesktop.h index a3506a468..3a5190db1 100755 --- a/src/STD/STD_MDIDesktop.h +++ b/src/STD/STD_MDIDesktop.h @@ -67,7 +67,7 @@ private: }; #if defined WIN32 -#pragma warning( default: 4251 ) +///#pragma warning( default: 4251 ) #endif #endif diff --git a/src/STD/STD_TabDesktop.h b/src/STD/STD_TabDesktop.h index 35d09cd29..729270d10 100644 --- a/src/STD/STD_TabDesktop.h +++ b/src/STD/STD_TabDesktop.h @@ -67,7 +67,7 @@ private: }; #if defined WIN32 -#pragma warning( default: 4251 ) +//#pragma warning( default: 4251 ) #endif #endif diff --git a/src/SUIT/SUIT_Application.h b/src/SUIT/SUIT_Application.h index f20dc5633..80bfc6c8f 100755 --- a/src/SUIT/SUIT_Application.h +++ b/src/SUIT/SUIT_Application.h @@ -183,7 +183,7 @@ extern "C" #define APP_CREATE_NAME "createApplication" #ifdef WIN32 -#pragma warning ( default:4251 ) +//#pragma warning ( default:4251 ) #endif #endif diff --git a/src/SUIT/SUIT_DataObject.h b/src/SUIT/SUIT_DataObject.h index 03798ea8e..2ea48adb7 100755 --- a/src/SUIT/SUIT_DataObject.h +++ b/src/SUIT/SUIT_DataObject.h @@ -173,7 +173,7 @@ private: }; #ifdef WIN32 -#pragma warning( default:4251 ) +//#pragma warning( default:4251 ) #endif #endif // SUIT_DATAOBJECT_H diff --git a/src/SUIT/SUIT_DataOwner.h b/src/SUIT/SUIT_DataOwner.h index 976e5b45f..e00f03426 100755 --- a/src/SUIT/SUIT_DataOwner.h +++ b/src/SUIT/SUIT_DataOwner.h @@ -84,8 +84,8 @@ private: }; #ifdef WIN32 -#pragma warning( default:4251 ) -#pragma warning( default:4275 ) +//#pragma warning( default:4251 ) +//#pragma warning( default:4275 ) #endif #endif diff --git a/src/SUIT/SUIT_LicenseDlg.h b/src/SUIT/SUIT_LicenseDlg.h index d0e2e739f..84fa06397 100755 --- a/src/SUIT/SUIT_LicenseDlg.h +++ b/src/SUIT/SUIT_LicenseDlg.h @@ -45,7 +45,7 @@ private: }; #ifdef WIN32 -#pragma warning( default:4251 ) +//#pragma warning( default:4251 ) #endif #endif diff --git a/src/SUIT/SUIT_Operation.h b/src/SUIT/SUIT_Operation.h index cf29007d7..7cc7e3835 100755 --- a/src/SUIT/SUIT_Operation.h +++ b/src/SUIT/SUIT_Operation.h @@ -162,7 +162,7 @@ private: }; #ifdef WIN32 -#pragma warning( default:4251 ) +//#pragma warning( default:4251 ) #endif #endif diff --git a/src/SUIT/SUIT_SelectionMgr.h b/src/SUIT/SUIT_SelectionMgr.h index 8bef8ff5e..8d6d6a4f8 100755 --- a/src/SUIT/SUIT_SelectionMgr.h +++ b/src/SUIT/SUIT_SelectionMgr.h @@ -110,7 +110,7 @@ private: }; #ifdef WIN32 -#pragma warning ( default : 4251 ) +//#pragma warning ( default : 4251 ) #endif #endif diff --git a/src/SUIT/SUIT_Study.h b/src/SUIT/SUIT_Study.h index 603d9d9f5..fafba19ee 100755 --- a/src/SUIT/SUIT_Study.h +++ b/src/SUIT/SUIT_Study.h @@ -114,7 +114,7 @@ private: }; #ifdef WIN32 -#pragma warning( default:4251 ) +//#pragma warning( default:4251 ) #endif #endif diff --git a/src/SUIT/SUIT_TreeModel.h b/src/SUIT/SUIT_TreeModel.h index ecad0d413..5ccdf8455 100755 --- a/src/SUIT/SUIT_TreeModel.h +++ b/src/SUIT/SUIT_TreeModel.h @@ -249,7 +249,7 @@ public: }; #ifdef WIN32 -#pragma warning( default:4251 ) +//#pragma warning( default:4251 ) #endif #endif // SUIT_TREEMODEL_H diff --git a/src/SUIT/SUIT_ViewManager.h b/src/SUIT/SUIT_ViewManager.h index 220c824f5..e8c4d1978 100755 --- a/src/SUIT/SUIT_ViewManager.h +++ b/src/SUIT/SUIT_ViewManager.h @@ -141,7 +141,7 @@ protected: }; #ifdef WIN32 -#pragma warning( default:4251 ) +//#pragma warning( default:4251 ) #endif #endif diff --git a/src/SUIT/SUIT_ViewModel.h b/src/SUIT/SUIT_ViewModel.h index 8126a7913..961337a93 100755 --- a/src/SUIT/SUIT_ViewModel.h +++ b/src/SUIT/SUIT_ViewModel.h @@ -74,7 +74,7 @@ public: }; #ifdef WIN32 -#pragma warning( default:4251 ) +//#pragma warning( default:4251 ) #endif extern "C" diff --git a/src/SVTK/SALOME_Actor.h b/src/SVTK/SALOME_Actor.h index ee81079b5..5af43aa51 100644 --- a/src/SVTK/SALOME_Actor.h +++ b/src/SVTK/SALOME_Actor.h @@ -236,7 +236,7 @@ class SVTK_EXPORT SALOME_Actor : public VTKViewer_Actor }; #ifdef WIN32 -#pragma warning ( default:4251 ) +//#pragma warning ( default:4251 ) #endif #endif // SALOME_ACTOR_H diff --git a/src/SVTK/SVTK_Actor.h b/src/SVTK/SVTK_Actor.h index e0a8afc02..db02e1126 100644 --- a/src/SVTK/SVTK_Actor.h +++ b/src/SVTK/SVTK_Actor.h @@ -87,7 +87,7 @@ public: }; #ifdef WIN32 -#pragma warning ( default:4251 ) +//#pragma warning ( default:4251 ) #endif #endif diff --git a/src/SVTK/SVTK_CubeAxesActor2D.h b/src/SVTK/SVTK_CubeAxesActor2D.h index 0443f0b28..27cbf657f 100644 --- a/src/SVTK/SVTK_CubeAxesActor2D.h +++ b/src/SVTK/SVTK_CubeAxesActor2D.h @@ -111,7 +111,7 @@ private: }; #ifdef WIN32 -#pragma warning ( default:4251 ) +//#pragma warning ( default:4251 ) #endif #endif diff --git a/src/SVTK/SVTK_DeviceActor.h b/src/SVTK/SVTK_DeviceActor.h index 0fdd18b9f..2dc82b417 100644 --- a/src/SVTK/SVTK_DeviceActor.h +++ b/src/SVTK/SVTK_DeviceActor.h @@ -267,7 +267,7 @@ class SVTK_EXPORT SVTK_DeviceActor: public vtkLODActor }; #ifdef WIN32 -#pragma warning ( default:4251 ) +//#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 06c0241e8..5708874d2 100644 --- a/src/SVTK/SVTK_GenericRenderWindowInteractor.h +++ b/src/SVTK/SVTK_GenericRenderWindowInteractor.h @@ -127,7 +127,7 @@ class SVTK_EXPORT SVTK_GenericRenderWindowInteractor: public QVTK_GenericRenderW }; #ifdef WIN32 -#pragma warning ( default:4251 ) +//#pragma warning ( default:4251 ) #endif #endif diff --git a/src/SVTK/SVTK_InteractorStyle.h b/src/SVTK/SVTK_InteractorStyle.h index 969531065..1900025da 100644 --- a/src/SVTK/SVTK_InteractorStyle.h +++ b/src/SVTK/SVTK_InteractorStyle.h @@ -353,7 +353,7 @@ class SVTK_EXPORT SVTK_InteractorStyle: public vtkInteractorStyle }; #ifdef WIN32 -#pragma warning ( default:4251 ) +//#pragma warning ( default:4251 ) #endif #endif diff --git a/src/SVTK/SVTK_RectPicker.h b/src/SVTK/SVTK_RectPicker.h index 59e152eab..b6b73bc41 100644 --- a/src/SVTK/SVTK_RectPicker.h +++ b/src/SVTK/SVTK_RectPicker.h @@ -128,7 +128,7 @@ class SVTK_EXPORT SVTK_RectPicker : public vtkAbstractPropPicker }; #ifdef WIN32 -#pragma warning ( default:4251 ) +//#pragma warning ( default:4251 ) #endif #endif diff --git a/src/SVTK/SVTK_RenderWindowInteractor.h b/src/SVTK/SVTK_RenderWindowInteractor.h index ab5f9c182..b72615593 100644 --- a/src/SVTK/SVTK_RenderWindowInteractor.h +++ b/src/SVTK/SVTK_RenderWindowInteractor.h @@ -257,7 +257,7 @@ class SVTK_EXPORT SVTK_RenderWindowInteractor: public QVTK_RenderWindowInteracto }; #ifdef WIN32 -#pragma warning ( default:4251 ) +//#pragma warning ( default:4251 ) #endif #endif diff --git a/src/SVTK/SVTK_Renderer.h b/src/SVTK/SVTK_Renderer.h index 5c24cefa1..8dbd981b2 100644 --- a/src/SVTK/SVTK_Renderer.h +++ b/src/SVTK/SVTK_Renderer.h @@ -253,7 +253,7 @@ class SVTK_EXPORT SVTK_Renderer : public vtkObject }; #ifdef WIN32 -#pragma warning ( default:4251 ) +//#pragma warning ( default:4251 ) #endif #endif diff --git a/src/SVTK/SVTK_View.h b/src/SVTK/SVTK_View.h index 7e31e56b2..3861add92 100644 --- a/src/SVTK/SVTK_View.h +++ b/src/SVTK/SVTK_View.h @@ -266,7 +266,7 @@ public: }; #ifdef WIN32 -#pragma warning( default:4251 ) +//#pragma warning( default:4251 ) #endif #endif diff --git a/src/SVTK/SVTK_ViewWindow.h b/src/SVTK/SVTK_ViewWindow.h index 0b5f2014a..b3b8ba34e 100755 --- a/src/SVTK/SVTK_ViewWindow.h +++ b/src/SVTK/SVTK_ViewWindow.h @@ -396,7 +396,7 @@ private: }; #ifdef WIN32 -#pragma warning( default:4251 ) +//#pragma warning( default:4251 ) #endif #endif diff --git a/src/VTKViewer/VTKViewer_Actor.h b/src/VTKViewer/VTKViewer_Actor.h index 72035b6ae..f2ea80996 100755 --- a/src/VTKViewer/VTKViewer_Actor.h +++ b/src/VTKViewer/VTKViewer_Actor.h @@ -335,7 +335,7 @@ class VTKVIEWER_EXPORT VTKViewer_Actor : public vtkLODActor }; #ifdef WIN32 -#pragma warning ( default:4251 ) +//#pragma warning ( default:4251 ) #endif #endif // VTKVIEVER_ACTOR_H diff --git a/src/VTKViewer/VTKViewer_AppendFilter.h b/src/VTKViewer/VTKViewer_AppendFilter.h index ef2e7f11d..5e03dc070 100644 --- a/src/VTKViewer/VTKViewer_AppendFilter.h +++ b/src/VTKViewer/VTKViewer_AppendFilter.h @@ -107,7 +107,7 @@ protected: }; #ifdef WIN32 -#pragma warning ( default:4251 ) +//#pragma warning ( default:4251 ) #endif #endif diff --git a/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.h b/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.h index 71f3274d8..5bb27728b 100755 --- a/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.h +++ b/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.h @@ -128,7 +128,7 @@ private: }; #ifdef WIN32 -#pragma warning ( default:4251 ) +///#pragma warning ( default:4251 ) #endif #endif diff --git a/src/VTKViewer/VTKViewer_GeometryFilter.h b/src/VTKViewer/VTKViewer_GeometryFilter.h index 300c5a948..11cf5d107 100755 --- a/src/VTKViewer/VTKViewer_GeometryFilter.h +++ b/src/VTKViewer/VTKViewer_GeometryFilter.h @@ -113,7 +113,7 @@ private: }; #ifdef WIN32 -#pragma warning ( default:4251 ) +//#pragma warning ( default:4251 ) #endif #endif diff --git a/src/VTKViewer/VTKViewer_InteractorStyle.h b/src/VTKViewer/VTKViewer_InteractorStyle.h index baaa4988a..1f7c5fc09 100644 --- a/src/VTKViewer/VTKViewer_InteractorStyle.h +++ b/src/VTKViewer/VTKViewer_InteractorStyle.h @@ -196,7 +196,7 @@ class VTKVIEWER_EXPORT VTKViewer_InteractorStyle : public QObject, public vtkInt }; #ifdef WIN32 -#pragma warning ( default:4251 ) +//#pragma warning ( default:4251 ) #endif #endif diff --git a/src/VTKViewer/VTKViewer_ShrinkFilter.h b/src/VTKViewer/VTKViewer_ShrinkFilter.h index ab46c2514..15c4ea54d 100755 --- a/src/VTKViewer/VTKViewer_ShrinkFilter.h +++ b/src/VTKViewer/VTKViewer_ShrinkFilter.h @@ -62,7 +62,7 @@ private: }; #ifdef WIN32 -#pragma warning ( default:4251 ) +//#pragma warning ( default:4251 ) #endif #endif diff --git a/src/VTKViewer/VTKViewer_ViewWindow.h b/src/VTKViewer/VTKViewer_ViewWindow.h index 05c9ee9a8..255b6ea45 100755 --- a/src/VTKViewer/VTKViewer_ViewWindow.h +++ b/src/VTKViewer/VTKViewer_ViewWindow.h @@ -131,7 +131,7 @@ private: }; #ifdef WIN32 -#pragma warning( default:4251 ) +//#pragma warning( default:4251 ) #endif #endif -- 2.39.2