portage sur processeur alpha/osf

diff --git a/src/Notification/NOTIFICATION.cxx b/src/Notification/NOTIFICATION.cxx
index 1058d706edc3bfa88b84d54984ff83c7b79413e5..bbbb922948c7a896c31baae5967586d998c3cf56 100644 (file)
--- 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_<ORB_INIT>::Instance(); ASSERT(SINGLETON_<ORB_INIT>::IsAlreadyExisting());

diff --git a/src/Notification/NOTIFICATION_Consumer.cxx b/src/Notification/NOTIFICATION_Consumer.cxx
index 809d328eca5e8f4e3899f0b603229a6b357b4246..e502a01d0d91b5d365d0ba76a179cfdaf5671623 100644 (file)
--- 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 b572539a449b2c751c4c38a0ef0ee34ceb5421ca..83d3787a60b6fa4be138d15ced4601cceebd2d01 100644 (file)
--- 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 2d34b31a2095bed8eb89dbc7f1ccbb53ff34981b..46abdd1d6a70d1d45ef00bfa0c6fa9d3a5c25e59 100644 (file)
--- 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 117738ffac3948e23079e47a8390b706dd251614..b439aef2b01642587b9aa2e8d37b5425f18b20d4 100644 (file)
--- 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_Actor.cxx b/src/OBJECT/SALOME_Actor.cxx
index 38f46f8be3b9b39fb10ccd603151919f242efafb..db7f010109ee8a8d371367143496c00ff36a5e7b 100644 (file)
--- a/src/OBJECT/SALOME_Actor.cxx
+++ b/src/OBJECT/SALOME_Actor.cxx
@@ -26,7 +26,6 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 /*!
   \class SALOME_Actor SALOME_Actor.h
   \brief Abstract class of SALOME Objects in VTK.
@@ -36,6 +35,7 @@ using namespace std;
  
 // SALOME Includes
 #include "utilities.h"
+using namespace std;
 
 // VTK Includes
 #include <vtkObjectFactory.h>

diff --git a/src/OBJECT/SALOME_Actor.h b/src/OBJECT/SALOME_Actor.h
index 0a994e6160239a947201ed1cf227e3fd044cff8e..89c46f0668bdc709f26fa4edf91081f76d875b84 100644 (file)
--- a/src/OBJECT/SALOME_Actor.h
+++ b/src/OBJECT/SALOME_Actor.h
@@ -36,7 +36,7 @@
 #include "Handle_SALOME_InteractiveObject.hxx"
 #endif
 
-#include <vector.h>
+#include <vector>
 #include "VTKViewer_Common.h"
 
 class SALOME_Actor : public vtkLODActor 

diff --git a/src/OBJECT/SALOME_InteractiveObject.cxx b/src/OBJECT/SALOME_InteractiveObject.cxx
index 36a977af643c4f24f0f3435dac86f915884c30db..c361fca8f1220e108c7a522c2d0e4cfe8cf96f5f 100644 (file)
--- 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 d98bb2b1f7adaae19fa0b25e8320463abcb3e093..70a92624c83786b5b4c87e1f410e7c400a7a03bd 100644 (file)
--- 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 6310f51c6c919748a3b3b0285d33296f2e49fe02..0b95ac18decb35adb0727b7754c23d38ca68336e 100644 (file)
--- 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_Selector.cxx b/src/OCCViewer/OCCViewer_Selector.cxx
index e037b6b35281027e3cbc7932752d048db12035e6..41df5163a1fb7e124198aa8c9f8f603f2efab812 100644 (file)
--- a/src/OCCViewer/OCCViewer_Selector.cxx
+++ b/src/OCCViewer/OCCViewer_Selector.cxx
@@ -26,13 +26,13 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 /*!
   \class OCCViewer_Selector OCCViewer_Selector.h
   \brief Base class for object selection in Open CASCADE Viewer.
 */
 
 #include "OCCViewer_Selector.h"
+using namespace std;
 
 /*!
     Constructor

diff --git a/src/OCCViewer/OCCViewer_VService.cxx b/src/OCCViewer/OCCViewer_VService.cxx
index e0ed072a642204b10ea07161e9203e582ec69473..eca0fbbb84e1dfe6e878f23e2aea334e298728ae 100644 (file)
--- 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 <Xdps_Driver.hxx>
 #include <Xw_TypeOfMapping.hxx>
 #endif
+using namespace std;
 
 // For 2d
 #define LOPTIM

diff --git a/src/OCCViewer/OCCViewer_ViewFrame.cxx b/src/OCCViewer/OCCViewer_ViewFrame.cxx
index c15abf390ed31448c5e9776ca63b95e4f6240079..df850c74f33b28811315ebf8682f4a8048dc4608 100644 (file)
--- 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"
@@ -50,6 +49,7 @@ using namespace std;
 #include <V3d_View.hxx>
 #include <AIS_ListIteratorOfListOfInteractive.hxx>
 
+using namespace std;
 
 /*!
     Constructor

diff --git a/src/OCCViewer/OCCViewer_ViewPort.cxx b/src/OCCViewer/OCCViewer_ViewPort.cxx
index 1d6d410baba945ae175913993824eed26d61cfbc..69b0618128d2c39655b61e418f851008707475fe 100644 (file)
--- a/src/OCCViewer/OCCViewer_ViewPort.cxx
+++ b/src/OCCViewer/OCCViewer_ViewPort.cxx
@@ -26,7 +26,6 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include <stdlib.h>
 
 #if !defined WNT
@@ -52,6 +51,7 @@ using namespace std;
 
 #include <qpixmap.h>
 #include <qintdict.h>
+using namespace std;
 
 /* XPM */
 const char* imageZoomCursor[] = { 

diff --git a/src/OCCViewer/OCCViewer_ViewPort3d.cxx b/src/OCCViewer/OCCViewer_ViewPort3d.cxx
index 88601ea0bfc73307fdd147b6d4ccf9886589ac3c..6a5d747a80cb3acde91b43136a8518fc88df3298 100644 (file)
--- 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 <Xw.hxx>
 #endif
+using namespace std;
 
 /*!
     Constructor

diff --git a/src/OCCViewer/OCCViewer_Viewer3d.cxx b/src/OCCViewer/OCCViewer_Viewer3d.cxx
index 8d4a1331aef7589de27f25b87b090713a99df4f6..ffe52f7755e5fbde32da02bc3482fd8bb8d552fd 100644 (file)
--- 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.
@@ -56,6 +55,7 @@ using namespace std;
 #include <Geom_Axis2Placement.hxx>
 #include <AIS_ListOfInteractive.hxx>
 #include <AIS_ListIteratorOfListOfInteractive.hxx>
+using namespace std;
 
 /*!
     Constructor

diff --git a/src/PatchQt/qsplitterP.cxx b/src/PatchQt/qsplitterP.cxx
index 4b8268af90164280f6447e480547db41c7ca31ca..f44990ee392288051a734140c5e9f19f98364aeb 100644 (file)
--- a/src/PatchQt/qsplitterP.cxx
+++ b/src/PatchQt/qsplitterP.cxx
@@ -24,7 +24,6 @@
 //  File   : qsplitterP.cxx
 //  Module : SALOME
 
-using namespace std;
 /****************************************************************************
 ** $Id$
 **
@@ -80,6 +79,7 @@ using namespace std;
 
 #include <qobjectlist.h>
 #include <qapplication.h> //sendPostedEvents
+using namespace std;
 
 #define SPLITTER_ICON_WIDTH 10
 #define SPLITTER_ICON_HEIGHT 12

diff --git a/src/PatchQt/qworkspaceP.cxx b/src/PatchQt/qworkspaceP.cxx
index 0d4d618f751574db9d1cc7dd940d2c9d4cbd7936..483149bb6f200ce8ff1b5380ec00014abda3ae7c 100644 (file)
--- a/src/PatchQt/qworkspaceP.cxx
+++ b/src/PatchQt/qworkspaceP.cxx
@@ -9,7 +9,6 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "qworkspaceP.h"
 
 #include <qapplication.h>
@@ -41,6 +40,7 @@ using namespace std;
 
 #include <private/qapplication_p.h>
 #include <private/qinternal_p.h>
+using namespace std;
 
 #define BUTTON_WIDTH   16
 #define BUTTON_HEIGHT  14

diff --git a/src/Plot2d/Plot2d_Curve.cxx b/src/Plot2d/Plot2d_Curve.cxx
index 8d15c56ae847f298bad7cb097614a7396fa7e5ad..e32f477e046093f70396879f79b603963de0d4ab 100644 (file)
--- 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 f55104645e12add265756be029f9185a04ee65a1..f9021db1ef55c1cfae7ab98ed9162ebec68d7a33 100644 (file)
--- 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/Registry/RegistryConnexion.cxx b/src/Registry/RegistryConnexion.cxx
index e11f5a2218f15016877378cb954d0ad1c9cc52cf..018ea5fbf13d5f108417c80aad2644f0a939df7e 100644 (file)
--- 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"

diff --git a/src/Registry/RegistryService.cxx b/src/Registry/RegistryService.cxx
index 94dfa3034bdebf27ec451f515e6baa6d8ca54a4e..018d9cb8726e275568852a8a00eaec4c4f9d45d1 100644 (file)
--- a/src/Registry/RegistryService.cxx
+++ b/src/Registry/RegistryService.cxx
@@ -26,11 +26,10 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
-using namespace std;
 # include "RegistryService.hxx"
 # include "OpUtil.hxx"
 # include "utilities.h"
+using namespace std;
 
 extern "C"
 {

diff --git a/src/Registry/RegistryService.hxx b/src/Registry/RegistryService.hxx
index 0144b59b36797a446f62a71580fd41c28468cf00..63f7d57e4ddf2a1fa1b092102eb262895d990d33 100644 (file)
--- a/src/Registry/RegistryService.hxx
+++ b/src/Registry/RegistryService.hxx
@@ -87,10 +87,10 @@ protected :
 
        const char              *_SessionName ;
        int                      _Compteur ;
-       map<int,client_infos *>  _reg ;
-       map<int,client_infos *>  _fin ;
+       std::map<int,client_infos *>     _reg ;
+       std::map<int,client_infos *>     _fin ;
 
-       Registry::AllInfos* makeseq(map<int,client_infos *> &mymap );
+       Registry::AllInfos* makeseq(std::map<int,client_infos *> &mymap );
 
 } ;
 

diff --git a/src/Registry/SALOME_Registry_Server.cxx b/src/Registry/SALOME_Registry_Server.cxx
index 6cba1c7d8c2374c90d80cc302a21ca43862864e3..ceb92bf20df6a76b137b1980c185447515c5b162 100644 (file)
--- a/src/Registry/SALOME_Registry_Server.cxx
+++ b/src/Registry/SALOME_Registry_Server.cxx
@@ -26,10 +26,10 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 # include <stdlib.h>
-# include <iostream.h>
-# include <fstream.h>
+# include <iostream>
+# include <fstream>
+using namespace std;
 
 extern "C"
 {

diff --git a/src/RegistryDisplay/HelpWindow.cxx b/src/RegistryDisplay/HelpWindow.cxx
index 3d8b682cc3014e739e7588d20c382ffae544426f..40889fe28f6adfd6ed8f2654e841592b139e601d 100644 (file)
--- 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 <qpushbutton.h>
 # include <qtextstream.h> 
 # include <qfile.h> 
+using namespace std;
 
 HelpWindow::HelpWindow(QWidget* parent, const char* name ) 
      : QMainWindow( parent, name, WType_TopLevel | WDestructiveClose )

diff --git a/src/RegistryDisplay/RegWidget.cxx b/src/RegistryDisplay/RegWidget.cxx
index 9110ca423e5761063f6e13034febb3b95a027bb5..03e78e782521b71e0975dc2c6f968f4fc2d10447 100644 (file)
--- a/src/RegistryDisplay/RegWidget.cxx
+++ b/src/RegistryDisplay/RegWidget.cxx
@@ -26,7 +26,6 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 # include <qpushbutton.h>
 # include <qlistview.h>
 # include <qtabwidget.h> 
@@ -49,6 +48,7 @@ using namespace std;
 # include "RegWidget.hxx"
 # include "HelpWindow.hxx" 
 # include "IntervalWindow.hxx"
+using namespace std;
 
 static QString addSlash( const QString& path );
 

diff --git a/src/RegistryDisplay/RegWidgetFactory.cxx b/src/RegistryDisplay/RegWidgetFactory.cxx
index dcd0a27592c537811f26282495243064919f5bbc..fc517e33689b6adad26ab9059e8865c69c549a26 100644 (file)
--- 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 c6a524cde0c5a6b02905ad3282a3ecfb060b654c..05f13bc10e9a690d3b3c0240dcc384bf94eeceff 100644 (file)
--- a/src/RessourcesCatalog/SALOME_RessourcesCatalog_Client.cxx
+++ b/src/RessourcesCatalog/SALOME_RessourcesCatalog_Client.cxx
@@ -24,15 +24,15 @@
 //  File   : SALOME_RessourcesCatalog_Client.cxx
 //  Module : SALOME
 
-using namespace std;
 /* $Header$ */
 
-#include <iostream.h>
+#include <iostream>
 #include "SALOME_NamingService.hxx"
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SALOME_RessourcesCatalog)
 #include <string>
 #include "utilities.h"
+using namespace std;
 
 int main(int argc,char **argv)
 {

diff --git a/src/RessourcesCatalog/SALOME_RessourcesCatalog_Handler.cxx b/src/RessourcesCatalog/SALOME_RessourcesCatalog_Handler.cxx
index e82e54a2326d5fd20c6073262c1397a09ee8c834..67cd843d3e20a76203a23b0638d2c1ed21e26ec2 100755 (executable)
--- a/src/RessourcesCatalog/SALOME_RessourcesCatalog_Handler.cxx
+++ b/src/RessourcesCatalog/SALOME_RessourcesCatalog_Handler.cxx
@@ -26,9 +26,9 @@
 //  Module : SALOME
 //$Header$
 
-using namespace std;
 #define WRITE_RESSOURCES_TYPE
 #include "SALOME_RessourcesCatalog_Handler.hxx"
+using namespace std;
 
 //----------------------------------------------------------------------
 //Function : SALOME_RessourcesCatalog_Handler

diff --git a/src/RessourcesCatalog/SALOME_RessourcesCatalog_Server.cxx b/src/RessourcesCatalog/SALOME_RessourcesCatalog_Server.cxx
index 519f0b8453835f1b42505d28ce5424fcf9750fc9..c2014c0d15ccd1aef0cbd8243030b71addcfbbaa 100644 (file)
--- a/src/RessourcesCatalog/SALOME_RessourcesCatalog_Server.cxx
+++ b/src/RessourcesCatalog/SALOME_RessourcesCatalog_Server.cxx
@@ -26,11 +26,11 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include <iostream.h>
 #include "SALOME_NamingService.hxx"
 #include "SALOME_RessourcesCatalog_impl.hxx"
 #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 d0d27774964a6d7cdb9f8b34bc293bef25081a88..0557289d86995449a0500049d8f80044f7d43912 100644 (file)
--- a/src/RessourcesCatalog/SALOME_RessourcesCatalog_impl.cxx
+++ b/src/RessourcesCatalog/SALOME_RessourcesCatalog_impl.cxx
@@ -25,9 +25,9 @@
 //  Author : Estelle Deville
 //  Module : SALOME
 
-using namespace std;
 #include "SALOME_RessourcesCatalog_impl.hxx"
 #include <fstream>
+using namespace std;
 
 //----------------------------------------------------------------------
 // Function : SALOME_RessourcesCatalogImpl

diff --git a/src/SALOMEDS/SALOMEDS_AttributeComment_i.cxx b/src/SALOMEDS/SALOMEDS_AttributeComment_i.cxx
index f967482d801243435675aa8878be2fc7ba18c3b0..72babf8e1f6e53493ab9a6b5e649b1fee10b932d 100644 (file)
--- 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 <TCollection_ExtendedString.hxx>
 #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 903d1ead7163d02572bceb3ba467bcca14773885..8fa4ea1453127ab53e1547a80a8597197498a689 100644 (file)
--- 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 1560deeaa55dd5795ce94a4447a8a057624592cb..6fe877c50e34e1c494c5cf111a2bd8a64e08b9d1 100644 (file)
--- 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_AttributeIOR_i.cxx b/src/SALOMEDS/SALOMEDS_AttributeIOR_i.cxx
index fd338ac711296ec816d9edf27f37af1b18a0fccb..953a15d10c15641325592b0fcb48c7c8dcd9d720 100644 (file)
--- 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 <TCollection_ExtendedString.hxx>
 #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 d9f013db76ce4b7e51e874d561647b9b00ad2ca4..07920efb61ce7e33f4482fba8463bc788edfb9e7 100644 (file)
--- 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 0ed4628b837102fe5e497fdf727001f46652ee9d..3c1b124fd1ba2f75afc26b881c6f04547725cc49 100644 (file)
--- 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 415f71af3fe41d290c388819e22d1982ac559110..975e6439d4254bf46eda6fcaae6ae8d2127bcab6 100644 (file)
--- 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 <TCollection_ExtendedString.hxx>
 #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 c202cb0431c6bc5608589c0dbdee4c290e27ceb5..fd9c6bfd1d909a92fdfd193a6d08704ca7fe9a06 100644 (file)
--- 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 626ad9711e7130e340be59bb225bd03ca823a34b..3a867f0eaca090eae85e908e9ae307275ad9870b 100644 (file)
--- 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 <TCollection_ExtendedString.hxx>
 #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 5015f16977adc6782f6def36e3a95f021a9df3c0..1d8498c3fd64c6622060bfb3a6ec795933d46209 100644 (file)
--- 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 <TCollection_AsciiString.hxx>
+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 86f7a1ca49edff7386a51a68a8ffcaebc0256bc1..ca3f7d731d3345982b55831c439cbe27b5e5a11e 100644 (file)
--- 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 <TCollection_ExtendedString.hxx>
 #include <TColStd_HArray1OfCharacter.hxx>
 #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_AttributeReal_i.cxx b/src/SALOMEDS/SALOMEDS_AttributeReal_i.cxx
index fc5611c8e3a9ea28bb8dc1bd37e0f03f2423837b..62960aa9c74453eba1bd5f23a59bc809563fbc98 100644 (file)
--- a/src/SALOMEDS/SALOMEDS_AttributeReal_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_AttributeReal_i.cxx
@@ -26,9 +26,9 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "SALOMEDS_AttributeReal_i.hxx"
 #include "SALOMEDS_SObject_i.hxx"
+using namespace std;
 
 CORBA::Double SALOMEDS_AttributeReal_i::Value() {
   return Handle(TDataStd_Real)::DownCast(_myAttr)->Get();

diff --git a/src/SALOMEDS/SALOMEDS_AttributeSelectable_i.cxx b/src/SALOMEDS/SALOMEDS_AttributeSelectable_i.cxx
index b526f3c997e3c23a0578e7b8b21ff936523e1589..e208ad6a9c17419123cd9edd412e63e887c2da06 100644 (file)
--- 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 61e08b1bd06b2a31e79a59a3522ed4e7c427c361..cd142de25d88c5e774e6e02dcdde6f8b296e1bbd 100644 (file)
--- a/src/SALOMEDS/SALOMEDS_AttributeSequenceOfInteger_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_AttributeSequenceOfInteger_i.cxx
@@ -26,11 +26,10 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "SALOMEDS_AttributeSequenceOfInteger_i.hxx"
 #include "SALOMEDS_SObject_i.hxx"
 #include <TColStd_HSequenceOfInteger.hxx>
-
+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 8b48632b28472d113bb83b701a2ced6fe7f1ffbe..6c5c18589776632e0d2e2813f7ea6810225b491c 100644 (file)
--- 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 <TColStd_HSequenceOfReal.hxx>
+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 1646f3db4398b0cda7098434d0d828cfd116f1be..dce1ad3724fc221b1d486cb09cc9f5b8ec690bf7 100644 (file)
--- 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 <TColStd_HSequenceOfExtendedString.hxx>
 #include <TColStd_HSequenceOfInteger.hxx>
+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 f80457bb6614ff91ce1c41d689e8a0333d0037e1..1542471bfd975f153dc610b39c9dc66620c44e67 100644 (file)
--- 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 <TColStd_HSequenceOfInteger.hxx>
@@ -18,6 +17,7 @@ using namespace std;
 
 #include <strstream>
 #include <string>
+using namespace std;
 
 #define SEPARATOR '\1'
 

diff --git a/src/SALOMEDS/SALOMEDS_AttributeTableOfReal_i.cxx b/src/SALOMEDS/SALOMEDS_AttributeTableOfReal_i.cxx
index 432f42e5e4d54e09bde487c2e6fc478deef7045f..a684dc8df0dedf374b1eaa556cf6f16b9ba06769 100644 (file)
--- 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 <TColStd_HSequenceOfReal.hxx>
@@ -18,6 +17,7 @@ using namespace std;
 
 #include <strstream>
 #include <string>
+using namespace std;
 
 #define SEPARATOR '\1'
 

diff --git a/src/SALOMEDS/SALOMEDS_AttributeTableOfString_i.cxx b/src/SALOMEDS/SALOMEDS_AttributeTableOfString_i.cxx
index 262cdce8d479a8fef833ed3f8834f9ee686a81e0..c88ce6d2155dc92f7a8f3711c86e15aa5c60db63 100644 (file)
--- 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 <TCollection_ExtendedString.hxx>
 #include <TCollection_AsciiString.hxx>
 
@@ -21,6 +20,7 @@ using namespace std;
 
 #include <strstream>
 #include <string>
+using namespace std;
 
 #define SEPARATOR '\1'
 

diff --git a/src/SALOMEDS/SALOMEDS_AttributeTarget_i.cxx b/src/SALOMEDS/SALOMEDS_AttributeTarget_i.cxx
index f5f35cc7ba1bc9da8f08015e65503781370ba99b..b431af96af5a476805b749dbeaefd132b6a736b3 100644 (file)
--- 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 <TDF_LabelList.hxx>
 #include <TDF_ListIteratorOfLabelList.hxx>
+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 0f040990c55162ec8d56487ac0c23841b07729ee..45d1b8f52d96aa7f509630ce09c9d301c729cce9 100644 (file)
--- 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 <TColStd_HArray1OfReal.hxx>
+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 9ba430ba897524b118378b059a0ffab0b703f4f5..cc6ff475be518d07b577ee42aa8d84160468c508 100644 (file)
--- 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 <TColStd_HArray1OfReal.hxx>
+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 11d326b5c7b4b73550a7e002a59586981a8dd480..aaf7ddc253a3fd5730319e60869b9baf2e05da07 100644 (file)
--- a/src/SALOMEDS/SALOMEDS_AttributeTreeNode_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_AttributeTreeNode_i.cxx
@@ -26,10 +26,10 @@
 //  Module : SALOME
 //  $Header: 
 
-using namespace std;
 #include "SALOMEDS_AttributeTreeNode_i.hxx"
 #include "SALOMEDS_SObject_i.hxx"
 #include "utilities.h"
+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 632d95beb9e6a3317e475200ca4fab4a9d1d9c21..021879481e387df76578e84631c0b08ff7aa986f 100644 (file)
--- 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 <TCollection_ExtendedString.hxx>
 #include "SALOMEDS_SObject_i.hxx"
+using namespace std;
 
 char* SALOMEDS_AttributeUserID_i::Value() {
   char aGUID[40];

diff --git a/src/SALOMEDS/SALOMEDS_ChildIterator_i.cxx b/src/SALOMEDS/SALOMEDS_ChildIterator_i.cxx
index 9475797213a13086dc890bd2011a2ffd3ff25743..ada9ea7c40963624783bf6b0d9ed30856d23bdf8 100644 (file)
--- a/src/SALOMEDS/SALOMEDS_ChildIterator_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_ChildIterator_i.cxx
@@ -26,12 +26,10 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "SALOMEDS_ChildIterator_i.hxx"
 #include "SALOMEDS_SObject_i.hxx"
 #include "utilities.h"
-
-
+using namespace std;
 
 //============================================================================
 /*! Function : constructor

diff --git a/src/SALOMEDS/SALOMEDS_Client.cxx b/src/SALOMEDS/SALOMEDS_Client.cxx
index aa39a9f526eb935fa043f095df9f9168077e65bd..14b3faf67b0e480771ad6c9f9a5717d22ec8ba0b 100644 (file)
--- a/src/SALOMEDS/SALOMEDS_Client.cxx
+++ b/src/SALOMEDS/SALOMEDS_Client.cxx
@@ -26,12 +26,12 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SALOMEDS)
 #include "SALOMEDS_StudyManager_i.hxx"
 #include "utilities.h"
 #include "SALOMEDS_AttributeName_i.hxx"
+using namespace std;
 
 //============================================================================
 /*! Function :

diff --git a/src/SALOMEDS/SALOMEDS_DataMapIteratorOfDataMapStringLabel_0.cxx b/src/SALOMEDS/SALOMEDS_DataMapIteratorOfDataMapStringLabel_0.cxx
index 080f4b79d48ca2d9c19fda6e563738ff0876019f..ce782eae025c69c005cb03e7dda5e078ca124f57 100644 (file)
--- 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,6 +43,7 @@ using namespace std;
 #ifndef _SALOMEDS_DataMapNodeOfDataMapStringLabel_HeaderFile
 #include "SALOMEDS_DataMapNodeOfDataMapStringLabel.hxx"
 #endif
+using namespace std;
  
 
 #define TheKey TCollection_ExtendedString

diff --git a/src/SALOMEDS/SALOMEDS_DataMapNodeOfDataMapStringLabel_0.cxx b/src/SALOMEDS/SALOMEDS_DataMapNodeOfDataMapStringLabel_0.cxx
index 2b063d4793412ae9152bd3678bedea9b7ae49af8..4faa54baccf2c4dbe91cc9093490548a7b3c40b4 100644 (file)
--- 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_DataMapStringLabel_0.cxx b/src/SALOMEDS/SALOMEDS_DataMapStringLabel_0.cxx
index 4befe2030eebd461e8fa95577b2e31ef0ccbea46..a670a6f57704a11a8b761cd1eeb2db4193564b88 100644 (file)
--- 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,6 +46,7 @@ using namespace std;
 #ifndef _SALOMEDS_DataMapIteratorOfDataMapStringLabel_HeaderFile
 #include "SALOMEDS_DataMapIteratorOfDataMapStringLabel.hxx"
 #endif
+using namespace std;
  
 
 #define TheKey TCollection_ExtendedString

diff --git a/src/SALOMEDS/SALOMEDS_DrawableAttribute.cxx b/src/SALOMEDS/SALOMEDS_DrawableAttribute.cxx
index 62bed2f1b9f3afdce81220e2f7338d3b2912f80c..0245efc1de9eecd42a446ecf149c70e44dffe802 100644 (file)
--- 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 <TDataStd_Integer.hxx>
+using namespace std;
 
 //=======================================================================
 //function : GetID

diff --git a/src/SALOMEDS/SALOMEDS_ExpandableAttribute.cxx b/src/SALOMEDS/SALOMEDS_ExpandableAttribute.cxx
index ad3cc3c5d409bcab830503c3fb5b282415149c5a..db17601b45c7b307b184bb36f9ab69e4ec9e7df7 100644 (file)
--- 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 <TDataStd_Integer.hxx>
+using namespace std;
 
 //=======================================================================
 //function : GetID

diff --git a/src/SALOMEDS/SALOMEDS_GenericAttribute_i.cxx b/src/SALOMEDS/SALOMEDS_GenericAttribute_i.cxx
index d3fc65e30d6ba44b0549b9106819195b67a3836c..053b514380fa83d11ae8100115bd3b4a833675a9 100644 (file)
--- a/src/SALOMEDS/SALOMEDS_GenericAttribute_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_GenericAttribute_i.cxx
@@ -9,8 +9,8 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "SALOMEDS_StudyBuilder_i.hxx"
+using namespace std;
 
 void SALOMEDS_GenericAttribute_i::CheckLocked() throw (SALOMEDS::GenericAttribute::LockProtection) {
   if (!_myAttr.IsNull() && _myAttr->IsValid() && !CORBA::is_nil(_myOrb)) {

diff --git a/src/SALOMEDS/SALOMEDS_IORAttribute.cxx b/src/SALOMEDS/SALOMEDS_IORAttribute.cxx
index c305641a4bdf3e533f876914d19d34a93298db3d..f71b538fd5d59051bb0018ac78ce8b719bf74881 100644 (file)
--- 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 <TDataStd_Comment.hxx>
 #include <TCollection_ExtendedString.hxx>
 #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 9f8ece15c4a1e6324e68abc4aa80820457071875..623ce7c50bbe63f8212df37871ab10cba3350259 100644 (file)
--- 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 <TDataStd_Integer.hxx>
+using namespace std;
 
 //=======================================================================
 //function : GetID

diff --git a/src/SALOMEDS/SALOMEDS_OCAFApplication.cxx b/src/SALOMEDS/SALOMEDS_OCAFApplication.cxx
index e0c7ad35f595e60d809d4f1d7a139f1b72aa75e9..5913c68423ba85da657a4c9d894287dc497dd0d2 100644 (file)
--- 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 d59512cdf8a52ed98b6254477056a7b088921100..4704436ffb37cedb8884b08c5e5f07fed118c640 100644 (file)
--- 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 <TDataStd_Integer.hxx>
+using namespace std;
 
 //=======================================================================
 //function : GetID

diff --git a/src/SALOMEDS/SALOMEDS_PersRefAttribute.cxx b/src/SALOMEDS/SALOMEDS_PersRefAttribute.cxx
index 8e313831c5faf559f8b04404b553586968e34040..8d57af837f814525971eced591d614d4aaac7624 100644 (file)
--- 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 <TDataStd_Comment.hxx>
 #include <TCollection_ExtendedString.hxx>
+using namespace std;
 
 //=======================================================================
 //function : GetID

diff --git a/src/SALOMEDS/SALOMEDS_PixMapAttribute.cxx b/src/SALOMEDS/SALOMEDS_PixMapAttribute.cxx
index 3fde4f60e595d279b96e94ace14e8866c9ccbdf2..1799c035f901f80bb9f876333825e7d362187da9 100644 (file)
--- 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 <TDataStd_Comment.hxx>
 #include <TCollection_ExtendedString.hxx>
+using namespace std;
 
 //=======================================================================
 //function : GetID

diff --git a/src/SALOMEDS/SALOMEDS_PythonObjectAttribute.cxx b/src/SALOMEDS/SALOMEDS_PythonObjectAttribute.cxx
index fd0538e0ed5aaf37ca0b2432033171209903b36e..f8c8d9de49682e97059d7dd4bafb6e5ec359cb2b 100644 (file)
--- 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 <string>
+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 77b0b46554e7b8b02b1ee85f889af812839a028e..c8ae7c4c5f2d8e2a426093814d619def7bc0c9e6 100644 (file)
--- a/src/SALOMEDS/SALOMEDS_SComponentIterator_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_SComponentIterator_i.cxx
@@ -26,9 +26,8 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "SALOMEDS_SComponentIterator_i.hxx"
-
+using namespace std;
 
 //============================================================================
 /*! Function : constructor

diff --git a/src/SALOMEDS/SALOMEDS_SComponent_i.cxx b/src/SALOMEDS/SALOMEDS_SComponent_i.cxx
index 896859cca1bd7bb366e8d213a7dbe9aa3113bd20..66264fd5b31c6098fb3807bb54ce9257fa70a49a 100644 (file)
--- a/src/SALOMEDS/SALOMEDS_SComponent_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_SComponent_i.cxx
@@ -26,10 +26,9 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "SALOMEDS_SComponent_i.hxx"
 #include "utilities.h"
-
+using namespace std;
 
 //============================================================================
 /*! Function : constructor

diff --git a/src/SALOMEDS/SALOMEDS_SObject_i.cxx b/src/SALOMEDS/SALOMEDS_SObject_i.cxx
index f9c00984eded0c70bf0307679b2198716a5a5cd2..c5bbfbedcce1b21992cd824297d6224ee6456b75 100644 (file)
--- 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
@@ -66,6 +65,7 @@ using namespace std;
 #include "SALOMEDS_AttributeStudyProperties_i.hxx"
 #include "SALOMEDS_AttributePythonObject_i.hxx"
 #include <TDF_AttributeIterator.hxx>
+using namespace std;
 
 //============================================================================
 /*! Function : ReturnGUIDForAttribute
@@ -525,7 +525,7 @@ CORBA::Boolean SALOMEDS_SObject_i::ReferencedObject(SALOMEDS::SObject_out obj)
  *  Purpose  : 
  */
 //============================================================================
-CORBA::Boolean SALOMEDS_SObject_i::FindSubObject(long atag, SALOMEDS::SObject_out obj)
+CORBA::Boolean SALOMEDS_SObject_i::FindSubObject(CORBA::Long atag, SALOMEDS::SObject_out obj)
 {
   TDF_Label L = _lab.FindChild(atag,false);
   if (L.IsNull()) return false;

diff --git a/src/SALOMEDS/SALOMEDS_SObject_i.hxx b/src/SALOMEDS/SALOMEDS_SObject_i.hxx
index be22a90b20bfa83b0911ec66342572cf51fea67f..cd6944c55245678cc4c56036439217767e64db09 100644 (file)
--- a/src/SALOMEDS/SALOMEDS_SObject_i.hxx
+++ b/src/SALOMEDS/SALOMEDS_SObject_i.hxx
@@ -30,7 +30,7 @@
 #define __SALOMEDS_SOBJECT_I_H__
 
 // std C++ headers
-#include <iostream.h>
+#include <iostream>
 #include <vector>
 #include <string>
 
@@ -60,7 +60,7 @@ protected:
   char*                    _name;  
   char*                    _value;
   char*                    _type;
-  vector<string>           _liste_ba_type;
+  std::vector<std::string>      _liste_ba_type;
 
 public:
   
@@ -73,7 +73,7 @@ public:
   virtual SALOMEDS::SObject_ptr    GetFather() ;
   virtual CORBA::Boolean FindAttribute(SALOMEDS::GenericAttribute_out anAttribute, const char* aTypeOfAttribute);
   virtual CORBA::Boolean ReferencedObject(SALOMEDS::SObject_out obj) ;
-  virtual CORBA::Boolean FindSubObject(long atag, SALOMEDS::SObject_out obj );
+  virtual CORBA::Boolean FindSubObject(CORBA::Long atag, SALOMEDS::SObject_out obj );
 
   virtual SALOMEDS::Study_ptr    GetStudy() ;
   virtual char* Name();

diff --git a/src/SALOMEDS/SALOMEDS_SelectableAttribute.cxx b/src/SALOMEDS/SALOMEDS_SelectableAttribute.cxx
index 241792584449218b9e0e6c8b7b2f84354cd29311..aef7ac1bd50498e4c1cd0436d87d14326fea7463 100644 (file)
--- 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 <TDataStd_Integer.hxx>
+using namespace std;
 
 //=======================================================================
 //function : GetID

diff --git a/src/SALOMEDS/SALOMEDS_SequenceOfIntegerAttribute.cxx b/src/SALOMEDS/SALOMEDS_SequenceOfIntegerAttribute.cxx
index 51bdda48ae24530cf037643bd21759c0255f754b..30c1cf93a90d8c2d50a67b27357a0893c5171baa 100644 (file)
--- 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 9e3cf84e9289a1c3f28d715161597ff6c258a6d1..9cd839f055c1f4fc1beaff6da55868c8599adebd 100644 (file)
--- 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 <TDataStd_Real.hxx>
+using namespace std;
 
 //=======================================================================
 //function : GetID

diff --git a/src/SALOMEDS/SALOMEDS_Server.cxx b/src/SALOMEDS/SALOMEDS_Server.cxx
index 087ef8ff5a06ac52e0ab1665fcad202977879394..3452b5df9f7b4f15b59dd8be823a5fc2da2c19fa 100644 (file)
--- a/src/SALOMEDS/SALOMEDS_Server.cxx
+++ b/src/SALOMEDS/SALOMEDS_Server.cxx
@@ -26,11 +26,11 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SALOMEDS)
 #include "SALOMEDS_StudyManager_i.hxx"
 #include "utilities.h"
+using namespace std;
 
 //#define CHECKTIME
 #ifdef CHECKTIME

diff --git a/src/SALOMEDS/SALOMEDS_StudyBuilder_i.cxx b/src/SALOMEDS/SALOMEDS_StudyBuilder_i.cxx
index 93eaa48bc39ba59c30d43c35be25ac43f126ef90..ec830c6dd3cb37f901b77f70f577b91fb0cb7bac 100644 (file)
--- 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_StudyBuilder_i.hxx"
 #include "SALOMEDS_SObject_i.hxx"
@@ -76,6 +75,7 @@ using namespace std;
 
 #include <HDFOI.hxx>
 #include <stdlib.h> 
+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 4d12d2379154387ca9d96bfcc4fb28102f85a030..1aadb70d0a82fe19d698aa91ab4d48eff415b333 100644 (file)
--- a/src/SALOMEDS/SALOMEDS_StudyManager_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_StudyManager_i.cxx
@@ -26,7 +26,6 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "utilities.h"
 #include "SALOMEDS_StudyManager_i.hxx"
 #include "SALOMEDS_Study_i.hxx"
@@ -74,6 +73,7 @@ using namespace std;
 #include "Utils_CorbaException.hxx"
 
 #include <strstream>
+using namespace std;
 
 #define USE_CASE_LABEL_ID            "0:2"
 
@@ -90,7 +90,9 @@ static void ReadAttributes(Handle(TDF_Data)& DF,
 
     if (!strncmp(hdf_dataset->GetName(),"AttributeTreeNode",17)) {
       MESSAGE("Create a Attribute :     AttributeTreeNode");
-      char current_strings[5][hdf_dataset->GetSize()/5];
+      char **current_strings = (char**)malloc(5*sizeof(char*));
+      for(int i=0;i<5;i++)
+       current_strings[i] = (char*)malloc((hdf_dataset->GetSize()/5)*sizeof(char));
       hdf_dataset->ReadFromDisk(current_strings);
 
       MESSAGE("Create an Attribute :     AttributeTreeNode"); 
@@ -118,6 +120,9 @@ static void ReadAttributes(Handle(TDF_Data)& DF,
         if (!aLabel.FindAttribute(aGUID,aNode)) aNode = TDataStd_TreeNode::Set(aLabel,aGUID);
         aNewNode->SetFirst(aNode);
       }
+      for(int i=0;i<5;i++)
+       free(current_strings[i]);
+      free(current_strings);
     } else {
 
       int size =  hdf_dataset->GetSize();
@@ -565,10 +570,9 @@ SALOMEDS::Study_ptr  SALOMEDS_StudyManager_i::Open(const char* aUrl)
 //        MESSAGE( "HDFexception ! " );
 //        cerr << "HDFexception ! " << endl;
       delete aHDFUrl;
-      char eStr[strlen(aUrl)+17];
+      char *eStr = (char*)malloc((strlen(aUrl)+17)*sizeof(char*));
       sprintf(eStr,"Can't open file %s",aUrl);
       THROW_SALOME_CORBA_EXCEPTION(CORBA::string_dup(eStr),SALOME::BAD_PARAM);
-      
     } 
   MESSAGE("Open : Creating the CORBA servant holding it... ");
 
@@ -633,7 +637,7 @@ SALOMEDS::Study_ptr  SALOMEDS_StudyManager_i::Open(const char* aUrl)
 //        MESSAGE( "HDFexception ! " );
 //        cerr << "HDFexception ! " << endl;
       delete aHDFUrl;
-      char eStr[strlen(aUrl)+17];
+      char *eStr = (char*)malloc((strlen(aUrl)+17)*sizeof(char*));
       sprintf(eStr,"Can't open file %s",aUrl);
       THROW_SALOME_CORBA_EXCEPTION(CORBA::string_dup(eStr),SALOME::BAD_PARAM);
     } 
@@ -1178,7 +1182,9 @@ static void SaveAttributes(SALOMEDS::SObject_ptr SO, HDFgroup *hdf_group_sobject
       
       TNsize[0]=5;
       TNsize[1]=maxSize+1;
-      char Data[5][maxSize+1];
+      char **Data = (char**)malloc(5*sizeof(char*));
+      for(int i=0;i<5;i++)
+       Data[i] = (char*)malloc((maxSize+1)*sizeof(char));
       for(index=0;index<5;index++) {
        strcpy(Data[index],Val[index]);
        for(int a = strlen(Data[index]) + 1; a < maxSize; a++) Data[index][a] = ' '; // mpv: for ASCII format
@@ -1194,6 +1200,9 @@ static void SaveAttributes(SALOMEDS::SObject_ptr SO, HDFgroup *hdf_group_sobject
       MESSAGE("attribute AttributeTreeNode with various GUID wrote on file:");
       MESSAGE(aDataSetName);
       delete(aDataSetName);
+      for(int i=0;i<5;i++)
+       free(Data[i]);
+      free(Data);
     }
   }
 }

diff --git a/src/SALOMEDS/SALOMEDS_StudyPropertiesAttribute.cxx b/src/SALOMEDS/SALOMEDS_StudyPropertiesAttribute.cxx
index 4f83613beefcdbd307b29742e21b8fd4a4797d03..62835949d174f65afe253a541af30f54b91c55db 100644 (file)
--- a/src/SALOMEDS/SALOMEDS_StudyPropertiesAttribute.cxx
+++ b/src/SALOMEDS/SALOMEDS_StudyPropertiesAttribute.cxx
@@ -9,8 +9,8 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include <SALOMEDS_StudyPropertiesAttribute.ixx>
+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 c282ab096f431937c5ce1fade24b8f2ef130ca52..4748b90bc30b54f09a4010aa27404bbc4b62efda 100644 (file)
--- 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"
 
@@ -42,7 +41,7 @@ using namespace std;
 #include "SALOMEDS_LocalIDAttribute.hxx"
 #include "SALOMEDS_PersRefAttribute.hxx"
 #include "SALOMEDS_UseCaseIterator_i.hxx"
-
+using namespace std;
 
 #define DIRECTORYID 16661
 #define FILEID "FILE: "

diff --git a/src/SALOMEDS/SALOMEDS_TableOfIntegerAttribute.cxx b/src/SALOMEDS/SALOMEDS_TableOfIntegerAttribute.cxx
index 7eb9b5545d549059e0fad11cf9e502f6e5c12b24..a9db3037cfe9b105f584b23bb49b09b23be7e22b 100644 (file)
--- a/src/SALOMEDS/SALOMEDS_TableOfIntegerAttribute.cxx
+++ b/src/SALOMEDS/SALOMEDS_TableOfIntegerAttribute.cxx
@@ -9,12 +9,12 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include <SALOMEDS_TableOfIntegerAttribute.ixx>
 #include <Standard_Failure.hxx>
 #include <TColStd_DataMapIteratorOfDataMapOfIntegerInteger.hxx>
 
 #include <string>
+using namespace std;
 
 const Standard_GUID& SALOMEDS_TableOfIntegerAttribute::GetID() 
 {

diff --git a/src/SALOMEDS/SALOMEDS_TableOfIntegerAttribute.hxx b/src/SALOMEDS/SALOMEDS_TableOfIntegerAttribute.hxx
index f524bad983397065bf87b9dcaf864d20ad3eff0c..a15b4bce7320103471c9a7a70c5bf5c11ce6d1a7 100644 (file)
--- a/src/SALOMEDS/SALOMEDS_TableOfIntegerAttribute.hxx
+++ b/src/SALOMEDS/SALOMEDS_TableOfIntegerAttribute.hxx
@@ -111,8 +111,8 @@ Standard_EXPORT   void Paste(const Handle(TDF_Attribute)& into,const Handle(TDF_
 Standard_EXPORT   Handle_TColStd_HSequenceOfInteger GetSetRowIndices(const Standard_Integer theRow);
 Standard_EXPORT   Handle_TColStd_HSequenceOfInteger GetSetColumnIndices(const Standard_Integer theColumn);
 
-Standard_EXPORT   void ConvertToString(ostrstream& theStream);
-Standard_EXPORT   bool RestoreFromString(istrstream& theStream);
+Standard_EXPORT   void ConvertToString(std::ostrstream& theStream);
+Standard_EXPORT   bool RestoreFromString(std::istrstream& theStream);
 
 Standard_EXPORT ~SALOMEDS_TableOfIntegerAttribute();
 

diff --git a/src/SALOMEDS/SALOMEDS_TableOfRealAttribute.cxx b/src/SALOMEDS/SALOMEDS_TableOfRealAttribute.cxx
index 4d6ae31c1c9aff560d106ab4f4550703c00b2030..5276e0347d27bb97d686ce5869ae5abb27417f18 100644 (file)
--- a/src/SALOMEDS/SALOMEDS_TableOfRealAttribute.cxx
+++ b/src/SALOMEDS/SALOMEDS_TableOfRealAttribute.cxx
@@ -9,13 +9,13 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include <SALOMEDS_TableOfRealAttribute.ixx>
 #include <Standard_Failure.hxx>
 #include <TColStd_DataMapIteratorOfDataMapOfIntegerReal.hxx>
 
 #include <string>
 #include <stdio.h>
+using namespace std;
 
 const Standard_GUID& SALOMEDS_TableOfRealAttribute::GetID() 
 {

diff --git a/src/SALOMEDS/SALOMEDS_TableOfRealAttribute.hxx b/src/SALOMEDS/SALOMEDS_TableOfRealAttribute.hxx
index a3d35069ffdb795345b587181130579a1f2bdbfd..35d8e33aea37cc69e33bda0cfd4ea6fad9f24fe0 100644 (file)
--- a/src/SALOMEDS/SALOMEDS_TableOfRealAttribute.hxx
+++ b/src/SALOMEDS/SALOMEDS_TableOfRealAttribute.hxx
@@ -120,8 +120,8 @@ Standard_EXPORT   void Paste(const Handle(TDF_Attribute)& into,const Handle(TDF_
 Standard_EXPORT   Handle_TColStd_HSequenceOfInteger GetSetRowIndices(const Standard_Integer theRow);
 Standard_EXPORT   Handle_TColStd_HSequenceOfInteger GetSetColumnIndices(const Standard_Integer theColumn);
 
-Standard_EXPORT   void ConvertToString(ostrstream& theStream);
-Standard_EXPORT   bool RestoreFromString(istrstream& theStream);
+Standard_EXPORT   void ConvertToString(std::ostrstream& theStream);
+Standard_EXPORT   bool RestoreFromString(std::istrstream& theStream);
 
 Standard_EXPORT ~SALOMEDS_TableOfRealAttribute();
 

diff --git a/src/SALOMEDS/SALOMEDS_TableOfStringAttribute.cxx b/src/SALOMEDS/SALOMEDS_TableOfStringAttribute.cxx
index 486cee1927df79580701cd39c8ea510cc0b5f931..b0f06a31be6711d4109bf6c00d9d1dfc76fceece 100644 (file)
--- 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 <SALOMEDS_TableOfStringAttribute.ixx>
 #include <Standard_Failure.hxx>
 #include <SALOMEDS_DataMapIteratorOfDataMapOfIntegerString.hxx>
 
 #include <string>
 #include <stdio.h>
+using namespace std;
 
 const Standard_GUID& SALOMEDS_TableOfStringAttribute::GetID() 
 {

diff --git a/src/SALOMEDS/SALOMEDS_TargetAttribute.cxx b/src/SALOMEDS/SALOMEDS_TargetAttribute.cxx
index a043b9610a2483fa6068879ae07db2a7984dd9ff..9833dd56cf1c9521766e36705f34d30a36ccb312 100644 (file)
--- 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 <TDF_Reference.hxx>
 #include <TDF_ListIteratorOfAttributeList.hxx>
 #include "utilities.h"
+using namespace std;
 
 //=======================================================================
 //function : GetID

diff --git a/src/SALOMEDS/SALOMEDS_TextColorAttribute.cxx b/src/SALOMEDS/SALOMEDS_TextColorAttribute.cxx
index c264f94b3a577a09349709fef0014543184b79aa..c5eccab88c5166dcf5b74a3122cf7efc9a543238 100644 (file)
--- 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 4194d1353272ec2e1c808a7449e311b24c0f5b2d..dd95d6f6404effa615faaec0ace504f0b5c4e29e 100644 (file)
--- 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 698fbb1c6cb3de72b48c8a807e7584c4b2effac8..151a0bb9ca5d4625130fcf982a4e4d4cdfc6160a 100644 (file)
--- 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 <TDataStd_ChildNodeIterator.hxx>
 #include <TCollection_AsciiString.hxx>
 #include <TDF_ChildIterator.hxx>
+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 69e7d39ecc165e46b3f0b402906f8bd4c90df405..05507edab6762f82219ede3b69d64957eff2a9ad 100644 (file)
--- a/src/SALOMEDS/SALOMEDS_UseCaseIterator_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_UseCaseIterator_i.cxx
@@ -8,12 +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;
 
 //============================================================================
 /*! Function : constructor

diff --git a/src/SALOMEGUI/PyInterp_PyQt.cxx b/src/SALOMEGUI/PyInterp_PyQt.cxx
index ecd145c4b035953ebb43b2c453b201da81d83f44..7f59b13a42f717d51a53309b727db2ae46c3ec4b 100644 (file)
--- a/src/SALOMEGUI/PyInterp_PyQt.cxx
+++ b/src/SALOMEGUI/PyInterp_PyQt.cxx
@@ -9,11 +9,10 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
-using namespace std;
 #include "PyInterp_PyQt.h"
 
 #include "utilities.h"
+using namespace std;
 
 extern "C" PyObject * PyEval_EvalCode(PyObject *co, PyObject *g, PyObject *l);
 

diff --git a/src/SALOMEGUI/PyInterp_base.cxx b/src/SALOMEGUI/PyInterp_base.cxx
index f9d03e760673cebd5b6486735449b8543b28a1f8..fb88526ed9363b7ea86fccad5128d1c3fb442e8d 100644 (file)
--- a/src/SALOMEGUI/PyInterp_base.cxx
+++ b/src/SALOMEGUI/PyInterp_base.cxx
@@ -9,7 +9,6 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "PyInterp_base.h"
 #include "utilities.h"
 #include <string>

diff --git a/src/SALOMEGUI/PyInterp_base.h b/src/SALOMEGUI/PyInterp_base.h
index 48781e85f815407638cb4cdefcbf7cc4bfab31ea..9fe277d6a3a46e24df6cf9137370412bd8aee629 100644 (file)
--- a/src/SALOMEGUI/PyInterp_base.h
+++ b/src/SALOMEGUI/PyInterp_base.h
@@ -12,11 +12,11 @@
 #ifndef _PYINTERP_BASE_H_
 #define _PYINTERP_BASE_H_
 
-using namespace std;
 #include <iostream>
 #include <Python.h>
 #include <list>
 #include <string>
+using namespace std;
 
 #define TOP_HISTORY_PY "--- top of history ---"
 #define BEGIN_HISTORY_PY "--- begin of history ---"

diff --git a/src/SALOMEGUI/QAD_Application.cxx b/src/SALOMEGUI/QAD_Application.cxx
index 935f2c4e7751e8259280bbe2d07360fc70db32c8..dc53c48cfefa44ee5b7b0a342918e9b4ff4c5446 100644 (file)
--- 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 <TCollection_AsciiString.hxx>
 #include <TCollection_ExtendedString.hxx>
 #include <Standard_Failure.hxx>
+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 b9d734f16a14647cf49f7d0358bea404c61912e2..593e2c41b7df0b11afb4d6886682d38b32579a92 100644 (file)
--- 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 <qfile.h>
 #include <qregexp.h>
 #include <qtextstream.h>
+using namespace std;
 
 
 /*!

diff --git a/src/SALOMEGUI/QAD_Desktop.cxx b/src/SALOMEGUI/QAD_Desktop.cxx
index 189665a8e367f45ae0dda69484e9b97d77557de6..512f873562695abcba536ac893a3c155dbcb4707 100644 (file)
--- a/src/SALOMEGUI/QAD_Desktop.cxx
+++ b/src/SALOMEGUI/QAD_Desktop.cxx
@@ -30,7 +30,6 @@
   \class QAD_Desktop QAD_Desktop.h
   \brief Main desktop of QAD-based application.
 */
-using namespace std;
 # include "Utils_ORB_INIT.hxx"
 # include "Utils_SINGLETON.hxx"
 
@@ -97,6 +96,7 @@ using namespace std;
 #include <OSD_LoadMode.hxx>
 #include <OSD_Function.hxx>
 #include <TCollection_AsciiString.hxx>
+using namespace std;
 
 static const char* SEPARATOR    = ":";
 

diff --git a/src/SALOMEGUI/QAD_DirListDlg.cxx b/src/SALOMEGUI/QAD_DirListDlg.cxx
index a45638cd539f3fb928485727d869f8508bed902b..542df51cf581cfa7abe3446dbe864a832b33c039 100644 (file)
--- 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 <qlabel.h>
 #include <qpushbutton.h>
 #include <qapplication.h>
+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 2d626eb9650659b1ceb477666fb38ab3cf5885dc..caa45e54ab2ed1261ebc02c14e3f102649402cd6 100644 (file)
--- a/src/SALOMEGUI/QAD_FileDlg.cxx
+++ b/src/SALOMEGUI/QAD_FileDlg.cxx
@@ -9,7 +9,6 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include <qapplication.h>
 #include <qdir.h>
 #include <qlabel.h>
@@ -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_FileValidator.cxx b/src/SALOMEGUI/QAD_FileValidator.cxx
index f12915a41fe7090d1be3e887ab42698141bae907..d62145052db2d1043179d4a9ed4599e9948873d7 100644 (file)
--- a/src/SALOMEGUI/QAD_FileValidator.cxx
+++ b/src/SALOMEGUI/QAD_FileValidator.cxx
@@ -9,7 +9,6 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "QAD_FileValidator.h"
 #include "QAD_Application.h"
 #include "QAD_Desktop.h"
@@ -17,6 +16,7 @@ using namespace std;
 
 #include <qfile.h>
 #include <qfileinfo.h>
+using namespace std;
 
 /* constructor */
 QAD_FileValidator::QAD_FileValidator(QWidget* parent) :

diff --git a/src/SALOMEGUI/QAD_Help.cxx b/src/SALOMEGUI/QAD_Help.cxx
index ad66970368b1e7144564e1cb24d322633ee6fa72..e14035b593ec60f406de7f7095347ccc8147d943 100644 (file)
--- 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 8cb020a7e063c0aab9369db3196a4ab551774633..15d9dc4ba1457f1135f828417588edf2178e9829 100644 (file)
--- 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 <qtoolbutton.h>
 #include <qcombobox.h>
 #include <qfileinfo.h>
+using namespace std;
 
 /*!
   Constructor

diff --git a/src/SALOMEGUI/QAD_LeftFrame.cxx b/src/SALOMEGUI/QAD_LeftFrame.cxx
index c3a021d26aa860ba7f956da2af5ed9c41563e922..8edb54c480774cb6d5d007db109900944b52cfc7 100644 (file)
--- 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 <qlayout.h>
+using namespace std;
 
 /*!
   \class QAD_LeftFrame QAD_LeftFrame.h

diff --git a/src/SALOMEGUI/QAD_ListMenuIdAction.cxx b/src/SALOMEGUI/QAD_ListMenuIdAction.cxx
index 04c8d041dcda7c4b6c28db430e5212cd5cfd29e6..16bb368dc95e2cc680c813d9cf1bc80dc0d89eae 100644 (file)
--- 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 e5a5d134fcc50accd40e81ff1f46d0bf766c528b..1d9e9a7b98e0e1a08e8df44534dd54c8080663a0 100644 (file)
--- 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_ListView.cxx b/src/SALOMEGUI/QAD_ListView.cxx
index d555fd378d308a0faed878c0e36b14e15b0042b3..9b19755df213508e4d386a068ff05be2dff0d4e1 100644 (file)
--- a/src/SALOMEGUI/QAD_ListView.cxx
+++ b/src/SALOMEGUI/QAD_ListView.cxx
@@ -9,7 +9,6 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "QAD_ListView.h"
 
 #include <qheader.h>
@@ -25,6 +24,7 @@ using namespace std;
 
 #include <TColStd_ListIteratorOfListOfInteger.hxx>
 #include <TColStd_ListIteratorOfListOfReal.hxx>
+using namespace std;
 
 //////////////////////////////////////////////////////////////////////
 // QAD_ListView class implementation

diff --git a/src/SALOMEGUI/QAD_Menus.cxx b/src/SALOMEGUI/QAD_Menus.cxx
index 904ee271386e42d523e7f556949c4d2fe2cf9661..b7ddf6ae7d78a02c2962a11c02f7742f0ec7312e 100644 (file)
--- 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 a932028e29f0f370025fb58813ef5114c23a753f..4a4a0acb4a9c42c5aa71758b217185a7c889c80d 100644 (file)
--- 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 <qstring.h>
 #include <qpopupmenu.h>
 #include <qmap.h>
+using namespace std;
 
 enum { IdCopy, IdClear, IdSelectAll };
 

diff --git a/src/SALOMEGUI/QAD_MessageBox.cxx b/src/SALOMEGUI/QAD_MessageBox.cxx
index c6aad0f760c66f44a6df9aad41e6d1e2a9902fb6..2f41606245ff5771576473c3e1964a26be10c724 100644 (file)
--- 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 <qmessagebox.h>
 #include <qapplication.h>
+using namespace std;
 
 /*!
     Shows info message box with one button [ static ]

diff --git a/src/SALOMEGUI/QAD_ObjectBrowser.cxx b/src/SALOMEGUI/QAD_ObjectBrowser.cxx
index 35bcde863156c1a9db2eca81243e4f6a026fc850..99f4b04d16a965259d0e322ca678a5c0ef827c51 100644 (file)
--- a/src/SALOMEGUI/QAD_ObjectBrowser.cxx
+++ b/src/SALOMEGUI/QAD_ObjectBrowser.cxx
@@ -26,7 +26,6 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "QAD_ObjectBrowserItem.h"
 #include "QAD_ObjectBrowser.h"
 #include "QAD_Application.h"
@@ -55,6 +54,7 @@ using namespace std;
 #include <qtooltip.h>
 #include <qdragobject.h>
 #include <qstringlist.h>
+using namespace std;
 
 //VRV: porting on Qt 3.0.5
 #if QT_VERSION >= 0x030005

diff --git a/src/SALOMEGUI/QAD_ObjectBrowserItem.cxx b/src/SALOMEGUI/QAD_ObjectBrowserItem.cxx
index 37035831748131e59405a7b7cebf411517bf4eb0..696fb78f4273504ded2d9accc864ec544b71692e 100644 (file)
--- 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 <qcolor.h>
@@ -34,6 +33,7 @@ using namespace std;
 #include <qpixmap.h>
 #include <qstringlist.h>
 #include <qpainter.h>
+using namespace std;
 
 /*!
   Constructors

diff --git a/src/SALOMEGUI/QAD_Operation.cxx b/src/SALOMEGUI/QAD_Operation.cxx
index 87c99f194ef3486ae9564a554888681dfb140e5a..42e0bb9551ccf97b37d44f295bf8ccd92d4279b7 100644 (file)
--- 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 <qapplication.h>
+using namespace std;
 
 /*!
     Constructor 

diff --git a/src/SALOMEGUI/QAD_OperatorMenus.cxx b/src/SALOMEGUI/QAD_OperatorMenus.cxx
index 8ad4e40d0cd6eb33b35d8c9893b457f874b0863c..34bc0290c4070539e930413368cec49a82418830 100644 (file)
--- 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 b824dad2a3c988c37694b9a1bec6f946f9baf8d5..cb8fb7692483e7a8b5776725d37c9f5412656b28 100644 (file)
--- 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 <stdio.h>
@@ -35,7 +34,7 @@ using namespace std;
 #include <qfile.h>
 #include <qfileinfo.h>
 #include <qtextstream.h>
-
+using namespace std;
 
 /*!
     Constructor.

diff --git a/src/SALOMEGUI/QAD_Popup.cxx b/src/SALOMEGUI/QAD_Popup.cxx
index aa2c65a93d2cab66cd342be2db7967d2086d4e9d..9bd085b6b392108745dbf3c825cf40f84f744d48 100644 (file)
--- 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_PyEditor.cxx b/src/SALOMEGUI/QAD_PyEditor.cxx
index 58407f6a054a28425b0c21e8841b987d805ede98..0701bf0052bb92fc0b9bf96f94cdeda482439453 100644 (file)
--- a/src/SALOMEGUI/QAD_PyEditor.cxx
+++ b/src/SALOMEGUI/QAD_PyEditor.cxx
@@ -26,7 +26,6 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "QAD_PyEditor.h"
 #include "QAD_PyInterp.h"
 #include "QAD_Application.h"
@@ -35,6 +34,7 @@ using namespace std;
 #include "QAD_Tools.h"
 #include "QAD_MessageBox.h"
 //#include "QAD_RightFrame.h"
+using namespace std;
 
 #include <qapplication.h>
 #include <qmap.h>

diff --git a/src/SALOMEGUI/QAD_PyInterp.cxx b/src/SALOMEGUI/QAD_PyInterp.cxx
index 5f04d820f6e5f352c15db968f9a4a8a0684f2594..d01da91fa57d5455202dba9e21438efc22c2b403 100644 (file)
--- a/src/SALOMEGUI/QAD_PyInterp.cxx
+++ b/src/SALOMEGUI/QAD_PyInterp.cxx
@@ -26,10 +26,9 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
-using namespace std;
 #include "QAD_PyInterp.h"
 #include "utilities.h"
+using namespace std;
 
 /*!
  * constructor : multi Python interpreter, one per SALOME study.

diff --git a/src/SALOMEGUI/QAD_PyInterp_mono.cxx b/src/SALOMEGUI/QAD_PyInterp_mono.cxx
index e1be19054f92ba2205469feca27772826fa0a78e..b733314d01a218e30f3c0c7c1acfa5595249e484 100644 (file)
--- a/src/SALOMEGUI/QAD_PyInterp_mono.cxx
+++ b/src/SALOMEGUI/QAD_PyInterp_mono.cxx
@@ -9,10 +9,9 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
-using namespace std;
 #include "QAD_PyInterp_mono.h"
 #include "utilities.h"
+using namespace std;
 
 /*!
  * constructor : only one Python interpreter, shared within SALOME studies.

diff --git a/src/SALOMEGUI/QAD_ResourceMgr.cxx b/src/SALOMEGUI/QAD_ResourceMgr.cxx
index bb52c0aeecb03f716bb0ea1299cdcd8f8a28932d..aaabff33286f6acfaac7eb27129be11ac3a67886 100644 (file)
--- 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 <qfileinfo.h>
 
 #include <Standard.hxx>
+using namespace std;
 
 /* configuration file */
 static const char* CONFIG_FILE = "config";

diff --git a/src/SALOMEGUI/QAD_RightFrame.cxx b/src/SALOMEGUI/QAD_RightFrame.cxx
index 200ecc5cb6d172ece754930f472ec51fad396905..0b22647e2aa4671cae968222d3f0b3430e9d96be 100644 (file)
--- a/src/SALOMEGUI/QAD_RightFrame.cxx
+++ b/src/SALOMEGUI/QAD_RightFrame.cxx
@@ -26,7 +26,6 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "QAD_RightFrame.h"
 #include "QAD_Application.h"
 #include "QAD_Desktop.h"
@@ -39,6 +38,7 @@ using namespace std;
 
 // Open CASCADE Include
 #include <OSD_SharedLibrary.hxx>
+using namespace std;
 
 /*!
   \class QAD_RightFrame QAD_RightFrame.h

diff --git a/src/SALOMEGUI/QAD_Settings.cxx b/src/SALOMEGUI/QAD_Settings.cxx
index 14df2e8f37d09355301193aa98655fef949c1fef..d1fec9a21cbefbd28a4e79f38e3eb0296fe6a431 100644 (file)
--- 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 <stdio.h>
@@ -36,6 +35,7 @@ using namespace std;
 #include <qregexp.h>
 #include <qstring.h>
 #include <qtextstream.h>
+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 6bf31664c1c2057d63450545835622c911d22f60..dffa96919a75761878c0eac185e796f6f0fd593a 100644 (file)
--- 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 <qpushbutton.h>
 #include <qpainter.h>
@@ -19,6 +18,7 @@ using namespace std;
 #include <qpixmapcache.h>
 #include <qapplication.h>
 #include <limits.h>
+using namespace std;
 
 //******************************************************************************
 // QDblRangeControl class

diff --git a/src/SALOMEGUI/QAD_Splitter.cxx b/src/SALOMEGUI/QAD_Splitter.cxx
index cb472ea714eae5e537fa46c9ffc183a592a16a8c..0d620f597589ec833421aebba84c2548953d19c3 100644 (file)
--- 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_Study.cxx b/src/SALOMEGUI/QAD_Study.cxx
index 0e1796ab3123fe4369c3e132b2ca8e88795318b3..da0356b6f64fd1c1c64d1c688333af37f516dc48 100644 (file)
--- a/src/SALOMEGUI/QAD_Study.cxx
+++ b/src/SALOMEGUI/QAD_Study.cxx
@@ -26,7 +26,6 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 /*!
   \class QAD_Study QAD_Study.h
   \brief Study for QAD-based application.
@@ -59,6 +58,7 @@ using namespace std;
 
 // QT Include
 #include <qapplication.h>
+using namespace std;
 
 #define MAX_UNDO 10
 /*!

diff --git a/src/SALOMEGUI/QAD_StudyFrame.cxx b/src/SALOMEGUI/QAD_StudyFrame.cxx
index 194aaa516395eaf45a21bf3533dd05e2473a0ce8..4d39c6ad2e37dedfbb1b5594edcbc6a0c63c5207 100644 (file)
--- a/src/SALOMEGUI/QAD_StudyFrame.cxx
+++ b/src/SALOMEGUI/QAD_StudyFrame.cxx
@@ -26,7 +26,6 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 /*!
   \class QAD_StudyFrame QAD_StudyFrame.h
   \brief Frame window which contains QAD_LeftFrame and QAD_RightFrame.
@@ -40,6 +39,7 @@ using namespace std;
 #include "QAD_Study.h"
 #include "QAD_ObjectBrowser.h"
 #include <qvaluelist.h>
+using namespace std;
 
 /*!
     Constructor

diff --git a/src/SALOMEGUI/QAD_Tools.cxx b/src/SALOMEGUI/QAD_Tools.cxx
index 0b9ab52d31802f8aca52b3ad3ed208e920bfbd07..58f3e0e6be0f0822878b80898e1f7e6d5a307bbb 100644 (file)
--- 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 <string.h>
 #include <ctype.h>
 #include <qstringlist.h>
+using namespace std;
 
 static char* tempName()
 {

diff --git a/src/SALOMEGUI/QAD_ViewFrame.cxx b/src/SALOMEGUI/QAD_ViewFrame.cxx
index 6fa9053717f09079fc3c6c83bba10b92a28766ca..b5c19c9b4cdfd8fa5cda67d11ffae29d40d54471 100644 (file)
--- a/src/SALOMEGUI/QAD_ViewFrame.cxx
+++ b/src/SALOMEGUI/QAD_ViewFrame.cxx
@@ -26,7 +26,6 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "QAD.h"
 #include "QAD_ViewFrame.h"
 #include "QAD_Application.h"
@@ -37,6 +36,7 @@ using namespace std;
 #include <qapplication.h>
 #include <qimage.h>
 #include "utilities.h"
+using namespace std;
 
 /*!
     Constructor

diff --git a/src/SALOMEGUI/QAD_XmlHandler.cxx b/src/SALOMEGUI/QAD_XmlHandler.cxx
index 2226782d4581071129b3a1092aefab5d77f0edbb..85df1090063368893e4063d1deec88718b98117d 100644 (file)
--- 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 <qaccel.h>
 #include <qstringlist.h>
 #include <qfileinfo.h>
+using namespace std;
 
 map<int,QString>             QAD_XmlHandler::_bibmap;
 

diff --git a/src/SALOMEGUI/SALOMEGUI_AboutDlg.cxx b/src/SALOMEGUI/SALOMEGUI_AboutDlg.cxx
index 7ae5111de37ffbb4198f42d1caec31f4f1dd7511..fb7e5930130ddedd005f14ad829a272ea9a48a5f 100644 (file)
--- 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 <qlayout.h>
 #include <qpixmap.h>
 #include <qmessagebox.h>
+using namespace std;
 
 /* 
  * Constructor

diff --git a/src/SALOMEGUI/SALOMEGUI_Application.cxx b/src/SALOMEGUI/SALOMEGUI_Application.cxx
index 61556f22f578beb59beff104b873609f8ee642f9..3cc805578b671b8e36bf4fd17d74ba9fd2e3d248 100644 (file)
--- a/src/SALOMEGUI/SALOMEGUI_Application.cxx
+++ b/src/SALOMEGUI/SALOMEGUI_Application.cxx
@@ -26,7 +26,6 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "SALOMEGUI_Application.h"
 #include "SALOMEGUI_Desktop.h"
 #include "SALOMEGUI_ImportOperation.h"
@@ -51,6 +50,7 @@ using namespace std;
 // Open CASCADE Include
 #include <Standard_Failure.hxx>
 #include <TCollection_AsciiString.hxx>
+using namespace std;
 
 /*!
     Constructor

diff --git a/src/SALOMEGUI/SALOMEGUI_CloseDlg.cxx b/src/SALOMEGUI/SALOMEGUI_CloseDlg.cxx
index 090d66ad2764035484cbaab991facbf46a6a491c..556e10ca4319749de2fd920e9b690a89485cb801 100644 (file)
--- 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 <qpushbutton.h>
@@ -16,6 +15,7 @@ using namespace std;
 #include <qlayout.h> 
 #include <qlabel.h> 
 #include <qmessagebox.h>
+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 63ce9dbe806d8dfe62bb09cd13fbb44fd7e8d17a..0b24b49b0ac99c424e0524c86580533a833114cd 100644 (file)
--- a/src/SALOMEGUI/SALOMEGUI_Desktop.cxx
+++ b/src/SALOMEGUI/SALOMEGUI_Desktop.cxx
@@ -26,10 +26,10 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "SALOMEGUI_Desktop.h"
 #include "SALOME_Selection.h"
 #include "SALOME_ListIteratorOfListIO.hxx"
+using namespace std;
 
 #include CORBA_SERVER_HEADER(SALOMEDS_Attributes)
 

diff --git a/src/SALOMEGUI/SALOMEGUI_ImportOperation.cxx b/src/SALOMEGUI/SALOMEGUI_ImportOperation.cxx
index 36c535e8339d4075ec06aef4fc70b6c4ddb041fc..84e0c17ce46e3d694d4830aff024731c79d3a8cb 100644 (file)
--- 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 de3343aff21c3f655aba9a520684fd6476370f64..0e3c09dcee3775623c4f3cc2f07a9d2d2096e77e 100644 (file)
--- 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 <qlabel.h>
 #include <qlayout.h>
 #include <qlistbox.h>
 #include <qpushbutton.h>
+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 35d4b476fc1e6a541d03af5a735b441bdd50e672..3153d8317ec569879ec2980a720b69fc61fb041b 100644 (file)
--- 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 <qlineedit.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
+using namespace std;
 
 /*!
   Constructor

diff --git a/src/SALOMEGUI/SALOMEGUI_OpenWith.cxx b/src/SALOMEGUI/SALOMEGUI_OpenWith.cxx
index 77cde23402ba8829a9286926e38601b6e94580e1..16664321e9e57c54d09d2531abc51f3a0d2f84cf 100644 (file)
--- 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 <qlabel.h>
@@ -34,6 +33,7 @@ using namespace std;
 #include <qpushbutton.h>
 #include <qlayout.h>
 #include <qlistbox.h>
+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 971433632b17e01179674112426ccfe18124d108..ede2c4366f94e0fa7747c9473e3dcd1856f60f5b 100644 (file)
--- 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 2573f3ff9cbcfaf5b38bf0b90c1001e4bdc289c3..9beaec99c89b00bae13f2bafa9f715d6c2ea8317 100644 (file)
--- 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 <qpushbutton.h>
 #include <qlayout.h>
 #include <qvalidator.h>
+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 15e5b4cb6099ea5c7d6eb95b3e24069efcf9c60e..4265cb95de6a9351cf223c42f80c4e26cec28d64 100644 (file)
--- 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 <qlayout.h>
@@ -20,6 +19,7 @@ using namespace std;
 #include <qtoolbutton.h>
 #include <qgroupbox.h>
 #include <qcolordialog.h>
+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 0019a14ddcc66e81a149da4a24afdb1aa26e1f0f..4d9a73281c5bbdb17c17ae2ce1f20ac917c448ab 100644 (file)
--- 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 <qpushbutton.h>
 #include <qlayout.h>
+using namespace std;
 
 #define  DEFAULT_MARGIN 11
 #define DEFAULT_SPACING 6

diff --git a/src/SALOMEGUI/SALOMEGUI_Swig.cxx b/src/SALOMEGUI/SALOMEGUI_Swig.cxx
index 7103d349a1c6adf0411515b557e821c5301a45a8..9bf5578765af2b32f4e7ec86324b8b6ac8ccfab2 100644 (file)
--- a/src/SALOMEGUI/SALOMEGUI_Swig.cxx
+++ b/src/SALOMEGUI/SALOMEGUI_Swig.cxx
@@ -26,7 +26,6 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "QAD_Application.h"
 #include "QAD_Desktop.h"
 #include "QAD_Study.h"
@@ -38,6 +37,7 @@ using namespace std;
 #include "SALOME_Selection.h"
 #include "SALOME_InteractiveObject.hxx"
 #include "SALOME_ListIteratorOfListIO.hxx"
+using namespace std;
 
 
 /*!

diff --git a/src/SALOMEGUI/SALOMEGUI_TableDlg.cxx b/src/SALOMEGUI/SALOMEGUI_TableDlg.cxx
index 07c1b7bdbb322f022944a049cb4285cb8d4506bd..59afc147be98ede6d9ed159aa597155b346c3992 100644 (file)
--- 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 <qinputdialog.h>
 #include <qlabel.h>
 #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 ed31165c36a013e438158a2e677e8436e6864a8b..8f78226ce2f328b88bd354fb6e311a3c7b95c681 100644 (file)
--- 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 <qbuttongroup.h>
@@ -34,6 +33,7 @@ using namespace std;
 #include <qpushbutton.h>
 #include <qspinbox.h>
 #include <qlayout.h>
+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 d091d18dad083b0f4a783eedd7b128f866dc4299..9451c87773654993741c47ff2bc23eb9219b5722 100644 (file)
--- 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 <qvariant.h>
 #include <qtooltip.h>
 #include <qwhatsthis.h>
+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 1fca36e3ebe63a334e502df902dbe5bc7dbe9d89..7cc57f40b6993ce19ddf036a0e98bc74b16d432a 100644 (file)
--- 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,6 +44,7 @@ using namespace std;
 #ifndef _SALOME_DataMapNodeOfDataMapOfIOMapOfInteger_HeaderFile
 #include "SALOME_DataMapNodeOfDataMapOfIOMapOfInteger.hxx"
 #endif
+using namespace std;
  
 
 #define TheKey Handle_SALOME_InteractiveObject

diff --git a/src/SALOMEGUI/SALOME_DataMapNodeOfDataMapOfIOMapOfInteger_0.cxx b/src/SALOMEGUI/SALOME_DataMapNodeOfDataMapOfIOMapOfInteger_0.cxx
index 7fefc9c062f0d7a2d6a8c1432c2c72493324540f..f585105332a0f218e84a89f78f4aa76fddc2ad83 100644 (file)
--- 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,9 @@ 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 990e1bad6b83ce5dd2d29cf106357a2f9615bc4a..9800abcf3370c69aac133be57681b7ac8bc6bb77 100644 (file)
--- 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,6 +47,7 @@ using namespace std;
 #ifndef _SALOME_DataMapIteratorOfDataMapOfIOMapOfInteger_HeaderFile
 #include "SALOME_DataMapIteratorOfDataMapOfIOMapOfInteger.hxx"
 #endif
+using namespace std;
  
 
 #define TheKey Handle_SALOME_InteractiveObject

diff --git a/src/SALOMEGUI/SALOME_Filter.cxx b/src/SALOMEGUI/SALOME_Filter.cxx
index 2a095e50a7195d57555b807add0d358157eab3ee..816c9869fe0b02972cbda696697055e74e4c7d99 100644 (file)
--- 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.hxx b/src/SALOMEGUI/SALOME_ListIO.hxx
index 861a7ac6340b3907fa51ef9bc2c3263005e414a3..434a31f6408a4d65a79e75a17eadfdfdc33c570a 100644 (file)
--- a/src/SALOMEGUI/SALOME_ListIO.hxx
+++ b/src/SALOMEGUI/SALOME_ListIO.hxx
@@ -90,7 +90,9 @@ Standard_EXPORT   void Clear() ;
 Standard_EXPORT   Standard_Boolean IsEmpty() const;
 Standard_EXPORT   void Prepend(const Handle(SALOME_InteractiveObject)& I) ;
 Standard_EXPORT   void Prepend(SALOME_ListIO& Other) ;
+Standard_EXPORT   void Prepend(const Handle(SALOME_InteractiveObject)& I,SALOME_ListIteratorOfListIO& It);
 Standard_EXPORT   void Append(const Handle(SALOME_InteractiveObject)& I) ;
+Standard_EXPORT   void Append(const Handle(SALOME_InteractiveObject)& I,SALOME_ListIteratorOfListIO& It);
 Standard_EXPORT   void Append(SALOME_ListIO& Other) ;
 Standard_EXPORT   Handle_SALOME_InteractiveObject& First() const;
 Standard_EXPORT   Handle_SALOME_InteractiveObject& Last() const;

diff --git a/src/SALOMEGUI/SALOME_ListIO_0.cxx b/src/SALOMEGUI/SALOME_ListIO_0.cxx
index 0c5ee6097ec270daa61f1dc48e3720371b16baf3..71260fa5bed75175fbf03d91e89e4795e8378599 100644 (file)
--- 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,6 +38,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_ListIteratorOfListIO_0.cxx b/src/SALOMEGUI/SALOME_ListIteratorOfListIO_0.cxx
index 928d94559013eb89775e41c8c202a88b6c7835ec..adb55ab723ebc57e6a6354268c48d369bf063d36 100644 (file)
--- 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 95cba8a29729f1d14f18eee863959ec643d294f5..57a0e587bf1f7a3c3cf5eb090fec0ea0e0fa01ae 100644 (file)
--- 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 95147d20debcec7c1997814cd1a9c5523f6fc4ef..932626022edb281e5d73d8c7eed0431c844e67f0 100644 (file)
--- 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,9 @@ 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 b89c9d1e71fe18e790be7ad3e3e228d11c3f5843..6837e6fca7dce834f66789c541776da3a82b14e0 100644 (file)
--- 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,10 @@ 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.hxx b/src/SALOMEGUI/SALOME_ListOfFilter.hxx
index 7b4b9c2ac1727a2c4fe42779ccd1751db44b352c..fef6bfd5cfd01c52ef05aad80d71f6174c17e4c2 100644 (file)
--- a/src/SALOMEGUI/SALOME_ListOfFilter.hxx
+++ b/src/SALOMEGUI/SALOME_ListOfFilter.hxx
@@ -94,8 +94,10 @@ Standard_EXPORT   void Clear() ;
 Standard_EXPORT inline   Standard_Boolean IsEmpty() const;
 Standard_EXPORT   void Prepend(const Handle(SALOME_Filter)& I) ;
 Standard_EXPORT   void Prepend(SALOME_ListOfFilter& Other) ;
+Standard_EXPORT   void Prepend(const Handle(SALOME_Filter)& I,SALOME_ListIteratorOfListOfFilter& It);
 Standard_EXPORT   void Append(const Handle(SALOME_Filter)& I) ;
 Standard_EXPORT   void Append(SALOME_ListOfFilter& Other) ;
+Standard_EXPORT   void Append(const Handle(SALOME_Filter)& I,SALOME_ListIteratorOfListOfFilter& It);
 Standard_EXPORT   Handle_SALOME_Filter& First() const;
 Standard_EXPORT   Handle_SALOME_Filter& Last() const;
 Standard_EXPORT   void RemoveFirst() ;

diff --git a/src/SALOMEGUI/SALOME_ListOfFilter_0.cxx b/src/SALOMEGUI/SALOME_ListOfFilter_0.cxx
index 6dbbdaacf68abb96cfafcf51de9f3fd727fb8f65..8b30df9f67ae7a918c02545e27b998ef019917aa 100644 (file)
--- 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 3574d8d6412b8220c22bc68b2ca134822c12d1a9..cdc63948e71d601eefa8bb8aadfc753e18271da8 100644 (file)
--- 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_Selection.cxx b/src/SALOMEGUI/SALOME_Selection.cxx
index 3e79a6c6d99060ac9b45703810c97e832cbac06a..c5477bd63a625dd28440044fa55a07a88e5b054b 100644 (file)
--- a/src/SALOMEGUI/SALOME_Selection.cxx
+++ b/src/SALOMEGUI/SALOME_Selection.cxx
@@ -26,7 +26,6 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 /*!
   \class SALOME_Selection SALOME_Selection.h
   \brief Selection Mechanism of Interactive Object.
@@ -40,6 +39,7 @@ using namespace std;
 
 #include "QAD_Desktop.h"
 #include "utilities.h"
+using namespace std;
 
 static QList<SALOME_Selection>&  SALOME_Sel_GetSelections()
 {

diff --git a/src/SALOMEGUI/SALOME_TypeFilter.cxx b/src/SALOMEGUI/SALOME_TypeFilter.cxx
index 4bc2a52464c934d241843dc372330995505269b7..83f1d71ec1a00ff341a886ea5fa14e5efd95fe15 100644 (file)
--- 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/SALOME_PY/SalomePy.cxx b/src/SALOME_PY/SalomePy.cxx
index 4946923240b74d38e2457de8306bc9f3e227723d..76e643d9f90e312016feca16acac3b02b08d5241 100644 (file)
--- a/src/SALOME_PY/SalomePy.cxx
+++ b/src/SALOME_PY/SalomePy.cxx
@@ -26,7 +26,6 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include <Python.h>
 #include <vtkRenderer.h>
 #include <vtkRenderWindowInteractor.h>
@@ -38,6 +37,7 @@ using namespace std;
 #include "QAD_Application.h"
 #include "QAD_Desktop.h"
 #include "VTKViewer_ViewFrame.h"
+using namespace std;
 
 extern "C"
 { 

diff --git a/src/SUPERVGraph/SUPERVGraph.cxx b/src/SUPERVGraph/SUPERVGraph.cxx
index 140853bb9302c7901a5c924bc02b047119a45efb..70524b0619d7be2f225a5c638c1d28f1bba99c9b 100644 (file)
--- 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_ViewFrame.cxx b/src/SUPERVGraph/SUPERVGraph_ViewFrame.cxx
index 2fa21f44754e60685880a87e2a3039f49708d805..2978b4b79bb7da8129e75724ab93d225f0885f35 100644 (file)
--- 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 <qlayout.h>
 #include <qcolordialog.h>
+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 8531be10fc1e303a8a0adeb9e5bdf8f293d46a42..76de080f2b8fadc39eb2ccab0fa02e52495e6143 100644 (file)
--- 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 <qapplication.h>
 #include <qlabel.h>
 
@@ -43,6 +42,7 @@ using namespace std;
 // only to use findFile method : perhaps put it in QAD_Tools ???
 #include "QAD_ResourceMgr.h"
 #include <qlabel.h>
+using namespace std;
 
 
 #include <SALOMEconfig.h>

diff --git a/src/Session/SALOME_Session_i.cxx b/src/Session/SALOME_Session_i.cxx
index 0265845606263de0eeb85de31d31866928db2198..3f385fae5e11750bd7f5fcde7c5aa8e9acd1ece8 100644 (file)
--- a/src/Session/SALOME_Session_i.cxx
+++ b/src/Session/SALOME_Session_i.cxx
@@ -26,7 +26,6 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "utilities.h"
 
 #include "SALOME_Session_i.hxx"
@@ -41,6 +40,7 @@ using namespace std;
 #include <OSD_SharedLibrary.hxx>
 #include <OSD_LoadMode.hxx>
 #include <OSD_Function.hxx>
+using namespace std;
 
 //=============================================================================
 /*! SALOME_Session_i

diff --git a/src/TOOLSDS/SALOMEDS_Tool.cxx b/src/TOOLSDS/SALOMEDS_Tool.cxx
index 210c4273940dd87f805f6bcb09f2db8f3f3ec543..ae7937d7d322dec523669b40dce4a5eacd8da80f 100644 (file)
--- 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
@@ -13,8 +12,8 @@ using namespace std;
 
 #include <TCollection_AsciiString.hxx> 
 #include <stdio.h>
-#include <iostream.h> 
-#include <fstream.h>
+#include <iostream> 
+#include <fstream>
 #include <OSD_Path.hxx>
 #include <OSD_File.hxx>
 #include <OSD_Directory.hxx>
@@ -23,6 +22,7 @@ using namespace std;
 #include <OSD_Protection.hxx>
 #include <OSD_SingleProtection.hxx>
 #include <OSD_FileIterator.hxx>
+using namespace std;
 
 #include <sys/time.h>
 #include <stdlib.h>

diff --git a/src/TOOLSGUI/ToolsGUI.cxx b/src/TOOLSGUI/ToolsGUI.cxx
index 4b2f470890a966e09e208406670ed9221d515a00..7e98ad7b18f263ca97ddd501adfec5a1e483795e 100644 (file)
--- 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 <stdlib.h>
+using namespace std;
 
 int ToolsGUI::runCommand(string & arg)
 { 

diff --git a/src/TOOLSGUI/ToolsGUI_CatalogGeneratorDlg.cxx b/src/TOOLSGUI/ToolsGUI_CatalogGeneratorDlg.cxx
index 1147a6e378f4cc8530d84142b4a422559a36a791..c64b14fb1a0841441000d006dbede61feb290e7c 100644 (file)
--- a/src/TOOLSGUI/ToolsGUI_CatalogGeneratorDlg.cxx
+++ b/src/TOOLSGUI/ToolsGUI_CatalogGeneratorDlg.cxx
@@ -26,7 +26,6 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "ToolsGUI_CatalogGeneratorDlg.h"
 
 #include "QAD_Application.h"
@@ -47,6 +46,7 @@ using namespace std;
 #include <OSD_Path.hxx>
 #include <TCollection_AsciiString.hxx>
 #include <Standard_CString.hxx>
+using namespace std;
 
 #define SPACING_SIZE             6
 #define MARGIN_SIZE             11

diff --git a/src/TestContainer/SALOME_TestComponent_i.cxx b/src/TestContainer/SALOME_TestComponent_i.cxx
index 85f49d22bf56e789c81708eb6ea9df380d48c746..0bb4fa7858905074a3ecdf075660478df17932bb 100644 (file)
--- a/src/TestContainer/SALOME_TestComponent_i.cxx
+++ b/src/TestContainer/SALOME_TestComponent_i.cxx
@@ -26,10 +26,10 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "utilities.h"
 #include "SALOME_TestComponent_i.hxx"
 #include <stdio.h>
+using namespace std;
 
 Engines_TestComponent_i::Engines_TestComponent_i(CORBA::ORB_ptr orb,
                                                 PortableServer::POA_ptr poa,

diff --git a/src/TestContainer/TestContainer.cxx b/src/TestContainer/TestContainer.cxx
index f23459bc90870c9d972d2b44bbc804ccecedd0c2..15d5616031d42b11bcfc09d7e650f0b4f3e7e664 100644 (file)
--- a/src/TestContainer/TestContainer.cxx
+++ b/src/TestContainer/TestContainer.cxx
@@ -26,11 +26,11 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "utilities.h"
 #include <iostream>
 #include <unistd.h>
 #include <SALOMEconfig.h>
+using namespace std;
 #include CORBA_CLIENT_HEADER(SALOME_Component)
 #include CORBA_CLIENT_HEADER(SALOME_TestComponent)
 

diff --git a/src/TestContainer/TestLogger.cxx b/src/TestContainer/TestLogger.cxx
index a844dc7a758b48bee5b0fe19d6647808e27f15e3..989537652e3b12b12dd3c5745f3645b3fac1a781 100644 (file)
--- a/src/TestContainer/TestLogger.cxx
+++ b/src/TestContainer/TestLogger.cxx
@@ -26,13 +26,13 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "utilities.h"
 #include <iostream>
 #include <unistd.h>
 #include <SALOMEconfig.h>
 #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 d4e953d863a94632d0bfe03015068f4845ac4e2d..0dae2c1bfddc037495c75eefe113f945e455981c 100644 (file)
--- a/src/Utils/Utils_CommException.cxx
+++ b/src/Utils/Utils_CommException.cxx
@@ -26,7 +26,6 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 # include "Utils_CommException.hxx"
 
 CommException::CommException( void ): SALOME_Exception( "CommException" )

diff --git a/src/Utils/Utils_DESTRUCTEUR_GENERIQUE.cxx b/src/Utils/Utils_DESTRUCTEUR_GENERIQUE.cxx
index 07b70adfe0a4cf2c4209e3a135041895c5099fbf..0b4862f14d157174c27f225ffd7be46a167bad5b 100644 (file)
--- a/src/Utils/Utils_DESTRUCTEUR_GENERIQUE.cxx
+++ b/src/Utils/Utils_DESTRUCTEUR_GENERIQUE.cxx
@@ -26,13 +26,13 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 void Nettoyage( void ) ;
 
 # include <iostream>
 # include "utilities.h"
 # include "Utils_DESTRUCTEUR_GENERIQUE.hxx"
 # include <list>
+using namespace std;
 extern "C"
 {
 # include <stdlib.h>

diff --git a/src/Utils/Utils_ORB_INIT.cxx b/src/Utils/Utils_ORB_INIT.cxx
index 0da127b344b0d6dc5b776e0feff7cc261f1d4a8f..c140441790beaf921926bd19614a7f008ad84974 100644 (file)
--- a/src/Utils/Utils_ORB_INIT.cxx
+++ b/src/Utils/Utils_ORB_INIT.cxx
@@ -26,7 +26,6 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 # include "Utils_ORB_INIT.hxx" 
 # include "utilities.h" 
 

diff --git a/src/Utils/Utils_SALOME_Exception.cxx b/src/Utils/Utils_SALOME_Exception.cxx
index 59b79a7642611c014d5471c5c2612106b6d880f5..2ca211ac7bab291ab46b4fef269a1030821559e1 100644 (file)
--- a/src/Utils/Utils_SALOME_Exception.cxx
+++ b/src/Utils/Utils_SALOME_Exception.cxx
@@ -26,7 +26,6 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include <iostream>
 #include "Utils_SALOME_Exception.hxx"
 #include "utilities.h"
@@ -34,9 +33,9 @@ extern "C"
 {
 #include <math.h>
 #include <stdio.h>
-#include <string.h>
 }
-
+#include <string>
+using namespace std;
 
 const char* duplicate( const char *const str ) ;
 
@@ -48,7 +47,7 @@ SALOME_Exception::SALOME_Exception( void ): exception() , _text(0)
 
 
 
-const char *makeText( const char *text, const char *fileName, const unsigned int lineNumber )
+char *makeText( const char *text, const char *fileName, const unsigned int lineNumber )
 {
        char *newText = 0 ;
 
@@ -89,16 +88,14 @@ SALOME_Exception::~SALOME_Exception() throw ()
 {
        if ( _text )
        {
-               delete [] _text ;
-               char *& txt = (char*)_text ;
-               txt = 0 ;
+         delete [] _text ;
+         _text = NULL;
        }
-       ASSERT(_text==NULL) ;
 }
 
 
 
-SALOME_Exception::SALOME_Exception( const SALOME_Exception &ex ): _text(duplicate(ex._text))
+SALOME_Exception::SALOME_Exception( const SALOME_Exception &ex ): _text((char*)duplicate(ex._text))
 {
        ;
 }

diff --git a/src/Utils/Utils_SALOME_Exception.hxx b/src/Utils/Utils_SALOME_Exception.hxx
index f7e9a3a67c546a5ef96f434226c7fe8e60c53938..a60f61d1c3adf1e3c017e19899766ee637a31319 100644 (file)
--- a/src/Utils/Utils_SALOME_Exception.hxx
+++ b/src/Utils/Utils_SALOME_Exception.hxx
@@ -29,20 +29,20 @@
 #if !defined( __Utils_SALOME_Exception_hxx__ )
 #define __Utils_SALOME_Exception_hxx__
 
-using namespace std;
 # include <exception>
 # include <iostream>
+using namespace std;
 
 # define LOCALIZED(message) #message , __FILE__ , __LINE__
 
-class SALOME_Exception : public exception
+class SALOME_Exception : public std::exception
 {
 
 private :
        SALOME_Exception( void );
 
 protected :
-       const char* _text ;     // pointeur constant et zone pointee constante !!!!
+       char* _text ;   // pointeur
 
 public :
        SALOME_Exception( const char *text, const char *fileName=0, const unsigned int lineNumber=0 );

diff --git a/src/Utils/Utils_Timer.cxx b/src/Utils/Utils_Timer.cxx
index c2748f6ecb783525412bd5bfcc7ed28f170e8d46..82dd013f19a958fd12c4f0b1a42ff6d515c307ab 100644 (file)
--- a/src/Utils/Utils_Timer.cxx
+++ b/src/Utils/Utils_Timer.cxx
@@ -25,7 +25,7 @@
 //  Module : SALOME
 
 # include "Utils_Timer.hxx"
-# include <stream.h>
+# include <iostream>
 using namespace std;
 
 static struct timezone *tz=(struct timezone*) malloc(sizeof(struct timezone));

diff --git a/src/VTKViewer/VTKViewer.cxx b/src/VTKViewer/VTKViewer.cxx
index 79602806011070ee8c61eb1a38915424347ec11e..a0c60854ebb1f9c76b2a409542bbc7f7446ffc13 100644 (file)
--- 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_InteractorStyleSALOME.cxx b/src/VTKViewer/VTKViewer_InteractorStyleSALOME.cxx
index d9eb3a75c5b24879222f9f0b458514a4dbf8c951..1d6eb120aa034e8a5c1c1e3b65d750ee624afe38 100644 (file)
--- a/src/VTKViewer/VTKViewer_InteractorStyleSALOME.cxx
+++ b/src/VTKViewer/VTKViewer_InteractorStyleSALOME.cxx
@@ -26,7 +26,6 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "VTKViewer_InteractorStyleSALOME.h"
 #include "VTKViewer_RenderWindow.h"
 
@@ -51,6 +50,7 @@ using namespace std;
 #include <vtkPolyDataMapper.h>
 #include <vtkDataSetCollection.h>
 #include <vtkImageData.h>
+using namespace std;
 
 
 //VRV: porting on Qt 3.0.5

diff --git a/src/VTKViewer/VTKViewer_RenderWindow.cxx b/src/VTKViewer/VTKViewer_RenderWindow.cxx
index 3ae42c55b30e9c1a6e1eecf4c0914030524a7e72..50bdc3a6969a92e9a0821cf9d3cbc72bc64aae46 100644 (file)
--- 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"
@@ -45,6 +44,7 @@ using namespace std;
 #include <vtkRenderWindowInteractor.h>
 #include <vtkRendererCollection.h>
 #include <vtkXOpenGLRenderWindow.h>
+using namespace std;
 
 //#include <GL/gl.h>
 //#include <GL/glu.h>

diff --git a/src/VTKViewer/VTKViewer_RenderWindowInteractor.cxx b/src/VTKViewer/VTKViewer_RenderWindowInteractor.cxx
index 6d049b67ecd2a5cfcbaaae353bce438362f8fefa..489b2984194fd735eba432fcb13d21b3c64cbac4 100644 (file)
--- a/src/VTKViewer/VTKViewer_RenderWindowInteractor.cxx
+++ b/src/VTKViewer/VTKViewer_RenderWindowInteractor.cxx
@@ -26,7 +26,6 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "VTKViewer_RenderWindowInteractor.h"
 #include "VTKViewer_RenderWindow.h"
 #include "VTKViewer_InteractorStyleSALOME.h"
@@ -58,6 +57,7 @@ using namespace std;
 #include <vtkVertex.h>
 #include <vtkRendererCollection.h>
 #include <vtkPolyDataWriter.h>
+using namespace std;
 
 
 // QT Includes

diff --git a/src/VTKViewer/VTKViewer_ViewFrame.cxx b/src/VTKViewer/VTKViewer_ViewFrame.cxx
index ae35016b9deb87044fd24857003be06a02a6473b..c39915d691e27b5c61999aac428bcca3a3b7d286 100644 (file)
--- a/src/VTKViewer/VTKViewer_ViewFrame.cxx
+++ b/src/VTKViewer/VTKViewer_ViewFrame.cxx
@@ -26,7 +26,6 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "VTKViewer_ViewFrame.h"
 #include "VTKViewer_RenderWindow.h"
 //#include "VTKViewer_InteractorStyleSALOME.h"
@@ -64,6 +63,7 @@ using namespace std;
 #include <vtkTIFFWriter.h>
 #include <vtkVectorText.h>
 #include <vtkFollower.h>
+using namespace std;
 
 /*!
     Constructor