From be101f6109b0cb640bc5dc7919f20844b3757cdc Mon Sep 17 00:00:00 2001 From: vsr Date: Fri, 30 Mar 2012 08:47:11 +0000 Subject: [PATCH] Clean-up sources --- src/LightApp/LightApp_Driver.cxx | 2 -- src/LightApp/LightApp_HDFDriver.cxx | 2 -- src/LightApp/LightApp_NameDlg.cxx | 4 --- src/LightApp/LightApp_Selection.h | 4 +-- src/OBJECT/SALOME_AISObject.cxx | 5 +--- src/OBJECT/SALOME_AISShape.cxx | 7 ++--- ...MapIteratorOfDataMapOfIOMapOfInteger_0.cxx | 2 -- ...DataMapNodeOfDataMapOfIOMapOfInteger_0.cxx | 1 - .../SALOME_DataMapOfIOMapOfInteger_0.cxx | 2 -- src/OBJECT/SALOME_Filter.cxx | 5 +--- src/OBJECT/SALOME_InteractiveObject.cxx | 5 +--- src/OBJECT/SALOME_ListIO_0.cxx | 5 +--- src/OBJECT/SALOME_ListIteratorOfListIO_0.cxx | 6 ++-- src/OBJECT/SALOME_ListNodeOfListIO_0.cxx | 4 +-- src/OBJECT/SALOME_Selection.h | 4 +-- src/OBJECT/SALOME_TypeFilter.cxx | 5 +--- src/Prs/SALOME_Prs.cxx | 10 ++----- src/PyInterp/PyInterp_Dispatcher.cxx | 2 -- src/SALOME_SWIG/libSALOME_Swig.i | 5 +--- src/SOCC/SOCC_Prs.cxx | 6 +--- src/SOCC/SOCC_Prs.h | 4 +-- src/SPlot2d/SPlot2d_ViewModel.cxx | 2 -- src/SUPERVGraph/SUPERVGraph.cxx | 6 +--- src/SUPERVGraph/SUPERVGraph.h | 4 +-- src/SUPERVGraph/SUPERVGraph_ViewFrame.cxx | 7 +---- src/SUPERVGraph/SUPERVGraph_ViewFrame.h | 4 +-- src/SVTK/SALOME_Actor.cxx | 5 +--- src/SVTK/SALOME_Actor.h | 4 +-- src/SVTK/SVTK.cxx | 4 +-- src/SVTK/SVTK_Actor.cxx | 3 -- src/SVTK/SVTK_ComboAction.cxx | 4 +-- src/SVTK/SVTK_ComboAction.h | 4 +-- src/SVTK/SVTK_CubeAxesActor2D.cxx | 4 +-- src/SVTK/SVTK_CubeAxesActor2D.h | 4 +-- src/SVTK/SVTK_DeviceActor.cxx | 16 ++++------- src/SVTK/SVTK_DeviceActor.h | 4 +-- src/SVTK/SVTK_Event.h | 4 +-- .../SVTK_GenericRenderWindowInteractor.cxx | 6 +--- src/SVTK/SVTK_GenericRenderWindowInteractor.h | 4 +-- src/SVTK/SVTK_InteractorStyle.cxx | 6 +--- src/SVTK/SVTK_InteractorStyle.h | 4 +-- src/SVTK/SVTK_KeyFreeInteractorStyle.cxx | 4 +-- src/SVTK/SVTK_KeyFreeInteractorStyle.h | 5 +--- src/SVTK/SVTK_NonIsometricDlg.cxx | 6 +--- src/SVTK/SVTK_NonIsometricDlg.h | 4 +-- src/SVTK/SVTK_Prs.cxx | 6 +--- src/SVTK/SVTK_Prs.h | 4 +-- src/SVTK/SVTK_Recorder.cxx | 6 ++-- src/SVTK/SVTK_RenderWindowInteractor.cxx | 7 +---- src/SVTK/SVTK_RenderWindowInteractor.h | 4 +-- src/SVTK/SVTK_Renderer.cxx | 4 +-- src/SVTK/SVTK_Renderer.h | 4 +-- src/SVTK/SVTK_Selection.h | 4 +-- src/SVTK/SVTK_SelectionEvent.h | 4 +-- src/SVTK/SVTK_Selector.cxx | 4 +-- src/SVTK/SVTK_Selector.h | 4 +-- src/SVTK/SVTK_SelectorDef.h | 4 +-- src/SVTK/SVTK_SetRotationPointDlg.cxx | 6 +--- src/SVTK/SVTK_SetRotationPointDlg.h | 4 +-- src/SVTK/SVTK_SpaceMouse.cxx | 4 +-- src/SVTK/SVTK_SpaceMouse.h | 4 +-- src/SVTK/SVTK_UpdateRateDlg.cxx | 6 +--- src/SVTK/SVTK_UpdateRateDlg.h | 4 +-- src/SVTK/SVTK_View.cxx | 4 +-- src/SVTK/SVTK_ViewParameterDlg.cxx | 6 +--- src/SVTK/SVTK_ViewParameterDlg.h | 4 +-- src/SalomeApp/SalomeApp_ImportOperation.cxx | 8 +----- src/SalomeApp/SalomeApp_ImportOperation.h | 4 +-- src/SalomeApp/SalomeApp_NoteBookDlg.cxx | 28 +++++++++---------- src/SalomeApp/SalomeApp_PyInterp.cxx | 6 +--- src/SalomeApp/SalomeApp_PyInterp.h | 4 +-- .../SalomeApp_StudyPropertiesDlg.cxx | 4 +-- src/SalomeApp/Test/SalomeAppTest.cxx | 2 -- src/Session/SALOME_Session_Server.cxx | 2 +- src/Session/SalomeApp_Engine_i.cxx | 8 ++---- src/Session/SalomeApp_Engine_i.hxx | 4 +-- src/Session/Session_ServerLauncher.cxx | 13 ++++----- src/Session/Session_ServerLauncher.hxx | 28 ++++++++----------- src/Session/Session_ServerThread.cxx | 15 +++------- src/Session/Session_ServerThread.hxx | 18 +++++------- src/Session/Session_Session_i.cxx | 5 +--- src/TOOLSGUI/ToolsGUI_CatalogGeneratorDlg.cxx | 2 -- src/VTKViewer/VTKViewer.cxx | 4 +-- src/VTKViewer/VTKViewer_Actor.cxx | 7 +---- src/VTKViewer/VTKViewer_Actor.h | 4 +-- src/VTKViewer/VTKViewer_Algorithm.h | 4 +-- src/VTKViewer/VTKViewer_AppendFilter.cxx | 4 +-- .../VTKViewer_CellLocationsArray.cxx | 4 +-- .../VTKViewer_ExtractUnstructuredGrid.cxx | 8 ++---- src/VTKViewer/VTKViewer_Filter.cxx | 4 +-- src/VTKViewer/VTKViewer_Functor.h | 4 +-- src/VTKViewer/VTKViewer_InteractorStyle.cxx | 10 +------ src/VTKViewer/VTKViewer_MarkerUtils.cxx | 2 -- .../VTKViewer_RenderWindowInteractor.cxx | 9 ------ src/VTKViewer/VTKViewer_ShrinkFilter.cxx | 4 +-- src/VTKViewer/VTKViewer_Utilities.cxx | 26 ++++++++--------- tools/vtkEDFOverloads/vtkEDFCutter.cxx | 4 +-- 97 files changed, 142 insertions(+), 412 deletions(-) diff --git a/src/LightApp/LightApp_Driver.cxx b/src/LightApp/LightApp_Driver.cxx index 6acae14f0..e83ffbb0c 100644 --- a/src/LightApp/LightApp_Driver.cxx +++ b/src/LightApp/LightApp_Driver.cxx @@ -48,8 +48,6 @@ LightApp_Driver::~LightApp_Driver() { } -using namespace std; - /*! Save in file 'theFileName' datas from this driver */ diff --git a/src/LightApp/LightApp_HDFDriver.cxx b/src/LightApp/LightApp_HDFDriver.cxx index e58c5ab34..052d8a569 100644 --- a/src/LightApp/LightApp_HDFDriver.cxx +++ b/src/LightApp/LightApp_HDFDriver.cxx @@ -37,8 +37,6 @@ LightApp_HDFDriver::~LightApp_HDFDriver() { } -using namespace std; - /*! Saves in file 'theFileName' datas from this driver */ diff --git a/src/LightApp/LightApp_NameDlg.cxx b/src/LightApp/LightApp_NameDlg.cxx index b27c972d5..922a4430f 100644 --- a/src/LightApp/LightApp_NameDlg.cxx +++ b/src/LightApp/LightApp_NameDlg.cxx @@ -33,10 +33,6 @@ #include #include -#ifndef WIN32 -using namespace std; -#endif - /*! Constructor */ diff --git a/src/LightApp/LightApp_Selection.h b/src/LightApp/LightApp_Selection.h index 20aae9110..ab79522e3 100644 --- a/src/LightApp/LightApp_Selection.h +++ b/src/LightApp/LightApp_Selection.h @@ -23,9 +23,7 @@ // LightApp_Selection // File : LightApp_Selection.h // Author : Alexander SOLOVYOV -// Module : GUI -// $Header$ -// + #ifndef LIGHTAPP_SELECTION_HeaderFile #define LIGHTAPP_SELECTION_HeaderFile diff --git a/src/OBJECT/SALOME_AISObject.cxx b/src/OBJECT/SALOME_AISObject.cxx index faa1c7e60..cb7fcd001 100755 --- a/src/OBJECT/SALOME_AISObject.cxx +++ b/src/OBJECT/SALOME_AISObject.cxx @@ -23,8 +23,5 @@ // SALOME OBJECT : implementation of interactive object visualization for OCC and VTK viewers // File : SALOME_AISObject.hxx // Author : Nicolas REJNERI -// Module : SALOME -// $Header$ -//using namespace std; -// + #include "SALOME_AISObject.ixx" diff --git a/src/OBJECT/SALOME_AISShape.cxx b/src/OBJECT/SALOME_AISShape.cxx index 2f812e30f..196068e7d 100755 --- a/src/OBJECT/SALOME_AISShape.cxx +++ b/src/OBJECT/SALOME_AISShape.cxx @@ -21,12 +21,9 @@ // // SALOME OBJECT : implementation of interactive object visualization for OCC and VTK viewers -// File : SALOME_AISShape.hxx +// File : SALOME_AISShape.cxx // Author : Nicolas REJNERI -// Module : SALOME -// $Header$ -//using namespace std; -// + #include "SALOME_AISShape.ixx" /*! diff --git a/src/OBJECT/SALOME_DataMapIteratorOfDataMapOfIOMapOfInteger_0.cxx b/src/OBJECT/SALOME_DataMapIteratorOfDataMapOfIOMapOfInteger_0.cxx index 4fff582b6..5049391c5 100644 --- a/src/OBJECT/SALOME_DataMapIteratorOfDataMapOfIOMapOfInteger_0.cxx +++ b/src/OBJECT/SALOME_DataMapIteratorOfDataMapOfIOMapOfInteger_0.cxx @@ -44,8 +44,6 @@ #ifndef _SALOME_DataMapNodeOfDataMapOfIOMapOfInteger_HeaderFile #include "SALOME_DataMapNodeOfDataMapOfIOMapOfInteger.hxx" #endif -using namespace std; - #define TheKey Handle_SALOME_InteractiveObject #define TheKey_hxx "SALOME_InteractiveObject.hxx" diff --git a/src/OBJECT/SALOME_DataMapNodeOfDataMapOfIOMapOfInteger_0.cxx b/src/OBJECT/SALOME_DataMapNodeOfDataMapOfIOMapOfInteger_0.cxx index b987c78ca..a747c988e 100644 --- a/src/OBJECT/SALOME_DataMapNodeOfDataMapOfIOMapOfInteger_0.cxx +++ b/src/OBJECT/SALOME_DataMapNodeOfDataMapOfIOMapOfInteger_0.cxx @@ -45,7 +45,6 @@ #ifndef _SALOME_DataMapIteratorOfDataMapOfIOMapOfInteger_HeaderFile #include "SALOME_DataMapIteratorOfDataMapOfIOMapOfInteger.hxx" #endif -using namespace std; /*! Destructor diff --git a/src/OBJECT/SALOME_DataMapOfIOMapOfInteger_0.cxx b/src/OBJECT/SALOME_DataMapOfIOMapOfInteger_0.cxx index f30fff750..9aa1850c6 100644 --- a/src/OBJECT/SALOME_DataMapOfIOMapOfInteger_0.cxx +++ b/src/OBJECT/SALOME_DataMapOfIOMapOfInteger_0.cxx @@ -47,8 +47,6 @@ #ifndef _SALOME_DataMapIteratorOfDataMapOfIOMapOfInteger_HeaderFile #include "SALOME_DataMapIteratorOfDataMapOfIOMapOfInteger.hxx" #endif -using namespace std; - #define TheKey Handle_SALOME_InteractiveObject #define TheKey_hxx "SALOME_InteractiveObject.hxx" diff --git a/src/OBJECT/SALOME_Filter.cxx b/src/OBJECT/SALOME_Filter.cxx index 0f0c0dcee..3749b6796 100644 --- a/src/OBJECT/SALOME_Filter.cxx +++ b/src/OBJECT/SALOME_Filter.cxx @@ -23,9 +23,6 @@ // SALOME SALOMEGUI : implementation of desktop and GUI kernel // File : SALOME_Filter.cxx // Author : Nicolas REJNERI -// Module : SALOME -// $Header$ -// + #include "SALOME_Filter.ixx" -using namespace std; diff --git a/src/OBJECT/SALOME_InteractiveObject.cxx b/src/OBJECT/SALOME_InteractiveObject.cxx index 5c6910614..811432a97 100755 --- a/src/OBJECT/SALOME_InteractiveObject.cxx +++ b/src/OBJECT/SALOME_InteractiveObject.cxx @@ -23,10 +23,7 @@ // SALOME OBJECT : implementation of interactive object visualization for OCC and VTK viewers // File : SALOME_InteractiveObject.cxx // Author : Nicolas REJNERI -// Module : SALOME -// $Header$ -//using namespace std; -// + /*! \class SALOME_InteractiveObject SALOME_InteractiveObject.hxx \brief ... diff --git a/src/OBJECT/SALOME_ListIO_0.cxx b/src/OBJECT/SALOME_ListIO_0.cxx index ba36140b4..75266f5fd 100644 --- a/src/OBJECT/SALOME_ListIO_0.cxx +++ b/src/OBJECT/SALOME_ListIO_0.cxx @@ -22,8 +22,7 @@ // SALOME SALOMEGUI : implementation of desktop and GUI kernel // File : SALOME_ListIO_0.cxx -// Module : SALOME -// + #include "SALOME_ListIO.hxx" #ifndef _Standard_NoSuchObject_HeaderFile @@ -38,8 +37,6 @@ #ifndef _SALOME_ListNodeOfListIO_HeaderFile #include "SALOME_ListNodeOfListIO.hxx" #endif -using namespace std; - #define Item Handle_SALOME_InteractiveObject #define Item_hxx "SALOME_InteractiveObject.hxx" diff --git a/src/OBJECT/SALOME_ListIteratorOfListIO_0.cxx b/src/OBJECT/SALOME_ListIteratorOfListIO_0.cxx index a71a59cfb..c827b7866 100644 --- a/src/OBJECT/SALOME_ListIteratorOfListIO_0.cxx +++ b/src/OBJECT/SALOME_ListIteratorOfListIO_0.cxx @@ -22,8 +22,7 @@ // SALOME SALOMEGUI : implementation of desktop and GUI kernel // File : SALOME_ListIteratorOfListIO_0.cxx -// Module : SALOME -// + #include "SALOME_ListIteratorOfListIO.hxx" #ifndef _Standard_NoMoreObject_HeaderFile @@ -41,8 +40,7 @@ #ifndef _SALOME_ListNodeOfListIO_HeaderFile #include "SALOME_ListNodeOfListIO.hxx" #endif -using namespace std; - + #define Item Handle_SALOME_InteractiveObject #define Item_hxx "SALOME_InteractiveObject.hxx" diff --git a/src/OBJECT/SALOME_ListNodeOfListIO_0.cxx b/src/OBJECT/SALOME_ListNodeOfListIO_0.cxx index 751c8a7c4..9be8224bf 100644 --- a/src/OBJECT/SALOME_ListNodeOfListIO_0.cxx +++ b/src/OBJECT/SALOME_ListNodeOfListIO_0.cxx @@ -22,8 +22,7 @@ // SALOME SALOMEGUI : implementation of desktop and GUI kernel // File : SALOME_ListNodeOfListIO_0.cxx -// Module : SALOME -// + #include "SALOME_ListNodeOfListIO.hxx" #ifndef _Standard_TypeMismatch_HeaderFile @@ -39,7 +38,6 @@ #ifndef _SALOME_ListIteratorOfListIO_HeaderFile #include "SALOME_ListIteratorOfListIO.hxx" #endif -using namespace std; /*! Destructor diff --git a/src/OBJECT/SALOME_Selection.h b/src/OBJECT/SALOME_Selection.h index cc80163fa..49f7f88ab 100644 --- a/src/OBJECT/SALOME_Selection.h +++ b/src/OBJECT/SALOME_Selection.h @@ -23,9 +23,7 @@ // SALOME Selection : description of enumeration Selection_Mode // File : SALOME_Selection.h // Author : -// Module : SALOME -// $Header$ -// + #ifndef SALOME_SELECTION_H #define SALOME_SELECTION_H diff --git a/src/OBJECT/SALOME_TypeFilter.cxx b/src/OBJECT/SALOME_TypeFilter.cxx index 62e57b8f6..9fe6baead 100644 --- a/src/OBJECT/SALOME_TypeFilter.cxx +++ b/src/OBJECT/SALOME_TypeFilter.cxx @@ -23,12 +23,9 @@ // SALOME SALOMEGUI : implementation of desktop and GUI kernel // File : SALOME_TypeFilter.cxx // Author : Nicolas REJNERI -// Module : SALOME -// $Header$ -// + #include "SALOME_TypeFilter.ixx" #include "SALOME_InteractiveObject.hxx" -using namespace std; /*! Constructor diff --git a/src/Prs/SALOME_Prs.cxx b/src/Prs/SALOME_Prs.cxx index 2c3e48394..994f96b93 100755 --- a/src/Prs/SALOME_Prs.cxx +++ b/src/Prs/SALOME_Prs.cxx @@ -21,15 +21,9 @@ // // File: SALOME_Prs.cxx -// Created: Wed Apr 28 15:03:43 2004 -// Author: Sergey ANIKIN -// -// -#include "SALOME_Prs.h" +// Author: Sergey ANIKIN, Open CASCADE S.A.S. (sergey.anikin@opencascade.com) -//#include "utilities.h" - -//using namespace std; +#include "SALOME_Prs.h" /*! Dispatches display operation to proper Display() method of SALOME_View diff --git a/src/PyInterp/PyInterp_Dispatcher.cxx b/src/PyInterp/PyInterp_Dispatcher.cxx index 42e6caa36..48f527241 100755 --- a/src/PyInterp/PyInterp_Dispatcher.cxx +++ b/src/PyInterp/PyInterp_Dispatcher.cxx @@ -44,8 +44,6 @@ public: } }; -using namespace std; - PyInterp_Dispatcher* PyInterp_Dispatcher::myInstance = 0; void PyInterp_Request::process() diff --git a/src/SALOME_SWIG/libSALOME_Swig.i b/src/SALOME_SWIG/libSALOME_Swig.i index 069d62d8e..a22d05368 100755 --- a/src/SALOME_SWIG/libSALOME_Swig.i +++ b/src/SALOME_SWIG/libSALOME_Swig.i @@ -22,11 +22,8 @@ // File : libSALOME_Swig.i // Author : Paul RASCLE, EDF -// Module : SALOME -// $Header$ -// + %module libSALOME_Swig -//%include "SALOME_NamingService.i" %include "SALOMEGUI_Swig.i" diff --git a/src/SOCC/SOCC_Prs.cxx b/src/SOCC/SOCC_Prs.cxx index 239795d4f..d1387953e 100644 --- a/src/SOCC/SOCC_Prs.cxx +++ b/src/SOCC/SOCC_Prs.cxx @@ -23,15 +23,11 @@ // SALOME OCCViewer : build OCC Viewer into Salome desktop // File : SOCC_Prs.cxx // Author : Sergey ANIKIN -// Module : SALOME -// $Header$ -// + #include "SOCC_Prs.h" #include -using namespace std; - /*! Default constructor */ diff --git a/src/SOCC/SOCC_Prs.h b/src/SOCC/SOCC_Prs.h index da015cbaa..1dc0e3b2a 100644 --- a/src/SOCC/SOCC_Prs.h +++ b/src/SOCC/SOCC_Prs.h @@ -23,9 +23,7 @@ // SALOME OCCViewer : build OCC Viewer into Salome desktop // File : SOCC_Prs.h // Author : Sergey ANIKIN -// Module : SALOME -// $Header$ -// + #ifndef SOCC_Prs_H #define SOCC_Prs_H diff --git a/src/SPlot2d/SPlot2d_ViewModel.cxx b/src/SPlot2d/SPlot2d_ViewModel.cxx index c1e8b6cce..0731937d8 100644 --- a/src/SPlot2d/SPlot2d_ViewModel.cxx +++ b/src/SPlot2d/SPlot2d_ViewModel.cxx @@ -48,8 +48,6 @@ #include #include -using namespace std; - //ASL: Temporary commented in order to avoir dependency on SALOMEDS //#include "SALOMEDSClient.hxx" diff --git a/src/SUPERVGraph/SUPERVGraph.cxx b/src/SUPERVGraph/SUPERVGraph.cxx index f9be7155d..e4dfff8fe 100755 --- a/src/SUPERVGraph/SUPERVGraph.cxx +++ b/src/SUPERVGraph/SUPERVGraph.cxx @@ -23,17 +23,13 @@ // SALOME SUPERVGraph : build Supervisor viewer into desktop // File : SUPERVGraph.cxx // Author : Nicolas REJNERI -// Module : SALOME -// $Header$ -// + #include "SUPERVGraph.h" #include "SUPERVGraph_ViewFrame.h" #include "SUIT_Desktop.h" #include "SUIT_ViewWindow.h" -using namespace std; - /*! Creates view */ diff --git a/src/SUPERVGraph/SUPERVGraph.h b/src/SUPERVGraph/SUPERVGraph.h index b72eb8550..2df4f41e9 100755 --- a/src/SUPERVGraph/SUPERVGraph.h +++ b/src/SUPERVGraph/SUPERVGraph.h @@ -23,9 +23,7 @@ // SALOME SUPERVGraph : build Supervisor viewer into desktop // File : SUPERVGraph.h // Author : Nicolas REJNERI -// Module : SALOME -// $Header$ -// + #ifndef SUPERVGraph_HeaderFile #define SUPERVGraph_HeaderFile diff --git a/src/SUPERVGraph/SUPERVGraph_ViewFrame.cxx b/src/SUPERVGraph/SUPERVGraph_ViewFrame.cxx index 8d07929bc..0738dc1cf 100755 --- a/src/SUPERVGraph/SUPERVGraph_ViewFrame.cxx +++ b/src/SUPERVGraph/SUPERVGraph_ViewFrame.cxx @@ -23,9 +23,7 @@ // SALOME SUPERVGraph : build Supervisor viewer into desktop // File : SUPERVGraph_ViewFrame.cxx // Author : Nicolas REJNERI -// Module : SALOME -// $Header$ -// + #include "SUPERVGraph_ViewFrame.h" #include @@ -35,9 +33,6 @@ #include #include -using namespace std; - - /*! Constructor */ diff --git a/src/SUPERVGraph/SUPERVGraph_ViewFrame.h b/src/SUPERVGraph/SUPERVGraph_ViewFrame.h index 544767186..c21c86a40 100755 --- a/src/SUPERVGraph/SUPERVGraph_ViewFrame.h +++ b/src/SUPERVGraph/SUPERVGraph_ViewFrame.h @@ -23,9 +23,7 @@ // SALOME SUPERVGraph : build Supervisor viewer into desktop // File : SUPERVGraph_ViewFrame.h // Author : Nicolas REJNERI -// Module : SALOME -// $Header$ -// + #ifndef SUPERVGraph_ViewFrame_H #define SUPERVGraph_ViewFrame_H diff --git a/src/SVTK/SALOME_Actor.cxx b/src/SVTK/SALOME_Actor.cxx index 5c101d96d..ca671b759 100644 --- a/src/SVTK/SALOME_Actor.cxx +++ b/src/SVTK/SALOME_Actor.cxx @@ -23,8 +23,7 @@ // SALOME OBJECT : implementation of interactive object visualization for OCC and VTK viewers // File : SALOME_Actor.cxx // Author : Nicolas REJNERI -// Module : SALOME -// + /*! \class SALOME_Actor SALOME_Actor.h \brief Abstract class of SALOME Objects in VTK. @@ -67,8 +66,6 @@ #include #include -using namespace std; - #if defined __GNUC__ #if __GNUC__ == 2 #define __GNUC_2__ diff --git a/src/SVTK/SALOME_Actor.h b/src/SVTK/SALOME_Actor.h index 405182c6c..fe38edec2 100644 --- a/src/SVTK/SALOME_Actor.h +++ b/src/SVTK/SALOME_Actor.h @@ -23,9 +23,7 @@ // SALOME OBJECT : implementation of interactive object visualization for OCC and VTK viewers // File : SALOME_Actor.h // Author : Nicolas REJNERI -// Module : SALOME -// $Header$ -// + #ifndef SALOME_ACTOR_H #define SALOME_ACTOR_H diff --git a/src/SVTK/SVTK.cxx b/src/SVTK/SVTK.cxx index ddcac42aa..7496b4a85 100644 --- a/src/SVTK/SVTK.cxx +++ b/src/SVTK/SVTK.cxx @@ -23,9 +23,7 @@ // SALOME VTKViewer : build VTK viewer into Salome desktop // File : // Author : -// Module : -// $Header$ -// + #include "SVTK.h" #include "SVTK_Prs.h" #include "SVTK_Actor.h" diff --git a/src/SVTK/SVTK_Actor.cxx b/src/SVTK/SVTK_Actor.cxx index 2a6f657be..a29f7b525 100644 --- a/src/SVTK/SVTK_Actor.cxx +++ b/src/SVTK/SVTK_Actor.cxx @@ -41,9 +41,6 @@ #include "Utils_SALOME_Exception.hxx" #include "utilities.h" -using namespace std; - - static void CopyPoints(vtkUnstructuredGrid* theGrid, vtkDataSet *theSourceDataSet) diff --git a/src/SVTK/SVTK_ComboAction.cxx b/src/SVTK/SVTK_ComboAction.cxx index cba05a77f..e5f62b752 100644 --- a/src/SVTK/SVTK_ComboAction.cxx +++ b/src/SVTK/SVTK_ComboAction.cxx @@ -20,9 +20,7 @@ // SALOME VTKViewer : build VTK viewer into Salome desktop // File : // Author : -// Module : SALOME -// $Header: -// + #include "SVTK_ComboAction.h" #include diff --git a/src/SVTK/SVTK_ComboAction.h b/src/SVTK/SVTK_ComboAction.h index 325fad443..2a6d35d2f 100644 --- a/src/SVTK/SVTK_ComboAction.h +++ b/src/SVTK/SVTK_ComboAction.h @@ -20,9 +20,7 @@ // SALOME VTKViewer : build VTK viewer into Salome desktop // File : // Author : -// Module : SALOME -// $Header: -// + #ifndef SVTK_COMBOACTION_H #define SVTK_COMBOACTION_H diff --git a/src/SVTK/SVTK_CubeAxesActor2D.cxx b/src/SVTK/SVTK_CubeAxesActor2D.cxx index 4247f029e..0b8c197c5 100644 --- a/src/SVTK/SVTK_CubeAxesActor2D.cxx +++ b/src/SVTK/SVTK_CubeAxesActor2D.cxx @@ -23,9 +23,7 @@ // SALOME OBJECT : kernel of SALOME component // File : SVTK_CubeAxesActor2D.cxx // Author : Eugeny Nikolaev -// Module : SALOME -// $Header$ -// + #include "SVTK_CubeAxesActor2D.h" #include "VTKViewer_Transform.h" diff --git a/src/SVTK/SVTK_CubeAxesActor2D.h b/src/SVTK/SVTK_CubeAxesActor2D.h index 3e78ef79c..3537516a3 100644 --- a/src/SVTK/SVTK_CubeAxesActor2D.h +++ b/src/SVTK/SVTK_CubeAxesActor2D.h @@ -23,9 +23,7 @@ // SALOME OBJECT : kernel of SALOME component // File : SVTK_CubeAxesActor2D.h // Author : Eugeny Nikolaev -// Module : SALOME -// $Header$ -// + #ifndef __SVTK_CubeAxesActor2D_h #define __SVTK_CubeAxesActor2D_h diff --git a/src/SVTK/SVTK_DeviceActor.cxx b/src/SVTK/SVTK_DeviceActor.cxx index 4c68d61a6..0bace2066 100644 --- a/src/SVTK/SVTK_DeviceActor.cxx +++ b/src/SVTK/SVTK_DeviceActor.cxx @@ -23,9 +23,7 @@ // SVTK OBJECT : interactive object for SVTK visualization // File : SVTK_DeviceActor.cxx // Author : -// Module : -// $Header$ -// + #include "SVTK_DeviceActor.h" #include "VTKViewer_Transform.h" @@ -45,8 +43,6 @@ #include -using namespace std; - vtkStandardNewMacro(SVTK_DeviceActor); /*! @@ -192,18 +188,18 @@ SVTK_DeviceActor { unsigned long mTime = this->Superclass::GetMTime(); - mTime = max(mTime,myGeomFilter->GetMTime()); + mTime = std::max(mTime,myGeomFilter->GetMTime()); - mTime = max(mTime,myTransformFilter->GetMTime()); + mTime = std::max(mTime,myTransformFilter->GetMTime()); if(myIsShrunk) - mTime = max(mTime,myShrinkFilter->GetMTime()); + mTime = std::max(mTime,myShrinkFilter->GetMTime()); if(myIsFeatureEdgesEnabled) - mTime = max(mTime,myFeatureEdges->GetMTime()); + mTime = std::max(mTime,myFeatureEdges->GetMTime()); for(int i = 0, iEnd = myPassFilter.size(); i < iEnd; i++) - max(mTime,myPassFilter[i]->GetMTime()); + std::max(mTime,myPassFilter[i]->GetMTime()); return mTime; } diff --git a/src/SVTK/SVTK_DeviceActor.h b/src/SVTK/SVTK_DeviceActor.h index 3b8221b40..a81a9054e 100644 --- a/src/SVTK/SVTK_DeviceActor.h +++ b/src/SVTK/SVTK_DeviceActor.h @@ -23,9 +23,7 @@ // SVTK OBJECT : interactive object for SVTK visualization // File : SVTK_DeviceActor.h // Author : -// Module : -// $Header$ -// + #ifndef SVTK_DEVICE_ACTOR_H #define SVTK_DEVICE_ACTOR_H diff --git a/src/SVTK/SVTK_Event.h b/src/SVTK/SVTK_Event.h index 4785d794c..049759f8e 100644 --- a/src/SVTK/SVTK_Event.h +++ b/src/SVTK/SVTK_Event.h @@ -23,9 +23,7 @@ // SALOME VTKViewer : build VTK viewer into Salome desktop // File : // Author : Alexander SLADKOV -// Module : SALOME -// $Header$ -// + #ifndef SVTK_Event_h #define SVTK_Event_h diff --git a/src/SVTK/SVTK_GenericRenderWindowInteractor.cxx b/src/SVTK/SVTK_GenericRenderWindowInteractor.cxx index 2ec6e0d56..f89b6b430 100644 --- a/src/SVTK/SVTK_GenericRenderWindowInteractor.cxx +++ b/src/SVTK/SVTK_GenericRenderWindowInteractor.cxx @@ -23,9 +23,7 @@ // SALOME VTKViewer : build VTK viewer into Salome desktop // File : // Author : -// Module : SALOME -// $Header$ -// + #include "SVTK_GenericRenderWindowInteractor.h" #include "SVTK_Selector.h" @@ -34,8 +32,6 @@ #include -using namespace std; - vtkStandardNewMacro(QVTK_GenericRenderWindowInteractor); /*! diff --git a/src/SVTK/SVTK_GenericRenderWindowInteractor.h b/src/SVTK/SVTK_GenericRenderWindowInteractor.h index ca5148739..e8648a365 100644 --- a/src/SVTK/SVTK_GenericRenderWindowInteractor.h +++ b/src/SVTK/SVTK_GenericRenderWindowInteractor.h @@ -23,9 +23,7 @@ // SALOME VTKViewer : build VTK viewer into Salome desktop // File : // Author : -// Module : SALOME -// $Header$ -// + #ifndef SVTK_GenericRenderWindowInteractor_h #define SVTK_GenericRenderWindowInteractor_h diff --git a/src/SVTK/SVTK_InteractorStyle.cxx b/src/SVTK/SVTK_InteractorStyle.cxx index 5346d0981..703b4a2f5 100644 --- a/src/SVTK/SVTK_InteractorStyle.cxx +++ b/src/SVTK/SVTK_InteractorStyle.cxx @@ -23,9 +23,7 @@ // SALOME VTKViewer : build VTK viewer into Salome desktop // File : // Author : -// Module : SALOME -// $Header$ -// + #include "SVTK_InteractorStyle.h" #include "VTKViewer_Algorithm.h" @@ -65,8 +63,6 @@ #include #include -using namespace std; - namespace { inline void GetEventPosition(vtkRenderWindowInteractor* theInteractor, diff --git a/src/SVTK/SVTK_InteractorStyle.h b/src/SVTK/SVTK_InteractorStyle.h index 3dfa946bd..2d079ac8f 100644 --- a/src/SVTK/SVTK_InteractorStyle.h +++ b/src/SVTK/SVTK_InteractorStyle.h @@ -23,9 +23,7 @@ // SALOME VTKViewer : build VTK viewer into Salome desktop // File : SVTK_InteractorStyle.h // Author : Christophe ATTANASIO -// Module : SALOME -// $Header$ -// + #ifndef __SVTK_InteractorStyle_h #define __SVTK_InteractorStyle_h diff --git a/src/SVTK/SVTK_KeyFreeInteractorStyle.cxx b/src/SVTK/SVTK_KeyFreeInteractorStyle.cxx index 4699276d2..12f153863 100644 --- a/src/SVTK/SVTK_KeyFreeInteractorStyle.cxx +++ b/src/SVTK/SVTK_KeyFreeInteractorStyle.cxx @@ -20,9 +20,7 @@ // SALOME VTKViewer : build VTK viewer into Salome desktop // File : SVTK_KeyFreeInteractorStyle.cxx // Author : Christophe ATTANASIO -// Module : SALOME -// $Header$ -// + #include "SVTK_KeyFreeInteractorStyle.h" #include "SVTK_Selector.h" diff --git a/src/SVTK/SVTK_KeyFreeInteractorStyle.h b/src/SVTK/SVTK_KeyFreeInteractorStyle.h index 8545a881c..6f0dd3ace 100644 --- a/src/SVTK/SVTK_KeyFreeInteractorStyle.h +++ b/src/SVTK/SVTK_KeyFreeInteractorStyle.h @@ -20,13 +20,10 @@ // SALOME VTKViewer : build VTK viewer into Salome desktop // File : SVTK_KeyFreeInteractorStyle.h // Author : Christophe ATTANASIO -// Module : SALOME -// $Header$ -// + #ifndef __SVTK_KeyFreeInteractorStyle_h #define __SVTK_KeyFreeInteractorStyle_h - #include "SVTK.h" #include "SVTK_InteractorStyle.h" diff --git a/src/SVTK/SVTK_NonIsometricDlg.cxx b/src/SVTK/SVTK_NonIsometricDlg.cxx index 713a94770..2ee641265 100644 --- a/src/SVTK/SVTK_NonIsometricDlg.cxx +++ b/src/SVTK/SVTK_NonIsometricDlg.cxx @@ -23,9 +23,7 @@ // SALOME VTKViewer : build VTK viewer into Salome desktop // File : // Author : -// Module : SALOME -// $Header$ -// + #include "SVTK_NonIsometricDlg.h" #include "SVTK_ViewWindow.h" #include "SVTK_Renderer.h" @@ -38,8 +36,6 @@ #include #include -using namespace std; - /*! Constructor */ diff --git a/src/SVTK/SVTK_NonIsometricDlg.h b/src/SVTK/SVTK_NonIsometricDlg.h index 8a10fd328..9048d7a93 100644 --- a/src/SVTK/SVTK_NonIsometricDlg.h +++ b/src/SVTK/SVTK_NonIsometricDlg.h @@ -23,9 +23,7 @@ // SALOME VTKViewer : build VTK viewer into Salome desktop // File : // Author : -// Module : SALOME -// $Header$ -// + #ifndef SVTK_NONISOMETRICDLG_H #define SVTK_NONISOMETRICDLG_H diff --git a/src/SVTK/SVTK_Prs.cxx b/src/SVTK/SVTK_Prs.cxx index 8e9f25bf2..042eb4ee8 100644 --- a/src/SVTK/SVTK_Prs.cxx +++ b/src/SVTK/SVTK_Prs.cxx @@ -23,15 +23,11 @@ // SALOME VTKViewer : build VTK viewer into Salome desktop // File : SVTK_Prs.cxx // Author : Sergey ANIKIN -// Module : SALOME -// $Header$ -// + #include "SVTK_Prs.h" #include -using namespace std; - /*! Default constructor */ diff --git a/src/SVTK/SVTK_Prs.h b/src/SVTK/SVTK_Prs.h index 4d1228e66..959d90725 100644 --- a/src/SVTK/SVTK_Prs.h +++ b/src/SVTK/SVTK_Prs.h @@ -23,9 +23,7 @@ // SALOME VTKViewer : build VTK viewer into Salome desktop // File : SVTK_Prs.h // Author : Sergey ANIKIN -// Module : SALOME -// $Header$ -// + #ifndef SVTK_Prs_H #define SVTK_Prs_H diff --git a/src/SVTK/SVTK_Recorder.cxx b/src/SVTK/SVTK_Recorder.cxx index 14e745611..afd0e674a 100755 --- a/src/SVTK/SVTK_Recorder.cxx +++ b/src/SVTK/SVTK_Recorder.cxx @@ -61,8 +61,7 @@ namespace const int theIndex, std::string& theName) { - using namespace std; - ostringstream aStream; + std::ostringstream aStream; aStream< /dev/null"; #else diff --git a/src/SVTK/SVTK_RenderWindowInteractor.cxx b/src/SVTK/SVTK_RenderWindowInteractor.cxx index 2433aa03c..200545c1f 100644 --- a/src/SVTK/SVTK_RenderWindowInteractor.cxx +++ b/src/SVTK/SVTK_RenderWindowInteractor.cxx @@ -23,11 +23,8 @@ // SALOME VTKViewer : build VTK viewer into Salome desktop // File : // Author : -// Module : SALOME -// $Header$ -// + #include "SVTK_RenderWindowInteractor.h" -//#include "SVTK_GenericRenderWindowInteractor.h" #include "SVTK_InteractorStyle.h" #include "SVTK_Renderer.h" @@ -57,8 +54,6 @@ #include #include -using namespace std; - static bool GENERATE_SUIT_EVENTS = true; static bool FOCUS_UNDER_MOUSE = false; diff --git a/src/SVTK/SVTK_RenderWindowInteractor.h b/src/SVTK/SVTK_RenderWindowInteractor.h index 0ce1499aa..3b14827a3 100644 --- a/src/SVTK/SVTK_RenderWindowInteractor.h +++ b/src/SVTK/SVTK_RenderWindowInteractor.h @@ -23,9 +23,7 @@ // SALOME VTKViewer : build VTK viewer into Salome desktop // File : // Author : -// Module : SALOME -// $Header$ -// + #ifndef SVTK_RenderWindowInteractor_h #define SVTK_RenderWindowInteractor_h diff --git a/src/SVTK/SVTK_Renderer.cxx b/src/SVTK/SVTK_Renderer.cxx index 4cfbb58e7..ce5d5c24e 100644 --- a/src/SVTK/SVTK_Renderer.cxx +++ b/src/SVTK/SVTK_Renderer.cxx @@ -23,9 +23,7 @@ // SALOME VTKViewer : build VTK viewer into Salome desktop // File : // Author : -// Module : -// $Header$ -// + #include "SVTK_Renderer.h" #include "SVTK_Trihedron.h" diff --git a/src/SVTK/SVTK_Renderer.h b/src/SVTK/SVTK_Renderer.h index 177b5fca8..23790d401 100644 --- a/src/SVTK/SVTK_Renderer.h +++ b/src/SVTK/SVTK_Renderer.h @@ -23,9 +23,7 @@ // SALOME VTKViewer : build VTK viewer into Salome desktop // File : // Author : -// Module : SALOME -// $Header$ -// + #ifndef SVTK_Renderer_h #define SVTK_Renderer_h diff --git a/src/SVTK/SVTK_Selection.h b/src/SVTK/SVTK_Selection.h index a5f68ea36..1f01a3c2a 100644 --- a/src/SVTK/SVTK_Selection.h +++ b/src/SVTK/SVTK_Selection.h @@ -23,9 +23,7 @@ // SALOME SALOMEGUI : implementation of desktop and GUI kernel // File : SALOME_Selection.h // Author : Nicolas REJNERI -// Module : SALOME -// $Header$ -// + #ifndef SVTK_SELECTION_H #define SVTK_SELECTION_H diff --git a/src/SVTK/SVTK_SelectionEvent.h b/src/SVTK/SVTK_SelectionEvent.h index 035236417..59f75799f 100644 --- a/src/SVTK/SVTK_SelectionEvent.h +++ b/src/SVTK/SVTK_SelectionEvent.h @@ -23,9 +23,7 @@ // SALOME SALOMEGUI : implementation of desktop and GUI kernel // File : SVTK_SelectionEvent.h // Author : -// Module : SALOME -// $Header$ -// + #ifndef SVTK_SELECTIONEVENT_H #define SVTK_SELECTIONEVENT_H diff --git a/src/SVTK/SVTK_Selector.cxx b/src/SVTK/SVTK_Selector.cxx index c5b039a51..d2d614e0c 100644 --- a/src/SVTK/SVTK_Selector.cxx +++ b/src/SVTK/SVTK_Selector.cxx @@ -23,9 +23,7 @@ // SALOME SALOMEGUI : implementation of desktop and GUI kernel // File : SALOME_Selection.cxx // Author : Nicolas REJNERI -// Module : SALOME -// $Header$ -// + #include "SVTK_SelectorDef.h" #include diff --git a/src/SVTK/SVTK_Selector.h b/src/SVTK/SVTK_Selector.h index 15b1678fc..22885dfe1 100644 --- a/src/SVTK/SVTK_Selector.h +++ b/src/SVTK/SVTK_Selector.h @@ -23,9 +23,7 @@ // SALOME SALOMEGUI : implementation of desktop and GUI kernel // File : SALOME_Selection.h // Author : Nicolas REJNERI -// Module : SALOME -// $Header$ -// + #ifndef SVTK_SELECTOR_H #define SVTK_SELECTOR_H diff --git a/src/SVTK/SVTK_SelectorDef.h b/src/SVTK/SVTK_SelectorDef.h index bb78d3f89..670e955f6 100644 --- a/src/SVTK/SVTK_SelectorDef.h +++ b/src/SVTK/SVTK_SelectorDef.h @@ -23,9 +23,7 @@ // SALOME SALOMEGUI : implementation of desktop and GUI kernel // File : SALOME_Selection.h // Author : Nicolas REJNERI -// Module : SALOME -// $Header$ -// + #ifndef SVTK_SELECTORDEF_H #define SVTK_SELECTORDEF_H diff --git a/src/SVTK/SVTK_SetRotationPointDlg.cxx b/src/SVTK/SVTK_SetRotationPointDlg.cxx index 1448c54ef..f9f65940a 100755 --- a/src/SVTK/SVTK_SetRotationPointDlg.cxx +++ b/src/SVTK/SVTK_SetRotationPointDlg.cxx @@ -23,9 +23,7 @@ // SALOME VTKViewer : build VTK viewer into Salome desktop // File : // Author : -// Module : SALOME -// $Header$ -// + #include "SVTK_SetRotationPointDlg.h" #include "SVTK_ViewWindow.h" #include "SVTK_RenderWindowInteractor.h" @@ -46,8 +44,6 @@ #include -using namespace std; - /*! Constructor */ diff --git a/src/SVTK/SVTK_SetRotationPointDlg.h b/src/SVTK/SVTK_SetRotationPointDlg.h index 8ed9c937a..ae1eee585 100755 --- a/src/SVTK/SVTK_SetRotationPointDlg.h +++ b/src/SVTK/SVTK_SetRotationPointDlg.h @@ -23,9 +23,7 @@ // SALOME VTKViewer : build VTK viewer into Salome desktop // File : // Author : -// Module : SALOME -// $Header$ -// + #ifndef SVTK_SETROTATIONPOINTDLG_H #define SVTK_SETROTATIONPOINTDLG_H diff --git a/src/SVTK/SVTK_SpaceMouse.cxx b/src/SVTK/SVTK_SpaceMouse.cxx index 8ea559f86..25fec8ffd 100644 --- a/src/SVTK/SVTK_SpaceMouse.cxx +++ b/src/SVTK/SVTK_SpaceMouse.cxx @@ -23,9 +23,7 @@ // SALOME VTKViewer : build VTK viewer into Salome desktop // File : SVTK_SpaceMouse.cxx // Author : Alexander SLADKOV -// Module : SALOME -// $Header$ -// + #include #include #include diff --git a/src/SVTK/SVTK_SpaceMouse.h b/src/SVTK/SVTK_SpaceMouse.h index 838c4435a..baa7009ec 100644 --- a/src/SVTK/SVTK_SpaceMouse.h +++ b/src/SVTK/SVTK_SpaceMouse.h @@ -23,9 +23,7 @@ // SALOME VTKViewer : build VTK viewer into Salome desktop // File : SVTK_SpaceMouse.h // Author : Alexander SLADKOV -// Module : SALOME -// $Header$ -// + #ifndef SVTK_SpaceMouse_h #define SVTK_SpaceMouse_h diff --git a/src/SVTK/SVTK_UpdateRateDlg.cxx b/src/SVTK/SVTK_UpdateRateDlg.cxx index 30907890d..453b03408 100644 --- a/src/SVTK/SVTK_UpdateRateDlg.cxx +++ b/src/SVTK/SVTK_UpdateRateDlg.cxx @@ -23,9 +23,7 @@ // SALOME VTKViewer : build VTK viewer into Salome desktop // File : // Author : -// Module : SALOME -// $Header$ -// + #include "SVTK_UpdateRateDlg.h" #include "SVTK_ViewWindow.h" @@ -54,8 +52,6 @@ static vtkFloatingPointType OFF_UPDATE_RATE = 0.00001; static vtkFloatingPointType FLOAT_TOLERANCE = 1.0 / VTK_LARGE_FLOAT; -using namespace std; - namespace { //---------------------------------------------------------------------------- diff --git a/src/SVTK/SVTK_UpdateRateDlg.h b/src/SVTK/SVTK_UpdateRateDlg.h index 7b3719a74..2fe398cb8 100644 --- a/src/SVTK/SVTK_UpdateRateDlg.h +++ b/src/SVTK/SVTK_UpdateRateDlg.h @@ -23,9 +23,7 @@ // SALOME VTKViewer : build VTK viewer into Salome desktop // File : // Author : -// Module : SALOME -// $Header$ -// + #ifndef SVTK_UPDATERATEDLG_H #define SVTK_UPDATERATEDLG_H diff --git a/src/SVTK/SVTK_View.cxx b/src/SVTK/SVTK_View.cxx index 0b00015ce..5db2c2349 100644 --- a/src/SVTK/SVTK_View.cxx +++ b/src/SVTK/SVTK_View.cxx @@ -23,9 +23,7 @@ // SALOME VTKViewer : build VTK viewer into Salome desktop // File : // Author : -// Module : SALOME -// $Header$ -// + #include "SALOME_Actor.h" #include "SVTK_View.h" diff --git a/src/SVTK/SVTK_ViewParameterDlg.cxx b/src/SVTK/SVTK_ViewParameterDlg.cxx index 5d3d1474a..4d2880d64 100755 --- a/src/SVTK/SVTK_ViewParameterDlg.cxx +++ b/src/SVTK/SVTK_ViewParameterDlg.cxx @@ -20,9 +20,7 @@ // SALOME VTKViewer : build VTK viewer into Salome desktop // File : // Author : -// Module : SALOME -// $Header: -// + #include "SVTK_ViewParameterDlg.h" #include "SVTK_ViewWindow.h" #include "SVTK_RenderWindowInteractor.h" @@ -48,8 +46,6 @@ #include #include -using namespace std; - /*! Constructor */ diff --git a/src/SVTK/SVTK_ViewParameterDlg.h b/src/SVTK/SVTK_ViewParameterDlg.h index a540dc3c7..daa73802f 100755 --- a/src/SVTK/SVTK_ViewParameterDlg.h +++ b/src/SVTK/SVTK_ViewParameterDlg.h @@ -20,9 +20,7 @@ // SALOME VTKViewer : build VTK viewer into Salome desktop // File : // Author : -// Module : SALOME -// $Header: -// + #ifndef SVTK_VIEWPARAMETERDLG_H #define SVTK_VIEWPARAMETERDLG_H diff --git a/src/SalomeApp/SalomeApp_ImportOperation.cxx b/src/SalomeApp/SalomeApp_ImportOperation.cxx index 0f6e8e33d..0fedc5813 100644 --- a/src/SalomeApp/SalomeApp_ImportOperation.cxx +++ b/src/SalomeApp/SalomeApp_ImportOperation.cxx @@ -23,16 +23,10 @@ // SALOME SALOMEGUI : implementation of desktop and GUI kernel // File : SALOMEGUI_ImportOperation.cxx // Author : Nicolas REJNERI -// Module : SALOME -// $Header$ -// + #include "SalomeApp_ImportOperation.h" #include -#ifndef WIN32 -using namespace std; -#endif - /*!Constructor. Do nothing.*/ SalomeApp_ImportOperation::SalomeApp_ImportOperation( SUIT_Application* app ) : SUIT_Operation( app ) diff --git a/src/SalomeApp/SalomeApp_ImportOperation.h b/src/SalomeApp/SalomeApp_ImportOperation.h index 02bd28aec..6c23b7c3a 100644 --- a/src/SalomeApp/SalomeApp_ImportOperation.h +++ b/src/SalomeApp/SalomeApp_ImportOperation.h @@ -23,9 +23,7 @@ // SALOME SALOMEAPP : implementation of desktop and GUI kernel // File : SalomeApp_ImportOperation.h // Author : Nicolas REJNERI -// Module : SALOME -// $Header$ -// + #if !defined SALOMEAPP_IMPORTOPERATION #define SALOMEAPP_IMPORTOPERATION diff --git a/src/SalomeApp/SalomeApp_NoteBookDlg.cxx b/src/SalomeApp/SalomeApp_NoteBookDlg.cxx index 587a1e39d..212b5c946 100644 --- a/src/SalomeApp/SalomeApp_NoteBookDlg.cxx +++ b/src/SalomeApp/SalomeApp_NoteBookDlg.cxx @@ -55,8 +55,6 @@ #include #include -using namespace std; - #define DEFAULT_MARGIN 11 #define DEFAULT_SPACING 6 #define SPACER_SIZE 120 @@ -292,7 +290,7 @@ bool NoteBook_TableRow::IsValidStringValue(const QString theValue) PyConsole_Console* pyConsole = app->pythonConsole(); PyConsole_Interp* pyInterp = pyConsole->getInterp(); PyLockWrapper aLock = pyInterp->GetLockWrapper(); - string command = "import salome_notebook ; "; + std::string command = "import salome_notebook ; "; command += "salome_notebook.checkThisNoteBook("; for( int i = 0, n = aLastRowIsEmpty ? aNumRows - 1 : aNumRows; i < n; i++ ) { command += myParentTable->myRows[i]->GetName().toStdString(); @@ -409,7 +407,7 @@ void NoteBook_Table::Init(_PTR(Study) theStudy) myVariableMap.clear(); //Add all variables into the table - vector aVariables = theStudy->GetVariableNames(); + std::vector aVariables = theStudy->GetVariableNames(); for(int iVar = 0; iVar < aVariables.size(); iVar++ ) { AddRow(QString(aVariables[iVar].c_str()), Variable2String(aVariables[iVar],theStudy)); @@ -429,7 +427,7 @@ void NoteBook_Table::Init(_PTR(Study) theStudy) * Purpose : Convert variable values to QString */ //============================================================================ -QString NoteBook_Table::Variable2String(const string& theVarName, +QString NoteBook_Table::Variable2String(const std::string& theVarName, _PTR(Study) theStudy) { QString aResult; @@ -467,7 +465,7 @@ bool NoteBook_Table::IsValid() const PyConsole_Console* pyConsole = app->pythonConsole(); PyConsole_Interp* pyInterp = pyConsole->getInterp(); PyLockWrapper aLock = pyInterp->GetLockWrapper(); - string command = "import salome_notebook ; "; + std::string command = "import salome_notebook ; "; command += "salome_notebook.checkThisNoteBook("; for( int i = 0, n = aLastRowIsEmpty ? aNumRows - 1 : aNumRows; i < n; i++ ) { @@ -572,7 +570,7 @@ void NoteBook_Table::onItemChanged(QTableWidgetItem* theItem) if( myVariableMap.contains( anIndex ) ) { const NoteBoox_Variable& aVariable = myVariableMap[ anIndex ]; - if( !aVariable.Name.isEmpty() && myStudy->IsVariableUsed( string( aVariable.Name.toLatin1().constData() ) ) ) + if( !aVariable.Name.isEmpty() && myStudy->IsVariableUsed( std::string( aVariable.Name.toLatin1().constData() ) ) ) { if( QMessageBox::warning( parentWidget(), tr( "WARNING" ), tr( "RENAME_VARIABLE_IS_USED" ).arg( aVariable.Name ), @@ -681,7 +679,7 @@ void NoteBook_Table::RemoveSelected() else { int nRow = row(aSelectedItems[i]); - if( myStudy->IsVariableUsed( string( aRow->GetName().toLatin1().constData() ) ) ) + if( myStudy->IsVariableUsed( std::string( aRow->GetName().toLatin1().constData() ) ) ) { if( QMessageBox::warning( parentWidget(), tr( "WARNING" ), tr( "REMOVE_VARIABLE_IS_USED" ).arg( aRow->GetName() ), @@ -916,7 +914,7 @@ void SalomeApp_NoteBookDlg::onApply() if( aVariableMapRef.contains( anIndex ) ) { QString aRemovedVariable = aVariableMapRef[ anIndex ].Name; - myStudy->RemoveVariable( string( aRemovedVariable.toLatin1().constData() ) ); + myStudy->RemoveVariable( std::string( aRemovedVariable.toLatin1().constData() ) ); } } @@ -938,22 +936,22 @@ void SalomeApp_NoteBookDlg::onApply() if( !aNameRef.isEmpty() && !aValueRef.isEmpty() && aNameRef != aName ) { - myStudy->RenameVariable( string( aNameRef.toLatin1().constData() ), - string( aName.toLatin1().constData() ) ); + myStudy->RenameVariable( std::string( aNameRef.toLatin1().constData() ), + std::string( aName.toLatin1().constData() ) ); } } if( NoteBook_TableRow::IsIntegerValue(aValue,&anIVal) ) - myStudy->SetInteger(string(aName.toLatin1().constData()),anIVal); + myStudy->SetInteger(std::string(aName.toLatin1().constData()),anIVal); else if( NoteBook_TableRow::IsRealValue(aValue,&aDVal) ) - myStudy->SetReal(string(aName.toLatin1().constData()),aDVal); + myStudy->SetReal(std::string(aName.toLatin1().constData()),aDVal); else if( NoteBook_TableRow::IsBooleanValue(aValue,&aBVal) ) - myStudy->SetBoolean(string(aName.toLatin1().constData()),aBVal); + myStudy->SetBoolean(std::string(aName.toLatin1().constData()),aBVal); else - myStudy->SetString(string(aName.toLatin1().constData()),aValue.toStdString()); + myStudy->SetString(std::string(aName.toLatin1().constData()),aValue.toStdString()); } } myTable->ResetMaps(); diff --git a/src/SalomeApp/SalomeApp_PyInterp.cxx b/src/SalomeApp/SalomeApp_PyInterp.cxx index a89b080bd..8d3a10cc5 100755 --- a/src/SalomeApp/SalomeApp_PyInterp.cxx +++ b/src/SalomeApp/SalomeApp_PyInterp.cxx @@ -23,9 +23,7 @@ // SALOME SALOMEGUI : implementation of desktop and GUI kernel // File : SalomeApp_PyInterp.cxx // Author : Nicolas REJNERI -// Module : SALOME -// $Header$ -// + #include "SalomeApp_PyInterp.h" #include @@ -33,8 +31,6 @@ #include "PyInterp.h" // this include must be first (see PyInterp_base.h)! -using namespace std; - /*! * constructor : multi Python interpreter, one per SALOME study. * calls initialize method defined in base class, which calls virtual methods diff --git a/src/SalomeApp/SalomeApp_PyInterp.h b/src/SalomeApp/SalomeApp_PyInterp.h index 43ad905a2..e4d995e17 100755 --- a/src/SalomeApp/SalomeApp_PyInterp.h +++ b/src/SalomeApp/SalomeApp_PyInterp.h @@ -23,9 +23,7 @@ // SALOME SALOMEGUI : implementation of desktop and GUI kernel // File : SalomeApp_PyInterp.h // Author : Nicolas REJNERI -// Module : SALOME -// $Header$ -// + #ifndef _SalomeApp_PYINTERP_H_ #define _SalomeApp_PYINTERP_H_ diff --git a/src/SalomeApp/SalomeApp_StudyPropertiesDlg.cxx b/src/SalomeApp/SalomeApp_StudyPropertiesDlg.cxx index 5233289e5..873a11712 100644 --- a/src/SalomeApp/SalomeApp_StudyPropertiesDlg.cxx +++ b/src/SalomeApp/SalomeApp_StudyPropertiesDlg.cxx @@ -23,9 +23,7 @@ // SALOME SalomeApp // File : SalomeApp_StudyPropertiesDlg.cxx // Author : Roman NIKOLAEV -// Module : SALOME -// $Header$ -// + #include "SalomeApp_StudyPropertiesDlg.h" #include "SalomeApp_Study.h" diff --git a/src/SalomeApp/Test/SalomeAppTest.cxx b/src/SalomeApp/Test/SalomeAppTest.cxx index d9cac56a9..6a68508ce 100644 --- a/src/SalomeApp/Test/SalomeAppTest.cxx +++ b/src/SalomeApp/Test/SalomeAppTest.cxx @@ -22,8 +22,6 @@ #include "SalomeAppTest.hxx" -using namespace std; - // ============================================================================ /*! * Set up the environment diff --git a/src/Session/SALOME_Session_Server.cxx b/src/Session/SALOME_Session_Server.cxx index 8a359d6df..06621c071 100755 --- a/src/Session/SALOME_Session_Server.cxx +++ b/src/Session/SALOME_Session_Server.cxx @@ -455,7 +455,7 @@ int main( int argc, char **argv ) const char *p = tc->name(); INFOS ( "run(): CORBA exception of the kind : "< @@ -41,8 +39,6 @@ #include -using namespace std; - /*! Constructor */ @@ -115,7 +111,7 @@ CORBA::Boolean SalomeApp_Engine_i::Load (SALOMEDS::SComponent_ptr theComponent, const char* theURL, bool isMultiFile) { - cout << "SalomeApp_Engine_i::Load() isMultiFile = " << isMultiFile << endl; + std::cout << "SalomeApp_Engine_i::Load() isMultiFile = " << isMultiFile << std::endl; if (CORBA::is_nil(theComponent) || CORBA::is_nil(theComponent->GetStudy())) return false; diff --git a/src/Session/SalomeApp_Engine_i.hxx b/src/Session/SalomeApp_Engine_i.hxx index e9030cbb7..84138b824 100755 --- a/src/Session/SalomeApp_Engine_i.hxx +++ b/src/Session/SalomeApp_Engine_i.hxx @@ -23,9 +23,7 @@ // SalomeApp_Engine_i : implementation of SalomeApp_Engine.idl // File : SalomeApp_Engine_i.hxx // Author : Alexander SLADKOV -// Module : SALOME -// $Header$ -// + #ifndef _SALOMEAPP_ENGINE_I_HXX_ #define _SALOMEAPP_ENGINE_I_HXX_ diff --git a/src/Session/Session_ServerLauncher.cxx b/src/Session/Session_ServerLauncher.cxx index 71a8503aa..7f715812f 100755 --- a/src/Session/Session_ServerLauncher.cxx +++ b/src/Session/Session_ServerLauncher.cxx @@ -23,9 +23,7 @@ // SALOME Session : implementation of Session_ServerLauncher.cxx // File : Session_ServerLauncher.xx // Author : Paul RASCLE, EDF -// Module : SALOME -// $Header$ -// + #include "Session_ServerLauncher.hxx" #include "Session_ServerThread.hxx" @@ -35,7 +33,6 @@ #include #include -using namespace std; /*! default constructor not for use */ @@ -153,8 +150,8 @@ void Session_ServerLauncher::CheckArgs() { INFOS("parenthesis '(' is required here..."); for (int i=0; i::iterator itServ; + std::list::iterator itServ; for (itServ = _argServToLaunch.begin(); itServ !=_argServToLaunch.end(); itServ++) { int argc = 2 + (*itServ)._lastArg - (*itServ)._firstArg; @@ -239,7 +236,7 @@ void Session_ServerLauncher::ActivateAll() void Session_ServerLauncher::KillAll() { MESSAGE("Session_ServerLauncher::KillAll()"); - list::reverse_iterator itServ; + std::list::reverse_iterator itServ; for (itServ = _serverThreads.rbegin(); itServ !=_serverThreads.rend(); itServ++) { delete (*itServ); diff --git a/src/Session/Session_ServerLauncher.hxx b/src/Session/Session_ServerLauncher.hxx index 019919b00..a992d6da9 100755 --- a/src/Session/Session_ServerLauncher.hxx +++ b/src/Session/Session_ServerLauncher.hxx @@ -23,9 +23,7 @@ // SALOME Session : implementation of Session_ServerLauncher.hxx // File : Session_ServerLauncher.hxx // Author : Paul RASCLE, EDF -// Module : SALOME -// $Header$ -// + #ifndef _SESSION_SERVERLAUNCHER_HXX_ #define _SESSION_SERVERLAUNCHER_HXX_ @@ -37,8 +35,6 @@ #include #include -using namespace std; - class SESSION_EXPORT ServArg { public: @@ -78,17 +74,17 @@ protected: void ActivateAll(); private: - int _argc; - char ** _argv; - CORBA::ORB_var _orb; - PortableServer::POA_var _root_poa; - QMutex* _GUIMutex; - QWaitCondition* _ServerLaunch; - QMutex* _SessionMutex; - QWaitCondition* _SessionStarted; - list _argServToLaunch; - vector _argCopy; - list _serverThreads; + int _argc; + char** _argv; + CORBA::ORB_var _orb; + PortableServer::POA_var _root_poa; + QMutex* _GUIMutex; + QWaitCondition* _ServerLaunch; + QMutex* _SessionMutex; + QWaitCondition* _SessionStarted; + std::list _argServToLaunch; + std::vector _argCopy; + std::list _serverThreads; }; #endif diff --git a/src/Session/Session_ServerThread.cxx b/src/Session/Session_ServerThread.cxx index d15820848..d44aa3477 100755 --- a/src/Session/Session_ServerThread.cxx +++ b/src/Session/Session_ServerThread.cxx @@ -23,12 +23,7 @@ // SALOME Session : implementation of Session_ServerThread.cxx // File : Session_ServerThread.cxx // Author : Paul RASCLE, EDF -// Module : SALOME -// $Header$ -// #include -// #include CORBA_SERVER_HEADER(SALOME_Session) -// #include CORBA_SERVER_HEADER(SALOMEDS) -// + #include "Session_ServerThread.hxx" #include @@ -53,8 +48,6 @@ #include #include -using namespace std; - const int Session_ServerThread::NB_SRV_TYP = 6; const char* Session_ServerThread::_serverTypes[NB_SRV_TYP] = {"Container", "ModuleCatalog", @@ -149,7 +142,7 @@ void Session_ServerThread::Init() case 4: // Session { NamingService_WaitForServerReadiness(_NS,"/myStudyManager"); - string containerName = "/Containers/"; + std::string containerName = "/Containers/"; containerName = containerName + Kernel_Utils::GetHostname(); containerName = containerName + "/FactoryServer"; NamingService_WaitForServerReadiness(_NS,containerName); @@ -275,7 +268,7 @@ void Session_ServerThread::ActivateRegistry(int argc, } catch( const CORBA::Exception &/*exx*/ ) { } - string absoluteName = string("/") + registryName; + std::string absoluteName = std::string("/") + registryName; _NS->Register( varComponents , absoluteName.c_str() ); } catch( const SALOME_Exception &ex ) { @@ -289,7 +282,7 @@ void Session_ServerThread::ActivateContainerManager(int argc, { try { PortableServer::POA_var root_poa=PortableServer::POA::_the_root_poa(); - cout << "Activate SalomeLauncher ......!!!! " << endl; + std::cout << "Activate SalomeLauncher ......!!!! " << std::endl; new SALOME_Launcher(_orb,root_poa); } catch(CORBA::SystemException&) { diff --git a/src/Session/Session_ServerThread.hxx b/src/Session/Session_ServerThread.hxx index fd6d9b093..d4f83aaef 100755 --- a/src/Session/Session_ServerThread.hxx +++ b/src/Session/Session_ServerThread.hxx @@ -23,9 +23,7 @@ // SALOME Session : implementation of Session_ServerThread.hxx // File : Session_ServerThread.hxx // Author : Paul RASCLE, EDF -// Module : SALOME -// $Header$ -// + #ifndef _SESSION_SERVERTHREAD_HXX_ #define _SESSION_SERVERTHREAD_HXX_ @@ -34,9 +32,7 @@ #include #include -using namespace std; - -void WaitForServerReadiness(string serverName); +void WaitForServerReadiness(std::string serverName); class SALOME_NamingService; @@ -78,11 +74,11 @@ class SESSION_EXPORT Session_SessionThread : public Session_ServerThread public: Session_SessionThread() {} Session_SessionThread(int argc, - char** argv, - CORBA::ORB_ptr orb, - PortableServer::POA_ptr poa, - QMutex* GUIMutex, - QWaitCondition* GUILauncher); + char** argv, + CORBA::ORB_ptr orb, + PortableServer::POA_ptr poa, + QMutex* GUIMutex, + QWaitCondition* GUILauncher); virtual ~Session_SessionThread(); protected: diff --git a/src/Session/Session_Session_i.cxx b/src/Session/Session_Session_i.cxx index 389d6f33c..a8a5c9641 100755 --- a/src/Session/Session_Session_i.cxx +++ b/src/Session/Session_Session_i.cxx @@ -47,9 +47,6 @@ # include #endif - -using namespace std; - /*! constructor */ @@ -258,7 +255,7 @@ CORBA::Long SALOME_Session_i::getPID() { char* SALOME_Session_i::getHostname() { - string aHostName = Kernel_Utils::GetHostname(); + std::string aHostName = Kernel_Utils::GetHostname(); return CORBA::string_dup( aHostName.data() ); } diff --git a/src/TOOLSGUI/ToolsGUI_CatalogGeneratorDlg.cxx b/src/TOOLSGUI/ToolsGUI_CatalogGeneratorDlg.cxx index d37f1782a..4e7a99ec3 100755 --- a/src/TOOLSGUI/ToolsGUI_CatalogGeneratorDlg.cxx +++ b/src/TOOLSGUI/ToolsGUI_CatalogGeneratorDlg.cxx @@ -50,8 +50,6 @@ #include "utilities.h" -using namespace std; - #define SPACING_SIZE 6 #define MARGIN_SIZE 11 #define MIN_EDIT_SIZE 250 diff --git a/src/VTKViewer/VTKViewer.cxx b/src/VTKViewer/VTKViewer.cxx index 6489e3975..6fcd15bb9 100644 --- a/src/VTKViewer/VTKViewer.cxx +++ b/src/VTKViewer/VTKViewer.cxx @@ -23,9 +23,7 @@ // SALOME VTKViewer : build VTK viewer into Salome desktop // File : // Author : -// Module : -// $Header$ -// + #include "VTKViewer_Actor.h" #include "VTKViewer_ExtractUnstructuredGrid.h" #include "VTKViewer_ConvexTool.h" diff --git a/src/VTKViewer/VTKViewer_Actor.cxx b/src/VTKViewer/VTKViewer_Actor.cxx index d5c9a6603..fd54a793a 100755 --- a/src/VTKViewer/VTKViewer_Actor.cxx +++ b/src/VTKViewer/VTKViewer_Actor.cxx @@ -23,15 +23,12 @@ // SALOME OBJECT : implementation of interactive object visualization for OCC and VTK viewers // File : SALOME_Actor.cxx // Author : Nicolas REJNERI -// Module : SALOME -// $Header$ -// + /*! \class SALOME_Actor SALOME_Actor.h \brief Abstract class of SALOME Objects in VTK. */ - #include "VTKViewer_Actor.h" #include "VTKViewer_Transform.h" @@ -47,8 +44,6 @@ #include #include -using namespace std; - #if defined __GNUC__ #if __GNUC__ == 2 #define __GNUC_2__ diff --git a/src/VTKViewer/VTKViewer_Actor.h b/src/VTKViewer/VTKViewer_Actor.h index e2d026211..8ab7dc82a 100755 --- a/src/VTKViewer/VTKViewer_Actor.h +++ b/src/VTKViewer/VTKViewer_Actor.h @@ -23,9 +23,7 @@ // SALOME OBJECT : implementation of interactive object visualization for OCC and VTK viewers // File : SALOME_Actor.h // Author : Nicolas REJNERI -// Module : SALOME -// $Header$ -// + #ifndef VTKVIEVER_ACTOR_H #define VTKVIEVER_ACTOR_H diff --git a/src/VTKViewer/VTKViewer_Algorithm.h b/src/VTKViewer/VTKViewer_Algorithm.h index e81db825e..4ebc6f80e 100644 --- a/src/VTKViewer/VTKViewer_Algorithm.h +++ b/src/VTKViewer/VTKViewer_Algorithm.h @@ -23,9 +23,7 @@ // SALOME VTKViewer : build VTK viewer into Salome desktop // File : VTKViewer_ViewFrame.h // Author : Nicolas REJNERI -// Module : SALOME -// $Header$ -// + #ifndef VTKViewer_Algorithm_H #define VTKViewer_Algorithm_H diff --git a/src/VTKViewer/VTKViewer_AppendFilter.cxx b/src/VTKViewer/VTKViewer_AppendFilter.cxx index 8b685a591..c71697a79 100644 --- a/src/VTKViewer/VTKViewer_AppendFilter.cxx +++ b/src/VTKViewer/VTKViewer_AppendFilter.cxx @@ -23,9 +23,7 @@ // SALOME OBJECT : kernel of SALOME component // File : VTKViewer_GeometryFilter.cxx // Author : -// Module : SALOME -// $Header$ -// + #include "VTKViewer_AppendFilter.h" #include diff --git a/src/VTKViewer/VTKViewer_CellLocationsArray.cxx b/src/VTKViewer/VTKViewer_CellLocationsArray.cxx index 2e654989e..d78e9b1d5 100644 --- a/src/VTKViewer/VTKViewer_CellLocationsArray.cxx +++ b/src/VTKViewer/VTKViewer_CellLocationsArray.cxx @@ -23,9 +23,7 @@ // SALOME OBJECT : implementation of interactive object visualization for OCC and VTK viewers // File : // Author : -// Module : -// $Header$ -// + #include "VTKViewer_CellLocationsArray.h" #include diff --git a/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.cxx b/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.cxx index f9748c5f0..1a8261e49 100755 --- a/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.cxx +++ b/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.cxx @@ -20,11 +20,9 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// VISU CONVERTOR : -// File: VISU_ExtractUnstructuredGrid.cxx +// File: VTKViewer_ExtractUnstructuredGrid.cxx // Author: Alexey PETROV -// Module : VISU -// + #include "VTKViewer_ExtractUnstructuredGrid.h" #include "VTKViewer_CellLocationsArray.h" @@ -40,8 +38,6 @@ #include "utilities.h" -using namespace std; - #if defined __GNUC__ #if __GNUC__ == 2 #define __GNUC_2__ diff --git a/src/VTKViewer/VTKViewer_Filter.cxx b/src/VTKViewer/VTKViewer_Filter.cxx index 2f1908a7a..a6d446494 100755 --- a/src/VTKViewer/VTKViewer_Filter.cxx +++ b/src/VTKViewer/VTKViewer_Filter.cxx @@ -23,10 +23,8 @@ // VTKViewer_Filter : Filter for VTK viewer // File : VTKViewer_Filter.cxx // Author : Sergey LITONIN -// Module : SALOME -// + #include "VTKViewer_Filter.h" -using namespace std; IMPLEMENT_STANDARD_HANDLE(VTKViewer_Filter, MMgt_TShared) IMPLEMENT_STANDARD_RTTIEXT(VTKViewer_Filter, MMgt_TShared) diff --git a/src/VTKViewer/VTKViewer_Functor.h b/src/VTKViewer/VTKViewer_Functor.h index e63f6f40d..c4c33a374 100644 --- a/src/VTKViewer/VTKViewer_Functor.h +++ b/src/VTKViewer/VTKViewer_Functor.h @@ -23,9 +23,7 @@ // SALOME VTKViewer : build VTK viewer into Salome desktop // File : VTKViewer_ViewFrame.h // Author : Nicolas REJNERI -// Module : SALOME -// $Header$ -// + #ifndef VTKViewer_Functor_H #define VTKViewer_Functor_H diff --git a/src/VTKViewer/VTKViewer_InteractorStyle.cxx b/src/VTKViewer/VTKViewer_InteractorStyle.cxx index 573b73387..692c3e313 100644 --- a/src/VTKViewer/VTKViewer_InteractorStyle.cxx +++ b/src/VTKViewer/VTKViewer_InteractorStyle.cxx @@ -23,8 +23,7 @@ // SALOME VTKViewer : build VTK viewer into Salome desktop // File : VTKViewer_InteractorStyle.cxx // Author : Christophe ATTANASIO -// Module : SALOME -// + #include "VTKViewer_InteractorStyle.h" #include "VTKViewer_Actor.h" @@ -34,8 +33,6 @@ #include "VTKViewer_RenderWindow.h" #include "VTKViewer_RenderWindowInteractor.h" -//#include "SALOME_Actor.h" - #include #include #include @@ -55,11 +52,6 @@ #include -//#include "utilities.h" - -using namespace std; - - /* static int GetEdgeId(vtkPicker *thePicker, SALOME_Actor *theActor, int theObjId){ int anEdgeId = -1; diff --git a/src/VTKViewer/VTKViewer_MarkerUtils.cxx b/src/VTKViewer/VTKViewer_MarkerUtils.cxx index 103930b6c..24a081a57 100755 --- a/src/VTKViewer/VTKViewer_MarkerUtils.cxx +++ b/src/VTKViewer/VTKViewer_MarkerUtils.cxx @@ -28,8 +28,6 @@ #include #include -using namespace std; - namespace VTK { bool LoadTextureData( const QString& theFileName, diff --git a/src/VTKViewer/VTKViewer_RenderWindowInteractor.cxx b/src/VTKViewer/VTKViewer_RenderWindowInteractor.cxx index 3009d35fd..72f99dfc0 100755 --- a/src/VTKViewer/VTKViewer_RenderWindowInteractor.cxx +++ b/src/VTKViewer/VTKViewer_RenderWindowInteractor.cxx @@ -26,19 +26,10 @@ #include "SUIT_ViewModel.h" #include "VTKViewer_ViewWindow.h" -//#include "SUIT_Application.h" -//#include "SUIT_Desktop.h" - -//#include "SALOME_Selection.h" #include "VTKViewer_Actor.h" #include "VTKViewer_Algorithm.h" #include "VTKViewer_Functor.h" -//#include -//#include -//#include -//#include - // VTK Includes #include #include diff --git a/src/VTKViewer/VTKViewer_ShrinkFilter.cxx b/src/VTKViewer/VTKViewer_ShrinkFilter.cxx index 14b573e47..13bf91e28 100755 --- a/src/VTKViewer/VTKViewer_ShrinkFilter.cxx +++ b/src/VTKViewer/VTKViewer_ShrinkFilter.cxx @@ -23,9 +23,7 @@ // SALOME OBJECT : kernel of SALOME component // File : SALOME_GeometryFilter.cxx // Author : Michael ZORIN -// Module : SALOME -// $Header$ -// + #include "VTKViewer_ShrinkFilter.h" #include diff --git a/src/VTKViewer/VTKViewer_Utilities.cxx b/src/VTKViewer/VTKViewer_Utilities.cxx index ba3c8f8c9..5707faa14 100755 --- a/src/VTKViewer/VTKViewer_Utilities.cxx +++ b/src/VTKViewer/VTKViewer_Utilities.cxx @@ -32,8 +32,6 @@ #include #include -using namespace std; - /*!@see vtkRenderer::ResetCamera(vtkFloatingPointType bounds[6]) method*/ void ResetCamera(vtkRenderer* theRenderer, @@ -53,8 +51,8 @@ ResetCamera(vtkRenderer* theRenderer, static vtkFloatingPointType MIN_DISTANCE = 1.0 / VTK_LARGE_FLOAT; vtkFloatingPointType aLength = aBounds[1]-aBounds[0]; - aLength = max((aBounds[3]-aBounds[2]),aLength); - aLength = max((aBounds[5]-aBounds[4]),aLength); + aLength = std::max((aBounds[3]-aBounds[2]),aLength); + aLength = std::max((aBounds[5]-aBounds[4]),aLength); if(aLength < MIN_DISTANCE) return; @@ -137,13 +135,13 @@ ComputeVisiblePropBounds(vtkRenderer* theRenderer, { aCount++; - theBounds[0] = min(aBounds[0],theBounds[0]); - theBounds[2] = min(aBounds[2],theBounds[2]); - theBounds[4] = min(aBounds[4],theBounds[4]); + theBounds[0] = std::min(aBounds[0],theBounds[0]); + theBounds[2] = std::min(aBounds[2],theBounds[2]); + theBounds[4] = std::min(aBounds[4],theBounds[4]); - theBounds[1] = max(aBounds[1],theBounds[1]); - theBounds[3] = max(aBounds[3],theBounds[3]); - theBounds[5] = max(aBounds[5],theBounds[5]); + theBounds[1] = std::max(aBounds[1],theBounds[1]); + theBounds[3] = std::max(aBounds[3],theBounds[3]); + theBounds[5] = std::max(aBounds[5],theBounds[5]); }//not bogus } @@ -209,8 +207,8 @@ ComputeTrihedronSize( vtkRenderer* theRenderer, vtkFloatingPointType aLength = 0; aLength = bnd[ 1 ]-bnd[ 0 ]; - aLength = max( ( bnd[ 3 ] - bnd[ 2 ] ),aLength ); - aLength = max( ( bnd[ 5 ] - bnd[ 4 ] ),aLength ); + aLength = std::max( ( bnd[ 3 ] - bnd[ 2 ] ),aLength ); + aLength = std::max( ( bnd[ 5 ] - bnd[ 4 ] ),aLength ); static vtkFloatingPointType EPS_SIZE = 5.0E-3; theNewSize = aLength * theSizeInPercents / 100.0; @@ -302,8 +300,8 @@ bool ComputeBBCenter(vtkRenderer* theRenderer, vtkFloatingPointType theCenter[3] static vtkFloatingPointType MIN_DISTANCE = 1.0 / VTK_LARGE_FLOAT; vtkFloatingPointType aLength = aNewBndBox[1]-aNewBndBox[0]; - aLength = max((aNewBndBox[3]-aNewBndBox[2]),aLength); - aLength = max((aNewBndBox[5]-aNewBndBox[4]),aLength); + aLength = std::max((aNewBndBox[3]-aNewBndBox[2]),aLength); + aLength = std::max((aNewBndBox[5]-aNewBndBox[4]),aLength); if(aLength < MIN_DISTANCE) return false; diff --git a/tools/vtkEDFOverloads/vtkEDFCutter.cxx b/tools/vtkEDFOverloads/vtkEDFCutter.cxx index 8cdcb8f9c..8a0f34c5a 100755 --- a/tools/vtkEDFOverloads/vtkEDFCutter.cxx +++ b/tools/vtkEDFOverloads/vtkEDFCutter.cxx @@ -35,8 +35,6 @@ #include #include -using namespace std; - class vtkEDFEdge { public : @@ -332,7 +330,7 @@ void vtkEDFCutter::AssembleOutputTriangles(vtkPolyData* inpd, toVisit.push_back(*(batch.begin())); - set triedAgain; + std::set triedAgain; while(toVisit.size() > 0) { -- 2.39.2