From 94874427fc954d5c60bde780c1fd34b1b024ad3e Mon Sep 17 00:00:00 2001 From: prascle Date: Mon, 8 Nov 2004 20:28:29 +0000 Subject: [PATCH] PR: portage CCRT, suppression -using namespace std- des includes, report instruction apres includes, dans les cxx --- .../Batch_APIInternalFailureException.cxx | 1 + src/Batch/Batch_BatchManager.cxx | 1 + src/Batch/Batch_BatchManager.hxx | 11 ++- src/Batch/Batch_BatchManagerCatalog.cxx | 1 + src/Batch/Batch_BatchManagerCatalog.hxx | 7 +- src/Batch/Batch_BatchManager_PBS.cxx | 1 + src/Batch/Batch_BatchManager_PBS.hxx | 6 +- src/Batch/Batch_BoolType.cxx | 1 + src/Batch/Batch_BoolType.hxx | 3 +- src/Batch/Batch_CharType.cxx | 1 + src/Batch/Batch_CharType.hxx | 3 +- src/Batch/Batch_ConnexionFailureException.cxx | 1 + src/Batch/Batch_ConnexionFailureException.hxx | 2 +- src/Batch/Batch_Couple.cxx | 1 + src/Batch/Batch_Couple.hxx | 13 ++- src/Batch/Batch_CoupleType.cxx | 1 + src/Batch/Batch_CoupleType.hxx | 5 +- src/Batch/Batch_Date.cxx | 1 + src/Batch/Batch_Date.hxx | 7 +- src/Batch/Batch_DateType.cxx | 1 + src/Batch/Batch_DateType.hxx | 3 +- src/Batch/Batch_Environnement.cxx | 1 + src/Batch/Batch_Environnement.hxx | 3 +- src/Batch/Batch_FactBatchManager.cxx | 1 + src/Batch/Batch_FactBatchManager.hxx | 9 +-- src/Batch/Batch_FactBatchManager_PBS.cxx | 1 + src/Batch/Batch_FactBatchManager_PBS.hxx | 3 - src/Batch/Batch_GenericException.cxx | 1 + src/Batch/Batch_GenericException.hxx | 7 +- src/Batch/Batch_GenericType.cxx | 1 + src/Batch/Batch_GenericType.hxx | 5 +- src/Batch/Batch_IntType.cxx | 1 + src/Batch/Batch_IntType.hxx | 3 +- src/Batch/Batch_InvalidArgumentException.cxx | 1 + src/Batch/Batch_InvalidKeyException.cxx | 1 + src/Batch/Batch_InvalidKeyException.hxx | 2 +- src/Batch/Batch_Job.cxx | 1 + src/Batch/Batch_Job.hxx | 6 +- src/Batch/Batch_JobId.cxx | 1 + src/Batch/Batch_JobId.hxx | 10 +-- src/Batch/Batch_JobInfo.cxx | 1 + src/Batch/Batch_JobInfo.hxx | 7 +- src/Batch/Batch_JobInfo_PBS.cxx | 1 + src/Batch/Batch_JobInfo_PBS.hxx | 4 +- src/Batch/Batch_Job_PBS.cxx | 1 + src/Batch/Batch_ListIsFullException.cxx | 1 + src/Batch/Batch_ListIsFullException.hxx | 2 +- src/Batch/Batch_LongType.hxx | 3 +- src/Batch/Batch_MapKey.cxx | 1 + src/Batch/Batch_MapKey.hxx | 19 +++-- .../Batch_NotYetImplementedException.hxx | 1 + src/Batch/Batch_Parametre.hxx | 81 +++++++++---------- src/Batch/Batch_PyVersatile.hxx | 1 + src/Batch/Batch_RunTimeException.cxx | 1 + src/Batch/Batch_RunTimeException.hxx | 2 +- src/Batch/Batch_StringType.cxx | 1 + src/Batch/Batch_StringType.hxx | 11 ++- src/Batch/Batch_TypeMismatchException.cxx | 1 + src/Batch/Batch_TypeMismatchException.hxx | 2 +- src/Batch/Batch_Versatile.cxx | 1 + src/Batch/Batch_Versatile.hxx | 19 +++-- src/CASCatch/CASCatch_SignalsHandler.cxx | 2 +- src/Communication/MultiCommException.cxx | 1 + src/Communication/MultiCommException.hxx | 3 +- src/Communication/Receiver.cxx | 1 + src/Communication/ReceiverFactory.cxx | 1 + src/Communication/Receivers.cxx | 1 + src/Communication/SALOMEMultiComm.cxx | 1 + src/Communication/SALOME_Comm_i.cxx | 1 + src/Communication/SALOME_Comm_i.hxx | 1 - src/Communication/SenderFactory.cxx | 1 + src/Container/Component_i.cxx | 2 +- src/Container/SALOME_Container.cxx | 4 +- .../SALOME_Container_SignalsHandler.cxx | 1 + .../SALOME_DataTypeCatalog_Client.cxx | 2 +- .../SALOME_DataTypeCatalog_impl.cxx | 2 +- src/Event/SALOME_Event.cxx | 1 + src/HDFPersist/HDFascii.cc | 2 +- src/HDFPersist/HDFattribute.cc | 2 +- src/HDFPersist/HDFcontainerObject.cc | 2 +- src/HDFPersist/HDFconvert.cc | 2 +- src/HDFPersist/HDFdataset.cc | 2 +- src/HDFPersist/HDFexplorer.cc | 2 +- src/HDFPersist/HDFfile.cc | 2 +- src/HDFPersist/HDFgroup.cc | 2 +- src/HDFPersist/HDFinternalObject.cc | 2 +- src/HDFPersist/HDFobject.cc | 2 +- src/HDFPersist/test3.cxx | 2 +- src/HDFPersist/test4.cxx | 2 +- src/HDFPersist/test5.cxx | 2 +- src/HDFPersist/test6.cxx | 2 +- src/HDFPersist/test7.cxx | 2 +- src/HDFPersist/test8.cxx | 2 +- src/HDFPersist/test9.cxx | 2 +- src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx | 2 +- src/LifeCycleCORBA/TestLifeCycleCORBA.cxx | 2 +- src/Loader/InquireServersQThread.cxx | 2 +- src/Loader/SALOME_Session_Loader.cxx | 2 +- src/Logger/SALOME_Logger_Server.cxx | 3 +- src/Logger/SALOME_Trace.cxx | 2 +- src/MPIContainer/MPIContainer_i.cxx | 2 +- src/MPIContainer/MPIObject_i.cxx | 2 +- src/MPIContainer/SALOME_MPIContainer.cxx | 2 +- .../TestMPILifeCycleCORBA.cxx | 1 + src/MSG2QM/msg2qm.cxx | 2 +- .../SALOME_ModuleCatalog_Handler.cxx | 1 + src/NOTIFICATION_SWIG/NOTIFICATION_Swig.cxx | 2 +- src/NOTIFICATION_SWIG/NOTIFICATION_Swig.hxx | 1 - src/NamingService/ServiceUnreachable.cxx | 2 +- src/Notification/NOTIFICATION.cxx | 3 +- src/Notification/NOTIFICATION_Consumer.cxx | 2 +- src/Notification/NOTIFICATION_Supplier.cxx | 2 +- src/OBJECT/SALOME_AISObject.cxx | 2 +- src/OBJECT/SALOME_AISShape.cxx | 2 +- src/OBJECT/SALOME_InteractiveObject.cxx | 2 +- src/OCCViewer/OCCViewer.cxx | 2 +- src/OCCViewer/OCCViewer_AISSelector.cxx | 2 +- src/OCCViewer/OCCViewer_Prs.cxx | 1 + src/OCCViewer/OCCViewer_VService.cxx | 2 +- src/OCCViewer/OCCViewer_ViewFrame.cxx | 2 +- src/OCCViewer/OCCViewer_ViewPort3d.cxx | 2 +- src/OCCViewer/OCCViewer_Viewer3d.cxx | 2 +- src/Plot2d/Plot2d.cxx | 1 + src/Plot2d/Plot2d_Curve.cxx | 2 +- src/Plot2d/Plot2d_CurveContainer.cxx | 2 +- src/Plot2d/Plot2d_FitDataDlg.cxx | 1 + src/Plot2d/Plot2d_Prs.cxx | 1 + src/Plot2d/Plot2d_SetupViewDlg.cxx | 1 + src/Plot2d/Plot2d_ViewFrame.cxx | 1 + src/Registry/RegistryConnexion.cxx | 3 +- src/Registry/RegistryConnexion.hxx | 4 +- src/Registry/RegistryService.cxx | 3 +- src/Registry/RegistryService.hxx | 7 +- src/RegistryDisplay/HelpWindow.cxx | 2 +- src/RegistryDisplay/IntervalWindow.cxx | 1 + src/RegistryDisplay/IntervalWindow.hxx | 1 - src/RegistryDisplay/RegWidget.cxx | 2 +- src/RegistryDisplay/RegWidgetFactory.cxx | 2 +- .../SALOME_RessourcesCatalog_Client.cxx | 2 +- .../SALOME_RessourcesCatalog_impl.cxx | 2 +- src/SALOMEDS/SALOMEDS_AttLong_i.cxx | 2 +- src/SALOMEDS/SALOMEDS_AttReal_i.cxx | 2 +- src/SALOMEDS/SALOMEDS_AttributeComment_i.cxx | 2 +- src/SALOMEDS/SALOMEDS_AttributeDrawable_i.cxx | 2 +- .../SALOMEDS_AttributeExpandable_i.cxx | 2 +- .../SALOMEDS_AttributeExternalFileDef_i.cxx | 2 +- src/SALOMEDS/SALOMEDS_AttributeFileType_i.cxx | 2 +- src/SALOMEDS/SALOMEDS_AttributeIOR_i.cxx | 2 +- src/SALOMEDS/SALOMEDS_AttributeInteger_i.cxx | 2 +- src/SALOMEDS/SALOMEDS_AttributeLocalID_i.cxx | 2 +- src/SALOMEDS/SALOMEDS_AttributeName_i.cxx | 2 +- src/SALOMEDS/SALOMEDS_AttributeOpened_i.cxx | 2 +- .../SALOMEDS_AttributePersistentRef_i.cxx | 2 +- src/SALOMEDS/SALOMEDS_AttributePixMap_i.cxx | 2 +- .../SALOMEDS_AttributePythonObject_i.cxx | 2 +- .../SALOMEDS_AttributeSelectable_i.cxx | 2 +- .../SALOMEDS_AttributeSequenceOfInteger_i.cxx | 2 +- .../SALOMEDS_AttributeSequenceOfReal_i.cxx | 2 +- .../SALOMEDS_AttributeStudyProperties_i.cxx | 2 +- .../SALOMEDS_AttributeTableOfInteger_i.cxx | 2 +- .../SALOMEDS_AttributeTableOfReal_i.cxx | 2 +- .../SALOMEDS_AttributeTableOfString_i.cxx | 2 +- src/SALOMEDS/SALOMEDS_AttributeTarget_i.cxx | 2 +- .../SALOMEDS_AttributeTextColor_i.cxx | 2 +- ...SALOMEDS_AttributeTextHighlightColor_i.cxx | 2 +- src/SALOMEDS/SALOMEDS_AttributeTreeNode_i.cxx | 2 +- src/SALOMEDS/SALOMEDS_AttributeUserID_i.cxx | 2 +- .../SALOMEDS_BasicAttributeFactory.cxx | 2 +- src/SALOMEDS/SALOMEDS_BasicAttribute_i.cxx | 2 +- src/SALOMEDS/SALOMEDS_ChildIterator_i.cxx | 2 +- ...aMapIteratorOfDataMapOfIntegerString_0.cxx | 1 + ..._DataMapIteratorOfDataMapStringLabel_0.cxx | 4 +- ..._DataMapNodeOfDataMapOfIntegerString_0.cxx | 1 + ...MEDS_DataMapNodeOfDataMapStringLabel_0.cxx | 2 +- .../SALOMEDS_DataMapOfIntegerString_0.cxx | 3 +- .../SALOMEDS_DataMapStringLabel_0.cxx | 4 +- src/SALOMEDS/SALOMEDS_DrawableAttribute.cxx | 2 +- src/SALOMEDS/SALOMEDS_ExpandableAttribute.cxx | 2 +- src/SALOMEDS/SALOMEDS_GenericAttribute_i.cxx | 2 +- src/SALOMEDS/SALOMEDS_IORAttribute.cxx | 2 +- src/SALOMEDS/SALOMEDS_LocalIDAttribute.cxx | 2 +- src/SALOMEDS/SALOMEDS_OCAFApplication.cxx | 2 +- src/SALOMEDS/SALOMEDS_OpenedAttribute.cxx | 2 +- src/SALOMEDS/SALOMEDS_PersRefAttribute.cxx | 2 +- src/SALOMEDS/SALOMEDS_PixMapAttribute.cxx | 2 +- .../SALOMEDS_PythonObjectAttribute.cxx | 2 +- .../SALOMEDS_SComponentIterator_i.cxx | 2 +- src/SALOMEDS/SALOMEDS_SComponent_i.cxx | 2 +- src/SALOMEDS/SALOMEDS_SObject_i.cxx | 2 +- src/SALOMEDS/SALOMEDS_SelectableAttribute.cxx | 2 +- .../SALOMEDS_SequenceOfIntegerAttribute.cxx | 2 +- .../SALOMEDS_SequenceOfRealAttribute.cxx | 2 +- src/SALOMEDS/SALOMEDS_StudyBuilder_i.cxx | 2 +- src/SALOMEDS/SALOMEDS_StudyManager_i.cxx | 2 +- .../SALOMEDS_StudyPropertiesAttribute.cxx | 2 +- src/SALOMEDS/SALOMEDS_Study_i.cxx | 2 +- .../SALOMEDS_TableOfIntegerAttribute.cxx | 2 +- .../SALOMEDS_TableOfRealAttribute.cxx | 2 +- .../SALOMEDS_TableOfStringAttribute.cxx | 2 +- src/SALOMEDS/SALOMEDS_TargetAttribute.cxx | 2 +- src/SALOMEDS/SALOMEDS_TextColorAttribute.cxx | 2 +- .../SALOMEDS_TextHighlightColorAttribute.cxx | 2 +- src/SALOMEDS/SALOMEDS_UseCaseBuilder_i.cxx | 2 +- src/SALOMEDS/SALOMEDS_UseCaseIterator_i.cxx | 2 +- src/SALOMEGUI/QAD_Application.cxx | 2 +- src/SALOMEGUI/QAD_Config.cxx | 2 +- src/SALOMEGUI/QAD_DirListDlg.cxx | 2 +- src/SALOMEGUI/QAD_FileDlg.cxx | 2 +- src/SALOMEGUI/QAD_Help.cxx | 2 +- src/SALOMEGUI/QAD_HelpWindow.cxx | 2 +- src/SALOMEGUI/QAD_LeftFrame.cxx | 2 +- src/SALOMEGUI/QAD_ListMenuIdAction.cxx | 2 +- src/SALOMEGUI/QAD_ListPopupMenu.cxx | 2 +- src/SALOMEGUI/QAD_Menus.cxx | 2 +- src/SALOMEGUI/QAD_Message.cxx | 2 +- src/SALOMEGUI/QAD_MessageBox.cxx | 2 +- src/SALOMEGUI/QAD_NameBrowser.cxx | 2 +- src/SALOMEGUI/QAD_ObjectBrowserItem.cxx | 2 +- src/SALOMEGUI/QAD_Operation.cxx | 2 +- src/SALOMEGUI/QAD_OperatorMenus.cxx | 2 +- src/SALOMEGUI/QAD_ParserSettings.cxx | 2 +- src/SALOMEGUI/QAD_Popup.cxx | 2 +- src/SALOMEGUI/QAD_ResourceMgr.cxx | 2 +- src/SALOMEGUI/QAD_Settings.cxx | 2 +- src/SALOMEGUI/QAD_SpinBoxDbl.cxx | 2 +- src/SALOMEGUI/QAD_Splitter.cxx | 2 +- src/SALOMEGUI/QAD_Tools.cxx | 2 +- src/SALOMEGUI/QAD_XmlHandler.cxx | 2 +- src/SALOMEGUI/SALOMEGUI.cxx | 1 + src/SALOMEGUI/SALOMEGUI_AboutDlg.cxx | 2 +- .../SALOMEGUI_ActivateComponentDlg.cxx | 2 +- src/SALOMEGUI/SALOMEGUI_CloseDlg.cxx | 2 +- src/SALOMEGUI/SALOMEGUI_Desktop.cxx | 2 +- .../SALOMEGUI_ExternalBrowserDlg.cxx | 2 +- src/SALOMEGUI/SALOMEGUI_ImportOperation.cxx | 2 +- src/SALOMEGUI/SALOMEGUI_LoadStudiesDlg.cxx | 2 +- src/SALOMEGUI/SALOMEGUI_NameDlg.cxx | 2 +- src/SALOMEGUI/SALOMEGUI_OpenWith.cxx | 2 +- .../SALOMEGUI_QtCatchCorbaException.cxx | 2 +- src/SALOMEGUI/SALOMEGUI_SetValueDlg.cxx | 2 +- src/SALOMEGUI/SALOMEGUI_SetupCurveDlg.cxx | 2 +- .../SALOMEGUI_StudyPropertiesDlg.cxx | 2 +- src/SALOMEGUI/SALOMEGUI_TableDlg.cxx | 2 +- src/SALOMEGUI/SALOMEGUI_TrihedronSizeDlg.cxx | 2 +- src/SALOMEGUI/SALOMEGUI_ViewChoiceDlg.cxx | 2 +- ...MapIteratorOfDataMapOfIOMapOfInteger_0.cxx | 4 +- ...DataMapNodeOfDataMapOfIOMapOfInteger_0.cxx | 2 +- .../SALOME_DataMapOfIOMapOfInteger_0.cxx | 4 +- src/SALOMEGUI/SALOME_Filter.cxx | 2 +- src/SALOMEGUI/SALOME_ListIO_0.cxx | 4 +- .../SALOME_ListIteratorOfListIO_0.cxx | 2 +- .../SALOME_ListIteratorOfListOfFilter_0.cxx | 2 +- src/SALOMEGUI/SALOME_ListNodeOfListIO_0.cxx | 2 +- .../SALOME_ListNodeOfListOfFilter_0.cxx | 2 +- src/SALOMEGUI/SALOME_ListOfFilter_0.cxx | 2 +- src/SALOMEGUI/SALOME_NumberFilter.cxx | 2 +- src/SALOMEGUI/SALOME_TypeFilter.cxx | 2 +- src/SALOMELocalTrace/LocalTraceBufferPool.cxx | 4 +- src/SALOMELocalTrace/utilities.h | 5 +- src/SALOME_PYQT/SALOME_PYQT_GUI.cxx | 2 + src/SALOME_PYQT/SalomePyQt.cxx | 2 +- src/SUPERVGraph/SUPERVGraph.cxx | 2 +- src/SUPERVGraph/SUPERVGraph_Graph.cxx | 2 +- src/SUPERVGraph/SUPERVGraph_ViewFrame.cxx | 2 +- src/Session/SALOME_Session_QThread.cxx | 2 +- src/Session/SALOME_Session_Server.cxx | 1 + src/Session/SALOME_Session_SignalsHandler.cxx | 1 + src/Session/Session_ServerLauncher.cxx | 1 + src/Session/Session_ServerLauncher.hxx | 7 +- src/Session/Session_ServerThread.hxx | 2 - src/TOOLSDS/SALOMEDS_Tool.cxx | 2 +- src/TOOLSGUI/ToolsGUI.cxx | 2 +- src/TestContainer/SALOME_TestComponent_i.cxx | 2 +- src/TestContainer/TestLogger.cxx | 2 +- src/TestMPIContainer/TestMPIContainer.cxx | 1 + src/Utils/Utils_CommException.cxx | 2 +- src/Utils/Utils_DESTRUCTEUR_GENERIQUE.cxx | 4 +- src/Utils/Utils_ExceptHandlers.cxx | 2 + src/Utils/Utils_SALOME_Exception.cxx | 2 +- src/Utils/Utils_SignalsHandler.cxx | 1 + src/Utils/Utils_Timer.cxx | 2 +- src/VTKFilter/SALOME_GeometryFilter.cxx | 1 + src/VTKFilter/SALOME_PassThroughFilter.cxx | 1 + src/VTKFilter/SALOME_ShrinkFilter.cxx | 1 + src/VTKViewer/VTKViewer.cxx | 2 +- src/VTKViewer/VTKViewer_Filter.cxx | 1 + src/VTKViewer/VTKViewer_Prs.cxx | 1 + src/VTKViewer/VTKViewer_RenderWindow.cxx | 2 +- src/VTKViewer/VTKViewer_VectorText.cxx | 1 + 289 files changed, 392 insertions(+), 356 deletions(-) diff --git a/src/Batch/Batch_APIInternalFailureException.cxx b/src/Batch/Batch_APIInternalFailureException.cxx index 42e52aa9e..ac4f6491b 100644 --- a/src/Batch/Batch_APIInternalFailureException.cxx +++ b/src/Batch/Batch_APIInternalFailureException.cxx @@ -9,6 +9,7 @@ */ #include "Batch_APIInternalFailureException.hxx" +using namespace std; namespace Batch { diff --git a/src/Batch/Batch_BatchManager.cxx b/src/Batch/Batch_BatchManager.cxx index e84d3bdaf..56cae6c30 100644 --- a/src/Batch/Batch_BatchManager.cxx +++ b/src/Batch/Batch_BatchManager.cxx @@ -18,6 +18,7 @@ #include "Batch_InvalidArgumentException.hxx" #include "Batch_FactBatchManager.hxx" #include "Batch_BatchManager.hxx" +using namespace std; namespace Batch { diff --git a/src/Batch/Batch_BatchManager.hxx b/src/Batch/Batch_BatchManager.hxx index 47820ef0b..c132a575a 100644 --- a/src/Batch/Batch_BatchManager.hxx +++ b/src/Batch/Batch_BatchManager.hxx @@ -10,7 +10,6 @@ #ifndef _BATCHMANAGER_H_ #define _BATCHMANAGER_H_ -using namespace std; #include #include #include "Batch_Job.hxx" @@ -29,13 +28,13 @@ namespace Batch { { public: // Constructeur et destructeur - //BatchManager(string host="localhost") throw(InvalidArgumentException); // connexion a la machine host + //BatchManager(std::string host="localhost") throw(InvalidArgumentException); // connexion a la machine host BatchManager(const FactBatchManager * parent, const char * host="localhost") throw(InvalidArgumentException); // connexion a la machine host virtual ~BatchManager(); - virtual string __repr__() const; + virtual std::string __repr__() const; // Recupere le l'identifiant d'un job deja soumis au BatchManager - //virtual const JobId getJobIdByReference(const string & ref); + //virtual const JobId getJobIdByReference(const std::string & ref); virtual const JobId getJobIdByReference(const char * ref); // Methodes pour le controle des jobs : virtuelles pures @@ -49,8 +48,8 @@ namespace Batch { virtual JobInfo queryJob(const JobId & jobid) = 0; // renvoie l'etat du job protected: - string _hostname; // serveur ou tourne le BatchManager - map< const string, const JobId * > jobid_map; // table des jobs deja soumis + std::string _hostname; // serveur ou tourne le BatchManager + std::map< const std::string, const JobId * > jobid_map; // table des jobs deja soumis const FactBatchManager * _parent; private: diff --git a/src/Batch/Batch_BatchManagerCatalog.cxx b/src/Batch/Batch_BatchManagerCatalog.cxx index 437be93fb..6485411bc 100644 --- a/src/Batch/Batch_BatchManagerCatalog.cxx +++ b/src/Batch/Batch_BatchManagerCatalog.cxx @@ -12,6 +12,7 @@ #include #include "Batch_BatchManagerCatalog.hxx" #include "Batch_FactBatchManager.hxx" +using namespace std; namespace Batch { diff --git a/src/Batch/Batch_BatchManagerCatalog.hxx b/src/Batch/Batch_BatchManagerCatalog.hxx index cff458293..1857fa059 100644 --- a/src/Batch/Batch_BatchManagerCatalog.hxx +++ b/src/Batch/Batch_BatchManagerCatalog.hxx @@ -10,7 +10,6 @@ #ifndef _CATALOG_H_ #define _CATALOG_H_ -using namespace std; #include #include #include @@ -31,11 +30,11 @@ namespace Batch { static void addFactBatchManager(const char * type, FactBatchManager * pFBM); virtual FactBatchManager * operator() (const char * type) const; - virtual map * dict() const; - virtual string __repr__() const; + virtual std::map * dict() const; + virtual std::string __repr__() const; protected: - static map * _p_catalog; + static std::map * _p_catalog; static pthread_mutex_t _mutex; private: diff --git a/src/Batch/Batch_BatchManager_PBS.cxx b/src/Batch/Batch_BatchManager_PBS.cxx index 45fceedde..a45934629 100644 --- a/src/Batch/Batch_BatchManager_PBS.cxx +++ b/src/Batch/Batch_BatchManager_PBS.cxx @@ -17,6 +17,7 @@ extern "C" { #include //#include "MEDMEM_STRING.hxx" #include "Batch_BatchManager_PBS.hxx" +using namespace std; namespace Batch { diff --git a/src/Batch/Batch_BatchManager_PBS.hxx b/src/Batch/Batch_BatchManager_PBS.hxx index 53c7437cc..a8310ecba 100644 --- a/src/Batch/Batch_BatchManager_PBS.hxx +++ b/src/Batch/Batch_BatchManager_PBS.hxx @@ -36,12 +36,12 @@ namespace Batch { public: // Constructeur et destructeur //BatchManager_PBS() throw(InvalidArgumentException,ConnexionFailureException); // connexion au serveur par defaut - //BatchManager_PBS(string host) throw(InvalidArgumentException,ConnexionFailureException); // connexion a la machine host + //BatchManager_PBS(std::string host) throw(InvalidArgumentException,ConnexionFailureException); // connexion a la machine host BatchManager_PBS(const FactBatchManager * parent, const char * host="localhost") throw(InvalidArgumentException,ConnexionFailureException); // connexion a la machine host virtual ~BatchManager_PBS(); // Recupere le nom du serveur par defaut - // static string BatchManager_PBS::getDefaultServer(); + // static std::string BatchManager_PBS::getDefaultServer(); // Methodes pour le controle des jobs virtual const JobId submitJob(const Job & job); // soumet un job au gestionnaire @@ -65,7 +65,7 @@ namespace Batch { #ifdef SWIG public: // Recupere le l'identifiant d'un job deja soumis au BatchManager - //virtual const JobId getJobIdByReference(const string & ref) { return BatchManager::getJobIdByReference(ref); } + //virtual const JobId getJobIdByReference(const std::string & ref) { return BatchManager::getJobIdByReference(ref); } virtual const JobId getJobIdByReference(const char * ref) { return BatchManager::getJobIdByReference(ref); } #endif diff --git a/src/Batch/Batch_BoolType.cxx b/src/Batch/Batch_BoolType.cxx index b70696341..6e28f197b 100644 --- a/src/Batch/Batch_BoolType.cxx +++ b/src/Batch/Batch_BoolType.cxx @@ -9,6 +9,7 @@ #include #include "Batch_BoolType.hxx" +using namespace std; namespace Batch { diff --git a/src/Batch/Batch_BoolType.hxx b/src/Batch/Batch_BoolType.hxx index 1bb58d16d..47c61d57b 100644 --- a/src/Batch/Batch_BoolType.hxx +++ b/src/Batch/Batch_BoolType.hxx @@ -10,7 +10,6 @@ #ifndef _BOOLTYPE_H_ #define _BOOLTYPE_H_ -using namespace std; #include #include "Batch_GenericType.hxx" @@ -23,7 +22,7 @@ namespace Batch { BoolType(const bool b=false) : _data(b) {} // Conversion en chaine - virtual string affiche() const; + virtual std::string affiche() const; // Operateur d'affectation virtual BoolType & operator =(bool); diff --git a/src/Batch/Batch_CharType.cxx b/src/Batch/Batch_CharType.cxx index 66197f84c..52f64146d 100644 --- a/src/Batch/Batch_CharType.cxx +++ b/src/Batch/Batch_CharType.cxx @@ -9,6 +9,7 @@ #include #include "Batch_CharType.hxx" +using namespace std; namespace Batch { diff --git a/src/Batch/Batch_CharType.hxx b/src/Batch/Batch_CharType.hxx index 0aae9f45b..ac96bc950 100644 --- a/src/Batch/Batch_CharType.hxx +++ b/src/Batch/Batch_CharType.hxx @@ -10,7 +10,6 @@ #ifndef _CHARTYPE_H_ #define _CHARTYPE_H_ -using namespace std; #include #include "Batch_GenericType.hxx" @@ -23,7 +22,7 @@ namespace Batch { CharType(const char c=0) : _data(c) {} // Conversion en chaine - virtual string affiche() const; + virtual std::string affiche() const; // Operateur d'affectation virtual CharType & operator =(char); diff --git a/src/Batch/Batch_ConnexionFailureException.cxx b/src/Batch/Batch_ConnexionFailureException.cxx index df1096fd9..d78f842c1 100644 --- a/src/Batch/Batch_ConnexionFailureException.cxx +++ b/src/Batch/Batch_ConnexionFailureException.cxx @@ -9,6 +9,7 @@ */ #include "Batch_ConnexionFailureException.hxx" +using namespace std; namespace Batch { diff --git a/src/Batch/Batch_ConnexionFailureException.hxx b/src/Batch/Batch_ConnexionFailureException.hxx index 22d9584b2..123241876 100644 --- a/src/Batch/Batch_ConnexionFailureException.hxx +++ b/src/Batch/Batch_ConnexionFailureException.hxx @@ -20,7 +20,7 @@ namespace Batch { { public: // Constructeur - ConnexionFailureException(string ch = "undefined") : GenericException("ConnexionFailureException", ch) {} + ConnexionFailureException(std::string ch = "undefined") : GenericException("ConnexionFailureException", ch) {} }; diff --git a/src/Batch/Batch_Couple.cxx b/src/Batch/Batch_Couple.cxx index 8a08d7040..c87ce4fc1 100644 --- a/src/Batch/Batch_Couple.cxx +++ b/src/Batch/Batch_Couple.cxx @@ -9,6 +9,7 @@ */ #include "Batch_Couple.hxx" +using namespace std; namespace Batch { diff --git a/src/Batch/Batch_Couple.hxx b/src/Batch/Batch_Couple.hxx index 4efe11762..e60b75b4b 100644 --- a/src/Batch/Batch_Couple.hxx +++ b/src/Batch/Batch_Couple.hxx @@ -11,7 +11,6 @@ #ifndef _COUPLE_H_ #define _COUPLE_H_ -using namespace std; #include namespace Batch { @@ -20,7 +19,7 @@ namespace Batch { { public: // Constructeur standard - Couple(const string & local="", const string & remote="") : _local(local), _remote(remote) {} + Couple(const std::string & local="", const std::string & remote="") : _local(local), _remote(remote) {} // Constructeur par recopie Couple(const Couple & C) : _local(C._local), _remote(C._remote) {} @@ -32,15 +31,15 @@ namespace Batch { virtual Couple & operator =(const Couple &); // Conversion en chaine - virtual string str() const; + virtual std::string str() const; // Accesseurs - virtual string getLocal() const { return _local; } - virtual string getRemote() const { return _remote; } + virtual std::string getLocal() const { return _local; } + virtual std::string getRemote() const { return _remote; } protected: - string _local; // chemin d'acces au fichier local - string _remote; // chemin d'acees au fichier distant + std::string _local; // chemin d'acces au fichier local + std::string _remote; // chemin d'acees au fichier distant private: diff --git a/src/Batch/Batch_CoupleType.cxx b/src/Batch/Batch_CoupleType.cxx index 1de0b21f0..2cf112a26 100644 --- a/src/Batch/Batch_CoupleType.cxx +++ b/src/Batch/Batch_CoupleType.cxx @@ -9,6 +9,7 @@ */ #include "Batch_CoupleType.hxx" +using namespace std; namespace Batch { diff --git a/src/Batch/Batch_CoupleType.hxx b/src/Batch/Batch_CoupleType.hxx index a8913d575..9d3905be3 100644 --- a/src/Batch/Batch_CoupleType.hxx +++ b/src/Batch/Batch_CoupleType.hxx @@ -11,7 +11,6 @@ #ifndef _COUPLETYPE_H_ #define _COUPLETYPE_H_ -using namespace std; #include #include "Batch_GenericType.hxx" #include "Batch_Couple.hxx" @@ -25,8 +24,8 @@ namespace Batch { CoupleType(const Couple & C) : _data(C) {} // Conversion en chaine - virtual string affiche() const; - virtual operator string() const; + virtual std::string affiche() const; + virtual operator std::string() const; // Operateur d'affectation virtual CoupleType & operator =(const Couple & C); diff --git a/src/Batch/Batch_Date.cxx b/src/Batch/Batch_Date.cxx index 9ac52b12d..9c48d233d 100644 --- a/src/Batch/Batch_Date.cxx +++ b/src/Batch/Batch_Date.cxx @@ -11,6 +11,7 @@ #include #include #include "Batch_Date.hxx" +using namespace std; namespace Batch { diff --git a/src/Batch/Batch_Date.hxx b/src/Batch/Batch_Date.hxx index 0091850d1..cef80cc5a 100644 --- a/src/Batch/Batch_Date.hxx +++ b/src/Batch/Batch_Date.hxx @@ -11,7 +11,6 @@ #ifndef _DATE_H_ #define _DATE_H_ -using namespace std; #include namespace Batch { @@ -20,14 +19,14 @@ namespace Batch { { public: Date(const long l=0); - Date(const string s); + Date(const std::string s); virtual Date & operator =(long l); virtual Date & operator +(long l); virtual Date & operator -(long l); virtual Date & operator +=(long l); virtual Date & operator -=(long l); - virtual Date & operator =(const string & s); - virtual string str() const; + virtual Date & operator =(const std::string & s); + virtual std::string str() const; virtual long epoch() const; protected: diff --git a/src/Batch/Batch_DateType.cxx b/src/Batch/Batch_DateType.cxx index fac8830d6..4e08dd2a5 100644 --- a/src/Batch/Batch_DateType.cxx +++ b/src/Batch/Batch_DateType.cxx @@ -11,6 +11,7 @@ extern "C" { #include } #include "Batch_DateType.hxx" +using namespace std; namespace Batch { diff --git a/src/Batch/Batch_DateType.hxx b/src/Batch/Batch_DateType.hxx index 868272086..b94cdb2a8 100644 --- a/src/Batch/Batch_DateType.hxx +++ b/src/Batch/Batch_DateType.hxx @@ -11,7 +11,6 @@ #ifndef _DATETYPE_H_ #define _DATETYPE_H_ -using namespace std; #include #include "Batch_GenericType.hxx" #include "Batch_Date.hxx" @@ -25,7 +24,7 @@ namespace Batch { DateType(const Date & d) : _data(d) {}; // Conversion en chaine - virtual string affiche() const; + virtual std::string affiche() const; // Operateur d'affectation virtual DateType & operator =(const Date &); diff --git a/src/Batch/Batch_Environnement.cxx b/src/Batch/Batch_Environnement.cxx index d658d3855..24155decb 100644 --- a/src/Batch/Batch_Environnement.cxx +++ b/src/Batch/Batch_Environnement.cxx @@ -9,6 +9,7 @@ */ #include "Batch_Environnement.hxx" +using namespace std; namespace Batch { diff --git a/src/Batch/Batch_Environnement.hxx b/src/Batch/Batch_Environnement.hxx index cda22aeff..e136996f6 100644 --- a/src/Batch/Batch_Environnement.hxx +++ b/src/Batch/Batch_Environnement.hxx @@ -12,13 +12,12 @@ #define _ENVIRONNEMENT_H_ -using namespace std; #include #include namespace Batch { - typedef map < string, string > Environnement; + typedef std::map < std::string, std::string > Environnement; } diff --git a/src/Batch/Batch_FactBatchManager.cxx b/src/Batch/Batch_FactBatchManager.cxx index c8123cbfd..ba1d5e839 100644 --- a/src/Batch/Batch_FactBatchManager.cxx +++ b/src/Batch/Batch_FactBatchManager.cxx @@ -12,6 +12,7 @@ #include "Batch_BatchManagerCatalog.hxx" #include "Batch_FactBatchManager.hxx" #include "utilities.h" +using namespace std; namespace Batch { diff --git a/src/Batch/Batch_FactBatchManager.hxx b/src/Batch/Batch_FactBatchManager.hxx index 4e4282344..2a662d73c 100644 --- a/src/Batch/Batch_FactBatchManager.hxx +++ b/src/Batch/Batch_FactBatchManager.hxx @@ -10,7 +10,6 @@ #ifndef _FACTBATCHMANAGER_H_ #define _FACTBATCHMANAGER_H_ -using namespace std; #include #include @@ -22,15 +21,15 @@ namespace Batch { { public: // Constructeur et destructeur - FactBatchManager(const string & type); + FactBatchManager(const std::string & type); virtual ~FactBatchManager(); virtual BatchManager * operator() (const char * hostname) const = 0; - string getType() const; - string __repr__() const; + std::string getType() const; + std::string __repr__() const; protected: - string type; + std::string type; private: diff --git a/src/Batch/Batch_FactBatchManager_PBS.cxx b/src/Batch/Batch_FactBatchManager_PBS.cxx index 3a0e39763..d2ded29ca 100644 --- a/src/Batch/Batch_FactBatchManager_PBS.cxx +++ b/src/Batch/Batch_FactBatchManager_PBS.cxx @@ -11,6 +11,7 @@ #include "Batch_BatchManager_PBS.hxx" #include "Batch_FactBatchManager_PBS.hxx" #include "utilities.h" +using namespace std; namespace Batch { diff --git a/src/Batch/Batch_FactBatchManager_PBS.hxx b/src/Batch/Batch_FactBatchManager_PBS.hxx index 55d4bec90..fdf053c1b 100644 --- a/src/Batch/Batch_FactBatchManager_PBS.hxx +++ b/src/Batch/Batch_FactBatchManager_PBS.hxx @@ -10,9 +10,6 @@ #ifndef _FACTBATCHMANAGER_PBS_H_ #define _FACTBATCHMANAGER_PBS_H_ -using namespace std; -#include -#include #include "Batch_FactBatchManager.hxx" namespace Batch { diff --git a/src/Batch/Batch_GenericException.cxx b/src/Batch/Batch_GenericException.cxx index 6cf7a935f..e9f8ffb75 100644 --- a/src/Batch/Batch_GenericException.cxx +++ b/src/Batch/Batch_GenericException.cxx @@ -9,6 +9,7 @@ */ #include "Batch_GenericException.hxx" +using namespace std; namespace Batch { diff --git a/src/Batch/Batch_GenericException.hxx b/src/Batch/Batch_GenericException.hxx index 59ecd8413..dae5525d3 100644 --- a/src/Batch/Batch_GenericException.hxx +++ b/src/Batch/Batch_GenericException.hxx @@ -12,7 +12,6 @@ #define _GENERICEXCEPTION_H_ -using namespace std; #include namespace Batch { @@ -20,11 +19,11 @@ namespace Batch { class GenericException { public: - const string type; // la nature de l'exception - const string message; // la raison de l'exception + const std::string type; // la nature de l'exception + const std::string message; // la raison de l'exception // Constructeur - GenericException(const string tp = "GenericException", const string ch = "undefined") : type(tp), message(ch) {} + GenericException(const std::string tp = "GenericException", const std::string ch = "undefined") : type(tp), message(ch) {} }; } diff --git a/src/Batch/Batch_GenericType.cxx b/src/Batch/Batch_GenericType.cxx index 997222a73..dc00c838f 100644 --- a/src/Batch/Batch_GenericType.cxx +++ b/src/Batch/Batch_GenericType.cxx @@ -11,6 +11,7 @@ #include #include #include "Batch_GenericType.hxx" +using namespace std; namespace Batch { diff --git a/src/Batch/Batch_GenericType.hxx b/src/Batch/Batch_GenericType.hxx index 5a3dfe28e..9dea30601 100644 --- a/src/Batch/Batch_GenericType.hxx +++ b/src/Batch/Batch_GenericType.hxx @@ -11,7 +11,6 @@ #define _GENERICTYPE_H_ -using namespace std; #include #include @@ -25,10 +24,10 @@ namespace Batch { virtual ~GenericType() { _nb--; } // Operateur pour l'affichage sur un stream - friend ostream & operator << (ostream & os, const GenericType & obj); + friend std::ostream & operator << (std::ostream & os, const GenericType & obj); // Conversion en chaine - virtual string affiche() const; + virtual std::string affiche() const; // Clone duplique l'objet et en fabrique un nouveau a l'aide de new // qu'il faudra detruire ensuite manuellement diff --git a/src/Batch/Batch_IntType.cxx b/src/Batch/Batch_IntType.cxx index b5b1eb9cb..a9aa692ff 100644 --- a/src/Batch/Batch_IntType.cxx +++ b/src/Batch/Batch_IntType.cxx @@ -11,6 +11,7 @@ #include //#include "MEDMEM_STRING.hxx" #include "Batch_IntType.hxx" +using namespace std; namespace Batch { diff --git a/src/Batch/Batch_IntType.hxx b/src/Batch/Batch_IntType.hxx index 6d07fe50f..87dc862e7 100644 --- a/src/Batch/Batch_IntType.hxx +++ b/src/Batch/Batch_IntType.hxx @@ -10,7 +10,6 @@ #ifndef _INTTYPE_H_ #define _INTTYPE_H_ -using namespace std; #include #include "Batch_GenericType.hxx" @@ -23,7 +22,7 @@ namespace Batch { IntType(const int i=0) : _data(i) {} // Conversion en chaine - virtual string affiche() const; + virtual std::string affiche() const; // Operateur d'affectation virtual IntType & operator =(int); diff --git a/src/Batch/Batch_InvalidArgumentException.cxx b/src/Batch/Batch_InvalidArgumentException.cxx index fa077bcbb..b985a7f5e 100644 --- a/src/Batch/Batch_InvalidArgumentException.cxx +++ b/src/Batch/Batch_InvalidArgumentException.cxx @@ -9,6 +9,7 @@ */ #include "Batch_InvalidArgumentException.hxx" +using namespace std; namespace Batch { diff --git a/src/Batch/Batch_InvalidKeyException.cxx b/src/Batch/Batch_InvalidKeyException.cxx index bec522ef9..c600c2304 100644 --- a/src/Batch/Batch_InvalidKeyException.cxx +++ b/src/Batch/Batch_InvalidKeyException.cxx @@ -9,6 +9,7 @@ */ #include "Batch_InvalidKeyException.hxx" +using namespace std; namespace Batch { diff --git a/src/Batch/Batch_InvalidKeyException.hxx b/src/Batch/Batch_InvalidKeyException.hxx index 8e0c45b9c..0fa548f1d 100644 --- a/src/Batch/Batch_InvalidKeyException.hxx +++ b/src/Batch/Batch_InvalidKeyException.hxx @@ -21,7 +21,7 @@ namespace Batch { { public: // Constructeur - InvalidKeyException(string ch = "undefined") : GenericException("InvalidKeyException", ch) {} + InvalidKeyException(std::string ch = "undefined") : GenericException("InvalidKeyException", ch) {} protected: diff --git a/src/Batch/Batch_Job.cxx b/src/Batch/Batch_Job.cxx index 6fa203ed5..77f8126e1 100644 --- a/src/Batch/Batch_Job.cxx +++ b/src/Batch/Batch_Job.cxx @@ -11,6 +11,7 @@ #include "Batch_Parametre.hxx" #include //#include "MEDMEM_STRING.hxx" +using namespace std; namespace Batch { diff --git a/src/Batch/Batch_Job.hxx b/src/Batch/Batch_Job.hxx index efd8a90ce..66fdf0494 100644 --- a/src/Batch/Batch_Job.hxx +++ b/src/Batch/Batch_Job.hxx @@ -27,7 +27,7 @@ namespace Batch { virtual ~Job() {} // Operateur pour l'affichage sur un stream - friend ostream & operator <<(ostream & os, const Job & job); + friend std::ostream & operator <<(std::ostream & os, const Job & job); // Accesseurs Parametre getParametre() const; @@ -39,8 +39,8 @@ namespace Batch { // Methodes pour l'interfacage avec Python (SWIG) // TODO : supprimer ces methodes et transferer leur definitions dans SWIG - string __str__() const; // SWIG : affichage en Python - string __repr__() const { return __str__(); }; // SWIG : affichage en Python + std::string __str__() const; // SWIG : affichage en Python + std::string __repr__() const { return __str__(); }; // SWIG : affichage en Python protected: Parametre _param; // table des parametres batch du job diff --git a/src/Batch/Batch_JobId.cxx b/src/Batch/Batch_JobId.cxx index f642b4ce2..370fe4476 100644 --- a/src/Batch/Batch_JobId.cxx +++ b/src/Batch/Batch_JobId.cxx @@ -11,6 +11,7 @@ #include "Batch_BatchManager.hxx" #include //#include "MEDMEM_STRING.hxx" +using namespace std; namespace Batch { diff --git a/src/Batch/Batch_JobId.hxx b/src/Batch/Batch_JobId.hxx index d2811bc6d..be14e7f9e 100644 --- a/src/Batch/Batch_JobId.hxx +++ b/src/Batch/Batch_JobId.hxx @@ -28,7 +28,7 @@ namespace Batch { virtual ~JobId(); // Constructeur avec le pointeur sur le BatchManager associe et avec une reference - JobId(BatchManager *, string ref); + JobId(BatchManager *, std::string ref); // Operateur d'affectation entre objets virtual JobId & operator =(const JobId &); @@ -37,7 +37,7 @@ namespace Batch { JobId(const JobId &); // Accesseur pour la reference interne - virtual string getReference() const; + virtual std::string getReference() const; // Methodes pour le controle du job virtual void deleteJob() const; // retire un job du gestionnaire @@ -52,12 +52,12 @@ namespace Batch { // Methodes pour l'interfacage avec Python (SWIG) // TODO : supprimer ces methodes et transferer leur definitions dans SWIG - string __str__() const; // SWIG : affichage en Python - string __repr__() const { return __str__(); }; // SWIG : affichage en Python + std::string __str__() const; // SWIG : affichage en Python + std::string __repr__() const { return __str__(); }; // SWIG : affichage en Python protected: BatchManager * _p_batchmanager; // pointeur sur le BatchManager qui controle le job - string _reference; // reference du job au sein du BatchManager + std::string _reference; // reference du job au sein du BatchManager private: diff --git a/src/Batch/Batch_JobInfo.cxx b/src/Batch/Batch_JobInfo.cxx index 3192f21d5..87f814322 100644 --- a/src/Batch/Batch_JobInfo.cxx +++ b/src/Batch/Batch_JobInfo.cxx @@ -13,6 +13,7 @@ #include //#include "MEDMEM_STRING.hxx" #include "Batch_JobInfo.hxx" +using namespace std; namespace Batch { diff --git a/src/Batch/Batch_JobInfo.hxx b/src/Batch/Batch_JobInfo.hxx index 093d8e3a9..7cdca6535 100644 --- a/src/Batch/Batch_JobInfo.hxx +++ b/src/Batch/Batch_JobInfo.hxx @@ -11,7 +11,6 @@ #ifndef _JOBINFO_H_ #define _JOBINFO_H_ -using namespace std; #include #include #include "Batch_Parametre.hxx" @@ -30,7 +29,7 @@ namespace Batch { JobInfo(const JobInfo & jinfo) : _param(jinfo._param), _env(jinfo._env) {}; // Operateur pour l'affichage sur un stream - friend ostream & operator <<(ostream & os, const JobInfo & ji); + friend std::ostream & operator <<(std::ostream & os, const JobInfo & ji); // Accesseurs virtual Parametre getParametre() const; @@ -38,8 +37,8 @@ namespace Batch { // Methodes pour l'interfacage avec Python (SWIG) // TODO : supprimer ces methodes et transferer leur definitions dans SWIG - string __str__() const; // SWIG : affichage en Python - string __repr__() const { return __str__(); }; // SWIG : affichage en Python + std::string __str__() const; // SWIG : affichage en Python + std::string __repr__() const { return __str__(); }; // SWIG : affichage en Python protected: Parametre _param; // parametres du job diff --git a/src/Batch/Batch_JobInfo_PBS.cxx b/src/Batch/Batch_JobInfo_PBS.cxx index a079b9249..dce6749f7 100644 --- a/src/Batch/Batch_JobInfo_PBS.cxx +++ b/src/Batch/Batch_JobInfo_PBS.cxx @@ -15,6 +15,7 @@ #include "Batch_Environnement.hxx" #include "Batch_RunTimeException.hxx" #include "Batch_JobInfo_PBS.hxx" +using namespace std; namespace Batch { diff --git a/src/Batch/Batch_JobInfo_PBS.hxx b/src/Batch/Batch_JobInfo_PBS.hxx index 2429b9832..9010e2356 100644 --- a/src/Batch/Batch_JobInfo_PBS.hxx +++ b/src/Batch/Batch_JobInfo_PBS.hxx @@ -35,8 +35,8 @@ namespace Batch { // Methodes pour l'interfacage avec Python (SWIG) // TODO : supprimer ces methodes et transferer leur definitions dans SWIG - string __str__() const; // SWIG : affichage en Python - string __repr__() const { return __str__(); }; // SWIG : affichage en Python + std::string __str__() const; // SWIG : affichage en Python + std::string __repr__() const { return __str__(); }; // SWIG : affichage en Python protected: diff --git a/src/Batch/Batch_Job_PBS.cxx b/src/Batch/Batch_Job_PBS.cxx index 78450133e..b884d7fa0 100644 --- a/src/Batch/Batch_Job_PBS.cxx +++ b/src/Batch/Batch_Job_PBS.cxx @@ -12,6 +12,7 @@ #include #include #include "Batch_Job_PBS.hxx" +using namespace std; namespace Batch { diff --git a/src/Batch/Batch_ListIsFullException.cxx b/src/Batch/Batch_ListIsFullException.cxx index aba5d44ab..3d5f3be98 100644 --- a/src/Batch/Batch_ListIsFullException.cxx +++ b/src/Batch/Batch_ListIsFullException.cxx @@ -8,6 +8,7 @@ */ #include "Batch_ListIsFullException.hxx" +using namespace std; namespace Batch { diff --git a/src/Batch/Batch_ListIsFullException.hxx b/src/Batch/Batch_ListIsFullException.hxx index c9807b132..1451d9d03 100644 --- a/src/Batch/Batch_ListIsFullException.hxx +++ b/src/Batch/Batch_ListIsFullException.hxx @@ -18,7 +18,7 @@ namespace Batch { { public: // Constructeur - ListIsFullException(string ch = "undefined") : GenericException("ListIsFullException", ch) {} + ListIsFullException(std::string ch = "undefined") : GenericException("ListIsFullException", ch) {} }; } diff --git a/src/Batch/Batch_LongType.hxx b/src/Batch/Batch_LongType.hxx index bf82d2ed3..62873c911 100644 --- a/src/Batch/Batch_LongType.hxx +++ b/src/Batch/Batch_LongType.hxx @@ -10,7 +10,6 @@ #ifndef _LONGTYPE_H_ #define _LONGTYPE_H_ -using namespace std; #include #include "Batch_GenericType.hxx" @@ -23,7 +22,7 @@ namespace Batch { LongType(const long l=0L) : _data(l) {} // Conversion en chaine - virtual string affiche() const; + virtual std::string affiche() const; // Operateur d'affectation virtual LongType & operator =(long); diff --git a/src/Batch/Batch_MapKey.cxx b/src/Batch/Batch_MapKey.cxx index 170bd00cf..0fe844c8f 100644 --- a/src/Batch/Batch_MapKey.cxx +++ b/src/Batch/Batch_MapKey.cxx @@ -10,6 +10,7 @@ #include #include "Batch_MapKey.hxx" +using namespace std; namespace Batch { diff --git a/src/Batch/Batch_MapKey.hxx b/src/Batch/Batch_MapKey.hxx index caee3633f..2e7629927 100644 --- a/src/Batch/Batch_MapKey.hxx +++ b/src/Batch/Batch_MapKey.hxx @@ -12,31 +12,30 @@ #define _MAPKEY_H_ -using namespace std; #include namespace Batch { // une classe privee pour les differents types // ces types ne peuvent pas etre redefinis - class MapKey : public string + class MapKey : public std::string { private: friend class Parametre; // seule la classe Parametre peut creer des MapKey - MapKey() : string() {} - MapKey(const MapKey & mk, size_type pos, size_type npos) : string(mk, pos, npos) {} - MapKey(const char * s, size_type n) : string(s, n) {} - MapKey(const char * s) : string(s) {} - MapKey(size_type n, char c) : string(n, c) {} + MapKey() : std::string() {} + MapKey(const MapKey & mk, size_type pos, size_type npos) : std::string(mk, pos, npos) {} + MapKey(const char * s, size_type n) : std::string(s, n) {} + MapKey(const char * s) : std::string(s) {} + MapKey(size_type n, char c) : std::string(n, c) {} #ifdef __STL_MEMBER_TEMPLATES template - MapKey(InputIterator __begin, InputIterator __end) : string(__begin, __end) {} + MapKey(InputIterator __begin, InputIterator __end) : std::string(__begin, __end) {} #else - MapKey(const_iterator __begin, const_iterator __end) : string(__begin, __end) {} + MapKey(const_iterator __begin, const_iterator __end) : std::string(__begin, __end) {} #endif public: - MapKey(const MapKey & mk) : string(mk) {} + MapKey(const MapKey & mk) : std::string(mk) {} }; diff --git a/src/Batch/Batch_NotYetImplementedException.hxx b/src/Batch/Batch_NotYetImplementedException.hxx index 753290d81..2f64c06c4 100644 --- a/src/Batch/Batch_NotYetImplementedException.hxx +++ b/src/Batch/Batch_NotYetImplementedException.hxx @@ -13,6 +13,7 @@ #include "Batch_GenericException.hxx" +using namespace std; namespace Batch { diff --git a/src/Batch/Batch_Parametre.hxx b/src/Batch/Batch_Parametre.hxx index 5a2d78a52..e4ed4d889 100644 --- a/src/Batch/Batch_Parametre.hxx +++ b/src/Batch/Batch_Parametre.hxx @@ -10,7 +10,6 @@ #ifndef _PARAMETRE_H_ #define _PARAMETRE_H_ -using namespace std; #include #include #include "Batch_InvalidKeyException.hxx" @@ -22,13 +21,13 @@ using namespace std; // TODO : remplacer ce mecanisme statique par la lecture // TODO : d'une descrption dans un fichier exterieur (genre XML) -#define def_extern_MapKey(mk) extern const string & mk; -#define def_static_MapKey(mk) const string Batch::Parametre::mk(#mk); \ - const string & mk = Batch::Parametre::mk; +#define def_extern_MapKey(mk) extern const std::string & mk; +#define def_static_MapKey(mk) const std::string Batch::Parametre::mk(#mk); \ + const std::string & mk = Batch::Parametre::mk; namespace Batch { - class Parametre : public map< string, Versatile > + class Parametre : public std::map< std::string, Versatile > { public: // Constructeur standard @@ -38,50 +37,50 @@ namespace Batch { Parametre::Parametre(const Parametre & PM); // Operateur de recherche dans la map - Versatile & operator [] (const string &); - const Versatile & operator [] (const string &) const; + Versatile & operator [] (const std::string &); + const Versatile & operator [] (const std::string &) const; // Operateur d'affectation Parametre & operator =(const Parametre & PM); // Declarations statique des clefs de la map // TODO : supprimer les declarations statiques des clefs de la map - static const string ACCOUNT; - static const string CHECKPOINT; - static const string CKPTINTERVAL; - static const string CREATIONTIME; - static const string EGROUP; - static const string ELIGIBLETIME; - static const string EUSER; - static const string EXECUTABLE; - static const string EXECUTIONHOST; - static const string HOLD; - static const string ID; - static const string INFILE; - static const string MAIL; - static const string MAXCPUTIME; - static const string MAXDISKSIZE; - static const string MAXRAMSIZE; - static const string MAXWALLTIME; - static const string MODIFICATIONTIME; - static const string NAME; - static const string OUTFILE; - static const string PID; - static const string QUEUE; - static const string QUEUEDTIME; - static const string SERVER; - static const string STARTDATE; - static const string STATE; - static const string TEXT; - static const string TMPDIR; - static const string USEDCPUTIME; - static const string USEDDISKSIZE; - static const string USEDRAMSIZE; - static const string USEDWALLTIME; - static const string USER; + static const std::string ACCOUNT; + static const std::string CHECKPOINT; + static const std::string CKPTINTERVAL; + static const std::string CREATIONTIME; + static const std::string EGROUP; + static const std::string ELIGIBLETIME; + static const std::string EUSER; + static const std::string EXECUTABLE; + static const std::string EXECUTIONHOST; + static const std::string HOLD; + static const std::string ID; + static const std::string INFILE; + static const std::string MAIL; + static const std::string MAXCPUTIME; + static const std::string MAXDISKSIZE; + static const std::string MAXRAMSIZE; + static const std::string MAXWALLTIME; + static const std::string MODIFICATIONTIME; + static const std::string NAME; + static const std::string OUTFILE; + static const std::string PID; + static const std::string QUEUE; + static const std::string QUEUEDTIME; + static const std::string SERVER; + static const std::string STARTDATE; + static const std::string STATE; + static const std::string TEXT; + static const std::string TMPDIR; + static const std::string USEDCPUTIME; + static const std::string USEDDISKSIZE; + static const std::string USEDRAMSIZE; + static const std::string USEDWALLTIME; + static const std::string USER; protected: - map< string, TypeParam > TypeMap; // map interne servant a controler le type de la valeur associee a chaque clef + std::map< std::string, TypeParam > TypeMap; // map interne servant a controler le type de la valeur associee a chaque clef private: diff --git a/src/Batch/Batch_PyVersatile.hxx b/src/Batch/Batch_PyVersatile.hxx index c8321fb56..21c8104eb 100644 --- a/src/Batch/Batch_PyVersatile.hxx +++ b/src/Batch/Batch_PyVersatile.hxx @@ -17,6 +17,7 @@ #include "Batch_TypeMismatchException.hxx" #include "Batch_ListIsFullException.hxx" #include "Batch_InvalidArgumentException.hxx" +using namespace std; namespace Batch { diff --git a/src/Batch/Batch_RunTimeException.cxx b/src/Batch/Batch_RunTimeException.cxx index fd9156078..ebfe7d622 100644 --- a/src/Batch/Batch_RunTimeException.cxx +++ b/src/Batch/Batch_RunTimeException.cxx @@ -9,6 +9,7 @@ */ #include "Batch_RunTimeException.hxx" +using namespace std; namespace Batch { diff --git a/src/Batch/Batch_RunTimeException.hxx b/src/Batch/Batch_RunTimeException.hxx index 53194ac0b..2b64c4207 100644 --- a/src/Batch/Batch_RunTimeException.hxx +++ b/src/Batch/Batch_RunTimeException.hxx @@ -20,7 +20,7 @@ namespace Batch { { public: // Constructeur - RunTimeException(string ch = "undefined") : GenericException("RunTimeException", ch) {} + RunTimeException(std::string ch = "undefined") : GenericException("RunTimeException", ch) {} }; } diff --git a/src/Batch/Batch_StringType.cxx b/src/Batch/Batch_StringType.cxx index 4d71c333c..fa01f0331 100644 --- a/src/Batch/Batch_StringType.cxx +++ b/src/Batch/Batch_StringType.cxx @@ -9,6 +9,7 @@ #include #include "Batch_StringType.hxx" +using namespace std; namespace Batch { diff --git a/src/Batch/Batch_StringType.hxx b/src/Batch/Batch_StringType.hxx index 4471b2976..bc97b63a0 100644 --- a/src/Batch/Batch_StringType.hxx +++ b/src/Batch/Batch_StringType.hxx @@ -10,7 +10,6 @@ #ifndef _STRINGTYPE_H_ #define _STRINGTYPE_H_ -using namespace std; #include #include "Batch_GenericType.hxx" @@ -20,21 +19,21 @@ namespace Batch { { public: // Constructeur - StringType(const string & s="") : _data(s) {} + StringType(const std::string & s="") : _data(s) {} // Conversion en chaine - virtual string affiche() const; - virtual operator string() const; + virtual std::string affiche() const; + virtual operator std::string() const; // Operateur d'affectation - virtual StringType & operator =(string); + virtual StringType & operator =(std::string); // Clone duplique l'objet et en fabrique un nouveau a l'aide de new // qu'il faudra detruire ensuite manuellement virtual GenericType * clone() const; protected: - string _data; + std::string _data; private: diff --git a/src/Batch/Batch_TypeMismatchException.cxx b/src/Batch/Batch_TypeMismatchException.cxx index 7376eedb6..4575eda4a 100644 --- a/src/Batch/Batch_TypeMismatchException.cxx +++ b/src/Batch/Batch_TypeMismatchException.cxx @@ -8,6 +8,7 @@ */ #include "Batch_TypeMismatchException.hxx" +using namespace std; namespace Batch { diff --git a/src/Batch/Batch_TypeMismatchException.hxx b/src/Batch/Batch_TypeMismatchException.hxx index fb6d1f913..6aa7d0933 100644 --- a/src/Batch/Batch_TypeMismatchException.hxx +++ b/src/Batch/Batch_TypeMismatchException.hxx @@ -19,7 +19,7 @@ namespace Batch { { public: // Constructeur - TypeMismatchException(string ch = "undefined") : GenericException("TypeMismatchException", ch) {} + TypeMismatchException(std::string ch = "undefined") : GenericException("TypeMismatchException", ch) {} }; } diff --git a/src/Batch/Batch_Versatile.cxx b/src/Batch/Batch_Versatile.cxx index a0adaf1bc..8ed9d9a3e 100644 --- a/src/Batch/Batch_Versatile.cxx +++ b/src/Batch/Batch_Versatile.cxx @@ -21,6 +21,7 @@ #include "Batch_Versatile.hxx" #include "Batch_TypeMismatchException.hxx" #include "Batch_ListIsFullException.hxx" +using namespace std; namespace Batch { diff --git a/src/Batch/Batch_Versatile.hxx b/src/Batch/Batch_Versatile.hxx index bf44b961e..98d45c14a 100644 --- a/src/Batch/Batch_Versatile.hxx +++ b/src/Batch/Batch_Versatile.hxx @@ -10,7 +10,6 @@ #ifndef _VERSATILE_H_ #define _VERSATILE_H_ -using namespace std; #include #include #include @@ -35,7 +34,7 @@ namespace Batch { int maxelem; // le nombre d'elements autorises } TypeParam; - class Versatile : public list< GenericType * > + class Versatile : public std::list< GenericType * > { public: // Constructeur standard et destructeur @@ -47,14 +46,14 @@ namespace Batch { // Constructeur depuis le type de "base" Versatile(long l) : _discriminator(LONG), _maxsize(1), _name("long") { push_back(new LongType(l)); } - Versatile(const string & s) : _discriminator(STRING), _maxsize(1), _name("string") { push_back(new StringType(s)); } + Versatile(const std::string & s) : _discriminator(STRING), _maxsize(1), _name("string") { push_back(new StringType(s)); } Versatile(const Couple & c) : _discriminator(COUPLE), _maxsize(1), _name("couple") { push_back(new CoupleType(c)); } // Operateur d'affectation et de concatenation a partir d'un type de "base" Versatile & operator = (const long l) throw(TypeMismatchException); - Versatile & operator = (const string & ch) throw(TypeMismatchException); - Versatile & operator +=(const string & ch) throw(TypeMismatchException,ListIsFullException); - Versatile & operator , (const string & ch) throw(TypeMismatchException,ListIsFullException); + Versatile & operator = (const std::string & ch) throw(TypeMismatchException); + Versatile & operator +=(const std::string & ch) throw(TypeMismatchException,ListIsFullException); + Versatile & operator , (const std::string & ch) throw(TypeMismatchException,ListIsFullException); Versatile & operator = (const Couple & cp) throw(TypeMismatchException); Versatile & operator +=(const Couple & cp) throw(TypeMismatchException,ListIsFullException); Versatile & operator , (const Couple & cp) throw(TypeMismatchException,ListIsFullException); @@ -66,10 +65,10 @@ namespace Batch { operator long() const throw(TypeMismatchException); operator string() const throw(TypeMismatchException); operator Couple() const throw(TypeMismatchException); - string str() const throw(TypeMismatchException); + std::string str() const throw(TypeMismatchException); // Operateur pour l'affichage sur un stream - friend ostream & operator << (ostream & os, const Versatile & ); + friend std::ostream & operator << (std::ostream & os, const Versatile & ); // Positionnement et recuperation du type de l'element interne void setType(DiscriminatorType) throw(TypeMismatchException); @@ -81,7 +80,7 @@ namespace Batch { // Positionnement et recuperation du nom de l'objet string getName() const; - void setName(const string & name); + void setName(const std::string & name); protected: // Efface tous les elements internes de l'objet @@ -89,7 +88,7 @@ namespace Batch { DiscriminatorType _discriminator; // type de l'element interne int _maxsize; // nombre max d'elements internes - string _name; // nom de l'objet (sert pour les exceptions) + std::string _name; // nom de l'objet (sert pour les exceptions) private: diff --git a/src/CASCatch/CASCatch_SignalsHandler.cxx b/src/CASCatch/CASCatch_SignalsHandler.cxx index fd8cb5a0e..68cbb04bc 100644 --- a/src/CASCatch/CASCatch_SignalsHandler.cxx +++ b/src/CASCatch/CASCatch_SignalsHandler.cxx @@ -21,7 +21,7 @@ #include "CASCatch_SignalsHandler.h" #include - +using namespace std; CASCatch_SignalsHandler::CASCatch_SignalsHandler(bool theFloatingSignal) { diff --git a/src/Communication/MultiCommException.cxx b/src/Communication/MultiCommException.cxx index d649d9652..6eb40f7c6 100644 --- a/src/Communication/MultiCommException.cxx +++ b/src/Communication/MultiCommException.cxx @@ -1,4 +1,5 @@ #include "MultiCommException.hxx" +using namespace std; MultiCommException::MultiCommException(const char *message) { diff --git a/src/Communication/MultiCommException.hxx b/src/Communication/MultiCommException.hxx index 0f5466c86..fe029fc4a 100644 --- a/src/Communication/MultiCommException.hxx +++ b/src/Communication/MultiCommException.hxx @@ -3,11 +3,10 @@ #include -using namespace std; class MultiCommException { private: - string _message; + std::string _message; public: MultiCommException(const char *message); const char *what() const; diff --git a/src/Communication/Receiver.cxx b/src/Communication/Receiver.cxx index dc24b200f..559f8158e 100644 --- a/src/Communication/Receiver.cxx +++ b/src/Communication/Receiver.cxx @@ -1,5 +1,6 @@ #include "Receiver.hxx" #include +using namespace std; /*! return a deep copy of the array contained in the servant. diff --git a/src/Communication/ReceiverFactory.cxx b/src/Communication/ReceiverFactory.cxx index 31bcb6768..f3f0da6b1 100644 --- a/src/Communication/ReceiverFactory.cxx +++ b/src/Communication/ReceiverFactory.cxx @@ -1,5 +1,6 @@ #include "ReceiverFactory.hxx" #include "Receivers.hxx" +using namespace std; #ifdef COMP_CORBA_DOUBLE #define CorbaDNoCopyReceiver CorbaNCNoCopyReceiver diff --git a/src/Communication/Receivers.cxx b/src/Communication/Receivers.cxx index e01125aa7..a5d65ae15 100644 --- a/src/Communication/Receivers.cxx +++ b/src/Communication/Receivers.cxx @@ -1,5 +1,6 @@ #include "poa.h" #include "utilities.h" +using namespace std; #define TAILLE_SPLIT 100000 #define TIMEOUT 20 diff --git a/src/Communication/SALOMEMultiComm.cxx b/src/Communication/SALOMEMultiComm.cxx index 71c4135e6..c832478ab 100644 --- a/src/Communication/SALOMEMultiComm.cxx +++ b/src/Communication/SALOMEMultiComm.cxx @@ -1,4 +1,5 @@ #include "SALOMEMultiComm.hxx" +using namespace std; SALOMEMultiComm::SALOMEMultiComm():_type(SALOME::CORBA_) { diff --git a/src/Communication/SALOME_Comm_i.cxx b/src/Communication/SALOME_Comm_i.cxx index 00fe36a11..49dd14a17 100644 --- a/src/Communication/SALOME_Comm_i.cxx +++ b/src/Communication/SALOME_Comm_i.cxx @@ -7,6 +7,7 @@ #include "utilities.h" #include "SenderFactory.hxx" +using namespace std; CORBA::ORB_var &getGlobalORB(){ ORB_INIT &init = *SINGLETON_::Instance(); diff --git a/src/Communication/SALOME_Comm_i.hxx b/src/Communication/SALOME_Comm_i.hxx index 6a8c23ba9..3fac77789 100644 --- a/src/Communication/SALOME_Comm_i.hxx +++ b/src/Communication/SALOME_Comm_i.hxx @@ -11,7 +11,6 @@ #define TIMEOUT 20 -using namespace std; /*! Generic servant class for senders that factorizes all the common methods and attributes necessary to senders. diff --git a/src/Communication/SenderFactory.cxx b/src/Communication/SenderFactory.cxx index 35b4af0b9..3b1f81165 100644 --- a/src/Communication/SenderFactory.cxx +++ b/src/Communication/SenderFactory.cxx @@ -2,6 +2,7 @@ #include "utilities.h" #include "SALOMEMultiComm.hxx" #include "SALOME_Comm_i.hxx" +using namespace std; #ifdef COMP_CORBA_DOUBLE #define SALOME_CorbaDoubleSender SALOME_CorbaDoubleNCSender_i diff --git a/src/Container/Component_i.cxx b/src/Container/Component_i.cxx index cad8ba99c..a03faf92b 100644 --- a/src/Container/Component_i.cxx +++ b/src/Container/Component_i.cxx @@ -26,7 +26,6 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOME_Component_i.hxx" #include "RegistryConnexion.hxx" #include "OpUtil.hxx" @@ -34,6 +33,7 @@ using namespace std; #include #include #include "utilities.h" +using namespace std; extern bool _Sleeping ; static Engines_Component_i * theEngines_Component ; diff --git a/src/Container/SALOME_Container.cxx b/src/Container/SALOME_Container.cxx index 41a526d0a..02b2acce4 100644 --- a/src/Container/SALOME_Container.cxx +++ b/src/Container/SALOME_Container.cxx @@ -47,10 +47,10 @@ #include -extern "C" void HandleServerSideSignals(CORBA::ORB_ptr theORB); - using namespace std; +extern "C" void HandleServerSideSignals(CORBA::ORB_ptr theORB); + static PyMethodDef MethodPyVoidMethod[] = {{ NULL, NULL }}; int main(int argc, char* argv[]) diff --git a/src/Container/SALOME_Container_SignalsHandler.cxx b/src/Container/SALOME_Container_SignalsHandler.cxx index 268de2f0b..bb2d8989f 100644 --- a/src/Container/SALOME_Container_SignalsHandler.cxx +++ b/src/Container/SALOME_Container_SignalsHandler.cxx @@ -23,6 +23,7 @@ #include "CASCatch_SignalsHandler.h" // CAREFUL ! position of this file is critic : see Lucien PIGNOLONI / OCC +using namespace std; extern "C" void HandleServerSideSignals(CORBA::ORB_ptr theORB) { diff --git a/src/DataTypeCatalog/SALOME_DataTypeCatalog_Client.cxx b/src/DataTypeCatalog/SALOME_DataTypeCatalog_Client.cxx index 083cc4b14..580d16b5c 100644 --- a/src/DataTypeCatalog/SALOME_DataTypeCatalog_Client.cxx +++ b/src/DataTypeCatalog/SALOME_DataTypeCatalog_Client.cxx @@ -24,7 +24,6 @@ // File : SALOME_DataTypeCatalog_Client.cxx // Module : SALOME -using namespace std; /* $Header$ */ #include @@ -32,6 +31,7 @@ using namespace std; #include "SALOME_DataTypeCatalog.hh" #include #include "utilities.h" +using namespace std; int main(int argc,char **argv) { diff --git a/src/DataTypeCatalog/SALOME_DataTypeCatalog_impl.cxx b/src/DataTypeCatalog/SALOME_DataTypeCatalog_impl.cxx index 1fb5f45e1..cb5337e67 100644 --- a/src/DataTypeCatalog/SALOME_DataTypeCatalog_impl.cxx +++ b/src/DataTypeCatalog/SALOME_DataTypeCatalog_impl.cxx @@ -26,10 +26,10 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOME_DataTypeCatalog_impl.hxx" #include "Utils_ExceptHandlers.hxx" #include +using namespace std; UNEXPECT_CATCH(DTC_NotFound, SALOME_DataTypeCatalog::NotFound); diff --git a/src/Event/SALOME_Event.cxx b/src/Event/SALOME_Event.cxx index e12fc070f..97f81cc5f 100644 --- a/src/Event/SALOME_Event.cxx +++ b/src/Event/SALOME_Event.cxx @@ -34,6 +34,7 @@ #include #include #include +using namespace std; #ifdef _DEBUG_ static int MYDEBUG = 0; diff --git a/src/HDFPersist/HDFascii.cc b/src/HDFPersist/HDFascii.cc index 49cc43099..e5719df68 100644 --- a/src/HDFPersist/HDFascii.cc +++ b/src/HDFPersist/HDFascii.cc @@ -1,4 +1,3 @@ -using namespace std; // File : SALOMEDS_Tool.cxx // Created : Mon Oct 21 16:24:34 2002 // Author : Sergey RUIN @@ -19,6 +18,7 @@ using namespace std; #include #include #include +using namespace std; bool CreateAttributeFromASCII(HDFinternalObject *father, FILE* fp); bool CreateDatasetFromASCII(HDFcontainerObject *father, FILE *fp); diff --git a/src/HDFPersist/HDFattribute.cc b/src/HDFPersist/HDFattribute.cc index b87cb0799..5dff5b35e 100644 --- a/src/HDFPersist/HDFattribute.cc +++ b/src/HDFPersist/HDFattribute.cc @@ -24,7 +24,6 @@ // File : HDFattribute.cc // Module : SALOME -using namespace std; extern "C" { #include "hdfi.h" @@ -32,6 +31,7 @@ extern "C" #include "HDFexception.hxx" #include "HDFattribute.hxx" #include "HDFinternalObject.hxx" +using namespace std; HDFattribute::HDFattribute(char *name,HDFinternalObject *father,hdf_type type, size_t size) : HDFobject(name) diff --git a/src/HDFPersist/HDFcontainerObject.cc b/src/HDFPersist/HDFcontainerObject.cc index 2f5398bd7..1a84b1db1 100644 --- a/src/HDFPersist/HDFcontainerObject.cc +++ b/src/HDFPersist/HDFcontainerObject.cc @@ -24,7 +24,6 @@ // File : HDFcontainerObject.cc // Module : SALOME -using namespace std; extern "C" { #include "hdfi.h" @@ -32,6 +31,7 @@ extern "C" #include "HDFcontainerObject.hxx" #include "HDFexception.hxx" #include "utilities.h" +using namespace std; HDFcontainerObject::HDFcontainerObject(char *name) : HDFinternalObject(name) diff --git a/src/HDFPersist/HDFconvert.cc b/src/HDFPersist/HDFconvert.cc index 31c19c953..434c666da 100644 --- a/src/HDFPersist/HDFconvert.cc +++ b/src/HDFPersist/HDFconvert.cc @@ -24,8 +24,8 @@ // File : HDFconvert.cc // Module : SALOME -using namespace std; #include "HDFconvert.hxx" +using namespace std; int HDFConvert::FromAscii(const string& file, const HDFcontainerObject & hdf_container, const string& nomdataset) { diff --git a/src/HDFPersist/HDFdataset.cc b/src/HDFPersist/HDFdataset.cc index 07d75e11c..ac02e32db 100644 --- a/src/HDFPersist/HDFdataset.cc +++ b/src/HDFPersist/HDFdataset.cc @@ -24,7 +24,6 @@ // File : HDFdataset.cc // Module : SALOME -using namespace std; extern "C" { #include "hdfi.h" @@ -35,6 +34,7 @@ extern "C" #include "HDFexception.hxx" #include +using namespace std; herr_t dataset_attr(hid_t loc_id, const char *attr_name, void *operator_data) { diff --git a/src/HDFPersist/HDFexplorer.cc b/src/HDFPersist/HDFexplorer.cc index 2e86f820e..114732d48 100644 --- a/src/HDFPersist/HDFexplorer.cc +++ b/src/HDFPersist/HDFexplorer.cc @@ -24,11 +24,11 @@ // File : HDFexplorer.cc // Module : SALOME -using namespace std; #include "HDFcontainerObject.hxx" #include "HDFexception.hxx" #include "HDFinternalObject.hxx" #include "HDFexplorer.hxx" +using namespace std; HDFexplorer::HDFexplorer(HDFcontainerObject *container) { diff --git a/src/HDFPersist/HDFfile.cc b/src/HDFPersist/HDFfile.cc index 469430a34..9fbe7d70d 100644 --- a/src/HDFPersist/HDFfile.cc +++ b/src/HDFPersist/HDFfile.cc @@ -24,7 +24,6 @@ // File : HDFfile.cc // Module : SALOME -using namespace std; extern "C" { #include "hdfi.h" @@ -34,6 +33,7 @@ extern "C" #include #include "HDFfile.hxx" #include "HDFexception.hxx" +using namespace std; herr_t file_attr(hid_t loc_id, const char *attr_name, void *operator_data) { diff --git a/src/HDFPersist/HDFgroup.cc b/src/HDFPersist/HDFgroup.cc index b08f4de6e..a51e13b0b 100644 --- a/src/HDFPersist/HDFgroup.cc +++ b/src/HDFPersist/HDFgroup.cc @@ -24,7 +24,6 @@ // File : HDFgroup.cc // Module : SALOME -using namespace std; extern "C" { #include "hdfi.h" @@ -32,6 +31,7 @@ extern "C" } #include "HDFgroup.hxx" #include "HDFexception.hxx" +using namespace std; herr_t group_attr(hid_t loc_id, const char *attr_name, void *operator_data) { diff --git a/src/HDFPersist/HDFinternalObject.cc b/src/HDFPersist/HDFinternalObject.cc index 2cf6ed011..7ef6fb8e7 100644 --- a/src/HDFPersist/HDFinternalObject.cc +++ b/src/HDFPersist/HDFinternalObject.cc @@ -24,12 +24,12 @@ // File : HDFinternalObject.cc // Module : SALOME -using namespace std; extern "C" { #include "hdfi.h" } #include "HDFinternalObject.hxx" +using namespace std; HDFinternalObject::HDFinternalObject(char *name) : HDFobject(name) diff --git a/src/HDFPersist/HDFobject.cc b/src/HDFPersist/HDFobject.cc index 81fc689c8..28b87a63f 100644 --- a/src/HDFPersist/HDFobject.cc +++ b/src/HDFPersist/HDFobject.cc @@ -24,7 +24,6 @@ // File : HDFobject.cc // Module : SALOME -using namespace std; #include "HDFobject.hxx" extern "C" { @@ -32,6 +31,7 @@ extern "C" #include } #include "utilities.h" +using namespace std; HDFobject::HDFobject(char *name) { diff --git a/src/HDFPersist/test3.cxx b/src/HDFPersist/test3.cxx index 9f28614af..a1922f9b9 100644 --- a/src/HDFPersist/test3.cxx +++ b/src/HDFPersist/test3.cxx @@ -24,10 +24,10 @@ // File : test3.cxx // Module : SALOME -using namespace std; #include #include "HDFOI.hxx" #include +using namespace std; int main() diff --git a/src/HDFPersist/test4.cxx b/src/HDFPersist/test4.cxx index 9c85af23f..04bdc37c5 100644 --- a/src/HDFPersist/test4.cxx +++ b/src/HDFPersist/test4.cxx @@ -24,10 +24,10 @@ // File : test4.cxx // Module : SALOME -using namespace std; #include #include "HDFOI.hxx" #include +using namespace std; int main() diff --git a/src/HDFPersist/test5.cxx b/src/HDFPersist/test5.cxx index e025798dd..33ab02da9 100644 --- a/src/HDFPersist/test5.cxx +++ b/src/HDFPersist/test5.cxx @@ -24,10 +24,10 @@ // File : test5.cxx // Module : SALOME -using namespace std; #include #include "HDFOI.hxx" #include +using namespace std; int main() diff --git a/src/HDFPersist/test6.cxx b/src/HDFPersist/test6.cxx index 8be92dec0..cd92a5d14 100644 --- a/src/HDFPersist/test6.cxx +++ b/src/HDFPersist/test6.cxx @@ -24,10 +24,10 @@ // File : test6.cxx // Module : SALOME -using namespace std; #include #include "HDFOI.hxx" #include +using namespace std; int main() { diff --git a/src/HDFPersist/test7.cxx b/src/HDFPersist/test7.cxx index 935834bd2..00d445738 100644 --- a/src/HDFPersist/test7.cxx +++ b/src/HDFPersist/test7.cxx @@ -24,9 +24,9 @@ // File : test7.cxx // Module : SALOME -using namespace std; #include "HDFIO.hxx" #include +using namespace std; int main() { diff --git a/src/HDFPersist/test8.cxx b/src/HDFPersist/test8.cxx index c53e84d29..f73c840a4 100644 --- a/src/HDFPersist/test8.cxx +++ b/src/HDFPersist/test8.cxx @@ -24,10 +24,10 @@ // File : test8.cxx // Module : SALOME -using namespace std; #include #include "HDFOI.hxx" #include +using namespace std; int main() diff --git a/src/HDFPersist/test9.cxx b/src/HDFPersist/test9.cxx index 605eb0793..0034c4242 100644 --- a/src/HDFPersist/test9.cxx +++ b/src/HDFPersist/test9.cxx @@ -24,10 +24,10 @@ // File : test9.cxx // Module : SALOME -using namespace std; #include #include "HDFOI.hxx" #include +using namespace std; int main() diff --git a/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx b/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx index e86b0c0a1..7908d60ae 100644 --- a/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx +++ b/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx @@ -26,7 +26,6 @@ // Module : SALOME // $Header$ -using namespace std; #include #include #include @@ -40,6 +39,7 @@ using namespace std; #include "SALOME_LifeCycleCORBA.hxx" #include CORBA_CLIENT_HEADER(SALOME_ModuleCatalog) #include "SALOME_NamingService.hxx" +using namespace std; SALOME_LifeCycleCORBA::SALOME_LifeCycleCORBA() { diff --git a/src/LifeCycleCORBA/TestLifeCycleCORBA.cxx b/src/LifeCycleCORBA/TestLifeCycleCORBA.cxx index b67b988b6..603c32814 100644 --- a/src/LifeCycleCORBA/TestLifeCycleCORBA.cxx +++ b/src/LifeCycleCORBA/TestLifeCycleCORBA.cxx @@ -26,7 +26,6 @@ // Module : SALOME // $Header$ -using namespace std; #include "utilities.h" #include #include @@ -36,6 +35,7 @@ using namespace std; #include "SALOME_NamingService.hxx" #include "SALOME_LifeCycleCORBA.hxx" #include +using namespace std; int main (int argc, char * argv[]) { diff --git a/src/Loader/InquireServersQThread.cxx b/src/Loader/InquireServersQThread.cxx index d93260dc2..a293e4766 100644 --- a/src/Loader/InquireServersQThread.cxx +++ b/src/Loader/InquireServersQThread.cxx @@ -7,7 +7,6 @@ // Module : SALOME // $Header$ -using namespace std; #include "utilities.h" #include "InquireServersQThread.h" @@ -37,6 +36,7 @@ using namespace std; #include "SALOME_NamingService.hxx" //#include "utilities.h" #include "OpUtil.hxx" +using namespace std; #include CORBA_CLIENT_HEADER(SALOME_Session) #include CORBA_CLIENT_HEADER(SALOME_Registry) diff --git a/src/Loader/SALOME_Session_Loader.cxx b/src/Loader/SALOME_Session_Loader.cxx index 09cdad05e..0db216d3c 100644 --- a/src/Loader/SALOME_Session_Loader.cxx +++ b/src/Loader/SALOME_Session_Loader.cxx @@ -7,7 +7,6 @@ // Module : SALOME // $Header$ -using namespace std; /*! \file SALOME_Session_loader.cxx */ @@ -28,6 +27,7 @@ using namespace std; #include #include "InquireServersQThread.h" +using namespace std; int main(int argc, char **argv) { diff --git a/src/Logger/SALOME_Logger_Server.cxx b/src/Logger/SALOME_Logger_Server.cxx index 5d1b3a4a7..df2cd8a1c 100644 --- a/src/Logger/SALOME_Logger_Server.cxx +++ b/src/Logger/SALOME_Logger_Server.cxx @@ -8,12 +8,13 @@ // Author : Vasily Rusyaev // Module : SALOME -using namespace std; #include #include "SALOME_Logger_Server.hxx" #include #include #include +using namespace std; + omni_mutex Logger::myLock; ///////////////////////////////////////////////////////////////////// diff --git a/src/Logger/SALOME_Trace.cxx b/src/Logger/SALOME_Trace.cxx index d139476c1..1a33333eb 100644 --- a/src/Logger/SALOME_Trace.cxx +++ b/src/Logger/SALOME_Trace.cxx @@ -8,13 +8,13 @@ // Author : Vasily Rusyaev // Module : SALOME -using namespace std; #include "SALOME_Trace.hxx" #include #include //#include #include #include +using namespace std; ////////////////////////////////////////////////////////////////////// // Construction/Destruction diff --git a/src/MPIContainer/MPIContainer_i.cxx b/src/MPIContainer/MPIContainer_i.cxx index b3fb62e6b..e02449626 100644 --- a/src/MPIContainer/MPIContainer_i.cxx +++ b/src/MPIContainer/MPIContainer_i.cxx @@ -24,12 +24,12 @@ // File : MPIContainer_i.cxx // Module : SALOME -using namespace std; #include #include #include #include "MPIContainer_i.hxx" #include "utilities.h" +using namespace std; MPIContainer_i::MPIContainer_i(int nbproc, int numproc, CORBA::ORB_ptr orb, diff --git a/src/MPIContainer/MPIObject_i.cxx b/src/MPIContainer/MPIObject_i.cxx index 7f9324a9f..c32e204bd 100644 --- a/src/MPIContainer/MPIObject_i.cxx +++ b/src/MPIContainer/MPIObject_i.cxx @@ -24,10 +24,10 @@ // File : MPIObject_i.cxx // Module : SALOME -using namespace std; #include "MPIObject_i.hxx" #include "utilities.h" #include +using namespace std; MPIObject_i::MPIObject_i() { diff --git a/src/MPIContainer/SALOME_MPIContainer.cxx b/src/MPIContainer/SALOME_MPIContainer.cxx index d6e19149e..5f008c70c 100644 --- a/src/MPIContainer/SALOME_MPIContainer.cxx +++ b/src/MPIContainer/SALOME_MPIContainer.cxx @@ -24,12 +24,12 @@ // File : SALOME_MPIContainer.cxx // Module : SALOME -using namespace std; #include #include "MPIContainer_i.hxx" #include "utilities.h" #include "LocalTraceCollector.hxx" #include +using namespace std; int main(int argc, char* argv[]) { diff --git a/src/MPILifeCycleCORBA/TestMPILifeCycleCORBA.cxx b/src/MPILifeCycleCORBA/TestMPILifeCycleCORBA.cxx index 9e2c5c160..680ba3766 100644 --- a/src/MPILifeCycleCORBA/TestMPILifeCycleCORBA.cxx +++ b/src/MPILifeCycleCORBA/TestMPILifeCycleCORBA.cxx @@ -21,6 +21,7 @@ #include "SALOME_NamingService.hxx" #include "SALOME_MPILifeCycleCORBA.hxx" #include "OpUtil.hxx" +using namespace std; int main (int argc, char * argv[]) { diff --git a/src/MSG2QM/msg2qm.cxx b/src/MSG2QM/msg2qm.cxx index a7838c30d..57dac48d0 100644 --- a/src/MSG2QM/msg2qm.cxx +++ b/src/MSG2QM/msg2qm.cxx @@ -15,7 +15,6 @@ ** *****************************************************************************/ -using namespace std; #include #include #include @@ -23,6 +22,7 @@ using namespace std; #include #include +using namespace std; static QString* defaultScope = 0; diff --git a/src/ModuleCatalog/SALOME_ModuleCatalog_Handler.cxx b/src/ModuleCatalog/SALOME_ModuleCatalog_Handler.cxx index 19275eec5..0a8f27f4e 100644 --- a/src/ModuleCatalog/SALOME_ModuleCatalog_Handler.cxx +++ b/src/ModuleCatalog/SALOME_ModuleCatalog_Handler.cxx @@ -33,6 +33,7 @@ #include "utilities.h" #include +using namespace std; #ifdef _DEBUG_ static int MYDEBUG = 0; diff --git a/src/NOTIFICATION_SWIG/NOTIFICATION_Swig.cxx b/src/NOTIFICATION_SWIG/NOTIFICATION_Swig.cxx index 6e36d52a9..40bc4a12a 100644 --- a/src/NOTIFICATION_SWIG/NOTIFICATION_Swig.cxx +++ b/src/NOTIFICATION_SWIG/NOTIFICATION_Swig.cxx @@ -25,8 +25,8 @@ // Author : Francis KLOSS // Module : SALOME -using namespace std; #include "NOTIFICATION_Swig.hxx" +using namespace std; // Swig notification supplier // -------------------------- diff --git a/src/NOTIFICATION_SWIG/NOTIFICATION_Swig.hxx b/src/NOTIFICATION_SWIG/NOTIFICATION_Swig.hxx index f2361808c..a56c730c5 100644 --- a/src/NOTIFICATION_SWIG/NOTIFICATION_Swig.hxx +++ b/src/NOTIFICATION_SWIG/NOTIFICATION_Swig.hxx @@ -25,7 +25,6 @@ // Author : Francis KLOSS // Module : SALOME -using namespace std; #include "NOTIFICATION.hxx" class NOTIFICATION_Supplier_Swig { diff --git a/src/NamingService/ServiceUnreachable.cxx b/src/NamingService/ServiceUnreachable.cxx index 4b03e8d16..7fa194f76 100644 --- a/src/NamingService/ServiceUnreachable.cxx +++ b/src/NamingService/ServiceUnreachable.cxx @@ -24,8 +24,8 @@ // File : ServiceUnreachable.cxx // Module : SALOME -using namespace std; #include "ServiceUnreachable.hxx" +using namespace std; ServiceUnreachable::ServiceUnreachable( void ): SALOME_Exception( "ServiceUnreachable" ) { diff --git a/src/Notification/NOTIFICATION.cxx b/src/Notification/NOTIFICATION.cxx index 1058d706e..bbbb92294 100644 --- a/src/Notification/NOTIFICATION.cxx +++ b/src/Notification/NOTIFICATION.cxx @@ -25,12 +25,11 @@ // Author : Laurent DADA / Francis KLOSS // Module : SALOME -using namespace std; #include "NOTIFICATION.hxx" -using namespace std; #include "Utils_ORB_INIT.hxx" #include "Utils_SINGLETON.hxx" +using namespace std; CosNA_EventChannel_ptr NOTIFICATION_channel() { ORB_INIT& init = *SINGLETON_::Instance(); ASSERT(SINGLETON_::IsAlreadyExisting()); diff --git a/src/Notification/NOTIFICATION_Consumer.cxx b/src/Notification/NOTIFICATION_Consumer.cxx index f7bc0d67d..88591375b 100644 --- a/src/Notification/NOTIFICATION_Consumer.cxx +++ b/src/Notification/NOTIFICATION_Consumer.cxx @@ -25,8 +25,8 @@ // Author : Laurent DADA / Francis KLOSS // Module : SALOME -using namespace std; #include "NOTIFICATION.hxx" +using namespace std; NOTIFICATION_Consumer::NOTIFICATION_Consumer(): proxy_supplier(0), diff --git a/src/Notification/NOTIFICATION_Supplier.cxx b/src/Notification/NOTIFICATION_Supplier.cxx index b572539a4..83d3787a6 100644 --- a/src/Notification/NOTIFICATION_Supplier.cxx +++ b/src/Notification/NOTIFICATION_Supplier.cxx @@ -25,8 +25,8 @@ // Author : Laurent DADA / Francis KLOSS // Module : SALOME -using namespace std; #include "NOTIFICATION.hxx" +using namespace std; long NOTIFICATION_Supplier::_stamp = 0; diff --git a/src/OBJECT/SALOME_AISObject.cxx b/src/OBJECT/SALOME_AISObject.cxx index 2d34b31a2..46abdd1d6 100644 --- a/src/OBJECT/SALOME_AISObject.cxx +++ b/src/OBJECT/SALOME_AISObject.cxx @@ -26,5 +26,5 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOME_AISObject.ixx" +using namespace std; diff --git a/src/OBJECT/SALOME_AISShape.cxx b/src/OBJECT/SALOME_AISShape.cxx index 117738ffa..b439aef2b 100644 --- a/src/OBJECT/SALOME_AISShape.cxx +++ b/src/OBJECT/SALOME_AISShape.cxx @@ -26,8 +26,8 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOME_AISShape.ixx" +using namespace std; SALOME_AISShape::SALOME_AISShape(const TopoDS_Shape& shape): AIS_Shape(shape) { } diff --git a/src/OBJECT/SALOME_InteractiveObject.cxx b/src/OBJECT/SALOME_InteractiveObject.cxx index 4f07e3b88..4da402dc6 100644 --- a/src/OBJECT/SALOME_InteractiveObject.cxx +++ b/src/OBJECT/SALOME_InteractiveObject.cxx @@ -26,13 +26,13 @@ // Module : SALOME // $Header$ -using namespace std; /*! \class SALOME_InteractiveObject SALOME_InteractiveObject.hxx \brief ... */ #include "SALOME_InteractiveObject.ixx" +using namespace std; SALOME_InteractiveObject::SALOME_InteractiveObject() { diff --git a/src/OCCViewer/OCCViewer.cxx b/src/OCCViewer/OCCViewer.cxx index d98bb2b1f..70a92624c 100644 --- a/src/OCCViewer/OCCViewer.cxx +++ b/src/OCCViewer/OCCViewer.cxx @@ -26,9 +26,9 @@ // Module : SALOME // $Header$ -using namespace std; #include "OCCViewer.h" #include "OCCViewer_ViewFrame.h" +using namespace std; QAD_ViewFrame* OCCViewer::createView(QAD_RightFrame* parent) { diff --git a/src/OCCViewer/OCCViewer_AISSelector.cxx b/src/OCCViewer/OCCViewer_AISSelector.cxx index 826b8d285..a5f5a38a0 100644 --- a/src/OCCViewer/OCCViewer_AISSelector.cxx +++ b/src/OCCViewer/OCCViewer_AISSelector.cxx @@ -26,7 +26,6 @@ // Module : SALOME // $Header$ -using namespace std; /*! \class OCCViewer_AISSelector OCCViewer_AISSelector.h \brief Selector for AIS interactive context. @@ -35,6 +34,7 @@ using namespace std; */ #include "OCCViewer_AISSelector.h" +using namespace std; /*! Constructor diff --git a/src/OCCViewer/OCCViewer_Prs.cxx b/src/OCCViewer/OCCViewer_Prs.cxx index 133bd4b71..35cd69f32 100644 --- a/src/OCCViewer/OCCViewer_Prs.cxx +++ b/src/OCCViewer/OCCViewer_Prs.cxx @@ -27,6 +27,7 @@ // $Header$ #include "OCCViewer_Prs.h" +using namespace std; //========================================================== /*! diff --git a/src/OCCViewer/OCCViewer_VService.cxx b/src/OCCViewer/OCCViewer_VService.cxx index e0ed072a6..eca0fbbb8 100644 --- a/src/OCCViewer/OCCViewer_VService.cxx +++ b/src/OCCViewer/OCCViewer_VService.cxx @@ -26,7 +26,6 @@ // Module : SALOME // $Header$ -using namespace std; #include "OCCViewer_VService.h" // Open CASCADE Includes @@ -51,6 +50,7 @@ using namespace std; #include #include #endif +using namespace std; // For 2d #define LOPTIM diff --git a/src/OCCViewer/OCCViewer_ViewFrame.cxx b/src/OCCViewer/OCCViewer_ViewFrame.cxx index b43955be1..47e4def85 100644 --- a/src/OCCViewer/OCCViewer_ViewFrame.cxx +++ b/src/OCCViewer/OCCViewer_ViewFrame.cxx @@ -26,7 +26,6 @@ // Module : SALOME // $Header$ -using namespace std; #include "OCCViewer_ViewFrame.h" #include "OCCViewer_Viewer3d.h" #include "OCCViewer_ViewPort.h" @@ -53,6 +52,7 @@ using namespace std; #include #include #include +using namespace std; /*! Constructor diff --git a/src/OCCViewer/OCCViewer_ViewPort3d.cxx b/src/OCCViewer/OCCViewer_ViewPort3d.cxx index 1782f8785..9ea1b6828 100644 --- a/src/OCCViewer/OCCViewer_ViewPort3d.cxx +++ b/src/OCCViewer/OCCViewer_ViewPort3d.cxx @@ -26,7 +26,6 @@ // Module : SALOME // $Header$ -using namespace std; #include "OCCViewer_ViewPort3d.h" #include "QAD.h" @@ -46,6 +45,7 @@ using namespace std; #if !defined WNT #include #endif +using namespace std; /*! Constructor diff --git a/src/OCCViewer/OCCViewer_Viewer3d.cxx b/src/OCCViewer/OCCViewer_Viewer3d.cxx index cd97a6e90..fae548a60 100644 --- a/src/OCCViewer/OCCViewer_Viewer3d.cxx +++ b/src/OCCViewer/OCCViewer_Viewer3d.cxx @@ -26,7 +26,6 @@ // Module : SALOME // $Header$ -using namespace std; /*! \class OCCViewer_Viewer3d OCCViewer_Viewer3d.h \brief Open CASCADE Viewer 3D with viewport 3D and selection. @@ -62,6 +61,7 @@ using namespace std; #include #include #include +using namespace std; DEFINE_BASECOLLECTION( OCCViewer_CollectionOfIndexedMapOfShapes, TopTools_IndexedMapOfShape ) DEFINE_DATAMAP( OCCViewer_MapOfIOIndexedMapOfShape, OCCViewer_CollectionOfIndexedMapOfShapes, Handle_SALOME_InteractiveObject, TopTools_IndexedMapOfShape) diff --git a/src/Plot2d/Plot2d.cxx b/src/Plot2d/Plot2d.cxx index 9aa2f06d3..3034de6e6 100644 --- a/src/Plot2d/Plot2d.cxx +++ b/src/Plot2d/Plot2d.cxx @@ -9,6 +9,7 @@ #include "Plot2d.h" #include "Plot2d_ViewFrame.h" +using namespace std; QAD_ViewFrame* Plot2d::createView(QAD_RightFrame* parent) { diff --git a/src/Plot2d/Plot2d_Curve.cxx b/src/Plot2d/Plot2d_Curve.cxx index 8d15c56ae..e32f477e0 100644 --- a/src/Plot2d/Plot2d_Curve.cxx +++ b/src/Plot2d/Plot2d_Curve.cxx @@ -7,9 +7,9 @@ // Module : SALOME // $Header$ -using namespace std; #include "Plot2d_Curve.h" #include "utilities.h" +using namespace std; /*! Constructor diff --git a/src/Plot2d/Plot2d_CurveContainer.cxx b/src/Plot2d/Plot2d_CurveContainer.cxx index b5267b086..895328d59 100644 --- a/src/Plot2d/Plot2d_CurveContainer.cxx +++ b/src/Plot2d/Plot2d_CurveContainer.cxx @@ -7,8 +7,8 @@ // Module : SALOME // $Header$ -using namespace std; #include "Plot2d_CurveContainer.h" +using namespace std; /*! Constructor diff --git a/src/Plot2d/Plot2d_FitDataDlg.cxx b/src/Plot2d/Plot2d_FitDataDlg.cxx index 07c77fca8..c9fde0205 100644 --- a/src/Plot2d/Plot2d_FitDataDlg.cxx +++ b/src/Plot2d/Plot2d_FitDataDlg.cxx @@ -14,6 +14,7 @@ #include "QAD_Tools.h" #include "QAD_Application.h" #include "QAD_Desktop.h" +using namespace std; #define SPACING_SIZE 6 #define MARGIN_SIZE 11 diff --git a/src/Plot2d/Plot2d_Prs.cxx b/src/Plot2d/Plot2d_Prs.cxx index 2db19dfc4..8f3ec0687 100644 --- a/src/Plot2d/Plot2d_Prs.cxx +++ b/src/Plot2d/Plot2d_Prs.cxx @@ -27,6 +27,7 @@ // $Header$ #include "Plot2d_Prs.h" +using namespace std; //========================================================== /*! diff --git a/src/Plot2d/Plot2d_SetupViewDlg.cxx b/src/Plot2d/Plot2d_SetupViewDlg.cxx index bc80cd164..c7e157eec 100644 --- a/src/Plot2d/Plot2d_SetupViewDlg.cxx +++ b/src/Plot2d/Plot2d_SetupViewDlg.cxx @@ -20,6 +20,7 @@ #include #include #include +using namespace std; #define MARGIN_SIZE 11 #define SPACING_SIZE 6 diff --git a/src/Plot2d/Plot2d_ViewFrame.cxx b/src/Plot2d/Plot2d_ViewFrame.cxx index 53a7b3d92..49f5cbdd3 100644 --- a/src/Plot2d/Plot2d_ViewFrame.cxx +++ b/src/Plot2d/Plot2d_ViewFrame.cxx @@ -36,6 +36,7 @@ #include #include CORBA_SERVER_HEADER(SALOMEDS) #include CORBA_SERVER_HEADER(SALOMEDS_Attributes) +using namespace std; #define DEFAULT_LINE_WIDTH 0 // (default) line width #define DEFAULT_MARKER_SIZE 9 // default marker size diff --git a/src/Registry/RegistryConnexion.cxx b/src/Registry/RegistryConnexion.cxx index e11f5a221..bf33e0882 100644 --- a/src/Registry/RegistryConnexion.cxx +++ b/src/Registry/RegistryConnexion.cxx @@ -26,8 +26,6 @@ // Module : SALOME // $Header$ -using namespace std; -using namespace std; # include "Utils_ORB_INIT.hxx" # include "RegistryConnexion.hxx" # include "SALOME_NamingService.hxx" @@ -41,6 +39,7 @@ extern "C" { # include } +using namespace std; Registry::Components_var Connexion( int argc , char **argv , const char *ptrSessionName ) throw( CommException ) diff --git a/src/Registry/RegistryConnexion.hxx b/src/Registry/RegistryConnexion.hxx index 6f2509258..5b945cd41 100644 --- a/src/Registry/RegistryConnexion.hxx +++ b/src/Registry/RegistryConnexion.hxx @@ -42,8 +42,8 @@ class RegistryConnexion protected : const char* _Ior ; // engine ior Registry::Components_var _VarComponents ; // RegistryService reference - string _SessionName ; - string _Name ; // code name + std::string _SessionName ; + std::string _Name ; // code name int _Id ; // code identity returned by RegistryService void add( const char *aName ); void remove( void ); diff --git a/src/Registry/RegistryService.cxx b/src/Registry/RegistryService.cxx index 94dfa3034..8aed1d77f 100644 --- a/src/Registry/RegistryService.cxx +++ b/src/Registry/RegistryService.cxx @@ -26,8 +26,6 @@ // Module : SALOME // $Header$ -using namespace std; -using namespace std; # include "RegistryService.hxx" # include "OpUtil.hxx" # include "utilities.h" @@ -38,6 +36,7 @@ extern "C" } #include +using namespace std; /* ------------------------------*/ /* Constructeurs et Destructeurs */ diff --git a/src/Registry/RegistryService.hxx b/src/Registry/RegistryService.hxx index 3c26d92b7..63f7d57e4 100644 --- a/src/Registry/RegistryService.hxx +++ b/src/Registry/RegistryService.hxx @@ -34,7 +34,6 @@ # include -using namespace std; class RegistryService : public POA_Registry::Components //, public PortableServer::RefCountServantBase { @@ -88,10 +87,10 @@ protected : const char *_SessionName ; int _Compteur ; - map _reg ; - map _fin ; + std::map _reg ; + std::map _fin ; - Registry::AllInfos* makeseq(map &mymap ); + Registry::AllInfos* makeseq(std::map &mymap ); } ; diff --git a/src/RegistryDisplay/HelpWindow.cxx b/src/RegistryDisplay/HelpWindow.cxx index 3d8b682cc..40889fe28 100644 --- a/src/RegistryDisplay/HelpWindow.cxx +++ b/src/RegistryDisplay/HelpWindow.cxx @@ -26,7 +26,6 @@ // Module : SALOME // $Header$ -using namespace std; # include "HelpWindow.hxx" # include "utilities.h" @@ -34,6 +33,7 @@ using namespace std; # include # include # include +using namespace std; HelpWindow::HelpWindow(QWidget* parent, const char* name ) : QMainWindow( parent, name, WType_TopLevel | WDestructiveClose ) diff --git a/src/RegistryDisplay/IntervalWindow.cxx b/src/RegistryDisplay/IntervalWindow.cxx index 9f1a5d212..239de1fe0 100644 --- a/src/RegistryDisplay/IntervalWindow.cxx +++ b/src/RegistryDisplay/IntervalWindow.cxx @@ -15,6 +15,7 @@ #include #include # include "utilities.h" +using namespace std; #define MARGIN_SIZE 11 #define SPACING_SIZE 6 diff --git a/src/RegistryDisplay/IntervalWindow.hxx b/src/RegistryDisplay/IntervalWindow.hxx index c5a2b0f79..9e732f1b2 100644 --- a/src/RegistryDisplay/IntervalWindow.hxx +++ b/src/RegistryDisplay/IntervalWindow.hxx @@ -16,7 +16,6 @@ # include # include -using namespace std; class IntervalWindow : public QDialog { diff --git a/src/RegistryDisplay/RegWidget.cxx b/src/RegistryDisplay/RegWidget.cxx index d78d5150f..a2cb69e3b 100644 --- a/src/RegistryDisplay/RegWidget.cxx +++ b/src/RegistryDisplay/RegWidget.cxx @@ -26,7 +26,6 @@ // Module : SALOME // $Header$ -using namespace std; # include # include # include @@ -49,6 +48,7 @@ using namespace std; # include "RegWidget.hxx" # include "HelpWindow.hxx" # include "IntervalWindow.hxx" +using namespace std; typedef int PIXELS; RegWidget* RegWidget::myRegWidgetPtr = 0; diff --git a/src/RegistryDisplay/RegWidgetFactory.cxx b/src/RegistryDisplay/RegWidgetFactory.cxx index 341e60d54..ffef14c4d 100644 --- a/src/RegistryDisplay/RegWidgetFactory.cxx +++ b/src/RegistryDisplay/RegWidgetFactory.cxx @@ -26,9 +26,9 @@ // Module : SALOME // $Header$ -using namespace std; # include "RegWidget.hxx" # include "utilities.h" +using namespace std; extern "C" { diff --git a/src/RessourcesCatalog/SALOME_RessourcesCatalog_Client.cxx b/src/RessourcesCatalog/SALOME_RessourcesCatalog_Client.cxx index c6a524cde..d368d878f 100644 --- a/src/RessourcesCatalog/SALOME_RessourcesCatalog_Client.cxx +++ b/src/RessourcesCatalog/SALOME_RessourcesCatalog_Client.cxx @@ -24,7 +24,6 @@ // File : SALOME_RessourcesCatalog_Client.cxx // Module : SALOME -using namespace std; /* $Header$ */ #include @@ -33,6 +32,7 @@ using namespace std; #include CORBA_SERVER_HEADER(SALOME_RessourcesCatalog) #include #include "utilities.h" +using namespace std; int main(int argc,char **argv) { diff --git a/src/RessourcesCatalog/SALOME_RessourcesCatalog_impl.cxx b/src/RessourcesCatalog/SALOME_RessourcesCatalog_impl.cxx index cc819e495..5a1d7bed4 100644 --- a/src/RessourcesCatalog/SALOME_RessourcesCatalog_impl.cxx +++ b/src/RessourcesCatalog/SALOME_RessourcesCatalog_impl.cxx @@ -25,11 +25,11 @@ // Author : Estelle Deville // Module : SALOME -using namespace std; #include "SALOME_RessourcesCatalog_impl.hxx" #include #include "Utils_ExceptHandlers.hxx" +using namespace std; UNEXPECT_CATCH(RC_NotFound, SALOME_RessourcesCatalog::NotFound); //---------------------------------------------------------------------- diff --git a/src/SALOMEDS/SALOMEDS_AttLong_i.cxx b/src/SALOMEDS/SALOMEDS_AttLong_i.cxx index 7bb09d0a9..463f9594b 100644 --- a/src/SALOMEDS/SALOMEDS_AttLong_i.cxx +++ b/src/SALOMEDS/SALOMEDS_AttLong_i.cxx @@ -26,11 +26,11 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOMEDS_AttLong_i.hxx" #include "utilities.h" #include #include +using namespace std; //============================================================================ /*! Function : Set diff --git a/src/SALOMEDS/SALOMEDS_AttReal_i.cxx b/src/SALOMEDS/SALOMEDS_AttReal_i.cxx index e14480546..7140ec6b6 100644 --- a/src/SALOMEDS/SALOMEDS_AttReal_i.cxx +++ b/src/SALOMEDS/SALOMEDS_AttReal_i.cxx @@ -26,12 +26,12 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOMEDS_AttReal_i.hxx" #include "utilities.h" #include #include #include +using namespace std; //============================================================================ /*! Function : Set diff --git a/src/SALOMEDS/SALOMEDS_AttributeComment_i.cxx b/src/SALOMEDS/SALOMEDS_AttributeComment_i.cxx index 3bf3299f2..6563d8fd4 100644 --- a/src/SALOMEDS/SALOMEDS_AttributeComment_i.cxx +++ b/src/SALOMEDS/SALOMEDS_AttributeComment_i.cxx @@ -26,11 +26,11 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOMEDS_AttributeComment_i.hxx" #include #include "SALOMEDS_SObject_i.hxx" +using namespace std; char* SALOMEDS_AttributeComment_i::Value() { diff --git a/src/SALOMEDS/SALOMEDS_AttributeDrawable_i.cxx b/src/SALOMEDS/SALOMEDS_AttributeDrawable_i.cxx index 516443558..dc23dcd37 100644 --- a/src/SALOMEDS/SALOMEDS_AttributeDrawable_i.cxx +++ b/src/SALOMEDS/SALOMEDS_AttributeDrawable_i.cxx @@ -26,9 +26,9 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOMEDS_AttributeDrawable_i.hxx" #include "SALOMEDS_SObject_i.hxx" +using namespace std; CORBA::Boolean SALOMEDS_AttributeDrawable_i::IsDrawable() { return (Handle(SALOMEDS_DrawableAttribute)::DownCast(_myAttr)->Get() == 1); diff --git a/src/SALOMEDS/SALOMEDS_AttributeExpandable_i.cxx b/src/SALOMEDS/SALOMEDS_AttributeExpandable_i.cxx index 01679d0ca..ddff1d495 100644 --- a/src/SALOMEDS/SALOMEDS_AttributeExpandable_i.cxx +++ b/src/SALOMEDS/SALOMEDS_AttributeExpandable_i.cxx @@ -26,9 +26,9 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOMEDS_AttributeExpandable_i.hxx" #include "SALOMEDS_SObject_i.hxx" +using namespace std; CORBA::Boolean SALOMEDS_AttributeExpandable_i::IsExpandable() { return (Handle(SALOMEDS_ExpandableAttribute)::DownCast(_myAttr)->Get() == 1); diff --git a/src/SALOMEDS/SALOMEDS_AttributeExternalFileDef_i.cxx b/src/SALOMEDS/SALOMEDS_AttributeExternalFileDef_i.cxx index 94e2a313d..a6c424c17 100644 --- a/src/SALOMEDS/SALOMEDS_AttributeExternalFileDef_i.cxx +++ b/src/SALOMEDS/SALOMEDS_AttributeExternalFileDef_i.cxx @@ -26,11 +26,11 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOMEDS_AttributeExternalFileDef_i.hxx" #include #include "SALOMEDS_SObject_i.hxx" +using namespace std; char* SALOMEDS_AttributeExternalFileDef_i::Value() { diff --git a/src/SALOMEDS/SALOMEDS_AttributeFileType_i.cxx b/src/SALOMEDS/SALOMEDS_AttributeFileType_i.cxx index d40a53f43..9411fbb67 100644 --- a/src/SALOMEDS/SALOMEDS_AttributeFileType_i.cxx +++ b/src/SALOMEDS/SALOMEDS_AttributeFileType_i.cxx @@ -26,11 +26,11 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOMEDS_AttributeFileType_i.hxx" #include #include "SALOMEDS_SObject_i.hxx" +using namespace std; char* SALOMEDS_AttributeFileType_i::Value() { diff --git a/src/SALOMEDS/SALOMEDS_AttributeIOR_i.cxx b/src/SALOMEDS/SALOMEDS_AttributeIOR_i.cxx index b1ec78bf0..6cf5e3374 100644 --- a/src/SALOMEDS/SALOMEDS_AttributeIOR_i.cxx +++ b/src/SALOMEDS/SALOMEDS_AttributeIOR_i.cxx @@ -26,13 +26,13 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOMEDS_AttributeIOR_i.hxx" #include #include "SALOMEDS_SObject_i.hxx" #include "SALOMEDS_Study_i.hxx" +using namespace std; char* SALOMEDS_AttributeIOR_i::Value() { diff --git a/src/SALOMEDS/SALOMEDS_AttributeInteger_i.cxx b/src/SALOMEDS/SALOMEDS_AttributeInteger_i.cxx index 8d3484709..8245e3723 100644 --- a/src/SALOMEDS/SALOMEDS_AttributeInteger_i.cxx +++ b/src/SALOMEDS/SALOMEDS_AttributeInteger_i.cxx @@ -26,9 +26,9 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOMEDS_AttributeInteger_i.hxx" #include "SALOMEDS_SObject_i.hxx" +using namespace std; CORBA::Long SALOMEDS_AttributeInteger_i::Value() { diff --git a/src/SALOMEDS/SALOMEDS_AttributeLocalID_i.cxx b/src/SALOMEDS/SALOMEDS_AttributeLocalID_i.cxx index d55ea0d99..b6aac2280 100644 --- a/src/SALOMEDS/SALOMEDS_AttributeLocalID_i.cxx +++ b/src/SALOMEDS/SALOMEDS_AttributeLocalID_i.cxx @@ -26,9 +26,9 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOMEDS_AttributeLocalID_i.hxx" #include "SALOMEDS_SObject_i.hxx" +using namespace std; CORBA::Long SALOMEDS_AttributeLocalID_i::Value() { return Handle(SALOMEDS_LocalIDAttribute)::DownCast(_myAttr)->Get(); diff --git a/src/SALOMEDS/SALOMEDS_AttributeName_i.cxx b/src/SALOMEDS/SALOMEDS_AttributeName_i.cxx index 3dafade54..bc0032478 100644 --- a/src/SALOMEDS/SALOMEDS_AttributeName_i.cxx +++ b/src/SALOMEDS/SALOMEDS_AttributeName_i.cxx @@ -26,10 +26,10 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOMEDS_AttributeName_i.hxx" #include #include "SALOMEDS_SObject_i.hxx" +using namespace std; char* SALOMEDS_AttributeName_i::Value() { TCollection_ExtendedString S = Handle(TDataStd_Name)::DownCast(_myAttr)->Get(); diff --git a/src/SALOMEDS/SALOMEDS_AttributeOpened_i.cxx b/src/SALOMEDS/SALOMEDS_AttributeOpened_i.cxx index 1c5808a59..842d1ce1d 100644 --- a/src/SALOMEDS/SALOMEDS_AttributeOpened_i.cxx +++ b/src/SALOMEDS/SALOMEDS_AttributeOpened_i.cxx @@ -26,9 +26,9 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOMEDS_AttributeOpened_i.hxx" #include "SALOMEDS_SObject_i.hxx" +using namespace std; CORBA::Boolean SALOMEDS_AttributeOpened_i::IsOpened() { return (Handle(SALOMEDS_OpenedAttribute)::DownCast(_myAttr)->Get() == 1); diff --git a/src/SALOMEDS/SALOMEDS_AttributePersistentRef_i.cxx b/src/SALOMEDS/SALOMEDS_AttributePersistentRef_i.cxx index c8e72e102..c550587ae 100644 --- a/src/SALOMEDS/SALOMEDS_AttributePersistentRef_i.cxx +++ b/src/SALOMEDS/SALOMEDS_AttributePersistentRef_i.cxx @@ -26,10 +26,10 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOMEDS_AttributePersistentRef_i.hxx" #include #include "SALOMEDS_SObject_i.hxx" +using namespace std; char* SALOMEDS_AttributePersistentRef_i::Value() { diff --git a/src/SALOMEDS/SALOMEDS_AttributePixMap_i.cxx b/src/SALOMEDS/SALOMEDS_AttributePixMap_i.cxx index a34de4967..140d0ea48 100644 --- a/src/SALOMEDS/SALOMEDS_AttributePixMap_i.cxx +++ b/src/SALOMEDS/SALOMEDS_AttributePixMap_i.cxx @@ -26,10 +26,10 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOMEDS_AttributePixMap_i.hxx" #include "SALOMEDS_SObject_i.hxx" #include +using namespace std; CORBA::Boolean SALOMEDS_AttributePixMap_i::HasPixMap() { TCollection_ExtendedString S = Handle(SALOMEDS_PixMapAttribute)::DownCast(_myAttr)->Get(); diff --git a/src/SALOMEDS/SALOMEDS_AttributePythonObject_i.cxx b/src/SALOMEDS/SALOMEDS_AttributePythonObject_i.cxx index dde8e6093..c3be0fedc 100644 --- a/src/SALOMEDS/SALOMEDS_AttributePythonObject_i.cxx +++ b/src/SALOMEDS/SALOMEDS_AttributePythonObject_i.cxx @@ -9,11 +9,11 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOMEDS_AttributePythonObject_i.hxx" #include #include #include "SALOMEDS_SObject_i.hxx" +using namespace std; void SALOMEDS_AttributePythonObject_i::SetObject(const char* theSequence, CORBA::Boolean IsScript) { CheckLocked(); diff --git a/src/SALOMEDS/SALOMEDS_AttributeSelectable_i.cxx b/src/SALOMEDS/SALOMEDS_AttributeSelectable_i.cxx index c18334aea..aa41a7281 100644 --- a/src/SALOMEDS/SALOMEDS_AttributeSelectable_i.cxx +++ b/src/SALOMEDS/SALOMEDS_AttributeSelectable_i.cxx @@ -26,9 +26,9 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOMEDS_AttributeSelectable_i.hxx" #include "SALOMEDS_SObject_i.hxx" +using namespace std; CORBA::Boolean SALOMEDS_AttributeSelectable_i::IsSelectable() { return (Handle(SALOMEDS_SelectableAttribute)::DownCast(_myAttr)->Get() == 1); diff --git a/src/SALOMEDS/SALOMEDS_AttributeSequenceOfInteger_i.cxx b/src/SALOMEDS/SALOMEDS_AttributeSequenceOfInteger_i.cxx index 28748f753..6f202da14 100644 --- a/src/SALOMEDS/SALOMEDS_AttributeSequenceOfInteger_i.cxx +++ b/src/SALOMEDS/SALOMEDS_AttributeSequenceOfInteger_i.cxx @@ -26,10 +26,10 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOMEDS_AttributeSequenceOfInteger_i.hxx" #include "SALOMEDS_SObject_i.hxx" #include +using namespace std; void SALOMEDS_AttributeSequenceOfInteger_i::Assign(const SALOMEDS::LongSeq& other) diff --git a/src/SALOMEDS/SALOMEDS_AttributeSequenceOfReal_i.cxx b/src/SALOMEDS/SALOMEDS_AttributeSequenceOfReal_i.cxx index a88637f6a..a3fe11e24 100644 --- a/src/SALOMEDS/SALOMEDS_AttributeSequenceOfReal_i.cxx +++ b/src/SALOMEDS/SALOMEDS_AttributeSequenceOfReal_i.cxx @@ -26,10 +26,10 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOMEDS_AttributeSequenceOfReal_i.hxx" #include "SALOMEDS_SObject_i.hxx" #include +using namespace std; void SALOMEDS_AttributeSequenceOfReal_i::Assign(const SALOMEDS::DoubleSeq& other) { diff --git a/src/SALOMEDS/SALOMEDS_AttributeStudyProperties_i.cxx b/src/SALOMEDS/SALOMEDS_AttributeStudyProperties_i.cxx index 8444beca9..1e87e8428 100644 --- a/src/SALOMEDS/SALOMEDS_AttributeStudyProperties_i.cxx +++ b/src/SALOMEDS/SALOMEDS_AttributeStudyProperties_i.cxx @@ -9,11 +9,11 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOMEDS_AttributeStudyProperties_i.hxx" #include "SALOMEDS_SObject_i.hxx" #include #include +using namespace std; #define CREATION_MODE_NOTDEFINED 0 #define CREATION_MODE_SCRATCH 1 diff --git a/src/SALOMEDS/SALOMEDS_AttributeTableOfInteger_i.cxx b/src/SALOMEDS/SALOMEDS_AttributeTableOfInteger_i.cxx index df037e525..716a49139 100644 --- a/src/SALOMEDS/SALOMEDS_AttributeTableOfInteger_i.cxx +++ b/src/SALOMEDS/SALOMEDS_AttributeTableOfInteger_i.cxx @@ -9,7 +9,6 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOMEDS_AttributeTableOfInteger_i.hxx" #include "SALOMEDS_SObject_i.hxx" #include @@ -20,6 +19,7 @@ using namespace std; #include #include #include +using namespace std; #define SEPARATOR '\1' diff --git a/src/SALOMEDS/SALOMEDS_AttributeTableOfReal_i.cxx b/src/SALOMEDS/SALOMEDS_AttributeTableOfReal_i.cxx index cb06a664f..7308441ae 100644 --- a/src/SALOMEDS/SALOMEDS_AttributeTableOfReal_i.cxx +++ b/src/SALOMEDS/SALOMEDS_AttributeTableOfReal_i.cxx @@ -9,7 +9,6 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOMEDS_AttributeTableOfReal_i.hxx" #include "SALOMEDS_SObject_i.hxx" #include @@ -20,6 +19,7 @@ using namespace std; #include #include "Utils_ExceptHandlers.hxx" +using namespace std; UNEXPECT_CATCH(ATR_IncorrectIndex, SALOMEDS::AttributeTableOfReal::IncorrectIndex); UNEXPECT_CATCH(ATR_IncorrectArgumentLength, SALOMEDS::AttributeTableOfReal::IncorrectArgumentLength); diff --git a/src/SALOMEDS/SALOMEDS_AttributeTableOfString_i.cxx b/src/SALOMEDS/SALOMEDS_AttributeTableOfString_i.cxx index b77322d31..2f5a95796 100644 --- a/src/SALOMEDS/SALOMEDS_AttributeTableOfString_i.cxx +++ b/src/SALOMEDS/SALOMEDS_AttributeTableOfString_i.cxx @@ -8,7 +8,6 @@ // Author : Sergey Ruin // Module : SALOME -using namespace std; #include #include @@ -23,6 +22,7 @@ using namespace std; #include #include "Utils_ExceptHandlers.hxx" +using namespace std; UNEXPECT_CATCH(ATS_IncorrectIndex, SALOMEDS::AttributeTableOfString::IncorrectIndex); UNEXPECT_CATCH(ATS_IncorrectArgumentLength, SALOMEDS::AttributeTableOfString::IncorrectArgumentLength); diff --git a/src/SALOMEDS/SALOMEDS_AttributeTarget_i.cxx b/src/SALOMEDS/SALOMEDS_AttributeTarget_i.cxx index 1d14121c1..a70357e46 100644 --- a/src/SALOMEDS/SALOMEDS_AttributeTarget_i.cxx +++ b/src/SALOMEDS/SALOMEDS_AttributeTarget_i.cxx @@ -26,11 +26,11 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOMEDS_AttributeTarget_i.hxx" #include "SALOMEDS_SObject_i.hxx" #include #include +using namespace std; void SALOMEDS_AttributeTarget_i::Add(SALOMEDS::SObject_ptr anObject) { TDF_Label aLabel; diff --git a/src/SALOMEDS/SALOMEDS_AttributeTextColor_i.cxx b/src/SALOMEDS/SALOMEDS_AttributeTextColor_i.cxx index cf63ff0d9..f1c5b65ef 100644 --- a/src/SALOMEDS/SALOMEDS_AttributeTextColor_i.cxx +++ b/src/SALOMEDS/SALOMEDS_AttributeTextColor_i.cxx @@ -26,10 +26,10 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOMEDS_AttributeTextColor_i.hxx" #include "SALOMEDS_SObject_i.hxx" #include +using namespace std; SALOMEDS::Color SALOMEDS_AttributeTextColor_i::TextColor() { SALOMEDS::Color TextColor; diff --git a/src/SALOMEDS/SALOMEDS_AttributeTextHighlightColor_i.cxx b/src/SALOMEDS/SALOMEDS_AttributeTextHighlightColor_i.cxx index 0995ac90a..f50028358 100644 --- a/src/SALOMEDS/SALOMEDS_AttributeTextHighlightColor_i.cxx +++ b/src/SALOMEDS/SALOMEDS_AttributeTextHighlightColor_i.cxx @@ -26,10 +26,10 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOMEDS_AttributeTextHighlightColor_i.hxx" #include "SALOMEDS_SObject_i.hxx" #include +using namespace std; SALOMEDS::Color SALOMEDS_AttributeTextHighlightColor_i::TextHighlightColor() { SALOMEDS::Color TextHighlightColor; diff --git a/src/SALOMEDS/SALOMEDS_AttributeTreeNode_i.cxx b/src/SALOMEDS/SALOMEDS_AttributeTreeNode_i.cxx index e37bd2a9b..196d54b06 100644 --- a/src/SALOMEDS/SALOMEDS_AttributeTreeNode_i.cxx +++ b/src/SALOMEDS/SALOMEDS_AttributeTreeNode_i.cxx @@ -26,12 +26,12 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOMEDS_AttributeTreeNode_i.hxx" #include "SALOMEDS_SObject_i.hxx" #include "utilities.h" #include #include +using namespace std; static Handle(TDataStd_TreeNode) GetNode(SALOMEDS::AttributeTreeNode_ptr value, const Handle(TDataStd_TreeNode)& aNode) { diff --git a/src/SALOMEDS/SALOMEDS_AttributeUserID_i.cxx b/src/SALOMEDS/SALOMEDS_AttributeUserID_i.cxx index b7fa64a41..5c8524045 100644 --- a/src/SALOMEDS/SALOMEDS_AttributeUserID_i.cxx +++ b/src/SALOMEDS/SALOMEDS_AttributeUserID_i.cxx @@ -26,10 +26,10 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOMEDS_AttributeUserID_i.hxx" #include #include "SALOMEDS_SObject_i.hxx" +using namespace std; char* SALOMEDS_AttributeUserID_i::Value() { char aGUID[40]; diff --git a/src/SALOMEDS/SALOMEDS_BasicAttributeFactory.cxx b/src/SALOMEDS/SALOMEDS_BasicAttributeFactory.cxx index 707c40e10..666958247 100644 --- a/src/SALOMEDS/SALOMEDS_BasicAttributeFactory.cxx +++ b/src/SALOMEDS/SALOMEDS_BasicAttributeFactory.cxx @@ -26,9 +26,9 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOMEDS_BasicAttributeFactory.hxx" #include "utilities.h" +using namespace std; //============================================================================ /*! Function : Create diff --git a/src/SALOMEDS/SALOMEDS_BasicAttribute_i.cxx b/src/SALOMEDS/SALOMEDS_BasicAttribute_i.cxx index cedaec93a..5022f049c 100644 --- a/src/SALOMEDS/SALOMEDS_BasicAttribute_i.cxx +++ b/src/SALOMEDS/SALOMEDS_BasicAttribute_i.cxx @@ -26,8 +26,8 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOMEDS_BasicAttribute_i.hxx" +using namespace std; //============================================================================ /*! Function : SetLabel diff --git a/src/SALOMEDS/SALOMEDS_ChildIterator_i.cxx b/src/SALOMEDS/SALOMEDS_ChildIterator_i.cxx index 947579721..ed181e31f 100644 --- a/src/SALOMEDS/SALOMEDS_ChildIterator_i.cxx +++ b/src/SALOMEDS/SALOMEDS_ChildIterator_i.cxx @@ -26,10 +26,10 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOMEDS_ChildIterator_i.hxx" #include "SALOMEDS_SObject_i.hxx" #include "utilities.h" +using namespace std; diff --git a/src/SALOMEDS/SALOMEDS_DataMapIteratorOfDataMapOfIntegerString_0.cxx b/src/SALOMEDS/SALOMEDS_DataMapIteratorOfDataMapOfIntegerString_0.cxx index 93812ac4e..e564a093c 100644 --- a/src/SALOMEDS/SALOMEDS_DataMapIteratorOfDataMapOfIntegerString_0.cxx +++ b/src/SALOMEDS/SALOMEDS_DataMapIteratorOfDataMapOfIntegerString_0.cxx @@ -25,6 +25,7 @@ #ifndef _SALOMEDS_DataMapNodeOfDataMapOfIntegerString_HeaderFile #include #endif +using namespace std; #define TheKey Standard_Real diff --git a/src/SALOMEDS/SALOMEDS_DataMapIteratorOfDataMapStringLabel_0.cxx b/src/SALOMEDS/SALOMEDS_DataMapIteratorOfDataMapStringLabel_0.cxx index 1473d66c5..b261e4409 100644 --- a/src/SALOMEDS/SALOMEDS_DataMapIteratorOfDataMapStringLabel_0.cxx +++ b/src/SALOMEDS/SALOMEDS_DataMapIteratorOfDataMapStringLabel_0.cxx @@ -26,7 +26,6 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOMEDS_DataMapIteratorOfDataMapStringLabel.hxx" #ifndef _Standard_NoSuchObject_HeaderFile @@ -44,7 +43,8 @@ using namespace std; #ifndef _SALOMEDS_DataMapNodeOfDataMapStringLabel_HeaderFile #include "SALOMEDS_DataMapNodeOfDataMapStringLabel.hxx" #endif - + using namespace std; + #define TheKey TCollection_ExtendedString #define TheKey_hxx diff --git a/src/SALOMEDS/SALOMEDS_DataMapNodeOfDataMapOfIntegerString_0.cxx b/src/SALOMEDS/SALOMEDS_DataMapNodeOfDataMapOfIntegerString_0.cxx index c40761b05..737d4614a 100644 --- a/src/SALOMEDS/SALOMEDS_DataMapNodeOfDataMapOfIntegerString_0.cxx +++ b/src/SALOMEDS/SALOMEDS_DataMapNodeOfDataMapOfIntegerString_0.cxx @@ -26,6 +26,7 @@ #ifndef _SALOMEDS_DataMapIteratorOfDataMapOfIntegerString_HeaderFile #include #endif +using namespace std; SALOMEDS_DataMapNodeOfDataMapOfIntegerString::~SALOMEDS_DataMapNodeOfDataMapOfIntegerString() {} diff --git a/src/SALOMEDS/SALOMEDS_DataMapNodeOfDataMapStringLabel_0.cxx b/src/SALOMEDS/SALOMEDS_DataMapNodeOfDataMapStringLabel_0.cxx index 401a2b77e..ea3912899 100644 --- a/src/SALOMEDS/SALOMEDS_DataMapNodeOfDataMapStringLabel_0.cxx +++ b/src/SALOMEDS/SALOMEDS_DataMapNodeOfDataMapStringLabel_0.cxx @@ -26,7 +26,6 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOMEDS_DataMapNodeOfDataMapStringLabel.hxx" #ifndef _Standard_TypeMismatch_HeaderFile @@ -45,6 +44,7 @@ using namespace std; #ifndef _SALOMEDS_DataMapIteratorOfDataMapStringLabel_HeaderFile #include "SALOMEDS_DataMapIteratorOfDataMapStringLabel.hxx" #endif +using namespace std; SALOMEDS_DataMapNodeOfDataMapStringLabel::~SALOMEDS_DataMapNodeOfDataMapStringLabel() {} diff --git a/src/SALOMEDS/SALOMEDS_DataMapOfIntegerString_0.cxx b/src/SALOMEDS/SALOMEDS_DataMapOfIntegerString_0.cxx index b14e2d897..652532351 100644 --- a/src/SALOMEDS/SALOMEDS_DataMapOfIntegerString_0.cxx +++ b/src/SALOMEDS/SALOMEDS_DataMapOfIntegerString_0.cxx @@ -28,7 +28,8 @@ #ifndef _SALOMEDS_DataMapIteratorOfDataMapOfIntegerString_HeaderFile #include #endif - + using namespace std; + #define TheKey Standard_Real #define TheKey_hxx diff --git a/src/SALOMEDS/SALOMEDS_DataMapStringLabel_0.cxx b/src/SALOMEDS/SALOMEDS_DataMapStringLabel_0.cxx index 76dab0d3b..c5976f385 100644 --- a/src/SALOMEDS/SALOMEDS_DataMapStringLabel_0.cxx +++ b/src/SALOMEDS/SALOMEDS_DataMapStringLabel_0.cxx @@ -26,7 +26,6 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOMEDS_DataMapStringLabel.hxx" #ifndef _Standard_DomainError_HeaderFile @@ -47,7 +46,8 @@ using namespace std; #ifndef _SALOMEDS_DataMapIteratorOfDataMapStringLabel_HeaderFile #include "SALOMEDS_DataMapIteratorOfDataMapStringLabel.hxx" #endif - + using namespace std; + #define TheKey TCollection_ExtendedString #define TheKey_hxx diff --git a/src/SALOMEDS/SALOMEDS_DrawableAttribute.cxx b/src/SALOMEDS/SALOMEDS_DrawableAttribute.cxx index 8d72f6a6a..1a1db8c38 100644 --- a/src/SALOMEDS/SALOMEDS_DrawableAttribute.cxx +++ b/src/SALOMEDS/SALOMEDS_DrawableAttribute.cxx @@ -26,9 +26,9 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOMEDS_DrawableAttribute.ixx" #include +using namespace std; //======================================================================= //function : GetID diff --git a/src/SALOMEDS/SALOMEDS_ExpandableAttribute.cxx b/src/SALOMEDS/SALOMEDS_ExpandableAttribute.cxx index b20dd9c10..2ab9ebdd5 100644 --- a/src/SALOMEDS/SALOMEDS_ExpandableAttribute.cxx +++ b/src/SALOMEDS/SALOMEDS_ExpandableAttribute.cxx @@ -26,9 +26,9 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOMEDS_ExpandableAttribute.ixx" #include +using namespace std; //======================================================================= //function : GetID diff --git a/src/SALOMEDS/SALOMEDS_GenericAttribute_i.cxx b/src/SALOMEDS/SALOMEDS_GenericAttribute_i.cxx index 7311b29c0..87f76e105 100644 --- a/src/SALOMEDS/SALOMEDS_GenericAttribute_i.cxx +++ b/src/SALOMEDS/SALOMEDS_GenericAttribute_i.cxx @@ -9,7 +9,6 @@ // Module : SALOME // $Header$ -using namespace std; #include #include @@ -55,6 +54,7 @@ using namespace std; #include "SALOMEDS_ExternalFileDef.hxx" #include "SALOMEDS_FileType.hxx" #include "Utils_ExceptHandlers.hxx" +using namespace std; #define RegisteredAttributes 26 UNEXPECT_CATCH(GALockProtection, SALOMEDS::GenericAttribute::LockProtection); diff --git a/src/SALOMEDS/SALOMEDS_IORAttribute.cxx b/src/SALOMEDS/SALOMEDS_IORAttribute.cxx index c305641a4..f71b538fd 100644 --- a/src/SALOMEDS/SALOMEDS_IORAttribute.cxx +++ b/src/SALOMEDS/SALOMEDS_IORAttribute.cxx @@ -26,11 +26,11 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOMEDS_IORAttribute.ixx" #include #include #include "SALOMEDS_Study_i.hxx" +using namespace std; //======================================================================= //function : GetID diff --git a/src/SALOMEDS/SALOMEDS_LocalIDAttribute.cxx b/src/SALOMEDS/SALOMEDS_LocalIDAttribute.cxx index f38360b4a..406cde57e 100644 --- a/src/SALOMEDS/SALOMEDS_LocalIDAttribute.cxx +++ b/src/SALOMEDS/SALOMEDS_LocalIDAttribute.cxx @@ -26,9 +26,9 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOMEDS_LocalIDAttribute.ixx" #include +using namespace std; //======================================================================= //function : GetID diff --git a/src/SALOMEDS/SALOMEDS_OCAFApplication.cxx b/src/SALOMEDS/SALOMEDS_OCAFApplication.cxx index e0c7ad35f..5913c6842 100644 --- a/src/SALOMEDS/SALOMEDS_OCAFApplication.cxx +++ b/src/SALOMEDS/SALOMEDS_OCAFApplication.cxx @@ -26,8 +26,8 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOMEDS_OCAFApplication.ixx" +using namespace std; //======================================================================= //function : SALOMEDS_OCAFApplication diff --git a/src/SALOMEDS/SALOMEDS_OpenedAttribute.cxx b/src/SALOMEDS/SALOMEDS_OpenedAttribute.cxx index fc074bf13..f7c17c3ef 100644 --- a/src/SALOMEDS/SALOMEDS_OpenedAttribute.cxx +++ b/src/SALOMEDS/SALOMEDS_OpenedAttribute.cxx @@ -26,9 +26,9 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOMEDS_OpenedAttribute.ixx" #include +using namespace std; //======================================================================= //function : GetID diff --git a/src/SALOMEDS/SALOMEDS_PersRefAttribute.cxx b/src/SALOMEDS/SALOMEDS_PersRefAttribute.cxx index 8e313831c..8d57af837 100644 --- a/src/SALOMEDS/SALOMEDS_PersRefAttribute.cxx +++ b/src/SALOMEDS/SALOMEDS_PersRefAttribute.cxx @@ -26,10 +26,10 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOMEDS_PersRefAttribute.ixx" #include #include +using namespace std; //======================================================================= //function : GetID diff --git a/src/SALOMEDS/SALOMEDS_PixMapAttribute.cxx b/src/SALOMEDS/SALOMEDS_PixMapAttribute.cxx index fa84b6180..32c570500 100644 --- a/src/SALOMEDS/SALOMEDS_PixMapAttribute.cxx +++ b/src/SALOMEDS/SALOMEDS_PixMapAttribute.cxx @@ -26,10 +26,10 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOMEDS_PixMapAttribute.ixx" #include #include +using namespace std; //======================================================================= //function : GetID diff --git a/src/SALOMEDS/SALOMEDS_PythonObjectAttribute.cxx b/src/SALOMEDS/SALOMEDS_PythonObjectAttribute.cxx index fd0538e0e..f8c8d9de4 100644 --- a/src/SALOMEDS/SALOMEDS_PythonObjectAttribute.cxx +++ b/src/SALOMEDS/SALOMEDS_PythonObjectAttribute.cxx @@ -9,9 +9,9 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOMEDS_PythonObjectAttribute.ixx" #include +using namespace std; const Standard_GUID& SALOMEDS_PythonObjectAttribute::GetID() { diff --git a/src/SALOMEDS/SALOMEDS_SComponentIterator_i.cxx b/src/SALOMEDS/SALOMEDS_SComponentIterator_i.cxx index 77b0b4655..1cd09ebe6 100644 --- a/src/SALOMEDS/SALOMEDS_SComponentIterator_i.cxx +++ b/src/SALOMEDS/SALOMEDS_SComponentIterator_i.cxx @@ -26,8 +26,8 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOMEDS_SComponentIterator_i.hxx" +using namespace std; //============================================================================ diff --git a/src/SALOMEDS/SALOMEDS_SComponent_i.cxx b/src/SALOMEDS/SALOMEDS_SComponent_i.cxx index 15b066e5e..ee8997566 100644 --- a/src/SALOMEDS/SALOMEDS_SComponent_i.cxx +++ b/src/SALOMEDS/SALOMEDS_SComponent_i.cxx @@ -26,9 +26,9 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOMEDS_SComponent_i.hxx" #include "utilities.h" +using namespace std; //============================================================================ diff --git a/src/SALOMEDS/SALOMEDS_SObject_i.cxx b/src/SALOMEDS/SALOMEDS_SObject_i.cxx index 429716886..04478d1de 100644 --- a/src/SALOMEDS/SALOMEDS_SObject_i.cxx +++ b/src/SALOMEDS/SALOMEDS_SObject_i.cxx @@ -26,7 +26,6 @@ // Module : SALOME // $Header$ -using namespace std; #include "utilities.h" #include "SALOMEDS_SObject_i.hxx" //SALOMEDS Headers @@ -34,6 +33,7 @@ using namespace std; #include "SALOMEDS_GenericAttribute_i.hxx" #include "SALOMEDS_IORAttribute.hxx" #include +using namespace std; //============================================================================ /*! Function : constructor diff --git a/src/SALOMEDS/SALOMEDS_SelectableAttribute.cxx b/src/SALOMEDS/SALOMEDS_SelectableAttribute.cxx index 40b179eca..9bd6406b2 100644 --- a/src/SALOMEDS/SALOMEDS_SelectableAttribute.cxx +++ b/src/SALOMEDS/SALOMEDS_SelectableAttribute.cxx @@ -26,9 +26,9 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOMEDS_SelectableAttribute.ixx" #include +using namespace std; //======================================================================= //function : GetID diff --git a/src/SALOMEDS/SALOMEDS_SequenceOfIntegerAttribute.cxx b/src/SALOMEDS/SALOMEDS_SequenceOfIntegerAttribute.cxx index ed256eb0a..b18143181 100644 --- a/src/SALOMEDS/SALOMEDS_SequenceOfIntegerAttribute.cxx +++ b/src/SALOMEDS/SALOMEDS_SequenceOfIntegerAttribute.cxx @@ -26,8 +26,8 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOMEDS_SequenceOfIntegerAttribute.ixx" +using namespace std; //======================================================================= //function : GetID diff --git a/src/SALOMEDS/SALOMEDS_SequenceOfRealAttribute.cxx b/src/SALOMEDS/SALOMEDS_SequenceOfRealAttribute.cxx index 9c8d3516d..13d242526 100644 --- a/src/SALOMEDS/SALOMEDS_SequenceOfRealAttribute.cxx +++ b/src/SALOMEDS/SALOMEDS_SequenceOfRealAttribute.cxx @@ -26,9 +26,9 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOMEDS_SequenceOfRealAttribute.ixx" #include +using namespace std; //======================================================================= //function : GetID diff --git a/src/SALOMEDS/SALOMEDS_StudyBuilder_i.cxx b/src/SALOMEDS/SALOMEDS_StudyBuilder_i.cxx index 47bfde5ae..125152fed 100644 --- a/src/SALOMEDS/SALOMEDS_StudyBuilder_i.cxx +++ b/src/SALOMEDS/SALOMEDS_StudyBuilder_i.cxx @@ -26,7 +26,6 @@ // Module : SALOME // $Header$ -using namespace std; #include "utilities.h" #include "SALOMEDS_Study_i.hxx" //#include "SALOMEDS_StudyBuilder_i.hxx" @@ -83,6 +82,7 @@ using namespace std; #include #include +using namespace std; #define USE_CASE_LABEL_TAG 2 #define DIRECTORYID 16661 diff --git a/src/SALOMEDS/SALOMEDS_StudyManager_i.cxx b/src/SALOMEDS/SALOMEDS_StudyManager_i.cxx index 0f4a38c99..71033bb23 100644 --- a/src/SALOMEDS/SALOMEDS_StudyManager_i.cxx +++ b/src/SALOMEDS/SALOMEDS_StudyManager_i.cxx @@ -74,11 +74,11 @@ #include "Utils_CorbaException.hxx" #include -using namespace std; #include "SALOME_GenericObj_i.hh" #include "Utils_ExceptHandlers.hxx" +using namespace std; UNEXPECT_CATCH(SalomeException,SALOME::SALOME_Exception); UNEXPECT_CATCH(LockProtection, SALOMEDS::StudyBuilder::LockProtection); diff --git a/src/SALOMEDS/SALOMEDS_StudyPropertiesAttribute.cxx b/src/SALOMEDS/SALOMEDS_StudyPropertiesAttribute.cxx index 4f83613be..62835949d 100644 --- a/src/SALOMEDS/SALOMEDS_StudyPropertiesAttribute.cxx +++ b/src/SALOMEDS/SALOMEDS_StudyPropertiesAttribute.cxx @@ -9,8 +9,8 @@ // Module : SALOME // $Header$ -using namespace std; #include +using namespace std; const Standard_GUID& SALOMEDS_StudyPropertiesAttribute::GetID() { diff --git a/src/SALOMEDS/SALOMEDS_Study_i.cxx b/src/SALOMEDS/SALOMEDS_Study_i.cxx index be1599434..4b7287aad 100644 --- a/src/SALOMEDS/SALOMEDS_Study_i.cxx +++ b/src/SALOMEDS/SALOMEDS_Study_i.cxx @@ -26,7 +26,6 @@ // Module : SALOME // $Header$ -using namespace std; #include "utilities.h" #include "SALOMEDS_Study_i.hxx" @@ -44,6 +43,7 @@ using namespace std; #include "SALOMEDS_LocalIDAttribute.hxx" #include "SALOMEDS_PersRefAttribute.hxx" #include "SALOMEDS_UseCaseIterator_i.hxx" +using namespace std; #define DIRECTORYID 16661 diff --git a/src/SALOMEDS/SALOMEDS_TableOfIntegerAttribute.cxx b/src/SALOMEDS/SALOMEDS_TableOfIntegerAttribute.cxx index a5134a76f..abe7171f8 100644 --- a/src/SALOMEDS/SALOMEDS_TableOfIntegerAttribute.cxx +++ b/src/SALOMEDS/SALOMEDS_TableOfIntegerAttribute.cxx @@ -9,12 +9,12 @@ // Module : SALOME // $Header$ -using namespace std; #include #include #include #include +using namespace std; const Standard_GUID& SALOMEDS_TableOfIntegerAttribute::GetID() { diff --git a/src/SALOMEDS/SALOMEDS_TableOfRealAttribute.cxx b/src/SALOMEDS/SALOMEDS_TableOfRealAttribute.cxx index d12b58bb2..f234fca97 100644 --- a/src/SALOMEDS/SALOMEDS_TableOfRealAttribute.cxx +++ b/src/SALOMEDS/SALOMEDS_TableOfRealAttribute.cxx @@ -9,13 +9,13 @@ // Module : SALOME // $Header$ -using namespace std; #include #include #include #include #include +using namespace std; const Standard_GUID& SALOMEDS_TableOfRealAttribute::GetID() { diff --git a/src/SALOMEDS/SALOMEDS_TableOfStringAttribute.cxx b/src/SALOMEDS/SALOMEDS_TableOfStringAttribute.cxx index d3a3ab2e5..9fe181205 100644 --- a/src/SALOMEDS/SALOMEDS_TableOfStringAttribute.cxx +++ b/src/SALOMEDS/SALOMEDS_TableOfStringAttribute.cxx @@ -8,13 +8,13 @@ // Author : Sergey Ruin // Module : SALOME -using namespace std; #include #include #include #include #include +using namespace std; const Standard_GUID& SALOMEDS_TableOfStringAttribute::GetID() { diff --git a/src/SALOMEDS/SALOMEDS_TargetAttribute.cxx b/src/SALOMEDS/SALOMEDS_TargetAttribute.cxx index 9e623b8b1..a57efc214 100644 --- a/src/SALOMEDS/SALOMEDS_TargetAttribute.cxx +++ b/src/SALOMEDS/SALOMEDS_TargetAttribute.cxx @@ -26,11 +26,11 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOMEDS_TargetAttribute.ixx" #include #include #include "utilities.h" +using namespace std; //======================================================================= //function : GetID diff --git a/src/SALOMEDS/SALOMEDS_TextColorAttribute.cxx b/src/SALOMEDS/SALOMEDS_TextColorAttribute.cxx index 89b033e6e..33f137c20 100644 --- a/src/SALOMEDS/SALOMEDS_TextColorAttribute.cxx +++ b/src/SALOMEDS/SALOMEDS_TextColorAttribute.cxx @@ -26,8 +26,8 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOMEDS_TextColorAttribute.ixx" +using namespace std; //======================================================================= //function : GetID diff --git a/src/SALOMEDS/SALOMEDS_TextHighlightColorAttribute.cxx b/src/SALOMEDS/SALOMEDS_TextHighlightColorAttribute.cxx index ccc3c70a8..c27270f4a 100644 --- a/src/SALOMEDS/SALOMEDS_TextHighlightColorAttribute.cxx +++ b/src/SALOMEDS/SALOMEDS_TextHighlightColorAttribute.cxx @@ -26,8 +26,8 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOMEDS_TextHighlightColorAttribute.ixx" +using namespace std; //======================================================================= //function : GetID diff --git a/src/SALOMEDS/SALOMEDS_UseCaseBuilder_i.cxx b/src/SALOMEDS/SALOMEDS_UseCaseBuilder_i.cxx index ba6d6397e..e04481fdb 100644 --- a/src/SALOMEDS/SALOMEDS_UseCaseBuilder_i.cxx +++ b/src/SALOMEDS/SALOMEDS_UseCaseBuilder_i.cxx @@ -8,7 +8,6 @@ // Author : Yves FRICAUD // Module : SALOME -using namespace std; #include "SALOMEDS_UseCaseBuilder_i.hxx" #include "SALOMEDS_AttributeComment_i.hxx" #include "SALOMEDS_SObject_i.hxx" @@ -24,6 +23,7 @@ using namespace std; #include #include #include +using namespace std; #define USE_CASE_LABEL_TAG 2 #define USE_CASE_GUID "AA43BB12-D9CD-11d6-945D-0050DA506788" diff --git a/src/SALOMEDS/SALOMEDS_UseCaseIterator_i.cxx b/src/SALOMEDS/SALOMEDS_UseCaseIterator_i.cxx index 69e7d39ec..07f79bf75 100644 --- a/src/SALOMEDS/SALOMEDS_UseCaseIterator_i.cxx +++ b/src/SALOMEDS/SALOMEDS_UseCaseIterator_i.cxx @@ -8,10 +8,10 @@ // Author : Yves FRICAUD // Module : SALOME -using namespace std; #include "SALOMEDS_UseCaseIterator_i.hxx" #include "SALOMEDS_SObject_i.hxx" #include "utilities.h" +using namespace std; diff --git a/src/SALOMEGUI/QAD_Application.cxx b/src/SALOMEGUI/QAD_Application.cxx index eb8b43d5e..c58e5f57f 100644 --- a/src/SALOMEGUI/QAD_Application.cxx +++ b/src/SALOMEGUI/QAD_Application.cxx @@ -26,7 +26,6 @@ // Module : SALOME // $Header$ -using namespace std; /*! \class QAD_Application QAD_Application.h \brief Study manager for QAD-based application. @@ -62,6 +61,7 @@ using namespace std; #include #include #include +using namespace std; static bool checkPermission(QString fileName) { if ( QFile::exists( fileName ) ) { diff --git a/src/SALOMEGUI/QAD_Config.cxx b/src/SALOMEGUI/QAD_Config.cxx index 33b563237..0616c2611 100644 --- a/src/SALOMEGUI/QAD_Config.cxx +++ b/src/SALOMEGUI/QAD_Config.cxx @@ -26,7 +26,6 @@ // Module : SALOME // $Header$ -using namespace std; /*! \class QAD_Config QAD_Config.h \brief Settings file management for QAD-based application. @@ -40,6 +39,7 @@ using namespace std; #include #include #include +using namespace std; /*! diff --git a/src/SALOMEGUI/QAD_DirListDlg.cxx b/src/SALOMEGUI/QAD_DirListDlg.cxx index a45638cd5..542df51cf 100644 --- a/src/SALOMEGUI/QAD_DirListDlg.cxx +++ b/src/SALOMEGUI/QAD_DirListDlg.cxx @@ -9,7 +9,6 @@ // Module : SALOME // $Header$ -using namespace std; #include "QAD_DirListDlg.h" #include "QAD_Desktop.h" #include "QAD_FileDlg.h" @@ -19,6 +18,7 @@ using namespace std; #include #include #include +using namespace std; #define MIN_WIDTH 400 #define MIN_HEIGHT 200 diff --git a/src/SALOMEGUI/QAD_FileDlg.cxx b/src/SALOMEGUI/QAD_FileDlg.cxx index d3e1bb230..40b24ef6f 100644 --- a/src/SALOMEGUI/QAD_FileDlg.cxx +++ b/src/SALOMEGUI/QAD_FileDlg.cxx @@ -9,7 +9,6 @@ // Module : SALOME // $Header$ -using namespace std; #include #include #include @@ -22,6 +21,7 @@ using namespace std; #include "QAD_FileDlg.h" #include "QAD_MessageBox.h" #include "QAD_Tools.h" +using namespace std; #define MIN_COMBO_SIZE 100 diff --git a/src/SALOMEGUI/QAD_Help.cxx b/src/SALOMEGUI/QAD_Help.cxx index ad6697036..e14035b59 100644 --- a/src/SALOMEGUI/QAD_Help.cxx +++ b/src/SALOMEGUI/QAD_Help.cxx @@ -26,8 +26,8 @@ // Module : SALOME // $Header$ -using namespace std; #include "QAD_Help.h" +using namespace std; /*! \class QAD_Help QAD_HelpL.h diff --git a/src/SALOMEGUI/QAD_HelpWindow.cxx b/src/SALOMEGUI/QAD_HelpWindow.cxx index 8f4322541..2453ec7e4 100644 --- a/src/SALOMEGUI/QAD_HelpWindow.cxx +++ b/src/SALOMEGUI/QAD_HelpWindow.cxx @@ -26,7 +26,6 @@ // Module : SALOME // $Header$ -using namespace std; /*! \class QAD_HelpWindow QAD_HelpWindow.h \brief Html browser for help. @@ -46,6 +45,7 @@ using namespace std; #include #include #include +using namespace std; /*! Constructor diff --git a/src/SALOMEGUI/QAD_LeftFrame.cxx b/src/SALOMEGUI/QAD_LeftFrame.cxx index c3a021d26..8edb54c48 100644 --- a/src/SALOMEGUI/QAD_LeftFrame.cxx +++ b/src/SALOMEGUI/QAD_LeftFrame.cxx @@ -26,10 +26,10 @@ // Module : SALOME // $Header$ -using namespace std; #include "QAD_LeftFrame.h" #include "QAD_ObjectBrowser.h" #include +using namespace std; /*! \class QAD_LeftFrame QAD_LeftFrame.h diff --git a/src/SALOMEGUI/QAD_ListMenuIdAction.cxx b/src/SALOMEGUI/QAD_ListMenuIdAction.cxx index 04c8d041d..16bb368dc 100644 --- a/src/SALOMEGUI/QAD_ListMenuIdAction.cxx +++ b/src/SALOMEGUI/QAD_ListMenuIdAction.cxx @@ -26,8 +26,8 @@ // Module : SALOME // $Header$ -using namespace std; #include "QAD_ListMenuIdAction.h" +using namespace std; QAD_ListMenuIdAction::QAD_ListMenuIdAction(QPopupMenu* theMenu, int id, diff --git a/src/SALOMEGUI/QAD_ListPopupMenu.cxx b/src/SALOMEGUI/QAD_ListPopupMenu.cxx index e5a5d134f..1d9e9a7b9 100644 --- a/src/SALOMEGUI/QAD_ListPopupMenu.cxx +++ b/src/SALOMEGUI/QAD_ListPopupMenu.cxx @@ -26,8 +26,8 @@ // Module : SALOME // $Header$ -using namespace std; #include "QAD_ListPopupMenu.h" +using namespace std; /*! Constructor. diff --git a/src/SALOMEGUI/QAD_Menus.cxx b/src/SALOMEGUI/QAD_Menus.cxx index 904ee2713..b7ddf6ae7 100644 --- a/src/SALOMEGUI/QAD_Menus.cxx +++ b/src/SALOMEGUI/QAD_Menus.cxx @@ -26,8 +26,8 @@ // Module : SALOME // $Header$ -using namespace std; #include "QAD_Menus.h" +using namespace std; /*! Constructor. diff --git a/src/SALOMEGUI/QAD_Message.cxx b/src/SALOMEGUI/QAD_Message.cxx index 4730b1ee8..1f5f570c4 100644 --- a/src/SALOMEGUI/QAD_Message.cxx +++ b/src/SALOMEGUI/QAD_Message.cxx @@ -26,7 +26,6 @@ // Module : SALOME // $Header$ -using namespace std; #include "QAD_Message.h" #include "QAD_Application.h" #include "QAD_Config.h" @@ -35,6 +34,7 @@ using namespace std; #include #include #include +using namespace std; enum { IdCopy, IdClear, IdSelectAll }; diff --git a/src/SALOMEGUI/QAD_MessageBox.cxx b/src/SALOMEGUI/QAD_MessageBox.cxx index c6aad0f76..2f4160624 100644 --- a/src/SALOMEGUI/QAD_MessageBox.cxx +++ b/src/SALOMEGUI/QAD_MessageBox.cxx @@ -26,7 +26,6 @@ // Module : SALOME // $Header$ -using namespace std; /*! \class QAD_MessageBox QAD_MessageBox.h \brief Message dialog box for QAD-based application. @@ -37,6 +36,7 @@ using namespace std; // QT Includes #include #include +using namespace std; /*! Shows info message box with one button [ static ] diff --git a/src/SALOMEGUI/QAD_NameBrowser.cxx b/src/SALOMEGUI/QAD_NameBrowser.cxx index 730a53bad..7cdf04b59 100644 --- a/src/SALOMEGUI/QAD_NameBrowser.cxx +++ b/src/SALOMEGUI/QAD_NameBrowser.cxx @@ -26,7 +26,6 @@ // Module : SALOME // $Header$ -using namespace std; #include "QAD_NameBrowser.h" #include "QAD_Study.h" @@ -51,6 +50,7 @@ using namespace std; #include #include #include +using namespace std; /*! Constructs a QAD_NameBrowser which is a child of 'parent', with the diff --git a/src/SALOMEGUI/QAD_ObjectBrowserItem.cxx b/src/SALOMEGUI/QAD_ObjectBrowserItem.cxx index 370358317..696fb78f4 100644 --- a/src/SALOMEGUI/QAD_ObjectBrowserItem.cxx +++ b/src/SALOMEGUI/QAD_ObjectBrowserItem.cxx @@ -26,7 +26,6 @@ // Module : SALOME // $Header$ -using namespace std; #include "QAD_ObjectBrowserItem.h" #include @@ -34,6 +33,7 @@ using namespace std; #include #include #include +using namespace std; /*! Constructors diff --git a/src/SALOMEGUI/QAD_Operation.cxx b/src/SALOMEGUI/QAD_Operation.cxx index 87c99f194..42e0bb955 100644 --- a/src/SALOMEGUI/QAD_Operation.cxx +++ b/src/SALOMEGUI/QAD_Operation.cxx @@ -26,7 +26,6 @@ // Module : SALOME // $Header$ -using namespace std; /*! \class QAD_Operation QAD_Operation.h \brief Base class for OCAF operations in QAD-based application. @@ -39,6 +38,7 @@ using namespace std; // QT Include #include +using namespace std; /*! Constructor diff --git a/src/SALOMEGUI/QAD_OperatorMenus.cxx b/src/SALOMEGUI/QAD_OperatorMenus.cxx index 8ad4e40d0..34bc0290c 100644 --- a/src/SALOMEGUI/QAD_OperatorMenus.cxx +++ b/src/SALOMEGUI/QAD_OperatorMenus.cxx @@ -26,9 +26,9 @@ // Module : SALOME // $Header$ -using namespace std; #include "QAD_OperatorMenus.h" #include "QAD_Desktop.h" +using namespace std; /*! Constructor. diff --git a/src/SALOMEGUI/QAD_ParserSettings.cxx b/src/SALOMEGUI/QAD_ParserSettings.cxx index b824dad2a..c0506f189 100644 --- a/src/SALOMEGUI/QAD_ParserSettings.cxx +++ b/src/SALOMEGUI/QAD_ParserSettings.cxx @@ -26,7 +26,6 @@ // Module : SALOME // $Header$ -using namespace std; #include "QAD_ParserSettings.h" #include @@ -35,6 +34,7 @@ using namespace std; #include #include #include +using namespace std; /*! diff --git a/src/SALOMEGUI/QAD_Popup.cxx b/src/SALOMEGUI/QAD_Popup.cxx index aa2c65a93..9bd085b6b 100644 --- a/src/SALOMEGUI/QAD_Popup.cxx +++ b/src/SALOMEGUI/QAD_Popup.cxx @@ -26,10 +26,10 @@ // Module : SALOME // $Header$ -using namespace std; #include "QAD.h" #include "QAD_Popup.h" #include "utilities.h" +using namespace std; /***************************************************************************** ** Class QAD_PopupClientServer diff --git a/src/SALOMEGUI/QAD_ResourceMgr.cxx b/src/SALOMEGUI/QAD_ResourceMgr.cxx index a220c1536..576c7475c 100644 --- a/src/SALOMEGUI/QAD_ResourceMgr.cxx +++ b/src/SALOMEGUI/QAD_ResourceMgr.cxx @@ -26,7 +26,6 @@ // Module : SALOME // $Header$ -using namespace std; /*! \class QAD_ResourceMgr QAD_ResourceMgr.h \brief ResourceMgr QAD-based application. @@ -46,6 +45,7 @@ using namespace std; #include #include +using namespace std; /* configuration file */ static const char* CONFIG_FILE = "config"; diff --git a/src/SALOMEGUI/QAD_Settings.cxx b/src/SALOMEGUI/QAD_Settings.cxx index 14df2e8f3..d1fec9a21 100644 --- a/src/SALOMEGUI/QAD_Settings.cxx +++ b/src/SALOMEGUI/QAD_Settings.cxx @@ -26,7 +26,6 @@ // Module : SALOME // $Header$ -using namespace std; #include "QAD_Settings.h" #include @@ -36,6 +35,7 @@ using namespace std; #include #include #include +using namespace std; /*! Class QAD_Settings is a base class for different kind of settings diff --git a/src/SALOMEGUI/QAD_SpinBoxDbl.cxx b/src/SALOMEGUI/QAD_SpinBoxDbl.cxx index 6bf31664c..dffa96919 100644 --- a/src/SALOMEGUI/QAD_SpinBoxDbl.cxx +++ b/src/SALOMEGUI/QAD_SpinBoxDbl.cxx @@ -9,7 +9,6 @@ // Module : SALOME // $Header$ -using namespace std; #include "QAD_SpinBoxDbl.h" #include #include @@ -19,6 +18,7 @@ using namespace std; #include #include #include +using namespace std; //****************************************************************************** // QDblRangeControl class diff --git a/src/SALOMEGUI/QAD_Splitter.cxx b/src/SALOMEGUI/QAD_Splitter.cxx index cb472ea71..0d620f597 100644 --- a/src/SALOMEGUI/QAD_Splitter.cxx +++ b/src/SALOMEGUI/QAD_Splitter.cxx @@ -26,8 +26,8 @@ // Module : SALOME // $Header$ -using namespace std; #include "QAD_Splitter.h" +using namespace std; /*! Constructs an horizontal splitter. diff --git a/src/SALOMEGUI/QAD_Tools.cxx b/src/SALOMEGUI/QAD_Tools.cxx index e2e85bf53..dfa23e5c7 100644 --- a/src/SALOMEGUI/QAD_Tools.cxx +++ b/src/SALOMEGUI/QAD_Tools.cxx @@ -26,7 +26,6 @@ // Module : SALOME // $Header$ -using namespace std; /*! \class QAD_Tools QAD_Tools.h \brief Helpful functions for QAD. @@ -44,6 +43,7 @@ using namespace std; #include #include #include +using namespace std; static char* tempName() { diff --git a/src/SALOMEGUI/QAD_XmlHandler.cxx b/src/SALOMEGUI/QAD_XmlHandler.cxx index 2226782d4..85df10900 100644 --- a/src/SALOMEGUI/QAD_XmlHandler.cxx +++ b/src/SALOMEGUI/QAD_XmlHandler.cxx @@ -26,7 +26,6 @@ // Module : SALOME // $Header$ -using namespace std; #define INCLUDE_MENUITEM_DEF #include "QAD_Desktop.h" @@ -41,6 +40,7 @@ using namespace std; #include #include #include +using namespace std; map QAD_XmlHandler::_bibmap; diff --git a/src/SALOMEGUI/SALOMEGUI.cxx b/src/SALOMEGUI/SALOMEGUI.cxx index 5f853a485..6c2795394 100644 --- a/src/SALOMEGUI/SALOMEGUI.cxx +++ b/src/SALOMEGUI/SALOMEGUI.cxx @@ -28,6 +28,7 @@ #include "SALOMEGUI.h" #include "QAD_Desktop.h" +using namespace std; //============================================================================= diff --git a/src/SALOMEGUI/SALOMEGUI_AboutDlg.cxx b/src/SALOMEGUI/SALOMEGUI_AboutDlg.cxx index 7ae5111de..fb7e59301 100644 --- a/src/SALOMEGUI/SALOMEGUI_AboutDlg.cxx +++ b/src/SALOMEGUI/SALOMEGUI_AboutDlg.cxx @@ -26,13 +26,13 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOMEGUI_AboutDlg.h" #include "QAD_Desktop.h" #include "QAD_Tools.h" #include #include #include +using namespace std; /* * Constructor diff --git a/src/SALOMEGUI/SALOMEGUI_ActivateComponentDlg.cxx b/src/SALOMEGUI/SALOMEGUI_ActivateComponentDlg.cxx index 42859b842..a182a2d46 100644 --- a/src/SALOMEGUI/SALOMEGUI_ActivateComponentDlg.cxx +++ b/src/SALOMEGUI/SALOMEGUI_ActivateComponentDlg.cxx @@ -8,7 +8,6 @@ // Author : Michael Zorin (mzn) // Module : SALOME -using namespace std; #include "SALOMEGUI_ActivateComponentDlg.h" #include @@ -16,6 +15,7 @@ using namespace std; #include #include #include +using namespace std; static const char* const default_icon[] = { "48 48 17 1", diff --git a/src/SALOMEGUI/SALOMEGUI_CloseDlg.cxx b/src/SALOMEGUI/SALOMEGUI_CloseDlg.cxx index 090d66ad2..556e10ca4 100644 --- a/src/SALOMEGUI/SALOMEGUI_CloseDlg.cxx +++ b/src/SALOMEGUI/SALOMEGUI_CloseDlg.cxx @@ -8,7 +8,6 @@ // Author : Vasily RUSYAEV (vrv) // Module : SALOME -using namespace std; #include "SALOMEGUI_CloseDlg.h" #include @@ -16,6 +15,7 @@ using namespace std; #include #include #include +using namespace std; SALOMEGUI_CloseDlg::SALOMEGUI_CloseDlg ( QWidget * parent, const char * name, bool modal, WFlags f ) diff --git a/src/SALOMEGUI/SALOMEGUI_Desktop.cxx b/src/SALOMEGUI/SALOMEGUI_Desktop.cxx index 63ce9dbe8..c73bd1e3d 100644 --- a/src/SALOMEGUI/SALOMEGUI_Desktop.cxx +++ b/src/SALOMEGUI/SALOMEGUI_Desktop.cxx @@ -26,12 +26,12 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOMEGUI_Desktop.h" #include "SALOME_Selection.h" #include "SALOME_ListIteratorOfListIO.hxx" #include CORBA_SERVER_HEADER(SALOMEDS_Attributes) +using namespace std; /*! Constructor diff --git a/src/SALOMEGUI/SALOMEGUI_ExternalBrowserDlg.cxx b/src/SALOMEGUI/SALOMEGUI_ExternalBrowserDlg.cxx index 2cb58f858..34a33b1a3 100644 --- a/src/SALOMEGUI/SALOMEGUI_ExternalBrowserDlg.cxx +++ b/src/SALOMEGUI/SALOMEGUI_ExternalBrowserDlg.cxx @@ -3,7 +3,6 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOMEGUI_ExternalBrowserDlg.h" #include @@ -14,6 +13,7 @@ using namespace std; #include "QAD_FileDlg.h" #include "QAD_Tools.h" +using namespace std; /* * Constructs a modal SALOMEGUI_ExternalBowserDlg which is a child of 'parent' diff --git a/src/SALOMEGUI/SALOMEGUI_ImportOperation.cxx b/src/SALOMEGUI/SALOMEGUI_ImportOperation.cxx index 36c535e83..84e0c17ce 100644 --- a/src/SALOMEGUI/SALOMEGUI_ImportOperation.cxx +++ b/src/SALOMEGUI/SALOMEGUI_ImportOperation.cxx @@ -26,8 +26,8 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOMEGUI_ImportOperation.h" +using namespace std; SALOMEGUI_ImportOperation::SALOMEGUI_ImportOperation( QAD_Study* study ) : QAD_Operation( study ) diff --git a/src/SALOMEGUI/SALOMEGUI_LoadStudiesDlg.cxx b/src/SALOMEGUI/SALOMEGUI_LoadStudiesDlg.cxx index de3343aff..0e3c09dce 100644 --- a/src/SALOMEGUI/SALOMEGUI_LoadStudiesDlg.cxx +++ b/src/SALOMEGUI/SALOMEGUI_LoadStudiesDlg.cxx @@ -26,13 +26,13 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOMEGUI_LoadStudiesDlg.h" #include #include #include #include +using namespace std; #define SPACING_SIZE 6 #define MARGIN_SIZE 11 diff --git a/src/SALOMEGUI/SALOMEGUI_NameDlg.cxx b/src/SALOMEGUI/SALOMEGUI_NameDlg.cxx index 841e42f9b..dd21fe89b 100644 --- a/src/SALOMEGUI/SALOMEGUI_NameDlg.cxx +++ b/src/SALOMEGUI/SALOMEGUI_NameDlg.cxx @@ -9,7 +9,6 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOMEGUI_NameDlg.h" #include "QAD_Application.h" #include "QAD_Desktop.h" @@ -20,6 +19,7 @@ using namespace std; #include #include #include +using namespace std; /*! Constructor diff --git a/src/SALOMEGUI/SALOMEGUI_OpenWith.cxx b/src/SALOMEGUI/SALOMEGUI_OpenWith.cxx index 1638bdbb9..2203f5f97 100644 --- a/src/SALOMEGUI/SALOMEGUI_OpenWith.cxx +++ b/src/SALOMEGUI/SALOMEGUI_OpenWith.cxx @@ -26,7 +26,6 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOMEGUI_OpenWith.h" #include @@ -34,6 +33,7 @@ using namespace std; #include #include #include +using namespace std; #define SPACING_SIZE 6 #define MARGIN_SIZE 11 diff --git a/src/SALOMEGUI/SALOMEGUI_QtCatchCorbaException.cxx b/src/SALOMEGUI/SALOMEGUI_QtCatchCorbaException.cxx index 971433632..ede2c4366 100644 --- a/src/SALOMEGUI/SALOMEGUI_QtCatchCorbaException.cxx +++ b/src/SALOMEGUI/SALOMEGUI_QtCatchCorbaException.cxx @@ -26,12 +26,12 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOMEGUI_QtCatchCorbaException.hxx" #include "utilities.h" #include "QAD_Desktop.h" #include "QAD_MessageBox.h" +using namespace std; void QtCatchCorbaException(const SALOME::SALOME_Exception & S_ex) { diff --git a/src/SALOMEGUI/SALOMEGUI_SetValueDlg.cxx b/src/SALOMEGUI/SALOMEGUI_SetValueDlg.cxx index 3a8eb70f2..caa274038 100644 --- a/src/SALOMEGUI/SALOMEGUI_SetValueDlg.cxx +++ b/src/SALOMEGUI/SALOMEGUI_SetValueDlg.cxx @@ -9,7 +9,6 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOMEGUI_SetValueDlg.h" #include "QAD_Tools.h" @@ -19,6 +18,7 @@ using namespace std; #include #include #include +using namespace std; #define MARGIN_SIZE 11 #define SPACING_SIZE 6 diff --git a/src/SALOMEGUI/SALOMEGUI_SetupCurveDlg.cxx b/src/SALOMEGUI/SALOMEGUI_SetupCurveDlg.cxx index 15e5b4cb6..4265cb95d 100644 --- a/src/SALOMEGUI/SALOMEGUI_SetupCurveDlg.cxx +++ b/src/SALOMEGUI/SALOMEGUI_SetupCurveDlg.cxx @@ -9,7 +9,6 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOMEGUI_SetupCurveDlg.h" #include "QAD_Tools.h" #include @@ -20,6 +19,7 @@ using namespace std; #include #include #include +using namespace std; #define MARGIN_SIZE 11 #define SPACING_SIZE 6 diff --git a/src/SALOMEGUI/SALOMEGUI_StudyPropertiesDlg.cxx b/src/SALOMEGUI/SALOMEGUI_StudyPropertiesDlg.cxx index 0019a14dd..4d9a73281 100644 --- a/src/SALOMEGUI/SALOMEGUI_StudyPropertiesDlg.cxx +++ b/src/SALOMEGUI/SALOMEGUI_StudyPropertiesDlg.cxx @@ -9,7 +9,6 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOMEGUI_StudyPropertiesDlg.h" #include "QAD_Desktop.h" @@ -19,6 +18,7 @@ using namespace std; #include #include +using namespace std; #define DEFAULT_MARGIN 11 #define DEFAULT_SPACING 6 diff --git a/src/SALOMEGUI/SALOMEGUI_TableDlg.cxx b/src/SALOMEGUI/SALOMEGUI_TableDlg.cxx index 5f0455fcd..a70b74df4 100644 --- a/src/SALOMEGUI/SALOMEGUI_TableDlg.cxx +++ b/src/SALOMEGUI/SALOMEGUI_TableDlg.cxx @@ -9,7 +9,6 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOMEGUI_TableDlg.h" #include "QAD_Tools.h" #include "QAD_MessageBox.h" @@ -22,6 +21,7 @@ using namespace std; #include #include #include "utilities.h" +using namespace std; #define MARGIN_SIZE 11 #define SPACING_SIZE 6 diff --git a/src/SALOMEGUI/SALOMEGUI_TrihedronSizeDlg.cxx b/src/SALOMEGUI/SALOMEGUI_TrihedronSizeDlg.cxx index ed31165c3..8f78226ce 100644 --- a/src/SALOMEGUI/SALOMEGUI_TrihedronSizeDlg.cxx +++ b/src/SALOMEGUI/SALOMEGUI_TrihedronSizeDlg.cxx @@ -26,7 +26,6 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOMEGUI_TrihedronSizeDlg.h" #include @@ -34,6 +33,7 @@ using namespace std; #include #include #include +using namespace std; #define MARGIN_SIZE 11 #define SPACING_SIZE 6 diff --git a/src/SALOMEGUI/SALOMEGUI_ViewChoiceDlg.cxx b/src/SALOMEGUI/SALOMEGUI_ViewChoiceDlg.cxx index d091d18da..9451c8777 100644 --- a/src/SALOMEGUI/SALOMEGUI_ViewChoiceDlg.cxx +++ b/src/SALOMEGUI/SALOMEGUI_ViewChoiceDlg.cxx @@ -26,7 +26,6 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOMEGUI_ViewChoiceDlg.h" #include "QAD_Config.h" #include "QAD_StudyFrame.h" @@ -39,6 +38,7 @@ using namespace std; #include #include #include +using namespace std; /* * Constructs a SALOMEGUI_ViewChoiceDlg which is a child of 'parent', with the diff --git a/src/SALOMEGUI/SALOME_DataMapIteratorOfDataMapOfIOMapOfInteger_0.cxx b/src/SALOMEGUI/SALOME_DataMapIteratorOfDataMapOfIOMapOfInteger_0.cxx index b45bb6c6d..8d0897844 100644 --- a/src/SALOMEGUI/SALOME_DataMapIteratorOfDataMapOfIOMapOfInteger_0.cxx +++ b/src/SALOMEGUI/SALOME_DataMapIteratorOfDataMapOfIOMapOfInteger_0.cxx @@ -24,7 +24,6 @@ // File : SALOME_DataMapIteratorOfDataMapOfIOMapOfInteger_0.cxx // Module : SALOME -using namespace std; #include "SALOME_DataMapIteratorOfDataMapOfIOMapOfInteger.hxx" #ifndef _Standard_NoSuchObject_HeaderFile @@ -45,7 +44,8 @@ using namespace std; #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/SALOMEGUI/SALOME_DataMapNodeOfDataMapOfIOMapOfInteger_0.cxx b/src/SALOMEGUI/SALOME_DataMapNodeOfDataMapOfIOMapOfInteger_0.cxx index d4d843fe0..4cab4c88e 100644 --- a/src/SALOMEGUI/SALOME_DataMapNodeOfDataMapOfIOMapOfInteger_0.cxx +++ b/src/SALOMEGUI/SALOME_DataMapNodeOfDataMapOfIOMapOfInteger_0.cxx @@ -24,7 +24,6 @@ // File : SALOME_DataMapNodeOfDataMapOfIOMapOfInteger_0.cxx // Module : SALOME -using namespace std; #include "SALOME_DataMapNodeOfDataMapOfIOMapOfInteger.hxx" #ifndef _Standard_TypeMismatch_HeaderFile @@ -46,6 +45,7 @@ using namespace std; #ifndef _SALOME_DataMapIteratorOfDataMapOfIOMapOfInteger_HeaderFile #include "SALOME_DataMapIteratorOfDataMapOfIOMapOfInteger.hxx" #endif +using namespace std; SALOME_DataMapNodeOfDataMapOfIOMapOfInteger::~SALOME_DataMapNodeOfDataMapOfIOMapOfInteger() {} diff --git a/src/SALOMEGUI/SALOME_DataMapOfIOMapOfInteger_0.cxx b/src/SALOMEGUI/SALOME_DataMapOfIOMapOfInteger_0.cxx index e55a3e490..7ce912510 100644 --- a/src/SALOMEGUI/SALOME_DataMapOfIOMapOfInteger_0.cxx +++ b/src/SALOMEGUI/SALOME_DataMapOfIOMapOfInteger_0.cxx @@ -24,7 +24,6 @@ // File : SALOME_DataMapOfIOMapOfInteger_0.cxx // Module : SALOME -using namespace std; #include "SALOME_DataMapOfIOMapOfInteger.hxx" #ifndef _Standard_DomainError_HeaderFile @@ -48,7 +47,8 @@ using namespace std; #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/SALOMEGUI/SALOME_Filter.cxx b/src/SALOMEGUI/SALOME_Filter.cxx index 2a095e50a..a6ca25e67 100644 --- a/src/SALOMEGUI/SALOME_Filter.cxx +++ b/src/SALOMEGUI/SALOME_Filter.cxx @@ -26,6 +26,6 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOME_Filter.ixx" +using namespace std; diff --git a/src/SALOMEGUI/SALOME_ListIO_0.cxx b/src/SALOMEGUI/SALOME_ListIO_0.cxx index 0c5ee6097..14be3eee6 100644 --- a/src/SALOMEGUI/SALOME_ListIO_0.cxx +++ b/src/SALOMEGUI/SALOME_ListIO_0.cxx @@ -24,7 +24,6 @@ // File : SALOME_ListIO_0.cxx // Module : SALOME -using namespace std; #include "SALOME_ListIO.hxx" #ifndef _Standard_NoSuchObject_HeaderFile @@ -39,7 +38,8 @@ using namespace std; #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/SALOMEGUI/SALOME_ListIteratorOfListIO_0.cxx b/src/SALOMEGUI/SALOME_ListIteratorOfListIO_0.cxx index 928d94559..adb55ab72 100644 --- a/src/SALOMEGUI/SALOME_ListIteratorOfListIO_0.cxx +++ b/src/SALOMEGUI/SALOME_ListIteratorOfListIO_0.cxx @@ -24,7 +24,6 @@ // File : SALOME_ListIteratorOfListIO_0.cxx // Module : SALOME -using namespace std; #include "SALOME_ListIteratorOfListIO.hxx" #ifndef _Standard_NoMoreObject_HeaderFile @@ -42,6 +41,7 @@ using namespace std; #ifndef _SALOME_ListNodeOfListIO_HeaderFile #include "SALOME_ListNodeOfListIO.hxx" #endif +using namespace std; #define Item Handle_SALOME_InteractiveObject diff --git a/src/SALOMEGUI/SALOME_ListIteratorOfListOfFilter_0.cxx b/src/SALOMEGUI/SALOME_ListIteratorOfListOfFilter_0.cxx index 95cba8a29..57a0e587b 100644 --- a/src/SALOMEGUI/SALOME_ListIteratorOfListOfFilter_0.cxx +++ b/src/SALOMEGUI/SALOME_ListIteratorOfListOfFilter_0.cxx @@ -24,7 +24,6 @@ // File : SALOME_ListIteratorOfListOfFilter_0.cxx // Module : SALOME -using namespace std; #include "SALOME_ListIteratorOfListOfFilter.hxx" #ifndef _Standard_NoMoreObject_HeaderFile @@ -42,6 +41,7 @@ using namespace std; #ifndef _SALOME_ListNodeOfListOfFilter_HeaderFile #include "SALOME_ListNodeOfListOfFilter.hxx" #endif +using namespace std; #define Item Handle_SALOME_Filter diff --git a/src/SALOMEGUI/SALOME_ListNodeOfListIO_0.cxx b/src/SALOMEGUI/SALOME_ListNodeOfListIO_0.cxx index 95147d20d..35f04d576 100644 --- a/src/SALOMEGUI/SALOME_ListNodeOfListIO_0.cxx +++ b/src/SALOMEGUI/SALOME_ListNodeOfListIO_0.cxx @@ -24,7 +24,6 @@ // File : SALOME_ListNodeOfListIO_0.cxx // Module : SALOME -using namespace std; #include "SALOME_ListNodeOfListIO.hxx" #ifndef _Standard_TypeMismatch_HeaderFile @@ -40,6 +39,7 @@ using namespace std; #ifndef _SALOME_ListIteratorOfListIO_HeaderFile #include "SALOME_ListIteratorOfListIO.hxx" #endif +using namespace std; SALOME_ListNodeOfListIO::~SALOME_ListNodeOfListIO() {} diff --git a/src/SALOMEGUI/SALOME_ListNodeOfListOfFilter_0.cxx b/src/SALOMEGUI/SALOME_ListNodeOfListOfFilter_0.cxx index b89c9d1e7..23afd5801 100644 --- a/src/SALOMEGUI/SALOME_ListNodeOfListOfFilter_0.cxx +++ b/src/SALOMEGUI/SALOME_ListNodeOfListOfFilter_0.cxx @@ -24,7 +24,6 @@ // File : SALOME_ListNodeOfListOfFilter_0.cxx // Module : SALOME -using namespace std; #include "SALOME_ListNodeOfListOfFilter.hxx" #ifndef _Standard_TypeMismatch_HeaderFile @@ -40,6 +39,7 @@ using namespace std; #ifndef _SALOME_ListIteratorOfListOfFilter_HeaderFile #include "SALOME_ListIteratorOfListOfFilter.hxx" #endif +using namespace std; SALOME_ListNodeOfListOfFilter::~SALOME_ListNodeOfListOfFilter() {} diff --git a/src/SALOMEGUI/SALOME_ListOfFilter_0.cxx b/src/SALOMEGUI/SALOME_ListOfFilter_0.cxx index 6dbbdaacf..8b30df9f6 100644 --- a/src/SALOMEGUI/SALOME_ListOfFilter_0.cxx +++ b/src/SALOMEGUI/SALOME_ListOfFilter_0.cxx @@ -24,7 +24,6 @@ // File : SALOME_ListOfFilter_0.cxx // Module : SALOME -using namespace std; #include "SALOME_ListOfFilter.hxx" #ifndef _Standard_NoSuchObject_HeaderFile @@ -39,6 +38,7 @@ using namespace std; #ifndef _SALOME_ListNodeOfListOfFilter_HeaderFile #include "SALOME_ListNodeOfListOfFilter.hxx" #endif +using namespace std; #define Item Handle_SALOME_Filter diff --git a/src/SALOMEGUI/SALOME_NumberFilter.cxx b/src/SALOMEGUI/SALOME_NumberFilter.cxx index 3574d8d64..cdc63948e 100644 --- a/src/SALOMEGUI/SALOME_NumberFilter.cxx +++ b/src/SALOMEGUI/SALOME_NumberFilter.cxx @@ -26,7 +26,6 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOME_NumberFilter.ixx" #include "SALOME_Selection.h" #include "SALOME_InteractiveObject.hxx" @@ -34,6 +33,7 @@ using namespace std; #include "QAD_Application.h" #include "QAD_Desktop.h" #include "QAD_Study.h" +using namespace std; SALOME_NumberFilter::SALOME_NumberFilter(NumberFilter TheKind, Standard_Integer aValue): myKind(TheKind), diff --git a/src/SALOMEGUI/SALOME_TypeFilter.cxx b/src/SALOMEGUI/SALOME_TypeFilter.cxx index 4bc2a5246..83f1d71ec 100644 --- a/src/SALOMEGUI/SALOME_TypeFilter.cxx +++ b/src/SALOMEGUI/SALOME_TypeFilter.cxx @@ -26,9 +26,9 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOME_TypeFilter.ixx" #include "SALOME_InteractiveObject.hxx" +using namespace std; SALOME_TypeFilter::SALOME_TypeFilter(const Standard_CString TheKind): myKind(TheKind){} diff --git a/src/SALOMELocalTrace/LocalTraceBufferPool.cxx b/src/SALOMELocalTrace/LocalTraceBufferPool.cxx index 73046c6ec..8a997221a 100644 --- a/src/SALOMELocalTrace/LocalTraceBufferPool.cxx +++ b/src/SALOMELocalTrace/LocalTraceBufferPool.cxx @@ -30,12 +30,12 @@ #include "LocalTraceBufferPool.hxx" #include "utilities.h" +using namespace std; + // In case of truncated message, end of trace contains "...\n\0" #define TRUNCATED_MESSAGE "...\n" #define MAXMESS_LENGTH MAX_TRACE_LENGTH-5 -using namespace std; - LocalTraceBufferPool* LocalTraceBufferPool::_singleton = 0; pthread_mutex_t LocalTraceBufferPool::_singletonMutex; diff --git a/src/SALOMELocalTrace/utilities.h b/src/SALOMELocalTrace/utilities.h index 94543b9f2..28696612b 100644 --- a/src/SALOMELocalTrace/utilities.h +++ b/src/SALOMELocalTrace/utilities.h @@ -36,7 +36,6 @@ #include #include -using namespace std; #include "LocalTraceBufferPool.hxx" @@ -52,7 +51,7 @@ using namespace std; * thread waken up is not garanteed (no fifo or priority rules in Linux Kernel) */ -#define MESS_INIT(deb) ostringstream os; os<insert(NORMAL_MESS, os.str().c_str()); #define MESS_ABORT endl; LocalTraceBufferPool::instance()->insert(ABORT_MESS, os.str().c_str()); @@ -62,7 +61,7 @@ using namespace std; #define INFOS(msg) {MESS_BEGIN("- Trace ") << msg << MESS_END} #define PYSCRIPT(msg) {MESS_INIT("---PYSCRIPT--- ") << msg << MESS_END} #define INTERRUPTION(msg) {MESS_BEGIN("- INTERRUPTION: ")<< msg << MESS_ABORT} -#define IMMEDIATE_ABORT(code) {cout < @@ -20,6 +19,7 @@ using namespace std; #include "QAD_Config.h" #include "QAD_Settings.h" +using namespace std; QWidget* SalomePyQt::getDesktop() { diff --git a/src/SUPERVGraph/SUPERVGraph.cxx b/src/SUPERVGraph/SUPERVGraph.cxx index 140853bb9..70524b061 100644 --- a/src/SUPERVGraph/SUPERVGraph.cxx +++ b/src/SUPERVGraph/SUPERVGraph.cxx @@ -26,9 +26,9 @@ // Module : SALOME // $Header$ -using namespace std; #include "SUPERVGraph.h" #include "SUPERVGraph_ViewFrame.h" +using namespace std; QAD_ViewFrame* SUPERVGraph::createView(QAD_RightFrame* parent) { diff --git a/src/SUPERVGraph/SUPERVGraph_Graph.cxx b/src/SUPERVGraph/SUPERVGraph_Graph.cxx index f312dbcde..9d0c6baab 100644 --- a/src/SUPERVGraph/SUPERVGraph_Graph.cxx +++ b/src/SUPERVGraph/SUPERVGraph_Graph.cxx @@ -25,7 +25,6 @@ // Author : Francis KLOSS // Module : SALOME -using namespace std; #include "SUPERVGraph_Graph.h" #include "QAD_Settings.h" @@ -33,6 +32,7 @@ using namespace std; #include #include +using namespace std; SUPERVGraph_Graph::SUPERVGraph_Graph(QWidget* parent) : diff --git a/src/SUPERVGraph/SUPERVGraph_ViewFrame.cxx b/src/SUPERVGraph/SUPERVGraph_ViewFrame.cxx index 7a73fff3e..7e125178a 100644 --- a/src/SUPERVGraph/SUPERVGraph_ViewFrame.cxx +++ b/src/SUPERVGraph/SUPERVGraph_ViewFrame.cxx @@ -26,7 +26,6 @@ // Module : SALOME // $Header$ -using namespace std; #include "SUPERVGraph_ViewFrame.h" #include "QAD_Settings.h" @@ -40,6 +39,7 @@ using namespace std; //QT Include #include #include +using namespace std; SUPERVGraph_View::SUPERVGraph_View(QWidget* theParent): QWidget(theParent){ init(theParent); diff --git a/src/Session/SALOME_Session_QThread.cxx b/src/Session/SALOME_Session_QThread.cxx index 76cfaeb41..9b1e5d95f 100644 --- a/src/Session/SALOME_Session_QThread.cxx +++ b/src/Session/SALOME_Session_QThread.cxx @@ -26,7 +26,6 @@ // Module : SALOME // $Header$ -using namespace std; #include #include @@ -48,6 +47,7 @@ using namespace std; #include "Utils_CorbaException.hxx" #include #include CORBA_SERVER_HEADER(SALOMEDS) +using namespace std; //============================================================================= /*! SALOME_Session_QThread diff --git a/src/Session/SALOME_Session_Server.cxx b/src/Session/SALOME_Session_Server.cxx index 2a8522145..c78fb6763 100644 --- a/src/Session/SALOME_Session_Server.cxx +++ b/src/Session/SALOME_Session_Server.cxx @@ -60,6 +60,7 @@ #include "SALOME_Session_i.hxx" #include "Session_ServerLauncher.hxx" +using namespace std; extern "C" int HandleSignals(QApplication *theQApplication); diff --git a/src/Session/SALOME_Session_SignalsHandler.cxx b/src/Session/SALOME_Session_SignalsHandler.cxx index c02f6132a..8b0dec803 100644 --- a/src/Session/SALOME_Session_SignalsHandler.cxx +++ b/src/Session/SALOME_Session_SignalsHandler.cxx @@ -22,6 +22,7 @@ #include #include "CASCatch_SignalsHandler.h" // CAREFUL ! position of this file is critic : see Lucien PIGNOLONI / OCC +using namespace std; extern "C" int HandleSignals(QApplication *theQApplication) diff --git a/src/Session/Session_ServerLauncher.cxx b/src/Session/Session_ServerLauncher.cxx index 8cbfce4de..82a8c6733 100644 --- a/src/Session/Session_ServerLauncher.cxx +++ b/src/Session/Session_ServerLauncher.cxx @@ -30,6 +30,7 @@ #include "Utils_SALOME_Exception.hxx" #include "utilities.h" +using namespace std; //============================================================================= /*! diff --git a/src/Session/Session_ServerLauncher.hxx b/src/Session/Session_ServerLauncher.hxx index 45804e17d..e5c112322 100644 --- a/src/Session/Session_ServerLauncher.hxx +++ b/src/Session/Session_ServerLauncher.hxx @@ -38,7 +38,6 @@ #include #include -using namespace std; class ServArg { @@ -78,9 +77,9 @@ private: PortableServer::POA_var _root_poa; QMutex* _GUIMutex; QWaitCondition *_ServerLaunch; - list _argServToLaunch; - vector _argCopy; - list _serverThreads; + std::list _argServToLaunch; + std::vector _argCopy; + std::list _serverThreads; }; #endif diff --git a/src/Session/Session_ServerThread.hxx b/src/Session/Session_ServerThread.hxx index b7dfc2c86..e67ee7fe8 100644 --- a/src/Session/Session_ServerThread.hxx +++ b/src/Session/Session_ServerThread.hxx @@ -30,12 +30,10 @@ #define _SESSION_SERVERTHREAD_HXX_ #include -#include #include "SALOME_NamingService.hxx" #include -using namespace std; class Session_ServerThread { diff --git a/src/TOOLSDS/SALOMEDS_Tool.cxx b/src/TOOLSDS/SALOMEDS_Tool.cxx index f14dcade0..4e07ddf04 100644 --- a/src/TOOLSDS/SALOMEDS_Tool.cxx +++ b/src/TOOLSDS/SALOMEDS_Tool.cxx @@ -1,4 +1,3 @@ -using namespace std; // File : SALOMEDS_Tool.cxx // Created : Mon Oct 21 16:24:34 2002 // Author : Sergey RUIN @@ -26,6 +25,7 @@ using namespace std; #include #include +using namespace std; //============================================================================ // function : GetTempDir diff --git a/src/TOOLSGUI/ToolsGUI.cxx b/src/TOOLSGUI/ToolsGUI.cxx index 4b2f47089..7e98ad7b1 100644 --- a/src/TOOLSGUI/ToolsGUI.cxx +++ b/src/TOOLSGUI/ToolsGUI.cxx @@ -26,13 +26,13 @@ // Module : SALOME // $Header$ -using namespace std; #include "ToolsGUI.h" #include "ToolsGUI_CatalogGeneratorDlg.h" #include "utilities.h" #include +using namespace std; int ToolsGUI::runCommand(string & arg) { diff --git a/src/TestContainer/SALOME_TestComponent_i.cxx b/src/TestContainer/SALOME_TestComponent_i.cxx index cca19c31a..3c765b45c 100644 --- a/src/TestContainer/SALOME_TestComponent_i.cxx +++ b/src/TestContainer/SALOME_TestComponent_i.cxx @@ -26,12 +26,12 @@ // Module : SALOME // $Header$ -using namespace std; #include "utilities.h" #include "SALOME_TestComponent_i.hxx" #include #include #include +using namespace std; Engines_TestComponent_i::Engines_TestComponent_i(CORBA::ORB_ptr orb, PortableServer::POA_ptr poa, diff --git a/src/TestContainer/TestLogger.cxx b/src/TestContainer/TestLogger.cxx index 8b73720de..d5756b4cf 100644 --- a/src/TestContainer/TestLogger.cxx +++ b/src/TestContainer/TestLogger.cxx @@ -26,13 +26,13 @@ // Module : SALOME // $Header$ -using namespace std; #include "utilities.h" #include #include #include #include "SALOME_NamingService.hxx" #include "OpUtil.hxx" +using namespace std; int main (int argc, char * argv[]) { diff --git a/src/TestMPIContainer/TestMPIContainer.cxx b/src/TestMPIContainer/TestMPIContainer.cxx index 3f753af5d..b195a0199 100644 --- a/src/TestMPIContainer/TestMPIContainer.cxx +++ b/src/TestMPIContainer/TestMPIContainer.cxx @@ -20,6 +20,7 @@ # include "Utils_SINGLETON.hxx" #include "SALOME_NamingService.hxx" #include "OpUtil.hxx" +using namespace std; int main (int argc, char * argv[]) { diff --git a/src/Utils/Utils_CommException.cxx b/src/Utils/Utils_CommException.cxx index d4e953d86..15af581ee 100644 --- a/src/Utils/Utils_CommException.cxx +++ b/src/Utils/Utils_CommException.cxx @@ -26,8 +26,8 @@ // Module : SALOME // $Header$ -using namespace std; # include "Utils_CommException.hxx" +using namespace std; CommException::CommException( void ): SALOME_Exception( "CommException" ) { diff --git a/src/Utils/Utils_DESTRUCTEUR_GENERIQUE.cxx b/src/Utils/Utils_DESTRUCTEUR_GENERIQUE.cxx index dbe9f1ba3..268aa1f30 100644 --- a/src/Utils/Utils_DESTRUCTEUR_GENERIQUE.cxx +++ b/src/Utils/Utils_DESTRUCTEUR_GENERIQUE.cxx @@ -36,6 +36,8 @@ extern "C" # include "Utils_DESTRUCTEUR_GENERIQUE.hxx" # include "utilities.h" +using namespace std; + void Nettoyage(); #ifdef _DEBUG_ @@ -44,8 +46,6 @@ static int MYDEBUG = 0; static int MYDEBUG = 0; #endif -using namespace std; - static list *Destructeurs=0 ; /*! \class ATEXIT_ diff --git a/src/Utils/Utils_ExceptHandlers.cxx b/src/Utils/Utils_ExceptHandlers.cxx index 2e9b09567..d3f144e34 100644 --- a/src/Utils/Utils_ExceptHandlers.cxx +++ b/src/Utils/Utils_ExceptHandlers.cxx @@ -11,6 +11,8 @@ #include #include CORBA_SERVER_HEADER(SALOME_Exception) +using namespace std; + void SalomeException () { throw SALOME_Exception("Salome Exception"); diff --git a/src/Utils/Utils_SALOME_Exception.cxx b/src/Utils/Utils_SALOME_Exception.cxx index 8f26985a1..6db802be8 100644 --- a/src/Utils/Utils_SALOME_Exception.cxx +++ b/src/Utils/Utils_SALOME_Exception.cxx @@ -26,10 +26,10 @@ // Module : SALOME // $Header$ -using namespace std; #include #include "Utils_SALOME_Exception.hxx" #include "utilities.h" +using namespace std; extern "C" { #include diff --git a/src/Utils/Utils_SignalsHandler.cxx b/src/Utils/Utils_SignalsHandler.cxx index d72879e4b..d8af06d92 100644 --- a/src/Utils/Utils_SignalsHandler.cxx +++ b/src/Utils/Utils_SignalsHandler.cxx @@ -24,6 +24,7 @@ #include #include "Utils_SignalsHandler.h" +using namespace std; //============================================================================ diff --git a/src/Utils/Utils_Timer.cxx b/src/Utils/Utils_Timer.cxx index f594aba9b..74a64bac7 100644 --- a/src/Utils/Utils_Timer.cxx +++ b/src/Utils/Utils_Timer.cxx @@ -26,9 +26,9 @@ # include "Utils_Timer.hxx" # include -using namespace std; #include "utilities.h" +using namespace std; static struct timezone *tz=(struct timezone*) malloc(sizeof(struct timezone)); diff --git a/src/VTKFilter/SALOME_GeometryFilter.cxx b/src/VTKFilter/SALOME_GeometryFilter.cxx index d61f825e0..05e18db03 100644 --- a/src/VTKFilter/SALOME_GeometryFilter.cxx +++ b/src/VTKFilter/SALOME_GeometryFilter.cxx @@ -43,6 +43,7 @@ #include #include #include +using namespace std; #ifdef _DEBUG_ static int MYDEBUG = 0; diff --git a/src/VTKFilter/SALOME_PassThroughFilter.cxx b/src/VTKFilter/SALOME_PassThroughFilter.cxx index f1ee7c5e9..daaf36ab9 100644 --- a/src/VTKFilter/SALOME_PassThroughFilter.cxx +++ b/src/VTKFilter/SALOME_PassThroughFilter.cxx @@ -32,6 +32,7 @@ #include #include #include +using namespace std; vtkCxxRevisionMacro(SALOME_PassThroughFilter, "$Revision$"); vtkStandardNewMacro(SALOME_PassThroughFilter); diff --git a/src/VTKFilter/SALOME_ShrinkFilter.cxx b/src/VTKFilter/SALOME_ShrinkFilter.cxx index 1ea45c86f..7d9d8b18b 100644 --- a/src/VTKFilter/SALOME_ShrinkFilter.cxx +++ b/src/VTKFilter/SALOME_ShrinkFilter.cxx @@ -34,6 +34,7 @@ #include #include #include +using namespace std; #ifdef _DEBUG_ static int MYDEBUG = 0; diff --git a/src/VTKViewer/VTKViewer.cxx b/src/VTKViewer/VTKViewer.cxx index 796028060..a0c60854e 100644 --- a/src/VTKViewer/VTKViewer.cxx +++ b/src/VTKViewer/VTKViewer.cxx @@ -26,9 +26,9 @@ // Module : SALOME // $Header$ -using namespace std; #include "VTKViewer.h" #include "VTKViewer_ViewFrame.h" +using namespace std; QAD_ViewFrame* VTKViewer::createView(QAD_RightFrame* parent) { diff --git a/src/VTKViewer/VTKViewer_Filter.cxx b/src/VTKViewer/VTKViewer_Filter.cxx index 8c09a46c4..c0c5f7d81 100755 --- a/src/VTKViewer/VTKViewer_Filter.cxx +++ b/src/VTKViewer/VTKViewer_Filter.cxx @@ -26,6 +26,7 @@ // 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_Prs.cxx b/src/VTKViewer/VTKViewer_Prs.cxx index 4d048c609..dec6b008a 100644 --- a/src/VTKViewer/VTKViewer_Prs.cxx +++ b/src/VTKViewer/VTKViewer_Prs.cxx @@ -27,6 +27,7 @@ // $Header$ #include "VTKViewer_Prs.h" +using namespace std; //========================================================== /*! diff --git a/src/VTKViewer/VTKViewer_RenderWindow.cxx b/src/VTKViewer/VTKViewer_RenderWindow.cxx index 46e3dba3f..08dbc0eda 100644 --- a/src/VTKViewer/VTKViewer_RenderWindow.cxx +++ b/src/VTKViewer/VTKViewer_RenderWindow.cxx @@ -26,7 +26,6 @@ // Module : SALOME // $Header$ -using namespace std; #include "VTKViewer_RenderWindow.h" #include "utilities.h" #include "QAD_Settings.h" @@ -54,6 +53,7 @@ using namespace std; #if QT_VERSION > 300 #include #endif +using namespace std; VTKViewer_RenderWindow::VTKViewer_RenderWindow(QWidget *parent, const char *name) : QWidget(parent, name, diff --git a/src/VTKViewer/VTKViewer_VectorText.cxx b/src/VTKViewer/VTKViewer_VectorText.cxx index ae19d948d..d0ee379d6 100644 --- a/src/VTKViewer/VTKViewer_VectorText.cxx +++ b/src/VTKViewer/VTKViewer_VectorText.cxx @@ -24,6 +24,7 @@ #include "vtkObjectFactory.h" #include "vtkPoints.h" #include "vtkPolyData.h" +using namespace std; vtkCxxRevisionMacro(VTKViewer_VectorText, "$Revision$"); vtkStandardNewMacro(VTKViewer_VectorText); -- 2.39.2