From: secher <secher>
Date: Tue, 6 Jan 2004 10:36:57 +0000 (+0000)
Subject: portage sur processeur alpha/osf
X-Git-Tag: BSEC_br1_20040202~8
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=9f6cbf1c46808394532ad3013586ab7407c72b06;p=modules%2Fkernel.git

portage sur processeur alpha/osf
---

diff --git a/src/Notification/NOTIFICATION.cxx b/src/Notification/NOTIFICATION.cxx
index 1058d706e..bbbb92294 100644
--- a/src/Notification/NOTIFICATION.cxx
+++ b/src/Notification/NOTIFICATION.cxx
@@ -25,12 +25,11 @@
 //  Author : Laurent DADA / Francis KLOSS
 //  Module : SALOME
 
-using namespace std;
 #include "NOTIFICATION.hxx"
 
-using namespace std;
 #include "Utils_ORB_INIT.hxx"
 #include "Utils_SINGLETON.hxx"
+using namespace std;
 
 CosNA_EventChannel_ptr NOTIFICATION_channel() {
     ORB_INIT&      init = *SINGLETON_<ORB_INIT>::Instance(); ASSERT(SINGLETON_<ORB_INIT>::IsAlreadyExisting());
diff --git a/src/Notification/NOTIFICATION_Consumer.cxx b/src/Notification/NOTIFICATION_Consumer.cxx
index 809d328ec..e502a01d0 100644
--- a/src/Notification/NOTIFICATION_Consumer.cxx
+++ b/src/Notification/NOTIFICATION_Consumer.cxx
@@ -25,8 +25,8 @@
 //  Author : Laurent DADA / Francis KLOSS
 //  Module : SALOME
 
-using namespace std;
 #include "NOTIFICATION.hxx"
+using namespace std;
 
 NOTIFICATION_Consumer::NOTIFICATION_Consumer():
     proxy_supplier(0),
diff --git a/src/Notification/NOTIFICATION_Supplier.cxx b/src/Notification/NOTIFICATION_Supplier.cxx
index b572539a4..83d3787a6 100644
--- a/src/Notification/NOTIFICATION_Supplier.cxx
+++ b/src/Notification/NOTIFICATION_Supplier.cxx
@@ -25,8 +25,8 @@
 //  Author : Laurent DADA / Francis KLOSS
 //  Module : SALOME
 
-using namespace std;
 #include "NOTIFICATION.hxx"
+using namespace std;
 
 long NOTIFICATION_Supplier::_stamp = 0;
 
diff --git a/src/OBJECT/SALOME_AISObject.cxx b/src/OBJECT/SALOME_AISObject.cxx
index 2d34b31a2..46abdd1d6 100644
--- a/src/OBJECT/SALOME_AISObject.cxx
+++ b/src/OBJECT/SALOME_AISObject.cxx
@@ -26,5 +26,5 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "SALOME_AISObject.ixx"
+using namespace std;
diff --git a/src/OBJECT/SALOME_AISShape.cxx b/src/OBJECT/SALOME_AISShape.cxx
index 117738ffa..b439aef2b 100644
--- a/src/OBJECT/SALOME_AISShape.cxx
+++ b/src/OBJECT/SALOME_AISShape.cxx
@@ -26,8 +26,8 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "SALOME_AISShape.ixx"
+using namespace std;
 
 SALOME_AISShape::SALOME_AISShape(const TopoDS_Shape& shape): AIS_Shape(shape) {
 }
diff --git a/src/OBJECT/SALOME_Actor.cxx b/src/OBJECT/SALOME_Actor.cxx
index 38f46f8be..db7f01010 100644
--- 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 0a994e616..89c46f066 100644
--- 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 36a977af6..c361fca8f 100644
--- a/src/OBJECT/SALOME_InteractiveObject.cxx
+++ b/src/OBJECT/SALOME_InteractiveObject.cxx
@@ -26,13 +26,13 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 /*!
   \class SALOME_InteractiveObject SALOME_InteractiveObject.hxx
   \brief ...
 */
 
 #include "SALOME_InteractiveObject.ixx"
+using namespace std;
 
 SALOME_InteractiveObject::SALOME_InteractiveObject()
 {
diff --git a/src/OCCViewer/OCCViewer.cxx b/src/OCCViewer/OCCViewer.cxx
index d98bb2b1f..70a92624c 100644
--- a/src/OCCViewer/OCCViewer.cxx
+++ b/src/OCCViewer/OCCViewer.cxx
@@ -26,9 +26,9 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "OCCViewer.h"
 #include "OCCViewer_ViewFrame.h"
+using namespace std;
 
 QAD_ViewFrame* OCCViewer::createView(QAD_RightFrame* parent)
 {
diff --git a/src/OCCViewer/OCCViewer_AISSelector.cxx b/src/OCCViewer/OCCViewer_AISSelector.cxx
index 6310f51c6..0b95ac18d 100644
--- a/src/OCCViewer/OCCViewer_AISSelector.cxx
+++ b/src/OCCViewer/OCCViewer_AISSelector.cxx
@@ -26,7 +26,6 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 /*!
   \class OCCViewer_AISSelector OCCViewer_AISSelector.h
   \brief Selector for AIS interactive context.
@@ -35,6 +34,7 @@ using namespace std;
 */
 
 #include "OCCViewer_AISSelector.h"
+using namespace std;
 
 /*!
     Constructor
diff --git a/src/OCCViewer/OCCViewer_Selector.cxx b/src/OCCViewer/OCCViewer_Selector.cxx
index e037b6b35..41df5163a 100644
--- 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 e0ed072a6..eca0fbbb8 100644
--- a/src/OCCViewer/OCCViewer_VService.cxx
+++ b/src/OCCViewer/OCCViewer_VService.cxx
@@ -26,7 +26,6 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "OCCViewer_VService.h"
 
 // Open CASCADE Includes
@@ -51,6 +50,7 @@ using namespace std;
 #include <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 c15abf390..df850c74f 100644
--- a/src/OCCViewer/OCCViewer_ViewFrame.cxx
+++ b/src/OCCViewer/OCCViewer_ViewFrame.cxx
@@ -26,7 +26,6 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "OCCViewer_ViewFrame.h"
 #include "OCCViewer_Viewer3d.h"
 #include "OCCViewer_ViewPort.h"
@@ -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 1d6d410ba..69b061812 100644
--- 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 88601ea0b..6a5d747a8 100644
--- a/src/OCCViewer/OCCViewer_ViewPort3d.cxx
+++ b/src/OCCViewer/OCCViewer_ViewPort3d.cxx
@@ -26,7 +26,6 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "OCCViewer_ViewPort3d.h"
 
 #include "QAD.h"
@@ -46,6 +45,7 @@ using namespace std;
 #if !defined WNT
 #include <Xw.hxx>
 #endif
+using namespace std;
 
 /*!
     Constructor
diff --git a/src/OCCViewer/OCCViewer_Viewer3d.cxx b/src/OCCViewer/OCCViewer_Viewer3d.cxx
index 8d4a1331a..ffe52f775 100644
--- a/src/OCCViewer/OCCViewer_Viewer3d.cxx
+++ b/src/OCCViewer/OCCViewer_Viewer3d.cxx
@@ -26,7 +26,6 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 /*!
   \class OCCViewer_Viewer3d OCCViewer_Viewer3d.h
   \brief Open CASCADE Viewer 3D with viewport 3D and selection.
@@ -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 4b8268af9..f44990ee3 100644
--- 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 0d4d618f7..483149bb6 100644
--- 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 8d15c56ae..e32f477e0 100644
--- a/src/Plot2d/Plot2d_Curve.cxx
+++ b/src/Plot2d/Plot2d_Curve.cxx
@@ -7,9 +7,9 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "Plot2d_Curve.h"
 #include "utilities.h"
+using namespace std;
 
 /*!
   Constructor
diff --git a/src/Plot2d/Plot2d_CurveContainer.cxx b/src/Plot2d/Plot2d_CurveContainer.cxx
index f55104645..f9021db1e 100644
--- a/src/Plot2d/Plot2d_CurveContainer.cxx
+++ b/src/Plot2d/Plot2d_CurveContainer.cxx
@@ -7,8 +7,8 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "Plot2d_CurveContainer.h"
+using namespace std;
 
 /*!
   Constructor
diff --git a/src/Registry/RegistryConnexion.cxx b/src/Registry/RegistryConnexion.cxx
index e11f5a221..018ea5fbf 100644
--- a/src/Registry/RegistryConnexion.cxx
+++ b/src/Registry/RegistryConnexion.cxx
@@ -26,8 +26,6 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
-using namespace std;
 # include "Utils_ORB_INIT.hxx"
 # include "RegistryConnexion.hxx"
 # include "SALOME_NamingService.hxx"
diff --git a/src/Registry/RegistryService.cxx b/src/Registry/RegistryService.cxx
index 94dfa3034..018d9cb87 100644
--- 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 0144b59b3..63f7d57e4 100644
--- 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 6cba1c7d8..ceb92bf20 100644
--- 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 3d8b682cc..40889fe28 100644
--- a/src/RegistryDisplay/HelpWindow.cxx
+++ b/src/RegistryDisplay/HelpWindow.cxx
@@ -26,7 +26,6 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 # include "HelpWindow.hxx"
 # include "utilities.h"
 
@@ -34,6 +33,7 @@ using namespace std;
 # include <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 9110ca423..03e78e782 100644
--- 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 dcd0a2759..fc517e336 100644
--- a/src/RegistryDisplay/RegWidgetFactory.cxx
+++ b/src/RegistryDisplay/RegWidgetFactory.cxx
@@ -26,9 +26,9 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 # include "RegWidget.hxx"
 # include "utilities.h"
+using namespace std;
 
 extern "C"
 {
diff --git a/src/RessourcesCatalog/SALOME_RessourcesCatalog_Client.cxx b/src/RessourcesCatalog/SALOME_RessourcesCatalog_Client.cxx
index c6a524cde..05f13bc10 100644
--- 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 e82e54a23..67cd843d3 100755
--- 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 519f0b845..c2014c0d1 100644
--- 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 d0d277749..0557289d8 100644
--- 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 f967482d8..72babf8e1 100644
--- a/src/SALOMEDS/SALOMEDS_AttributeComment_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_AttributeComment_i.cxx
@@ -26,11 +26,11 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "SALOMEDS_AttributeComment_i.hxx"
 
 #include <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 903d1ead7..8fa4ea145 100644
--- a/src/SALOMEDS/SALOMEDS_AttributeDrawable_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_AttributeDrawable_i.cxx
@@ -26,9 +26,9 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "SALOMEDS_AttributeDrawable_i.hxx"
 #include "SALOMEDS_SObject_i.hxx"
+using namespace std;
 
 CORBA::Boolean SALOMEDS_AttributeDrawable_i::IsDrawable() {
   return (Handle(SALOMEDS_DrawableAttribute)::DownCast(_myAttr)->Get() == 1);
diff --git a/src/SALOMEDS/SALOMEDS_AttributeExpandable_i.cxx b/src/SALOMEDS/SALOMEDS_AttributeExpandable_i.cxx
index 1560deeaa..6fe877c50 100644
--- a/src/SALOMEDS/SALOMEDS_AttributeExpandable_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_AttributeExpandable_i.cxx
@@ -26,9 +26,9 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "SALOMEDS_AttributeExpandable_i.hxx"
 #include "SALOMEDS_SObject_i.hxx"
+using namespace std;
 
 CORBA::Boolean SALOMEDS_AttributeExpandable_i::IsExpandable() {
   return (Handle(SALOMEDS_ExpandableAttribute)::DownCast(_myAttr)->Get() == 1);
diff --git a/src/SALOMEDS/SALOMEDS_AttributeIOR_i.cxx b/src/SALOMEDS/SALOMEDS_AttributeIOR_i.cxx
index fd338ac71..953a15d10 100644
--- a/src/SALOMEDS/SALOMEDS_AttributeIOR_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_AttributeIOR_i.cxx
@@ -26,13 +26,13 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "SALOMEDS_AttributeIOR_i.hxx"
 
 
 #include <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 d9f013db7..07920efb6 100644
--- a/src/SALOMEDS/SALOMEDS_AttributeInteger_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_AttributeInteger_i.cxx
@@ -26,9 +26,9 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "SALOMEDS_AttributeInteger_i.hxx"
 #include "SALOMEDS_SObject_i.hxx"
+using namespace std;
 
 
 CORBA::Long SALOMEDS_AttributeInteger_i::Value() {
diff --git a/src/SALOMEDS/SALOMEDS_AttributeLocalID_i.cxx b/src/SALOMEDS/SALOMEDS_AttributeLocalID_i.cxx
index 0ed4628b8..3c1b124fd 100644
--- a/src/SALOMEDS/SALOMEDS_AttributeLocalID_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_AttributeLocalID_i.cxx
@@ -26,9 +26,9 @@
 //  Module : SALOME
 //  $Header: 
 
-using namespace std;
 #include "SALOMEDS_AttributeLocalID_i.hxx"
 #include "SALOMEDS_SObject_i.hxx"
+using namespace std;
 
 CORBA::Long SALOMEDS_AttributeLocalID_i::Value() {
   return Handle(SALOMEDS_LocalIDAttribute)::DownCast(_myAttr)->Get();
diff --git a/src/SALOMEDS/SALOMEDS_AttributeName_i.cxx b/src/SALOMEDS/SALOMEDS_AttributeName_i.cxx
index 415f71af3..975e6439d 100644
--- a/src/SALOMEDS/SALOMEDS_AttributeName_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_AttributeName_i.cxx
@@ -26,10 +26,10 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "SALOMEDS_AttributeName_i.hxx"
 #include <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 c202cb043..fd9c6bfd1 100644
--- a/src/SALOMEDS/SALOMEDS_AttributeOpened_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_AttributeOpened_i.cxx
@@ -26,9 +26,9 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "SALOMEDS_AttributeOpened_i.hxx"
 #include "SALOMEDS_SObject_i.hxx"
+using namespace std;
 
 CORBA::Boolean SALOMEDS_AttributeOpened_i::IsOpened() {
   return (Handle(SALOMEDS_OpenedAttribute)::DownCast(_myAttr)->Get() == 1);
diff --git a/src/SALOMEDS/SALOMEDS_AttributePersistentRef_i.cxx b/src/SALOMEDS/SALOMEDS_AttributePersistentRef_i.cxx
index 626ad9711..3a867f0ea 100644
--- a/src/SALOMEDS/SALOMEDS_AttributePersistentRef_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_AttributePersistentRef_i.cxx
@@ -26,10 +26,10 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "SALOMEDS_AttributePersistentRef_i.hxx"
 #include <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 5015f1697..1d8498c3f 100644
--- a/src/SALOMEDS/SALOMEDS_AttributePixMap_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_AttributePixMap_i.cxx
@@ -26,10 +26,10 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "SALOMEDS_AttributePixMap_i.hxx"
 #include "SALOMEDS_SObject_i.hxx"
 #include <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 86f7a1ca4..ca3f7d731 100644
--- a/src/SALOMEDS/SALOMEDS_AttributePythonObject_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_AttributePythonObject_i.cxx
@@ -9,11 +9,11 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "SALOMEDS_AttributePythonObject_i.hxx"
 #include <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 fc5611c8e..62960aa9c 100644
--- 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 b526f3c99..e208ad6a9 100644
--- a/src/SALOMEDS/SALOMEDS_AttributeSelectable_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_AttributeSelectable_i.cxx
@@ -26,9 +26,9 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "SALOMEDS_AttributeSelectable_i.hxx"
 #include "SALOMEDS_SObject_i.hxx"
+using namespace std;
 
 CORBA::Boolean SALOMEDS_AttributeSelectable_i::IsSelectable() {
   return (Handle(SALOMEDS_SelectableAttribute)::DownCast(_myAttr)->Get() == 1);
diff --git a/src/SALOMEDS/SALOMEDS_AttributeSequenceOfInteger_i.cxx b/src/SALOMEDS/SALOMEDS_AttributeSequenceOfInteger_i.cxx
index 61e08b1bd..cd142de25 100644
--- 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 8b48632b2..6c5c18589 100644
--- a/src/SALOMEDS/SALOMEDS_AttributeSequenceOfReal_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_AttributeSequenceOfReal_i.cxx
@@ -26,10 +26,10 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "SALOMEDS_AttributeSequenceOfReal_i.hxx"
 #include "SALOMEDS_SObject_i.hxx"
 #include <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 1646f3db4..dce1ad372 100644
--- a/src/SALOMEDS/SALOMEDS_AttributeStudyProperties_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_AttributeStudyProperties_i.cxx
@@ -9,11 +9,11 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "SALOMEDS_AttributeStudyProperties_i.hxx"
 #include "SALOMEDS_SObject_i.hxx"
 #include <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 f80457bb6..1542471bf 100644
--- a/src/SALOMEDS/SALOMEDS_AttributeTableOfInteger_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_AttributeTableOfInteger_i.cxx
@@ -9,7 +9,6 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "SALOMEDS_AttributeTableOfInteger_i.hxx"
 #include "SALOMEDS_SObject_i.hxx"
 #include <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 432f42e5e..a684dc8df 100644
--- a/src/SALOMEDS/SALOMEDS_AttributeTableOfReal_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_AttributeTableOfReal_i.cxx
@@ -9,7 +9,6 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "SALOMEDS_AttributeTableOfReal_i.hxx"
 #include "SALOMEDS_SObject_i.hxx"
 #include <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 262cdce8d..c88ce6d21 100644
--- a/src/SALOMEDS/SALOMEDS_AttributeTableOfString_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_AttributeTableOfString_i.cxx
@@ -8,7 +8,6 @@
 //  Author : Sergey Ruin
 //  Module : SALOME
 
-using namespace std;
 #include <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 f5f35cc7b..b431af96a 100644
--- a/src/SALOMEDS/SALOMEDS_AttributeTarget_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_AttributeTarget_i.cxx
@@ -26,11 +26,11 @@
 //  Module : SALOME
 //  $Header: 
 
-using namespace std;
 #include "SALOMEDS_AttributeTarget_i.hxx"
 #include "SALOMEDS_SObject_i.hxx"
 #include <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 0f040990c..45d1b8f52 100644
--- a/src/SALOMEDS/SALOMEDS_AttributeTextColor_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_AttributeTextColor_i.cxx
@@ -26,10 +26,10 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "SALOMEDS_AttributeTextColor_i.hxx"
 #include "SALOMEDS_SObject_i.hxx"
 #include <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 9ba430ba8..cc6ff475b 100644
--- a/src/SALOMEDS/SALOMEDS_AttributeTextHighlightColor_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_AttributeTextHighlightColor_i.cxx
@@ -26,10 +26,10 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "SALOMEDS_AttributeTextHighlightColor_i.hxx"
 #include "SALOMEDS_SObject_i.hxx"
 #include <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 11d326b5c..aaf7ddc25 100644
--- 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 632d95beb..021879481 100644
--- a/src/SALOMEDS/SALOMEDS_AttributeUserID_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_AttributeUserID_i.cxx
@@ -26,10 +26,10 @@
 //  Module : SALOME
 //  $Header: 
 
-using namespace std;
 #include "SALOMEDS_AttributeUserID_i.hxx"
 #include <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 947579721..ada9ea7c4 100644
--- 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 aa39a9f52..14b3faf67 100644
--- 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 080f4b79d..ce782eae0 100644
--- a/src/SALOMEDS/SALOMEDS_DataMapIteratorOfDataMapStringLabel_0.cxx
+++ b/src/SALOMEDS/SALOMEDS_DataMapIteratorOfDataMapStringLabel_0.cxx
@@ -26,7 +26,6 @@
 //  Module : SALOME
 //  $Header: 
 
-using namespace std;
 #include "SALOMEDS_DataMapIteratorOfDataMapStringLabel.hxx"
 
 #ifndef _Standard_NoSuchObject_HeaderFile
@@ -44,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 2b063d479..4faa54bac 100644
--- a/src/SALOMEDS/SALOMEDS_DataMapNodeOfDataMapStringLabel_0.cxx
+++ b/src/SALOMEDS/SALOMEDS_DataMapNodeOfDataMapStringLabel_0.cxx
@@ -26,7 +26,6 @@
 //  Module : SALOME
 //  $Header: 
 
-using namespace std;
 #include "SALOMEDS_DataMapNodeOfDataMapStringLabel.hxx"
 
 #ifndef _Standard_TypeMismatch_HeaderFile
@@ -45,6 +44,7 @@ using namespace std;
 #ifndef _SALOMEDS_DataMapIteratorOfDataMapStringLabel_HeaderFile
 #include "SALOMEDS_DataMapIteratorOfDataMapStringLabel.hxx"
 #endif
+using namespace std;
 SALOMEDS_DataMapNodeOfDataMapStringLabel::~SALOMEDS_DataMapNodeOfDataMapStringLabel() {}
  
 
diff --git a/src/SALOMEDS/SALOMEDS_DataMapStringLabel_0.cxx b/src/SALOMEDS/SALOMEDS_DataMapStringLabel_0.cxx
index 4befe2030..a670a6f57 100644
--- a/src/SALOMEDS/SALOMEDS_DataMapStringLabel_0.cxx
+++ b/src/SALOMEDS/SALOMEDS_DataMapStringLabel_0.cxx
@@ -26,7 +26,6 @@
 //  Module : SALOME
 //  $Header: 
 
-using namespace std;
 #include "SALOMEDS_DataMapStringLabel.hxx"
 
 #ifndef _Standard_DomainError_HeaderFile
@@ -47,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 62bed2f1b..0245efc1d 100644
--- a/src/SALOMEDS/SALOMEDS_DrawableAttribute.cxx
+++ b/src/SALOMEDS/SALOMEDS_DrawableAttribute.cxx
@@ -26,9 +26,9 @@
 //  Module : SALOME
 //  $Header:  
 
-using namespace std;
 #include "SALOMEDS_DrawableAttribute.ixx"
 #include <TDataStd_Integer.hxx>
+using namespace std;
 
 //=======================================================================
 //function : GetID
diff --git a/src/SALOMEDS/SALOMEDS_ExpandableAttribute.cxx b/src/SALOMEDS/SALOMEDS_ExpandableAttribute.cxx
index ad3cc3c5d..db17601b4 100644
--- a/src/SALOMEDS/SALOMEDS_ExpandableAttribute.cxx
+++ b/src/SALOMEDS/SALOMEDS_ExpandableAttribute.cxx
@@ -26,9 +26,9 @@
 //  Module : SALOME
 //  $Header:  
 
-using namespace std;
 #include "SALOMEDS_ExpandableAttribute.ixx"
 #include <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 d3fc65e30..053b51438 100644
--- 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 c305641a4..f71b538fd 100644
--- a/src/SALOMEDS/SALOMEDS_IORAttribute.cxx
+++ b/src/SALOMEDS/SALOMEDS_IORAttribute.cxx
@@ -26,11 +26,11 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "SALOMEDS_IORAttribute.ixx"
 #include <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 9f8ece15c..623ce7c50 100644
--- a/src/SALOMEDS/SALOMEDS_LocalIDAttribute.cxx
+++ b/src/SALOMEDS/SALOMEDS_LocalIDAttribute.cxx
@@ -26,9 +26,9 @@
 //  Module : SALOME
 //  $Header:  
 
-using namespace std;
 #include "SALOMEDS_LocalIDAttribute.ixx"
 #include <TDataStd_Integer.hxx>
+using namespace std;
 
 //=======================================================================
 //function : GetID
diff --git a/src/SALOMEDS/SALOMEDS_OCAFApplication.cxx b/src/SALOMEDS/SALOMEDS_OCAFApplication.cxx
index e0c7ad35f..5913c6842 100644
--- a/src/SALOMEDS/SALOMEDS_OCAFApplication.cxx
+++ b/src/SALOMEDS/SALOMEDS_OCAFApplication.cxx
@@ -26,8 +26,8 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "SALOMEDS_OCAFApplication.ixx"
+using namespace std;
 
 //=======================================================================
 //function : SALOMEDS_OCAFApplication
diff --git a/src/SALOMEDS/SALOMEDS_OpenedAttribute.cxx b/src/SALOMEDS/SALOMEDS_OpenedAttribute.cxx
index d59512cdf..4704436ff 100644
--- a/src/SALOMEDS/SALOMEDS_OpenedAttribute.cxx
+++ b/src/SALOMEDS/SALOMEDS_OpenedAttribute.cxx
@@ -26,9 +26,9 @@
 //  Module : SALOME
 //  $Header:  
 
-using namespace std;
 #include "SALOMEDS_OpenedAttribute.ixx"
 #include <TDataStd_Integer.hxx>
+using namespace std;
 
 //=======================================================================
 //function : GetID
diff --git a/src/SALOMEDS/SALOMEDS_PersRefAttribute.cxx b/src/SALOMEDS/SALOMEDS_PersRefAttribute.cxx
index 8e313831c..8d57af837 100644
--- a/src/SALOMEDS/SALOMEDS_PersRefAttribute.cxx
+++ b/src/SALOMEDS/SALOMEDS_PersRefAttribute.cxx
@@ -26,10 +26,10 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "SALOMEDS_PersRefAttribute.ixx"
 #include <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 3fde4f60e..1799c035f 100644
--- a/src/SALOMEDS/SALOMEDS_PixMapAttribute.cxx
+++ b/src/SALOMEDS/SALOMEDS_PixMapAttribute.cxx
@@ -26,10 +26,10 @@
 //  Module : SALOME
 //  $Header: 
 
-using namespace std;
 #include "SALOMEDS_PixMapAttribute.ixx"
 #include <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 fd0538e0e..f8c8d9de4 100644
--- a/src/SALOMEDS/SALOMEDS_PythonObjectAttribute.cxx
+++ b/src/SALOMEDS/SALOMEDS_PythonObjectAttribute.cxx
@@ -9,9 +9,9 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "SALOMEDS_PythonObjectAttribute.ixx"
 #include <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 77b0b4655..c8ae7c4c5 100644
--- 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 896859cca..66264fd5b 100644
--- 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 f9c00984e..c5bbfbedc 100644
--- a/src/SALOMEDS/SALOMEDS_SObject_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_SObject_i.cxx
@@ -26,7 +26,6 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "utilities.h"
 #include "SALOMEDS_SObject_i.hxx"
 //SALOMEDS Headers
@@ -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 be22a90b2..cd6944c55 100644
--- 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 241792584..aef7ac1bd 100644
--- a/src/SALOMEDS/SALOMEDS_SelectableAttribute.cxx
+++ b/src/SALOMEDS/SALOMEDS_SelectableAttribute.cxx
@@ -26,9 +26,9 @@
 //  Module : SALOME
 //  $Header:  
 
-using namespace std;
 #include "SALOMEDS_SelectableAttribute.ixx"
 #include <TDataStd_Integer.hxx>
+using namespace std;
 
 //=======================================================================
 //function : GetID
diff --git a/src/SALOMEDS/SALOMEDS_SequenceOfIntegerAttribute.cxx b/src/SALOMEDS/SALOMEDS_SequenceOfIntegerAttribute.cxx
index 51bdda48a..30c1cf93a 100644
--- a/src/SALOMEDS/SALOMEDS_SequenceOfIntegerAttribute.cxx
+++ b/src/SALOMEDS/SALOMEDS_SequenceOfIntegerAttribute.cxx
@@ -26,8 +26,8 @@
 //  Module : SALOME
 //  $Header: 
 
-using namespace std;
 #include "SALOMEDS_SequenceOfIntegerAttribute.ixx"
+using namespace std;
 
 //=======================================================================
 //function : GetID
diff --git a/src/SALOMEDS/SALOMEDS_SequenceOfRealAttribute.cxx b/src/SALOMEDS/SALOMEDS_SequenceOfRealAttribute.cxx
index 9e3cf84e9..9cd839f05 100644
--- a/src/SALOMEDS/SALOMEDS_SequenceOfRealAttribute.cxx
+++ b/src/SALOMEDS/SALOMEDS_SequenceOfRealAttribute.cxx
@@ -26,9 +26,9 @@
 //  Module : SALOME
 //  $Header: 
 
-using namespace std;
 #include "SALOMEDS_SequenceOfRealAttribute.ixx"
 #include <TDataStd_Real.hxx>
+using namespace std;
 
 //=======================================================================
 //function : GetID
diff --git a/src/SALOMEDS/SALOMEDS_Server.cxx b/src/SALOMEDS/SALOMEDS_Server.cxx
index 087ef8ff5..3452b5df9 100644
--- 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 93eaa48bc..ec830c6dd 100644
--- a/src/SALOMEDS/SALOMEDS_StudyBuilder_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_StudyBuilder_i.cxx
@@ -26,7 +26,6 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "utilities.h"
 #include "SALOMEDS_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 4d12d2379..1aadb70d0 100644
--- 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 4f83613be..62835949d 100644
--- a/src/SALOMEDS/SALOMEDS_StudyPropertiesAttribute.cxx
+++ b/src/SALOMEDS/SALOMEDS_StudyPropertiesAttribute.cxx
@@ -9,8 +9,8 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include <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 c282ab096..4748b90bc 100644
--- a/src/SALOMEDS/SALOMEDS_Study_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_Study_i.cxx
@@ -26,7 +26,6 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "utilities.h"
 #include "SALOMEDS_Study_i.hxx"
 
@@ -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 7eb9b5545..a9db3037c 100644
--- 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 f524bad98..a15b4bce7 100644
--- 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 4d6ae31c1..5276e0347 100644
--- 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 a3d35069f..35d8e33ae 100644
--- 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 486cee192..b0f06a31b 100644
--- a/src/SALOMEDS/SALOMEDS_TableOfStringAttribute.cxx
+++ b/src/SALOMEDS/SALOMEDS_TableOfStringAttribute.cxx
@@ -8,13 +8,13 @@
 //  Author : Sergey Ruin
 //  Module : SALOME
 
-using namespace std;
 #include <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 a043b9610..9833dd56c 100644
--- a/src/SALOMEDS/SALOMEDS_TargetAttribute.cxx
+++ b/src/SALOMEDS/SALOMEDS_TargetAttribute.cxx
@@ -26,11 +26,11 @@
 //  Module : SALOME
 //  $Header:  
 
-using namespace std;
 #include "SALOMEDS_TargetAttribute.ixx"
 #include <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 c264f94b3..c5eccab88 100644
--- a/src/SALOMEDS/SALOMEDS_TextColorAttribute.cxx
+++ b/src/SALOMEDS/SALOMEDS_TextColorAttribute.cxx
@@ -26,8 +26,8 @@
 //  Module : SALOME
 //  $Header: 
 
-using namespace std;
 #include "SALOMEDS_TextColorAttribute.ixx"
+using namespace std;
 
 //=======================================================================
 //function : GetID
diff --git a/src/SALOMEDS/SALOMEDS_TextHighlightColorAttribute.cxx b/src/SALOMEDS/SALOMEDS_TextHighlightColorAttribute.cxx
index 4194d1353..dd95d6f64 100644
--- a/src/SALOMEDS/SALOMEDS_TextHighlightColorAttribute.cxx
+++ b/src/SALOMEDS/SALOMEDS_TextHighlightColorAttribute.cxx
@@ -26,8 +26,8 @@
 //  Module : SALOME
 //  $Header: 
 
-using namespace std;
 #include "SALOMEDS_TextHighlightColorAttribute.ixx"
+using namespace std;
 
 //=======================================================================
 //function : GetID
diff --git a/src/SALOMEDS/SALOMEDS_UseCaseBuilder_i.cxx b/src/SALOMEDS/SALOMEDS_UseCaseBuilder_i.cxx
index 698fbb1c6..151a0bb9c 100644
--- a/src/SALOMEDS/SALOMEDS_UseCaseBuilder_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_UseCaseBuilder_i.cxx
@@ -8,7 +8,6 @@
 //  Author : Yves FRICAUD
 //  Module : SALOME
 
-using namespace std;
 #include "SALOMEDS_UseCaseBuilder_i.hxx"
 #include "SALOMEDS_AttributeComment_i.hxx"
 #include "SALOMEDS_SObject_i.hxx"
@@ -24,6 +23,7 @@ using namespace std;
 #include <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 69e7d39ec..05507edab 100644
--- 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 ecd145c4b..7f59b13a4 100644
--- 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 f9d03e760..fb88526ed 100644
--- 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 48781e85f..9fe277d6a 100644
--- 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 935f2c4e7..dc53c48cf 100644
--- a/src/SALOMEGUI/QAD_Application.cxx
+++ b/src/SALOMEGUI/QAD_Application.cxx
@@ -26,7 +26,6 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 /*!
   \class QAD_Application QAD_Application.h
   \brief Study manager for QAD-based application.
@@ -62,6 +61,7 @@ using namespace std;
 #include <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 b9d734f16..593e2c41b 100644
--- a/src/SALOMEGUI/QAD_Config.cxx
+++ b/src/SALOMEGUI/QAD_Config.cxx
@@ -26,7 +26,6 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 /*!
   \class QAD_Config QAD_Config.h
   \brief Settings file management for QAD-based application.
@@ -40,6 +39,7 @@ using namespace std;
 #include <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 189665a8e..512f87356 100644
--- 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 a45638cd5..542df51cf 100644
--- a/src/SALOMEGUI/QAD_DirListDlg.cxx
+++ b/src/SALOMEGUI/QAD_DirListDlg.cxx
@@ -9,7 +9,6 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "QAD_DirListDlg.h"
 #include "QAD_Desktop.h"
 #include "QAD_FileDlg.h"
@@ -19,6 +18,7 @@ using namespace std;
 #include <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 2d626eb96..caa45e54a 100644
--- 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 f12915a41..d62145052 100644
--- 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 ad6697036..e14035b59 100644
--- a/src/SALOMEGUI/QAD_Help.cxx
+++ b/src/SALOMEGUI/QAD_Help.cxx
@@ -26,8 +26,8 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "QAD_Help.h"
+using namespace std;
 
 /*!
   \class QAD_Help QAD_HelpL.h
diff --git a/src/SALOMEGUI/QAD_HelpWindow.cxx b/src/SALOMEGUI/QAD_HelpWindow.cxx
index 8cb020a7e..15d9dc4ba 100644
--- a/src/SALOMEGUI/QAD_HelpWindow.cxx
+++ b/src/SALOMEGUI/QAD_HelpWindow.cxx
@@ -26,7 +26,6 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 /*!
   \class QAD_HelpWindow QAD_HelpWindow.h
   \brief Html browser for help.
@@ -46,6 +45,7 @@ using namespace std;
 #include <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 c3a021d26..8edb54c48 100644
--- a/src/SALOMEGUI/QAD_LeftFrame.cxx
+++ b/src/SALOMEGUI/QAD_LeftFrame.cxx
@@ -26,10 +26,10 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "QAD_LeftFrame.h"
 #include "QAD_ObjectBrowser.h"
 #include <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 04c8d041d..16bb368dc 100644
--- a/src/SALOMEGUI/QAD_ListMenuIdAction.cxx
+++ b/src/SALOMEGUI/QAD_ListMenuIdAction.cxx
@@ -26,8 +26,8 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "QAD_ListMenuIdAction.h"
+using namespace std;
 
 QAD_ListMenuIdAction::QAD_ListMenuIdAction(QPopupMenu* theMenu,
 					   int id,
diff --git a/src/SALOMEGUI/QAD_ListPopupMenu.cxx b/src/SALOMEGUI/QAD_ListPopupMenu.cxx
index e5a5d134f..1d9e9a7b9 100644
--- a/src/SALOMEGUI/QAD_ListPopupMenu.cxx
+++ b/src/SALOMEGUI/QAD_ListPopupMenu.cxx
@@ -26,8 +26,8 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "QAD_ListPopupMenu.h"
+using namespace std;
 
 /*!
   Constructor.
diff --git a/src/SALOMEGUI/QAD_ListView.cxx b/src/SALOMEGUI/QAD_ListView.cxx
index d555fd378..9b19755df 100644
--- 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 904ee2713..b7ddf6ae7 100644
--- a/src/SALOMEGUI/QAD_Menus.cxx
+++ b/src/SALOMEGUI/QAD_Menus.cxx
@@ -26,8 +26,8 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "QAD_Menus.h"
+using namespace std;
 
 /*!
   Constructor.
diff --git a/src/SALOMEGUI/QAD_Message.cxx b/src/SALOMEGUI/QAD_Message.cxx
index a932028e2..4a4a0acb4 100644
--- a/src/SALOMEGUI/QAD_Message.cxx
+++ b/src/SALOMEGUI/QAD_Message.cxx
@@ -26,7 +26,6 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "QAD_Message.h"
 #include "QAD_Application.h"
 #include "QAD_Config.h"
@@ -35,6 +34,7 @@ using namespace std;
 #include <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 c6aad0f76..2f4160624 100644
--- a/src/SALOMEGUI/QAD_MessageBox.cxx
+++ b/src/SALOMEGUI/QAD_MessageBox.cxx
@@ -26,7 +26,6 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 /*!
   \class QAD_MessageBox QAD_MessageBox.h
   \brief Message dialog box for QAD-based application.
@@ -37,6 +36,7 @@ using namespace std;
 // QT Includes
 #include <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 35bcde863..99f4b04d1 100644
--- 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 370358317..696fb78f4 100644
--- a/src/SALOMEGUI/QAD_ObjectBrowserItem.cxx
+++ b/src/SALOMEGUI/QAD_ObjectBrowserItem.cxx
@@ -26,7 +26,6 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "QAD_ObjectBrowserItem.h"
 
 #include <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 87c99f194..42e0bb955 100644
--- a/src/SALOMEGUI/QAD_Operation.cxx
+++ b/src/SALOMEGUI/QAD_Operation.cxx
@@ -26,7 +26,6 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 /*!
   \class QAD_Operation QAD_Operation.h
   \brief Base class for OCAF operations in QAD-based application.
@@ -39,6 +38,7 @@ using namespace std;
 
 // QT Include
 #include <qapplication.h>
+using namespace std;
 
 /*!
     Constructor 
diff --git a/src/SALOMEGUI/QAD_OperatorMenus.cxx b/src/SALOMEGUI/QAD_OperatorMenus.cxx
index 8ad4e40d0..34bc0290c 100644
--- a/src/SALOMEGUI/QAD_OperatorMenus.cxx
+++ b/src/SALOMEGUI/QAD_OperatorMenus.cxx
@@ -26,9 +26,9 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "QAD_OperatorMenus.h"
 #include "QAD_Desktop.h"
+using namespace std;
 
 /*!
   Constructor.
diff --git a/src/SALOMEGUI/QAD_ParserSettings.cxx b/src/SALOMEGUI/QAD_ParserSettings.cxx
index b824dad2a..cb8fb7692 100644
--- a/src/SALOMEGUI/QAD_ParserSettings.cxx
+++ b/src/SALOMEGUI/QAD_ParserSettings.cxx
@@ -26,7 +26,6 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "QAD_ParserSettings.h"
 
 #include <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 aa2c65a93..9bd085b6b 100644
--- a/src/SALOMEGUI/QAD_Popup.cxx
+++ b/src/SALOMEGUI/QAD_Popup.cxx
@@ -26,10 +26,10 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "QAD.h"
 #include "QAD_Popup.h"
 #include "utilities.h"
+using namespace std;
 
 /*****************************************************************************
 **  Class QAD_PopupClientServer
diff --git a/src/SALOMEGUI/QAD_PyEditor.cxx b/src/SALOMEGUI/QAD_PyEditor.cxx
index 58407f6a0..0701bf005 100644
--- 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 5f04d820f..d01da91fa 100644
--- 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 e1be19054..b733314d0 100644
--- 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 bb52c0aee..aaabff332 100644
--- a/src/SALOMEGUI/QAD_ResourceMgr.cxx
+++ b/src/SALOMEGUI/QAD_ResourceMgr.cxx
@@ -26,7 +26,6 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 /*!
   \class QAD_ResourceMgr QAD_ResourceMgr.h
   \brief ResourceMgr QAD-based application.
@@ -46,6 +45,7 @@ using namespace std;
 #include <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 200ecc5cb..0b22647e2 100644
--- 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 14df2e8f3..d1fec9a21 100644
--- a/src/SALOMEGUI/QAD_Settings.cxx
+++ b/src/SALOMEGUI/QAD_Settings.cxx
@@ -26,7 +26,6 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "QAD_Settings.h"
 
 #include <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 6bf31664c..dffa96919 100644
--- a/src/SALOMEGUI/QAD_SpinBoxDbl.cxx
+++ b/src/SALOMEGUI/QAD_SpinBoxDbl.cxx
@@ -9,7 +9,6 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "QAD_SpinBoxDbl.h"
 #include <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 cb472ea71..0d620f597 100644
--- a/src/SALOMEGUI/QAD_Splitter.cxx
+++ b/src/SALOMEGUI/QAD_Splitter.cxx
@@ -26,8 +26,8 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "QAD_Splitter.h"
+using namespace std;
 
 /*!
   Constructs an horizontal splitter.
diff --git a/src/SALOMEGUI/QAD_Study.cxx b/src/SALOMEGUI/QAD_Study.cxx
index 0e1796ab3..da0356b6f 100644
--- 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 194aaa516..4d39c6ad2 100644
--- 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 0b9ab52d3..58f3e0e6b 100644
--- a/src/SALOMEGUI/QAD_Tools.cxx
+++ b/src/SALOMEGUI/QAD_Tools.cxx
@@ -26,7 +26,6 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 /*!
   \class QAD_Tools QAD_Tools.h
   \brief Helpful functions for QAD.
@@ -44,6 +43,7 @@ using namespace std;
 #include <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 6fa905371..b5c19c9b4 100644
--- 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 2226782d4..85df10900 100644
--- a/src/SALOMEGUI/QAD_XmlHandler.cxx
+++ b/src/SALOMEGUI/QAD_XmlHandler.cxx
@@ -26,7 +26,6 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #define  INCLUDE_MENUITEM_DEF 
 
 #include "QAD_Desktop.h"
@@ -41,6 +40,7 @@ using namespace std;
 #include <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 7ae5111de..fb7e59301 100644
--- a/src/SALOMEGUI/SALOMEGUI_AboutDlg.cxx
+++ b/src/SALOMEGUI/SALOMEGUI_AboutDlg.cxx
@@ -26,13 +26,13 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "SALOMEGUI_AboutDlg.h"
 #include "QAD_Desktop.h"
 #include "QAD_Tools.h"
 #include <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 61556f22f..3cc805578 100644
--- 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 090d66ad2..556e10ca4 100644
--- a/src/SALOMEGUI/SALOMEGUI_CloseDlg.cxx
+++ b/src/SALOMEGUI/SALOMEGUI_CloseDlg.cxx
@@ -8,7 +8,6 @@
 //  Author : Vasily RUSYAEV (vrv)
 //  Module : SALOME
 
-using namespace std;
 #include "SALOMEGUI_CloseDlg.h"
 
 #include <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 63ce9dbe8..0b24b49b0 100644
--- 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 36c535e83..84e0c17ce 100644
--- a/src/SALOMEGUI/SALOMEGUI_ImportOperation.cxx
+++ b/src/SALOMEGUI/SALOMEGUI_ImportOperation.cxx
@@ -26,8 +26,8 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "SALOMEGUI_ImportOperation.h"
+using namespace std;
 
 SALOMEGUI_ImportOperation::SALOMEGUI_ImportOperation( QAD_Study* study ) :
 QAD_Operation( study )
diff --git a/src/SALOMEGUI/SALOMEGUI_LoadStudiesDlg.cxx b/src/SALOMEGUI/SALOMEGUI_LoadStudiesDlg.cxx
index de3343aff..0e3c09dce 100644
--- a/src/SALOMEGUI/SALOMEGUI_LoadStudiesDlg.cxx
+++ b/src/SALOMEGUI/SALOMEGUI_LoadStudiesDlg.cxx
@@ -26,13 +26,13 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "SALOMEGUI_LoadStudiesDlg.h"
 
 #include <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 35d4b476f..3153d8317 100644
--- a/src/SALOMEGUI/SALOMEGUI_NameDlg.cxx
+++ b/src/SALOMEGUI/SALOMEGUI_NameDlg.cxx
@@ -9,7 +9,6 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "SALOMEGUI_NameDlg.h"
 #include "QAD_Application.h"
 #include "QAD_Desktop.h"
@@ -20,6 +19,7 @@ using namespace std;
 #include <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 77cde2340..16664321e 100644
--- a/src/SALOMEGUI/SALOMEGUI_OpenWith.cxx
+++ b/src/SALOMEGUI/SALOMEGUI_OpenWith.cxx
@@ -26,7 +26,6 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "SALOMEGUI_OpenWith.h"
 
 #include <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 971433632..ede2c4366 100644
--- a/src/SALOMEGUI/SALOMEGUI_QtCatchCorbaException.cxx
+++ b/src/SALOMEGUI/SALOMEGUI_QtCatchCorbaException.cxx
@@ -26,12 +26,12 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "SALOMEGUI_QtCatchCorbaException.hxx"
 #include "utilities.h"
 
 #include "QAD_Desktop.h"
 #include "QAD_MessageBox.h"
+using namespace std;
 
 void QtCatchCorbaException(const SALOME::SALOME_Exception & S_ex)
 {
diff --git a/src/SALOMEGUI/SALOMEGUI_SetValueDlg.cxx b/src/SALOMEGUI/SALOMEGUI_SetValueDlg.cxx
index 2573f3ff9..9beaec99c 100644
--- a/src/SALOMEGUI/SALOMEGUI_SetValueDlg.cxx
+++ b/src/SALOMEGUI/SALOMEGUI_SetValueDlg.cxx
@@ -9,7 +9,6 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "SALOMEGUI_SetValueDlg.h"
 #include "QAD_Tools.h"
 
@@ -19,6 +18,7 @@ using namespace std;
 #include <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 15e5b4cb6..4265cb95d 100644
--- a/src/SALOMEGUI/SALOMEGUI_SetupCurveDlg.cxx
+++ b/src/SALOMEGUI/SALOMEGUI_SetupCurveDlg.cxx
@@ -9,7 +9,6 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "SALOMEGUI_SetupCurveDlg.h"
 #include "QAD_Tools.h"
 #include <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 0019a14dd..4d9a73281 100644
--- a/src/SALOMEGUI/SALOMEGUI_StudyPropertiesDlg.cxx
+++ b/src/SALOMEGUI/SALOMEGUI_StudyPropertiesDlg.cxx
@@ -9,7 +9,6 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "SALOMEGUI_StudyPropertiesDlg.h"
 
 #include "QAD_Desktop.h"
@@ -19,6 +18,7 @@ using namespace std;
 
 #include <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 7103d349a..9bf557876 100644
--- 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 07c1b7bdb..59afc147b 100644
--- a/src/SALOMEGUI/SALOMEGUI_TableDlg.cxx
+++ b/src/SALOMEGUI/SALOMEGUI_TableDlg.cxx
@@ -9,7 +9,6 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "SALOMEGUI_TableDlg.h"
 #include "QAD_Tools.h"
 #include "QAD_MessageBox.h"
@@ -22,6 +21,7 @@ using namespace std;
 #include <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 ed31165c3..8f78226ce 100644
--- a/src/SALOMEGUI/SALOMEGUI_TrihedronSizeDlg.cxx
+++ b/src/SALOMEGUI/SALOMEGUI_TrihedronSizeDlg.cxx
@@ -26,7 +26,6 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "SALOMEGUI_TrihedronSizeDlg.h"
 
 #include <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 d091d18da..9451c8777 100644
--- a/src/SALOMEGUI/SALOMEGUI_ViewChoiceDlg.cxx
+++ b/src/SALOMEGUI/SALOMEGUI_ViewChoiceDlg.cxx
@@ -26,7 +26,6 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "SALOMEGUI_ViewChoiceDlg.h"
 #include "QAD_Config.h"
 #include "QAD_StudyFrame.h"
@@ -39,6 +38,7 @@ using namespace std;
 #include <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 1fca36e3e..7cc57f40b 100644
--- a/src/SALOMEGUI/SALOME_DataMapIteratorOfDataMapOfIOMapOfInteger_0.cxx
+++ b/src/SALOMEGUI/SALOME_DataMapIteratorOfDataMapOfIOMapOfInteger_0.cxx
@@ -24,7 +24,6 @@
 //  File   : SALOME_DataMapIteratorOfDataMapOfIOMapOfInteger_0.cxx
 //  Module : SALOME
 
-using namespace std;
 #include "SALOME_DataMapIteratorOfDataMapOfIOMapOfInteger.hxx"
 
 #ifndef _Standard_NoSuchObject_HeaderFile
@@ -45,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 7fefc9c06..f58510533 100644
--- a/src/SALOMEGUI/SALOME_DataMapNodeOfDataMapOfIOMapOfInteger_0.cxx
+++ b/src/SALOMEGUI/SALOME_DataMapNodeOfDataMapOfIOMapOfInteger_0.cxx
@@ -24,7 +24,6 @@
 //  File   : SALOME_DataMapNodeOfDataMapOfIOMapOfInteger_0.cxx
 //  Module : SALOME
 
-using namespace std;
 #include "SALOME_DataMapNodeOfDataMapOfIOMapOfInteger.hxx"
 
 #ifndef _Standard_TypeMismatch_HeaderFile
@@ -46,6 +45,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 990e1bad6..9800abcf3 100644
--- a/src/SALOMEGUI/SALOME_DataMapOfIOMapOfInteger_0.cxx
+++ b/src/SALOMEGUI/SALOME_DataMapOfIOMapOfInteger_0.cxx
@@ -24,7 +24,6 @@
 //  File   : SALOME_DataMapOfIOMapOfInteger_0.cxx
 //  Module : SALOME
 
-using namespace std;
 #include "SALOME_DataMapOfIOMapOfInteger.hxx"
 
 #ifndef _Standard_DomainError_HeaderFile
@@ -48,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 2a095e50a..816c9869f 100644
--- a/src/SALOMEGUI/SALOME_Filter.cxx
+++ b/src/SALOMEGUI/SALOME_Filter.cxx
@@ -26,6 +26,6 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "SALOME_Filter.ixx"
 
+using namespace std;
diff --git a/src/SALOMEGUI/SALOME_ListIO.hxx b/src/SALOMEGUI/SALOME_ListIO.hxx
index 861a7ac63..434a31f64 100644
--- 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 0c5ee6097..71260fa5b 100644
--- a/src/SALOMEGUI/SALOME_ListIO_0.cxx
+++ b/src/SALOMEGUI/SALOME_ListIO_0.cxx
@@ -24,7 +24,6 @@
 //  File   : SALOME_ListIO_0.cxx
 //  Module : SALOME
 
-using namespace std;
 #include "SALOME_ListIO.hxx"
 
 #ifndef _Standard_NoSuchObject_HeaderFile
@@ -39,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 928d94559..adb55ab72 100644
--- a/src/SALOMEGUI/SALOME_ListIteratorOfListIO_0.cxx
+++ b/src/SALOMEGUI/SALOME_ListIteratorOfListIO_0.cxx
@@ -24,7 +24,6 @@
 //  File   : SALOME_ListIteratorOfListIO_0.cxx
 //  Module : SALOME
 
-using namespace std;
 #include "SALOME_ListIteratorOfListIO.hxx"
 
 #ifndef _Standard_NoMoreObject_HeaderFile
@@ -42,6 +41,7 @@ using namespace std;
 #ifndef _SALOME_ListNodeOfListIO_HeaderFile
 #include "SALOME_ListNodeOfListIO.hxx"
 #endif
+using namespace std;
  
 
 #define Item Handle_SALOME_InteractiveObject
diff --git a/src/SALOMEGUI/SALOME_ListIteratorOfListOfFilter_0.cxx b/src/SALOMEGUI/SALOME_ListIteratorOfListOfFilter_0.cxx
index 95cba8a29..57a0e587b 100644
--- a/src/SALOMEGUI/SALOME_ListIteratorOfListOfFilter_0.cxx
+++ b/src/SALOMEGUI/SALOME_ListIteratorOfListOfFilter_0.cxx
@@ -24,7 +24,6 @@
 //  File   : SALOME_ListIteratorOfListOfFilter_0.cxx
 //  Module : SALOME
 
-using namespace std;
 #include "SALOME_ListIteratorOfListOfFilter.hxx"
 
 #ifndef _Standard_NoMoreObject_HeaderFile
@@ -42,6 +41,7 @@ using namespace std;
 #ifndef _SALOME_ListNodeOfListOfFilter_HeaderFile
 #include "SALOME_ListNodeOfListOfFilter.hxx"
 #endif
+using namespace std;
  
 
 #define Item Handle_SALOME_Filter
diff --git a/src/SALOMEGUI/SALOME_ListNodeOfListIO_0.cxx b/src/SALOMEGUI/SALOME_ListNodeOfListIO_0.cxx
index 95147d20d..932626022 100644
--- a/src/SALOMEGUI/SALOME_ListNodeOfListIO_0.cxx
+++ b/src/SALOMEGUI/SALOME_ListNodeOfListIO_0.cxx
@@ -24,7 +24,6 @@
 //  File   : SALOME_ListNodeOfListIO_0.cxx
 //  Module : SALOME
 
-using namespace std;
 #include "SALOME_ListNodeOfListIO.hxx"
 
 #ifndef _Standard_TypeMismatch_HeaderFile
@@ -40,6 +39,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 b89c9d1e7..6837e6fca 100644
--- a/src/SALOMEGUI/SALOME_ListNodeOfListOfFilter_0.cxx
+++ b/src/SALOMEGUI/SALOME_ListNodeOfListOfFilter_0.cxx
@@ -24,7 +24,6 @@
 //  File   : SALOME_ListNodeOfListOfFilter_0.cxx
 //  Module : SALOME
 
-using namespace std;
 #include "SALOME_ListNodeOfListOfFilter.hxx"
 
 #ifndef _Standard_TypeMismatch_HeaderFile
@@ -40,6 +39,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 7b4b9c2ac..fef6bfd5c 100644
--- 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 6dbbdaacf..8b30df9f6 100644
--- a/src/SALOMEGUI/SALOME_ListOfFilter_0.cxx
+++ b/src/SALOMEGUI/SALOME_ListOfFilter_0.cxx
@@ -24,7 +24,6 @@
 //  File   : SALOME_ListOfFilter_0.cxx
 //  Module : SALOME
 
-using namespace std;
 #include "SALOME_ListOfFilter.hxx"
 
 #ifndef _Standard_NoSuchObject_HeaderFile
@@ -39,6 +38,7 @@ using namespace std;
 #ifndef _SALOME_ListNodeOfListOfFilter_HeaderFile
 #include "SALOME_ListNodeOfListOfFilter.hxx"
 #endif
+using namespace std;
  
 
 #define Item Handle_SALOME_Filter
diff --git a/src/SALOMEGUI/SALOME_NumberFilter.cxx b/src/SALOMEGUI/SALOME_NumberFilter.cxx
index 3574d8d64..cdc63948e 100644
--- a/src/SALOMEGUI/SALOME_NumberFilter.cxx
+++ b/src/SALOMEGUI/SALOME_NumberFilter.cxx
@@ -26,7 +26,6 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "SALOME_NumberFilter.ixx"
 #include "SALOME_Selection.h"
 #include "SALOME_InteractiveObject.hxx"
@@ -34,6 +33,7 @@ using namespace std;
 #include "QAD_Application.h"
 #include "QAD_Desktop.h"
 #include "QAD_Study.h"
+using namespace std;
 
 SALOME_NumberFilter::SALOME_NumberFilter(NumberFilter TheKind, Standard_Integer aValue):
 myKind(TheKind),
diff --git a/src/SALOMEGUI/SALOME_Selection.cxx b/src/SALOMEGUI/SALOME_Selection.cxx
index 3e79a6c6d..c5477bd63 100644
--- 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 4bc2a5246..83f1d71ec 100644
--- a/src/SALOMEGUI/SALOME_TypeFilter.cxx
+++ b/src/SALOMEGUI/SALOME_TypeFilter.cxx
@@ -26,9 +26,9 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "SALOME_TypeFilter.ixx"
 #include "SALOME_InteractiveObject.hxx"
+using namespace std;
 
 SALOME_TypeFilter::SALOME_TypeFilter(const Standard_CString TheKind):
 myKind(TheKind){}
diff --git a/src/SALOME_PY/SalomePy.cxx b/src/SALOME_PY/SalomePy.cxx
index 494692324..76e643d9f 100644
--- 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 140853bb9..70524b061 100644
--- a/src/SUPERVGraph/SUPERVGraph.cxx
+++ b/src/SUPERVGraph/SUPERVGraph.cxx
@@ -26,9 +26,9 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "SUPERVGraph.h"
 #include "SUPERVGraph_ViewFrame.h"
+using namespace std;
 
 QAD_ViewFrame* SUPERVGraph::createView(QAD_RightFrame* parent)
 {
diff --git a/src/SUPERVGraph/SUPERVGraph_ViewFrame.cxx b/src/SUPERVGraph/SUPERVGraph_ViewFrame.cxx
index 2fa21f447..2978b4b79 100644
--- a/src/SUPERVGraph/SUPERVGraph_ViewFrame.cxx
+++ b/src/SUPERVGraph/SUPERVGraph_ViewFrame.cxx
@@ -26,7 +26,6 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "SUPERVGraph_ViewFrame.h"
 
 #include "QAD_Settings.h"
@@ -40,6 +39,7 @@ using namespace std;
 //QT Include
 #include <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 8531be10f..76de080f2 100644
--- a/src/Session/SALOME_Session_QThread.cxx
+++ b/src/Session/SALOME_Session_QThread.cxx
@@ -26,7 +26,6 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include <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 026584560..3f385fae5 100644
--- 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 210c42739..ae7937d7d 100644
--- a/src/TOOLSDS/SALOMEDS_Tool.cxx
+++ b/src/TOOLSDS/SALOMEDS_Tool.cxx
@@ -1,4 +1,3 @@
-using namespace std;
 //  File      : SALOMEDS_Tool.cxx
 //  Created   : Mon Oct 21 16:24:34 2002
 //  Author    : Sergey RUIN
@@ -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 4b2f47089..7e98ad7b1 100644
--- a/src/TOOLSGUI/ToolsGUI.cxx
+++ b/src/TOOLSGUI/ToolsGUI.cxx
@@ -26,13 +26,13 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "ToolsGUI.h"
 #include "ToolsGUI_CatalogGeneratorDlg.h"
 
 #include "utilities.h"
 
 #include <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 1147a6e37..c64b14fb1 100644
--- 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 85f49d22b..0bb4fa785 100644
--- 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 f23459bc9..15d561603 100644
--- 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 a844dc7a7..989537652 100644
--- a/src/TestContainer/TestLogger.cxx
+++ b/src/TestContainer/TestLogger.cxx
@@ -26,13 +26,13 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "utilities.h"
 #include <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 d4e953d86..0dae2c1bf 100644
--- 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 07b70adfe..0b4862f14 100644
--- 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 0da127b34..c14044179 100644
--- 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 59b79a764..2ca211ac7 100644
--- 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 f7e9a3a67..a60f61d1c 100644
--- 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 c2748f6ec..82dd013f1 100644
--- 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 796028060..a0c60854e 100644
--- a/src/VTKViewer/VTKViewer.cxx
+++ b/src/VTKViewer/VTKViewer.cxx
@@ -26,9 +26,9 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "VTKViewer.h"
 #include "VTKViewer_ViewFrame.h"
+using namespace std;
 
 QAD_ViewFrame* VTKViewer::createView(QAD_RightFrame* parent)
 {
diff --git a/src/VTKViewer/VTKViewer_InteractorStyleSALOME.cxx b/src/VTKViewer/VTKViewer_InteractorStyleSALOME.cxx
index d9eb3a75c..1d6eb120a 100644
--- 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 3ae42c55b..50bdc3a69 100644
--- a/src/VTKViewer/VTKViewer_RenderWindow.cxx
+++ b/src/VTKViewer/VTKViewer_RenderWindow.cxx
@@ -26,7 +26,6 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "VTKViewer_RenderWindow.h"
 #include "utilities.h"
 #include "QAD_Settings.h"
@@ -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 6d049b67e..489b29841 100644
--- 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 ae35016b9..c39915d69 100644
--- 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