From 281a4cd992ae7151a85c979648e6dd2e61978421 Mon Sep 17 00:00:00 2001 From: asl Date: Fri, 26 Jun 2015 10:02:09 +0300 Subject: [PATCH] minor code revision --- src/HYDROData/HYDROData_Document.h | 1 - src/HYDROData/HYDROData_Object.h | 17 ----------------- src/HYDROGUI/HYDROGUI_DataObject.h | 4 ++-- src/HYDROGUI/HYDROGUI_Module.h | 10 ++++++++-- 4 files changed, 10 insertions(+), 22 deletions(-) diff --git a/src/HYDROData/HYDROData_Document.h b/src/HYDROData/HYDROData_Document.h index 4c57cbc0..3565fd5c 100644 --- a/src/HYDROData/HYDROData_Document.h +++ b/src/HYDROData/HYDROData_Document.h @@ -19,7 +19,6 @@ #ifndef HYDROData_Document_HeaderFile #define HYDROData_Document_HeaderFile -#include #include #include diff --git a/src/HYDROData/HYDROData_Object.h b/src/HYDROData/HYDROData_Object.h index badf45ea..520a70ab 100644 --- a/src/HYDROData/HYDROData_Object.h +++ b/src/HYDROData/HYDROData_Object.h @@ -16,28 +16,11 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// - #ifndef HYDROData_Object_HeaderFile #define HYDROData_Object_HeaderFile #include - DEFINE_STANDARD_HANDLE(HYDROData_Object, HYDROData_Entity) class TopoDS_Shape; diff --git a/src/HYDROGUI/HYDROGUI_DataObject.h b/src/HYDROGUI/HYDROGUI_DataObject.h index 28aa22e4..caa5eba4 100644 --- a/src/HYDROGUI/HYDROGUI_DataObject.h +++ b/src/HYDROGUI/HYDROGUI_DataObject.h @@ -34,8 +34,8 @@ #include #ifdef WIN32 - #pragma warning( disable: 4250 ) - #pragma warning( disable: 4251 ) + #pragma warning( default: 4250 ) + #pragma warning( default: 4251 ) #endif /** diff --git a/src/HYDROGUI/HYDROGUI_Module.h b/src/HYDROGUI/HYDROGUI_Module.h index ddd8faad..381bf95d 100644 --- a/src/HYDROGUI/HYDROGUI_Module.h +++ b/src/HYDROGUI/HYDROGUI_Module.h @@ -21,13 +21,19 @@ #include -#include +#ifdef WIN32 + #pragma warning ( disable: 4251 ) +#endif +#include #include #include -class QGraphicsSceneMouseEvent; +#ifdef WIN32 + #pragma warning ( default: 4251 ) +#endif +class QGraphicsSceneMouseEvent; class GraphicsView_Viewer; class OCCViewer_Viewer; class SVTK_Viewer; -- 2.39.2