diff --git a/GEOM_version.h.in b/GEOM_version.h.in
index 4924a56c0..ce1af35af 100644
--- a/GEOM_version.h.in
+++ b/GEOM_version.h.in
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/Makefile.am b/Makefile.am
index 7be7f126e..863140fa7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/adm_local/Makefile.am b/adm_local/Makefile.am
index 2bc4a55b3..6d9ac170c 100644
--- a/adm_local/Makefile.am
+++ b/adm_local/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/adm_local/cmake_files/FindGEOM.cmake b/adm_local/cmake_files/FindGEOM.cmake
index d7226be7f..6703e076a 100644
--- a/adm_local/cmake_files/FindGEOM.cmake
+++ b/adm_local/cmake_files/FindGEOM.cmake
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/adm_local/cmake_files/Makefile.am b/adm_local/cmake_files/Makefile.am
index 0feb42409..3135a765d 100644
--- a/adm_local/cmake_files/Makefile.am
+++ b/adm_local/cmake_files/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/adm_local/unix/Makefile.am b/adm_local/unix/Makefile.am
index 8451478b1..0d5ee76b8 100644
--- a/adm_local/unix/Makefile.am
+++ b/adm_local/unix/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/adm_local/unix/config_files/Makefile.am b/adm_local/unix/config_files/Makefile.am
index b2687da74..7a5c9953e 100644
--- a/adm_local/unix/config_files/Makefile.am
+++ b/adm_local/unix/config_files/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/adm_local/unix/config_files/check_GEOM.m4 b/adm_local/unix/config_files/check_GEOM.m4
index b29c1759b..eeb81bb79 100644
--- a/adm_local/unix/config_files/check_GEOM.m4
+++ b/adm_local/unix/config_files/check_GEOM.m4
@@ -1,4 +1,4 @@
-dnl Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+dnl Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 dnl
 dnl Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/adm_local/unix/config_files/check_GUI.m4 b/adm_local/unix/config_files/check_GUI.m4
index 5f0453650..de8c71769 100755
--- a/adm_local/unix/config_files/check_GUI.m4
+++ b/adm_local/unix/config_files/check_GUI.m4
@@ -1,4 +1,4 @@
-dnl Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+dnl Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 dnl
 dnl This library is free software; you can redistribute it and/or
 dnl modify it under the terms of the GNU Lesser General Public
diff --git a/adm_local/unix/config_files/check_OpenCV.m4 b/adm_local/unix/config_files/check_OpenCV.m4
index dd91380e6..84ee1c7fc 100644
--- a/adm_local/unix/config_files/check_OpenCV.m4
+++ b/adm_local/unix/config_files/check_OpenCV.m4
@@ -1,4 +1,4 @@
-dnl Copyright (C) 2007-2011  CEA/DEN, EDF R&D
+dnl Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 dnl
 dnl This library is free software; you can redistribute it and/or
 dnl modify it under the terms of the GNU Lesser General Public
diff --git a/adm_local/unix/make_common_starter.am b/adm_local/unix/make_common_starter.am
index 77936ec88..4f70a7077 100644
--- a/adm_local/unix/make_common_starter.am
+++ b/adm_local/unix/make_common_starter.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/bin/Makefile.am b/bin/Makefile.am
index d5745d16c..95a26d150 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/bin/addvars2notebook_GEOM.py b/bin/addvars2notebook_GEOM.py
index 96224ce66..76bc4a012 100644
--- a/bin/addvars2notebook_GEOM.py
+++ b/bin/addvars2notebook_GEOM.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/bin/geom_setenv.py b/bin/geom_setenv.py
index 581423673..dfe3ecab1 100644
--- a/bin/geom_setenv.py
+++ b/bin/geom_setenv.py
@@ -1,6 +1,6 @@
 #! /usr/bin/env python
 #  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/build_cmake b/build_cmake
index 209964f6e..83f78035a 100755
--- a/build_cmake
+++ b/build_cmake
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/build_cmake.bat b/build_cmake.bat
index 495ad5379..0829ab1f1 100644
--- a/build_cmake.bat
+++ b/build_cmake.bat
@@ -1,4 +1,4 @@
-@REM Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+@REM Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 @REM
 @REM This library is free software; you can redistribute it and/or
 @REM modify it under the terms of the GNU Lesser General Public
diff --git a/build_configure b/build_configure
index 7a8f5a923..8d2bef16f 100755
--- a/build_configure
+++ b/build_configure
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/clean_configure b/clean_configure
index 5d7d8df56..6fc5b4f83 100755
--- a/clean_configure
+++ b/clean_configure
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/configure.ac b/configure.ac
index 9ef5b3c2b..dbf341425 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/doc/Makefile.am b/doc/Makefile.am
index f6dc56cf4..8f3319cec 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/doc/docutils/Makefile.am b/doc/docutils/Makefile.am
index 5d077ad62..a1dd57ced 100644
--- a/doc/docutils/Makefile.am
+++ b/doc/docutils/Makefile.am
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/doc/salome/Makefile.am b/doc/salome/Makefile.am
index 4de92c761..8bf9f392d 100644
--- a/doc/salome/Makefile.am
+++ b/doc/salome/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/doc/salome/gui/GEOM/Makefile.am b/doc/salome/gui/GEOM/Makefile.am
index c8ac4cc1a..3b96e0abd 100755
--- a/doc/salome/gui/GEOM/Makefile.am
+++ b/doc/salome/gui/GEOM/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/doc/salome/gui/GEOM/doxyfile.in b/doc/salome/gui/GEOM/doxyfile.in
index ce6b06db1..45859ef60 100755
--- a/doc/salome/gui/GEOM/doxyfile.in
+++ b/doc/salome/gui/GEOM/doxyfile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/doc/salome/gui/GEOM/doxyfile_py.in b/doc/salome/gui/GEOM/doxyfile_py.in
index 6ae7795b0..c35ee2024 100755
--- a/doc/salome/gui/GEOM/doxyfile_py.in
+++ b/doc/salome/gui/GEOM/doxyfile_py.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/doc/salome/gui/GEOM/doxyfile_tui.in b/doc/salome/gui/GEOM/doxyfile_tui.in
index 033379f57..9617a169d 100755
--- a/doc/salome/gui/GEOM/doxyfile_tui.in
+++ b/doc/salome/gui/GEOM/doxyfile_tui.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/doc/salome/gui/GEOM/static/footer.html b/doc/salome/gui/GEOM/static/footer.html
index b344790a6..4c89a2ba1 100755
--- a/doc/salome/gui/GEOM/static/footer.html
+++ b/doc/salome/gui/GEOM/static/footer.html
@@ -3,7 +3,7 @@
  </div>
  <div class="footer1">
  <div style="text-align: center;">
- Copyright &copy; 2007-2011  CEA/DEN, EDF R&amp;D, OPEN CASCADE<br>
+ Copyright &copy; 2007-2012  CEA/DEN, EDF R&amp;D, OPEN CASCADE<br>
  Copyright &copy; 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, CEDRAT, EDF R&amp;D, LEG, PRINCIPIA R&amp;D, BUREAU VERITAS<br>
  </div>
  </div>
diff --git a/doc/salome/gui/Makefile.am b/doc/salome/gui/Makefile.am
index fada74efd..03e3efc6e 100644
--- a/doc/salome/gui/Makefile.am
+++ b/doc/salome/gui/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/doc/salome/tui/Makefile.am b/doc/salome/tui/Makefile.am
index a2b5e1a66..459ea3379 100644
--- a/doc/salome/tui/Makefile.am
+++ b/doc/salome/tui/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/doc/salome/tui/doxyfile.in b/doc/salome/tui/doxyfile.in
index 23195824e..4966b4729 100755
--- a/doc/salome/tui/doxyfile.in
+++ b/doc/salome/tui/doxyfile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/doc/salome/tui/static/footer.html b/doc/salome/tui/static/footer.html
index d77ef0a32..5b030c021 100755
--- a/doc/salome/tui/static/footer.html
+++ b/doc/salome/tui/static/footer.html
@@ -6,7 +6,7 @@
 <div class="footer1">
 <!--hr style="width: 100%; height: 2px;"-->
 <div style="text-align: center;">
-Copyright &copy; 2007-2011  CEA/DEN, EDF R&amp;D, OPEN CASCADE<br>
+Copyright &copy; 2007-2012  CEA/DEN, EDF R&amp;D, OPEN CASCADE<br>
 Copyright &copy; 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, CEDRAT, EDF R&amp;D, LEG, PRINCIPIA R&amp;D, BUREAU VERITAS<br>
 </div>
 </div>
diff --git a/idl/GEOM_Gen.idl b/idl/GEOM_Gen.idl
index 9fd614d99..905b1b6c7 100644
--- a/idl/GEOM_Gen.idl
+++ b/idl/GEOM_Gen.idl
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/idl/GEOM_Superv.idl b/idl/GEOM_Superv.idl
index fa6ef3a03..7bc184a7f 100644
--- a/idl/GEOM_Superv.idl
+++ b/idl/GEOM_Superv.idl
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/idl/Makefile.am b/idl/Makefile.am
index c5140066c..f0435a3a3 100644
--- a/idl/Makefile.am
+++ b/idl/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/resources/GEOMCatalog.xml.in b/resources/GEOMCatalog.xml.in
index 9552fdae5..db645d25b 100644
--- a/resources/GEOMCatalog.xml.in
+++ b/resources/GEOMCatalog.xml.in
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='us-ascii' ?>
 <!--
-  Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+  Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 
   Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
   CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/resources/GEOM_en.xml b/resources/GEOM_en.xml
index 033ccbd86..f435c1abb 100644
--- a/resources/GEOM_en.xml
+++ b/resources/GEOM_en.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='us-ascii'?>
 <!DOCTYPE application PUBLIC "" "desktop.dtd">
 <!--
-  Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+  Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 
   Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
   CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/resources/GEOM_fr.xml b/resources/GEOM_fr.xml
index 657036015..f117d4059 100644
--- a/resources/GEOM_fr.xml
+++ b/resources/GEOM_fr.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='us-ascii'?>
 <!DOCTYPE application PUBLIC "" "desktop.dtd">
 <!--
-  Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+  Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 
   Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
   CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/resources/Makefile.am b/resources/Makefile.am
index ef1cc9fa1..35470ef58 100644
--- a/resources/Makefile.am
+++ b/resources/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -15,6 +15,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
 
 # -* Makefile *- 
 # Author : Patrick GOLDBRONN (CEA)
diff --git a/resources/SalomeApp.xml.in b/resources/SalomeApp.xml.in
index ae902aa02..5aec2f60f 100644
--- a/resources/SalomeApp.xml.in
+++ b/resources/SalomeApp.xml.in
@@ -1,5 +1,5 @@
 <!--
-  Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+  Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 
   Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
   CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/ARCHIMEDE/ARCHIMEDE.pro b/src/ARCHIMEDE/ARCHIMEDE.pro
index 9083b99a7..5e082c623 100644
--- a/src/ARCHIMEDE/ARCHIMEDE.pro
+++ b/src/ARCHIMEDE/ARCHIMEDE.pro
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/ARCHIMEDE/Archimede_VolumeSection.cxx b/src/ARCHIMEDE/Archimede_VolumeSection.cxx
index c902bd4ed..0aee99aad 100644
--- a/src/ARCHIMEDE/Archimede_VolumeSection.cxx
+++ b/src/ARCHIMEDE/Archimede_VolumeSection.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/ARCHIMEDE/Archimede_VolumeSection.hxx b/src/ARCHIMEDE/Archimede_VolumeSection.hxx
index aef12ea7d..183443788 100644
--- a/src/ARCHIMEDE/Archimede_VolumeSection.hxx
+++ b/src/ARCHIMEDE/Archimede_VolumeSection.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/ARCHIMEDE/Makefile.am b/src/ARCHIMEDE/Makefile.am
index 153053c99..84d1a3560 100644
--- a/src/ARCHIMEDE/Makefile.am
+++ b/src/ARCHIMEDE/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/AdvancedGUI/AdvancedGUI.cxx b/src/AdvancedGUI/AdvancedGUI.cxx
index 29b7a7e1f..a092ecc3a 100644
--- a/src/AdvancedGUI/AdvancedGUI.cxx
+++ b/src/AdvancedGUI/AdvancedGUI.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/AdvancedGUI/AdvancedGUI.h b/src/AdvancedGUI/AdvancedGUI.h
index 98229b30c..710bb39ff 100644
--- a/src/AdvancedGUI/AdvancedGUI.h
+++ b/src/AdvancedGUI/AdvancedGUI.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/AdvancedGUI/AdvancedGUI_PipeTShapeDlg.cxx b/src/AdvancedGUI/AdvancedGUI_PipeTShapeDlg.cxx
index 17eae604c..bbf214274 100644
--- a/src/AdvancedGUI/AdvancedGUI_PipeTShapeDlg.cxx
+++ b/src/AdvancedGUI/AdvancedGUI_PipeTShapeDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/AdvancedGUI/AdvancedGUI_PipeTShapeDlg.h b/src/AdvancedGUI/AdvancedGUI_PipeTShapeDlg.h
index ec1c18281..04147ea96 100644
--- a/src/AdvancedGUI/AdvancedGUI_PipeTShapeDlg.h
+++ b/src/AdvancedGUI/AdvancedGUI_PipeTShapeDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/AdvancedGUI/Makefile.am b/src/AdvancedGUI/Makefile.am
index 08326de25..1a1005aeb 100644
--- a/src/AdvancedGUI/Makefile.am
+++ b/src/AdvancedGUI/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/BREPExport/BREPExport.cxx b/src/BREPExport/BREPExport.cxx
index 546d544d8..6c125cac0 100644
--- a/src/BREPExport/BREPExport.cxx
+++ b/src/BREPExport/BREPExport.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/BREPExport/BREPExport.pro b/src/BREPExport/BREPExport.pro
index bc48592d2..3889afd53 100644
--- a/src/BREPExport/BREPExport.pro
+++ b/src/BREPExport/BREPExport.pro
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/BREPExport/Makefile.am b/src/BREPExport/Makefile.am
index 2a685d349..94f4ed160 100644
--- a/src/BREPExport/Makefile.am
+++ b/src/BREPExport/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/BREPImport/BREPImport.cxx b/src/BREPImport/BREPImport.cxx
index 64873bb1d..287564270 100644
--- a/src/BREPImport/BREPImport.cxx
+++ b/src/BREPImport/BREPImport.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/BREPImport/BREPImport.pro b/src/BREPImport/BREPImport.pro
index 0e9eb0633..5b0e1c45d 100644
--- a/src/BREPImport/BREPImport.pro
+++ b/src/BREPImport/BREPImport.pro
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/BREPImport/Makefile.am b/src/BREPImport/Makefile.am
index 4b046fe03..f531040e4 100644
--- a/src/BREPImport/Makefile.am
+++ b/src/BREPImport/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/BasicGUI/BasicGUI.cxx b/src/BasicGUI/BasicGUI.cxx
index 855fb75e4..10ae19e27 100644
--- a/src/BasicGUI/BasicGUI.cxx
+++ b/src/BasicGUI/BasicGUI.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/BasicGUI/BasicGUI.h b/src/BasicGUI/BasicGUI.h
index 7fbb5ec36..203eb3599 100644
--- a/src/BasicGUI/BasicGUI.h
+++ b/src/BasicGUI/BasicGUI.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/BasicGUI/BasicGUI.pro b/src/BasicGUI/BasicGUI.pro
index 39f795cb3..53dbe1114 100644
--- a/src/BasicGUI/BasicGUI.pro
+++ b/src/BasicGUI/BasicGUI.pro
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/BasicGUI/BasicGUI_ArcDlg.cxx b/src/BasicGUI/BasicGUI_ArcDlg.cxx
index 255b9f047..abbcc3910 100644
--- a/src/BasicGUI/BasicGUI_ArcDlg.cxx
+++ b/src/BasicGUI/BasicGUI_ArcDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/BasicGUI/BasicGUI_ArcDlg.h b/src/BasicGUI/BasicGUI_ArcDlg.h
index 91de212a2..31ab4d73d 100644
--- a/src/BasicGUI/BasicGUI_ArcDlg.h
+++ b/src/BasicGUI/BasicGUI_ArcDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/BasicGUI/BasicGUI_CircleDlg.cxx b/src/BasicGUI/BasicGUI_CircleDlg.cxx
index d86c5f808..b69c3660c 100644
--- a/src/BasicGUI/BasicGUI_CircleDlg.cxx
+++ b/src/BasicGUI/BasicGUI_CircleDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/BasicGUI/BasicGUI_CircleDlg.h b/src/BasicGUI/BasicGUI_CircleDlg.h
index 5dd578f3c..3e0f3e58d 100644
--- a/src/BasicGUI/BasicGUI_CircleDlg.h
+++ b/src/BasicGUI/BasicGUI_CircleDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/BasicGUI/BasicGUI_CurveDlg.cxx b/src/BasicGUI/BasicGUI_CurveDlg.cxx
index 9e0ac3bbf..c964983ae 100644
--- a/src/BasicGUI/BasicGUI_CurveDlg.cxx
+++ b/src/BasicGUI/BasicGUI_CurveDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/BasicGUI/BasicGUI_CurveDlg.h b/src/BasicGUI/BasicGUI_CurveDlg.h
index c7674db8d..ce9a6a9e7 100644
--- a/src/BasicGUI/BasicGUI_CurveDlg.h
+++ b/src/BasicGUI/BasicGUI_CurveDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/BasicGUI/BasicGUI_EllipseDlg.cxx b/src/BasicGUI/BasicGUI_EllipseDlg.cxx
index 03f2ac2db..b480b74b6 100644
--- a/src/BasicGUI/BasicGUI_EllipseDlg.cxx
+++ b/src/BasicGUI/BasicGUI_EllipseDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/BasicGUI/BasicGUI_EllipseDlg.h b/src/BasicGUI/BasicGUI_EllipseDlg.h
index c3568c3a6..303cc5348 100644
--- a/src/BasicGUI/BasicGUI_EllipseDlg.h
+++ b/src/BasicGUI/BasicGUI_EllipseDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/BasicGUI/BasicGUI_LineDlg.cxx b/src/BasicGUI/BasicGUI_LineDlg.cxx
index ed7401cdc..42895f074 100644
--- a/src/BasicGUI/BasicGUI_LineDlg.cxx
+++ b/src/BasicGUI/BasicGUI_LineDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/BasicGUI/BasicGUI_LineDlg.h b/src/BasicGUI/BasicGUI_LineDlg.h
index 16feab932..5de775ed8 100644
--- a/src/BasicGUI/BasicGUI_LineDlg.h
+++ b/src/BasicGUI/BasicGUI_LineDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/BasicGUI/BasicGUI_MarkerDlg.cxx b/src/BasicGUI/BasicGUI_MarkerDlg.cxx
index 126b86046..98c22720a 100644
--- a/src/BasicGUI/BasicGUI_MarkerDlg.cxx
+++ b/src/BasicGUI/BasicGUI_MarkerDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/BasicGUI/BasicGUI_MarkerDlg.h b/src/BasicGUI/BasicGUI_MarkerDlg.h
index 1858f387b..9219db234 100644
--- a/src/BasicGUI/BasicGUI_MarkerDlg.h
+++ b/src/BasicGUI/BasicGUI_MarkerDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/BasicGUI/BasicGUI_ParamCurveWidget.cxx b/src/BasicGUI/BasicGUI_ParamCurveWidget.cxx
index 87c5476b7..ecdbd3467 100644
--- a/src/BasicGUI/BasicGUI_ParamCurveWidget.cxx
+++ b/src/BasicGUI/BasicGUI_ParamCurveWidget.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/BasicGUI/BasicGUI_ParamCurveWidget.h b/src/BasicGUI/BasicGUI_ParamCurveWidget.h
index df2adfeaf..c941be550 100644
--- a/src/BasicGUI/BasicGUI_ParamCurveWidget.h
+++ b/src/BasicGUI/BasicGUI_ParamCurveWidget.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/BasicGUI/BasicGUI_PlaneDlg.cxx b/src/BasicGUI/BasicGUI_PlaneDlg.cxx
index 4925c472a..ec6f72235 100644
--- a/src/BasicGUI/BasicGUI_PlaneDlg.cxx
+++ b/src/BasicGUI/BasicGUI_PlaneDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/BasicGUI/BasicGUI_PlaneDlg.h b/src/BasicGUI/BasicGUI_PlaneDlg.h
index bf03cbf1b..602dbdaec 100644
--- a/src/BasicGUI/BasicGUI_PlaneDlg.h
+++ b/src/BasicGUI/BasicGUI_PlaneDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/BasicGUI/BasicGUI_PointDlg.cxx b/src/BasicGUI/BasicGUI_PointDlg.cxx
index 4f9809c7f..48682704b 100644
--- a/src/BasicGUI/BasicGUI_PointDlg.cxx
+++ b/src/BasicGUI/BasicGUI_PointDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/BasicGUI/BasicGUI_PointDlg.h b/src/BasicGUI/BasicGUI_PointDlg.h
index af1c38438..092a491b7 100644
--- a/src/BasicGUI/BasicGUI_PointDlg.h
+++ b/src/BasicGUI/BasicGUI_PointDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/BasicGUI/BasicGUI_VectorDlg.cxx b/src/BasicGUI/BasicGUI_VectorDlg.cxx
index c45c8c040..847e06c16 100644
--- a/src/BasicGUI/BasicGUI_VectorDlg.cxx
+++ b/src/BasicGUI/BasicGUI_VectorDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/BasicGUI/BasicGUI_VectorDlg.h b/src/BasicGUI/BasicGUI_VectorDlg.h
index e3326f630..0b60c6346 100644
--- a/src/BasicGUI/BasicGUI_VectorDlg.h
+++ b/src/BasicGUI/BasicGUI_VectorDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/BasicGUI/BasicGUI_WorkingPlaneDlg.cxx b/src/BasicGUI/BasicGUI_WorkingPlaneDlg.cxx
index 3cc78c619..7ea8228af 100644
--- a/src/BasicGUI/BasicGUI_WorkingPlaneDlg.cxx
+++ b/src/BasicGUI/BasicGUI_WorkingPlaneDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/BasicGUI/BasicGUI_WorkingPlaneDlg.h b/src/BasicGUI/BasicGUI_WorkingPlaneDlg.h
index ee9c21337..bc43c0151 100644
--- a/src/BasicGUI/BasicGUI_WorkingPlaneDlg.h
+++ b/src/BasicGUI/BasicGUI_WorkingPlaneDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/BasicGUI/Makefile.am b/src/BasicGUI/Makefile.am
index 5aad443b1..8c008f59f 100644
--- a/src/BasicGUI/Makefile.am
+++ b/src/BasicGUI/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/BlocksGUI/BlocksGUI.cxx b/src/BlocksGUI/BlocksGUI.cxx
index 0c9894d26..0722f01f5 100644
--- a/src/BlocksGUI/BlocksGUI.cxx
+++ b/src/BlocksGUI/BlocksGUI.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/BlocksGUI/BlocksGUI.h b/src/BlocksGUI/BlocksGUI.h
index 4a4410955..200268590 100644
--- a/src/BlocksGUI/BlocksGUI.h
+++ b/src/BlocksGUI/BlocksGUI.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/BlocksGUI/BlocksGUI_BlockDlg.cxx b/src/BlocksGUI/BlocksGUI_BlockDlg.cxx
index b26d30556..8c74aa391 100644
--- a/src/BlocksGUI/BlocksGUI_BlockDlg.cxx
+++ b/src/BlocksGUI/BlocksGUI_BlockDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/BlocksGUI/BlocksGUI_BlockDlg.h b/src/BlocksGUI/BlocksGUI_BlockDlg.h
index 352cf8189..035894f28 100644
--- a/src/BlocksGUI/BlocksGUI_BlockDlg.h
+++ b/src/BlocksGUI/BlocksGUI_BlockDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/BlocksGUI/BlocksGUI_ExplodeDlg.cxx b/src/BlocksGUI/BlocksGUI_ExplodeDlg.cxx
index 7e1cb2371..a03687eab 100644
--- a/src/BlocksGUI/BlocksGUI_ExplodeDlg.cxx
+++ b/src/BlocksGUI/BlocksGUI_ExplodeDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/BlocksGUI/BlocksGUI_ExplodeDlg.h b/src/BlocksGUI/BlocksGUI_ExplodeDlg.h
index ec4014829..6be87bef4 100644
--- a/src/BlocksGUI/BlocksGUI_ExplodeDlg.h
+++ b/src/BlocksGUI/BlocksGUI_ExplodeDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/BlocksGUI/BlocksGUI_PropagateDlg.cxx b/src/BlocksGUI/BlocksGUI_PropagateDlg.cxx
index 2470856b6..6b07b7afb 100644
--- a/src/BlocksGUI/BlocksGUI_PropagateDlg.cxx
+++ b/src/BlocksGUI/BlocksGUI_PropagateDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/BlocksGUI/BlocksGUI_PropagateDlg.h b/src/BlocksGUI/BlocksGUI_PropagateDlg.h
index 279e88c55..72d9cd64a 100644
--- a/src/BlocksGUI/BlocksGUI_PropagateDlg.h
+++ b/src/BlocksGUI/BlocksGUI_PropagateDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/BlocksGUI/BlocksGUI_QuadFaceDlg.cxx b/src/BlocksGUI/BlocksGUI_QuadFaceDlg.cxx
index ad9c1b5bb..e78e01111 100644
--- a/src/BlocksGUI/BlocksGUI_QuadFaceDlg.cxx
+++ b/src/BlocksGUI/BlocksGUI_QuadFaceDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/BlocksGUI/BlocksGUI_QuadFaceDlg.h b/src/BlocksGUI/BlocksGUI_QuadFaceDlg.h
index 4595feb4e..0375551df 100644
--- a/src/BlocksGUI/BlocksGUI_QuadFaceDlg.h
+++ b/src/BlocksGUI/BlocksGUI_QuadFaceDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/BlocksGUI/BlocksGUI_TrsfDlg.cxx b/src/BlocksGUI/BlocksGUI_TrsfDlg.cxx
index 3af221a76..9ba4e363d 100644
--- a/src/BlocksGUI/BlocksGUI_TrsfDlg.cxx
+++ b/src/BlocksGUI/BlocksGUI_TrsfDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/BlocksGUI/BlocksGUI_TrsfDlg.h b/src/BlocksGUI/BlocksGUI_TrsfDlg.h
index 047688cd9..605b2a07e 100644
--- a/src/BlocksGUI/BlocksGUI_TrsfDlg.h
+++ b/src/BlocksGUI/BlocksGUI_TrsfDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/BlocksGUI/Makefile.am b/src/BlocksGUI/Makefile.am
index 46d7379bd..864a6c8b9 100644
--- a/src/BlocksGUI/Makefile.am
+++ b/src/BlocksGUI/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/BooleanGUI/BooleanGUI.cxx b/src/BooleanGUI/BooleanGUI.cxx
index 17dfcec71..5db2a56a9 100644
--- a/src/BooleanGUI/BooleanGUI.cxx
+++ b/src/BooleanGUI/BooleanGUI.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/BooleanGUI/BooleanGUI.h b/src/BooleanGUI/BooleanGUI.h
index c2e151aef..4bd9f53bf 100644
--- a/src/BooleanGUI/BooleanGUI.h
+++ b/src/BooleanGUI/BooleanGUI.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/BooleanGUI/BooleanGUI.pro b/src/BooleanGUI/BooleanGUI.pro
index 3bc888206..58e04375d 100644
--- a/src/BooleanGUI/BooleanGUI.pro
+++ b/src/BooleanGUI/BooleanGUI.pro
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/BooleanGUI/BooleanGUI_Dialog.cxx b/src/BooleanGUI/BooleanGUI_Dialog.cxx
index 5c87f3c01..a72aba04a 100644
--- a/src/BooleanGUI/BooleanGUI_Dialog.cxx
+++ b/src/BooleanGUI/BooleanGUI_Dialog.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/BooleanGUI/BooleanGUI_Dialog.h b/src/BooleanGUI/BooleanGUI_Dialog.h
index 31767c2d2..d51d4250e 100644
--- a/src/BooleanGUI/BooleanGUI_Dialog.h
+++ b/src/BooleanGUI/BooleanGUI_Dialog.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/BooleanGUI/Makefile.am b/src/BooleanGUI/Makefile.am
index c400ca83c..45ffc15e5 100644
--- a/src/BooleanGUI/Makefile.am
+++ b/src/BooleanGUI/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/BuildGUI/BuildGUI.cxx b/src/BuildGUI/BuildGUI.cxx
index c28fddd4b..9964b2428 100644
--- a/src/BuildGUI/BuildGUI.cxx
+++ b/src/BuildGUI/BuildGUI.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/BuildGUI/BuildGUI.h b/src/BuildGUI/BuildGUI.h
index 183e036c1..5cbaaf3b1 100644
--- a/src/BuildGUI/BuildGUI.h
+++ b/src/BuildGUI/BuildGUI.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/BuildGUI/BuildGUI.pro b/src/BuildGUI/BuildGUI.pro
index 40d9ae247..34d26efe4 100644
--- a/src/BuildGUI/BuildGUI.pro
+++ b/src/BuildGUI/BuildGUI.pro
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/BuildGUI/BuildGUI_CompoundDlg.cxx b/src/BuildGUI/BuildGUI_CompoundDlg.cxx
index 62427ac23..b604e63c1 100644
--- a/src/BuildGUI/BuildGUI_CompoundDlg.cxx
+++ b/src/BuildGUI/BuildGUI_CompoundDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/BuildGUI/BuildGUI_CompoundDlg.h b/src/BuildGUI/BuildGUI_CompoundDlg.h
index 133c8d837..8ab58a83f 100644
--- a/src/BuildGUI/BuildGUI_CompoundDlg.h
+++ b/src/BuildGUI/BuildGUI_CompoundDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/BuildGUI/BuildGUI_EdgeDlg.cxx b/src/BuildGUI/BuildGUI_EdgeDlg.cxx
index f6c9f3d62..7f596761b 100644
--- a/src/BuildGUI/BuildGUI_EdgeDlg.cxx
+++ b/src/BuildGUI/BuildGUI_EdgeDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/BuildGUI/BuildGUI_EdgeDlg.h b/src/BuildGUI/BuildGUI_EdgeDlg.h
index 7f8244d50..c0f955079 100644
--- a/src/BuildGUI/BuildGUI_EdgeDlg.h
+++ b/src/BuildGUI/BuildGUI_EdgeDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/BuildGUI/BuildGUI_FaceDlg.cxx b/src/BuildGUI/BuildGUI_FaceDlg.cxx
index c1561405b..72bf40bbf 100644
--- a/src/BuildGUI/BuildGUI_FaceDlg.cxx
+++ b/src/BuildGUI/BuildGUI_FaceDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // GEOM GEOMGUI : GUI for Geometry component
 // File   : BuildGUI_FaceDlg.cxx
diff --git a/src/BuildGUI/BuildGUI_FaceDlg.h b/src/BuildGUI/BuildGUI_FaceDlg.h
index 1cd1c05a7..f0ca76acd 100644
--- a/src/BuildGUI/BuildGUI_FaceDlg.h
+++ b/src/BuildGUI/BuildGUI_FaceDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/BuildGUI/BuildGUI_ShellDlg.cxx b/src/BuildGUI/BuildGUI_ShellDlg.cxx
index 073b9ceb4..6555f45b9 100644
--- a/src/BuildGUI/BuildGUI_ShellDlg.cxx
+++ b/src/BuildGUI/BuildGUI_ShellDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/BuildGUI/BuildGUI_ShellDlg.h b/src/BuildGUI/BuildGUI_ShellDlg.h
index 54f6099b5..e7814d38e 100644
--- a/src/BuildGUI/BuildGUI_ShellDlg.h
+++ b/src/BuildGUI/BuildGUI_ShellDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/BuildGUI/BuildGUI_SolidDlg.cxx b/src/BuildGUI/BuildGUI_SolidDlg.cxx
index 995faf671..fcd5307ea 100644
--- a/src/BuildGUI/BuildGUI_SolidDlg.cxx
+++ b/src/BuildGUI/BuildGUI_SolidDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/BuildGUI/BuildGUI_SolidDlg.h b/src/BuildGUI/BuildGUI_SolidDlg.h
index 05f8da944..dda578c38 100644
--- a/src/BuildGUI/BuildGUI_SolidDlg.h
+++ b/src/BuildGUI/BuildGUI_SolidDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/BuildGUI/BuildGUI_WireDlg.cxx b/src/BuildGUI/BuildGUI_WireDlg.cxx
index 33a9541ff..89c18a189 100644
--- a/src/BuildGUI/BuildGUI_WireDlg.cxx
+++ b/src/BuildGUI/BuildGUI_WireDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/BuildGUI/BuildGUI_WireDlg.h b/src/BuildGUI/BuildGUI_WireDlg.h
index 1bbad4c19..2b5521ab2 100644
--- a/src/BuildGUI/BuildGUI_WireDlg.h
+++ b/src/BuildGUI/BuildGUI_WireDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/BuildGUI/Makefile.am b/src/BuildGUI/Makefile.am
index 9cfaa90d5..ad254d831 100644
--- a/src/BuildGUI/Makefile.am
+++ b/src/BuildGUI/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/DisplayGUI/DisplayGUI.cxx b/src/DisplayGUI/DisplayGUI.cxx
index c7f5df89c..6badd1c08 100644
--- a/src/DisplayGUI/DisplayGUI.cxx
+++ b/src/DisplayGUI/DisplayGUI.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/DisplayGUI/DisplayGUI.h b/src/DisplayGUI/DisplayGUI.h
index 2c362d607..df1c1826d 100644
--- a/src/DisplayGUI/DisplayGUI.h
+++ b/src/DisplayGUI/DisplayGUI.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/DisplayGUI/DisplayGUI.pro b/src/DisplayGUI/DisplayGUI.pro
index dfbeb2f8d..b3f444ea0 100644
--- a/src/DisplayGUI/DisplayGUI.pro
+++ b/src/DisplayGUI/DisplayGUI.pro
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/DisplayGUI/Makefile.am b/src/DisplayGUI/Makefile.am
index 05c10b299..a361cdb10 100644
--- a/src/DisplayGUI/Makefile.am
+++ b/src/DisplayGUI/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/DlgRef/DlgRef.cxx b/src/DlgRef/DlgRef.cxx
index a9aa9286b..164f483b4 100644
--- a/src/DlgRef/DlgRef.cxx
+++ b/src/DlgRef/DlgRef.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/DlgRef/DlgRef.h b/src/DlgRef/DlgRef.h
index fc324f56b..bda6da5b5 100644
--- a/src/DlgRef/DlgRef.h
+++ b/src/DlgRef/DlgRef.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/DlgRef/DlgRef.pro b/src/DlgRef/DlgRef.pro
index b75774a0c..3445991d2 100644
--- a/src/DlgRef/DlgRef.pro
+++ b/src/DlgRef/DlgRef.pro
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/DlgRef/Makefile.am b/src/DlgRef/Makefile.am
index b66ba8cc2..deaa27026 100644
--- a/src/DlgRef/Makefile.am
+++ b/src/DlgRef/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/EntityGUI/EntityGUI.cxx b/src/EntityGUI/EntityGUI.cxx
index f7ed8a04c..eded6c0c9 100644
--- a/src/EntityGUI/EntityGUI.cxx
+++ b/src/EntityGUI/EntityGUI.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/EntityGUI/EntityGUI.h b/src/EntityGUI/EntityGUI.h
index 981f6ca1f..7ab56f090 100644
--- a/src/EntityGUI/EntityGUI.h
+++ b/src/EntityGUI/EntityGUI.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/EntityGUI/EntityGUI.pro b/src/EntityGUI/EntityGUI.pro
index fd2281889..54c110c87 100644
--- a/src/EntityGUI/EntityGUI.pro
+++ b/src/EntityGUI/EntityGUI.pro
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/EntityGUI/EntityGUI_3DSketcherDlg.cxx b/src/EntityGUI/EntityGUI_3DSketcherDlg.cxx
index fd4ff4c53..bc35ffad1 100755
--- a/src/EntityGUI/EntityGUI_3DSketcherDlg.cxx
+++ b/src/EntityGUI/EntityGUI_3DSketcherDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/EntityGUI/EntityGUI_3DSketcherDlg.h b/src/EntityGUI/EntityGUI_3DSketcherDlg.h
index bb64042c3..b4969bbda 100755
--- a/src/EntityGUI/EntityGUI_3DSketcherDlg.h
+++ b/src/EntityGUI/EntityGUI_3DSketcherDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/EntityGUI/EntityGUI_FeatureDetectorDlg.cxx b/src/EntityGUI/EntityGUI_FeatureDetectorDlg.cxx
index f6e3184d9..e5d83b8de 100644
--- a/src/EntityGUI/EntityGUI_FeatureDetectorDlg.cxx
+++ b/src/EntityGUI/EntityGUI_FeatureDetectorDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/EntityGUI/EntityGUI_FeatureDetectorDlg.h b/src/EntityGUI/EntityGUI_FeatureDetectorDlg.h
index d9bd8cd96..2595142b9 100644
--- a/src/EntityGUI/EntityGUI_FeatureDetectorDlg.h
+++ b/src/EntityGUI/EntityGUI_FeatureDetectorDlg.h
@@ -1,3 +1,8 @@
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
diff --git a/src/EntityGUI/EntityGUI_PictureImportDlg.cxx b/src/EntityGUI/EntityGUI_PictureImportDlg.cxx
index eda7d1d77..e71aa1075 100644
--- a/src/EntityGUI/EntityGUI_PictureImportDlg.cxx
+++ b/src/EntityGUI/EntityGUI_PictureImportDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/EntityGUI/EntityGUI_PictureImportDlg.h b/src/EntityGUI/EntityGUI_PictureImportDlg.h
index 74c2c32af..4fc9fb09b 100644
--- a/src/EntityGUI/EntityGUI_PictureImportDlg.h
+++ b/src/EntityGUI/EntityGUI_PictureImportDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/EntityGUI/EntityGUI_SketcherDlg.cxx b/src/EntityGUI/EntityGUI_SketcherDlg.cxx
index 0cc9f7aa8..e9c2eb27b 100644
--- a/src/EntityGUI/EntityGUI_SketcherDlg.cxx
+++ b/src/EntityGUI/EntityGUI_SketcherDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/EntityGUI/EntityGUI_SketcherDlg.h b/src/EntityGUI/EntityGUI_SketcherDlg.h
index 0d4f0d324..d8bed62f3 100644
--- a/src/EntityGUI/EntityGUI_SketcherDlg.h
+++ b/src/EntityGUI/EntityGUI_SketcherDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/EntityGUI/EntityGUI_SubShapeDlg.cxx b/src/EntityGUI/EntityGUI_SubShapeDlg.cxx
index 33b15d982..46f13f672 100644
--- a/src/EntityGUI/EntityGUI_SubShapeDlg.cxx
+++ b/src/EntityGUI/EntityGUI_SubShapeDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // GEOM GEOMGUI : GUI for Geometry component
 // File   : EntityGUI_SubShapeDlg.cxx
diff --git a/src/EntityGUI/EntityGUI_SubShapeDlg.h b/src/EntityGUI/EntityGUI_SubShapeDlg.h
index 7ac5e8b75..d9bf30a3f 100644
--- a/src/EntityGUI/EntityGUI_SubShapeDlg.h
+++ b/src/EntityGUI/EntityGUI_SubShapeDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/EntityGUI/EntityGUI_Widgets.cxx b/src/EntityGUI/EntityGUI_Widgets.cxx
index 90ac44121..5416df1be 100644
--- a/src/EntityGUI/EntityGUI_Widgets.cxx
+++ b/src/EntityGUI/EntityGUI_Widgets.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/EntityGUI/EntityGUI_Widgets.h b/src/EntityGUI/EntityGUI_Widgets.h
index 8cfbc15f7..c7a37cf13 100644
--- a/src/EntityGUI/EntityGUI_Widgets.h
+++ b/src/EntityGUI/EntityGUI_Widgets.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/EntityGUI/Makefile.am b/src/EntityGUI/Makefile.am
index 6d588edfb..f6671ee65 100644
--- a/src/EntityGUI/Makefile.am
+++ b/src/EntityGUI/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOM/GEOM.pro b/src/GEOM/GEOM.pro
index 26b09afce..76191e98b 100644
--- a/src/GEOM/GEOM.pro
+++ b/src/GEOM/GEOM.pro
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOM/GEOM_Application.cxx b/src/GEOM/GEOM_Application.cxx
index 1b0c884c5..ab56603f6 100644
--- a/src/GEOM/GEOM_Application.cxx
+++ b/src/GEOM/GEOM_Application.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM/GEOM_Application.hxx b/src/GEOM/GEOM_Application.hxx
index aa28a22c9..079d9dca3 100644
--- a/src/GEOM/GEOM_Application.hxx
+++ b/src/GEOM/GEOM_Application.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM/GEOM_Application.ixx b/src/GEOM/GEOM_Application.ixx
index 7e58a0573..4e27bad7c 100644
--- a/src/GEOM/GEOM_Application.ixx
+++ b/src/GEOM/GEOM_Application.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM/GEOM_Application.jxx b/src/GEOM/GEOM_Application.jxx
index d8e4ef2bf..30bce69d1 100644
--- a/src/GEOM/GEOM_Application.jxx
+++ b/src/GEOM/GEOM_Application.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM/GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient.hxx b/src/GEOM/GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient.hxx
index 810b11d2a..963dd1bd0 100644
--- a/src/GEOM/GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient.hxx
+++ b/src/GEOM/GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM/GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient_0.cxx b/src/GEOM/GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient_0.cxx
index 65742a81e..31390b070 100644
--- a/src/GEOM/GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient_0.cxx
+++ b/src/GEOM/GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM/GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx b/src/GEOM/GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx
index 4b26cefd9..011dc9fbc 100644
--- a/src/GEOM/GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx
+++ b/src/GEOM/GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM/GEOM_DataMapNodeOfDataMapOfAsciiStringTransient_0.cxx b/src/GEOM/GEOM_DataMapNodeOfDataMapOfAsciiStringTransient_0.cxx
index 4a6e65b51..ecd72b16f 100644
--- a/src/GEOM/GEOM_DataMapNodeOfDataMapOfAsciiStringTransient_0.cxx
+++ b/src/GEOM/GEOM_DataMapNodeOfDataMapOfAsciiStringTransient_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM/GEOM_DataMapOfAsciiStringTransient.hxx b/src/GEOM/GEOM_DataMapOfAsciiStringTransient.hxx
index 8f5472dd2..c2a3e3ce3 100644
--- a/src/GEOM/GEOM_DataMapOfAsciiStringTransient.hxx
+++ b/src/GEOM/GEOM_DataMapOfAsciiStringTransient.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _GEOM_DataMapOfAsciiStringTransient_HeaderFile
 #define _GEOM_DataMapOfAsciiStringTransient_HeaderFile
diff --git a/src/GEOM/GEOM_DataMapOfAsciiStringTransient_0.cxx b/src/GEOM/GEOM_DataMapOfAsciiStringTransient_0.cxx
index 33a35bf3d..d83dfa587 100644
--- a/src/GEOM/GEOM_DataMapOfAsciiStringTransient_0.cxx
+++ b/src/GEOM/GEOM_DataMapOfAsciiStringTransient_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM/GEOM_Engine.cxx b/src/GEOM/GEOM_Engine.cxx
index 28393c39b..40ac1d97c 100644
--- a/src/GEOM/GEOM_Engine.cxx
+++ b/src/GEOM/GEOM_Engine.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifdef WNT
 #pragma warning( disable:4786 )
diff --git a/src/GEOM/GEOM_Engine.hxx b/src/GEOM/GEOM_Engine.hxx
index 5ff84364f..4ae37dfec 100644
--- a/src/GEOM/GEOM_Engine.hxx
+++ b/src/GEOM/GEOM_Engine.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _GEOM_Engine_HXX_
 #define _GEOM_Engine_HXX_
diff --git a/src/GEOM/GEOM_Function.cxx b/src/GEOM/GEOM_Function.cxx
index 09820f40b..0ed23645e 100644
--- a/src/GEOM/GEOM_Function.cxx
+++ b/src/GEOM/GEOM_Function.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include <Standard_Stream.hxx>
 
diff --git a/src/GEOM/GEOM_Function.hxx b/src/GEOM/GEOM_Function.hxx
index d1f6b0e1b..4aed35221 100644
--- a/src/GEOM/GEOM_Function.hxx
+++ b/src/GEOM/GEOM_Function.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM/GEOM_IOperations.cxx b/src/GEOM/GEOM_IOperations.cxx
index 363cba85d..d7a381c16 100644
--- a/src/GEOM/GEOM_IOperations.cxx
+++ b/src/GEOM/GEOM_IOperations.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM/GEOM_IOperations.hxx b/src/GEOM/GEOM_IOperations.hxx
index d9d35f82f..14363f4cf 100644
--- a/src/GEOM/GEOM_IOperations.hxx
+++ b/src/GEOM/GEOM_IOperations.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM/GEOM_ISubShape.hxx b/src/GEOM/GEOM_ISubShape.hxx
index d81f7bd94..fe6996741 100644
--- a/src/GEOM/GEOM_ISubShape.hxx
+++ b/src/GEOM/GEOM_ISubShape.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM/GEOM_Object.cxx b/src/GEOM/GEOM_Object.cxx
index 604543026..19c7b7ebb 100644
--- a/src/GEOM/GEOM_Object.cxx
+++ b/src/GEOM/GEOM_Object.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM/GEOM_Object.hxx b/src/GEOM/GEOM_Object.hxx
index 6a4dd55fb..dbb10717f 100644
--- a/src/GEOM/GEOM_Object.hxx
+++ b/src/GEOM/GEOM_Object.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM/GEOM_PythonDump.cxx b/src/GEOM/GEOM_PythonDump.cxx
index eec356204..97eae0cef 100644
--- a/src/GEOM/GEOM_PythonDump.cxx
+++ b/src/GEOM/GEOM_PythonDump.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM/GEOM_PythonDump.hxx b/src/GEOM/GEOM_PythonDump.hxx
index b5baa1e09..b9b83a7ea 100644
--- a/src/GEOM/GEOM_PythonDump.hxx
+++ b/src/GEOM/GEOM_PythonDump.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM/GEOM_Solver.cxx b/src/GEOM/GEOM_Solver.cxx
index c9d28c728..81e97403b 100644
--- a/src/GEOM/GEOM_Solver.cxx
+++ b/src/GEOM/GEOM_Solver.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM/GEOM_Solver.hxx b/src/GEOM/GEOM_Solver.hxx
index cc75983cd..fc3d6caeb 100644
--- a/src/GEOM/GEOM_Solver.hxx
+++ b/src/GEOM/GEOM_Solver.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM/GEOM_SubShapeDriver.cxx b/src/GEOM/GEOM_SubShapeDriver.cxx
index c9b207f1f..fa2d4cdca 100644
--- a/src/GEOM/GEOM_SubShapeDriver.cxx
+++ b/src/GEOM/GEOM_SubShapeDriver.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM/GEOM_SubShapeDriver.hxx b/src/GEOM/GEOM_SubShapeDriver.hxx
index b5674f5ff..f5646b839 100644
--- a/src/GEOM/GEOM_SubShapeDriver.hxx
+++ b/src/GEOM/GEOM_SubShapeDriver.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM/Handle_GEOM_Application.hxx b/src/GEOM/Handle_GEOM_Application.hxx
index a88ae61f2..7a3b00bcc 100644
--- a/src/GEOM/Handle_GEOM_Application.hxx
+++ b/src/GEOM/Handle_GEOM_Application.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM/Handle_GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx b/src/GEOM/Handle_GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx
index 69bc41ce2..74e7f3d12 100644
--- a/src/GEOM/Handle_GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx
+++ b/src/GEOM/Handle_GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM/Makefile.am b/src/GEOM/Makefile.am
index a3924d8ad..7c4f64c4e 100644
--- a/src/GEOM/Makefile.am
+++ b/src/GEOM/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -15,6 +15,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
 
 #  File   : Makefile.in
 #  Author : Damien COQUERET (OCC)
diff --git a/src/GEOMAlgo/BlockFix.cdl b/src/GEOMAlgo/BlockFix.cdl
index 478685c9c..f37324564 100644
--- a/src/GEOMAlgo/BlockFix.cdl
+++ b/src/GEOMAlgo/BlockFix.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 -- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/BlockFix.cxx b/src/GEOMAlgo/BlockFix.cxx
index ef9ca5578..961ec9ecf 100644
--- a/src/GEOMAlgo/BlockFix.cxx
+++ b/src/GEOMAlgo/BlockFix.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/BlockFix.hxx b/src/GEOMAlgo/BlockFix.hxx
index 3bd612070..3d38d4de2 100644
--- a/src/GEOMAlgo/BlockFix.hxx
+++ b/src/GEOMAlgo/BlockFix.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/BlockFix.ixx b/src/GEOMAlgo/BlockFix.ixx
index 05477e7e1..b1764fbb2 100644
--- a/src/GEOMAlgo/BlockFix.ixx
+++ b/src/GEOMAlgo/BlockFix.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/BlockFix.jxx b/src/GEOMAlgo/BlockFix.jxx
index 1cc0d609d..8649f8895 100644
--- a/src/GEOMAlgo/BlockFix.jxx
+++ b/src/GEOMAlgo/BlockFix.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/BlockFix_BlockFixAPI.cdl b/src/GEOMAlgo/BlockFix_BlockFixAPI.cdl
index 85dd360e2..0403538dc 100644
--- a/src/GEOMAlgo/BlockFix_BlockFixAPI.cdl
+++ b/src/GEOMAlgo/BlockFix_BlockFixAPI.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 -- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/BlockFix_BlockFixAPI.cxx b/src/GEOMAlgo/BlockFix_BlockFixAPI.cxx
index 21281eefd..2aefa654e 100644
--- a/src/GEOMAlgo/BlockFix_BlockFixAPI.cxx
+++ b/src/GEOMAlgo/BlockFix_BlockFixAPI.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/BlockFix_BlockFixAPI.hxx b/src/GEOMAlgo/BlockFix_BlockFixAPI.hxx
index 9100b6dac..e29a48c98 100644
--- a/src/GEOMAlgo/BlockFix_BlockFixAPI.hxx
+++ b/src/GEOMAlgo/BlockFix_BlockFixAPI.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/BlockFix_BlockFixAPI.ixx b/src/GEOMAlgo/BlockFix_BlockFixAPI.ixx
index 55c205dc1..92d411ad5 100644
--- a/src/GEOMAlgo/BlockFix_BlockFixAPI.ixx
+++ b/src/GEOMAlgo/BlockFix_BlockFixAPI.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/BlockFix_BlockFixAPI.jxx b/src/GEOMAlgo/BlockFix_BlockFixAPI.jxx
index 81f42ef35..945a6ed88 100644
--- a/src/GEOMAlgo/BlockFix_BlockFixAPI.jxx
+++ b/src/GEOMAlgo/BlockFix_BlockFixAPI.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/BlockFix_BlockFixAPI.lxx b/src/GEOMAlgo/BlockFix_BlockFixAPI.lxx
index 6184d5aca..1cbe8b2b4 100644
--- a/src/GEOMAlgo/BlockFix_BlockFixAPI.lxx
+++ b/src/GEOMAlgo/BlockFix_BlockFixAPI.lxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/BlockFix_CheckTool.cdl b/src/GEOMAlgo/BlockFix_CheckTool.cdl
index dce838ad3..dd6671e1f 100644
--- a/src/GEOMAlgo/BlockFix_CheckTool.cdl
+++ b/src/GEOMAlgo/BlockFix_CheckTool.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 -- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/BlockFix_CheckTool.cxx b/src/GEOMAlgo/BlockFix_CheckTool.cxx
index b936d9d4a..fb9b45c6a 100644
--- a/src/GEOMAlgo/BlockFix_CheckTool.cxx
+++ b/src/GEOMAlgo/BlockFix_CheckTool.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/BlockFix_CheckTool.hxx b/src/GEOMAlgo/BlockFix_CheckTool.hxx
index 884309297..b72150690 100644
--- a/src/GEOMAlgo/BlockFix_CheckTool.hxx
+++ b/src/GEOMAlgo/BlockFix_CheckTool.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/BlockFix_CheckTool.ixx b/src/GEOMAlgo/BlockFix_CheckTool.ixx
index 06c110b1d..7a65aa831 100644
--- a/src/GEOMAlgo/BlockFix_CheckTool.ixx
+++ b/src/GEOMAlgo/BlockFix_CheckTool.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/BlockFix_CheckTool.jxx b/src/GEOMAlgo/BlockFix_CheckTool.jxx
index ba5c9672d..7574af057 100644
--- a/src/GEOMAlgo/BlockFix_CheckTool.jxx
+++ b/src/GEOMAlgo/BlockFix_CheckTool.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/BlockFix_PeriodicSurfaceModifier.cdl b/src/GEOMAlgo/BlockFix_PeriodicSurfaceModifier.cdl
index b654d6182..998b04d10 100644
--- a/src/GEOMAlgo/BlockFix_PeriodicSurfaceModifier.cdl
+++ b/src/GEOMAlgo/BlockFix_PeriodicSurfaceModifier.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 -- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/BlockFix_PeriodicSurfaceModifier.cxx b/src/GEOMAlgo/BlockFix_PeriodicSurfaceModifier.cxx
index 2d001d179..fa599739c 100644
--- a/src/GEOMAlgo/BlockFix_PeriodicSurfaceModifier.cxx
+++ b/src/GEOMAlgo/BlockFix_PeriodicSurfaceModifier.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File:      BlockFix_PeriodicSurfaceModifier.cxx
 // Created:   15.12.04 10:08:50
diff --git a/src/GEOMAlgo/BlockFix_PeriodicSurfaceModifier.hxx b/src/GEOMAlgo/BlockFix_PeriodicSurfaceModifier.hxx
index 78973d0f3..0185514f4 100644
--- a/src/GEOMAlgo/BlockFix_PeriodicSurfaceModifier.hxx
+++ b/src/GEOMAlgo/BlockFix_PeriodicSurfaceModifier.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/BlockFix_PeriodicSurfaceModifier.ixx b/src/GEOMAlgo/BlockFix_PeriodicSurfaceModifier.ixx
index 8625b1650..84ec7526b 100644
--- a/src/GEOMAlgo/BlockFix_PeriodicSurfaceModifier.ixx
+++ b/src/GEOMAlgo/BlockFix_PeriodicSurfaceModifier.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/BlockFix_PeriodicSurfaceModifier.jxx b/src/GEOMAlgo/BlockFix_PeriodicSurfaceModifier.jxx
index 3ceaab7d2..29c1c1e34 100644
--- a/src/GEOMAlgo/BlockFix_PeriodicSurfaceModifier.jxx
+++ b/src/GEOMAlgo/BlockFix_PeriodicSurfaceModifier.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/BlockFix_SphereSpaceModifier.cdl b/src/GEOMAlgo/BlockFix_SphereSpaceModifier.cdl
index 69e4cd9ec..d6cf9b7cc 100644
--- a/src/GEOMAlgo/BlockFix_SphereSpaceModifier.cdl
+++ b/src/GEOMAlgo/BlockFix_SphereSpaceModifier.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 -- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/BlockFix_SphereSpaceModifier.cxx b/src/GEOMAlgo/BlockFix_SphereSpaceModifier.cxx
index 570e3921f..fd4c14986 100644
--- a/src/GEOMAlgo/BlockFix_SphereSpaceModifier.cxx
+++ b/src/GEOMAlgo/BlockFix_SphereSpaceModifier.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File:        BlockFix.cxx
 // Created:     Tue Dec  7 11:59:05 2004
diff --git a/src/GEOMAlgo/BlockFix_SphereSpaceModifier.hxx b/src/GEOMAlgo/BlockFix_SphereSpaceModifier.hxx
index bd9871e0a..b4c5f64a7 100644
--- a/src/GEOMAlgo/BlockFix_SphereSpaceModifier.hxx
+++ b/src/GEOMAlgo/BlockFix_SphereSpaceModifier.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/BlockFix_SphereSpaceModifier.ixx b/src/GEOMAlgo/BlockFix_SphereSpaceModifier.ixx
index f756d7280..78813f922 100644
--- a/src/GEOMAlgo/BlockFix_SphereSpaceModifier.ixx
+++ b/src/GEOMAlgo/BlockFix_SphereSpaceModifier.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/BlockFix_SphereSpaceModifier.jxx b/src/GEOMAlgo/BlockFix_SphereSpaceModifier.jxx
index 413af0805..050734179 100644
--- a/src/GEOMAlgo/BlockFix_SphereSpaceModifier.jxx
+++ b/src/GEOMAlgo/BlockFix_SphereSpaceModifier.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/BlockFix_UnionEdges.cdl b/src/GEOMAlgo/BlockFix_UnionEdges.cdl
index 6e9d3bcc1..60ba8fef0 100644
--- a/src/GEOMAlgo/BlockFix_UnionEdges.cdl
+++ b/src/GEOMAlgo/BlockFix_UnionEdges.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 -- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/BlockFix_UnionEdges.cxx b/src/GEOMAlgo/BlockFix_UnionEdges.cxx
index 68bc3a92a..f5be58454 100644
--- a/src/GEOMAlgo/BlockFix_UnionEdges.cxx
+++ b/src/GEOMAlgo/BlockFix_UnionEdges.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File:      BlockFix_UnionEdges.cxx
 // Created:   07.12.04 15:27:30
diff --git a/src/GEOMAlgo/BlockFix_UnionEdges.hxx b/src/GEOMAlgo/BlockFix_UnionEdges.hxx
index 07909ce7c..eb1a4c8e5 100644
--- a/src/GEOMAlgo/BlockFix_UnionEdges.hxx
+++ b/src/GEOMAlgo/BlockFix_UnionEdges.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/BlockFix_UnionEdges.ixx b/src/GEOMAlgo/BlockFix_UnionEdges.ixx
index 63a34541d..0c2b1edd5 100644
--- a/src/GEOMAlgo/BlockFix_UnionEdges.ixx
+++ b/src/GEOMAlgo/BlockFix_UnionEdges.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/BlockFix_UnionEdges.jxx b/src/GEOMAlgo/BlockFix_UnionEdges.jxx
index c6cf527cb..558e8d82b 100644
--- a/src/GEOMAlgo/BlockFix_UnionEdges.jxx
+++ b/src/GEOMAlgo/BlockFix_UnionEdges.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/BlockFix_UnionFaces.cdl b/src/GEOMAlgo/BlockFix_UnionFaces.cdl
index b566b8228..0656115fd 100644
--- a/src/GEOMAlgo/BlockFix_UnionFaces.cdl
+++ b/src/GEOMAlgo/BlockFix_UnionFaces.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 -- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/BlockFix_UnionFaces.cxx b/src/GEOMAlgo/BlockFix_UnionFaces.cxx
index e2f9f32fd..c800fd421 100644
--- a/src/GEOMAlgo/BlockFix_UnionFaces.cxx
+++ b/src/GEOMAlgo/BlockFix_UnionFaces.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 //  File:    BlockFix_UnionFaces.cxx
 //  Created: Tue Dec  7 17:15:42 2004
diff --git a/src/GEOMAlgo/BlockFix_UnionFaces.hxx b/src/GEOMAlgo/BlockFix_UnionFaces.hxx
index 62c50504b..efdc67bbd 100644
--- a/src/GEOMAlgo/BlockFix_UnionFaces.hxx
+++ b/src/GEOMAlgo/BlockFix_UnionFaces.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/BlockFix_UnionFaces.ixx b/src/GEOMAlgo/BlockFix_UnionFaces.ixx
index 471f45326..6f376af7b 100644
--- a/src/GEOMAlgo/BlockFix_UnionFaces.ixx
+++ b/src/GEOMAlgo/BlockFix_UnionFaces.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/BlockFix_UnionFaces.jxx b/src/GEOMAlgo/BlockFix_UnionFaces.jxx
index ee5ff52ca..c89fc31fb 100644
--- a/src/GEOMAlgo/BlockFix_UnionFaces.jxx
+++ b/src/GEOMAlgo/BlockFix_UnionFaces.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo.cdl b/src/GEOMAlgo/GEOMAlgo.cdl
index 94d672db4..28f2a1d09 100755
--- a/src/GEOMAlgo/GEOMAlgo.cdl
+++ b/src/GEOMAlgo/GEOMAlgo.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 -- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo.pro b/src/GEOMAlgo/GEOMAlgo.pro
index ee72178bf..887ab8bf0 100644
--- a/src/GEOMAlgo/GEOMAlgo.pro
+++ b/src/GEOMAlgo/GEOMAlgo.pro
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMAlgo/GEOMAlgo_Algo.cdl b/src/GEOMAlgo/GEOMAlgo_Algo.cdl
index 00f2d3c1b..596f5b99f 100755
--- a/src/GEOMAlgo/GEOMAlgo_Algo.cdl
+++ b/src/GEOMAlgo/GEOMAlgo_Algo.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 -- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_Algo.cxx b/src/GEOMAlgo/GEOMAlgo_Algo.cxx
index 89ae5aee9..f47097929 100755
--- a/src/GEOMAlgo/GEOMAlgo_Algo.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_Algo.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_Algo.hxx b/src/GEOMAlgo/GEOMAlgo_Algo.hxx
index 01ba1d0df..efcf42709 100644
--- a/src/GEOMAlgo/GEOMAlgo_Algo.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_Algo.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_Algo.ixx b/src/GEOMAlgo/GEOMAlgo_Algo.ixx
index a1af9a17b..0cf36f467 100644
--- a/src/GEOMAlgo/GEOMAlgo_Algo.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_Algo.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_Algo.jxx b/src/GEOMAlgo/GEOMAlgo_Algo.jxx
index 609f1a4e3..217927e2c 100644
--- a/src/GEOMAlgo/GEOMAlgo_Algo.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_Algo.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_Builder.cdl b/src/GEOMAlgo/GEOMAlgo_Builder.cdl
index 499b38187..8e2ce65e3 100755
--- a/src/GEOMAlgo/GEOMAlgo_Builder.cdl
+++ b/src/GEOMAlgo/GEOMAlgo_Builder.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 -- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_Builder.cxx b/src/GEOMAlgo/GEOMAlgo_Builder.cxx
index 4ddd81bca..920f4a77a 100755
--- a/src/GEOMAlgo/GEOMAlgo_Builder.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_Builder.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_Builder.hxx b/src/GEOMAlgo/GEOMAlgo_Builder.hxx
index 1df7d2671..be753b225 100644
--- a/src/GEOMAlgo/GEOMAlgo_Builder.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_Builder.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_Builder.ixx b/src/GEOMAlgo/GEOMAlgo_Builder.ixx
index f436bfb9a..62611a069 100644
--- a/src/GEOMAlgo/GEOMAlgo_Builder.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_Builder.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_Builder.jxx b/src/GEOMAlgo/GEOMAlgo_Builder.jxx
index dd1a902fc..18fd81cac 100644
--- a/src/GEOMAlgo/GEOMAlgo_Builder.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_Builder.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_BuilderArea.cdl b/src/GEOMAlgo/GEOMAlgo_BuilderArea.cdl
index 25a0650ac..f9c7b2d6e 100755
--- a/src/GEOMAlgo/GEOMAlgo_BuilderArea.cdl
+++ b/src/GEOMAlgo/GEOMAlgo_BuilderArea.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 -- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 --
 -- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+--
 
 -- File:   ModGlue_BuilderArea.cdl
 -- Author: Peter KURNEV
diff --git a/src/GEOMAlgo/GEOMAlgo_BuilderArea.cxx b/src/GEOMAlgo/GEOMAlgo_BuilderArea.cxx
index a7d2aba71..7edd9df9e 100755
--- a/src/GEOMAlgo/GEOMAlgo_BuilderArea.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_BuilderArea.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File:        GEOMAlgo_BuilderArea.cxx
 // Author:      Peter KURNEV
diff --git a/src/GEOMAlgo/GEOMAlgo_BuilderArea.hxx b/src/GEOMAlgo/GEOMAlgo_BuilderArea.hxx
index d548480eb..4dddcd6a1 100644
--- a/src/GEOMAlgo/GEOMAlgo_BuilderArea.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_BuilderArea.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _GEOMAlgo_BuilderArea_HeaderFile
 #define _GEOMAlgo_BuilderArea_HeaderFile
diff --git a/src/GEOMAlgo/GEOMAlgo_BuilderArea.ixx b/src/GEOMAlgo/GEOMAlgo_BuilderArea.ixx
index eabd9ca2e..afcfbd77b 100644
--- a/src/GEOMAlgo/GEOMAlgo_BuilderArea.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_BuilderArea.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_BuilderArea.jxx b/src/GEOMAlgo/GEOMAlgo_BuilderArea.jxx
index a59854fb5..eb98413c6 100644
--- a/src/GEOMAlgo/GEOMAlgo_BuilderArea.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_BuilderArea.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_BuilderFace.cdl b/src/GEOMAlgo/GEOMAlgo_BuilderFace.cdl
index c1ff371b2..5ac144a96 100755
--- a/src/GEOMAlgo/GEOMAlgo_BuilderFace.cdl
+++ b/src/GEOMAlgo/GEOMAlgo_BuilderFace.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 -- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_BuilderFace.cxx b/src/GEOMAlgo/GEOMAlgo_BuilderFace.cxx
index 75e2896e2..cbdfd2199 100755
--- a/src/GEOMAlgo/GEOMAlgo_BuilderFace.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_BuilderFace.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File:        GEOMAlgo_BuilderFace.cxx
 // Author:      Peter KURNEV
diff --git a/src/GEOMAlgo/GEOMAlgo_BuilderFace.hxx b/src/GEOMAlgo/GEOMAlgo_BuilderFace.hxx
index 9bb209e1f..8e46ce349 100644
--- a/src/GEOMAlgo/GEOMAlgo_BuilderFace.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_BuilderFace.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_BuilderFace.ixx b/src/GEOMAlgo/GEOMAlgo_BuilderFace.ixx
index 3fb43b932..2d98f4ca4 100644
--- a/src/GEOMAlgo/GEOMAlgo_BuilderFace.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_BuilderFace.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_BuilderFace.jxx b/src/GEOMAlgo/GEOMAlgo_BuilderFace.jxx
index 1560d6078..afff2598e 100644
--- a/src/GEOMAlgo/GEOMAlgo_BuilderFace.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_BuilderFace.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_BuilderShape.cdl b/src/GEOMAlgo/GEOMAlgo_BuilderShape.cdl
index b19cc30eb..208d5c411 100755
--- a/src/GEOMAlgo/GEOMAlgo_BuilderShape.cdl
+++ b/src/GEOMAlgo/GEOMAlgo_BuilderShape.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 -- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_BuilderShape.cxx b/src/GEOMAlgo/GEOMAlgo_BuilderShape.cxx
index 30f22e4ba..0f6978c6c 100755
--- a/src/GEOMAlgo/GEOMAlgo_BuilderShape.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_BuilderShape.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_BuilderShape.hxx b/src/GEOMAlgo/GEOMAlgo_BuilderShape.hxx
index 75c87f10f..d9b04049e 100644
--- a/src/GEOMAlgo/GEOMAlgo_BuilderShape.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_BuilderShape.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_BuilderShape.ixx b/src/GEOMAlgo/GEOMAlgo_BuilderShape.ixx
index 48e28dfe4..43cb290c4 100644
--- a/src/GEOMAlgo/GEOMAlgo_BuilderShape.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_BuilderShape.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_BuilderShape.jxx b/src/GEOMAlgo/GEOMAlgo_BuilderShape.jxx
index 79b038cbd..80eda2d3e 100644
--- a/src/GEOMAlgo/GEOMAlgo_BuilderShape.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_BuilderShape.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_BuilderSolid.cdl b/src/GEOMAlgo/GEOMAlgo_BuilderSolid.cdl
index b9b09c825..aa8e1df8b 100755
--- a/src/GEOMAlgo/GEOMAlgo_BuilderSolid.cdl
+++ b/src/GEOMAlgo/GEOMAlgo_BuilderSolid.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 -- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_BuilderSolid.cxx b/src/GEOMAlgo/GEOMAlgo_BuilderSolid.cxx
index e3af4d7be..d2b71e5d0 100755
--- a/src/GEOMAlgo/GEOMAlgo_BuilderSolid.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_BuilderSolid.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File:        GEOMAlgo_BuilderSolid.cxx
 // Author:      Peter KURNEV
diff --git a/src/GEOMAlgo/GEOMAlgo_BuilderSolid.hxx b/src/GEOMAlgo/GEOMAlgo_BuilderSolid.hxx
index f0b5c8789..3ffdcc4ee 100644
--- a/src/GEOMAlgo/GEOMAlgo_BuilderSolid.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_BuilderSolid.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_BuilderSolid.ixx b/src/GEOMAlgo/GEOMAlgo_BuilderSolid.ixx
index 03f03bf78..e2c65b651 100644
--- a/src/GEOMAlgo/GEOMAlgo_BuilderSolid.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_BuilderSolid.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_BuilderSolid.jxx b/src/GEOMAlgo/GEOMAlgo_BuilderSolid.jxx
index 7072669c4..64d41a417 100644
--- a/src/GEOMAlgo/GEOMAlgo_BuilderSolid.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_BuilderSolid.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_BuilderTools.cdl b/src/GEOMAlgo/GEOMAlgo_BuilderTools.cdl
index f9e6a6947..6a203adeb 100755
--- a/src/GEOMAlgo/GEOMAlgo_BuilderTools.cdl
+++ b/src/GEOMAlgo/GEOMAlgo_BuilderTools.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 -- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_BuilderTools.cxx b/src/GEOMAlgo/GEOMAlgo_BuilderTools.cxx
index 7c147907e..9bab7d5b3 100755
--- a/src/GEOMAlgo/GEOMAlgo_BuilderTools.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_BuilderTools.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File:        GEOMAlgo_BuilderTools.cxx
 // Author:      Peter KURNEV
diff --git a/src/GEOMAlgo/GEOMAlgo_BuilderTools.hxx b/src/GEOMAlgo/GEOMAlgo_BuilderTools.hxx
index 4282e4843..90e3b75f1 100644
--- a/src/GEOMAlgo/GEOMAlgo_BuilderTools.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_BuilderTools.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_BuilderTools.ixx b/src/GEOMAlgo/GEOMAlgo_BuilderTools.ixx
index febbd3397..493034342 100644
--- a/src/GEOMAlgo/GEOMAlgo_BuilderTools.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_BuilderTools.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_BuilderTools.jxx b/src/GEOMAlgo/GEOMAlgo_BuilderTools.jxx
index abfd981ad..d4ee6821d 100644
--- a/src/GEOMAlgo/GEOMAlgo_BuilderTools.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_BuilderTools.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_Builder_0.cxx b/src/GEOMAlgo/GEOMAlgo_Builder_0.cxx
index bd7594caf..ec1063deb 100644
--- a/src/GEOMAlgo/GEOMAlgo_Builder_0.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_Builder_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_Builder_1.cxx b/src/GEOMAlgo/GEOMAlgo_Builder_1.cxx
index 60be7b5e5..394809471 100755
--- a/src/GEOMAlgo/GEOMAlgo_Builder_1.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_Builder_1.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File:        GEOMAlgo_Builder_1.cxx
 // Author:      Peter KURNEV 
diff --git a/src/GEOMAlgo/GEOMAlgo_Builder_2.cxx b/src/GEOMAlgo/GEOMAlgo_Builder_2.cxx
index 54be6ce3e..bb65514c4 100755
--- a/src/GEOMAlgo/GEOMAlgo_Builder_2.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_Builder_2.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_Builder_3.cxx b/src/GEOMAlgo/GEOMAlgo_Builder_3.cxx
index 79b42d1df..aca45b207 100755
--- a/src/GEOMAlgo/GEOMAlgo_Builder_3.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_Builder_3.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 //  File    : GEOMAlgo_Builder_3.cxx
 //  Author  : Peter KURNEV
diff --git a/src/GEOMAlgo/GEOMAlgo_Builder_4.cxx b/src/GEOMAlgo/GEOMAlgo_Builder_4.cxx
index 902614583..a091a65ee 100755
--- a/src/GEOMAlgo/GEOMAlgo_Builder_4.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_Builder_4.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File:        GEOMAlgo_Builder_4.cxx
 // Author:      Peter KURNEV
diff --git a/src/GEOMAlgo/GEOMAlgo_Clsf.cdl b/src/GEOMAlgo/GEOMAlgo_Clsf.cdl
index fcc4425e7..43f8e8e33 100644
--- a/src/GEOMAlgo/GEOMAlgo_Clsf.cdl
+++ b/src/GEOMAlgo/GEOMAlgo_Clsf.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 -- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_Clsf.cxx b/src/GEOMAlgo/GEOMAlgo_Clsf.cxx
index 36ea4d8b8..be752d18f 100644
--- a/src/GEOMAlgo/GEOMAlgo_Clsf.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_Clsf.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_Clsf.hxx b/src/GEOMAlgo/GEOMAlgo_Clsf.hxx
index 0e0ed2952..01e2b4182 100644
--- a/src/GEOMAlgo/GEOMAlgo_Clsf.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_Clsf.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_Clsf.ixx b/src/GEOMAlgo/GEOMAlgo_Clsf.ixx
index 19f4270d5..0245f7f95 100644
--- a/src/GEOMAlgo/GEOMAlgo_Clsf.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_Clsf.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_Clsf.jxx b/src/GEOMAlgo/GEOMAlgo_Clsf.jxx
index b2a23dc84..c0c221468 100644
--- a/src/GEOMAlgo/GEOMAlgo_Clsf.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_Clsf.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_ClsfBox.cdl b/src/GEOMAlgo/GEOMAlgo_ClsfBox.cdl
index 2f649993f..9c9009f29 100644
--- a/src/GEOMAlgo/GEOMAlgo_ClsfBox.cdl
+++ b/src/GEOMAlgo/GEOMAlgo_ClsfBox.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 -- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_ClsfBox.cxx b/src/GEOMAlgo/GEOMAlgo_ClsfBox.cxx
index afeeead99..df7814bb1 100644
--- a/src/GEOMAlgo/GEOMAlgo_ClsfBox.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_ClsfBox.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_ClsfBox.hxx b/src/GEOMAlgo/GEOMAlgo_ClsfBox.hxx
index 1a5fee8e2..42918d24a 100644
--- a/src/GEOMAlgo/GEOMAlgo_ClsfBox.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_ClsfBox.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_ClsfBox.ixx b/src/GEOMAlgo/GEOMAlgo_ClsfBox.ixx
index 69cdede5f..c1c4bcc26 100644
--- a/src/GEOMAlgo/GEOMAlgo_ClsfBox.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_ClsfBox.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_ClsfBox.jxx b/src/GEOMAlgo/GEOMAlgo_ClsfBox.jxx
index f429ee739..d7d956d75 100644
--- a/src/GEOMAlgo/GEOMAlgo_ClsfBox.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_ClsfBox.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_ClsfSolid.cdl b/src/GEOMAlgo/GEOMAlgo_ClsfSolid.cdl
index 4d770c48b..b61256a12 100755
--- a/src/GEOMAlgo/GEOMAlgo_ClsfSolid.cdl
+++ b/src/GEOMAlgo/GEOMAlgo_ClsfSolid.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- This library is free software; you can redistribute it and/or
 -- modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMAlgo/GEOMAlgo_ClsfSolid.cxx b/src/GEOMAlgo/GEOMAlgo_ClsfSolid.cxx
index 643cc1427..5d16464c4 100755
--- a/src/GEOMAlgo/GEOMAlgo_ClsfSolid.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_ClsfSolid.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMAlgo/GEOMAlgo_ClsfSolid.hxx b/src/GEOMAlgo/GEOMAlgo_ClsfSolid.hxx
index cf0fcbaa9..61132917a 100644
--- a/src/GEOMAlgo/GEOMAlgo_ClsfSolid.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_ClsfSolid.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMAlgo/GEOMAlgo_ClsfSolid.ixx b/src/GEOMAlgo/GEOMAlgo_ClsfSolid.ixx
index fedefdefe..81d9bcf1e 100644
--- a/src/GEOMAlgo/GEOMAlgo_ClsfSolid.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_ClsfSolid.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMAlgo/GEOMAlgo_ClsfSolid.jxx b/src/GEOMAlgo/GEOMAlgo_ClsfSolid.jxx
index 201109ca5..55526d625 100644
--- a/src/GEOMAlgo/GEOMAlgo_ClsfSolid.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_ClsfSolid.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMAlgo/GEOMAlgo_ClsfSurf.cdl b/src/GEOMAlgo/GEOMAlgo_ClsfSurf.cdl
index cad56c22f..b0cc20ac1 100644
--- a/src/GEOMAlgo/GEOMAlgo_ClsfSurf.cdl
+++ b/src/GEOMAlgo/GEOMAlgo_ClsfSurf.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 -- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_ClsfSurf.cxx b/src/GEOMAlgo/GEOMAlgo_ClsfSurf.cxx
index a1765d2af..f69969074 100644
--- a/src/GEOMAlgo/GEOMAlgo_ClsfSurf.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_ClsfSurf.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_ClsfSurf.hxx b/src/GEOMAlgo/GEOMAlgo_ClsfSurf.hxx
index c00a705cd..95ab4d10e 100644
--- a/src/GEOMAlgo/GEOMAlgo_ClsfSurf.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_ClsfSurf.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_ClsfSurf.ixx b/src/GEOMAlgo/GEOMAlgo_ClsfSurf.ixx
index d1c3672ed..1ad284a14 100644
--- a/src/GEOMAlgo/GEOMAlgo_ClsfSurf.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_ClsfSurf.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_ClsfSurf.jxx b/src/GEOMAlgo/GEOMAlgo_ClsfSurf.jxx
index 77fd96abb..d4f97423d 100644
--- a/src/GEOMAlgo/GEOMAlgo_ClsfSurf.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_ClsfSurf.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.cdl b/src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.cdl
index 750e19ced..fb40299cd 100644
--- a/src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.cdl
+++ b/src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 -- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.cxx b/src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.cxx
index 372d7d3ec..f233a65c9 100644
--- a/src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.hxx b/src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.hxx
index b9dee8eed..557df22c8 100644
--- a/src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.ixx b/src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.ixx
index 6212b8481..03022d5e4 100644
--- a/src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.jxx b/src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.jxx
index a08e16512..726dd803f 100644
--- a/src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfOrientedShapeShape.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfOrientedShapeShape.hxx
index 42ac34494..deb44cbcc 100644
--- a/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfOrientedShapeShape.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfOrientedShapeShape.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfOrientedShapeShape_0.cxx b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfOrientedShapeShape_0.cxx
index 9342a2928..37cd70f3a 100644
--- a/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfOrientedShapeShape_0.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfOrientedShapeShape_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger.hxx
index fe222e5af..513b57034 100644
--- a/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger_0.cxx b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger_0.cxx
index d97497f1e..97b5c8316 100644
--- a/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger_0.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyShapeShape.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyShapeShape.hxx
index 4833c4247..5fdc3f2e4 100644
--- a/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyShapeShape.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyShapeShape.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyShapeShape_0.cxx b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyShapeShape_0.cxx
index 58ba8b7dd..1f4129c5b 100644
--- a/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyShapeShape_0.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyShapeShape_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfRealListOfShape.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfRealListOfShape.hxx
index 131c6afae..a539700e7 100644
--- a/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfRealListOfShape.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfRealListOfShape.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfRealListOfShape_0.cxx b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfRealListOfShape_0.cxx
index b5506260b..d645bd9f9 100644
--- a/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfRealListOfShape_0.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfRealListOfShape_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapeMapOfShape.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapeMapOfShape.hxx
index 60a66da4a..80db864ed 100644
--- a/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapeMapOfShape.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapeMapOfShape.hxx
@@ -1,23 +1,24 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _GEOMAlgo_DataMapIteratorOfDataMapOfShapeMapOfShape_HeaderFile
 #define _GEOMAlgo_DataMapIteratorOfDataMapOfShapeMapOfShape_HeaderFile
diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapeMapOfShape_0.cxx b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapeMapOfShape_0.cxx
index 55efb4bb1..f8030d2ed 100644
--- a/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapeMapOfShape_0.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapeMapOfShape_0.cxx
@@ -1,23 +1,24 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include <GEOMAlgo_DataMapIteratorOfDataMapOfShapeMapOfShape.hxx>
 
diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapePnt.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapePnt.hxx
index e86fd05f5..ea0e865b3 100644
--- a/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapePnt.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapePnt.hxx
@@ -1,23 +1,24 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _GEOMAlgo_DataMapIteratorOfDataMapOfShapePnt_HeaderFile
 #define _GEOMAlgo_DataMapIteratorOfDataMapOfShapePnt_HeaderFile
diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapePnt_0.cxx b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapePnt_0.cxx
index 06c890444..afcf4e205 100644
--- a/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapePnt_0.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapePnt_0.cxx
@@ -1,23 +1,24 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include <GEOMAlgo_DataMapIteratorOfDataMapOfShapePnt.hxx>
 
diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapeReal.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapeReal.hxx
index f2795ae84..1632b8b2c 100644
--- a/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapeReal.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapeReal.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapeReal_0.cxx b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapeReal_0.cxx
index 908a19f37..a8a0d2da0 100644
--- a/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapeReal_0.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapeReal_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet.hxx
index 6e7f99742..bc54b432c 100644
--- a/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet_HeaderFile
 #define _GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet_HeaderFile
diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet_0.cxx b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet_0.cxx
index 0a0c4cdcf..ac21bb25a 100644
--- a/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet_0.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape.hxx
index 28915f8a2..88e037400 100644
--- a/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -15,6 +15,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape_HeaderFile
 #define _GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape_HeaderFile
diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape_0.cxx b/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape_0.cxx
index 7a73f4f17..aced2ed90 100644
--- a/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape_0.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -15,6 +15,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include <GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape.hxx>
 
diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger.hxx
index 72f4e957e..7b4b7b2c7 100644
--- a/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger_HeaderFile
 #define _GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger_HeaderFile
diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger_0.cxx b/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger_0.cxx
index a96b10152..86198cf55 100644
--- a/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger_0.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include <GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger.hxx>
 
diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape.hxx
index 48ceaa19e..00d2d4696 100644
--- a/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -15,6 +15,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape_HeaderFile
 #define _GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape_HeaderFile
diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape_0.cxx b/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape_0.cxx
index 70b97bd2d..2a279fc7b 100644
--- a/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape_0.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -15,6 +15,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include <GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape.hxx>
 
diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape.hxx
index e7a83472a..381ea0430 100644
--- a/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape_HeaderFile
 #define _GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape_HeaderFile
diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape_0.cxx b/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape_0.cxx
index e6413628a..5ab8c1789 100644
--- a/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape_0.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include <GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape.hxx>
 
diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapeMapOfShape.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapeMapOfShape.hxx
index 4d6e8320c..d2e50893a 100644
--- a/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapeMapOfShape.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapeMapOfShape.hxx
@@ -1,23 +1,24 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _GEOMAlgo_DataMapNodeOfDataMapOfShapeMapOfShape_HeaderFile
 #define _GEOMAlgo_DataMapNodeOfDataMapOfShapeMapOfShape_HeaderFile
diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapeMapOfShape_0.cxx b/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapeMapOfShape_0.cxx
index 30f0fb5a5..c19e3bc3c 100644
--- a/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapeMapOfShape_0.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapeMapOfShape_0.cxx
@@ -1,23 +1,24 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include <GEOMAlgo_DataMapNodeOfDataMapOfShapeMapOfShape.hxx>
 
diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapePnt.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapePnt.hxx
index 64ac59928..c470093e3 100644
--- a/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapePnt.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapePnt.hxx
@@ -1,23 +1,24 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _GEOMAlgo_DataMapNodeOfDataMapOfShapePnt_HeaderFile
 #define _GEOMAlgo_DataMapNodeOfDataMapOfShapePnt_HeaderFile
diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapePnt_0.cxx b/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapePnt_0.cxx
index e22ab54cb..eb1ce0950 100644
--- a/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapePnt_0.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapePnt_0.cxx
@@ -1,23 +1,24 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include <GEOMAlgo_DataMapNodeOfDataMapOfShapePnt.hxx>
 
diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapeReal.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapeReal.hxx
index 218e03cf7..d6ca24d11 100644
--- a/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapeReal.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapeReal.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _GEOMAlgo_DataMapNodeOfDataMapOfShapeReal_HeaderFile
 #define _GEOMAlgo_DataMapNodeOfDataMapOfShapeReal_HeaderFile
diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapeReal_0.cxx b/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapeReal_0.cxx
index 2c9e6d3f6..b5eadeb54 100644
--- a/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapeReal_0.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapeReal_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include <GEOMAlgo_DataMapNodeOfDataMapOfShapeReal.hxx>
 
diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet.hxx
index bcd0aaa83..a07f4c488 100644
--- a/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet_HeaderFile
 #define _GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet_HeaderFile
diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet_0.cxx b/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet_0.cxx
index c8d7c13c9..fbe632546 100644
--- a/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet_0.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include <GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet.hxx>
 
diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapOfOrientedShapeShape.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapOfOrientedShapeShape.hxx
index bb222b10d..81313ba98 100644
--- a/src/GEOMAlgo/GEOMAlgo_DataMapOfOrientedShapeShape.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapOfOrientedShapeShape.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -15,6 +15,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _GEOMAlgo_DataMapOfOrientedShapeShape_HeaderFile
 #define _GEOMAlgo_DataMapOfOrientedShapeShape_HeaderFile
diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapOfOrientedShapeShape_0.cxx b/src/GEOMAlgo/GEOMAlgo_DataMapOfOrientedShapeShape_0.cxx
index a06f56621..25bfd175c 100644
--- a/src/GEOMAlgo/GEOMAlgo_DataMapOfOrientedShapeShape_0.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapOfOrientedShapeShape_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -15,6 +15,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include <GEOMAlgo_DataMapOfOrientedShapeShape.hxx>
 
diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapOfPassKeyInteger.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapOfPassKeyInteger.hxx
index 228cbfa64..bc5e47173 100644
--- a/src/GEOMAlgo/GEOMAlgo_DataMapOfPassKeyInteger.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapOfPassKeyInteger.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _GEOMAlgo_DataMapOfPassKeyInteger_HeaderFile
 #define _GEOMAlgo_DataMapOfPassKeyInteger_HeaderFile
diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapOfPassKeyInteger_0.cxx b/src/GEOMAlgo/GEOMAlgo_DataMapOfPassKeyInteger_0.cxx
index 353d2d493..198f0679a 100644
--- a/src/GEOMAlgo/GEOMAlgo_DataMapOfPassKeyInteger_0.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapOfPassKeyInteger_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapOfPassKeyShapeShape.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapOfPassKeyShapeShape.hxx
index 651f1c7ee..f35bdbf85 100644
--- a/src/GEOMAlgo/GEOMAlgo_DataMapOfPassKeyShapeShape.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapOfPassKeyShapeShape.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -15,6 +15,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _GEOMAlgo_DataMapOfPassKeyShapeShape_HeaderFile
 #define _GEOMAlgo_DataMapOfPassKeyShapeShape_HeaderFile
diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapOfPassKeyShapeShape_0.cxx b/src/GEOMAlgo/GEOMAlgo_DataMapOfPassKeyShapeShape_0.cxx
index 1a6bfba17..7ed3b8dbe 100644
--- a/src/GEOMAlgo/GEOMAlgo_DataMapOfPassKeyShapeShape_0.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapOfPassKeyShapeShape_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapOfRealListOfShape.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapOfRealListOfShape.hxx
index 2c539bf80..45a038bbf 100644
--- a/src/GEOMAlgo/GEOMAlgo_DataMapOfRealListOfShape.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapOfRealListOfShape.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _GEOMAlgo_DataMapOfRealListOfShape_HeaderFile
 #define _GEOMAlgo_DataMapOfRealListOfShape_HeaderFile
diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapOfRealListOfShape_0.cxx b/src/GEOMAlgo/GEOMAlgo_DataMapOfRealListOfShape_0.cxx
index 9f31d3a43..8794f0809 100644
--- a/src/GEOMAlgo/GEOMAlgo_DataMapOfRealListOfShape_0.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapOfRealListOfShape_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapOfShapeMapOfShape.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapOfShapeMapOfShape.hxx
index 228278e5e..dd67f9fff 100644
--- a/src/GEOMAlgo/GEOMAlgo_DataMapOfShapeMapOfShape.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapOfShapeMapOfShape.hxx
@@ -1,23 +1,24 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _GEOMAlgo_DataMapOfShapeMapOfShape_HeaderFile
 #define _GEOMAlgo_DataMapOfShapeMapOfShape_HeaderFile
diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapOfShapeMapOfShape_0.cxx b/src/GEOMAlgo/GEOMAlgo_DataMapOfShapeMapOfShape_0.cxx
index fce49dcbc..25d966ad3 100644
--- a/src/GEOMAlgo/GEOMAlgo_DataMapOfShapeMapOfShape_0.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapOfShapeMapOfShape_0.cxx
@@ -1,23 +1,24 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include <GEOMAlgo_DataMapOfShapeMapOfShape.hxx>
 
diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapOfShapePnt.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapOfShapePnt.hxx
index aca9d89e2..85bb78cb3 100644
--- a/src/GEOMAlgo/GEOMAlgo_DataMapOfShapePnt.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapOfShapePnt.hxx
@@ -1,23 +1,24 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _GEOMAlgo_DataMapOfShapePnt_HeaderFile
 #define _GEOMAlgo_DataMapOfShapePnt_HeaderFile
diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapOfShapePnt_0.cxx b/src/GEOMAlgo/GEOMAlgo_DataMapOfShapePnt_0.cxx
index 30ca13662..97e73fcfe 100644
--- a/src/GEOMAlgo/GEOMAlgo_DataMapOfShapePnt_0.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapOfShapePnt_0.cxx
@@ -1,23 +1,24 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include <GEOMAlgo_DataMapOfShapePnt.hxx>
 
diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapOfShapeReal.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapOfShapeReal.hxx
index fa8ebbf95..d61212df5 100644
--- a/src/GEOMAlgo/GEOMAlgo_DataMapOfShapeReal.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapOfShapeReal.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _GEOMAlgo_DataMapOfShapeReal_HeaderFile
 #define _GEOMAlgo_DataMapOfShapeReal_HeaderFile
diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapOfShapeReal_0.cxx b/src/GEOMAlgo/GEOMAlgo_DataMapOfShapeReal_0.cxx
index 0faa7310e..571a0d045 100644
--- a/src/GEOMAlgo/GEOMAlgo_DataMapOfShapeReal_0.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapOfShapeReal_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapOfShapeShapeSet.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapOfShapeShapeSet.hxx
index dd9e6aff6..72ce0250f 100644
--- a/src/GEOMAlgo/GEOMAlgo_DataMapOfShapeShapeSet.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapOfShapeShapeSet.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _GEOMAlgo_DataMapOfShapeShapeSet_HeaderFile
 #define _GEOMAlgo_DataMapOfShapeShapeSet_HeaderFile
diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapOfShapeShapeSet_0.cxx b/src/GEOMAlgo/GEOMAlgo_DataMapOfShapeShapeSet_0.cxx
index deb3442c0..e8c897125 100644
--- a/src/GEOMAlgo/GEOMAlgo_DataMapOfShapeShapeSet_0.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapOfShapeShapeSet_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.cdl b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.cdl
index c103117a8..4a559e3dc 100644
--- a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.cdl
+++ b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 -- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 --
 -- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+--
 
 --  File:	GEOMAlgo_FinderShapeOn.cdl
 --  Created:	Tue Jan 11 14:35:52 2005
diff --git a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.cxx b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.cxx
index 8975aaabe..111369dce 100644
--- a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File:        GEOMAlgo_FinderShapeOn.cxx
 // Created:     Tue Jan 11 14:44:31 2005
diff --git a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.hxx b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.hxx
index 050a61391..d3682f3a4 100644
--- a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.ixx b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.ixx
index 654d47682..c228b3245 100644
--- a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.jxx b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.jxx
index 7383e5f1b..8f68697ef 100644
--- a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.cdl b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.cdl
index 863bbfb72..89d2b84ac 100644
--- a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.cdl
+++ b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 -- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.cxx b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.cxx
index 3c1a98d14..5eee17905 100644
--- a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File:        GEOMAlgo_FinderShapeOn1.cxx
 // Created:     Fri Mar  4 10:31:06 2005
diff --git a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.hxx b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.hxx
index 523f78f4c..b221b87c0 100644
--- a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.ixx b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.ixx
index bf89c7b22..cc4fc5121 100644
--- a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.jxx b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.jxx
index 4fdb53112..f035b6151 100644
--- a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.cdl b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.cdl
index b815d1df2..9067bf4a9 100644
--- a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.cdl
+++ b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 -- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.cxx b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.cxx
index 35c0a7e3c..2910f6a40 100644
--- a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File:        GEOMAlgo_FinderShapeOn1.cxx
 // Created:     Fri Mar  4 10:31:06 2005
diff --git a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.hxx b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.hxx
index 3e210154a..6a66c841a 100644
--- a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.ixx b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.ixx
index 3325ba39a..57d8bdad8 100644
--- a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.jxx b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.jxx
index 4a68bf3a3..de1dd509c 100644
--- a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_FinderShapeOnQuad.cxx b/src/GEOMAlgo/GEOMAlgo_FinderShapeOnQuad.cxx
index 7805ad133..b608e8d44 100644
--- a/src/GEOMAlgo/GEOMAlgo_FinderShapeOnQuad.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_FinderShapeOnQuad.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_FinderShapeOnQuad.hxx b/src/GEOMAlgo/GEOMAlgo_FinderShapeOnQuad.hxx
index d24d64c8d..e2239123b 100644
--- a/src/GEOMAlgo/GEOMAlgo_FinderShapeOnQuad.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_FinderShapeOnQuad.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_GetInPlace.cxx b/src/GEOMAlgo/GEOMAlgo_GetInPlace.cxx
index 8407d7a1e..d97c943b2 100644
--- a/src/GEOMAlgo/GEOMAlgo_GetInPlace.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_GetInPlace.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File:     GEOMAlgo_GetInPlace.cxx
 // Author:   Peter KURNEV
diff --git a/src/GEOMAlgo/GEOMAlgo_GetInPlace.hxx b/src/GEOMAlgo/GEOMAlgo_GetInPlace.hxx
index cf3c61f0b..a49e4b247 100644
--- a/src/GEOMAlgo/GEOMAlgo_GetInPlace.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_GetInPlace.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_GetInPlace_1.cxx b/src/GEOMAlgo/GEOMAlgo_GetInPlace_1.cxx
index 0bebbba4a..45f136755 100644
--- a/src/GEOMAlgo/GEOMAlgo_GetInPlace_1.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_GetInPlace_1.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File:     GEOMAlgo_GetInPlace_1.cxx
 // Author:   Peter KURNEV
diff --git a/src/GEOMAlgo/GEOMAlgo_GetInPlace_2.cxx b/src/GEOMAlgo/GEOMAlgo_GetInPlace_2.cxx
index 7378e0e51..07d30b1b6 100644
--- a/src/GEOMAlgo/GEOMAlgo_GetInPlace_2.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_GetInPlace_2.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_GetInPlace_3.cxx b/src/GEOMAlgo/GEOMAlgo_GetInPlace_3.cxx
index 6f86b5442..0e7119c79 100644
--- a/src/GEOMAlgo/GEOMAlgo_GetInPlace_3.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_GetInPlace_3.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_GlueAnalyser.cdl b/src/GEOMAlgo/GEOMAlgo_GlueAnalyser.cdl
index f957f04dd..694d0f850 100644
--- a/src/GEOMAlgo/GEOMAlgo_GlueAnalyser.cdl
+++ b/src/GEOMAlgo/GEOMAlgo_GlueAnalyser.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 -- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_GlueAnalyser.cxx b/src/GEOMAlgo/GEOMAlgo_GlueAnalyser.cxx
index 31083a7f1..eb2935d54 100644
--- a/src/GEOMAlgo/GEOMAlgo_GlueAnalyser.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_GlueAnalyser.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File:        GEOMAlgo_GlueDetector.cxx
 // Created:     Wed Dec 15 11:08:09 2004
diff --git a/src/GEOMAlgo/GEOMAlgo_GlueAnalyser.hxx b/src/GEOMAlgo/GEOMAlgo_GlueAnalyser.hxx
index a106b2399..7463a72af 100644
--- a/src/GEOMAlgo/GEOMAlgo_GlueAnalyser.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_GlueAnalyser.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_GlueAnalyser.ixx b/src/GEOMAlgo/GEOMAlgo_GlueAnalyser.ixx
index 93259c45e..172b0ed19 100644
--- a/src/GEOMAlgo/GEOMAlgo_GlueAnalyser.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_GlueAnalyser.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_GlueAnalyser.jxx b/src/GEOMAlgo/GEOMAlgo_GlueAnalyser.jxx
index e54803132..c53f0757c 100644
--- a/src/GEOMAlgo/GEOMAlgo_GlueAnalyser.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_GlueAnalyser.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_GlueDetector.cxx b/src/GEOMAlgo/GEOMAlgo_GlueDetector.cxx
index c6c1433fe..e813ad267 100644
--- a/src/GEOMAlgo/GEOMAlgo_GlueDetector.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_GlueDetector.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File:        GEOMAlgo_GlueDetector.cxx
 // Author:      Peter KURNEV
diff --git a/src/GEOMAlgo/GEOMAlgo_GlueDetector.hxx b/src/GEOMAlgo/GEOMAlgo_GlueDetector.hxx
index db24754ff..9b6388c74 100644
--- a/src/GEOMAlgo/GEOMAlgo_GlueDetector.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_GlueDetector.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_Gluer.cdl b/src/GEOMAlgo/GEOMAlgo_Gluer.cdl
index 0f63c2ea3..5d7d5640e 100755
--- a/src/GEOMAlgo/GEOMAlgo_Gluer.cdl
+++ b/src/GEOMAlgo/GEOMAlgo_Gluer.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 -- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_Gluer.cxx b/src/GEOMAlgo/GEOMAlgo_Gluer.cxx
index 94919c591..9fc06291a 100755
--- a/src/GEOMAlgo/GEOMAlgo_Gluer.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_Gluer.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File:	GEOMAlgo_Gluer.cxx
 // Created:	Sat Dec 04 12:45:53 2004
diff --git a/src/GEOMAlgo/GEOMAlgo_Gluer.hxx b/src/GEOMAlgo/GEOMAlgo_Gluer.hxx
index 52a18fd3e..9b0f6608f 100644
--- a/src/GEOMAlgo/GEOMAlgo_Gluer.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_Gluer.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_Gluer.ixx b/src/GEOMAlgo/GEOMAlgo_Gluer.ixx
index 6d59d097b..c7d370014 100644
--- a/src/GEOMAlgo/GEOMAlgo_Gluer.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_Gluer.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_Gluer.jxx b/src/GEOMAlgo/GEOMAlgo_Gluer.jxx
index a1aec18b6..d1a24a5ce 100644
--- a/src/GEOMAlgo/GEOMAlgo_Gluer.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_Gluer.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_Gluer2.cxx b/src/GEOMAlgo/GEOMAlgo_Gluer2.cxx
index b48d49740..1a32a60f7 100644
--- a/src/GEOMAlgo/GEOMAlgo_Gluer2.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_Gluer2.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File:        GEOMAlgo_Gluer2.cxx
 // Author:      Peter KURNEV
diff --git a/src/GEOMAlgo/GEOMAlgo_Gluer2.hxx b/src/GEOMAlgo/GEOMAlgo_Gluer2.hxx
index d6182bbab..552318fdf 100644
--- a/src/GEOMAlgo/GEOMAlgo_Gluer2.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_Gluer2.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_Gluer2_1.cxx b/src/GEOMAlgo/GEOMAlgo_Gluer2_1.cxx
index e14f54b55..400613da7 100644
--- a/src/GEOMAlgo/GEOMAlgo_Gluer2_1.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_Gluer2_1.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File:     GEOMAlgo_Gluer2_1.cxx
 // Author:   Peter KURNEV
diff --git a/src/GEOMAlgo/GEOMAlgo_Gluer2_2.cxx b/src/GEOMAlgo/GEOMAlgo_Gluer2_2.cxx
index 91c620053..74610392b 100644
--- a/src/GEOMAlgo/GEOMAlgo_Gluer2_2.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_Gluer2_2.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_Gluer2_3.cxx b/src/GEOMAlgo/GEOMAlgo_Gluer2_3.cxx
index 06aaf308d..93ccc32ca 100644
--- a/src/GEOMAlgo/GEOMAlgo_Gluer2_3.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_Gluer2_3.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_GluerAlgo.cxx b/src/GEOMAlgo/GEOMAlgo_GluerAlgo.cxx
index 79fcae64e..89d546ccd 100644
--- a/src/GEOMAlgo/GEOMAlgo_GluerAlgo.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_GluerAlgo.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File:	GEOMAlgo_GluerAlgo.cxx
 // Author:	Peter KURNEV
diff --git a/src/GEOMAlgo/GEOMAlgo_GluerAlgo.hxx b/src/GEOMAlgo/GEOMAlgo_GluerAlgo.hxx
index 68e08628b..fc38a08ba 100644
--- a/src/GEOMAlgo/GEOMAlgo_GluerAlgo.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_GluerAlgo.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File:        GEOMAlgo_GluerAlgo.hxx
 // Author:      Peter KURNEV
diff --git a/src/GEOMAlgo/GEOMAlgo_HAlgo.cdl b/src/GEOMAlgo/GEOMAlgo_HAlgo.cdl
index f356ec262..e90e4f6b0 100644
--- a/src/GEOMAlgo/GEOMAlgo_HAlgo.cdl
+++ b/src/GEOMAlgo/GEOMAlgo_HAlgo.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 -- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_HAlgo.cxx b/src/GEOMAlgo/GEOMAlgo_HAlgo.cxx
index 9514497e5..999280b6b 100644
--- a/src/GEOMAlgo/GEOMAlgo_HAlgo.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_HAlgo.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_HAlgo.hxx b/src/GEOMAlgo/GEOMAlgo_HAlgo.hxx
index 008c492a9..21e091438 100644
--- a/src/GEOMAlgo/GEOMAlgo_HAlgo.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_HAlgo.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_HAlgo.ixx b/src/GEOMAlgo/GEOMAlgo_HAlgo.ixx
index 60f8456ee..b32cf82b6 100644
--- a/src/GEOMAlgo/GEOMAlgo_HAlgo.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_HAlgo.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_HAlgo.jxx b/src/GEOMAlgo/GEOMAlgo_HAlgo.jxx
index 885bb86a3..884df3fcb 100644
--- a/src/GEOMAlgo/GEOMAlgo_HAlgo.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_HAlgo.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape.hxx b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape.hxx
index 31b29796a..54f60034e 100644
--- a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape_0.cxx b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape_0.cxx
index fa25f0d92..153d42346 100644
--- a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape_0.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyListOfShape.hxx b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyListOfShape.hxx
index ba747e004..92986b677 100644
--- a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyListOfShape.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyListOfShape.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyListOfShape_0.cxx b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyListOfShape_0.cxx
index a6cee5d26..9b1e91bce 100644
--- a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyListOfShape_0.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyListOfShape_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyShapeListOfShape.hxx b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyShapeListOfShape.hxx
index d7a08747e..fbdccc0cd 100644
--- a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyShapeListOfShape.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyShapeListOfShape.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyShapeListOfShape_0.cxx b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyShapeListOfShape_0.cxx
index cfde2e533..a91d5c048 100644
--- a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyShapeListOfShape_0.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyShapeListOfShape_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeBox.hxx b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeBox.hxx
index 38023b3a6..0981ddbde 100644
--- a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeBox.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeBox.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeBox_0.cxx b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeBox_0.cxx
index 08a2faf7b..c4d6132ed 100644
--- a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeBox_0.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeBox_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeShapeInfo.hxx b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeShapeInfo.hxx
index 2825444fb..34e1f416e 100644
--- a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeShapeInfo.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeShapeInfo.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeShapeInfo_0.cxx b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeShapeInfo_0.cxx
index 06f984508..1b9ff9ea6 100644
--- a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeShapeInfo_0.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeShapeInfo_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeState.hxx b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeState.hxx
index 1e18452fd..b4510ae04 100644
--- a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeState.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeState.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeState_0.cxx b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeState_0.cxx
index 1ce07e4ed..0a3218980 100644
--- a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeState_0.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeState_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfIntegerShape.hxx b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfIntegerShape.hxx
index 9c50281a6..820819743 100644
--- a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfIntegerShape.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfIntegerShape.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _GEOMAlgo_IndexedDataMapOfIntegerShape_HeaderFile
 #define _GEOMAlgo_IndexedDataMapOfIntegerShape_HeaderFile
diff --git a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfIntegerShape_0.cxx b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfIntegerShape_0.cxx
index 1078c815e..b939bec52 100644
--- a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfIntegerShape_0.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfIntegerShape_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfPassKeyListOfShape.hxx b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfPassKeyListOfShape.hxx
index 38ebe7c49..48ca75f61 100644
--- a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfPassKeyListOfShape.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfPassKeyListOfShape.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _GEOMAlgo_IndexedDataMapOfPassKeyListOfShape_HeaderFile
 #define _GEOMAlgo_IndexedDataMapOfPassKeyListOfShape_HeaderFile
diff --git a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfPassKeyListOfShape_0.cxx b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfPassKeyListOfShape_0.cxx
index 7dc4b0ebb..7cca1cc22 100644
--- a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfPassKeyListOfShape_0.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfPassKeyListOfShape_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape.hxx b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape.hxx
index 63a181686..60384040a 100644
--- a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape_HeaderFile
 #define _GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape_HeaderFile
diff --git a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape_0.cxx b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape_0.cxx
index 46110818d..84d777224 100644
--- a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape_0.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeBox.hxx b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeBox.hxx
index 2b4f692b2..592e90453 100644
--- a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeBox.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeBox.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _GEOMAlgo_IndexedDataMapOfShapeBox_HeaderFile
 #define _GEOMAlgo_IndexedDataMapOfShapeBox_HeaderFile
diff --git a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeBox_0.cxx b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeBox_0.cxx
index 4dc1e6bf0..3ae3d1208 100644
--- a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeBox_0.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeBox_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeShapeInfo.hxx b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeShapeInfo.hxx
index 25aa6f527..72d7d2216 100644
--- a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeShapeInfo.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeShapeInfo.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -15,6 +15,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _GEOMAlgo_IndexedDataMapOfShapeShapeInfo_HeaderFile
 #define _GEOMAlgo_IndexedDataMapOfShapeShapeInfo_HeaderFile
diff --git a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeShapeInfo_0.cxx b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeShapeInfo_0.cxx
index bff5ec874..d991d0213 100644
--- a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeShapeInfo_0.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeShapeInfo_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeState.hxx b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeState.hxx
index a8dde9077..b7cee9ee2 100644
--- a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeState.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeState.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _GEOMAlgo_IndexedDataMapOfShapeState_HeaderFile
 #define _GEOMAlgo_IndexedDataMapOfShapeState_HeaderFile
diff --git a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeState_0.cxx b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeState_0.cxx
index 91c1160f2..a74e1a295 100644
--- a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeState_0.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeState_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_KindOfBounds.hxx b/src/GEOMAlgo/GEOMAlgo_KindOfBounds.hxx
index 3425f239c..bebea023d 100644
--- a/src/GEOMAlgo/GEOMAlgo_KindOfBounds.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_KindOfBounds.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMAlgo/GEOMAlgo_KindOfClosed.hxx b/src/GEOMAlgo/GEOMAlgo_KindOfClosed.hxx
index 06714dedf..df72372e5 100644
--- a/src/GEOMAlgo/GEOMAlgo_KindOfClosed.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_KindOfClosed.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMAlgo/GEOMAlgo_KindOfName.hxx b/src/GEOMAlgo/GEOMAlgo_KindOfName.hxx
index 72cb50e08..0b1e3fca3 100644
--- a/src/GEOMAlgo/GEOMAlgo_KindOfName.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_KindOfName.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMAlgo/GEOMAlgo_KindOfShape.hxx b/src/GEOMAlgo/GEOMAlgo_KindOfShape.hxx
index 2bc70ad59..32156b217 100644
--- a/src/GEOMAlgo/GEOMAlgo_KindOfShape.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_KindOfShape.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMAlgo/GEOMAlgo_ListIteratorOfListOfCoupleOfShapes.hxx b/src/GEOMAlgo/GEOMAlgo_ListIteratorOfListOfCoupleOfShapes.hxx
index d07673ba7..ccde56848 100644
--- a/src/GEOMAlgo/GEOMAlgo_ListIteratorOfListOfCoupleOfShapes.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_ListIteratorOfListOfCoupleOfShapes.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_ListIteratorOfListOfCoupleOfShapes_0.cxx b/src/GEOMAlgo/GEOMAlgo_ListIteratorOfListOfCoupleOfShapes_0.cxx
index 75a71c4b5..b06af1d69 100644
--- a/src/GEOMAlgo/GEOMAlgo_ListIteratorOfListOfCoupleOfShapes_0.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_ListIteratorOfListOfCoupleOfShapes_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_ListIteratorOfListOfPnt.hxx b/src/GEOMAlgo/GEOMAlgo_ListIteratorOfListOfPnt.hxx
index 60420c304..d04e32756 100644
--- a/src/GEOMAlgo/GEOMAlgo_ListIteratorOfListOfPnt.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_ListIteratorOfListOfPnt.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_ListIteratorOfListOfPnt_0.cxx b/src/GEOMAlgo/GEOMAlgo_ListIteratorOfListOfPnt_0.cxx
index fe6f2d40c..917ceee44 100644
--- a/src/GEOMAlgo/GEOMAlgo_ListIteratorOfListOfPnt_0.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_ListIteratorOfListOfPnt_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_ListNodeOfListOfCoupleOfShapes.hxx b/src/GEOMAlgo/GEOMAlgo_ListNodeOfListOfCoupleOfShapes.hxx
index 53253a8c7..6dcc8ae3e 100644
--- a/src/GEOMAlgo/GEOMAlgo_ListNodeOfListOfCoupleOfShapes.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_ListNodeOfListOfCoupleOfShapes.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_ListNodeOfListOfCoupleOfShapes_0.cxx b/src/GEOMAlgo/GEOMAlgo_ListNodeOfListOfCoupleOfShapes_0.cxx
index 5d5853cea..8b17dad38 100644
--- a/src/GEOMAlgo/GEOMAlgo_ListNodeOfListOfCoupleOfShapes_0.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_ListNodeOfListOfCoupleOfShapes_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_ListNodeOfListOfPnt.hxx b/src/GEOMAlgo/GEOMAlgo_ListNodeOfListOfPnt.hxx
index b2a1886be..5105bcd12 100644
--- a/src/GEOMAlgo/GEOMAlgo_ListNodeOfListOfPnt.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_ListNodeOfListOfPnt.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_ListNodeOfListOfPnt_0.cxx b/src/GEOMAlgo/GEOMAlgo_ListNodeOfListOfPnt_0.cxx
index 4c69f7dc2..87f546af7 100644
--- a/src/GEOMAlgo/GEOMAlgo_ListNodeOfListOfPnt_0.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_ListNodeOfListOfPnt_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_ListOfCoupleOfShapes.hxx b/src/GEOMAlgo/GEOMAlgo_ListOfCoupleOfShapes.hxx
index 1191ce216..9716695f4 100644
--- a/src/GEOMAlgo/GEOMAlgo_ListOfCoupleOfShapes.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_ListOfCoupleOfShapes.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_ListOfCoupleOfShapes_0.cxx b/src/GEOMAlgo/GEOMAlgo_ListOfCoupleOfShapes_0.cxx
index ee85df702..11675e464 100644
--- a/src/GEOMAlgo/GEOMAlgo_ListOfCoupleOfShapes_0.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_ListOfCoupleOfShapes_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_ListOfPnt.hxx b/src/GEOMAlgo/GEOMAlgo_ListOfPnt.hxx
index 54aa42e53..299772ffe 100644
--- a/src/GEOMAlgo/GEOMAlgo_ListOfPnt.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_ListOfPnt.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_ListOfPnt_0.cxx b/src/GEOMAlgo/GEOMAlgo_ListOfPnt_0.cxx
index d7dedf9f0..4d28a58b3 100644
--- a/src/GEOMAlgo/GEOMAlgo_ListOfPnt_0.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_ListOfPnt_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_PWireEdgeSet.hxx b/src/GEOMAlgo/GEOMAlgo_PWireEdgeSet.hxx
index 65c581e19..81568c2b0 100644
--- a/src/GEOMAlgo/GEOMAlgo_PWireEdgeSet.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_PWireEdgeSet.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_PassKey.cdl b/src/GEOMAlgo/GEOMAlgo_PassKey.cdl
index d1221c3f1..0160c679e 100755
--- a/src/GEOMAlgo/GEOMAlgo_PassKey.cdl
+++ b/src/GEOMAlgo/GEOMAlgo_PassKey.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 -- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_PassKey.cxx b/src/GEOMAlgo/GEOMAlgo_PassKey.cxx
index 421b8cc4d..934c4f7c3 100755
--- a/src/GEOMAlgo/GEOMAlgo_PassKey.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_PassKey.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_PassKey.hxx b/src/GEOMAlgo/GEOMAlgo_PassKey.hxx
index 27483f3e2..6626b881b 100644
--- a/src/GEOMAlgo/GEOMAlgo_PassKey.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_PassKey.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_PassKey.ixx b/src/GEOMAlgo/GEOMAlgo_PassKey.ixx
index 82fe19e96..d84d83291 100644
--- a/src/GEOMAlgo/GEOMAlgo_PassKey.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_PassKey.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_PassKey.jxx b/src/GEOMAlgo/GEOMAlgo_PassKey.jxx
index a3f9b354b..114189ddc 100644
--- a/src/GEOMAlgo/GEOMAlgo_PassKey.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_PassKey.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.cdl b/src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.cdl
index ba3004680..0fe39d297 100755
--- a/src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.cdl
+++ b/src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 -- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.cxx b/src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.cxx
index d4e7326d9..060c1ff31 100755
--- a/src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.hxx b/src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.hxx
index d799b663e..222c862aa 100644
--- a/src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.ixx b/src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.ixx
index a682d0c4d..72da2bec0 100644
--- a/src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.jxx b/src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.jxx
index 580906c44..d90d66d0b 100644
--- a/src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_PassKeyShape.cdl b/src/GEOMAlgo/GEOMAlgo_PassKeyShape.cdl
index 966dab163..29dbb98c4 100755
--- a/src/GEOMAlgo/GEOMAlgo_PassKeyShape.cdl
+++ b/src/GEOMAlgo/GEOMAlgo_PassKeyShape.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 -- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_PassKeyShape.cxx b/src/GEOMAlgo/GEOMAlgo_PassKeyShape.cxx
index aece2e3ba..b558e302c 100755
--- a/src/GEOMAlgo/GEOMAlgo_PassKeyShape.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_PassKeyShape.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_PassKeyShape.hxx b/src/GEOMAlgo/GEOMAlgo_PassKeyShape.hxx
index 4857de3a2..89872bff2 100644
--- a/src/GEOMAlgo/GEOMAlgo_PassKeyShape.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_PassKeyShape.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_PassKeyShape.ixx b/src/GEOMAlgo/GEOMAlgo_PassKeyShape.ixx
index a5dd91704..d4459e8f7 100644
--- a/src/GEOMAlgo/GEOMAlgo_PassKeyShape.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_PassKeyShape.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_PassKeyShape.jxx b/src/GEOMAlgo/GEOMAlgo_PassKeyShape.jxx
index c12c17d65..2fe24b08e 100644
--- a/src/GEOMAlgo/GEOMAlgo_PassKeyShape.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_PassKeyShape.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_PassKeyShapeMapHasher.cdl b/src/GEOMAlgo/GEOMAlgo_PassKeyShapeMapHasher.cdl
index 15a509684..d15fafa21 100644
--- a/src/GEOMAlgo/GEOMAlgo_PassKeyShapeMapHasher.cdl
+++ b/src/GEOMAlgo/GEOMAlgo_PassKeyShapeMapHasher.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 -- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_PassKeyShapeMapHasher.cxx b/src/GEOMAlgo/GEOMAlgo_PassKeyShapeMapHasher.cxx
index 0ca325625..440099475 100644
--- a/src/GEOMAlgo/GEOMAlgo_PassKeyShapeMapHasher.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_PassKeyShapeMapHasher.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_PassKeyShapeMapHasher.hxx b/src/GEOMAlgo/GEOMAlgo_PassKeyShapeMapHasher.hxx
index ed433d68f..ef2d638ed 100644
--- a/src/GEOMAlgo/GEOMAlgo_PassKeyShapeMapHasher.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_PassKeyShapeMapHasher.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_PassKeyShapeMapHasher.ixx b/src/GEOMAlgo/GEOMAlgo_PassKeyShapeMapHasher.ixx
index afc3f391f..8bb2bf916 100644
--- a/src/GEOMAlgo/GEOMAlgo_PassKeyShapeMapHasher.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_PassKeyShapeMapHasher.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_PassKeyShapeMapHasher.jxx b/src/GEOMAlgo/GEOMAlgo_PassKeyShapeMapHasher.jxx
index 0601b9190..f863c3d9e 100644
--- a/src/GEOMAlgo/GEOMAlgo_PassKeyShapeMapHasher.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_PassKeyShapeMapHasher.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.cdl b/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.cdl
index a11ea9301..08e413e25 100644
--- a/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.cdl
+++ b/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 -- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.cxx b/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.cxx
index e11f480fc..b9ee9b70e 100644
--- a/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File:        GEOMAlgo_ShapeAlgo.cxx
 // Created:     Tue Dec  7 12:06:54 2004
diff --git a/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.hxx b/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.hxx
index e91a67239..0fae9f9f3 100644
--- a/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _GEOMAlgo_ShapeAlgo_HeaderFile
 #define _GEOMAlgo_ShapeAlgo_HeaderFile
diff --git a/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.ixx b/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.ixx
index 95d9c8e17..7eece2ffa 100644
--- a/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.jxx b/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.jxx
index 017a2bcee..16ac8077c 100644
--- a/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_ShapeInfo.cdl b/src/GEOMAlgo/GEOMAlgo_ShapeInfo.cdl
index 94f12f374..56fc525d3 100644
--- a/src/GEOMAlgo/GEOMAlgo_ShapeInfo.cdl
+++ b/src/GEOMAlgo/GEOMAlgo_ShapeInfo.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- This library is free software; you can redistribute it and/or
 -- modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMAlgo/GEOMAlgo_ShapeInfo.cxx b/src/GEOMAlgo/GEOMAlgo_ShapeInfo.cxx
index 84573a932..c52739dcd 100644
--- a/src/GEOMAlgo/GEOMAlgo_ShapeInfo.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_ShapeInfo.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMAlgo/GEOMAlgo_ShapeInfo.hxx b/src/GEOMAlgo/GEOMAlgo_ShapeInfo.hxx
index 4334a90d1..55783b6a9 100644
--- a/src/GEOMAlgo/GEOMAlgo_ShapeInfo.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_ShapeInfo.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMAlgo/GEOMAlgo_ShapeInfo.ixx b/src/GEOMAlgo/GEOMAlgo_ShapeInfo.ixx
index 9552a2337..0368e314b 100644
--- a/src/GEOMAlgo/GEOMAlgo_ShapeInfo.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_ShapeInfo.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMAlgo/GEOMAlgo_ShapeInfo.jxx b/src/GEOMAlgo/GEOMAlgo_ShapeInfo.jxx
index f26712b7a..e6672ca3a 100644
--- a/src/GEOMAlgo/GEOMAlgo_ShapeInfo.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_ShapeInfo.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller.cdl b/src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller.cdl
index 29226546b..a5d3189d3 100644
--- a/src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller.cdl
+++ b/src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- This library is free software; you can redistribute it and/or
 -- modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller.cxx b/src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller.cxx
index 852ad6a05..3211fa232 100644
--- a/src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller.hxx b/src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller.hxx
index 88b1d932e..180f8bbda 100644
--- a/src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller.ixx b/src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller.ixx
index edb3977db..2c7ecc63a 100644
--- a/src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller.jxx b/src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller.jxx
index 872037d5e..984a8a53e 100644
--- a/src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller_1.cxx b/src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller_1.cxx
index 194882e7b..e3ae5eae3 100644
--- a/src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller_1.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller_1.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -15,6 +15,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include <GEOMAlgo_ShapeInfoFiller.ixx>
 
diff --git a/src/GEOMAlgo/GEOMAlgo_ShapeSet.cdl b/src/GEOMAlgo/GEOMAlgo_ShapeSet.cdl
index bdb75acac..65a7267db 100755
--- a/src/GEOMAlgo/GEOMAlgo_ShapeSet.cdl
+++ b/src/GEOMAlgo/GEOMAlgo_ShapeSet.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 -- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_ShapeSet.cxx b/src/GEOMAlgo/GEOMAlgo_ShapeSet.cxx
index 720df322c..72df4ecf3 100755
--- a/src/GEOMAlgo/GEOMAlgo_ShapeSet.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_ShapeSet.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_ShapeSet.hxx b/src/GEOMAlgo/GEOMAlgo_ShapeSet.hxx
index 7f09816f8..c06f6a932 100644
--- a/src/GEOMAlgo/GEOMAlgo_ShapeSet.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_ShapeSet.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_ShapeSet.ixx b/src/GEOMAlgo/GEOMAlgo_ShapeSet.ixx
index cfb4e2507..e006551e7 100644
--- a/src/GEOMAlgo/GEOMAlgo_ShapeSet.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_ShapeSet.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_ShapeSet.jxx b/src/GEOMAlgo/GEOMAlgo_ShapeSet.jxx
index 0820dc216..44da338b7 100644
--- a/src/GEOMAlgo/GEOMAlgo_ShapeSet.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_ShapeSet.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_ShapeSolid.cdl b/src/GEOMAlgo/GEOMAlgo_ShapeSolid.cdl
index 710c7e9ed..2fab3b54b 100644
--- a/src/GEOMAlgo/GEOMAlgo_ShapeSolid.cdl
+++ b/src/GEOMAlgo/GEOMAlgo_ShapeSolid.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 -- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_ShapeSolid.cxx b/src/GEOMAlgo/GEOMAlgo_ShapeSolid.cxx
index 0f56fd364..82bbbfc2b 100644
--- a/src/GEOMAlgo/GEOMAlgo_ShapeSolid.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_ShapeSolid.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_ShapeSolid.hxx b/src/GEOMAlgo/GEOMAlgo_ShapeSolid.hxx
index 600c097ee..85eb68dd2 100644
--- a/src/GEOMAlgo/GEOMAlgo_ShapeSolid.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_ShapeSolid.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_ShapeSolid.ixx b/src/GEOMAlgo/GEOMAlgo_ShapeSolid.ixx
index 0a2e36f40..0ed159b4f 100644
--- a/src/GEOMAlgo/GEOMAlgo_ShapeSolid.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_ShapeSolid.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_ShapeSolid.jxx b/src/GEOMAlgo/GEOMAlgo_ShapeSolid.jxx
index 62e064f64..faca670b4 100644
--- a/src/GEOMAlgo/GEOMAlgo_ShapeSolid.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_ShapeSolid.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_ShellSolid.cdl b/src/GEOMAlgo/GEOMAlgo_ShellSolid.cdl
index 2bc047084..6dca21eed 100644
--- a/src/GEOMAlgo/GEOMAlgo_ShellSolid.cdl
+++ b/src/GEOMAlgo/GEOMAlgo_ShellSolid.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 -- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_ShellSolid.cxx b/src/GEOMAlgo/GEOMAlgo_ShellSolid.cxx
index cf6e49e5d..de0f483bc 100644
--- a/src/GEOMAlgo/GEOMAlgo_ShellSolid.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_ShellSolid.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File:        GEOMAlgo_ShellSolid.cxx
 // Created:     Wed Jan 12 12:49:45 2005
diff --git a/src/GEOMAlgo/GEOMAlgo_ShellSolid.hxx b/src/GEOMAlgo/GEOMAlgo_ShellSolid.hxx
index 55557dae6..2e8a043f4 100644
--- a/src/GEOMAlgo/GEOMAlgo_ShellSolid.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_ShellSolid.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_ShellSolid.ixx b/src/GEOMAlgo/GEOMAlgo_ShellSolid.ixx
index d121e147f..0cf9ad15f 100644
--- a/src/GEOMAlgo/GEOMAlgo_ShellSolid.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_ShellSolid.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_ShellSolid.jxx b/src/GEOMAlgo/GEOMAlgo_ShellSolid.jxx
index ed2cde3c0..861ac2697 100644
--- a/src/GEOMAlgo/GEOMAlgo_ShellSolid.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_ShellSolid.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_SolidSolid.cdl b/src/GEOMAlgo/GEOMAlgo_SolidSolid.cdl
index 88cdd8950..d8939882e 100644
--- a/src/GEOMAlgo/GEOMAlgo_SolidSolid.cdl
+++ b/src/GEOMAlgo/GEOMAlgo_SolidSolid.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 -- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_SolidSolid.cxx b/src/GEOMAlgo/GEOMAlgo_SolidSolid.cxx
index 45859f428..69c0a0cf1 100644
--- a/src/GEOMAlgo/GEOMAlgo_SolidSolid.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_SolidSolid.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_SolidSolid.hxx b/src/GEOMAlgo/GEOMAlgo_SolidSolid.hxx
index f93cde8ee..a96d56630 100644
--- a/src/GEOMAlgo/GEOMAlgo_SolidSolid.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_SolidSolid.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_SolidSolid.ixx b/src/GEOMAlgo/GEOMAlgo_SolidSolid.ixx
index 9fa885d71..123d6d85a 100644
--- a/src/GEOMAlgo/GEOMAlgo_SolidSolid.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_SolidSolid.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_SolidSolid.jxx b/src/GEOMAlgo/GEOMAlgo_SolidSolid.jxx
index 6ad05912c..704f2d32b 100644
--- a/src/GEOMAlgo/GEOMAlgo_SolidSolid.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_SolidSolid.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_Splitter.cdl b/src/GEOMAlgo/GEOMAlgo_Splitter.cdl
index 0a55cace7..4c3477c26 100755
--- a/src/GEOMAlgo/GEOMAlgo_Splitter.cdl
+++ b/src/GEOMAlgo/GEOMAlgo_Splitter.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 -- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_Splitter.cxx b/src/GEOMAlgo/GEOMAlgo_Splitter.cxx
index 4ed10d8ba..d4db73266 100755
--- a/src/GEOMAlgo/GEOMAlgo_Splitter.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_Splitter.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_Splitter.hxx b/src/GEOMAlgo/GEOMAlgo_Splitter.hxx
index 4854e68be..8d3fe560a 100644
--- a/src/GEOMAlgo/GEOMAlgo_Splitter.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_Splitter.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_Splitter.ixx b/src/GEOMAlgo/GEOMAlgo_Splitter.ixx
index f36dffbac..040713310 100644
--- a/src/GEOMAlgo/GEOMAlgo_Splitter.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_Splitter.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_Splitter.jxx b/src/GEOMAlgo/GEOMAlgo_Splitter.jxx
index 91979d3e3..909f327cf 100644
--- a/src/GEOMAlgo/GEOMAlgo_Splitter.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_Splitter.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_State.hxx b/src/GEOMAlgo/GEOMAlgo_State.hxx
index f5d21567d..65204c1ff 100644
--- a/src/GEOMAlgo/GEOMAlgo_State.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_State.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_StateCollector.cdl b/src/GEOMAlgo/GEOMAlgo_StateCollector.cdl
index 8cf0475e5..eeebd834e 100644
--- a/src/GEOMAlgo/GEOMAlgo_StateCollector.cdl
+++ b/src/GEOMAlgo/GEOMAlgo_StateCollector.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 -- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_StateCollector.cxx b/src/GEOMAlgo/GEOMAlgo_StateCollector.cxx
index 417bf3d94..78e58e3e7 100644
--- a/src/GEOMAlgo/GEOMAlgo_StateCollector.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_StateCollector.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_StateCollector.hxx b/src/GEOMAlgo/GEOMAlgo_StateCollector.hxx
index 0b3704100..da598fa45 100644
--- a/src/GEOMAlgo/GEOMAlgo_StateCollector.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_StateCollector.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_StateCollector.ixx b/src/GEOMAlgo/GEOMAlgo_StateCollector.ixx
index 6cdde7d8f..051a5c362 100644
--- a/src/GEOMAlgo/GEOMAlgo_StateCollector.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_StateCollector.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_StateCollector.jxx b/src/GEOMAlgo/GEOMAlgo_StateCollector.jxx
index 8d5573114..3aaaa8dde 100644
--- a/src/GEOMAlgo/GEOMAlgo_StateCollector.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_StateCollector.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_SurfaceTools.cdl b/src/GEOMAlgo/GEOMAlgo_SurfaceTools.cdl
index 91d782305..5c2f745ad 100644
--- a/src/GEOMAlgo/GEOMAlgo_SurfaceTools.cdl
+++ b/src/GEOMAlgo/GEOMAlgo_SurfaceTools.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 -- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_SurfaceTools.cxx b/src/GEOMAlgo/GEOMAlgo_SurfaceTools.cxx
index ad96ad376..56b70d5e5 100644
--- a/src/GEOMAlgo/GEOMAlgo_SurfaceTools.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_SurfaceTools.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_SurfaceTools.hxx b/src/GEOMAlgo/GEOMAlgo_SurfaceTools.hxx
index 1666bd84a..d405d91df 100644
--- a/src/GEOMAlgo/GEOMAlgo_SurfaceTools.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_SurfaceTools.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_SurfaceTools.ixx b/src/GEOMAlgo/GEOMAlgo_SurfaceTools.ixx
index e2dae505e..44c08deae 100644
--- a/src/GEOMAlgo/GEOMAlgo_SurfaceTools.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_SurfaceTools.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_SurfaceTools.jxx b/src/GEOMAlgo/GEOMAlgo_SurfaceTools.jxx
index f5518d073..515bbc9db 100644
--- a/src/GEOMAlgo/GEOMAlgo_SurfaceTools.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_SurfaceTools.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_Tools.cdl b/src/GEOMAlgo/GEOMAlgo_Tools.cdl
index 4d08662e5..a765e56bd 100644
--- a/src/GEOMAlgo/GEOMAlgo_Tools.cdl
+++ b/src/GEOMAlgo/GEOMAlgo_Tools.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 -- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 --
 -- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+--
 
 -- File:	GEOMAlgo_Tools.cdl
 -- Created:	Mon Dec  6 11:26:02 2004
diff --git a/src/GEOMAlgo/GEOMAlgo_Tools.cxx b/src/GEOMAlgo/GEOMAlgo_Tools.cxx
index 296b6928b..5b5a23e96 100644
--- a/src/GEOMAlgo/GEOMAlgo_Tools.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_Tools.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File:        GEOMAlgo_Tools.cxx
 // Created:     Mon Dec  6 11:35:29 2004
diff --git a/src/GEOMAlgo/GEOMAlgo_Tools.hxx b/src/GEOMAlgo/GEOMAlgo_Tools.hxx
index 30ff7cc51..e4fefabac 100644
--- a/src/GEOMAlgo/GEOMAlgo_Tools.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_Tools.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _GEOMAlgo_Tools_HeaderFile
 #define _GEOMAlgo_Tools_HeaderFile
diff --git a/src/GEOMAlgo/GEOMAlgo_Tools.ixx b/src/GEOMAlgo/GEOMAlgo_Tools.ixx
index b110f6cf7..28ebd1573 100644
--- a/src/GEOMAlgo/GEOMAlgo_Tools.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_Tools.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_Tools.jxx b/src/GEOMAlgo/GEOMAlgo_Tools.jxx
index 96e7c260a..f3305ace9 100644
--- a/src/GEOMAlgo/GEOMAlgo_Tools.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_Tools.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_Tools3D.cdl b/src/GEOMAlgo/GEOMAlgo_Tools3D.cdl
index a9d06da58..269b7bf5d 100755
--- a/src/GEOMAlgo/GEOMAlgo_Tools3D.cdl
+++ b/src/GEOMAlgo/GEOMAlgo_Tools3D.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 -- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_Tools3D.cxx b/src/GEOMAlgo/GEOMAlgo_Tools3D.cxx
index 4f400ac42..71652ea0d 100755
--- a/src/GEOMAlgo/GEOMAlgo_Tools3D.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_Tools3D.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 //  File    : GEOMAlgo_Tools3D.cxx
 //  Author  : Peter KURNEV
diff --git a/src/GEOMAlgo/GEOMAlgo_Tools3D.hxx b/src/GEOMAlgo/GEOMAlgo_Tools3D.hxx
index c89435b92..e23fa4917 100644
--- a/src/GEOMAlgo/GEOMAlgo_Tools3D.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_Tools3D.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _GEOMAlgo_Tools3D_HeaderFile
 #define _GEOMAlgo_Tools3D_HeaderFile
diff --git a/src/GEOMAlgo/GEOMAlgo_Tools3D.ixx b/src/GEOMAlgo/GEOMAlgo_Tools3D.ixx
index 63277acc6..636d0174d 100644
--- a/src/GEOMAlgo/GEOMAlgo_Tools3D.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_Tools3D.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_Tools3D.jxx b/src/GEOMAlgo/GEOMAlgo_Tools3D.jxx
index d03adb871..dacd81f3c 100644
--- a/src/GEOMAlgo/GEOMAlgo_Tools3D.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_Tools3D.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_Tools_1.cxx b/src/GEOMAlgo/GEOMAlgo_Tools_1.cxx
index ed8a7d6f6..9223836db 100644
--- a/src/GEOMAlgo/GEOMAlgo_Tools_1.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_Tools_1.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMAlgo/GEOMAlgo_VertexSolid.cdl b/src/GEOMAlgo/GEOMAlgo_VertexSolid.cdl
index 8a8221f3a..4cdb1cc56 100644
--- a/src/GEOMAlgo/GEOMAlgo_VertexSolid.cdl
+++ b/src/GEOMAlgo/GEOMAlgo_VertexSolid.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 -- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_VertexSolid.cxx b/src/GEOMAlgo/GEOMAlgo_VertexSolid.cxx
index 5c5ed522f..c182ece74 100644
--- a/src/GEOMAlgo/GEOMAlgo_VertexSolid.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_VertexSolid.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File:        GEOMAlgo_VertexSolid.cxx
 // Created:     Wed Jan 12 16:36:40 2005
diff --git a/src/GEOMAlgo/GEOMAlgo_VertexSolid.hxx b/src/GEOMAlgo/GEOMAlgo_VertexSolid.hxx
index b759fb989..826693fdc 100644
--- a/src/GEOMAlgo/GEOMAlgo_VertexSolid.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_VertexSolid.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_VertexSolid.ixx b/src/GEOMAlgo/GEOMAlgo_VertexSolid.ixx
index a512e20f3..c2faedfc5 100644
--- a/src/GEOMAlgo/GEOMAlgo_VertexSolid.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_VertexSolid.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_VertexSolid.jxx b/src/GEOMAlgo/GEOMAlgo_VertexSolid.jxx
index fc2e2daae..a93527759 100644
--- a/src/GEOMAlgo/GEOMAlgo_VertexSolid.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_VertexSolid.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_WESCorrector.cdl b/src/GEOMAlgo/GEOMAlgo_WESCorrector.cdl
index b87895470..34d4c0c63 100755
--- a/src/GEOMAlgo/GEOMAlgo_WESCorrector.cdl
+++ b/src/GEOMAlgo/GEOMAlgo_WESCorrector.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 -- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_WESCorrector.cxx b/src/GEOMAlgo/GEOMAlgo_WESCorrector.cxx
index 0eb721f4f..7a041087f 100755
--- a/src/GEOMAlgo/GEOMAlgo_WESCorrector.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_WESCorrector.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File:        NMTAlgo_WESCorrector.cxx
 // Author:      Peter KURNEV
diff --git a/src/GEOMAlgo/GEOMAlgo_WESCorrector.hxx b/src/GEOMAlgo/GEOMAlgo_WESCorrector.hxx
index afe8989bf..3b1571bdf 100644
--- a/src/GEOMAlgo/GEOMAlgo_WESCorrector.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_WESCorrector.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_WESCorrector.ixx b/src/GEOMAlgo/GEOMAlgo_WESCorrector.ixx
index 82b262cf2..2f98b1e8e 100644
--- a/src/GEOMAlgo/GEOMAlgo_WESCorrector.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_WESCorrector.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_WESCorrector.jxx b/src/GEOMAlgo/GEOMAlgo_WESCorrector.jxx
index 4f66dd96c..5c49eedb4 100644
--- a/src/GEOMAlgo/GEOMAlgo_WESCorrector.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_WESCorrector.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_WESScaler.cdl b/src/GEOMAlgo/GEOMAlgo_WESScaler.cdl
index c7b0e07aa..a4576c072 100644
--- a/src/GEOMAlgo/GEOMAlgo_WESScaler.cdl
+++ b/src/GEOMAlgo/GEOMAlgo_WESScaler.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- This library is free software; you can redistribute it and/or
 -- modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMAlgo/GEOMAlgo_WESScaler.cxx b/src/GEOMAlgo/GEOMAlgo_WESScaler.cxx
index 26c749acf..5b3341a10 100644
--- a/src/GEOMAlgo/GEOMAlgo_WESScaler.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_WESScaler.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMAlgo/GEOMAlgo_WESScaler.hxx b/src/GEOMAlgo/GEOMAlgo_WESScaler.hxx
index 5d33a6be7..8b9df122f 100644
--- a/src/GEOMAlgo/GEOMAlgo_WESScaler.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_WESScaler.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMAlgo/GEOMAlgo_WESScaler.ixx b/src/GEOMAlgo/GEOMAlgo_WESScaler.ixx
index 623d87b32..61f0ad3b0 100644
--- a/src/GEOMAlgo/GEOMAlgo_WESScaler.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_WESScaler.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMAlgo/GEOMAlgo_WESScaler.jxx b/src/GEOMAlgo/GEOMAlgo_WESScaler.jxx
index 027cd0278..068012de0 100644
--- a/src/GEOMAlgo/GEOMAlgo_WESScaler.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_WESScaler.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMAlgo/GEOMAlgo_WireEdgeSet.cdl b/src/GEOMAlgo/GEOMAlgo_WireEdgeSet.cdl
index 8f208a945..289a18bb8 100755
--- a/src/GEOMAlgo/GEOMAlgo_WireEdgeSet.cdl
+++ b/src/GEOMAlgo/GEOMAlgo_WireEdgeSet.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 -- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_WireEdgeSet.cxx b/src/GEOMAlgo/GEOMAlgo_WireEdgeSet.cxx
index 0d1bb7fa8..9e0a85433 100755
--- a/src/GEOMAlgo/GEOMAlgo_WireEdgeSet.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_WireEdgeSet.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_WireEdgeSet.hxx b/src/GEOMAlgo/GEOMAlgo_WireEdgeSet.hxx
index 8d4de9f29..0432d6943 100644
--- a/src/GEOMAlgo/GEOMAlgo_WireEdgeSet.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_WireEdgeSet.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_WireEdgeSet.ixx b/src/GEOMAlgo/GEOMAlgo_WireEdgeSet.ixx
index 516fc8dff..8c24d13f5 100644
--- a/src/GEOMAlgo/GEOMAlgo_WireEdgeSet.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_WireEdgeSet.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_WireEdgeSet.jxx b/src/GEOMAlgo/GEOMAlgo_WireEdgeSet.jxx
index d40e647ea..8b65519d0 100644
--- a/src/GEOMAlgo/GEOMAlgo_WireEdgeSet.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_WireEdgeSet.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_WireSolid.cdl b/src/GEOMAlgo/GEOMAlgo_WireSolid.cdl
index c43213820..de7588f4f 100644
--- a/src/GEOMAlgo/GEOMAlgo_WireSolid.cdl
+++ b/src/GEOMAlgo/GEOMAlgo_WireSolid.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 -- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_WireSolid.cxx b/src/GEOMAlgo/GEOMAlgo_WireSolid.cxx
index 3f33dea28..715fa5533 100644
--- a/src/GEOMAlgo/GEOMAlgo_WireSolid.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_WireSolid.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_WireSolid.hxx b/src/GEOMAlgo/GEOMAlgo_WireSolid.hxx
index d57cdc0c7..82ffd60fe 100644
--- a/src/GEOMAlgo/GEOMAlgo_WireSolid.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_WireSolid.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_WireSolid.ixx b/src/GEOMAlgo/GEOMAlgo_WireSolid.ixx
index b167891d1..ca53f6723 100644
--- a/src/GEOMAlgo/GEOMAlgo_WireSolid.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_WireSolid.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_WireSolid.jxx b/src/GEOMAlgo/GEOMAlgo_WireSolid.jxx
index fc56515b5..88f953cec 100644
--- a/src/GEOMAlgo/GEOMAlgo_WireSolid.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_WireSolid.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_WireSplitter.cdl b/src/GEOMAlgo/GEOMAlgo_WireSplitter.cdl
index 060481f96..db1821977 100755
--- a/src/GEOMAlgo/GEOMAlgo_WireSplitter.cdl
+++ b/src/GEOMAlgo/GEOMAlgo_WireSplitter.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 -- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_WireSplitter.cxx b/src/GEOMAlgo/GEOMAlgo_WireSplitter.cxx
index f365d0769..7cbdc8f6c 100755
--- a/src/GEOMAlgo/GEOMAlgo_WireSplitter.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_WireSplitter.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File:        GEOMAlgo_WireSplitter.cxx
 // Author:      Peter KURNEV
diff --git a/src/GEOMAlgo/GEOMAlgo_WireSplitter.hxx b/src/GEOMAlgo/GEOMAlgo_WireSplitter.hxx
index 5974bb503..673a20914 100644
--- a/src/GEOMAlgo/GEOMAlgo_WireSplitter.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_WireSplitter.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_WireSplitter.ixx b/src/GEOMAlgo/GEOMAlgo_WireSplitter.ixx
index 7f453ca0c..3a6fd5959 100644
--- a/src/GEOMAlgo/GEOMAlgo_WireSplitter.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_WireSplitter.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/GEOMAlgo_WireSplitter.jxx b/src/GEOMAlgo/GEOMAlgo_WireSplitter.jxx
index 6e6cd62a8..6d3af0b9a 100644
--- a/src/GEOMAlgo/GEOMAlgo_WireSplitter.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_WireSplitter.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/Handle_BlockFix_BlockFixAPI.hxx b/src/GEOMAlgo/Handle_BlockFix_BlockFixAPI.hxx
index bc7daabef..9a823485a 100644
--- a/src/GEOMAlgo/Handle_BlockFix_BlockFixAPI.hxx
+++ b/src/GEOMAlgo/Handle_BlockFix_BlockFixAPI.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/Handle_BlockFix_PeriodicSurfaceModifier.hxx b/src/GEOMAlgo/Handle_BlockFix_PeriodicSurfaceModifier.hxx
index 93fd00c01..3f7838436 100644
--- a/src/GEOMAlgo/Handle_BlockFix_PeriodicSurfaceModifier.hxx
+++ b/src/GEOMAlgo/Handle_BlockFix_PeriodicSurfaceModifier.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/Handle_BlockFix_SphereSpaceModifier.hxx b/src/GEOMAlgo/Handle_BlockFix_SphereSpaceModifier.hxx
index 29253a81a..ac7191b56 100644
--- a/src/GEOMAlgo/Handle_BlockFix_SphereSpaceModifier.hxx
+++ b/src/GEOMAlgo/Handle_BlockFix_SphereSpaceModifier.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/Handle_GEOMAlgo_Clsf.hxx b/src/GEOMAlgo/Handle_GEOMAlgo_Clsf.hxx
index da15fd29d..eb9bd7038 100644
--- a/src/GEOMAlgo/Handle_GEOMAlgo_Clsf.hxx
+++ b/src/GEOMAlgo/Handle_GEOMAlgo_Clsf.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/Handle_GEOMAlgo_ClsfBox.hxx b/src/GEOMAlgo/Handle_GEOMAlgo_ClsfBox.hxx
index 982217c8f..5667b30b8 100644
--- a/src/GEOMAlgo/Handle_GEOMAlgo_ClsfBox.hxx
+++ b/src/GEOMAlgo/Handle_GEOMAlgo_ClsfBox.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/Handle_GEOMAlgo_ClsfSolid.hxx b/src/GEOMAlgo/Handle_GEOMAlgo_ClsfSolid.hxx
index 2df0fc8ed..cd5d0d151 100644
--- a/src/GEOMAlgo/Handle_GEOMAlgo_ClsfSolid.hxx
+++ b/src/GEOMAlgo/Handle_GEOMAlgo_ClsfSolid.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMAlgo/Handle_GEOMAlgo_ClsfSurf.hxx b/src/GEOMAlgo/Handle_GEOMAlgo_ClsfSurf.hxx
index de47695fc..9464374fd 100644
--- a/src/GEOMAlgo/Handle_GEOMAlgo_ClsfSurf.hxx
+++ b/src/GEOMAlgo/Handle_GEOMAlgo_ClsfSurf.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/Handle_GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape.hxx b/src/GEOMAlgo/Handle_GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape.hxx
index 33966f75d..1d72173ac 100644
--- a/src/GEOMAlgo/Handle_GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape.hxx
+++ b/src/GEOMAlgo/Handle_GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -15,6 +15,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _Handle_GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape_HeaderFile
 #define _Handle_GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape_HeaderFile
diff --git a/src/GEOMAlgo/Handle_GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger.hxx b/src/GEOMAlgo/Handle_GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger.hxx
index f438781ba..c731d16d3 100644
--- a/src/GEOMAlgo/Handle_GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger.hxx
+++ b/src/GEOMAlgo/Handle_GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _Handle_GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger_HeaderFile
 #define _Handle_GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger_HeaderFile
diff --git a/src/GEOMAlgo/Handle_GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape.hxx b/src/GEOMAlgo/Handle_GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape.hxx
index 26cca94e4..f60fe7fc6 100644
--- a/src/GEOMAlgo/Handle_GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape.hxx
+++ b/src/GEOMAlgo/Handle_GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -15,6 +15,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _Handle_GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape_HeaderFile
 #define _Handle_GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape_HeaderFile
diff --git a/src/GEOMAlgo/Handle_GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape.hxx b/src/GEOMAlgo/Handle_GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape.hxx
index 36950c7c8..730be085e 100644
--- a/src/GEOMAlgo/Handle_GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape.hxx
+++ b/src/GEOMAlgo/Handle_GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _Handle_GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape_HeaderFile
 #define _Handle_GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape_HeaderFile
diff --git a/src/GEOMAlgo/Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapeMapOfShape.hxx b/src/GEOMAlgo/Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapeMapOfShape.hxx
index f14d3720c..aa7c289f4 100644
--- a/src/GEOMAlgo/Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapeMapOfShape.hxx
+++ b/src/GEOMAlgo/Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapeMapOfShape.hxx
@@ -1,23 +1,24 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapeMapOfShape_HeaderFile
 #define _Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapeMapOfShape_HeaderFile
diff --git a/src/GEOMAlgo/Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapePnt.hxx b/src/GEOMAlgo/Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapePnt.hxx
index 66eaa6179..87e5d56e9 100644
--- a/src/GEOMAlgo/Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapePnt.hxx
+++ b/src/GEOMAlgo/Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapePnt.hxx
@@ -1,23 +1,24 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapePnt_HeaderFile
 #define _Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapePnt_HeaderFile
diff --git a/src/GEOMAlgo/Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapeReal.hxx b/src/GEOMAlgo/Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapeReal.hxx
index 18c33d39c..6952cc9b5 100644
--- a/src/GEOMAlgo/Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapeReal.hxx
+++ b/src/GEOMAlgo/Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapeReal.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapeReal_HeaderFile
 #define _Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapeReal_HeaderFile
diff --git a/src/GEOMAlgo/Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet.hxx b/src/GEOMAlgo/Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet.hxx
index 01b72f7b7..82ffa4fca 100644
--- a/src/GEOMAlgo/Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet.hxx
+++ b/src/GEOMAlgo/Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet_HeaderFile
 #define _Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet_HeaderFile
diff --git a/src/GEOMAlgo/Handle_GEOMAlgo_HAlgo.hxx b/src/GEOMAlgo/Handle_GEOMAlgo_HAlgo.hxx
index 112efdf5f..8fc3ba405 100644
--- a/src/GEOMAlgo/Handle_GEOMAlgo_HAlgo.hxx
+++ b/src/GEOMAlgo/Handle_GEOMAlgo_HAlgo.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape.hxx b/src/GEOMAlgo/Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape.hxx
index c9db7549c..e868435d2 100644
--- a/src/GEOMAlgo/Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape.hxx
+++ b/src/GEOMAlgo/Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyListOfShape.hxx b/src/GEOMAlgo/Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyListOfShape.hxx
index bd376debb..0978f3678 100644
--- a/src/GEOMAlgo/Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyListOfShape.hxx
+++ b/src/GEOMAlgo/Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyListOfShape.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyShapeListOfShape.hxx b/src/GEOMAlgo/Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyShapeListOfShape.hxx
index cab9f93eb..dc3d4ccc8 100644
--- a/src/GEOMAlgo/Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyShapeListOfShape.hxx
+++ b/src/GEOMAlgo/Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyShapeListOfShape.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeBox.hxx b/src/GEOMAlgo/Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeBox.hxx
index a0ef7cbfd..e695dcdf9 100644
--- a/src/GEOMAlgo/Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeBox.hxx
+++ b/src/GEOMAlgo/Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeBox.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeShapeInfo.hxx b/src/GEOMAlgo/Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeShapeInfo.hxx
index 3811681a8..28474380d 100644
--- a/src/GEOMAlgo/Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeShapeInfo.hxx
+++ b/src/GEOMAlgo/Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeShapeInfo.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMAlgo/Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeState.hxx b/src/GEOMAlgo/Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeState.hxx
index 24114c066..8027299fb 100644
--- a/src/GEOMAlgo/Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeState.hxx
+++ b/src/GEOMAlgo/Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeState.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/Handle_GEOMAlgo_ListNodeOfListOfCoupleOfShapes.hxx b/src/GEOMAlgo/Handle_GEOMAlgo_ListNodeOfListOfCoupleOfShapes.hxx
index 70ad0c0ec..409531f1f 100644
--- a/src/GEOMAlgo/Handle_GEOMAlgo_ListNodeOfListOfCoupleOfShapes.hxx
+++ b/src/GEOMAlgo/Handle_GEOMAlgo_ListNodeOfListOfCoupleOfShapes.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/Handle_GEOMAlgo_ListNodeOfListOfPnt.hxx b/src/GEOMAlgo/Handle_GEOMAlgo_ListNodeOfListOfPnt.hxx
index 4d1c36fb0..dd6d2ae33 100644
--- a/src/GEOMAlgo/Handle_GEOMAlgo_ListNodeOfListOfPnt.hxx
+++ b/src/GEOMAlgo/Handle_GEOMAlgo_ListNodeOfListOfPnt.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo/Makefile.am b/src/GEOMAlgo/Makefile.am
index 90975da2b..db733bc4a 100644
--- a/src/GEOMAlgo/Makefile.am
+++ b/src/GEOMAlgo/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -15,6 +15,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
 
 # GEOM GEOMAlgo : tools for Glue Faces algorithm
 # File   : Makefile.am
diff --git a/src/GEOMAlgo_NEW/BlockFix.cdl b/src/GEOMAlgo_NEW/BlockFix.cdl
index 478685c9c..961af6625 100644
--- a/src/GEOMAlgo_NEW/BlockFix.cdl
+++ b/src/GEOMAlgo_NEW/BlockFix.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 -- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -42,19 +42,19 @@ uses
 is
 
     class SphereSpaceModifier;
-    
+
     class UnionFaces;
-    
+
     class UnionEdges;
-    
+
     class BlockFixAPI;
     	---Purpose: API class to perform the fixing of the
 	--          block
-    
+
     class PeriodicSurfaceModifier;
 
     class CheckTool;
-    
+
     RotateSphereSpace (S: Shape from TopoDS; Tol: Real)
     returns Shape from TopoDS;
 
diff --git a/src/GEOMAlgo_NEW/BlockFix.cxx b/src/GEOMAlgo_NEW/BlockFix.cxx
index ef9ca5578..22f230b9d 100644
--- a/src/GEOMAlgo_NEW/BlockFix.cxx
+++ b/src/GEOMAlgo_NEW/BlockFix.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -79,26 +79,26 @@ static void FixResult(const TopoDS_Shape& result,
     TopoDS_Face aFace = TopoDS::Face(aShape);
     TopLoc_Location L;
     Handle(Geom_Surface) Surf = BRep_Tool::Surface(aFace,L);
-    
+
     if( Surf->IsKind(STANDARD_TYPE(Geom_SphericalSurface)) ||
         Surf->IsKind(STANDARD_TYPE(Geom_CylindricalSurface)) ) {
-    
+
       Standard_Integer nbWires = 0;
       for (TopExp_Explorer ex_w(aFace,TopAbs_WIRE); ex_w.More(); ex_w.Next()) {
         nbWires++;
-        Handle(ShapeFix_Wire) sfw = new ShapeFix_Wire(TopoDS::Wire(ex_w.Current()), 
-                                                      aFace, 
+        Handle(ShapeFix_Wire) sfw = new ShapeFix_Wire(TopoDS::Wire(ex_w.Current()),
+                                                      aFace,
                                                       Precision::Confusion());
         sfw->FixReorder();
         if(sfw->StatusReorder ( ShapeExtend_FAIL ))
           continue;
-        
+
         sfw->SetPrecision(2.*Tol);
         sfw->FixShifted();
-        
+
         Standard_Boolean isDone = sfw->LastFixStatus ( ShapeExtend_DONE );
         isDone |= sfw->FixDegenerated();
-        
+
         // remove degenerated edges from not degenerated points
         ShapeAnalysis_Edge sae;
         Handle(ShapeExtend_WireData) sewd = sfw->WireData();
@@ -111,10 +111,10 @@ static void FixResult(const TopoDS_Shape& result,
             i--;
           }
         }
-        
+
         //isDone |= sfw->FixLacking(); // commented by skl 22.03.2005 (PAL8395)
-        
-        // remove neighbour seam edges 
+
+        // remove neighbour seam edges
         if(isDone) {
           for( i = 1; i<sewd->NbEdges();i++) {
             if(sewd->IsSeam(i) && sewd->IsSeam(i+1)) {
@@ -129,8 +129,8 @@ static void FixResult(const TopoDS_Shape& result,
             sewd->Remove(sewd->NbEdges());
           }
         }
-        
-               
+
+
         if(isDone) {
           TopoDS_Wire ResWire = sfw->Wire();
           Context->Replace(ex_w.Current(), ResWire);
@@ -143,7 +143,7 @@ static void FixResult(const TopoDS_Shape& result,
         if(sff->FixOrientation())
           Context->Replace(aFixedFace,sff->Face());
       }
-      
+
     }
   }
 }
@@ -154,11 +154,11 @@ static void FixResult(const TopoDS_Shape& result,
 
 //=======================================================================
 //function : ConvertToAnalytical
-//purpose  : 
+//purpose  :
 //=======================================================================
 
 TopoDS_Shape BlockFix::RotateSphereSpace (const TopoDS_Shape& S,
-                                          const Standard_Real Tol) 
+                                          const Standard_Real Tol)
 {
 
   // Create a modification description
@@ -168,17 +168,17 @@ TopoDS_Shape BlockFix::RotateSphereSpace (const TopoDS_Shape& S,
   TopTools_DataMapOfShapeShape context;
   BRepTools_Modifier MD;
   TopoDS_Shape result = ShapeCustom::ApplyModifier ( S, SR, context,MD );
-  
+
   Handle(ShapeBuild_ReShape) RS = new ShapeBuild_ReShape;
   FixResult(result,RS,Tol);
   result = RS->Apply(result);
-  
+
   ShapeFix_Edge sfe;
   for(TopExp_Explorer exp(result,TopAbs_EDGE); exp.More(); exp.Next()) {
     TopoDS_Edge E = TopoDS::Edge(exp.Current());
     sfe.FixVertexTolerance (E);
   }
-  
+
   ShapeFix::SameParameter(result,Standard_False);
   return result;
 }
@@ -186,11 +186,11 @@ TopoDS_Shape BlockFix::RotateSphereSpace (const TopoDS_Shape& S,
 
 //=======================================================================
 //function : FixRanges
-//purpose  : 
+//purpose  :
 //=======================================================================
 
 TopoDS_Shape BlockFix::FixRanges (const TopoDS_Shape& S,
-                                  const Standard_Real Tol) 
+                                  const Standard_Real Tol)
 {
   // Create a modification description
   Handle(BlockFix_PeriodicSurfaceModifier) SR = new BlockFix_PeriodicSurfaceModifier;
@@ -199,17 +199,17 @@ TopoDS_Shape BlockFix::FixRanges (const TopoDS_Shape& S,
   TopTools_DataMapOfShapeShape context;
   BRepTools_Modifier MD;
   TopoDS_Shape result = ShapeCustom::ApplyModifier ( S, SR, context,MD );
-  
+
   Handle(ShapeBuild_ReShape) RS = new ShapeBuild_ReShape;
   FixResult(result,RS,Tol);
   result = RS->Apply(result);
-  
+
   ShapeFix_Edge sfe;
   for(TopExp_Explorer exp(result,TopAbs_EDGE); exp.More(); exp.Next()) {
     TopoDS_Edge E = TopoDS::Edge(exp.Current());
     sfe.FixVertexTolerance (E);
   }
-  
+
   ShapeFix::SameParameter(result,Standard_False);
 
   return result;
diff --git a/src/GEOMAlgo_NEW/BlockFix.hxx b/src/GEOMAlgo_NEW/BlockFix.hxx
index 3bd612070..a6a357276 100644
--- a/src/GEOMAlgo_NEW/BlockFix.hxx
+++ b/src/GEOMAlgo_NEW/BlockFix.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -46,20 +46,20 @@ class BlockFix  {
 
 public:
 
-    void* operator new(size_t,void* anAddress) 
+    void* operator new(size_t,void* anAddress)
       {
         return anAddress;
       }
-    void* operator new(size_t size) 
-      { 
-        return Standard::Allocate(size); 
+    void* operator new(size_t size)
+      {
+        return Standard::Allocate(size);
       }
-    void  operator delete(void *anAddress) 
-      { 
-        if (anAddress) Standard::Free((Standard_Address&)anAddress); 
+    void  operator delete(void *anAddress)
+      {
+        if (anAddress) Standard::Free((Standard_Address&)anAddress);
       }
  // Methods PUBLIC
- // 
+ //
 Standard_EXPORT static  TopoDS_Shape RotateSphereSpace(const TopoDS_Shape& S,const Standard_Real Tol) ;
 Standard_EXPORT static  TopoDS_Shape FixRanges(const TopoDS_Shape& S,const Standard_Real Tol) ;
 
@@ -70,17 +70,17 @@ Standard_EXPORT static  TopoDS_Shape FixRanges(const TopoDS_Shape& S,const Stand
 protected:
 
  // Methods PROTECTED
- // 
+ //
 
 
  // Fields PROTECTED
  //
 
 
-private: 
+private:
 
  // Methods PRIVATE
- // 
+ //
 
 
  // Fields PRIVATE
diff --git a/src/GEOMAlgo_NEW/BlockFix.ixx b/src/GEOMAlgo_NEW/BlockFix.ixx
index 05477e7e1..2ea228ff7 100644
--- a/src/GEOMAlgo_NEW/BlockFix.ixx
+++ b/src/GEOMAlgo_NEW/BlockFix.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -22,6 +22,6 @@
 
 #include <BlockFix.jxx>
 
- 
+
 
 
diff --git a/src/GEOMAlgo_NEW/BlockFix.jxx b/src/GEOMAlgo_NEW/BlockFix.jxx
index 1cc0d609d..8649f8895 100644
--- a/src/GEOMAlgo_NEW/BlockFix.jxx
+++ b/src/GEOMAlgo_NEW/BlockFix.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo_NEW/BlockFix_BlockFixAPI.cdl b/src/GEOMAlgo_NEW/BlockFix_BlockFixAPI.cdl
index 85dd360e2..8cb4c49ce 100644
--- a/src/GEOMAlgo_NEW/BlockFix_BlockFixAPI.cdl
+++ b/src/GEOMAlgo_NEW/BlockFix_BlockFixAPI.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 -- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -26,43 +26,43 @@
 --
 class BlockFixAPI from BlockFix inherits TShared from MMgt
 
-	---Purpose: 
+	---Purpose:
 
 uses
 
     Shape from TopoDS,
-    ReShape from ShapeBuild 
+    ReShape from ShapeBuild
 
 is
     Create returns BlockFixAPI from BlockFix;
     	---Purpose: Empty constructor
-	
+
     SetShape(me: mutable; Shape: Shape from TopoDS);
     	---Purpose: Sets the shape to be operated on
 	---C++: inline
 
     Perform(me: mutable);
-    	---Purpose: 
-	
+    	---Purpose:
+
     Shape(me) returns Shape from TopoDS;
     	---Purpose: Returns resulting shape.
 	---C++: inline
-    
+
     Context(me:mutable) returns ReShape from ShapeBuild;
-    	---Purpose: Returns modifiable context for storing the 
+    	---Purpose: Returns modifiable context for storing the
 	--          mofifications
 	---C++: inline
     	---C++: return &
-    
+
     Tolerance (me:mutable) returns Real;
     	---Purpose: Returns modifiable tolerance of recognition
     	---C++: inline
     	---C++: return &
 
 fields
-    
+
     myContext     : ReShape from ShapeBuild;
     myShape       : Shape from TopoDS;
     myTolerance   : Real from Standard;
-  
+
 end BlockFixAPI from BlockFix;
diff --git a/src/GEOMAlgo_NEW/BlockFix_BlockFixAPI.cxx b/src/GEOMAlgo_NEW/BlockFix_BlockFixAPI.cxx
index 21281eefd..2aefa654e 100644
--- a/src/GEOMAlgo_NEW/BlockFix_BlockFixAPI.cxx
+++ b/src/GEOMAlgo_NEW/BlockFix_BlockFixAPI.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo_NEW/BlockFix_BlockFixAPI.hxx b/src/GEOMAlgo_NEW/BlockFix_BlockFixAPI.hxx
index 9100b6dac..7be25cc57 100644
--- a/src/GEOMAlgo_NEW/BlockFix_BlockFixAPI.hxx
+++ b/src/GEOMAlgo_NEW/BlockFix_BlockFixAPI.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -50,21 +50,21 @@ class TopoDS_Shape;
 class BlockFix_BlockFixAPI : public MMgt_TShared
 {
 public:
-  void* operator new(size_t,void* anAddress) 
+  void* operator new(size_t,void* anAddress)
   {
     return anAddress;
   }
-  void* operator new(size_t size) 
-  { 
-    return Standard::Allocate(size); 
+  void* operator new(size_t size)
+  {
+    return Standard::Allocate(size);
   }
-  void  operator delete(void *anAddress) 
-  { 
-    if (anAddress) Standard::Free((Standard_Address&)anAddress); 
+  void  operator delete(void *anAddress)
+  {
+    if (anAddress) Standard::Free((Standard_Address&)anAddress);
   }
 
   // Methods PUBLIC
-  // 
+  //
   Standard_EXPORT BlockFix_BlockFixAPI();
   void SetShape(const TopoDS_Shape& Shape);
   Standard_EXPORT   void Perform();
@@ -80,7 +80,7 @@ public:
   Standard_EXPORT const Handle(Standard_Type)& DynamicType() const;
   Standard_EXPORT Standard_Boolean             IsKind(const Handle(Standard_Type)&) const;
 
-private: 
+private:
   // Fields PRIVATE
   //
   Handle_ShapeBuild_ReShape myContext;
diff --git a/src/GEOMAlgo_NEW/BlockFix_BlockFixAPI.ixx b/src/GEOMAlgo_NEW/BlockFix_BlockFixAPI.ixx
index 55c205dc1..4d06a875e 100644
--- a/src/GEOMAlgo_NEW/BlockFix_BlockFixAPI.ixx
+++ b/src/GEOMAlgo_NEW/BlockFix_BlockFixAPI.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -27,7 +27,7 @@
 #endif
 
 BlockFix_BlockFixAPI::~BlockFix_BlockFixAPI() {}
- 
+
 
 
 Standard_EXPORT Handle_Standard_Type& BlockFix_BlockFixAPI_Type_()
@@ -37,7 +37,7 @@ Standard_EXPORT Handle_Standard_Type& BlockFix_BlockFixAPI_Type_()
   if ( aType1.IsNull()) aType1 = STANDARD_TYPE(MMgt_TShared);
   static Handle_Standard_Type aType2 = STANDARD_TYPE(Standard_Transient);
   if ( aType2.IsNull()) aType2 = STANDARD_TYPE(Standard_Transient);
- 
+
 
   static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,NULL};
   static Handle_Standard_Type _aType = new Standard_Type("BlockFix_BlockFixAPI",
@@ -53,7 +53,7 @@ Standard_EXPORT Handle_Standard_Type& BlockFix_BlockFixAPI_Type_()
 // DownCast method
 //   allow safe downcasting
 //
-const Handle(BlockFix_BlockFixAPI) Handle(BlockFix_BlockFixAPI)::DownCast(const Handle(Standard_Transient)& AnObject) 
+const Handle(BlockFix_BlockFixAPI) Handle(BlockFix_BlockFixAPI)::DownCast(const Handle(Standard_Transient)& AnObject)
 {
   Handle(BlockFix_BlockFixAPI) _anOtherObject;
 
@@ -65,13 +65,13 @@ const Handle(BlockFix_BlockFixAPI) Handle(BlockFix_BlockFixAPI)::DownCast(const
 
   return _anOtherObject ;
 }
-const Handle(Standard_Type)& BlockFix_BlockFixAPI::DynamicType() const 
-{ 
-  return STANDARD_TYPE(BlockFix_BlockFixAPI) ; 
+const Handle(Standard_Type)& BlockFix_BlockFixAPI::DynamicType() const
+{
+  return STANDARD_TYPE(BlockFix_BlockFixAPI) ;
 }
-Standard_Boolean BlockFix_BlockFixAPI::IsKind(const Handle(Standard_Type)& AType) const 
-{ 
-  return (STANDARD_TYPE(BlockFix_BlockFixAPI) == AType || MMgt_TShared::IsKind(AType)); 
+Standard_Boolean BlockFix_BlockFixAPI::IsKind(const Handle(Standard_Type)& AType) const
+{
+  return (STANDARD_TYPE(BlockFix_BlockFixAPI) == AType || MMgt_TShared::IsKind(AType));
 }
 Handle_BlockFix_BlockFixAPI::~Handle_BlockFix_BlockFixAPI() {}
 
diff --git a/src/GEOMAlgo_NEW/BlockFix_BlockFixAPI.jxx b/src/GEOMAlgo_NEW/BlockFix_BlockFixAPI.jxx
index 81f42ef35..945a6ed88 100644
--- a/src/GEOMAlgo_NEW/BlockFix_BlockFixAPI.jxx
+++ b/src/GEOMAlgo_NEW/BlockFix_BlockFixAPI.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo_NEW/BlockFix_BlockFixAPI.lxx b/src/GEOMAlgo_NEW/BlockFix_BlockFixAPI.lxx
index 6184d5aca..5992e1794 100644
--- a/src/GEOMAlgo_NEW/BlockFix_BlockFixAPI.lxx
+++ b/src/GEOMAlgo_NEW/BlockFix_BlockFixAPI.lxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -24,7 +24,7 @@
 
 //=======================================================================
 //function : SetShape
-//purpose  : 
+//purpose  :
 //=======================================================================
 
 inline void BlockFix_BlockFixAPI::SetShape(const TopoDS_Shape& Shape)
@@ -34,7 +34,7 @@ inline void BlockFix_BlockFixAPI::SetShape(const TopoDS_Shape& Shape)
 
 //=======================================================================
 //function : Shape
-//purpose  : 
+//purpose  :
 //=======================================================================
 
 inline TopoDS_Shape BlockFix_BlockFixAPI::Shape() const
@@ -44,7 +44,7 @@ inline TopoDS_Shape BlockFix_BlockFixAPI::Shape() const
 
 //=======================================================================
 //function : Context
-//purpose  : 
+//purpose  :
 //=======================================================================
 
 inline Handle(ShapeBuild_ReShape)& BlockFix_BlockFixAPI::Context()
@@ -54,7 +54,7 @@ inline Handle(ShapeBuild_ReShape)& BlockFix_BlockFixAPI::Context()
 
 //=======================================================================
 //function : Tolerance
-//purpose  : 
+//purpose  :
 //=======================================================================
 
 inline Standard_Real& BlockFix_BlockFixAPI::Tolerance()
@@ -64,7 +64,7 @@ inline Standard_Real& BlockFix_BlockFixAPI::Tolerance()
 
 //=======================================================================
 //function : OptimumNbFaces
-//purpose  : 
+//purpose  :
 //=======================================================================
 
 inline Standard_Integer& BlockFix_BlockFixAPI::OptimumNbFaces()
diff --git a/src/GEOMAlgo_NEW/BlockFix_CheckTool.cdl b/src/GEOMAlgo_NEW/BlockFix_CheckTool.cdl
index dce838ad3..c5423377f 100644
--- a/src/GEOMAlgo_NEW/BlockFix_CheckTool.cdl
+++ b/src/GEOMAlgo_NEW/BlockFix_CheckTool.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 -- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -27,7 +27,7 @@
 class CheckTool from BlockFix
 
     	---Purpose:
-	
+
 uses
 
     Shape from TopoDS,
@@ -37,18 +37,18 @@ is
 
     Create returns CheckTool from BlockFix;
     	---Purpose: Empty constructor
-    
+
     SetShape(me: in out; aShape: Shape from TopoDS);
 
     Perform(me: in out);
-    	---Purpose: 
-	
+    	---Purpose:
+
     NbPossibleBlocks(me) returns Integer;
-    
+
     PossibleBlock(me; num: Integer) returns Shape from TopoDS;
 
     DumpCheckResult(me; S : in out OStream);
-    	---Purpose: Dumps results of checking 
+    	---Purpose: Dumps results of checking
 
 
 fields
@@ -63,5 +63,5 @@ fields
     myNbUE       : Integer;
     myNbUFUE     : Integer;
     myBadRanges  : Integer;
-    
+
 end CheckTool;
diff --git a/src/GEOMAlgo_NEW/BlockFix_CheckTool.cxx b/src/GEOMAlgo_NEW/BlockFix_CheckTool.cxx
index b936d9d4a..674ef69dd 100644
--- a/src/GEOMAlgo_NEW/BlockFix_CheckTool.cxx
+++ b/src/GEOMAlgo_NEW/BlockFix_CheckTool.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -57,7 +57,7 @@ BlockFix_CheckTool::BlockFix_CheckTool( )
 
 //=======================================================================
 //function : SetShape
-//purpose  : 
+//purpose  :
 //=======================================================================
 
 void BlockFix_CheckTool::SetShape(const TopoDS_Shape& aShape)
@@ -70,10 +70,10 @@ void BlockFix_CheckTool::SetShape(const TopoDS_Shape& aShape)
 
 //=======================================================================
 //function : Perform
-//purpose  : 
+//purpose  :
 //=======================================================================
 
-void BlockFix_CheckTool::Perform() 
+void BlockFix_CheckTool::Perform()
 {
   myNbSolids=0;
   myNbBlocks=0;
@@ -209,7 +209,7 @@ void BlockFix_CheckTool::Perform()
       }
     }
 
-    if (IsBlock) 
+    if (IsBlock)
       myNbBlocks++;
     else {
       if (MayBeUF) {
@@ -232,7 +232,7 @@ void BlockFix_CheckTool::Perform()
 
 //=======================================================================
 //function : NbPossibleBlocks
-//purpose  : 
+//purpose  :
 //=======================================================================
 
 Standard_Integer BlockFix_CheckTool::NbPossibleBlocks() const
@@ -243,13 +243,13 @@ Standard_Integer BlockFix_CheckTool::NbPossibleBlocks() const
 
 //=======================================================================
 //function : PossibleBlock
-//purpose  : 
+//purpose  :
 //=======================================================================
 
 TopoDS_Shape BlockFix_CheckTool::PossibleBlock(const Standard_Integer num) const
 {
   TopoDS_Shape res;
-  if( num>0 && num<=myPossibleBlocks.Length() ) 
+  if( num>0 && num<=myPossibleBlocks.Length() )
     res = myPossibleBlocks.Value(num);
   return res;
 }
@@ -257,7 +257,7 @@ TopoDS_Shape BlockFix_CheckTool::PossibleBlock(const Standard_Integer num) const
 
 //=======================================================================
 //function : DumpCheckResult
-//purpose  : 
+//purpose  :
 //=======================================================================
 
 void BlockFix_CheckTool::DumpCheckResult(Standard_OStream& S) const
diff --git a/src/GEOMAlgo_NEW/BlockFix_CheckTool.hxx b/src/GEOMAlgo_NEW/BlockFix_CheckTool.hxx
index 884309297..652319e42 100644
--- a/src/GEOMAlgo_NEW/BlockFix_CheckTool.hxx
+++ b/src/GEOMAlgo_NEW/BlockFix_CheckTool.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -52,20 +52,20 @@ class BlockFix_CheckTool  {
 
 public:
 
-    void* operator new(size_t,void* anAddress) 
+    void* operator new(size_t,void* anAddress)
       {
         return anAddress;
       }
-    void* operator new(size_t size) 
-      { 
-        return Standard::Allocate(size); 
+    void* operator new(size_t size)
+      {
+        return Standard::Allocate(size);
       }
-    void  operator delete(void *anAddress) 
-      { 
-        if (anAddress) Standard::Free((Standard_Address&)anAddress); 
+    void  operator delete(void *anAddress)
+      {
+        if (anAddress) Standard::Free((Standard_Address&)anAddress);
       }
  // Methods PUBLIC
- // 
+ //
 Standard_EXPORT BlockFix_CheckTool();
 Standard_EXPORT   void SetShape(const TopoDS_Shape& aShape) ;
 Standard_EXPORT   void Perform() ;
@@ -80,17 +80,17 @@ Standard_EXPORT   void DumpCheckResult(Standard_OStream& S) const;
 protected:
 
  // Methods PROTECTED
- // 
+ //
 
 
  // Fields PROTECTED
  //
 
 
-private: 
+private:
 
  // Methods PRIVATE
- // 
+ //
 
 
  // Fields PRIVATE
diff --git a/src/GEOMAlgo_NEW/BlockFix_CheckTool.ixx b/src/GEOMAlgo_NEW/BlockFix_CheckTool.ixx
index 06c110b1d..d44f98056 100644
--- a/src/GEOMAlgo_NEW/BlockFix_CheckTool.ixx
+++ b/src/GEOMAlgo_NEW/BlockFix_CheckTool.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -22,6 +22,6 @@
 
 #include <BlockFix_CheckTool.jxx>
 
- 
+
 
 
diff --git a/src/GEOMAlgo_NEW/BlockFix_CheckTool.jxx b/src/GEOMAlgo_NEW/BlockFix_CheckTool.jxx
index ba5c9672d..7574af057 100644
--- a/src/GEOMAlgo_NEW/BlockFix_CheckTool.jxx
+++ b/src/GEOMAlgo_NEW/BlockFix_CheckTool.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo_NEW/BlockFix_PeriodicSurfaceModifier.cdl b/src/GEOMAlgo_NEW/BlockFix_PeriodicSurfaceModifier.cdl
index b654d6182..374af919c 100644
--- a/src/GEOMAlgo_NEW/BlockFix_PeriodicSurfaceModifier.cdl
+++ b/src/GEOMAlgo_NEW/BlockFix_PeriodicSurfaceModifier.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 -- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -24,12 +24,12 @@
 --  Created:	Wed Dec 15 10:03:50 2004
 --  Author:	Sergey KUUL
 --
-class PeriodicSurfaceModifier from BlockFix inherits Modification from BRepTools 
+class PeriodicSurfaceModifier from BlockFix inherits Modification from BRepTools
 
-	---Purpose: 
+	---Purpose:
 
 uses
-    Vertex   from TopoDS, 
+    Vertex   from TopoDS,
     Edge     from TopoDS,
     Face     from TopoDS,
     Location from TopLoc,
@@ -42,9 +42,9 @@ uses
     DataMapOfShapeInteger from TopTools
 
 is
-    
+
     Create returns mutable PeriodicSurfaceModifier from BlockFix;
-    
+
     SetTolerance(me: mutable; Toler: Real);
     	---Purpose: Sets the tolerance for recognition of geometry
 
@@ -61,7 +61,7 @@ is
 	--          the new tolerance.  Otherwise, returns
 	--          Standard_False, and <S>, <L>, <Tol> are  not
 	--          significant.
-	
+
     NewCurve(me: mutable; E  :     Edge     from TopoDS;
                           C  : out Curve    from Geom;
 		          L  : out Location from TopLoc;
@@ -95,10 +95,10 @@ is
 	--          curve on surface on the face <F>.In this case, <C>
 	--          is the new geometric support of  the edge, <L> the
 	--          new location, <Tol> the new tolerance.
-	--          
+	--
 	--          Otherwise, returns  Standard_False, and <C>,  <L>,
 	--          <Tol> are not significant.
-	--          
+	--
 	--          <NewE> is the new  edge created from  <E>.  <NewF>
 	--          is the new face created from <F>. They may be usefull.
 
@@ -120,14 +120,14 @@ is
     returns Shape from GeomAbs;
 	---Purpose: Returns the  continuity of  <NewE> between <NewF1>
 	--          and <NewF2>.
-	--          
+	--
 	--          <NewE> is the new  edge created from <E>.  <NewF1>
 	--          (resp. <NewF2>) is the new  face created from <F1>
 	--          (resp. <F2>).
-    
 
-fields 
-    
+
+fields
+
     myTolerance    : Real;
     myMapOfFaces   : DataMapOfShapeInteger from TopTools;
     myMapOfSurfaces: IndexedMapOfTransient from TColStd;
diff --git a/src/GEOMAlgo_NEW/BlockFix_PeriodicSurfaceModifier.cxx b/src/GEOMAlgo_NEW/BlockFix_PeriodicSurfaceModifier.cxx
index 2d001d179..1e9f33ca0 100644
--- a/src/GEOMAlgo_NEW/BlockFix_PeriodicSurfaceModifier.cxx
+++ b/src/GEOMAlgo_NEW/BlockFix_PeriodicSurfaceModifier.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File:      BlockFix_PeriodicSurfaceModifier.cxx
 // Created:   15.12.04 10:08:50
@@ -48,7 +49,7 @@ BlockFix_PeriodicSurfaceModifier::BlockFix_PeriodicSurfaceModifier (  )
 
 //=======================================================================
 //function : SetTolerance
-//purpose  : 
+//purpose  :
 //=======================================================================
 
 void BlockFix_PeriodicSurfaceModifier::SetTolerance(const Standard_Real Tol)
@@ -69,7 +70,7 @@ static Standard_Boolean ModifySurface(const TopoDS_Face& aFace,
   Handle(Geom_Surface) S = aSurface;
 
   if(S->IsKind(STANDARD_TYPE(Geom_CylindricalSurface))) {
-    Handle(Geom_CylindricalSurface) aCyl = 
+    Handle(Geom_CylindricalSurface) aCyl =
       Handle(Geom_CylindricalSurface)::DownCast(S);
     Standard_Real Umin, Umax, Vmin, Vmax;
     BRepTools::UVBounds(aFace, Umin, Umax, Vmin, Vmax);
@@ -83,7 +84,7 @@ static Standard_Boolean ModifySurface(const TopoDS_Face& aFace,
       return Standard_True;
     }
   }
-  
+
   if(S->IsKind(STANDARD_TYPE(Geom_SphericalSurface))) {
     Handle(Geom_SphericalSurface) aSphere = Handle(Geom_SphericalSurface)::DownCast(S);
     Standard_Real Umin, Umax, Vmin, Vmax;
@@ -100,30 +101,30 @@ static Standard_Boolean ModifySurface(const TopoDS_Face& aFace,
 
   return Standard_False;
 }
-                                      
+
 
 //=======================================================================
 //function : NewSurface
-//purpose  : 
+//purpose  :
 //=======================================================================
 
 Standard_Boolean BlockFix_PeriodicSurfaceModifier::NewSurface(const TopoDS_Face& F,
                                                               Handle(Geom_Surface)& S,
                                                               TopLoc_Location& L,Standard_Real& Tol,
                                                               Standard_Boolean& RevWires,
-                                                              Standard_Boolean& RevFace) 
+                                                              Standard_Boolean& RevFace)
 {
   TopLoc_Location LS;
   Handle(Geom_Surface) SIni = BRep_Tool::Surface(F, LS);
-  
+
   if(ModifySurface(F, SIni, S)) {
-  
+
     RevWires = Standard_False;
     RevFace = Standard_False;
-    
+
     L = LS;
     Tol = BRep_Tool::Tolerance(F);
-     
+
     Standard_Integer anIndex = myMapOfSurfaces.Add(S);
     myMapOfFaces.Bind(F,anIndex);
     return Standard_True;
@@ -135,13 +136,13 @@ Standard_Boolean BlockFix_PeriodicSurfaceModifier::NewSurface(const TopoDS_Face&
 
 //=======================================================================
 //function : NewCurve
-//purpose  : 
+//purpose  :
 //=======================================================================
 
 Standard_Boolean BlockFix_PeriodicSurfaceModifier::NewCurve(const TopoDS_Edge& /*E*/,
                                                             Handle(Geom_Curve)& /*C*/,
                                                             TopLoc_Location& /*L*/,
-                                                            Standard_Real& /*Tol*/) 
+                                                            Standard_Real& /*Tol*/)
 {
   return Standard_False;
 }
@@ -149,12 +150,12 @@ Standard_Boolean BlockFix_PeriodicSurfaceModifier::NewCurve(const TopoDS_Edge& /
 
 //=======================================================================
 //function : NewPoint
-//purpose  : 
+//purpose  :
 //=======================================================================
 
 Standard_Boolean BlockFix_PeriodicSurfaceModifier::NewPoint(const TopoDS_Vertex& /*V*/,
                                                             gp_Pnt& /*P*/,
-                                                            Standard_Real& /*Tol*/) 
+                                                            Standard_Real& /*Tol*/)
 {
   return Standard_False;
 }
@@ -162,7 +163,7 @@ Standard_Boolean BlockFix_PeriodicSurfaceModifier::NewPoint(const TopoDS_Vertex&
 
 //=======================================================================
 //function : NewCurve2d
-//purpose  : 
+//purpose  :
 //=======================================================================
 
 Standard_Boolean BlockFix_PeriodicSurfaceModifier::NewCurve2d(const TopoDS_Edge& E,
@@ -170,47 +171,47 @@ Standard_Boolean BlockFix_PeriodicSurfaceModifier::NewCurve2d(const TopoDS_Edge&
                                                               const TopoDS_Edge& /*NewE*/,
                                                               const TopoDS_Face& /*NewF*/,
                                                               Handle(Geom2d_Curve)& C,
-                                                              Standard_Real& Tol) 
+                                                              Standard_Real& Tol)
 {
   //check if undelying surface of the face was modified
   if(myMapOfFaces.IsBound(F)) {
     Standard_Integer anIndex = myMapOfFaces.Find(F);
-    
+
     Handle(Geom_Surface) aNewSurf = Handle(Geom_Surface)::DownCast(myMapOfSurfaces.FindKey(anIndex));
-    
+
     Standard_Real f,l;
     TopLoc_Location LC, LS;
     Handle(Geom_Curve) C3d = BRep_Tool::Curve ( E, LC, f, l );
     Handle(Geom_Surface) S = BRep_Tool::Surface(F, LS);
-  
+
     //taking into accound the orientation of the seam
     C = BRep_Tool::CurveOnSurface(E,F,f,l);
     Tol = BRep_Tool::Tolerance(E);
-     
+
     BRep_Builder B;
     TopoDS_Edge TempE;
     B.MakeEdge(TempE);
     B.Add(TempE, TopExp::FirstVertex(E));
     B.Add(TempE, TopExp::LastVertex(E));
 
-    if(!C3d.IsNull()) 
+    if(!C3d.IsNull())
       B.UpdateEdge(TempE, Handle(Geom_Curve)::DownCast(C3d->Transformed(LC.Transformation())), Precision::Confusion());
     B.Range(TempE, f, l);
-    
+
     Handle(ShapeFix_Edge) sfe = new ShapeFix_Edge;
     Handle(Geom_Surface) STemp = Handle(Geom_Surface)::DownCast(aNewSurf->Transformed(LS.Transformation()));
     TopLoc_Location LTemp;
     LTemp.Identity();
-    
+
     Standard_Boolean isClosed = BRep_Tool::IsClosed (E, F);
     Standard_Real aWorkTol = 2*myTolerance+Tol;
     sfe->FixAddPCurve(TempE, STemp, LTemp, isClosed, Max(Precision::Confusion(), aWorkTol));
     sfe->FixSameParameter(TempE);
-      
+
     //keep the orientation of original edge
     TempE.Orientation(E.Orientation());
     C = BRep_Tool::CurveOnSurface(TempE, STemp, LTemp, f, l);
-    
+
     //surface was modified
     return Standard_True;
   }
@@ -221,13 +222,13 @@ Standard_Boolean BlockFix_PeriodicSurfaceModifier::NewCurve2d(const TopoDS_Edge&
 
 //=======================================================================
 //function : NewParameter
-//purpose  : 
+//purpose  :
 //=======================================================================
 
 Standard_Boolean BlockFix_PeriodicSurfaceModifier::NewParameter(const TopoDS_Vertex& /*V*/,
                                                                 const TopoDS_Edge& /*E*/,
                                                                 Standard_Real& /*P*/,
-                                                                Standard_Real& /*Tol*/) 
+                                                                Standard_Real& /*Tol*/)
 {
   return Standard_False;
 }
@@ -235,7 +236,7 @@ Standard_Boolean BlockFix_PeriodicSurfaceModifier::NewParameter(const TopoDS_Ver
 
 //=======================================================================
 //function : Continuity
-//purpose  : 
+//purpose  :
 //=======================================================================
 
 GeomAbs_Shape BlockFix_PeriodicSurfaceModifier::Continuity(const TopoDS_Edge& E,
@@ -243,7 +244,7 @@ GeomAbs_Shape BlockFix_PeriodicSurfaceModifier::Continuity(const TopoDS_Edge& E,
                                                            const TopoDS_Face& F2,
                                                            const TopoDS_Edge& /*NewE*/,
                                                            const TopoDS_Face& /*NewF1*/,
-                                                           const TopoDS_Face& /*NewF2*/) 
+                                                           const TopoDS_Face& /*NewF2*/)
 {
   return BRep_Tool::Continuity(E,F1,F2);
 }
diff --git a/src/GEOMAlgo_NEW/BlockFix_PeriodicSurfaceModifier.hxx b/src/GEOMAlgo_NEW/BlockFix_PeriodicSurfaceModifier.hxx
index 78973d0f3..39d2062ea 100644
--- a/src/GEOMAlgo_NEW/BlockFix_PeriodicSurfaceModifier.hxx
+++ b/src/GEOMAlgo_NEW/BlockFix_PeriodicSurfaceModifier.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -71,20 +71,20 @@ class BlockFix_PeriodicSurfaceModifier : public BRepTools_Modification {
 
 public:
 
-    void* operator new(size_t,void* anAddress) 
+    void* operator new(size_t,void* anAddress)
       {
         return anAddress;
       }
-    void* operator new(size_t size) 
-      { 
-        return Standard::Allocate(size); 
+    void* operator new(size_t size)
+      {
+        return Standard::Allocate(size);
       }
-    void  operator delete(void *anAddress) 
-      { 
-        if (anAddress) Standard::Free((Standard_Address&)anAddress); 
+    void  operator delete(void *anAddress)
+      {
+        if (anAddress) Standard::Free((Standard_Address&)anAddress);
       }
  // Methods PUBLIC
- // 
+ //
 Standard_EXPORT BlockFix_PeriodicSurfaceModifier();
 Standard_EXPORT   void SetTolerance(const Standard_Real Toler) ;
 Standard_EXPORT   Standard_Boolean NewSurface(const TopoDS_Face& F,Handle(Geom_Surface)& S,TopLoc_Location& L,Standard_Real& Tol,Standard_Boolean& RevWires,Standard_Boolean& RevFace) ;
@@ -107,17 +107,17 @@ Standard_EXPORT ~BlockFix_PeriodicSurfaceModifier();
 protected:
 
  // Methods PROTECTED
- // 
+ //
 
 
  // Fields PROTECTED
  //
 
 
-private: 
+private:
 
  // Methods PRIVATE
- // 
+ //
 
 
  // Fields PRIVATE
diff --git a/src/GEOMAlgo_NEW/BlockFix_PeriodicSurfaceModifier.ixx b/src/GEOMAlgo_NEW/BlockFix_PeriodicSurfaceModifier.ixx
index 8625b1650..da3bdc95e 100644
--- a/src/GEOMAlgo_NEW/BlockFix_PeriodicSurfaceModifier.ixx
+++ b/src/GEOMAlgo_NEW/BlockFix_PeriodicSurfaceModifier.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -27,7 +27,7 @@
 #endif
 
 BlockFix_PeriodicSurfaceModifier::~BlockFix_PeriodicSurfaceModifier() {}
- 
+
 
 
 Standard_EXPORT Handle_Standard_Type& BlockFix_PeriodicSurfaceModifier_Type_()
@@ -39,7 +39,7 @@ Standard_EXPORT Handle_Standard_Type& BlockFix_PeriodicSurfaceModifier_Type_()
   if ( aType2.IsNull()) aType2 = STANDARD_TYPE(MMgt_TShared);
   static Handle_Standard_Type aType3 = STANDARD_TYPE(Standard_Transient);
   if ( aType3.IsNull()) aType3 = STANDARD_TYPE(Standard_Transient);
- 
+
 
   static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,aType3,NULL};
   static Handle_Standard_Type _aType = new Standard_Type("BlockFix_PeriodicSurfaceModifier",
@@ -55,7 +55,7 @@ Standard_EXPORT Handle_Standard_Type& BlockFix_PeriodicSurfaceModifier_Type_()
 // DownCast method
 //   allow safe downcasting
 //
-const Handle(BlockFix_PeriodicSurfaceModifier) Handle(BlockFix_PeriodicSurfaceModifier)::DownCast(const Handle(Standard_Transient)& AnObject) 
+const Handle(BlockFix_PeriodicSurfaceModifier) Handle(BlockFix_PeriodicSurfaceModifier)::DownCast(const Handle(Standard_Transient)& AnObject)
 {
   Handle(BlockFix_PeriodicSurfaceModifier) _anOtherObject;
 
@@ -67,13 +67,13 @@ const Handle(BlockFix_PeriodicSurfaceModifier) Handle(BlockFix_PeriodicSurfaceMo
 
   return _anOtherObject ;
 }
-const Handle(Standard_Type)& BlockFix_PeriodicSurfaceModifier::DynamicType() const 
-{ 
-  return STANDARD_TYPE(BlockFix_PeriodicSurfaceModifier) ; 
+const Handle(Standard_Type)& BlockFix_PeriodicSurfaceModifier::DynamicType() const
+{
+  return STANDARD_TYPE(BlockFix_PeriodicSurfaceModifier) ;
 }
-Standard_Boolean BlockFix_PeriodicSurfaceModifier::IsKind(const Handle(Standard_Type)& AType) const 
-{ 
-  return (STANDARD_TYPE(BlockFix_PeriodicSurfaceModifier) == AType || BRepTools_Modification::IsKind(AType)); 
+Standard_Boolean BlockFix_PeriodicSurfaceModifier::IsKind(const Handle(Standard_Type)& AType) const
+{
+  return (STANDARD_TYPE(BlockFix_PeriodicSurfaceModifier) == AType || BRepTools_Modification::IsKind(AType));
 }
 Handle_BlockFix_PeriodicSurfaceModifier::~Handle_BlockFix_PeriodicSurfaceModifier() {}
 
diff --git a/src/GEOMAlgo_NEW/BlockFix_PeriodicSurfaceModifier.jxx b/src/GEOMAlgo_NEW/BlockFix_PeriodicSurfaceModifier.jxx
index 3ceaab7d2..29c1c1e34 100644
--- a/src/GEOMAlgo_NEW/BlockFix_PeriodicSurfaceModifier.jxx
+++ b/src/GEOMAlgo_NEW/BlockFix_PeriodicSurfaceModifier.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo_NEW/BlockFix_SphereSpaceModifier.cdl b/src/GEOMAlgo_NEW/BlockFix_SphereSpaceModifier.cdl
index 69e4cd9ec..da614611b 100644
--- a/src/GEOMAlgo_NEW/BlockFix_SphereSpaceModifier.cdl
+++ b/src/GEOMAlgo_NEW/BlockFix_SphereSpaceModifier.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 -- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -24,13 +24,13 @@
 --  Created:	Tue Dec  7 12:01:49 2004
 --  Author:	Pavel Durandin
 --
-class SphereSpaceModifier from BlockFix inherits Modification from BRepTools 
+class SphereSpaceModifier from BlockFix inherits Modification from BRepTools
 
 	---Purpose: Rotation of the parametric space of the sphere in order
         --          to avoid the seam and degenerared edge within it
 
 uses
-    Vertex   from TopoDS, 
+    Vertex   from TopoDS,
     Edge     from TopoDS,
     Face     from TopoDS,
     Location from TopLoc,
@@ -43,9 +43,9 @@ uses
     DataMapOfShapeInteger from TopTools
 
 is
-    
+
     Create returns mutable SphereSpaceModifier from BlockFix;
-    
+
     SetTolerance(me: mutable; Toler: Real);
     	---Purpose: Sets the tolerance for recognition of geometry
 
@@ -62,7 +62,7 @@ is
 	--          the new tolerance.  Otherwise, returns
 	--          Standard_False, and <S>, <L>, <Tol> are  not
 	--          significant.
-	
+
     NewCurve(me: mutable; E  :     Edge     from TopoDS;
                           C  : out Curve    from Geom;
 		          L  : out Location from TopLoc;
@@ -96,10 +96,10 @@ is
 	--          curve on surface on the face <F>.In this case, <C>
 	--          is the new geometric support of  the edge, <L> the
 	--          new location, <Tol> the new tolerance.
-	--          
+	--
 	--          Otherwise, returns  Standard_False, and <C>,  <L>,
 	--          <Tol> are not significant.
-	--          
+	--
 	--          <NewE> is the new  edge created from  <E>.  <NewF>
 	--          is the new face created from <F>. They may be usefull.
 
@@ -121,15 +121,15 @@ is
     returns Shape from GeomAbs;
 	---Purpose: Returns the  continuity of  <NewE> between <NewF1>
 	--          and <NewF2>.
-	--          
+	--
 	--          <NewE> is the new  edge created from <E>.  <NewF1>
 	--          (resp. <NewF2>) is the new  face created from <F1>
 	--          (resp. <F2>).
-    
+
     ForRotation(me: mutable; F: Face from TopoDS) returns Boolean;
-    
-fields 
-    
+
+fields
+
     myTolerance   : Real;
     myMapOfFaces  : DataMapOfShapeInteger from TopTools;
     myMapOfSpheres: IndexedMapOfTransient from TColStd;
diff --git a/src/GEOMAlgo_NEW/BlockFix_SphereSpaceModifier.cxx b/src/GEOMAlgo_NEW/BlockFix_SphereSpaceModifier.cxx
index 570e3921f..9e2db755a 100644
--- a/src/GEOMAlgo_NEW/BlockFix_SphereSpaceModifier.cxx
+++ b/src/GEOMAlgo_NEW/BlockFix_SphereSpaceModifier.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File:        BlockFix.cxx
 // Created:     Tue Dec  7 11:59:05 2004
@@ -43,7 +44,7 @@
 
 //=======================================================================
 //function : BlockFix_SphereSpaceModifier
-//purpose  : 
+//purpose  :
 //=======================================================================
 
 BlockFix_SphereSpaceModifier::BlockFix_SphereSpaceModifier()
@@ -54,7 +55,7 @@ BlockFix_SphereSpaceModifier::BlockFix_SphereSpaceModifier()
 
 //=======================================================================
 //function : SetTolerance
-//purpose  : 
+//purpose  :
 //=======================================================================
 
 void BlockFix_SphereSpaceModifier::SetTolerance(const Standard_Real Tol)
@@ -65,7 +66,7 @@ void BlockFix_SphereSpaceModifier::SetTolerance(const Standard_Real Tol)
 
 //=======================================================================
 //function : NewSurface
-//purpose  : 
+//purpose  :
 //=======================================================================
 
 
@@ -75,11 +76,11 @@ static Standard_Boolean ModifySurface(const TopoDS_Face& aFace,
 {
   Handle(Geom_Surface) S = aSurface;
   if(S->IsKind(STANDARD_TYPE(Geom_RectangularTrimmedSurface))) {
-    Handle(Geom_RectangularTrimmedSurface) RTS = 
+    Handle(Geom_RectangularTrimmedSurface) RTS =
       Handle(Geom_RectangularTrimmedSurface)::DownCast(S);
     S = RTS->BasisSurface();
   }
-  
+
   if(S->IsKind(STANDARD_TYPE(Geom_SphericalSurface))) {
     Standard_Real Umin, Umax, Vmin, Vmax;
     ShapeAnalysis::GetFaceUVBounds(aFace,Umin, Umax, Vmin, Vmax);
@@ -118,109 +119,109 @@ static Standard_Boolean ModifySurface(const TopoDS_Face& aFace,
   }
   return Standard_False;
 }
-                                      
+
 
 Standard_Boolean BlockFix_SphereSpaceModifier::NewSurface(const TopoDS_Face& F,
                                                         Handle(Geom_Surface)& S,
                                                         TopLoc_Location& L,Standard_Real& Tol,
                                                         Standard_Boolean& RevWires,
-                                                        Standard_Boolean& RevFace) 
+                                                        Standard_Boolean& RevFace)
 {
   TopLoc_Location LS;
   Handle(Geom_Surface) SIni = BRep_Tool::Surface(F, LS);
-  
+
   //check if pole of the sphere in the parametric space
   if(ModifySurface(F, SIni, S)) {
-  
+
     RevWires = Standard_False;
     RevFace = Standard_False;
-    
+
     L = LS;
     Tol = BRep_Tool::Tolerance(F);
-     
+
     Standard_Integer anIndex = myMapOfSpheres.Add(S);
     myMapOfFaces.Bind(F,anIndex);
     return Standard_True;
   }
-  
+
   return Standard_False;
 }
 
 //=======================================================================
 //function : NewCurve
-//purpose  : 
+//purpose  :
 //=======================================================================
 
 Standard_Boolean BlockFix_SphereSpaceModifier::NewCurve(const TopoDS_Edge& /*E*/,Handle(Geom_Curve)& /*C*/,
-                                                        TopLoc_Location& /*L*/,Standard_Real& /*Tol*/) 
+                                                        TopLoc_Location& /*L*/,Standard_Real& /*Tol*/)
 {
   return Standard_False;
 }
 
 //=======================================================================
 //function : NewPoint
-//purpose  : 
+//purpose  :
 //=======================================================================
 
 Standard_Boolean BlockFix_SphereSpaceModifier::NewPoint(const TopoDS_Vertex& /*V*/,
                                                       gp_Pnt& /*P*/,
-                                                      Standard_Real& /*Tol*/) 
+                                                      Standard_Real& /*Tol*/)
 {
   return Standard_False;
 }
 
 //=======================================================================
 //function : NewCurve2d
-//purpose  : 
+//purpose  :
 //=======================================================================
 
 Standard_Boolean BlockFix_SphereSpaceModifier::NewCurve2d(const TopoDS_Edge& E,const TopoDS_Face& F,
                                                         const TopoDS_Edge& /*NewE*/,const TopoDS_Face& /*NewF*/,
-                                                        Handle(Geom2d_Curve)& C,Standard_Real& Tol) 
+                                                        Handle(Geom2d_Curve)& C,Standard_Real& Tol)
 {
   //check if undelying surface of the face was modified
   if(myMapOfFaces.IsBound(F)) {
     Standard_Integer anIndex = myMapOfFaces.Find(F);
-    
+
     Handle(Geom_Surface) aNewSphere = Handle(Geom_Surface)::DownCast(myMapOfSpheres.FindKey(anIndex));
-    
+
     Standard_Real f,l;
     TopLoc_Location LC, LS;
     Handle(Geom_Curve) C3d = BRep_Tool::Curve ( E, LC, f, l );
     Handle(Geom_Surface) S = BRep_Tool::Surface(F, LS);
-  
+
     //taking into accound the orientation of the seam
     C = BRep_Tool::CurveOnSurface(E,F,f,l);
     Tol = BRep_Tool::Tolerance(E);
-     
+
     BRep_Builder B;
     TopoDS_Edge TempE;
     B.MakeEdge(TempE);
     B.Add(TempE, TopExp::FirstVertex(E));
     B.Add(TempE, TopExp::LastVertex(E));
 
-    if(!C3d.IsNull()) 
+    if(!C3d.IsNull())
       B.UpdateEdge(TempE, Handle(Geom_Curve)::DownCast(C3d->Transformed(LC.Transformation())), Precision::Confusion());
     B.Range(TempE, f, l);
-    
+
     Handle(ShapeFix_Edge) sfe = new ShapeFix_Edge;
     Handle(Geom_Surface) STemp = Handle(Geom_Surface)::DownCast(aNewSphere->Transformed(LS.Transformation()));
     TopLoc_Location LTemp;
     LTemp.Identity();
-    
+
     Standard_Boolean isClosed = BRep_Tool::IsClosed (E, F);
     Standard_Real aWorkTol = 2*myTolerance+Tol;
     sfe->FixAddPCurve(TempE, STemp, LTemp, isClosed, Max(Precision::Confusion(), aWorkTol));
     sfe->FixSameParameter(TempE);
-      
+
     //keep the orientation of original edge
     TempE.Orientation(E.Orientation());
     C = BRep_Tool::CurveOnSurface(TempE, STemp, LTemp, f, l);
-    
+
     // shifting seam of sphere
     if(isClosed  && !C.IsNull()) {
       Standard_Real f2,l2;
-      Handle(Geom2d_Curve) c22 = 
+      Handle(Geom2d_Curve) c22 =
         BRep_Tool::CurveOnSurface(TopoDS::Edge(TempE.Reversed()),STemp, LTemp,f2,l2);
       Standard_Real dPreci = Precision::PConfusion()*Precision::PConfusion();
       if((C->Value(f).SquareDistance(c22->Value(f2)) < dPreci)
@@ -239,11 +240,11 @@ Standard_Boolean BlockFix_SphereSpaceModifier::NewCurve2d(const TopoDS_Edge& E,c
 
 //=======================================================================
 //function : NewParameter
-//purpose  : 
+//purpose  :
 //=======================================================================
 
 Standard_Boolean BlockFix_SphereSpaceModifier::NewParameter(const TopoDS_Vertex& /*V*/,const TopoDS_Edge& /*E*/,
-                                                            Standard_Real& /*P*/,Standard_Real& /*Tol*/) 
+                                                            Standard_Real& /*P*/,Standard_Real& /*Tol*/)
 {
   return Standard_False;
 }
@@ -251,12 +252,12 @@ Standard_Boolean BlockFix_SphereSpaceModifier::NewParameter(const TopoDS_Vertex&
 
 //=======================================================================
 //function : Continuity
-//purpose  : 
+//purpose  :
 //=======================================================================
 
 GeomAbs_Shape BlockFix_SphereSpaceModifier::Continuity(const TopoDS_Edge& E,const TopoDS_Face& F1,
                                                      const TopoDS_Face& F2,const TopoDS_Edge& /*NewE*/,
-                                                     const TopoDS_Face& /*NewF1*/,const TopoDS_Face& /*NewF2*/) 
+                                                     const TopoDS_Face& /*NewF1*/,const TopoDS_Face& /*NewF2*/)
 {
   return BRep_Tool::Continuity(E,F1,F2);
 }
diff --git a/src/GEOMAlgo_NEW/BlockFix_SphereSpaceModifier.hxx b/src/GEOMAlgo_NEW/BlockFix_SphereSpaceModifier.hxx
index bd9871e0a..fb11fdbae 100644
--- a/src/GEOMAlgo_NEW/BlockFix_SphereSpaceModifier.hxx
+++ b/src/GEOMAlgo_NEW/BlockFix_SphereSpaceModifier.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -71,20 +71,20 @@ class BlockFix_SphereSpaceModifier : public BRepTools_Modification {
 
 public:
 
-    void* operator new(size_t,void* anAddress) 
+    void* operator new(size_t,void* anAddress)
       {
         return anAddress;
       }
-    void* operator new(size_t size) 
-      { 
-        return Standard::Allocate(size); 
+    void* operator new(size_t size)
+      {
+        return Standard::Allocate(size);
       }
-    void  operator delete(void *anAddress) 
-      { 
-        if (anAddress) Standard::Free((Standard_Address&)anAddress); 
+    void  operator delete(void *anAddress)
+      {
+        if (anAddress) Standard::Free((Standard_Address&)anAddress);
       }
  // Methods PUBLIC
- // 
+ //
 Standard_EXPORT BlockFix_SphereSpaceModifier();
 Standard_EXPORT   void SetTolerance(const Standard_Real Toler) ;
 Standard_EXPORT   Standard_Boolean NewSurface(const TopoDS_Face& F,Handle(Geom_Surface)& S,TopLoc_Location& L,Standard_Real& Tol,Standard_Boolean& RevWires,Standard_Boolean& RevFace) ;
@@ -108,17 +108,17 @@ Standard_EXPORT ~BlockFix_SphereSpaceModifier();
 protected:
 
  // Methods PROTECTED
- // 
+ //
 
 
  // Fields PROTECTED
  //
 
 
-private: 
+private:
 
  // Methods PRIVATE
- // 
+ //
 
 
  // Fields PRIVATE
diff --git a/src/GEOMAlgo_NEW/BlockFix_SphereSpaceModifier.ixx b/src/GEOMAlgo_NEW/BlockFix_SphereSpaceModifier.ixx
index f756d7280..482241f6d 100644
--- a/src/GEOMAlgo_NEW/BlockFix_SphereSpaceModifier.ixx
+++ b/src/GEOMAlgo_NEW/BlockFix_SphereSpaceModifier.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -27,7 +27,7 @@
 #endif
 
 BlockFix_SphereSpaceModifier::~BlockFix_SphereSpaceModifier() {}
- 
+
 
 
 Standard_EXPORT Handle_Standard_Type& BlockFix_SphereSpaceModifier_Type_()
@@ -39,7 +39,7 @@ Standard_EXPORT Handle_Standard_Type& BlockFix_SphereSpaceModifier_Type_()
   if ( aType2.IsNull()) aType2 = STANDARD_TYPE(MMgt_TShared);
   static Handle_Standard_Type aType3 = STANDARD_TYPE(Standard_Transient);
   if ( aType3.IsNull()) aType3 = STANDARD_TYPE(Standard_Transient);
- 
+
 
   static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,aType3,NULL};
   static Handle_Standard_Type _aType = new Standard_Type("BlockFix_SphereSpaceModifier",
@@ -55,7 +55,7 @@ Standard_EXPORT Handle_Standard_Type& BlockFix_SphereSpaceModifier_Type_()
 // DownCast method
 //   allow safe downcasting
 //
-const Handle(BlockFix_SphereSpaceModifier) Handle(BlockFix_SphereSpaceModifier)::DownCast(const Handle(Standard_Transient)& AnObject) 
+const Handle(BlockFix_SphereSpaceModifier) Handle(BlockFix_SphereSpaceModifier)::DownCast(const Handle(Standard_Transient)& AnObject)
 {
   Handle(BlockFix_SphereSpaceModifier) _anOtherObject;
 
@@ -67,13 +67,13 @@ const Handle(BlockFix_SphereSpaceModifier) Handle(BlockFix_SphereSpaceModifier):
 
   return _anOtherObject ;
 }
-const Handle(Standard_Type)& BlockFix_SphereSpaceModifier::DynamicType() const 
-{ 
-  return STANDARD_TYPE(BlockFix_SphereSpaceModifier) ; 
+const Handle(Standard_Type)& BlockFix_SphereSpaceModifier::DynamicType() const
+{
+  return STANDARD_TYPE(BlockFix_SphereSpaceModifier) ;
 }
-Standard_Boolean BlockFix_SphereSpaceModifier::IsKind(const Handle(Standard_Type)& AType) const 
-{ 
-  return (STANDARD_TYPE(BlockFix_SphereSpaceModifier) == AType || BRepTools_Modification::IsKind(AType)); 
+Standard_Boolean BlockFix_SphereSpaceModifier::IsKind(const Handle(Standard_Type)& AType) const
+{
+  return (STANDARD_TYPE(BlockFix_SphereSpaceModifier) == AType || BRepTools_Modification::IsKind(AType));
 }
 Handle_BlockFix_SphereSpaceModifier::~Handle_BlockFix_SphereSpaceModifier() {}
 
diff --git a/src/GEOMAlgo_NEW/BlockFix_SphereSpaceModifier.jxx b/src/GEOMAlgo_NEW/BlockFix_SphereSpaceModifier.jxx
index 413af0805..050734179 100644
--- a/src/GEOMAlgo_NEW/BlockFix_SphereSpaceModifier.jxx
+++ b/src/GEOMAlgo_NEW/BlockFix_SphereSpaceModifier.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo_NEW/BlockFix_UnionEdges.cdl b/src/GEOMAlgo_NEW/BlockFix_UnionEdges.cdl
index 6e9d3bcc1..05a9f3870 100644
--- a/src/GEOMAlgo_NEW/BlockFix_UnionEdges.cdl
+++ b/src/GEOMAlgo_NEW/BlockFix_UnionEdges.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 -- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -26,24 +26,24 @@
 --
 class UnionEdges from BlockFix
 
-    	---Purpose: 
-	
+    	---Purpose:
+
 uses
-    
+
     Shape           from TopoDS,
     ReShape         from ShapeBuild
 
 is
 
     Create returns UnionEdges from BlockFix;
-    
+
     Perform(me: in out; Shape: Shape from TopoDS;
                         Tol  : Real)
-    returns Shape from TopoDS;    
-    
+    returns Shape from TopoDS;
+
 fields
 
     myTolerance : Real;
     myContext   : ReShape from ShapeBuild;
-    
+
 end UnionEdges;
diff --git a/src/GEOMAlgo_NEW/BlockFix_UnionEdges.cxx b/src/GEOMAlgo_NEW/BlockFix_UnionEdges.cxx
index 68bc3a92a..7c5d2a186 100644
--- a/src/GEOMAlgo_NEW/BlockFix_UnionEdges.cxx
+++ b/src/GEOMAlgo_NEW/BlockFix_UnionEdges.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File:      BlockFix_UnionEdges.cxx
 // Created:   07.12.04 15:27:30
@@ -141,9 +142,9 @@ static Standard_Boolean MergeEdges(const TopTools_SequenceOfShape& SeqEdges,
       Handle(Geom_Line) L2 = Handle(Geom_Line)::DownCast(c3d2);
       gp_Dir Dir1 = L1->Position().Direction();
       gp_Dir Dir2 = L2->Position().Direction();
-      //if(!Dir1.IsEqual(Dir2,Precision::Angular())) { 
-      //if(!Dir1.IsParallel(Dir2,Precision::Angular())) { 
-      if(!Dir1.IsParallel(Dir2,Tol)) { 
+      //if(!Dir1.IsEqual(Dir2,Precision::Angular())) {
+      //if(!Dir1.IsParallel(Dir2,Precision::Angular())) {
+      if(!Dir1.IsParallel(Dir2,Tol)) {
         continue;
       }
       // can union lines => create new edge
diff --git a/src/GEOMAlgo_NEW/BlockFix_UnionEdges.hxx b/src/GEOMAlgo_NEW/BlockFix_UnionEdges.hxx
index 07909ce7c..b38e941fb 100644
--- a/src/GEOMAlgo_NEW/BlockFix_UnionEdges.hxx
+++ b/src/GEOMAlgo_NEW/BlockFix_UnionEdges.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -44,20 +44,20 @@ class BlockFix_UnionEdges  {
 
 public:
 
-    void* operator new(size_t,void* anAddress) 
+    void* operator new(size_t,void* anAddress)
       {
         return anAddress;
       }
-    void* operator new(size_t size) 
-      { 
-        return Standard::Allocate(size); 
+    void* operator new(size_t size)
+      {
+        return Standard::Allocate(size);
       }
-    void  operator delete(void *anAddress) 
-      { 
-        if (anAddress) Standard::Free((Standard_Address&)anAddress); 
+    void  operator delete(void *anAddress)
+      {
+        if (anAddress) Standard::Free((Standard_Address&)anAddress);
       }
  // Methods PUBLIC
- // 
+ //
 Standard_EXPORT BlockFix_UnionEdges();
 Standard_EXPORT   TopoDS_Shape Perform(const TopoDS_Shape& Shape,const Standard_Real Tol) ;
 
@@ -68,17 +68,17 @@ Standard_EXPORT   TopoDS_Shape Perform(const TopoDS_Shape& Shape,const Standard_
 protected:
 
  // Methods PROTECTED
- // 
+ //
 
 
  // Fields PROTECTED
  //
 
 
-private: 
+private:
 
  // Methods PRIVATE
- // 
+ //
 
 
  // Fields PRIVATE
diff --git a/src/GEOMAlgo_NEW/BlockFix_UnionEdges.ixx b/src/GEOMAlgo_NEW/BlockFix_UnionEdges.ixx
index 63a34541d..27e87ac6c 100644
--- a/src/GEOMAlgo_NEW/BlockFix_UnionEdges.ixx
+++ b/src/GEOMAlgo_NEW/BlockFix_UnionEdges.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -22,6 +22,6 @@
 
 #include <BlockFix_UnionEdges.jxx>
 
- 
+
 
 
diff --git a/src/GEOMAlgo_NEW/BlockFix_UnionEdges.jxx b/src/GEOMAlgo_NEW/BlockFix_UnionEdges.jxx
index c6cf527cb..558e8d82b 100644
--- a/src/GEOMAlgo_NEW/BlockFix_UnionEdges.jxx
+++ b/src/GEOMAlgo_NEW/BlockFix_UnionEdges.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo_NEW/BlockFix_UnionFaces.cdl b/src/GEOMAlgo_NEW/BlockFix_UnionFaces.cdl
index b566b8228..371cb25ea 100644
--- a/src/GEOMAlgo_NEW/BlockFix_UnionFaces.cdl
+++ b/src/GEOMAlgo_NEW/BlockFix_UnionFaces.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 -- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -35,31 +35,31 @@ is
 
     Create returns UnionFaces from BlockFix;
     	---Purpose: Empty constructor
-    
+
     GetTolerance(me: in out) returns Real;
     	---Purpose: Returns modifiable tolerance
-	---C++: return& 
-        
+	---C++: return&
+
     Perform (me: in out; Shape: Shape from TopoDS) returns Shape from TopoDS;
     	---Purpose: Performs the unification of the fsces
 	--          whith the same geometry
-	
+
     IsSameDomain(me; aFace      : Face from TopoDS;
     	    	     aChekedFace: Face from TopoDS)
     returns Boolean is virtual;
     	---Purpose: Returns true is surfaces have same geometrically domain
 	--          with given tolerance
-	
+
     MovePCurves(me; aTarget: in out Face from TopoDS;
     	    	    aSource:        Face from TopoDS)
     is virtual;
-    	---Purpose: Creates pcurves on aTarget face for each edge from 
+    	---Purpose: Creates pcurves on aTarget face for each edge from
 	--          aSource one.
 
 fields
 
     myTolerance: Real;
-    
-end;
-    
+
+end;
+
 
diff --git a/src/GEOMAlgo_NEW/BlockFix_UnionFaces.cxx b/src/GEOMAlgo_NEW/BlockFix_UnionFaces.cxx
index e2f9f32fd..c800fd421 100644
--- a/src/GEOMAlgo_NEW/BlockFix_UnionFaces.cxx
+++ b/src/GEOMAlgo_NEW/BlockFix_UnionFaces.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 //  File:    BlockFix_UnionFaces.cxx
 //  Created: Tue Dec  7 17:15:42 2004
diff --git a/src/GEOMAlgo_NEW/BlockFix_UnionFaces.hxx b/src/GEOMAlgo_NEW/BlockFix_UnionFaces.hxx
index 62c50504b..f676d5bcf 100644
--- a/src/GEOMAlgo_NEW/BlockFix_UnionFaces.hxx
+++ b/src/GEOMAlgo_NEW/BlockFix_UnionFaces.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -42,21 +42,21 @@ class TopoDS_Face;
 class BlockFix_UnionFaces
 {
 public:
-  void* operator new(size_t,void* anAddress) 
+  void* operator new(size_t,void* anAddress)
   {
     return anAddress;
   }
-  void* operator new(size_t size) 
-  { 
-    return Standard::Allocate(size); 
+  void* operator new(size_t size)
+  {
+    return Standard::Allocate(size);
   }
-  void  operator delete(void *anAddress) 
-  { 
-    if (anAddress) Standard::Free((Standard_Address&)anAddress); 
+  void  operator delete(void *anAddress)
+  {
+    if (anAddress) Standard::Free((Standard_Address&)anAddress);
   }
 
   // Methods PUBLIC
-  // 
+  //
   Standard_EXPORT BlockFix_UnionFaces();
 
   Standard_EXPORT   Standard_Real& GetTolerance();
@@ -80,7 +80,7 @@ public:
   Standard_EXPORT virtual  void MovePCurves(TopoDS_Face& aTarget,
                                             const TopoDS_Face& aSource) const;
 
-private: 
+private:
   // Fields PRIVATE
   //
   Standard_Real myTolerance;
diff --git a/src/GEOMAlgo_NEW/BlockFix_UnionFaces.ixx b/src/GEOMAlgo_NEW/BlockFix_UnionFaces.ixx
index 471f45326..c5299ca40 100644
--- a/src/GEOMAlgo_NEW/BlockFix_UnionFaces.ixx
+++ b/src/GEOMAlgo_NEW/BlockFix_UnionFaces.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -22,6 +22,6 @@
 
 #include <BlockFix_UnionFaces.jxx>
 
- 
+
 
 
diff --git a/src/GEOMAlgo_NEW/BlockFix_UnionFaces.jxx b/src/GEOMAlgo_NEW/BlockFix_UnionFaces.jxx
index ee5ff52ca..c89fc31fb 100644
--- a/src/GEOMAlgo_NEW/BlockFix_UnionFaces.jxx
+++ b/src/GEOMAlgo_NEW/BlockFix_UnionFaces.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo.cdl b/src/GEOMAlgo_NEW/GEOMAlgo.cdl
index da00ffaee..d2fbf9770 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo.cdl
+++ b/src/GEOMAlgo_NEW/GEOMAlgo.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 -- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -23,45 +23,45 @@
 -- Created:	Sat Dec 04 12:36:22 2004
 -- Author:	Peter KURNEV
 
-package GEOMAlgo 
+package GEOMAlgo
 
-	---Purpose: 
+	---Purpose:
 
-uses  
-    TCollection, 
-    
-    TColgp, 
-    Geom,     
-    Bnd, 
-    gp,	  
+uses
+    TCollection,
+
+    TColgp,
+    Geom,
+    Bnd,
+    gp,
     GeomAdaptor,
     TopAbs,
-    TopoDS, 
-    TopTools, 
-    IntTools, 
-    BOPTools, 
-    BOP, 
-    
-    TColStd, 
-    BOPTColStd,  
-    BRepAlgo, 
-    NMTDS, 
-    NMTTools 
-    
-is   
+    TopoDS,
+    TopTools,
+    IntTools,
+    BOPTools,
+    BOP,
+
+    TColStd,
+    BOPTColStd,
+    BRepAlgo,
+    NMTDS,
+    NMTTools
+
+is
     --  Enumerations
     imported State from GEOMAlgo;
     imported KindOfShape from GEOMAlgo;
     imported KindOfName from GEOMAlgo;
     imported KindOfBounds from GEOMAlgo;
     imported KindOfClosed from GEOMAlgo;
-    -- 
-    --  Gluer / GetInPlace 
-    imported Gluer2 from GEOMAlgo;   
-    imported GlueDetector from GEOMAlgo; 
-    imported GluerAlgo from GEOMAlgo; 
-    imported GetInPlace from GEOMAlgo; 
-    -- Algos   	     
+    --
+    --  Gluer / GetInPlace
+    imported Gluer2 from GEOMAlgo;
+    imported GlueDetector from GEOMAlgo;
+    imported GluerAlgo from GEOMAlgo;
+    imported GetInPlace from GEOMAlgo;
+    -- Algos
     imported WireSplitter from GEOMAlgo;
     imported WESScaler from GEOMAlgo;
     imported WESCorrector from GEOMAlgo;
@@ -84,155 +84,155 @@ is
     imported BuilderFace from GEOMAlgo;
     imported BuilderArea from GEOMAlgo;
     imported ShapeInfoFiller from GEOMAlgo;
-    imported Algo from GEOMAlgo; 
+    imported Algo from GEOMAlgo;
     -- Data /  Tools
     imported ShapeSet from GEOMAlgo;
-    imported SurfaceTools from GEOMAlgo; 
-    imported ShapeInfo from GEOMAlgo; 
-    imported CoupleOfShapes from GEOMAlgo; 
-    imported BuilderTools from GEOMAlgo; 
-    imported Tools3D from GEOMAlgo; 
-    imported Tools from GEOMAlgo; 
-    imported PWireEdgeSet from GEOMAlgo; 
-    imported StateCollector from GEOMAlgo; 
-    imported PassKey from GEOMAlgo; 
-    imported PassKeyMapHasher from GEOMAlgo; 
-    imported PassKeyShape from GEOMAlgo; 
-    imported PassKeyShapeMapHasher from GEOMAlgo; 
-    imported ClsfBox from GEOMAlgo; 
-    imported ClsfSurf from GEOMAlgo; 
-    imported ClsfSolid from GEOMAlgo; 
-    imported Clsf from GEOMAlgo; 
-    imported HAlgo from GEOMAlgo; 
-     
-    imported ListOfCoupleOfShapes from GEOMAlgo; 
-    imported ListIteratorOfListOfCoupleOfShapes from GEOMAlgo; 
-    imported ListOfPnt from GEOMAlgo; 
-    imported ListIteratorOfListOfPnt from GEOMAlgo; 
-    imported DataMapOfShapeShapeSet from GEOMAlgo; 
-    imported DataMapIteratorOfDataMapOfShapeShapeSet from GEOMAlgo; 
-    imported DataMapOfShapeReal from GEOMAlgo; 
-    imported DataMapIteratorOfDataMapOfShapeReal from GEOMAlgo; 
-    imported DataMapOfRealListOfShape from GEOMAlgo; 
-    imported DataMapIteratorOfDataMapOfRealListOfShape from GEOMAlgo; 
-    imported DataMapOfPassKeyInteger from GEOMAlgo; 
-    imported DataMapIteratorOfDataMapOfPassKeyInteger from GEOMAlgo; 
-    imported DataMapOfPassKeyShapeShape from GEOMAlgo; 
-    imported DataMapIteratorOfDataMapOfPassKeyShapeShape from GEOMAlgo; 
-    imported DataMapOfOrientedShapeShape from GEOMAlgo; 
-    imported DataMapIteratorOfDataMapOfOrientedShapeShape from GEOMAlgo; 
-    imported DataMapOfShapeMapOfShape from GEOMAlgo; 
-    imported DataMapIteratorOfDataMapOfShapeMapOfShape from GEOMAlgo; 
-    imported DataMapOfShapePnt from GEOMAlgo; 
-    imported DataMapIteratorOfDataMapOfShapePnt from GEOMAlgo; 
-    imported IndexedDataMapOfShapeBox from GEOMAlgo; 
-    imported IndexedDataMapOfShapeShapeInfo from GEOMAlgo; 
-    imported IndexedDataMapOfShapeState from GEOMAlgo; 
-    imported IndexedDataMapOfIntegerShape from GEOMAlgo; 
-    imported IndexedDataMapOfPassKeyShapeListOfShape from GEOMAlgo; 
-     
- 
-    --  Instantiations	   
-     
-    --class ListOfCoupleOfShapes  
-    --	instantiates List from TCollection  (CoupleOfShapes from GEOMAlgo); 
- 
+    imported SurfaceTools from GEOMAlgo;
+    imported ShapeInfo from GEOMAlgo;
+    imported CoupleOfShapes from GEOMAlgo;
+    imported BuilderTools from GEOMAlgo;
+    imported Tools3D from GEOMAlgo;
+    imported Tools from GEOMAlgo;
+    imported PWireEdgeSet from GEOMAlgo;
+    imported StateCollector from GEOMAlgo;
+    imported PassKey from GEOMAlgo;
+    imported PassKeyMapHasher from GEOMAlgo;
+    imported PassKeyShape from GEOMAlgo;
+    imported PassKeyShapeMapHasher from GEOMAlgo;
+    imported ClsfBox from GEOMAlgo;
+    imported ClsfSurf from GEOMAlgo;
+    imported ClsfSolid from GEOMAlgo;
+    imported Clsf from GEOMAlgo;
+    imported HAlgo from GEOMAlgo;
+
+    imported ListOfCoupleOfShapes from GEOMAlgo;
+    imported ListIteratorOfListOfCoupleOfShapes from GEOMAlgo;
+    imported ListOfPnt from GEOMAlgo;
+    imported ListIteratorOfListOfPnt from GEOMAlgo;
+    imported DataMapOfShapeShapeSet from GEOMAlgo;
+    imported DataMapIteratorOfDataMapOfShapeShapeSet from GEOMAlgo;
+    imported DataMapOfShapeReal from GEOMAlgo;
+    imported DataMapIteratorOfDataMapOfShapeReal from GEOMAlgo;
+    imported DataMapOfRealListOfShape from GEOMAlgo;
+    imported DataMapIteratorOfDataMapOfRealListOfShape from GEOMAlgo;
+    imported DataMapOfPassKeyInteger from GEOMAlgo;
+    imported DataMapIteratorOfDataMapOfPassKeyInteger from GEOMAlgo;
+    imported DataMapOfPassKeyShapeShape from GEOMAlgo;
+    imported DataMapIteratorOfDataMapOfPassKeyShapeShape from GEOMAlgo;
+    imported DataMapOfOrientedShapeShape from GEOMAlgo;
+    imported DataMapIteratorOfDataMapOfOrientedShapeShape from GEOMAlgo;
+    imported DataMapOfShapeMapOfShape from GEOMAlgo;
+    imported DataMapIteratorOfDataMapOfShapeMapOfShape from GEOMAlgo;
+    imported DataMapOfShapePnt from GEOMAlgo;
+    imported DataMapIteratorOfDataMapOfShapePnt from GEOMAlgo;
+    imported IndexedDataMapOfShapeBox from GEOMAlgo;
+    imported IndexedDataMapOfShapeShapeInfo from GEOMAlgo;
+    imported IndexedDataMapOfShapeState from GEOMAlgo;
+    imported IndexedDataMapOfIntegerShape from GEOMAlgo;
+    imported IndexedDataMapOfPassKeyShapeListOfShape from GEOMAlgo;
+
+
+    --  Instantiations
+
+    --class ListOfCoupleOfShapes
+    --	instantiates List from TCollection  (CoupleOfShapes from GEOMAlgo);
+
     --class ListOfPnt
     --	instantiates List from TCollection  (Pnt from gp);
     --
-    
-    --class DataMapOfShapeShapeSet instantiates 
-    --	DataMap from TCollection(Shape from TopoDS, 
-    --	                         ShapeSet from GEOMAlgo, 
-    --	                         ShapeMapHasher from TopTools); 
-	 
-    --class DataMapOfShapeReal instantiates 
-    --	DataMap from TCollection(Shape from TopoDS, 
-    --	                         Real from Standard, 
-    --	                         ShapeMapHasher from TopTools);		 
-				  
-    
-    --class DataMapOfRealListOfShape instantiates  
-    --	DataMap from TCollection(Real from Standard, 
-    --	    	    	    	 ListOfShape from TopTools,  
-    --	                         MapRealHasher from TColStd); 
-				  
-				      
+
+    --class DataMapOfShapeShapeSet instantiates
+    --	DataMap from TCollection(Shape from TopoDS,
+    --	                         ShapeSet from GEOMAlgo,
+    --	                         ShapeMapHasher from TopTools);
+
+    --class DataMapOfShapeReal instantiates
+    --	DataMap from TCollection(Shape from TopoDS,
+    --	                         Real from Standard,
+    --	                         ShapeMapHasher from TopTools);
+
+
+    --class DataMapOfRealListOfShape instantiates
+    --	DataMap from TCollection(Real from Standard,
+    --	    	    	    	 ListOfShape from TopTools,
+    --	                         MapRealHasher from TColStd);
+
+
     --class DataMapOfPassKeyInteger
-    --	instantiates DataMap from TCollection (PassKey from GEOMAlgo, 
-    --					       Integer from Standard, 
-    --                                         PassKeyMapHasher from GEOMAlgo); 
- 
-    --class DataMapOfPassKeyShapeShape   
-    --	instantiates DataMap from TCollection (PassKeyShape from GEOMAlgo, 
-    --					       Shape from TopoDS, 
-    --     	    	    	    	    	       PassKeyShapeMapHasher from GEOMAlgo); 
+    --	instantiates DataMap from TCollection (PassKey from GEOMAlgo,
+    --					       Integer from Standard,
+    --                                         PassKeyMapHasher from GEOMAlgo);
+
+    --class DataMapOfPassKeyShapeShape
+    --	instantiates DataMap from TCollection (PassKeyShape from GEOMAlgo,
+    --					       Shape from TopoDS,
+    --     	    	    	    	    	       PassKeyShapeMapHasher from GEOMAlgo);
 
     --class DataMapOfOrientedShapeShape instantiates
     --    DataMap from TCollection (Shape                  from TopoDS,
      --                             Shape                  from TopoDS,
-     --                             OrientedShapeMapHasher from TopTools); 
- 
-    
+     --                             OrientedShapeMapHasher from TopTools);
+
+
     --class DataMapOfShapeMapOfShape instantiates
     --    DataMap from TCollection (Shape          from TopoDS,
     --                              MapOfShape     from TopTools,
-     --                             ShapeMapHasher from TopTools); 
-     
+     --                             ShapeMapHasher from TopTools);
+
     --class DataMapOfShapePnt instantiates
     --    DataMap from TCollection (Shape          from TopoDS,
     --                              Pnt            from gp,
     --                              ShapeMapHasher from TopTools);
- 
-    -- 
-    --class IndexedDataMapOfShapeBox  
+
+    --
+    --class IndexedDataMapOfShapeBox
     --	instantiates IndexedDataMap from TCollection   	(Shape from TopoDS,
 --	    		    		         	 Box from Bnd,
---	    		    		         	 ShapeMapHasher from TopTools);  
+--	    		    		         	 ShapeMapHasher from TopTools);
 
 --    class IndexedDataMapOfShapeShapeInfo
 --    	instantiates IndexedDataMap from TCollection   	(Shape from TopoDS,
 --	    		    		         	 ShapeInfo from GEOMAlgo,
---	    		    		         	 ShapeMapHasher from TopTools);							  
+--	    		    		         	 ShapeMapHasher from TopTools);
 --    class IndexedDataMapOfShapeState
 --    	instantiates IndexedDataMap from TCollection   	(Shape from TopoDS,
---	    		    		         	 State from TopAbs,  
---	    	    	    	    	    	    	 ShapeMapHasher from TopTools);							  
-							 
-     
---     
---    class IndexedDataMapOfIntegerShape  
+--	    		    		         	 State from TopAbs,
+--	    	    	    	    	    	    	 ShapeMapHasher from TopTools);
+
+
+--
+--    class IndexedDataMapOfIntegerShape
 --    	instantiates IndexedDataMap from TCollection   	(Integer from Standard,
 --	    		    		         	 Shape from TopoDS,
---	    		    		         	 MapIntegerHasher from TColStd); 
-   
-   
+--	    		    		         	 MapIntegerHasher from TColStd);
+
+
 --    class IndexedDataMapOfPassKeyShapeListOfShape
---	instantiates IndexedDataMap from TCollection (PassKeyShape from GEOMAlgo, 
---						      ListOfShape from TopTools, 
---                                                      PassKeyShapeMapHasher from GEOMAlgo); 
+--	instantiates IndexedDataMap from TCollection (PassKeyShape from GEOMAlgo,
+--						      ListOfShape from TopTools,
+--                                                      PassKeyShapeMapHasher from GEOMAlgo);
+
+
+
+
 
-    
 
-    			  
-    
-    
 end GEOMAlgo;
     --
-    -- enumerations 
+    -- enumerations
     --
-    --enumeration State is 
-    --	ST_UNKNOWN, 
+    --enumeration State is
+    --	ST_UNKNOWN,
 --	ST_IN,
 --	ST_OUT,
---	ST_ON, 
---	ST_ONIN, 
---	ST_ONOUT, 
---	ST_INOUT    
---    end State; 
+--	ST_ON,
+--	ST_ONIN,
+--	ST_ONOUT,
+--	ST_INOUT
+--    end State;
     --
---    enumeration KindOfShape is 
---    	KS_UNKNOWN, 
+--    enumeration KindOfShape is
+--    	KS_UNKNOWN,
 --    	KS_SPHERE,
 --    	KS_CYLINDER,
 --    	KS_BOX,
@@ -240,103 +240,103 @@ end GEOMAlgo;
 --    	KS_CONE,
 --    	KS_ELLIPSE,
 --    	KS_PLANE,
---    	KS_CIRCLE, 
---    	KS_LINE, 
---    	KS_DEGENERATED 
---    end KindOfShape;   
-    --  
---    enumeration KindOfName is 
---    	KN_UNKNOWN, 
+--    	KS_CIRCLE,
+--    	KS_LINE,
+--    	KS_DEGENERATED
+--    end KindOfShape;
+    --
+--    enumeration KindOfName is
+--    	KN_UNKNOWN,
 --    	KN_SPHERE,
 --    	KN_CYLINDER,
 --    	KN_TORUS,
 --    	KN_CONE,
---    	KN_ELLIPSE, 
+--    	KN_ELLIPSE,
 --    	KN_CIRCLE,
 --    	KN_PLANE,
---    	KN_LINE, 
---    	KN_BOX, 
---	KN_SEGMENT, 
---	KN_ARCCIRCLE, 
---        KN_POLYGON, 
+--    	KN_LINE,
+--    	KN_BOX,
+--	KN_SEGMENT,
+--	KN_ARCCIRCLE,
+--        KN_POLYGON,
 --	KN_POLYHEDRON,
---    	KN_DISKCIRCLE, 
---    	KN_DISKELLIPSE, 
---	KN_RECTANGLE, 
---	KN_TRIANGLE, 
---	KN_QUADRANGLE, 
---	KN_ARCELLIPSE       	 
---    end KindOfName;   
+--    	KN_DISKCIRCLE,
+--    	KN_DISKELLIPSE,
+--	KN_RECTANGLE,
+--	KN_TRIANGLE,
+--	KN_QUADRANGLE,
+--	KN_ARCELLIPSE
+--    end KindOfName;
     --
- --   enumeration KindOfBounds is  
- --   	KB_UNKNOWN, 
---	KB_TRIMMED, 
+ --   enumeration KindOfBounds is
+ --   	KB_UNKNOWN,
+--	KB_TRIMMED,
  --   	KB_INFINITE
---    end KindOfBounds;  
+--    end KindOfBounds;
     --
---    enumeration KindOfClosed is  
---    	KC_UNKNOWN, 
---	KC_CLOSED, 
+--    enumeration KindOfClosed is
+--    	KC_UNKNOWN,
+--	KC_CLOSED,
 --    	KC_NOTCLOSED
---    end KindOfClosed;  
+--    end KindOfClosed;
     --
 
     --deferred class HAlgo;
     --deferred class Clsf;
-    --class ClsfSurf; 
-    --class ClsfBox; 
-    --class ClsfSolid;  
-    
-    -- 
-    --  classes 
-    --  
-    --deferred class Algo;  
-    --deferred class ShapeAlgo;  
-    -- 
+    --class ClsfSurf;
+    --class ClsfBox;
+    --class ClsfSolid;
+
+    --
+    --  classes
+    --
+    --deferred class Algo;
+    --deferred class ShapeAlgo;
+    --
     --class ShapeInfo;
     --class ShapeInfoFiller;
-    --class CoupleOfShapes; 
-    --class SurfaceTools; 
-    --class Tools; 
-    --class PassKey;  
-    --class PassKeyMapHasher; 
-    --class PassKeyShape; 
-    --class PassKeyShapeMapHasher;     
-    --	     
-    --  finder on 
-    --deferred class ShapeSolid;
-    --class WireSolid; 
-    --class ShellSolid; 
-    --class VertexSolid; 
-    --class SolidSolid; 
-    --class StateCollector; 
-     
-    --     
-    --class Gluer; 
-    --class GlueAnalyser; 
-    --class FinderShapeOn; 
-    --class FinderShapeOn1;
-    --class FinderShapeOn2; 
+    --class CoupleOfShapes;
+    --class SurfaceTools;
+    --class Tools;
+    --class PassKey;
+    --class PassKeyMapHasher;
+    --class PassKeyShape;
+    --class PassKeyShapeMapHasher;
     --
-    -- Builder/Splitter 
-    --deferred class BuilderShape; 
-    --class Builder; 
-    --class Splitter; 
-    --class Tools3D; 
-    --class BuilderTools; 
-    --class ShapeSet;  
-     
+    --  finder on
+    --deferred class ShapeSolid;
+    --class WireSolid;
+    --class ShellSolid;
+    --class VertexSolid;
+    --class SolidSolid;
+    --class StateCollector;
+
+    --
+    --class Gluer;
+    --class GlueAnalyser;
+    --class FinderShapeOn;
+    --class FinderShapeOn1;
+    --class FinderShapeOn2;
+    --
+    -- Builder/Splitter
+    --deferred class BuilderShape;
+    --class Builder;
+    --class Splitter;
+    --class Tools3D;
+    --class BuilderTools;
+    --class ShapeSet;
+
     --deferred class BuilderArea;
-    --class BuilderFace; 
-    --class BuilderSolid;  
-    
-    --class WireSplitter; 
-    --class WireEdgeSet; 
-    --class WESCorrector; 
-    --class WESScaler; 
-    -- 
+    --class BuilderFace;
+    --class BuilderSolid;
+
+    --class WireSplitter;
+    --class WireEdgeSet;
+    --class WESCorrector;
+    --class WESScaler;
+    --
     --  Pointers
-    --     
-    --pointer PWireEdgeSet to WireEdgeSet from GEOMAlgo;  
-    --	   
-    -- 
+    --
+    --pointer PWireEdgeSet to WireEdgeSet from GEOMAlgo;
+    --
+    --
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_Algo.cxx b/src/GEOMAlgo_NEW/GEOMAlgo_Algo.cxx
index a33b3c50c..f159c1a57 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_Algo.cxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_Algo.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -28,8 +28,8 @@
 #include <GEOMAlgo_Algo.hxx>
 
 //=======================================================================
-// function: 
-// purpose: 
+// function:
+// purpose:
 //=======================================================================
   GEOMAlgo_Algo::GEOMAlgo_Algo()
 :
@@ -39,14 +39,14 @@
 {}
 //=======================================================================
 // function: ~
-// purpose: 
+// purpose:
 //=======================================================================
   GEOMAlgo_Algo::~GEOMAlgo_Algo()
 {
 }
 //=======================================================================
 // function: CheckData
-// purpose: 
+// purpose:
 //=======================================================================
   void GEOMAlgo_Algo::CheckData()
 {
@@ -54,7 +54,7 @@
 }
 //=======================================================================
 // function: CheckResult
-// purpose: 
+// purpose:
 //=======================================================================
   void GEOMAlgo_Algo::CheckResult()
 {
@@ -62,7 +62,7 @@
 }
 //=======================================================================
 // function: ErrorStatus
-// purpose: 
+// purpose:
 //=======================================================================
   Standard_Integer GEOMAlgo_Algo::ErrorStatus()const
 {
@@ -70,7 +70,7 @@
 }
 //=======================================================================
 // function: WarningStatus
-// purpose: 
+// purpose:
 //=======================================================================
   Standard_Integer GEOMAlgo_Algo::WarningStatus()const
 {
@@ -82,7 +82,7 @@
 
 //=======================================================================
 //function : ComputeInternalShapes
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_Algo::ComputeInternalShapes(const Standard_Boolean theFlag)
 {
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_Algo.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_Algo.hxx
index 13f3e162e..b82398fe1 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_Algo.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_Algo.hxx
@@ -1,75 +1,75 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-
-// File:        GEOMAlgo_Algo.hxx
-// Created:     Sat Dec 04 12:39:47 2004
-// Author:      Peter KURNEV
-//              <peter@PREFEX>
-//
-#ifndef _GEOMAlgo_Algo_HeaderFile
-#define _GEOMAlgo_Algo_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_Macro.hxx>
-#include <Standard_Integer.hxx>
-#include <Standard_Boolean.hxx>
-
-//=======================================================================
-//class    : GEOMAlgo_Algo
-//purpose  : 
-//=======================================================================
-class GEOMAlgo_Algo 
-{
- public:
-  Standard_EXPORT
-    virtual  void Perform()  = 0;
-  
-  Standard_EXPORT
-    Standard_Integer ErrorStatus() const;
-  
-  Standard_EXPORT
-    Standard_Integer WarningStatus() const;
-
-  //! Allows to omit of creation of internal shapes (manifold topology). <br>
-  //!          Needed for the SALOME/TRIPOLI module. <br>
-  Standard_EXPORT
-    void ComputeInternalShapes(const Standard_Boolean theFlag) ;
-
-protected:
-  Standard_EXPORT
-    GEOMAlgo_Algo();
-  
-  Standard_EXPORT
-    virtual ~GEOMAlgo_Algo();
-  
-  Standard_EXPORT
-    virtual  void CheckData() ;
-  
-  Standard_EXPORT
-    virtual  void CheckResult() ;
-
-
-  Standard_Integer myErrorStatus;
-  Standard_Integer myWarningStatus;
-  Standard_Boolean myComputeInternalShapes; 
-};
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File:        GEOMAlgo_Algo.hxx
+// Created:     Sat Dec 04 12:39:47 2004
+// Author:      Peter KURNEV
+//              <peter@PREFEX>
+//
+#ifndef _GEOMAlgo_Algo_HeaderFile
+#define _GEOMAlgo_Algo_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Macro.hxx>
+#include <Standard_Integer.hxx>
+#include <Standard_Boolean.hxx>
+
+//=======================================================================
+//class    : GEOMAlgo_Algo
+//purpose  :
+//=======================================================================
+class GEOMAlgo_Algo
+{
+ public:
+  Standard_EXPORT
+    virtual  void Perform()  = 0;
+
+  Standard_EXPORT
+    Standard_Integer ErrorStatus() const;
+
+  Standard_EXPORT
+    Standard_Integer WarningStatus() const;
+
+  //! Allows to omit of creation of internal shapes (manifold topology). <br>
+  //!          Needed for the SALOME/TRIPOLI module. <br>
+  Standard_EXPORT
+    void ComputeInternalShapes(const Standard_Boolean theFlag) ;
+
+protected:
+  Standard_EXPORT
+    GEOMAlgo_Algo();
+
+  Standard_EXPORT
+    virtual ~GEOMAlgo_Algo();
+
+  Standard_EXPORT
+    virtual  void CheckData() ;
+
+  Standard_EXPORT
+    virtual  void CheckResult() ;
+
+
+  Standard_Integer myErrorStatus;
+  Standard_Integer myWarningStatus;
+  Standard_Boolean myComputeInternalShapes;
+};
+#endif
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_Builder.cxx b/src/GEOMAlgo_NEW/GEOMAlgo_Builder.cxx
index 5429d32c3..669274cfa 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_Builder.cxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_Builder.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -20,8 +20,8 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 // File:        GEOMAlgo_Builder.cxx
-// Created:     
-// Author:      Peter KURNEV 
+// Created:
+// Author:      Peter KURNEV
 //
 #include <GEOMAlgo_Builder.hxx>
 
@@ -44,8 +44,8 @@
 #include <GEOMAlgo_Tools.hxx>
 
 //=======================================================================
-//function : 
-//purpose  : 
+//function :
+//purpose  :
 //=======================================================================
   GEOMAlgo_Builder::GEOMAlgo_Builder()
 :
@@ -57,7 +57,7 @@
 }
 //=======================================================================
 //function : ~
-//purpose  : 
+//purpose  :
 //=======================================================================
   GEOMAlgo_Builder::~GEOMAlgo_Builder()
 {
@@ -70,7 +70,7 @@
 }
 //=======================================================================
 //function : AddCompound
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_Builder::AddCompound(const TopoDS_Shape& theShape)
 {
@@ -84,7 +84,7 @@
 }
 //=======================================================================
 //function : AddShape
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_Builder::AddShape(const TopoDS_Shape& theShape)
 {
@@ -94,7 +94,7 @@
 }
 //=======================================================================
 //function : Shapes
-//purpose  : 
+//purpose  :
 //=======================================================================
   const TopTools_ListOfShape& GEOMAlgo_Builder::Shapes()const
 {
@@ -102,7 +102,7 @@
 }
 //=======================================================================
 //function : Clear
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_Builder::Clear()
 {
@@ -111,7 +111,7 @@
 }
 //=======================================================================
 //function : ClearInternals
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_Builder::ClearInternals()
 {
@@ -130,7 +130,7 @@
 }
 //=======================================================================
 //function : Prepare
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_Builder::Prepare()
 {
@@ -161,7 +161,7 @@
 
 //=======================================================================
 //function : AddShape1
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_Builder::AddShape1(const TopoDS_Shape& theShape)
 {
@@ -186,7 +186,7 @@
 }
 //=======================================================================
 //function : BuildResult
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_Builder::BuildResult(const TopAbs_ShapeEnum theType)
 {
@@ -222,7 +222,7 @@
 }
 //=======================================================================
 //function : Perform
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_Builder::Perform()
 {
@@ -250,7 +250,7 @@
 }
 //=======================================================================
 //function : PerformWithFiller
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_Builder::PerformWithFiller(const NMTTools_PaveFiller& theDSF)
 {
@@ -260,7 +260,7 @@
 }
 //=======================================================================
 //function : PerformInternal
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_Builder::PerformInternal(const NMTTools_PaveFiller& pPF)
 {
@@ -303,7 +303,7 @@
   if (myErrorStatus) {
     return;
   }
-  
+
   BuildResult(TopAbs_EDGE);
   if (myErrorStatus) {
     return;
@@ -313,29 +313,29 @@
   if (myErrorStatus) {
     return;
   }
-  
+
   BuildResult(TopAbs_WIRE);
   if (myErrorStatus) {
     return;
   }
-  
+
   // 3.4 Faces
   FillImagesFaces();
   if (myErrorStatus) {
     return;
   }
-  
+
   BuildResult(TopAbs_FACE);
   if (myErrorStatus) {
     return;
   }
   // 3.5 Shells
-  
+
   FillImagesContainers(TopAbs_SHELL);
   if (myErrorStatus) {
     return;
   }
-  
+
   BuildResult(TopAbs_SHELL);
   if (myErrorStatus) {
     return;
@@ -345,7 +345,7 @@
   if (myErrorStatus) {
     return;
   }
-  
+
   BuildResult(TopAbs_SOLID);
   if (myErrorStatus) {
     return;
@@ -355,7 +355,7 @@
   if (myErrorStatus) {
     return;
   }
-  
+
   BuildResult(TopAbs_COMPSOLID);
   if (myErrorStatus) {
     return;
@@ -365,7 +365,7 @@
   if (myErrorStatus) {
     return;
   }
-  
+
   BuildResult(TopAbs_COMPOUND);
   if (myErrorStatus) {
     return;
@@ -374,16 +374,16 @@
   // 4.History
   PrepareHistory();
   //
-  // 5 Post-treatment 
+  // 5 Post-treatment
   PostTreat();
 }
 //
-// static 
+// static
 //   void CorrectWires(const TopoDS_Shape& aS);
 //
 //=======================================================================
 //function : PostTreat
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_Builder::PostTreat()
 {
@@ -400,14 +400,14 @@
   if (aNbS==1) {
     myShape=aLS.First();
   }
-  
+
   BRepLib::SameParameter(myShape, 1.e-7, Standard_True);
   //
   GEOMAlgo_Tools::CorrectWires(myShape);
 }
 //
 // myErrorStatus
-// 
+//
 // 0  - Ok
 // 1  - The object is just initialized
 // 2  - PaveFiller is failed
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_Builder.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_Builder.hxx
index 529ae81b2..47d175564 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_Builder.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_Builder.hxx
@@ -1,224 +1,224 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-// File:        GEOMAlgo_Builder.cxx
-// Created:     
-// Author:      Peter KURNEV 
-//
-#ifndef _GEOMAlgo_Builder_HeaderFile
-#define _GEOMAlgo_Builder_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_Macro.hxx>
-#include <NMTTools_PPaveFiller.hxx>
-#include <TopTools_ListOfShape.hxx>
-#include <Standard_Integer.hxx>
-#include <TopTools_MapOfShape.hxx>
-#include <BRepAlgo_Image.hxx>
-#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
-#include <TopTools_IndexedDataMapOfShapeShape.hxx>
-#include <GEOMAlgo_BuilderShape.hxx>
-#include <NMTTools_PaveFiller.hxx>
-#include <Standard_Boolean.hxx>
-#include <TopAbs_ShapeEnum.hxx>
-#include <TopoDS_Shape.hxx>
-#include <BRepAlgo_Image.hxx>
-
-//=======================================================================
-//function : GEOMAlgo_Builder
-//purpose  : 
-//=======================================================================
-class GEOMAlgo_Builder  : public GEOMAlgo_BuilderShape 
-{
- public:
-  //!  Empty constructor <br>
-  Standard_EXPORT
-    GEOMAlgo_Builder();
-  
-  Standard_EXPORT
-    virtual ~GEOMAlgo_Builder();
-  
-  //!  Performs calculations <br>
-  Standard_EXPORT
-    virtual  void Perform() ;
-  
-  //!  Performs calculations using prepared PaveFiller <br>
-  //!           object theDSF <br>
-  Standard_EXPORT
-    virtual  void PerformWithFiller(const NMTTools_PaveFiller& theDSF) ;
-  
-  //!  Adds argument theShape of the operation <br>
-  Standard_EXPORT
-    virtual  void AddShape(const TopoDS_Shape& theShape) ;
-  
-  //!  Clears internal fields and arguments <br>
-  Standard_EXPORT
-    virtual  void Clear() ;
-  
-  //!  Returns the arguments of the operation <br>
-  Standard_EXPORT
-    const TopTools_ListOfShape& Shapes() const;
-  
-  //! Returns the  list of shapes generated from the <br>
-  //!          shape theS. <br>
-  Standard_EXPORT
-    virtual const TopTools_ListOfShape& Generated(const TopoDS_Shape& theS) ;
-  
-  //! Returns the list of shapes modified from the shape <br>
-  //!          theS. <br>
-  Standard_EXPORT
-    virtual const TopTools_ListOfShape& Modified(const TopoDS_Shape& theS) ;
-  
-  //! Returns true if the shape theS has been deleted. <br>
-  Standard_EXPORT   
-    virtual  Standard_Boolean IsDeleted(const TopoDS_Shape& theS) ;
-  
-  //!  Adds arguments of the operation as <br>
-  //!           shapes of upper level of container shape theShape <br>
-  Standard_EXPORT
-    void AddCompound(const TopoDS_Shape& theShape) ;
-  
-  //! Returns list of arguments of type theType <br>
-  Standard_EXPORT
-    const TopTools_ListOfShape& Shapes1(const Standard_Integer theType) const;
-  
-  //! Returns image shapes <br>
-  Standard_EXPORT
-    const BRepAlgo_Image& Images() const;
-  
-  //! Returns split-parts of shapes that have <br>
-  //!          state IN for the domain of shape theShape <br>
-  Standard_EXPORT
-    const TopTools_ListOfShape& InParts(const TopoDS_Shape& theShape) const;
-
-protected:
-  //!  Performs calculations using prepared DSFiller <br>
-  //!           object theDSF <br>
-  Standard_EXPORT
-    virtual  void PerformInternal(const NMTTools_PaveFiller& theDSF) ;
-  
-  //!  Prepare information for history support <br>
-  Standard_EXPORT   
-    virtual  void PrepareHistory() ;
-  
-  //!  Clears internal fields <br>
-  Standard_EXPORT
-    virtual  void ClearInternals() ;
-  
-  //!  Provides preparing actions <br>
-  Standard_EXPORT
-    virtual  void Prepare() ;
-  
-  //!  Provides post-tratment actions <br>
-  Standard_EXPORT
-    virtual  void PostTreat() ;
-  
-  //!  Append the argument theShape to <br>
-  //!           typified lists of arguments myShapes1 <br>
-  Standard_EXPORT
-    void AddShape1(const TopoDS_Shape& theShape) ;
-  
-  //! Build the resulting shapes of type theType <br>
-  Standard_EXPORT
-    virtual  void BuildResult(const TopAbs_ShapeEnum theType) ;
-  
-  //! Fill Images for vertices <br>
-  Standard_EXPORT
-    void FillImagesVertices() ;
-  
-  //! Fill Images for edges <br>
-  Standard_EXPORT
-    void FillImagesEdges() ;
-  
-  //! Fill Images for faces <br>
-  Standard_EXPORT
-    void FillImagesFaces() ;
-  
-  //! For each interferred face find split edges <br>
-  //!          that are in 2-D domain of the face <br>
-  Standard_EXPORT
-    void FillIn2DParts() ;
-  
-  //! Build draft faces <br>
-  Standard_EXPORT
-    void BuildSplitFaces() ;
-  
-  //! Among draft faces find same domain faces <br>
-  Standard_EXPORT
-    void FillSameDomainFaces() ;
-  
-  //! Fill Images for faces <br>
-  //!          taking into account same domain faces <br>
-  Standard_EXPORT
-    void FillImagesFaces1() ;
-  
-  //! Update Images for faces by <br>
-  //!          internal vertices <br>
-  Standard_EXPORT
-    void FillInternalVertices() ;
-  
-  //!  Fill Images for Wires, Shells, Compsolids, Compounds <br>
-  Standard_EXPORT
-    void FillImagesContainers(const TopAbs_ShapeEnum theType) ;
-  
-  //!  Fill Images for solids <br>
-  Standard_EXPORT
-    void FillImagesSolids() ;
-  
-  //! For each interferred solid find split faces <br>
-  //!          that are in 3-D domain of the solid <br>
-  Standard_EXPORT
-    void FillIn3DParts() ;
-  
-  //! Build draft solids <br>
-  Standard_EXPORT
-    void BuildSplitSolids() ;
-  
-  //!  Update draft solids by <br>
-  //!           internal shells, edges, vertices <br>
-  Standard_EXPORT
-    void FillInternalShapes() ;
-  
-  //!  Build solid theDraftSolid that consists of <br>
-  //!           non-internal split faces of the solid <br>
-  //!           theSolid. <br>
-  //!           All splits of internal faces of <br>
-  //!           theSolid are in the list: theInternalFaces <br>
-  Standard_EXPORT     
-    void BuildDraftSolid(const TopoDS_Shape& theSolid,
-			 TopoDS_Shape& theDraftSolid,
-			 TopTools_ListOfShape& theInternalFaces) ;
-
-
-  NMTTools_PPaveFiller myPaveFiller;
-  TopTools_ListOfShape myShapes;
-  Standard_Integer myNbTypes;
-  TopTools_MapOfShape myMapFence;
-  TopTools_ListOfShape myShapes1[9];
-  BRepAlgo_Image myImages;
-  TopTools_IndexedDataMapOfShapeListOfShape myInParts;
-  BRepAlgo_Image mySplitFaces;
-  TopTools_IndexedDataMapOfShapeShape mySameDomainShapes;
-  TopTools_IndexedDataMapOfShapeShape myDraftSolids;
-  Standard_Integer myEntryPoint;
-
-};
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// File:        GEOMAlgo_Builder.cxx
+// Created:
+// Author:      Peter KURNEV
+//
+#ifndef _GEOMAlgo_Builder_HeaderFile
+#define _GEOMAlgo_Builder_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Macro.hxx>
+#include <NMTTools_PPaveFiller.hxx>
+#include <TopTools_ListOfShape.hxx>
+#include <Standard_Integer.hxx>
+#include <TopTools_MapOfShape.hxx>
+#include <BRepAlgo_Image.hxx>
+#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
+#include <TopTools_IndexedDataMapOfShapeShape.hxx>
+#include <GEOMAlgo_BuilderShape.hxx>
+#include <NMTTools_PaveFiller.hxx>
+#include <Standard_Boolean.hxx>
+#include <TopAbs_ShapeEnum.hxx>
+#include <TopoDS_Shape.hxx>
+#include <BRepAlgo_Image.hxx>
+
+//=======================================================================
+//function : GEOMAlgo_Builder
+//purpose  :
+//=======================================================================
+class GEOMAlgo_Builder  : public GEOMAlgo_BuilderShape
+{
+ public:
+  //!  Empty constructor <br>
+  Standard_EXPORT
+    GEOMAlgo_Builder();
+
+  Standard_EXPORT
+    virtual ~GEOMAlgo_Builder();
+
+  //!  Performs calculations <br>
+  Standard_EXPORT
+    virtual  void Perform() ;
+
+  //!  Performs calculations using prepared PaveFiller <br>
+  //!           object theDSF <br>
+  Standard_EXPORT
+    virtual  void PerformWithFiller(const NMTTools_PaveFiller& theDSF) ;
+
+  //!  Adds argument theShape of the operation <br>
+  Standard_EXPORT
+    virtual  void AddShape(const TopoDS_Shape& theShape) ;
+
+  //!  Clears internal fields and arguments <br>
+  Standard_EXPORT
+    virtual  void Clear() ;
+
+  //!  Returns the arguments of the operation <br>
+  Standard_EXPORT
+    const TopTools_ListOfShape& Shapes() const;
+
+  //! Returns the  list of shapes generated from the <br>
+  //!          shape theS. <br>
+  Standard_EXPORT
+    virtual const TopTools_ListOfShape& Generated(const TopoDS_Shape& theS) ;
+
+  //! Returns the list of shapes modified from the shape <br>
+  //!          theS. <br>
+  Standard_EXPORT
+    virtual const TopTools_ListOfShape& Modified(const TopoDS_Shape& theS) ;
+
+  //! Returns true if the shape theS has been deleted. <br>
+  Standard_EXPORT
+    virtual  Standard_Boolean IsDeleted(const TopoDS_Shape& theS) ;
+
+  //!  Adds arguments of the operation as <br>
+  //!           shapes of upper level of container shape theShape <br>
+  Standard_EXPORT
+    void AddCompound(const TopoDS_Shape& theShape) ;
+
+  //! Returns list of arguments of type theType <br>
+  Standard_EXPORT
+    const TopTools_ListOfShape& Shapes1(const Standard_Integer theType) const;
+
+  //! Returns image shapes <br>
+  Standard_EXPORT
+    const BRepAlgo_Image& Images() const;
+
+  //! Returns split-parts of shapes that have <br>
+  //!          state IN for the domain of shape theShape <br>
+  Standard_EXPORT
+    const TopTools_ListOfShape& InParts(const TopoDS_Shape& theShape) const;
+
+protected:
+  //!  Performs calculations using prepared DSFiller <br>
+  //!           object theDSF <br>
+  Standard_EXPORT
+    virtual  void PerformInternal(const NMTTools_PaveFiller& theDSF) ;
+
+  //!  Prepare information for history support <br>
+  Standard_EXPORT
+    virtual  void PrepareHistory() ;
+
+  //!  Clears internal fields <br>
+  Standard_EXPORT
+    virtual  void ClearInternals() ;
+
+  //!  Provides preparing actions <br>
+  Standard_EXPORT
+    virtual  void Prepare() ;
+
+  //!  Provides post-tratment actions <br>
+  Standard_EXPORT
+    virtual  void PostTreat() ;
+
+  //!  Append the argument theShape to <br>
+  //!           typified lists of arguments myShapes1 <br>
+  Standard_EXPORT
+    void AddShape1(const TopoDS_Shape& theShape) ;
+
+  //! Build the resulting shapes of type theType <br>
+  Standard_EXPORT
+    virtual  void BuildResult(const TopAbs_ShapeEnum theType) ;
+
+  //! Fill Images for vertices <br>
+  Standard_EXPORT
+    void FillImagesVertices() ;
+
+  //! Fill Images for edges <br>
+  Standard_EXPORT
+    void FillImagesEdges() ;
+
+  //! Fill Images for faces <br>
+  Standard_EXPORT
+    void FillImagesFaces() ;
+
+  //! For each interferred face find split edges <br>
+  //!          that are in 2-D domain of the face <br>
+  Standard_EXPORT
+    void FillIn2DParts() ;
+
+  //! Build draft faces <br>
+  Standard_EXPORT
+    void BuildSplitFaces() ;
+
+  //! Among draft faces find same domain faces <br>
+  Standard_EXPORT
+    void FillSameDomainFaces() ;
+
+  //! Fill Images for faces <br>
+  //!          taking into account same domain faces <br>
+  Standard_EXPORT
+    void FillImagesFaces1() ;
+
+  //! Update Images for faces by <br>
+  //!          internal vertices <br>
+  Standard_EXPORT
+    void FillInternalVertices() ;
+
+  //!  Fill Images for Wires, Shells, Compsolids, Compounds <br>
+  Standard_EXPORT
+    void FillImagesContainers(const TopAbs_ShapeEnum theType) ;
+
+  //!  Fill Images for solids <br>
+  Standard_EXPORT
+    void FillImagesSolids() ;
+
+  //! For each interferred solid find split faces <br>
+  //!          that are in 3-D domain of the solid <br>
+  Standard_EXPORT
+    void FillIn3DParts() ;
+
+  //! Build draft solids <br>
+  Standard_EXPORT
+    void BuildSplitSolids() ;
+
+  //!  Update draft solids by <br>
+  //!           internal shells, edges, vertices <br>
+  Standard_EXPORT
+    void FillInternalShapes() ;
+
+  //!  Build solid theDraftSolid that consists of <br>
+  //!           non-internal split faces of the solid <br>
+  //!           theSolid. <br>
+  //!           All splits of internal faces of <br>
+  //!           theSolid are in the list: theInternalFaces <br>
+  Standard_EXPORT
+    void BuildDraftSolid(const TopoDS_Shape& theSolid,
+			 TopoDS_Shape& theDraftSolid,
+			 TopTools_ListOfShape& theInternalFaces) ;
+
+
+  NMTTools_PPaveFiller myPaveFiller;
+  TopTools_ListOfShape myShapes;
+  Standard_Integer myNbTypes;
+  TopTools_MapOfShape myMapFence;
+  TopTools_ListOfShape myShapes1[9];
+  BRepAlgo_Image myImages;
+  TopTools_IndexedDataMapOfShapeListOfShape myInParts;
+  BRepAlgo_Image mySplitFaces;
+  TopTools_IndexedDataMapOfShapeShape mySameDomainShapes;
+  TopTools_IndexedDataMapOfShapeShape myDraftSolids;
+  Standard_Integer myEntryPoint;
+
+};
+#endif
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_BuilderArea.cxx b/src/GEOMAlgo_NEW/GEOMAlgo_BuilderArea.cxx
index 0cd264068..d2dbd991b 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_BuilderArea.cxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_BuilderArea.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -21,8 +21,8 @@
 //
 
 // File:        GEOMAlgo_BuilderArea.cxx
-// Created:     
-// Author:      Peter KURNEV 
+// Created:
+// Author:      Peter KURNEV
 //
 #include <GEOMAlgo_BuilderArea.hxx>
 
@@ -31,8 +31,8 @@
 #include <IntTools_Context.hxx>
 
 //=======================================================================
-//function : 
-//purpose  : 
+//function :
+//purpose  :
 //=======================================================================
 GEOMAlgo_BuilderArea::GEOMAlgo_BuilderArea()
 :
@@ -41,14 +41,14 @@ GEOMAlgo_BuilderArea::GEOMAlgo_BuilderArea()
 }
 //=======================================================================
 //function : ~
-//purpose  : 
+//purpose  :
 //=======================================================================
 GEOMAlgo_BuilderArea::~GEOMAlgo_BuilderArea()
 {
 }
 //=======================================================================
 //function : SetContext
-//purpose  : 
+//purpose  :
 //=======================================================================
 void GEOMAlgo_BuilderArea::SetContext(const Handle(IntTools_Context)& theContext)
 {
@@ -56,15 +56,15 @@ void GEOMAlgo_BuilderArea::SetContext(const Handle(IntTools_Context)& theContext
 }
 //=======================================================================
 //function : Context
-//purpose  : 
+//purpose  :
 //=======================================================================
-const Handle(IntTools_Context)& GEOMAlgo_BuilderArea::Context()const 
+const Handle(IntTools_Context)& GEOMAlgo_BuilderArea::Context()const
 {
   return myContext;
 }
 //=======================================================================
 //function : Perform
-//purpose  : 
+//purpose  :
 //=======================================================================
 void GEOMAlgo_BuilderArea::Perform()
 {
@@ -74,7 +74,7 @@ void GEOMAlgo_BuilderArea::Perform()
 }
 //=======================================================================
 //function : SetShapes
-//purpose  : 
+//purpose  :
 //=======================================================================
 void GEOMAlgo_BuilderArea::SetShapes(const TopTools_ListOfShape& theLF)
 {
@@ -89,7 +89,7 @@ void GEOMAlgo_BuilderArea::SetShapes(const TopTools_ListOfShape& theLF)
 }
 //=======================================================================
 //function : Shapes
-//purpose  : 
+//purpose  :
 //=======================================================================
 const TopTools_ListOfShape& GEOMAlgo_BuilderArea::Shapes()const
 {
@@ -97,7 +97,7 @@ const TopTools_ListOfShape& GEOMAlgo_BuilderArea::Shapes()const
 }
 //=======================================================================
 //function : Loops
-//purpose  : 
+//purpose  :
 //=======================================================================
 const TopTools_ListOfShape& GEOMAlgo_BuilderArea::Loops()const
 {
@@ -105,7 +105,7 @@ const TopTools_ListOfShape& GEOMAlgo_BuilderArea::Loops()const
 }
 //=======================================================================
 //function : Areas
-//purpose  : 
+//purpose  :
 //=======================================================================
 const TopTools_ListOfShape& GEOMAlgo_BuilderArea::Areas()const
 {
@@ -113,28 +113,28 @@ const TopTools_ListOfShape& GEOMAlgo_BuilderArea::Areas()const
 }
 //=======================================================================
 //function :PerformShapesToAvoid
-//purpose  : 
+//purpose  :
 //=======================================================================
 void GEOMAlgo_BuilderArea::PerformShapesToAvoid()
 {
 }
 //=======================================================================
 //function : PerformLoops
-//purpose  : 
+//purpose  :
 //=======================================================================
 void GEOMAlgo_BuilderArea::PerformLoops()
 {
 }
 //=======================================================================
 //function : PerformAreas
-//purpose  : 
+//purpose  :
 //=======================================================================
 void GEOMAlgo_BuilderArea::PerformAreas()
 {
 }
 //=======================================================================
 //function : PerformInternalShapes
-//purpose  : 
+//purpose  :
 //=======================================================================
 void GEOMAlgo_BuilderArea::PerformInternalShapes()
 {
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_BuilderArea.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_BuilderArea.hxx
index a6d5d8aba..670517f32 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_BuilderArea.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_BuilderArea.hxx
@@ -1,112 +1,112 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-
-// File:        GEOMAlgo_BuilderArea.hxx
-// Created:     
-// Author:      Peter KURNEV 
-//
-
-#ifndef _GEOMAlgo_BuilderArea_HeaderFile
-#define _GEOMAlgo_BuilderArea_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_Macro.hxx>
-#include <TopTools_ListOfShape.hxx>
-#include <TopTools_MapOfOrientedShape.hxx>
-#include <Handle_IntTools_Context.hxx>
-#include <GEOMAlgo_Algo.hxx>
-#include <IntTools_Context.hxx>
-
-//! The root class for algorithms to build <br>
-//!          faces/solids from set of edges/faces <br>
-//=======================================================================
-//class    : GEOMAlgo_BuilderArea
-//purpose  : 
-//=======================================================================
-class GEOMAlgo_BuilderArea  : public GEOMAlgo_Algo 
-{
- public:
-  //! Sets cashed geometrical tools <br>
-  Standard_EXPORT
-    void SetContext(const Handle(IntTools_Context)& theContext) ;
-  
-  //! Returns cashed geometrical tools <br>
-  Standard_EXPORT
-    const Handle_IntTools_Context& Context() const;
-  
-  //! Sets edges/faces to process <br>
-  Standard_EXPORT
-    void SetShapes(const TopTools_ListOfShape& theLS) ;
-  
-  //! Returns edges/faces to process <br>
-  Standard_EXPORT
-    const TopTools_ListOfShape& Shapes() const;
-  
-  //! Returns wires/shells that have been built <br>
-  Standard_EXPORT
-    const TopTools_ListOfShape& Loops() const;
-  
-  //! Returns faces/solids that have been built <br>
-  Standard_EXPORT
-    const TopTools_ListOfShape& Areas() const;
-  
-  Standard_EXPORT
-    virtual  void Perform() ;
-
- protected:
-  //!  Empty  constructor <br>
-  Standard_EXPORT
-    GEOMAlgo_BuilderArea();
-
-  Standard_EXPORT
-    virtual ~GEOMAlgo_BuilderArea();
-  //!  Collect the edges/faces that <br>
-  //!           a) are internal <br>
-  //!           b) are the same and have different orientation <br>
-  
-  Standard_EXPORT
-    virtual  void PerformShapesToAvoid() ;
-
-  //! Build draft faces/shells <br>
-  //!          a)myLoops - draft faces/shells that consist of <br>
-  //!                      boundary edges/faces <br>
-  //!          b)myLoopsInternal - draft faces/shells that contains <br>
-  //!                               inner edges/faces <br>
-  Standard_EXPORT
-    virtual  void PerformLoops() ;
-  //! Build draft faces/solids that contains boundary faces <br>
-  
-  Standard_EXPORT
-    virtual  void PerformAreas() ;
-  
-  //! Build finalized faces/solids with internal wires/shells <br>
-  Standard_EXPORT
-    virtual  void PerformInternalShapes() ;
-
-  TopTools_ListOfShape myShapes;
-  TopTools_ListOfShape myLoops;
-  TopTools_ListOfShape myLoopsInternal;
-  TopTools_MapOfOrientedShape myShapesToAvoid;
-  TopTools_ListOfShape myAreas;
-  Handle_IntTools_Context myContext;
-};
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File:        GEOMAlgo_BuilderArea.hxx
+// Created:
+// Author:      Peter KURNEV
+//
+
+#ifndef _GEOMAlgo_BuilderArea_HeaderFile
+#define _GEOMAlgo_BuilderArea_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Macro.hxx>
+#include <TopTools_ListOfShape.hxx>
+#include <TopTools_MapOfOrientedShape.hxx>
+#include <Handle_IntTools_Context.hxx>
+#include <GEOMAlgo_Algo.hxx>
+#include <IntTools_Context.hxx>
+
+//! The root class for algorithms to build <br>
+//!          faces/solids from set of edges/faces <br>
+//=======================================================================
+//class    : GEOMAlgo_BuilderArea
+//purpose  :
+//=======================================================================
+class GEOMAlgo_BuilderArea  : public GEOMAlgo_Algo
+{
+ public:
+  //! Sets cashed geometrical tools <br>
+  Standard_EXPORT
+    void SetContext(const Handle(IntTools_Context)& theContext) ;
+
+  //! Returns cashed geometrical tools <br>
+  Standard_EXPORT
+    const Handle_IntTools_Context& Context() const;
+
+  //! Sets edges/faces to process <br>
+  Standard_EXPORT
+    void SetShapes(const TopTools_ListOfShape& theLS) ;
+
+  //! Returns edges/faces to process <br>
+  Standard_EXPORT
+    const TopTools_ListOfShape& Shapes() const;
+
+  //! Returns wires/shells that have been built <br>
+  Standard_EXPORT
+    const TopTools_ListOfShape& Loops() const;
+
+  //! Returns faces/solids that have been built <br>
+  Standard_EXPORT
+    const TopTools_ListOfShape& Areas() const;
+
+  Standard_EXPORT
+    virtual  void Perform() ;
+
+ protected:
+  //!  Empty  constructor <br>
+  Standard_EXPORT
+    GEOMAlgo_BuilderArea();
+
+  Standard_EXPORT
+    virtual ~GEOMAlgo_BuilderArea();
+  //!  Collect the edges/faces that <br>
+  //!           a) are internal <br>
+  //!           b) are the same and have different orientation <br>
+
+  Standard_EXPORT
+    virtual  void PerformShapesToAvoid() ;
+
+  //! Build draft faces/shells <br>
+  //!          a)myLoops - draft faces/shells that consist of <br>
+  //!                      boundary edges/faces <br>
+  //!          b)myLoopsInternal - draft faces/shells that contains <br>
+  //!                               inner edges/faces <br>
+  Standard_EXPORT
+    virtual  void PerformLoops() ;
+  //! Build draft faces/solids that contains boundary faces <br>
+
+  Standard_EXPORT
+    virtual  void PerformAreas() ;
+
+  //! Build finalized faces/solids with internal wires/shells <br>
+  Standard_EXPORT
+    virtual  void PerformInternalShapes() ;
+
+  TopTools_ListOfShape myShapes;
+  TopTools_ListOfShape myLoops;
+  TopTools_ListOfShape myLoopsInternal;
+  TopTools_MapOfOrientedShape myShapesToAvoid;
+  TopTools_ListOfShape myAreas;
+  Handle_IntTools_Context myContext;
+};
+#endif
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_BuilderFace.cxx b/src/GEOMAlgo_NEW/GEOMAlgo_BuilderFace.cxx
index ce238b31f..afae9cee4 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_BuilderFace.cxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_BuilderFace.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -21,7 +21,7 @@
 //
 
 // File:        GEOMAlgo_BuilderFace.cxx
-// Created:     
+// Created:
 // Author:      Peter KURNEV
 //
 #include <GEOMAlgo_BuilderFace.hxx>
@@ -86,7 +86,7 @@ static
 
                                 const TopTools_IndexedMapOfShape& );
 
-static 
+static
   Standard_Boolean IsInside(const TopoDS_Shape& ,
                             const TopoDS_Shape& ,
                             const Handle(IntTools_Context)& );
@@ -95,8 +95,8 @@ static
                          TopTools_ListOfShape& );
 
 //=======================================================================
-//function : 
-//purpose  : 
+//function :
+//purpose  :
 //=======================================================================
   GEOMAlgo_BuilderFace::GEOMAlgo_BuilderFace()
 :
@@ -105,14 +105,14 @@ static
 }
 //=======================================================================
 //function : ~
-//purpose  : 
+//purpose  :
 //=======================================================================
   GEOMAlgo_BuilderFace::~GEOMAlgo_BuilderFace()
 {
 }
 //=======================================================================
 //function : SetFace
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_BuilderFace::SetFace(const TopoDS_Face& theFace)
 {
@@ -120,7 +120,7 @@ static
 }
 //=======================================================================
 //function : Face
-//purpose  : 
+//purpose  :
 //=======================================================================
   const TopoDS_Face& GEOMAlgo_BuilderFace::Face()const
 {
@@ -128,7 +128,7 @@ static
 }
 //=======================================================================
 //function : Perform
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_BuilderFace::Perform()
 {
@@ -163,7 +163,7 @@ static
 }
 //=======================================================================
 //function :PerformShapesToAvoid
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_BuilderFace::PerformShapesToAvoid()
 {
@@ -234,12 +234,12 @@ static
       break;
     }
     //
-  }//while (1) 
+  }//while (1)
   //printf(" EdgesToAvoid=%d, iCnt=%d\n", EdgesToAvoid.Extent(), iCnt);
-}  
+}
 //=======================================================================
 //function : PerformLoops
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_BuilderFace::PerformLoops()
 {
@@ -252,11 +252,11 @@ static
   TopTools_IndexedDataMapOfShapeListOfShape aVEMap;
   TopTools_MapOfOrientedShape aMAdded;
   TopoDS_Iterator aItW;
-  BRep_Builder aBB; 
+  BRep_Builder aBB;
   GEOMAlgo_WireEdgeSet aWES;
   GEOMAlgo_WESCorrector aWESCor;
   //
-  // 1. Usual Wires 
+  // 1. Usual Wires
   myLoops.Clear();
   aWES.SetFace(myFace);
   //
@@ -282,7 +282,7 @@ static
   //modified by NIZNHY-PKV Tue Aug  5 15:09:29 2008f
   // Post Treatment
   TopTools_MapOfOrientedShape aMEP;
-  // 
+  //
   // a. collect all edges that are in loops
   aIt.Initialize (myLoops);
   for (; aIt.More(); aIt.Next()) {
@@ -293,7 +293,7 @@ static
       aMEP.Add(aE);
     }
   }
-  // 
+  //
   // b. collect all edges that are to avoid
   aItM.Initialize(myShapesToAvoid);
   for (; aItM.More(); aItM.Next()) {
@@ -343,7 +343,7 @@ static
         const TopoDS_Vertex& aV = TopoDS::Vertex(aItE.Value());
         const TopTools_ListOfShape& aLE=aVEMap.FindFromKey(aV);
         aIt.Initialize(aLE);
-        for (; aIt.More()&&bFlag; aIt.Next()) { 
+        for (; aIt.More()&&bFlag; aIt.Next()) {
           const TopoDS_Shape& aEx=aIt.Value();
           if (aMAdded.Add(aEx)) {
             aBB.Add(aW, aEx);
@@ -351,7 +351,7 @@ static
               bFlag=!bFlag;
             }
           }
-        }//for (; aIt.More(); aIt.Next()) { 
+        }//for (; aIt.More(); aIt.Next()) {
       }//for (; aItE.More(); aItE.Next()) {
     }//for (; aItW.More(); aItW.Next()) {
     myLoopsInternal.Append(aW);
@@ -359,7 +359,7 @@ static
 }
 //=======================================================================
 //function : PerformAreas
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_BuilderFace::PerformAreas()
 {
@@ -367,7 +367,7 @@ static
   //
   Standard_Boolean bIsGrowth, bIsHole;
   Standard_Real aTol;
-  TopTools_ListOfShape aNewFaces, aHoleWires; 
+  TopTools_ListOfShape aNewFaces, aHoleWires;
   TopoDS_Shape anInfinitePointShape;
   TopTools_DataMapOfShapeShape aInOutMap;
   TopTools_DataMapOfShapeListOfShape aMSH;
@@ -398,7 +398,7 @@ static
       aNewFaces.Append (aFace);
     }
     else{
-      // check if a wire is a hole 
+      // check if a wire is a hole
       //XX
       //bIsHole=IsHole(aWire, myFace, myContext);
       bIsHole=GEOMAlgo_BuilderTools::IsHole(aWire, myFace);
@@ -470,20 +470,20 @@ static
       aBB.Add (aF, aHole);
     }
     //
-    // update classifier 
+    // update classifier
     aTol=BRep_Tool::Tolerance(aF);
     IntTools_FClass2d& aClsf=myContext->FClass2d(aF);
     aClsf.Init(aF, aTol);
   }
   //
-  // These aNewFaces are draft faces that 
+  // These aNewFaces are draft faces that
   // do not contain any internal shapes
   //
   myAreas.Append(aNewFaces);
 }
 //=======================================================================
 //function : PerformInternalShapes
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_BuilderFace::PerformInternalShapes()
 {
@@ -493,11 +493,11 @@ static
   if (!aNbWI) {// nothing to do
     return;
   }
-  // 
+  //
   //Standard_Real aTol;
   BRep_Builder aBB;
   TopTools_ListIteratorOfListOfShape aIt1, aIt2;
-  TopoDS_Iterator aIt; 
+  TopoDS_Iterator aIt;
   TopTools_MapOfShape aME, aMEP;
   TopTools_MapIteratorOfMapOfShape aItME;
   TopTools_IndexedDataMapOfShapeListOfShape aMVE;
@@ -559,7 +559,7 @@ static
 }
 //=======================================================================
 //function : MakeInternalWires
-//purpose  : 
+//purpose  :
 //=======================================================================
 void MakeInternalWires(const TopTools_MapOfShape& theME,
                        TopTools_ListOfShape& theWires)
@@ -585,7 +585,7 @@ void MakeInternalWires(const TopTools_MapOfShape& theME,
     //
     // make a new shell
     TopoDS_Wire aW;
-    aBB.MakeWire(aW);    
+    aBB.MakeWire(aW);
     aEE.Orientation(TopAbs_INTERNAL);
     aBB.Add(aW, aEE);
     //
@@ -598,7 +598,7 @@ void MakeInternalWires(const TopTools_MapOfShape& theME,
         const TopoDS_Shape& aV =aExp.Current();
         const TopTools_ListOfShape& aLE=aMVE.FindFromKey(aV);
         aItE.Initialize(aLE);
-        for (; aItE.More(); aItE.Next()) { 
+        for (; aItE.More(); aItE.Next()) {
           TopoDS_Shape aEL=aItE.Value();
           if (aAddedMap.Add(aEL)){
             aEL.Orientation(TopAbs_INTERNAL);
@@ -612,7 +612,7 @@ void MakeInternalWires(const TopTools_MapOfShape& theME,
 }
 //=======================================================================
 //function : IsInside
-//purpose  : 
+//purpose  :
 //=======================================================================
 Standard_Boolean IsInside(const TopoDS_Shape& theHole,
                           const TopoDS_Shape& theF2,
@@ -620,7 +620,7 @@ Standard_Boolean IsInside(const TopoDS_Shape& theHole,
 {
   Standard_Boolean bRet;
   Standard_Real aT, aU, aV;
-  
+
   TopAbs_State aState;
   TopExp_Explorer aExp;
   TopTools_IndexedMapOfShape aME2;
@@ -653,14 +653,14 @@ Standard_Boolean IsInside(const TopoDS_Shape& theHole,
 
 //=======================================================================
 //function : IsGrowthWire
-//purpose  : 
+//purpose  :
 //=======================================================================
 Standard_Boolean IsGrowthWire(const TopoDS_Shape& theWire,
                               const TopTools_IndexedMapOfShape& theMHE)
 {
   Standard_Boolean bRet;
   TopoDS_Iterator aIt;
-  // 
+  //
   bRet=Standard_False;
   if (theMHE.Extent()) {
     aIt.Initialize(theWire);
@@ -683,7 +683,7 @@ Standard_Boolean IsGrowthWire(const TopoDS_Shape& theWire,
 /*
 //=======================================================================
 //function : IsInside
-//purpose  : 
+//purpose  :
 //=======================================================================
 Standard_Boolean IsInside(const TopoDS_Shape& theHole,
                           const TopoDS_Shape& theF2,
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_BuilderFace.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_BuilderFace.hxx
index 96a038954..595436cda 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_BuilderFace.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_BuilderFace.hxx
@@ -1,91 +1,91 @@
-
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-
-// File:        GEOMAlgo_BuilderFace.hxx
-// Created:     
-// Author:      Peter KURNEV
-//
-#ifndef _GEOMAlgo_BuilderFace_HeaderFile
-#define _GEOMAlgo_BuilderFace_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_Macro.hxx>
-#include <TopoDS_Face.hxx>
-#include <GEOMAlgo_BuilderArea.hxx>
-
-//! The algorithm to build faces from set of edges <br>
-//=======================================================================
-//class    : GEOMAlgo_BuilderFace
-//purpose  : 
-//=======================================================================
-class GEOMAlgo_BuilderFace  : public GEOMAlgo_BuilderArea 
-{
- public:
-  
-  //!  Empty  constructor <br>
-  Standard_EXPORT
-    GEOMAlgo_BuilderFace();
-
-  Standard_EXPORT
-    virtual ~GEOMAlgo_BuilderFace();
-  
-  //! Sets the face generatix <br>
-  Standard_EXPORT
-    void SetFace(const TopoDS_Face& theFace) ;
-  
-  //! Returns the face generatix <br>
-  Standard_EXPORT
-    const TopoDS_Face& Face() const;
-  
-  //!  Performs the algorithm <br>
-  Standard_EXPORT
-    virtual  void Perform() ;
-
- protected:
-  //!  Collect the edges that <br>
-  //!           a) are internal <br>
-  //!           b) are the same and have different orientation <br>
-  Standard_EXPORT
-    virtual  void PerformShapesToAvoid() ;
-  
-  //! Build draft wires <br>
-  //!          a)myLoops - draft wires that consist of <br>
-  //!                       boundary edges <br>
-  //!          b)myLoopsInternal - draft wires that contains <br>
-  //!                               inner edges <br>
-  Standard_EXPORT
-    virtual  void PerformLoops() ;
-  
-  //! Build draft faces that contains boundary edges <br>
-  Standard_EXPORT
-    virtual  void PerformAreas() ;
-  
-  //! Build finalized faces with internals <br>
-  Standard_EXPORT
-    virtual  void PerformInternalShapes() ;
-
-
-  TopoDS_Face myFace;
-};
-
-#endif
+
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File:        GEOMAlgo_BuilderFace.hxx
+// Created:
+// Author:      Peter KURNEV
+//
+#ifndef _GEOMAlgo_BuilderFace_HeaderFile
+#define _GEOMAlgo_BuilderFace_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Macro.hxx>
+#include <TopoDS_Face.hxx>
+#include <GEOMAlgo_BuilderArea.hxx>
+
+//! The algorithm to build faces from set of edges <br>
+//=======================================================================
+//class    : GEOMAlgo_BuilderFace
+//purpose  :
+//=======================================================================
+class GEOMAlgo_BuilderFace  : public GEOMAlgo_BuilderArea
+{
+ public:
+
+  //!  Empty  constructor <br>
+  Standard_EXPORT
+    GEOMAlgo_BuilderFace();
+
+  Standard_EXPORT
+    virtual ~GEOMAlgo_BuilderFace();
+
+  //! Sets the face generatix <br>
+  Standard_EXPORT
+    void SetFace(const TopoDS_Face& theFace) ;
+
+  //! Returns the face generatix <br>
+  Standard_EXPORT
+    const TopoDS_Face& Face() const;
+
+  //!  Performs the algorithm <br>
+  Standard_EXPORT
+    virtual  void Perform() ;
+
+ protected:
+  //!  Collect the edges that <br>
+  //!           a) are internal <br>
+  //!           b) are the same and have different orientation <br>
+  Standard_EXPORT
+    virtual  void PerformShapesToAvoid() ;
+
+  //! Build draft wires <br>
+  //!          a)myLoops - draft wires that consist of <br>
+  //!                       boundary edges <br>
+  //!          b)myLoopsInternal - draft wires that contains <br>
+  //!                               inner edges <br>
+  Standard_EXPORT
+    virtual  void PerformLoops() ;
+
+  //! Build draft faces that contains boundary edges <br>
+  Standard_EXPORT
+    virtual  void PerformAreas() ;
+
+  //! Build finalized faces with internals <br>
+  Standard_EXPORT
+    virtual  void PerformInternalShapes() ;
+
+
+  TopoDS_Face myFace;
+};
+
+#endif
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_BuilderShape.cxx b/src/GEOMAlgo_NEW/GEOMAlgo_BuilderShape.cxx
index ecccd52a2..5abac4efc 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_BuilderShape.cxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_BuilderShape.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -21,13 +21,13 @@
 //
 
 // File:        GEOMAlgo_BuilderShape.cxx
-// Created:     
-// Author:      Peter KURNEV 
+// Created:
+// Author:      Peter KURNEV
 //
 #include <GEOMAlgo_BuilderShape.hxx>
 //=======================================================================
-//function : 
-//purpose  : 
+//function :
+//purpose  :
 //=======================================================================
   GEOMAlgo_BuilderShape::GEOMAlgo_BuilderShape()
 :
@@ -39,14 +39,14 @@
 }
 //=======================================================================
 //function : ~
-//purpose  : 
+//purpose  :
 //=======================================================================
   GEOMAlgo_BuilderShape::~GEOMAlgo_BuilderShape()
 {
 }
 //=======================================================================
 //function : Shape
-//purpose  : 
+//purpose  :
 //=======================================================================
   const TopoDS_Shape& GEOMAlgo_BuilderShape::Shape() const
 {
@@ -55,7 +55,7 @@
 //
 //=======================================================================
 //function : Generated
-//purpose  : 
+//purpose  :
 //=======================================================================
   const TopTools_ListOfShape& GEOMAlgo_BuilderShape::Generated(const TopoDS_Shape& )
 {
@@ -64,7 +64,7 @@
 }
 //=======================================================================
 //function : Modified
-//purpose  : 
+//purpose  :
 //=======================================================================
   const TopTools_ListOfShape& GEOMAlgo_BuilderShape::Modified(const TopoDS_Shape& )
 {
@@ -73,18 +73,18 @@
 }
 //=======================================================================
 //function : IsDeleted
-//purpose  : 
+//purpose  :
 //=======================================================================
   Standard_Boolean GEOMAlgo_BuilderShape::IsDeleted(const TopoDS_Shape& theS)
 {
   Standard_Boolean bRet;
   //
   bRet=!myMapShape.Contains(theS);
-  return bRet;  
+  return bRet;
 }
 //=======================================================================
 //function : HasDeleted
-//purpose  : 
+//purpose  :
 //=======================================================================
   Standard_Boolean GEOMAlgo_BuilderShape::HasDeleted()const
 {
@@ -92,7 +92,7 @@
 }
 //=======================================================================
 //function : HasGenerated
-//purpose  : 
+//purpose  :
 //=======================================================================
   Standard_Boolean GEOMAlgo_BuilderShape::HasGenerated()const
 {
@@ -100,7 +100,7 @@
 }
 //=======================================================================
 //function : HasModified
-//purpose  : 
+//purpose  :
 //=======================================================================
   Standard_Boolean GEOMAlgo_BuilderShape::HasModified()const
 {
@@ -108,7 +108,7 @@
 }
 //=======================================================================
 //function : PrepareHistory
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_BuilderShape::PrepareHistory()
 {
@@ -124,7 +124,7 @@
 //modified by NIZNHY-PKV Thu Dec  7 11:57:00 2006f
 //=======================================================================
 //function : ImagesResult
-//purpose  : 
+//purpose  :
 //=======================================================================
   const TopTools_IndexedDataMapOfShapeListOfShape& GEOMAlgo_BuilderShape::ImagesResult()const
 {
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_BuilderShape.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_BuilderShape.hxx
index 58580489c..2ae67470c 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_BuilderShape.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_BuilderShape.hxx
@@ -1,105 +1,105 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-
-// File:        GEOMAlgo_BuilderShape.hxx
-// Created:     
-// Author:      Peter KURNEV 
-//
-#ifndef _GEOMAlgo_BuilderShape_HeaderFile
-#define _GEOMAlgo_BuilderShape_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_Macro.hxx>
-#include <TopoDS_Shape.hxx>
-#include <TopTools_ListOfShape.hxx>
-#include <TopTools_MapOfShape.hxx>
-#include <Standard_Boolean.hxx>
-#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
-#include <GEOMAlgo_Algo.hxx>
-
-
-//! Root class for algorithms that has shape as result <br>
-//=======================================================================
-//class    : GEOMAlgo_BuilderShape
-//purpose  : 
-//=======================================================================
-class GEOMAlgo_BuilderShape  : public GEOMAlgo_Algo
-{
- public:
-  //!  Returns the result of algorithm <br>
-  Standard_EXPORT
-    const TopoDS_Shape& Shape() const;
-  
-  //! Returns the list of shapes generated from the <br>
-  //!          shape theS. <br>
-  Standard_EXPORT
-    virtual const TopTools_ListOfShape& Generated(const TopoDS_Shape& theS) ;
-  
-  //! Returns the list of shapes modified from the <br>
-  //!          shape theS. <br>
-  Standard_EXPORT
-    virtual const TopTools_ListOfShape& Modified(const TopoDS_Shape& theS) ;
-  
-  //! Returns true if the shape theS has been deleted. <br>
-  Standard_EXPORT
-    virtual  Standard_Boolean IsDeleted(const TopoDS_Shape& theS) ;
-  
-  //! Returns true if the at least one shape(or sub-shape) <br>
-  //!          of arguments has been deleted. <br>
-  Standard_EXPORT
-    Standard_Boolean HasDeleted() const;
-  
-  //! Returns true if the at least one shape(or sub-shape) <br>
-  //!          of arguments has generated shapes. <br>
-  Standard_EXPORT
-    Standard_Boolean HasGenerated() const;
-  
-  //! Returns true if the at least one shape(or sub-shape) <br>
-  //!          of arguments has modified shapes. <br>
-  Standard_EXPORT
-    Standard_Boolean HasModified() const;
-  
-  Standard_EXPORT
-    const TopTools_IndexedDataMapOfShapeListOfShape& ImagesResult() const;
-
-protected:
-  //! Empty constructor <br>
-  Standard_EXPORT
-    GEOMAlgo_BuilderShape();
-  
-  Standard_EXPORT
-    virtual ~GEOMAlgo_BuilderShape();
-  
-  //!  Prepare information for history support <br>
-  Standard_EXPORT
-    virtual  void PrepareHistory() ;
-
-
-  TopoDS_Shape myShape;
-  TopTools_ListOfShape myHistShapes;
-  TopTools_MapOfShape myMapShape;
-  Standard_Boolean myHasDeleted;
-  Standard_Boolean myHasGenerated;
-  Standard_Boolean myHasModified;
-  TopTools_IndexedDataMapOfShapeListOfShape myImagesResult;
-};
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File:        GEOMAlgo_BuilderShape.hxx
+// Created:
+// Author:      Peter KURNEV
+//
+#ifndef _GEOMAlgo_BuilderShape_HeaderFile
+#define _GEOMAlgo_BuilderShape_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Macro.hxx>
+#include <TopoDS_Shape.hxx>
+#include <TopTools_ListOfShape.hxx>
+#include <TopTools_MapOfShape.hxx>
+#include <Standard_Boolean.hxx>
+#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
+#include <GEOMAlgo_Algo.hxx>
+
+
+//! Root class for algorithms that has shape as result <br>
+//=======================================================================
+//class    : GEOMAlgo_BuilderShape
+//purpose  :
+//=======================================================================
+class GEOMAlgo_BuilderShape  : public GEOMAlgo_Algo
+{
+ public:
+  //!  Returns the result of algorithm <br>
+  Standard_EXPORT
+    const TopoDS_Shape& Shape() const;
+
+  //! Returns the list of shapes generated from the <br>
+  //!          shape theS. <br>
+  Standard_EXPORT
+    virtual const TopTools_ListOfShape& Generated(const TopoDS_Shape& theS) ;
+
+  //! Returns the list of shapes modified from the <br>
+  //!          shape theS. <br>
+  Standard_EXPORT
+    virtual const TopTools_ListOfShape& Modified(const TopoDS_Shape& theS) ;
+
+  //! Returns true if the shape theS has been deleted. <br>
+  Standard_EXPORT
+    virtual  Standard_Boolean IsDeleted(const TopoDS_Shape& theS) ;
+
+  //! Returns true if the at least one shape(or sub-shape) <br>
+  //!          of arguments has been deleted. <br>
+  Standard_EXPORT
+    Standard_Boolean HasDeleted() const;
+
+  //! Returns true if the at least one shape(or sub-shape) <br>
+  //!          of arguments has generated shapes. <br>
+  Standard_EXPORT
+    Standard_Boolean HasGenerated() const;
+
+  //! Returns true if the at least one shape(or sub-shape) <br>
+  //!          of arguments has modified shapes. <br>
+  Standard_EXPORT
+    Standard_Boolean HasModified() const;
+
+  Standard_EXPORT
+    const TopTools_IndexedDataMapOfShapeListOfShape& ImagesResult() const;
+
+protected:
+  //! Empty constructor <br>
+  Standard_EXPORT
+    GEOMAlgo_BuilderShape();
+
+  Standard_EXPORT
+    virtual ~GEOMAlgo_BuilderShape();
+
+  //!  Prepare information for history support <br>
+  Standard_EXPORT
+    virtual  void PrepareHistory() ;
+
+
+  TopoDS_Shape myShape;
+  TopTools_ListOfShape myHistShapes;
+  TopTools_MapOfShape myMapShape;
+  Standard_Boolean myHasDeleted;
+  Standard_Boolean myHasGenerated;
+  Standard_Boolean myHasModified;
+  TopTools_IndexedDataMapOfShapeListOfShape myImagesResult;
+};
+#endif
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_BuilderSolid.cxx b/src/GEOMAlgo_NEW/GEOMAlgo_BuilderSolid.cxx
index 9c22ffd94..cd8c54625 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_BuilderSolid.cxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_BuilderSolid.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -21,8 +21,8 @@
 //
 
 // File:        GEOMAlgo_BuilderSolid.cxx
-// Created:     
-// Author:      Peter KURNEV 
+// Created:
+// Author:      Peter KURNEV
 //
 #include <GEOMAlgo_BuilderSolid.hxx>
 
@@ -99,12 +99,12 @@ static
   Standard_Boolean IsClosedShell(const TopoDS_Shell& );
 
 static
-  Standard_Boolean RefineShell(const TopoDS_Shell& , 
+  Standard_Boolean RefineShell(const TopoDS_Shell& ,
 			       TopoDS_Shell& );
 
 //=======================================================================
-//function : 
-//purpose  : 
+//function :
+//purpose  :
 //=======================================================================
 GEOMAlgo_BuilderSolid::GEOMAlgo_BuilderSolid()
 :
@@ -113,14 +113,14 @@ GEOMAlgo_BuilderSolid::GEOMAlgo_BuilderSolid()
 }
 //=======================================================================
 //function : ~
-//purpose  : 
+//purpose  :
 //=======================================================================
 GEOMAlgo_BuilderSolid::~GEOMAlgo_BuilderSolid()
 {
 }
 //=======================================================================
 //function : Perform
-//purpose  : 
+//purpose  :
 //=======================================================================
 void GEOMAlgo_BuilderSolid::Perform()
 {
@@ -132,7 +132,7 @@ void GEOMAlgo_BuilderSolid::Perform()
   TopoDS_Compound aC;
   BRep_Builder aBB;
   TopTools_ListIteratorOfListOfShape aIt;
-  
+
   aBB.MakeCompound(aC);
   aIt.Initialize(myShapes);
   for(; aIt.More(); aIt.Next()) {
@@ -162,7 +162,7 @@ void GEOMAlgo_BuilderSolid::Perform()
 }
 //=======================================================================
 //function :PerformShapesToAvoid
-//purpose  : 
+//purpose  :
 //=======================================================================
 void GEOMAlgo_BuilderSolid::PerformShapesToAvoid()
 {
@@ -188,8 +188,8 @@ void GEOMAlgo_BuilderSolid::PerformShapesToAvoid()
         TopExp::MapShapesAndAncestors(aF, TopAbs_EDGE, TopAbs_FACE, aMEF);
       }
       /*
-      else { 
-	int a=0; 
+      else {
+	int a=0;
       }
       */
     }
@@ -235,7 +235,7 @@ void GEOMAlgo_BuilderSolid::PerformShapesToAvoid()
           myShapesToAvoid.Add(aF2);
         }
       }
-      /*//DEB	       
+      /*//DEB
       else {
         TopTools_ListIteratorOfListOfShape aItLF;
         //
@@ -252,11 +252,11 @@ void GEOMAlgo_BuilderSolid::PerformShapesToAvoid()
       break;
     }
     //
-  }//while (1) 
-}  
+  }//while (1)
+}
 //=======================================================================
 //function : PerformLoops
-//purpose  : 
+//purpose  :
 //=======================================================================
 void GEOMAlgo_BuilderSolid::PerformLoops()
 {
@@ -317,7 +317,7 @@ void GEOMAlgo_BuilderSolid::PerformLoops()
         if (aMEFP.Contains(aE)) {
           const TopTools_ListOfShape& aLFP=aMEFP.FindFromKey(aE);
           aNbFP=aLFP.Extent();
-          if (aNbFP>1) { 
+          if (aNbFP>1) {
             continue;
           }
         }
@@ -345,14 +345,14 @@ void GEOMAlgo_BuilderSolid::PerformLoops()
         NMTTools_ListOfCoupleOfShape aLCSOff;
         //
         aItLF.Initialize(aLF);
-        for (; aItLF.More(); aItLF.Next()) { 
+        for (; aItLF.More(); aItLF.Next()) {
           const TopoDS_Face& aFL=*((TopoDS_Face*)(&aItLF.Value()));
           if (myShapesToAvoid.Contains(aFL)) {
             continue;
           }
           if (aF.IsSame(aFL)) {
             continue;
-          } 
+          }
           if (AddedFacesMap.Contains(aFL)){
             continue;
           }
@@ -365,7 +365,7 @@ void GEOMAlgo_BuilderSolid::PerformLoops()
           aCSOff.SetShape1(aEL);
           aCSOff.SetShape2(aFL);
           aLCSOff.Append(aCSOff);
-        }//for (; aItLF.More(); aItLF.Next()) { 
+        }//for (; aItLF.More(); aItLF.Next()) {
         //
         aNbOff=aLCSOff.Extent();
         if (!aNbOff){
@@ -380,11 +380,11 @@ void GEOMAlgo_BuilderSolid::PerformLoops()
           GEOMAlgo_Tools3D::GetFaceOff(aE, aF, aLCSOff, aSelF);
         }
         //
-        if (!aSelF.IsNull() && AddedFacesMap.Add(aSelF)) { 
+        if (!aSelF.IsNull() && AddedFacesMap.Add(aSelF)) {
           aBB.Add(aShell, aSelF);
           TopExp::MapShapesAndAncestors(aSelF, TopAbs_EDGE, TopAbs_FACE, aMEFP);
         }
-      } // for (; aEdgeExp.More(); aEdgeExp.Next()) { 
+      } // for (; aEdgeExp.More(); aEdgeExp.Next()) {
     } //for (; aItAddedF.More(); aItAddedF.Next()) {
     //
     if (IsClosedShell(aShell)) {
@@ -399,11 +399,11 @@ void GEOMAlgo_BuilderSolid::PerformLoops()
 	myLoops.Append(aShx);
       }
     }
-  } // for (; aItF.More(); aItF.Next()) { 
+  } // for (; aItF.More(); aItF.Next()) {
   //
   // Post Treatment
   TopTools_MapOfOrientedShape aMP;
-  // 
+  //
   // a. collect all edges that are in loops
   aIt.Initialize (myLoops);
   for (; aIt.More(); aIt.Next()) {
@@ -414,7 +414,7 @@ void GEOMAlgo_BuilderSolid::PerformLoops()
       aMP.Add(aF);
     }
   }
-  // 
+  //
   // b. collect all faces that are to avoid
   aItM.Initialize(myShapesToAvoid);
   for (; aItM.More(); aItM.Next()) {
@@ -467,7 +467,7 @@ void GEOMAlgo_BuilderSolid::PerformLoops()
           const TopoDS_Edge& aE = *((TopoDS_Edge*)(&aEdgeExp.Current()));
           const TopTools_ListOfShape& aLF=aEFMap.FindFromKey(aE);
           aItF.Initialize(aLF);
-          for (; aItF.More(); aItF.Next()) { 
+          for (; aItF.More(); aItF.Next()) {
             const TopoDS_Face& aFL=*((TopoDS_Face*)(&aItF.Value()));
             if (AddedFacesMap.Add(aFL)){
               aBB.Add(aShell, aFL);
@@ -481,14 +481,14 @@ void GEOMAlgo_BuilderSolid::PerformLoops()
 }
 //=======================================================================
 //function : PerformAreas
-//purpose  : 
+//purpose  :
 //=======================================================================
 void GEOMAlgo_BuilderSolid::PerformAreas()
 {
   myErrorStatus=0;
   //
   Standard_Boolean bIsGrowthShell, bIsHole;
-  TopTools_ListOfShape aNewSolids, aHoleShells; 
+  TopTools_ListOfShape aNewSolids, aHoleShells;
   TopoDS_Shape anInfinitePointShape;
   TopTools_DataMapOfShapeShape aInOutMap;
   TopTools_DataMapOfShapeListOfShape aMSH;
@@ -591,14 +591,14 @@ void GEOMAlgo_BuilderSolid::PerformAreas()
     //
   }
   //
-  // These aNewSolids are draft solids that 
+  // These aNewSolids are draft solids that
   // do not contain any internal shapes
   //
   myAreas.Append(aNewSolids);
 }
 //=======================================================================
 //function : PerformInternalShapes
-//purpose  : 
+//purpose  :
 //=======================================================================
 void GEOMAlgo_BuilderSolid::PerformInternalShapes()
 {
@@ -608,11 +608,11 @@ void GEOMAlgo_BuilderSolid::PerformInternalShapes()
   if (!aNbFI) {// nothing to do
     return;
   }
-  // 
+  //
   Standard_Integer bFlag;
   BRep_Builder aBB;
   TopTools_ListIteratorOfListOfShape aShellIt, aSolidIt;
-  TopoDS_Iterator aIt; 
+  TopoDS_Iterator aIt;
   TopTools_MapOfShape aMF, aMFP, aMFS;
   TopTools_MapIteratorOfMapOfShape aItMF;
   TopTools_IndexedDataMapOfShapeListOfShape aMEF;
@@ -693,7 +693,7 @@ void GEOMAlgo_BuilderSolid::PerformInternalShapes()
 
 //=======================================================================
 //function : MakeInternalShells
-//purpose  : 
+//purpose  :
 //=======================================================================
 void MakeInternalShells(const TopTools_MapOfShape& theMF,
                         TopTools_ListOfShape& theShells)
@@ -719,7 +719,7 @@ void MakeInternalShells(const TopTools_MapOfShape& theMF,
     //
     // make a new shell
     TopoDS_Shell aShell;
-    aBB.MakeShell(aShell);    
+    aBB.MakeShell(aShell);
     aFF.Orientation(TopAbs_INTERNAL);
     aBB.Add(aShell, aFF);
     //
@@ -732,7 +732,7 @@ void MakeInternalShells(const TopTools_MapOfShape& theMF,
         const TopoDS_Shape& aE =aEdgeExp.Current();
         const TopTools_ListOfShape& aLF=aMEF.FindFromKey(aE);
         aItF.Initialize(aLF);
-        for (; aItF.More(); aItF.Next()) { 
+        for (; aItF.More(); aItF.Next()) {
           TopoDS_Shape aFL=aItF.Value();
           if (aAddedFacesMap.Add(aFL)){
             aFL.Orientation(TopAbs_INTERNAL);
@@ -746,7 +746,7 @@ void MakeInternalShells(const TopTools_MapOfShape& theMF,
 }
 //=======================================================================
 //function : IsHole
-//purpose  : 
+//purpose  :
 //=======================================================================
 Standard_Boolean IsHole(const TopoDS_Shape& theS2,
                         const Handle(IntTools_Context)& theContext)
@@ -760,7 +760,7 @@ Standard_Boolean IsHole(const TopoDS_Shape& theS2,
 }
 //=======================================================================
 //function : IsInside
-//purpose  : 
+//purpose  :
 //=======================================================================
 Standard_Boolean IsInside(const TopoDS_Shape& theS1,
                           const TopoDS_Shape& theS2,
@@ -786,14 +786,14 @@ Standard_Boolean IsInside(const TopoDS_Shape& theS1,
 }
 //=======================================================================
 //function : IsGrowthShell
-//purpose  : 
+//purpose  :
 //=======================================================================
 Standard_Boolean IsGrowthShell(const TopoDS_Shape& theShell,
                                const TopTools_IndexedMapOfShape& theMHF)
 {
   Standard_Boolean bRet;
   TopoDS_Iterator aIt;
-  // 
+  //
   bRet=Standard_False;
   if (theMHF.Extent()) {
     aIt.Initialize(theShell);
@@ -808,7 +808,7 @@ Standard_Boolean IsGrowthShell(const TopoDS_Shape& theShell,
 }
 //=======================================================================
 //function : IsClosedShell
-//purpose  : 
+//purpose  :
 //=======================================================================
 Standard_Boolean IsClosedShell(const TopoDS_Shell& theShell)
 {
@@ -817,7 +817,7 @@ Standard_Boolean IsClosedShell(const TopoDS_Shell& theShell)
   TopoDS_Iterator aIt;
   TopExp_Explorer aExp;
   TopTools_MapOfShape aM;
-  // 
+  //
   bRet=Standard_False;
   aIt.Initialize(theShell);
   for(; aIt.More(); aIt.Next()) {
@@ -851,14 +851,14 @@ Standard_Boolean IsClosedShell(const TopoDS_Shell& theShell)
 //=======================================================================
 Standard_Boolean RefineShell(const TopoDS_Shell& aShell,
 			     TopoDS_Shell& aShx)
-			       
+
 {
   Standard_Boolean bRet;
   Standard_Integer i, aNbE, aNbF;
   TopAbs_Orientation aOrE;
   TopTools_IndexedDataMapOfShapeListOfShape aMEF;
   TopTools_MapOfOrientedShape aMFx;
-  // 
+  //
   bRet=Standard_False;
   //
   TopExp::MapShapesAndAncestors(aShell, TopAbs_EDGE, TopAbs_FACE, aMEF);
@@ -904,7 +904,7 @@ Standard_Boolean RefineShell(const TopoDS_Shell& aShell,
   aNbF=aMFx.Extent();
   if (!aNbF) {
     return bRet;
-  } 
+  }
   //
   BRep_Builder aBB;
   TopoDS_Iterator aIt;
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_BuilderSolid.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_BuilderSolid.hxx
index 4ba96d50f..650528fa7 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_BuilderSolid.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_BuilderSolid.hxx
@@ -1,77 +1,77 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-
-// File:        GEOMAlgo_BuilderSolid.hxx
-// Created:     
-// Author:      Peter KURNEV 
-//
-#ifndef _GEOMAlgo_BuilderSolid_HeaderFile
-#define _GEOMAlgo_BuilderSolid_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_Macro.hxx>
-#include <GEOMAlgo_BuilderArea.hxx>
-
-//! The algorithm to build solids from set of faces <br>
-//=======================================================================
-//function : GEOMAlgo_BuilderSolid
-//purpose  : 
-//=======================================================================
-class GEOMAlgo_BuilderSolid  : public GEOMAlgo_BuilderArea 
-{
- public:
-  //!  Empty  constructor <br>
-  Standard_EXPORT
-    GEOMAlgo_BuilderSolid();
-  
-  Standard_EXPORT
-    virtual ~GEOMAlgo_BuilderSolid();
-  
-  //!  Performs the algorithm <br>
-  Standard_EXPORT
-    virtual  void Perform() ;
-
- protected:
-  //!  Collect the faces that <br>
-  //!           a) are internal <br>
-  //!           b) are the same and have different orientation <br>
-  Standard_EXPORT
-    virtual  void PerformShapesToAvoid() ;
-  
-  //! Build draft shells <br>
-  //!          a)myLoops - draft shells that consist of <br>
-  //!                       boundary faces <br>
-  //!          b)myLoopsInternal - draft shells that contains <br>
-  //!                               inner faces <br>
-  Standard_EXPORT
-    virtual  void PerformLoops() ;
-  
-  //! Build draft solids that contains boundary faces <br>
-  Standard_EXPORT
-    virtual  void PerformAreas() ;
-  
-  //! Build finalized solids with internal shells <br>
-  Standard_EXPORT
-    virtual  void PerformInternalShapes() ;
-
-};
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File:        GEOMAlgo_BuilderSolid.hxx
+// Created:
+// Author:      Peter KURNEV
+//
+#ifndef _GEOMAlgo_BuilderSolid_HeaderFile
+#define _GEOMAlgo_BuilderSolid_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Macro.hxx>
+#include <GEOMAlgo_BuilderArea.hxx>
+
+//! The algorithm to build solids from set of faces <br>
+//=======================================================================
+//function : GEOMAlgo_BuilderSolid
+//purpose  :
+//=======================================================================
+class GEOMAlgo_BuilderSolid  : public GEOMAlgo_BuilderArea
+{
+ public:
+  //!  Empty  constructor <br>
+  Standard_EXPORT
+    GEOMAlgo_BuilderSolid();
+
+  Standard_EXPORT
+    virtual ~GEOMAlgo_BuilderSolid();
+
+  //!  Performs the algorithm <br>
+  Standard_EXPORT
+    virtual  void Perform() ;
+
+ protected:
+  //!  Collect the faces that <br>
+  //!           a) are internal <br>
+  //!           b) are the same and have different orientation <br>
+  Standard_EXPORT
+    virtual  void PerformShapesToAvoid() ;
+
+  //! Build draft shells <br>
+  //!          a)myLoops - draft shells that consist of <br>
+  //!                       boundary faces <br>
+  //!          b)myLoopsInternal - draft shells that contains <br>
+  //!                               inner faces <br>
+  Standard_EXPORT
+    virtual  void PerformLoops() ;
+
+  //! Build draft solids that contains boundary faces <br>
+  Standard_EXPORT
+    virtual  void PerformAreas() ;
+
+  //! Build finalized solids with internal shells <br>
+  Standard_EXPORT
+    virtual  void PerformInternalShapes() ;
+
+};
+#endif
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_BuilderTools.cxx b/src/GEOMAlgo_NEW/GEOMAlgo_BuilderTools.cxx
index a02db1146..a40c07a37 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_BuilderTools.cxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_BuilderTools.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File:        GEOMAlgo_BuilderTools.cxx
 // Author:      Peter KURNEV
@@ -63,7 +64,7 @@
 #include <Bnd_Box.hxx>
 #include <BRepAdaptor_Curve2d.hxx>
 
-static 
+static
   Standard_Integer ComputeProps(const TopoDS_Face& aF,
                                 Standard_Real& aA,
                                 Standard_Real& aV);
@@ -72,7 +73,7 @@ static
 
 //=======================================================================
 //function : IsHole
-//purpose  : 
+//purpose  :
 //=======================================================================
   Standard_Boolean GEOMAlgo_BuilderTools::IsHole(const TopoDS_Shape& aW,
                                                  const TopoDS_Shape& aFace)
@@ -83,7 +84,7 @@ static
   Standard_Real aU1, aU2, aU, dU;
   Standard_Real aX1, aY1, aX0, aY0;
   TopAbs_Orientation aOr;
-  
+
   gp_Pnt2d aP2D0, aP2D1;
   Handle(Geom2d_Curve) aC2D;
   TopoDS_Face aF, aFF;
@@ -97,10 +98,10 @@ static
   //
   aS=0.;
   aItW.Initialize(aW);
-  for (; aItW.More(); aItW.Next()) { 
+  for (; aItW.More(); aItW.Next()) {
     const TopoDS_Edge& aE=TopoDS::Edge(aItW.Value());
     aOr=aE.Orientation();
-    if (!(aOr==TopAbs_FORWARD || 
+    if (!(aOr==TopAbs_FORWARD ||
           aOr==TopAbs_REVERSED)) {
       continue;
     }
@@ -134,17 +135,17 @@ static
       aP2D0.Coord(aX0, aY0);
       aP2D1.Coord(aX1, aY1);
       //
-      aS=aS+(aY0+aY1)*(aX1-aX0); 
+      aS=aS+(aY0+aY1)*(aX1-aX0);
       //
       aP2D0=aP2D1;
     }
-  }//for (; aItW.More(); aItW.Next()) { 
+  }//for (; aItW.More(); aItW.Next()) {
   bIsHole=(aS>0.);
   return bIsHole;
 }
 //=======================================================================
 //function : IsHole
-//purpose  : 
+//purpose  :
 //=======================================================================
   Standard_Boolean GEOMAlgo_BuilderTools::IsHole(const TopoDS_Shape& aShell)
 {
@@ -170,7 +171,7 @@ static
 }
 //=======================================================================
 //function : ComputeProps
-//purpose  : 
+//purpose  :
 //=======================================================================
 Standard_Integer ComputeProps(const TopoDS_Face& aF,
                               Standard_Real& aA,
@@ -243,7 +244,7 @@ Standard_Integer ComputeProps(const TopoDS_Face& aF,
 }
 //=======================================================================
 //function : BuildTriangulation
-//purpose  : 
+//purpose  :
 //=======================================================================
 void BuildTriangulation(const TopoDS_Face& aF)
 {
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_BuilderTools.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_BuilderTools.hxx
index 892f7753b..b0d13c9fe 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_BuilderTools.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_BuilderTools.hxx
@@ -1,47 +1,48 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
-// File:        GEOMAlgo_BuilderTools.hxx
-// Author:      Peter KURNEV
-
-#ifndef _GEOMAlgo_BuilderTools_HeaderFile
-#define _GEOMAlgo_BuilderTools_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_Macro.hxx>
-#include <Standard_Boolean.hxx>
-#include <TopoDS_Shape.hxx>
-
-//=======================================================================
-//class    : GEOMAlgo_BuilderTools
-//purpose  : 
-//=======================================================================
-class GEOMAlgo_BuilderTools  
-{
- public:
-  Standard_EXPORT
-    static  Standard_Boolean IsHole(const TopoDS_Shape& aW,
-				    const TopoDS_Shape& aF) ;
-  
-  Standard_EXPORT
-    static  Standard_Boolean IsHole(const TopoDS_Shape& aShell) ;
-};
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File:        GEOMAlgo_BuilderTools.hxx
+// Author:      Peter KURNEV
+
+#ifndef _GEOMAlgo_BuilderTools_HeaderFile
+#define _GEOMAlgo_BuilderTools_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Macro.hxx>
+#include <Standard_Boolean.hxx>
+#include <TopoDS_Shape.hxx>
+
+//=======================================================================
+//class    : GEOMAlgo_BuilderTools
+//purpose  :
+//=======================================================================
+class GEOMAlgo_BuilderTools
+{
+ public:
+  Standard_EXPORT
+    static  Standard_Boolean IsHole(const TopoDS_Shape& aW,
+				    const TopoDS_Shape& aF) ;
+
+  Standard_EXPORT
+    static  Standard_Boolean IsHole(const TopoDS_Shape& aShell) ;
+};
+#endif
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_Builder_0.cxx b/src/GEOMAlgo_NEW/GEOMAlgo_Builder_0.cxx
index bd7594caf..b0fe28966 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_Builder_0.cxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_Builder_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -35,7 +35,7 @@
 
 //=======================================================================
 //function : Shapes1
-//purpose  : 
+//purpose  :
 //=======================================================================
   const TopTools_ListOfShape& GEOMAlgo_Builder::Shapes1(const Standard_Integer theType)const
 {
@@ -43,7 +43,7 @@
 }
 //=======================================================================
 //function : Images
-//purpose  : 
+//purpose  :
 //=======================================================================
   const BRepAlgo_Image& GEOMAlgo_Builder::Images()const
 {
@@ -51,7 +51,7 @@
 }
 //=======================================================================
 //function : InParts
-//purpose  : 
+//purpose  :
 //=======================================================================
   const TopTools_ListOfShape& GEOMAlgo_Builder::InParts(const TopoDS_Shape& theS)const
 {
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_Builder_1.cxx b/src/GEOMAlgo_NEW/GEOMAlgo_Builder_1.cxx
index d033afd26..aa4f7ef53 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_Builder_1.cxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_Builder_1.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -21,8 +21,8 @@
 //
 
 // File:        GEOMAlgo_Builder_1.cxx
-// Created:     
-// Author:      Peter KURNEV 
+// Created:
+// Author:      Peter KURNEV
 //
 #include <GEOMAlgo_Builder.hxx>
 //
@@ -74,7 +74,7 @@ static
 
 //=======================================================================
 //function : FillImagesVertices
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_Builder::FillImagesVertices()
 {
@@ -103,7 +103,7 @@ static
 }
 //=======================================================================
 // function: FillImagesEdges
-// purpose: 
+// purpose:
 //=======================================================================
   void GEOMAlgo_Builder::FillImagesEdges()
 {
@@ -204,12 +204,12 @@ static
     }
     //
     myImages.Bind(aE, aLSp);
-    
+
   }//for (i=1; i<=aNb; ++i)
 }
 //=======================================================================
 // function: FillImagesContainers
-// purpose: 
+// purpose:
 //=======================================================================
   void GEOMAlgo_Builder::FillImagesContainers(const TopAbs_ShapeEnum theType)
 {
@@ -220,7 +220,7 @@ static
   TopAbs_ShapeEnum aType;
   BRep_Builder aBB;
   TopoDS_Iterator aIt;
-  TopTools_ListIteratorOfListOfShape aItIm; 
+  TopTools_ListIteratorOfListOfShape aItIm;
   TopTools_MapOfShape aMS;
   TopTools_MapIteratorOfMapOfShape aItS;
   //
@@ -282,12 +282,12 @@ static
         aBB.Add(aCIm, aF);
       }
     }
-    myImages.Bind(aC, aCIm); 
+    myImages.Bind(aC, aCIm);
   }// for (; aItS.More(); aItS.Next()) {
 }
 //=======================================================================
 // function: FillImagesCompounds
-// purpose: 
+// purpose:
 //=======================================================================
 void FillImagesCompounds(const TopTools_MapOfShape& theMS,
                          BRepAlgo_Image& theImages)
@@ -303,18 +303,18 @@ void FillImagesCompounds(const TopTools_MapOfShape& theMS,
 }
 //=======================================================================
 //function : FillImagesCompound
-//purpose  : 
+//purpose  :
 //=======================================================================
 void FillImagesCompound(const TopoDS_Shape& theS,
                         BRepAlgo_Image& theImages,
                         TopTools_MapOfShape& theMFP)
-{ 
+{
   Standard_Boolean bInterferred;
   TopAbs_ShapeEnum aTypeX;
   TopAbs_Orientation aOrX;
   TopoDS_Iterator aIt;
   BRep_Builder aBB;
-  TopTools_ListIteratorOfListOfShape aItIm; 
+  TopTools_ListIteratorOfListOfShape aItIm;
   //
   if (!theMFP.Add(theS)) {
     return;
@@ -356,5 +356,5 @@ void FillImagesCompound(const TopoDS_Shape& theS,
       aBB.Add(aCIm, aSX);
     }
   }
-  theImages.Bind(theS, aCIm); 
+  theImages.Bind(theS, aCIm);
 }
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_Builder_2.cxx b/src/GEOMAlgo_NEW/GEOMAlgo_Builder_2.cxx
index 9a77a113a..888ee3ec9 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_Builder_2.cxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_Builder_2.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -314,7 +314,7 @@ void GEOMAlgo_Builder::BuildSplitFaces()
       bIsDegenerated=BRep_Tool::Degenerated(aE);
       //modified by NIZNHY-PKV Wed Mar 07 07:46:09 2012f
       bIsClosed=IsClosed(aE, aF);
-      //bIsClosed=BRep_Tool::IsClosed(aE, aF); 
+      //bIsClosed=BRep_Tool::IsClosed(aE, aF);
       //modified by NIZNHY-PKV Wed Mar 07 07:46:13 2012t
       //
       const TopTools_ListOfShape& aLIE=myImages.Image(aE);
@@ -589,7 +589,7 @@ void GEOMAlgo_Builder::FillSameDomainFaces()
   // 2. Find Chains
   NMTTools_IndexedDataMapOfShapeIndexedMapOfShape aMC;
   //
-  NMTTools_Tools::FindChains(aLCS, aMC); 
+  NMTTools_Tools::FindChains(aLCS, aMC);
   //
   Standard_Boolean bIsImage;
   Standard_Integer aIx, aIxMin, aNbMSDF, k, aNbMFj;
@@ -940,7 +940,7 @@ void UpdateCandidates(const Standard_Integer theNF,
 //modified by NIZNHY-PKV Thu Feb 16 12:25:16 2012f
 //=======================================================================
 //function : IsClosed
-//purpose  : 
+//purpose  :
 //=======================================================================
 Standard_Boolean IsClosed(const TopoDS_Edge& aE,
 			  const TopoDS_Face& aF)
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_Builder_3.cxx b/src/GEOMAlgo_NEW/GEOMAlgo_Builder_3.cxx
index 9dc978395..066cc9c7d 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_Builder_3.cxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_Builder_3.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_Builder_4.cxx b/src/GEOMAlgo_NEW/GEOMAlgo_Builder_4.cxx
index 7b21d51cc..5672fe1fd 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_Builder_4.cxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_Builder_4.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -21,8 +21,8 @@
 //
 
 // File:        GEOMAlgo_Builder_4.cxx
-// Created:     
-// Author:      Peter KURNEV 
+// Created:
+// Author:      Peter KURNEV
 //
 #include <GEOMAlgo_Builder.hxx>
 
@@ -47,7 +47,7 @@ static
 
 //=======================================================================
 //function : Generated
-//purpose  : 
+//purpose  :
 //=======================================================================
   const TopTools_ListOfShape& GEOMAlgo_Builder::Generated(const TopoDS_Shape& theS)
 {
@@ -71,8 +71,8 @@ static
   //
   aType=theS.ShapeType();
   //
-  if (aType==TopAbs_EDGE   || aType==TopAbs_FACE || 
-      aType==TopAbs_VERTEX || aType==TopAbs_SOLID) { 
+  if (aType==TopAbs_EDGE   || aType==TopAbs_FACE ||
+      aType==TopAbs_VERTEX || aType==TopAbs_SOLID) {
     const TopTools_ListOfShape& aLSp=myImages.Image(theS);
     aIt.Initialize(aLSp);
     for (; aIt.More(); aIt.Next()) {
@@ -101,7 +101,7 @@ static
 }
 //=======================================================================
 //function : Modified
-//purpose  : 
+//purpose  :
 //=======================================================================
   const TopTools_ListOfShape& GEOMAlgo_Builder::Modified(const TopoDS_Shape& theS)
 {
@@ -125,8 +125,8 @@ static
   //
   aType=theS.ShapeType();
   //
-  if (aType==TopAbs_EDGE   || aType==TopAbs_FACE || 
-      aType==TopAbs_VERTEX || aType==TopAbs_SOLID) { 
+  if (aType==TopAbs_EDGE   || aType==TopAbs_FACE ||
+      aType==TopAbs_VERTEX || aType==TopAbs_SOLID) {
     const TopTools_ListOfShape& aLSp=myImages.Image(theS);
     aIt.Initialize(aLSp);
     for (; aIt.More(); aIt.Next()) {
@@ -154,7 +154,7 @@ static
 }
 //=======================================================================
 //function : IsDeleted
-//purpose  : 
+//purpose  :
 //=======================================================================
   Standard_Boolean GEOMAlgo_Builder::IsDeleted(const TopoDS_Shape& theS)
 {
@@ -179,8 +179,8 @@ static
   }
   //
   aType=theS.ShapeType();
-  if (aType==TopAbs_EDGE   || aType==TopAbs_FACE || 
-      aType==TopAbs_VERTEX || aType==TopAbs_SOLID) { 
+  if (aType==TopAbs_EDGE   || aType==TopAbs_FACE ||
+      aType==TopAbs_VERTEX || aType==TopAbs_SOLID) {
     const TopTools_ListOfShape& aLSp=myImages.Image(theS);
     aIt.Initialize(aLSp);
     for (; aIt.More(); aIt.Next()) {
@@ -203,7 +203,7 @@ static
 }
 //=======================================================================
 //function : PrepareHistory
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_Builder::PrepareHistory()
 {
@@ -217,10 +217,10 @@ static
   TopTools_ListIteratorOfListOfShape aIt;
   TopTools_MapIteratorOfMapOfShape aItM;
   //
-  // 1. Clearing 
+  // 1. Clearing
   GEOMAlgo_BuilderShape::PrepareHistory();
   //
-  // 2. myMapShape - all shapes of result with theirs sub-shapes 
+  // 2. myMapShape - all shapes of result with theirs sub-shapes
   MapShapes(myShape, myMapShape);
   //
   // 3. MS - all argument shapes with theirs sub-shapes
@@ -261,13 +261,13 @@ static
     //
     //modified by NIZNHY-PKV Thu Dec  7 11:34:10 2006t
     //
-    // 4.2 As it was 
+    // 4.2 As it was
     if (!myHasDeleted) {
       myHasDeleted=IsDeleted(aSx);//xx
     }
     //
     if (!myHasGenerated || !myHasModified) {
-      if (aType==TopAbs_EDGE   || aType==TopAbs_FACE || 
+      if (aType==TopAbs_EDGE   || aType==TopAbs_FACE ||
           aType==TopAbs_VERTEX || aType==TopAbs_SOLID) {
         //modified by NIZNHY-PKV Thu Dec  7 11:53:01 2006f
         //bHasImage=myImages.HasImage(aSx);
@@ -294,14 +294,14 @@ static
             } // if (myMapShape.Contains(aSp))
           }
         }
-      } 
+      }
     }
   }
-  
+
 }
 //=======================================================================
 //function : MapShapes
-//purpose  : 
+//purpose  :
 //=======================================================================
   void MapShapes(const TopoDS_Shape& theS,
                  TopTools_MapOfShape& theM)
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_Clsf.cxx b/src/GEOMAlgo_NEW/GEOMAlgo_Clsf.cxx
index 9abb550a9..9f3fe0acb 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_Clsf.cxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_Clsf.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -31,8 +31,8 @@ IMPLEMENT_STANDARD_HANDLE(GEOMAlgo_Clsf, GEOMAlgo_HAlgo);
 IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_Clsf, GEOMAlgo_HAlgo);
 
 //=======================================================================
-//function : 
-//purpose  : 
+//function :
+//purpose  :
 //=======================================================================
   GEOMAlgo_Clsf::GEOMAlgo_Clsf()
 :
@@ -44,14 +44,14 @@ IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_Clsf, GEOMAlgo_HAlgo);
 }
 //=======================================================================
 //function : ~
-//purpose  : 
+//purpose  :
 //=======================================================================
   GEOMAlgo_Clsf::~GEOMAlgo_Clsf()
 {
 }
 //=======================================================================
 //function : SetTolerance
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_Clsf::SetTolerance(const Standard_Real aT)
 {
@@ -59,7 +59,7 @@ IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_Clsf, GEOMAlgo_HAlgo);
 }
 //=======================================================================
 //function : Tolerance
-//purpose  : 
+//purpose  :
 //=======================================================================
   Standard_Real GEOMAlgo_Clsf::Tolerance()const
 {
@@ -67,7 +67,7 @@ IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_Clsf, GEOMAlgo_HAlgo);
 }
 //=======================================================================
 //function : SetPnt
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_Clsf::SetPnt(const gp_Pnt& aP)
 {
@@ -75,7 +75,7 @@ IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_Clsf, GEOMAlgo_HAlgo);
 }
 //=======================================================================
 //function : Pnt
-//purpose  : 
+//purpose  :
 //=======================================================================
   const gp_Pnt& GEOMAlgo_Clsf::Pnt()const
 {
@@ -83,7 +83,7 @@ IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_Clsf, GEOMAlgo_HAlgo);
 }
 //=======================================================================
 //function : State
-//purpose  : 
+//purpose  :
 //=======================================================================
   TopAbs_State GEOMAlgo_Clsf::State() const
 {
@@ -91,7 +91,7 @@ IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_Clsf, GEOMAlgo_HAlgo);
 }
 //=======================================================================
 //function : CanBeON
-//purpose  : 
+//purpose  :
 //=======================================================================
   Standard_Boolean GEOMAlgo_Clsf::CanBeON(const Handle(Geom_Curve)& ) const
 {
@@ -99,7 +99,7 @@ IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_Clsf, GEOMAlgo_HAlgo);
 }
 //=======================================================================
 //function : CanBeON
-//purpose  : 
+//purpose  :
 //=======================================================================
   Standard_Boolean GEOMAlgo_Clsf::CanBeON(const Handle(Geom_Surface)& ) const
 {
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_Clsf.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_Clsf.hxx
index 38fd2cefe..017578386 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_Clsf.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_Clsf.hxx
@@ -1,87 +1,87 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-
-// File:        GEOMAlgo_Clsf.hxx
-// Created:     Wed Nov 22 10:23:04 2006
-// Author:      Peter KURNEV
-//              <pkv@irinox>
-//
-#ifndef _GEOMAlgo_Clsf_HeaderFile
-#define _GEOMAlgo_Clsf_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_DefineHandle.hxx>
-//#include <Handle_GEOMAlgo_Clsf.hxx>
-#include <TopAbs_State.hxx>
-#include <gp_Pnt.hxx>
-#include <Standard_Real.hxx>
-#include <GEOMAlgo_HAlgo.hxx>
-#include <Standard_Boolean.hxx>
-#include <Handle_Geom_Curve.hxx>
-#include <Handle_Geom_Surface.hxx>
-#include <Geom_Curve.hxx>
-#include <Geom_Surface.hxx>
-
-DEFINE_STANDARD_HANDLE(GEOMAlgo_Clsf, GEOMAlgo_HAlgo);
-
-//=======================================================================
-//class    : GEOMAlgo_Clsf
-//purpose  : 
-//=======================================================================
-class GEOMAlgo_Clsf : public GEOMAlgo_HAlgo 
-{
- public:
-  Standard_EXPORT
-    void SetPnt(const gp_Pnt& aP) ;
-  
-  Standard_EXPORT
-    const gp_Pnt& Pnt() const;
-  
-  Standard_EXPORT
-    void SetTolerance(const Standard_Real aT) ;
-  
-  Standard_EXPORT
-    Standard_Real Tolerance() const;
-  
-  Standard_EXPORT
-    TopAbs_State State() const;
-  
-  Standard_EXPORT
-    virtual  Standard_Boolean CanBeON(const Handle(Geom_Curve)& aCT) const;
-  
-  Standard_EXPORT
-    virtual  Standard_Boolean CanBeON(const Handle(Geom_Surface)& aST) const;
-
-  DEFINE_STANDARD_RTTI(GEOMAlgo_Clsf);
-
- protected:
-  Standard_EXPORT
-    GEOMAlgo_Clsf();
-  
-  Standard_EXPORT
-    virtual ~GEOMAlgo_Clsf();
-
-  TopAbs_State myState;
-  gp_Pnt myPnt;
-  Standard_Real myTolerance;
-};
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File:        GEOMAlgo_Clsf.hxx
+// Created:     Wed Nov 22 10:23:04 2006
+// Author:      Peter KURNEV
+//              <pkv@irinox>
+//
+#ifndef _GEOMAlgo_Clsf_HeaderFile
+#define _GEOMAlgo_Clsf_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_DefineHandle.hxx>
+//#include <Handle_GEOMAlgo_Clsf.hxx>
+#include <TopAbs_State.hxx>
+#include <gp_Pnt.hxx>
+#include <Standard_Real.hxx>
+#include <GEOMAlgo_HAlgo.hxx>
+#include <Standard_Boolean.hxx>
+#include <Handle_Geom_Curve.hxx>
+#include <Handle_Geom_Surface.hxx>
+#include <Geom_Curve.hxx>
+#include <Geom_Surface.hxx>
+
+DEFINE_STANDARD_HANDLE(GEOMAlgo_Clsf, GEOMAlgo_HAlgo);
+
+//=======================================================================
+//class    : GEOMAlgo_Clsf
+//purpose  :
+//=======================================================================
+class GEOMAlgo_Clsf : public GEOMAlgo_HAlgo
+{
+ public:
+  Standard_EXPORT
+    void SetPnt(const gp_Pnt& aP) ;
+
+  Standard_EXPORT
+    const gp_Pnt& Pnt() const;
+
+  Standard_EXPORT
+    void SetTolerance(const Standard_Real aT) ;
+
+  Standard_EXPORT
+    Standard_Real Tolerance() const;
+
+  Standard_EXPORT
+    TopAbs_State State() const;
+
+  Standard_EXPORT
+    virtual  Standard_Boolean CanBeON(const Handle(Geom_Curve)& aCT) const;
+
+  Standard_EXPORT
+    virtual  Standard_Boolean CanBeON(const Handle(Geom_Surface)& aST) const;
+
+  DEFINE_STANDARD_RTTI(GEOMAlgo_Clsf);
+
+ protected:
+  Standard_EXPORT
+    GEOMAlgo_Clsf();
+
+  Standard_EXPORT
+    virtual ~GEOMAlgo_Clsf();
+
+  TopAbs_State myState;
+  gp_Pnt myPnt;
+  Standard_Real myTolerance;
+};
+#endif
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_ClsfBox.cxx b/src/GEOMAlgo_NEW/GEOMAlgo_ClsfBox.cxx
index 891c0a66e..dbc3eec1c 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_ClsfBox.cxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_ClsfBox.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -47,8 +47,8 @@ IMPLEMENT_STANDARD_HANDLE(GEOMAlgo_ClsfBox, GEOMAlgo_Clsf)
 IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfBox, GEOMAlgo_Clsf)
 
 //=======================================================================
-//function : 
-//purpose  : 
+//function :
+//purpose  :
 //=======================================================================
   GEOMAlgo_ClsfBox::GEOMAlgo_ClsfBox()
 :
@@ -57,14 +57,14 @@ IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfBox, GEOMAlgo_Clsf)
 }
 //=======================================================================
 //function : ~
-//purpose  : 
+//purpose  :
 //=======================================================================
   GEOMAlgo_ClsfBox::~GEOMAlgo_ClsfBox()
 {
 }
 //=======================================================================
 //function : SetBox
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_ClsfBox::SetBox(const TopoDS_Shape& aBox)
 {
@@ -72,7 +72,7 @@ IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfBox, GEOMAlgo_Clsf)
 }
 //=======================================================================
 //function : Box
-//purpose  : 
+//purpose  :
 //=======================================================================
   const TopoDS_Shape& GEOMAlgo_ClsfBox::Box() const
 {
@@ -80,10 +80,10 @@ IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfBox, GEOMAlgo_Clsf)
 }
 //=======================================================================
 //function : CheckData
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_ClsfBox::CheckData()
-{ 
+{
   Standard_Integer i, aNbF;
   TopAbs_ShapeEnum aTypeShape;
   TopAbs_Orientation aOr;
@@ -122,7 +122,7 @@ IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfBox, GEOMAlgo_Clsf)
     aS=BRep_Tool::Surface(aF);
     myGAS[i-1].Load(aS);
     aType=myGAS[i-1].GetType();
-    if (!aType==GeomAbs_Plane) { 
+    if (!aType==GeomAbs_Plane) {
       myErrorStatus=13; // unallowed surface type
       return;
     }
@@ -146,7 +146,7 @@ IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfBox, GEOMAlgo_Clsf)
 }
 //=======================================================================
 //function : Perform
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_ClsfBox::Perform()
 {
@@ -162,7 +162,7 @@ IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfBox, GEOMAlgo_Clsf)
   }
   */
   iNext=1;
-  aNbON=0; 
+  aNbON=0;
   aNbIN=0;
   for(i=0; i<aNbS && iNext; i++) {
     GEOMAlgo_SurfaceTools::GetState(myPnt, myGAS[i], myTolerance, aSt);
@@ -181,7 +181,7 @@ IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfBox, GEOMAlgo_Clsf)
       default:
         myState=TopAbs_UNKNOWN;
         iNext=0;
-        break; 
+        break;
     }
   }
   //
@@ -198,7 +198,7 @@ IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfBox, GEOMAlgo_Clsf)
 }
 //=======================================================================
 //function : CanBeON
-//purpose  : 
+//purpose  :
 //=======================================================================
   Standard_Boolean GEOMAlgo_ClsfBox::CanBeON(const Handle(Geom_Curve)& aC) const
 {
@@ -206,7 +206,7 @@ IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfBox, GEOMAlgo_Clsf)
 }
 //=======================================================================
 //function : CanBeON
-//purpose  : 
+//purpose  :
 //=======================================================================
   Standard_Boolean GEOMAlgo_ClsfBox::CanBeON(const Handle(Geom_Surface)& aS1) const
 {
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_ClsfBox.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_ClsfBox.hxx
index d28c55dc8..dc635f52b 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_ClsfBox.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_ClsfBox.hxx
@@ -1,97 +1,97 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-
-// File:        GEOMAlgo_ClsfBox.hxx
-// Created:     Wed Nov 22 10:41:47 2006
-// Author:      Peter KURNEV
-//              <pkv@irinox>
-//
-#ifndef _GEOMAlgo_ClsfBox_HeaderFile
-#define _GEOMAlgo_ClsfBox_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_DefineHandle.hxx>
-//#include <Handle_GEOMAlgo_ClsfBox.hxx>
-#include <TopoDS_Shape.hxx>
-#include <GeomAdaptor_Surface.hxx>
-#include <GEOMAlgo_Clsf.hxx>
-#include <Standard_Boolean.hxx>
-#include <Handle_Geom_Curve.hxx>
-#include <Handle_Geom_Surface.hxx>
-#include <Geom_Curve.hxx>
-#include <Geom_Surface.hxx>
-
-DEFINE_STANDARD_HANDLE(GEOMAlgo_ClsfBox, GEOMAlgo_Clsf)
-
-//=======================================================================
-//function : GEOMAlgo_ClsfBox
-//purpose  : 
-//=======================================================================
-class GEOMAlgo_ClsfBox : public GEOMAlgo_Clsf 
-{
- public:
-  Standard_EXPORT
-    GEOMAlgo_ClsfBox();
-  
-  Standard_EXPORT
-    virtual ~GEOMAlgo_ClsfBox();
-  
-  Standard_EXPORT
-    void SetBox(const TopoDS_Shape& aS) ;
-  
-  Standard_EXPORT
-    const TopoDS_Shape& Box() const;
-  
-  Standard_EXPORT
-    virtual  void Perform() ;
-  
-  Standard_EXPORT
-    virtual  void CheckData() ;
-  
-  Standard_EXPORT
-    virtual  Standard_Boolean CanBeON(const Handle(Geom_Curve)& aC) const;
-  
-  Standard_EXPORT
-    virtual  Standard_Boolean CanBeON(const Handle(Geom_Surface)& aST) const;
-  
-  DEFINE_STANDARD_RTTI(GEOMAlgo_ClsfBox)
-    
- protected:
-  TopoDS_Shape myBox;
-  GeomAdaptor_Surface myGAS[6];
-
-
-private: 
-
-
-
-
-};
-
-
-
-
-
-// other Inline functions and methods (like "C++: function call" methods)
-
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File:        GEOMAlgo_ClsfBox.hxx
+// Created:     Wed Nov 22 10:41:47 2006
+// Author:      Peter KURNEV
+//              <pkv@irinox>
+//
+#ifndef _GEOMAlgo_ClsfBox_HeaderFile
+#define _GEOMAlgo_ClsfBox_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_DefineHandle.hxx>
+//#include <Handle_GEOMAlgo_ClsfBox.hxx>
+#include <TopoDS_Shape.hxx>
+#include <GeomAdaptor_Surface.hxx>
+#include <GEOMAlgo_Clsf.hxx>
+#include <Standard_Boolean.hxx>
+#include <Handle_Geom_Curve.hxx>
+#include <Handle_Geom_Surface.hxx>
+#include <Geom_Curve.hxx>
+#include <Geom_Surface.hxx>
+
+DEFINE_STANDARD_HANDLE(GEOMAlgo_ClsfBox, GEOMAlgo_Clsf)
+
+//=======================================================================
+//function : GEOMAlgo_ClsfBox
+//purpose  :
+//=======================================================================
+class GEOMAlgo_ClsfBox : public GEOMAlgo_Clsf
+{
+ public:
+  Standard_EXPORT
+    GEOMAlgo_ClsfBox();
+
+  Standard_EXPORT
+    virtual ~GEOMAlgo_ClsfBox();
+
+  Standard_EXPORT
+    void SetBox(const TopoDS_Shape& aS) ;
+
+  Standard_EXPORT
+    const TopoDS_Shape& Box() const;
+
+  Standard_EXPORT
+    virtual  void Perform() ;
+
+  Standard_EXPORT
+    virtual  void CheckData() ;
+
+  Standard_EXPORT
+    virtual  Standard_Boolean CanBeON(const Handle(Geom_Curve)& aC) const;
+
+  Standard_EXPORT
+    virtual  Standard_Boolean CanBeON(const Handle(Geom_Surface)& aST) const;
+
+  DEFINE_STANDARD_RTTI(GEOMAlgo_ClsfBox)
+
+ protected:
+  TopoDS_Shape myBox;
+  GeomAdaptor_Surface myGAS[6];
+
+
+private:
+
+
+
+
+};
+
+
+
+
+
+// other Inline functions and methods (like "C++: function call" methods)
+
+
+#endif
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_ClsfSolid.cxx b/src/GEOMAlgo_NEW/GEOMAlgo_ClsfSolid.cxx
index 39b8f43d0..35bb725ef 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_ClsfSolid.cxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_ClsfSolid.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -34,8 +34,8 @@ IMPLEMENT_STANDARD_HANDLE(GEOMAlgo_ClsfSolid, GEOMAlgo_Clsf)
 IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfSolid, GEOMAlgo_Clsf)
 
 //=======================================================================
-//function : 
-//purpose  : 
+//function :
+//purpose  :
 //=======================================================================
   GEOMAlgo_ClsfSolid::GEOMAlgo_ClsfSolid()
 :
@@ -45,7 +45,7 @@ IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfSolid, GEOMAlgo_Clsf)
 }
 //=======================================================================
 //function : ~
-//purpose  : 
+//purpose  :
 //=======================================================================
   GEOMAlgo_ClsfSolid::~GEOMAlgo_ClsfSolid()
 {
@@ -58,7 +58,7 @@ IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfSolid, GEOMAlgo_Clsf)
 }
 //=======================================================================
 //function : SetShape
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_ClsfSolid::SetShape(const TopoDS_Shape& aS)
 {
@@ -66,7 +66,7 @@ IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfSolid, GEOMAlgo_Clsf)
 }
 //=======================================================================
 //function : Shape
-//purpose  : 
+//purpose  :
 //=======================================================================
   const TopoDS_Shape& GEOMAlgo_ClsfSolid::Shape()const
 {
@@ -74,7 +74,7 @@ IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfSolid, GEOMAlgo_Clsf)
 }
 //=======================================================================
 //function : CheckData
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_ClsfSolid::CheckData()
 {
@@ -92,7 +92,7 @@ IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfSolid, GEOMAlgo_Clsf)
   //
   aType=myShape.ShapeType();
   if (!(aType==TopAbs_SOLID || aType==TopAbs_SHELL)) {
-    myErrorStatus=12; 
+    myErrorStatus=12;
     return;
   }
   //
@@ -115,7 +115,7 @@ IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfSolid, GEOMAlgo_Clsf)
 }
 //=======================================================================
 //function : Perform
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_ClsfSolid::Perform()
 {
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_ClsfSolid.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_ClsfSolid.hxx
index dc2c67b38..1715d88db 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_ClsfSolid.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_ClsfSolid.hxx
@@ -1,69 +1,69 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-
-// File:        GEOMAlgo_ClsfSolid.hxx
-// Created:     Mon Jan 29 10:35:46 2007
-// Author:      Peter KURNEV
-//              <pkv@irinox>
-//
-#ifndef _GEOMAlgo_ClsfSolid_HeaderFile
-#define _GEOMAlgo_ClsfSolid_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_DefineHandle.hxx>
-//#include <Handle_GEOMAlgo_ClsfSolid.hxx>
-#include <TopoDS_Shape.hxx>
-#include <Standard_Address.hxx>
-#include <GEOMAlgo_Clsf.hxx>
-
-DEFINE_STANDARD_HANDLE(GEOMAlgo_ClsfSolid, GEOMAlgo_Clsf)
-
-//=======================================================================
-//class : GEOMAlgo_ClsfSolid
-//purpose  : 
-//=======================================================================
-class GEOMAlgo_ClsfSolid : public GEOMAlgo_Clsf 
-{
- public:
-  Standard_EXPORT
-    GEOMAlgo_ClsfSolid();
-  
-  Standard_EXPORT
-    virtual ~GEOMAlgo_ClsfSolid();
-  
-  Standard_EXPORT
-    void SetShape(const TopoDS_Shape& aS) ;
-  
-  Standard_EXPORT
-    const TopoDS_Shape& Shape() const;
-  
-  Standard_EXPORT
-    virtual  void Perform() ;
-  
-  Standard_EXPORT
-    virtual  void CheckData() ;
-
-  DEFINE_STANDARD_RTTI(GEOMAlgo_ClsfSolid)
-
-  protected:
-    TopoDS_Shape myShape;
-  Standard_Address myPClsf;
-
-};
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File:        GEOMAlgo_ClsfSolid.hxx
+// Created:     Mon Jan 29 10:35:46 2007
+// Author:      Peter KURNEV
+//              <pkv@irinox>
+//
+#ifndef _GEOMAlgo_ClsfSolid_HeaderFile
+#define _GEOMAlgo_ClsfSolid_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_DefineHandle.hxx>
+//#include <Handle_GEOMAlgo_ClsfSolid.hxx>
+#include <TopoDS_Shape.hxx>
+#include <Standard_Address.hxx>
+#include <GEOMAlgo_Clsf.hxx>
+
+DEFINE_STANDARD_HANDLE(GEOMAlgo_ClsfSolid, GEOMAlgo_Clsf)
+
+//=======================================================================
+//class : GEOMAlgo_ClsfSolid
+//purpose  :
+//=======================================================================
+class GEOMAlgo_ClsfSolid : public GEOMAlgo_Clsf
+{
+ public:
+  Standard_EXPORT
+    GEOMAlgo_ClsfSolid();
+
+  Standard_EXPORT
+    virtual ~GEOMAlgo_ClsfSolid();
+
+  Standard_EXPORT
+    void SetShape(const TopoDS_Shape& aS) ;
+
+  Standard_EXPORT
+    const TopoDS_Shape& Shape() const;
+
+  Standard_EXPORT
+    virtual  void Perform() ;
+
+  Standard_EXPORT
+    virtual  void CheckData() ;
+
+  DEFINE_STANDARD_RTTI(GEOMAlgo_ClsfSolid)
+
+  protected:
+    TopoDS_Shape myShape;
+  Standard_Address myPClsf;
+
+};
+#endif
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_ClsfSurf.cxx b/src/GEOMAlgo_NEW/GEOMAlgo_ClsfSurf.cxx
index 48d459498..cdc66dd14 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_ClsfSurf.cxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_ClsfSurf.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -34,8 +34,8 @@ IMPLEMENT_STANDARD_HANDLE(GEOMAlgo_ClsfSurf, GEOMAlgo_Clsf);
 IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfSurf, GEOMAlgo_Clsf);
 
 //=======================================================================
-//function : 
-//purpose  : 
+//function :
+//purpose  :
 //=======================================================================
   GEOMAlgo_ClsfSurf::GEOMAlgo_ClsfSurf()
 :
@@ -44,14 +44,14 @@ IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfSurf, GEOMAlgo_Clsf);
 }
 //=======================================================================
 //function : ~
-//purpose  : 
+//purpose  :
 //=======================================================================
   GEOMAlgo_ClsfSurf::~GEOMAlgo_ClsfSurf()
 {
 }
 //=======================================================================
 //function : SetSurface
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_ClsfSurf::SetSurface(const Handle(Geom_Surface)& aS)
 {
@@ -59,7 +59,7 @@ IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfSurf, GEOMAlgo_Clsf);
 }
 //=======================================================================
 //function : Surface
-//purpose  : 
+//purpose  :
 //=======================================================================
   const Handle(Geom_Surface)& GEOMAlgo_ClsfSurf::Surface() const
 {
@@ -67,7 +67,7 @@ IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfSurf, GEOMAlgo_Clsf);
 }
 //=======================================================================
 //function : CheckData
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_ClsfSurf::CheckData()
 {
@@ -82,7 +82,7 @@ IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfSurf, GEOMAlgo_Clsf);
   //
   myGAS.Load(myS);
   aType=myGAS.GetType();
-  if (!(aType==GeomAbs_Plane || 
+  if (!(aType==GeomAbs_Plane ||
         aType==GeomAbs_Cylinder ||
         aType==GeomAbs_Sphere)) {
     myErrorStatus=11; // unallowed surface type
@@ -90,7 +90,7 @@ IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfSurf, GEOMAlgo_Clsf);
 }
 //=======================================================================
 //function : Perform
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_ClsfSurf::Perform()
 {
@@ -105,7 +105,7 @@ IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfSurf, GEOMAlgo_Clsf);
 }
 //=======================================================================
 //function : CanBeON
-//purpose  : 
+//purpose  :
 //=======================================================================
   Standard_Boolean GEOMAlgo_ClsfSurf::CanBeON(const Handle(Geom_Curve)& aC) const
 {
@@ -124,7 +124,7 @@ IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfSurf, GEOMAlgo_Clsf);
 }
 //=======================================================================
 //function : CanBeON
-//purpose  : 
+//purpose  :
 //=======================================================================
   Standard_Boolean GEOMAlgo_ClsfSurf::CanBeON(const Handle(Geom_Surface)& aS1) const
 {
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_ClsfSurf.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_ClsfSurf.hxx
index 35261d279..e0dd97395 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_ClsfSurf.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_ClsfSurf.hxx
@@ -1,81 +1,81 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-
-// File:        GEOMAlgo_ClsfSurf.hxx
-// Created:     Wed Nov 22 10:41:47 2006
-// Author:      Peter KURNEV
-//              <pkv@irinox>
-//
-#ifndef _GEOMAlgo_ClsfSurf_HeaderFile
-#define _GEOMAlgo_ClsfSurf_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_DefineHandle.hxx>
-//#include <Handle_GEOMAlgo_ClsfSurf.hxx>
-#include <Handle_Geom_Surface.hxx>
-#include <GeomAdaptor_Surface.hxx>
-#include <GEOMAlgo_Clsf.hxx>
-#include <Standard_Boolean.hxx>
-#include <Handle_Geom_Curve.hxx>
-#include <Geom_Surface.hxx>
-#include <Geom_Curve.hxx>
-
-DEFINE_STANDARD_HANDLE(GEOMAlgo_ClsfSurf, GEOMAlgo_Clsf)
-
-//=======================================================================
-// class   : GEOMAlgo_ClsfSurf
-//purpose  : 
-//=======================================================================
-class GEOMAlgo_ClsfSurf : public GEOMAlgo_Clsf 
-{
- public:
-  Standard_EXPORT
-    GEOMAlgo_ClsfSurf();
-
-  Standard_EXPORT
-    virtual ~GEOMAlgo_ClsfSurf();
-  
-  Standard_EXPORT
-    void SetSurface(const Handle(Geom_Surface)& aS) ;
-  
-  Standard_EXPORT
-    const Handle_Geom_Surface& Surface() const;
-  
-  Standard_EXPORT
-    virtual  void Perform() ;
-  
-  Standard_EXPORT
-    virtual  void CheckData() ;
-  
-  Standard_EXPORT
-    virtual  Standard_Boolean CanBeON(const Handle(Geom_Curve)& aC) const;
-  
-  Standard_EXPORT
-    virtual  Standard_Boolean CanBeON(const Handle(Geom_Surface)& aST) const;
-
-  DEFINE_STANDARD_RTTI(GEOMAlgo_ClsfSurf);
-
- protected:
-  Handle_Geom_Surface myS;
-  GeomAdaptor_Surface myGAS;
-};
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File:        GEOMAlgo_ClsfSurf.hxx
+// Created:     Wed Nov 22 10:41:47 2006
+// Author:      Peter KURNEV
+//              <pkv@irinox>
+//
+#ifndef _GEOMAlgo_ClsfSurf_HeaderFile
+#define _GEOMAlgo_ClsfSurf_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_DefineHandle.hxx>
+//#include <Handle_GEOMAlgo_ClsfSurf.hxx>
+#include <Handle_Geom_Surface.hxx>
+#include <GeomAdaptor_Surface.hxx>
+#include <GEOMAlgo_Clsf.hxx>
+#include <Standard_Boolean.hxx>
+#include <Handle_Geom_Curve.hxx>
+#include <Geom_Surface.hxx>
+#include <Geom_Curve.hxx>
+
+DEFINE_STANDARD_HANDLE(GEOMAlgo_ClsfSurf, GEOMAlgo_Clsf)
+
+//=======================================================================
+// class   : GEOMAlgo_ClsfSurf
+//purpose  :
+//=======================================================================
+class GEOMAlgo_ClsfSurf : public GEOMAlgo_Clsf
+{
+ public:
+  Standard_EXPORT
+    GEOMAlgo_ClsfSurf();
+
+  Standard_EXPORT
+    virtual ~GEOMAlgo_ClsfSurf();
+
+  Standard_EXPORT
+    void SetSurface(const Handle(Geom_Surface)& aS) ;
+
+  Standard_EXPORT
+    const Handle_Geom_Surface& Surface() const;
+
+  Standard_EXPORT
+    virtual  void Perform() ;
+
+  Standard_EXPORT
+    virtual  void CheckData() ;
+
+  Standard_EXPORT
+    virtual  Standard_Boolean CanBeON(const Handle(Geom_Curve)& aC) const;
+
+  Standard_EXPORT
+    virtual  Standard_Boolean CanBeON(const Handle(Geom_Surface)& aST) const;
+
+  DEFINE_STANDARD_RTTI(GEOMAlgo_ClsfSurf);
+
+ protected:
+  Handle_Geom_Surface myS;
+  GeomAdaptor_Surface myGAS;
+};
+#endif
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_CoupleOfShapes.cxx b/src/GEOMAlgo_NEW/GEOMAlgo_CoupleOfShapes.cxx
index 993beb8e2..0055a8228 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_CoupleOfShapes.cxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_CoupleOfShapes.cxx
@@ -1,8 +1,7 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -28,13 +27,13 @@
 #include <GEOMAlgo_CoupleOfShapes.hxx>
 //=======================================================================
 //function : GEOMAlgo_CoupleOfShapes
-//purpose  : 
+//purpose  :
 //=======================================================================
 GEOMAlgo_CoupleOfShapes::GEOMAlgo_CoupleOfShapes()
 {}
 //=======================================================================
 //function : SetShapes
-//purpose  : 
+//purpose  :
 //=======================================================================
 void GEOMAlgo_CoupleOfShapes::SetShapes(const TopoDS_Shape& aS1,
                                         const TopoDS_Shape& aS2)
@@ -44,7 +43,7 @@ void GEOMAlgo_CoupleOfShapes::SetShapes(const TopoDS_Shape& aS1,
 }
 //=======================================================================
 //function : Shapes
-//purpose  : 
+//purpose  :
 //=======================================================================
 void GEOMAlgo_CoupleOfShapes::Shapes(TopoDS_Shape& aS1,
                                      TopoDS_Shape& aS2)const
@@ -54,7 +53,7 @@ void GEOMAlgo_CoupleOfShapes::Shapes(TopoDS_Shape& aS1,
 }
 //=======================================================================
 //function : SetShape1
-//purpose  : 
+//purpose  :
 //=======================================================================
 void GEOMAlgo_CoupleOfShapes::SetShape1(const TopoDS_Shape& aS1)
 {
@@ -62,7 +61,7 @@ void GEOMAlgo_CoupleOfShapes::SetShape1(const TopoDS_Shape& aS1)
 }
 //=======================================================================
 //function : SetShape2
-//purpose  : 
+//purpose  :
 //=======================================================================
 void GEOMAlgo_CoupleOfShapes::SetShape2(const TopoDS_Shape& aS2)
 {
@@ -70,7 +69,7 @@ void GEOMAlgo_CoupleOfShapes::SetShape2(const TopoDS_Shape& aS2)
 }
 //=======================================================================
 //function : Shape1
-//purpose  : 
+//purpose  :
 //=======================================================================
 const TopoDS_Shape& GEOMAlgo_CoupleOfShapes::Shape1()const
 {
@@ -78,7 +77,7 @@ const TopoDS_Shape& GEOMAlgo_CoupleOfShapes::Shape1()const
 }
 //=======================================================================
 //function : Shape2
-//purpose  : 
+//purpose  :
 //=======================================================================
 const TopoDS_Shape& GEOMAlgo_CoupleOfShapes::Shape2()const
 {
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_CoupleOfShapes.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_CoupleOfShapes.hxx
index 30a0f94b8..7e346aa8d 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_CoupleOfShapes.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_CoupleOfShapes.hxx
@@ -1,64 +1,64 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-// File:        GEOMAlgo_CoupleOfShapes.hxx
-// Created:     Wed Dec 15 13:03:52 2004
-// Author:      Peter KURNEV
-//              <pkv@irinox>
-//
-
-#ifndef _GEOMAlgo_CoupleOfShapes_HeaderFile
-#define _GEOMAlgo_CoupleOfShapes_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_Macro.hxx>
-#include <TopoDS_Shape.hxx>
-
-//=======================================================================
-//class    : GEOMAlgo_CoupleOfShapes
-//purpose  : 
-//=======================================================================
-class GEOMAlgo_CoupleOfShapes  
-{
- public:
-  Standard_EXPORT
-    GEOMAlgo_CoupleOfShapes();
-  
-  Standard_EXPORT
-    void SetShapes(const TopoDS_Shape& aS1,const TopoDS_Shape& aS2) ;
-  
-  Standard_EXPORT
-    void SetShape1(const TopoDS_Shape& aS1) ;
-  
-  Standard_EXPORT
-    void SetShape2(const TopoDS_Shape& aS2) ;
-  
-  Standard_EXPORT
-    void Shapes(TopoDS_Shape& aS1,TopoDS_Shape& aS2) const;
-  
-  Standard_EXPORT
-    const TopoDS_Shape& Shape1() const;
-  
-  Standard_EXPORT
-    const TopoDS_Shape& Shape2() const;
-
-protected:
-  TopoDS_Shape myShape1;
-  TopoDS_Shape myShape2;
-};
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// File:        GEOMAlgo_CoupleOfShapes.hxx
+// Created:     Wed Dec 15 13:03:52 2004
+// Author:      Peter KURNEV
+//              <pkv@irinox>
+//
+
+#ifndef _GEOMAlgo_CoupleOfShapes_HeaderFile
+#define _GEOMAlgo_CoupleOfShapes_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Macro.hxx>
+#include <TopoDS_Shape.hxx>
+
+//=======================================================================
+//class    : GEOMAlgo_CoupleOfShapes
+//purpose  :
+//=======================================================================
+class GEOMAlgo_CoupleOfShapes
+{
+ public:
+  Standard_EXPORT
+    GEOMAlgo_CoupleOfShapes();
+
+  Standard_EXPORT
+    void SetShapes(const TopoDS_Shape& aS1,const TopoDS_Shape& aS2) ;
+
+  Standard_EXPORT
+    void SetShape1(const TopoDS_Shape& aS1) ;
+
+  Standard_EXPORT
+    void SetShape2(const TopoDS_Shape& aS2) ;
+
+  Standard_EXPORT
+    void Shapes(TopoDS_Shape& aS1,TopoDS_Shape& aS2) const;
+
+  Standard_EXPORT
+    const TopoDS_Shape& Shape1() const;
+
+  Standard_EXPORT
+    const TopoDS_Shape& Shape2() const;
+
+protected:
+  TopoDS_Shape myShape1;
+  TopoDS_Shape myShape2;
+};
+#endif
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_DataMapIteratorOfDataMapOfOrientedShapeShape.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_DataMapIteratorOfDataMapOfOrientedShapeShape.hxx
index 2e2bccc1e..ed169e1c5 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_DataMapIteratorOfDataMapOfOrientedShapeShape.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_DataMapIteratorOfDataMapOfOrientedShapeShape.hxx
@@ -1,32 +1,32 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-// File:	GEOMAlgo_DataMapIteratorOfDataMapOfOrientedShapeShape.hxx
-// Created:	Wed Feb 22 11:05:01 2012
-// Author:	
-//		<pkv@BDEURI37616>
-
-
-#ifndef GEOMAlgo_DataMapIteratorOfDataMapOfOrientedShapeShape_HeaderFile
-#define GEOMAlgo_DataMapIteratorOfDataMapOfOrientedShapeShape_HeaderFile
-
-#ifndef GEOMAlgo_DataMapOfOrientedShapeShape_HeaderFile
-#include <GEOMAlgo_DataMapOfOrientedShapeShape.hxx>
-#endif
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// File:	GEOMAlgo_DataMapIteratorOfDataMapOfOrientedShapeShape.hxx
+// Created:	Wed Feb 22 11:05:01 2012
+// Author:
+//		<pkv@BDEURI37616>
+
+
+#ifndef GEOMAlgo_DataMapIteratorOfDataMapOfOrientedShapeShape_HeaderFile
+#define GEOMAlgo_DataMapIteratorOfDataMapOfOrientedShapeShape_HeaderFile
+
+#ifndef GEOMAlgo_DataMapOfOrientedShapeShape_HeaderFile
+#include <GEOMAlgo_DataMapOfOrientedShapeShape.hxx>
+#endif
+
+#endif
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger.hxx
index 5212bf5d8..2ea6a30ad 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger.hxx
@@ -1,31 +1,31 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-// File:	GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger.hxx
-// Created:	Wed Feb 22 10:58:14 2012
-// Author:	
-//		<pkv@BDEURI37616>
-
-
-#ifndef GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger_HeaderFile
-#define GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger_HeaderFile
-
-#ifndef GEOMAlgo_DataMapOfPassKeyInteger_HeaderFile
-#include <GEOMAlgo_DataMapOfPassKeyInteger.hxx>
-#endif
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// File:	GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger.hxx
+// Created:	Wed Feb 22 10:58:14 2012
+// Author:
+//		<pkv@BDEURI37616>
+
+
+#ifndef GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger_HeaderFile
+#define GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger_HeaderFile
+
+#ifndef GEOMAlgo_DataMapOfPassKeyInteger_HeaderFile
+#include <GEOMAlgo_DataMapOfPassKeyInteger.hxx>
+#endif
+#endif
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyShapeShape.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyShapeShape.hxx
index f37bd53b2..bda2348e2 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyShapeShape.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyShapeShape.hxx
@@ -1,31 +1,31 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-// File:	GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyShapeShape.hxx
-// Created:	Wed Feb 22 11:01:34 2012
-// Author:	
-//		<pkv@BDEURI37616>
-
-
-#ifndef GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyShapeShape_HeaderFile
-#define GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyShapeShape_HeaderFile
-
-#ifndef GEOMAlgo_DataMapOfPassKeyShapeShape_HeaderFile
-#include <GEOMAlgo_DataMapOfPassKeyShapeShape.hxx>
-#endif
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// File:	GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyShapeShape.hxx
+// Created:	Wed Feb 22 11:01:34 2012
+// Author:
+//		<pkv@BDEURI37616>
+
+
+#ifndef GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyShapeShape_HeaderFile
+#define GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyShapeShape_HeaderFile
+
+#ifndef GEOMAlgo_DataMapOfPassKeyShapeShape_HeaderFile
+#include <GEOMAlgo_DataMapOfPassKeyShapeShape.hxx>
+#endif
+#endif
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_DataMapIteratorOfDataMapOfRealListOfShape.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_DataMapIteratorOfDataMapOfRealListOfShape.hxx
index 284e5555c..9bce78862 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_DataMapIteratorOfDataMapOfRealListOfShape.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_DataMapIteratorOfDataMapOfRealListOfShape.hxx
@@ -1,31 +1,31 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-// File:	GEOMAlgo_DataMapIteratorOfDataMapOfRealListOfShape.hxx
-// Created:	Wed Feb 22 10:53:47 2012
-// Author:	
-//		<pkv@BDEURI37616>
-
-
-#ifndef GEOMAlgo_DataMapIteratorOfDataMapOfRealListOfShape_HeaderFile
-#define GEOMAlgo_DataMapIteratorOfDataMapOfRealListOfShape_HeaderFile
-
-#ifndef GEOMAlgo_DataMapOfRealListOfShape_HeaderFile
-#include <GEOMAlgo_DataMapOfRealListOfShape.hxx>
-#endif
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// File:	GEOMAlgo_DataMapIteratorOfDataMapOfRealListOfShape.hxx
+// Created:	Wed Feb 22 10:53:47 2012
+// Author:
+//		<pkv@BDEURI37616>
+
+
+#ifndef GEOMAlgo_DataMapIteratorOfDataMapOfRealListOfShape_HeaderFile
+#define GEOMAlgo_DataMapIteratorOfDataMapOfRealListOfShape_HeaderFile
+
+#ifndef GEOMAlgo_DataMapOfRealListOfShape_HeaderFile
+#include <GEOMAlgo_DataMapOfRealListOfShape.hxx>
+#endif
+#endif
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_DataMapIteratorOfDataMapOfShapeMapOfShape.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_DataMapIteratorOfDataMapOfShapeMapOfShape.hxx
index 2b41d723f..5b19a5aeb 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_DataMapIteratorOfDataMapOfShapeMapOfShape.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_DataMapIteratorOfDataMapOfShapeMapOfShape.hxx
@@ -1,31 +1,31 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-// File:	GEOMAlgo_DataMapIteratorOfDataMapOfShapeMapOfShape.hxx
-// Created:	Wed Feb 22 11:08:26 2012
-// Author:	
-//		<pkv@BDEURI37616>
-
-
-#ifndef GEOMAlgo_DataMapIteratorOfDataMapOfShapeMapOfShape_HeaderFile
-#define GEOMAlgo_DataMapIteratorOfDataMapOfShapeMapOfShape_HeaderFile
-
-#ifndef GEOMAlgo_DataMapOfShapeMapOfShape_HeaderFile
-#include <GEOMAlgo_DataMapOfShapeMapOfShape.hxx>
-#endif
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// File:	GEOMAlgo_DataMapIteratorOfDataMapOfShapeMapOfShape.hxx
+// Created:	Wed Feb 22 11:08:26 2012
+// Author:
+//		<pkv@BDEURI37616>
+
+
+#ifndef GEOMAlgo_DataMapIteratorOfDataMapOfShapeMapOfShape_HeaderFile
+#define GEOMAlgo_DataMapIteratorOfDataMapOfShapeMapOfShape_HeaderFile
+
+#ifndef GEOMAlgo_DataMapOfShapeMapOfShape_HeaderFile
+#include <GEOMAlgo_DataMapOfShapeMapOfShape.hxx>
+#endif
+#endif
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_DataMapIteratorOfDataMapOfShapePnt.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_DataMapIteratorOfDataMapOfShapePnt.hxx
index c72a4cc58..0eed7b26d 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_DataMapIteratorOfDataMapOfShapePnt.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_DataMapIteratorOfDataMapOfShapePnt.hxx
@@ -1,31 +1,31 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-// File:	GEOMAlgo_DataMapIteratorOfDataMapOfShapePnt.hxx
-// Created:	Wed Feb 22 11:11:09 2012
-// Author:	
-//		<pkv@BDEURI37616>
-
-
-#ifndef GEOMAlgo_DataMapIteratorOfDataMapOfShapePnt_HeaderFile
-#define GEOMAlgo_DataMapIteratorOfDataMapOfShapePnt_HeaderFile
-
-#ifndef GEOMAlgo_DataMapOfShapePnt_HeaderFile
-#include <GEOMAlgo_DataMapOfShapePnt.hxx>
-#endif
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// File:	GEOMAlgo_DataMapIteratorOfDataMapOfShapePnt.hxx
+// Created:	Wed Feb 22 11:11:09 2012
+// Author:
+//		<pkv@BDEURI37616>
+
+
+#ifndef GEOMAlgo_DataMapIteratorOfDataMapOfShapePnt_HeaderFile
+#define GEOMAlgo_DataMapIteratorOfDataMapOfShapePnt_HeaderFile
+
+#ifndef GEOMAlgo_DataMapOfShapePnt_HeaderFile
+#include <GEOMAlgo_DataMapOfShapePnt.hxx>
+#endif
+#endif
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_DataMapIteratorOfDataMapOfShapeReal.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_DataMapIteratorOfDataMapOfShapeReal.hxx
index 3c3128565..4fa86a84f 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_DataMapIteratorOfDataMapOfShapeReal.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_DataMapIteratorOfDataMapOfShapeReal.hxx
@@ -1,32 +1,32 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-// File:	GEOMAlgo_DataMapIteratorOfDataMapOfShapeReal.hxx
-// Created:	Wed Feb 22 10:49:11 2012
-// Author:	
-//		<pkv@BDEURI37616>
-
-
-#ifndef GEOMAlgo_DataMapIteratorOfDataMapOfShapeReal_HeaderFile
-#define GEOMAlgo_DataMapIteratorOfDataMapOfShapeReal_HeaderFile
-
-#ifndef GEOMAlgo_DataMapOfShapeReal_HeaderFile
-#include <GEOMAlgo_DataMapOfShapeReal.hxx>
-#endif
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// File:	GEOMAlgo_DataMapIteratorOfDataMapOfShapeReal.hxx
+// Created:	Wed Feb 22 10:49:11 2012
+// Author:
+//		<pkv@BDEURI37616>
+
+
+#ifndef GEOMAlgo_DataMapIteratorOfDataMapOfShapeReal_HeaderFile
+#define GEOMAlgo_DataMapIteratorOfDataMapOfShapeReal_HeaderFile
+
+#ifndef GEOMAlgo_DataMapOfShapeReal_HeaderFile
+#include <GEOMAlgo_DataMapOfShapeReal.hxx>
+#endif
+
+#endif
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet.hxx
index cd44f6aa3..fad39a60b 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet.hxx
@@ -1,32 +1,32 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-// File:	GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet.hxx
-// Created:	Wed Feb 22 08:39:02 2012
-// Author:	
-//		<pkv@BDEURI37616>
-
-
-#ifndef GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet_HeaderFile
-#define GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet_HeaderFile
-
-#ifndef GEOMAlgo_DataMapOfShapeShapeSet_HeaderFile
-#include <GEOMAlgo_DataMapOfShapeShapeSet.hxx>
-#endif
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// File:	GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet.hxx
+// Created:	Wed Feb 22 08:39:02 2012
+// Author:
+//		<pkv@BDEURI37616>
+
+
+#ifndef GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet_HeaderFile
+#define GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet_HeaderFile
+
+#ifndef GEOMAlgo_DataMapOfShapeShapeSet_HeaderFile
+#include <GEOMAlgo_DataMapOfShapeShapeSet.hxx>
+#endif
+
+#endif
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_DataMapOfOrientedShapeShape.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_DataMapOfOrientedShapeShape.hxx
index d9dc23111..3126d0e4a 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_DataMapOfOrientedShapeShape.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_DataMapOfOrientedShapeShape.hxx
@@ -1,42 +1,42 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-// File:	GEOMAlgo_DataMapOfOrientedShapeShape.hxx
-// Created:	Wed Feb 22 11:03:36 2012
-// Author:	
-//		<pkv@BDEURI37616>
-
-
-#ifndef GEOMAlgo_DataMapOfOrientedShapeShape_HeaderFile
-#define GEOMAlgo_DataMapOfOrientedShapeShape_HeaderFile
-
-#include <TopoDS_Shape.hxx>
-#include <TopTools_OrientedShapeMapHasher.hxx>
-
-#define _NCollection_MapHasher
-#include <NCollection_DataMap.hxx>
-
-
-typedef NCollection_DataMap<TopoDS_Shape, TopoDS_Shape, TopTools_OrientedShapeMapHasher> GEOMAlgo_DataMapOfOrientedShapeShape; 
-typedef GEOMAlgo_DataMapOfOrientedShapeShape::Iterator GEOMAlgo_DataMapIteratorOfDataMapOfOrientedShapeShape;
- 
-#undef _NCollection_MapHasher
-
-
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// File:	GEOMAlgo_DataMapOfOrientedShapeShape.hxx
+// Created:	Wed Feb 22 11:03:36 2012
+// Author:
+//		<pkv@BDEURI37616>
+
+
+#ifndef GEOMAlgo_DataMapOfOrientedShapeShape_HeaderFile
+#define GEOMAlgo_DataMapOfOrientedShapeShape_HeaderFile
+
+#include <TopoDS_Shape.hxx>
+#include <TopTools_OrientedShapeMapHasher.hxx>
+
+#define _NCollection_MapHasher
+#include <NCollection_DataMap.hxx>
+
+
+typedef NCollection_DataMap<TopoDS_Shape, TopoDS_Shape, TopTools_OrientedShapeMapHasher> GEOMAlgo_DataMapOfOrientedShapeShape;
+typedef GEOMAlgo_DataMapOfOrientedShapeShape::Iterator GEOMAlgo_DataMapIteratorOfDataMapOfOrientedShapeShape;
+
+#undef _NCollection_MapHasher
+
+
+
+#endif
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_DataMapOfPassKeyInteger.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_DataMapOfPassKeyInteger.hxx
index d04744be5..6ba58447b 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_DataMapOfPassKeyInteger.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_DataMapOfPassKeyInteger.hxx
@@ -1,41 +1,41 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-// File:	GEOMAlgo_DataMapOfPassKeyInteger.hxx
-// Created:	Wed Feb 22 10:55:55 2012
-// Author:	
-//		<pkv@BDEURI37616>
-
-
-#ifndef GEOMAlgo_DataMapOfPassKeyInteger_HeaderFile
-#define GEOMAlgo_DataMapOfPassKeyInteger_HeaderFile
-
-#include <GEOMAlgo_PassKey.hxx>
-#include <Standard_Integer.hxx>
-#include <GEOMAlgo_PassKeyMapHasher.hxx>
-
-#define _NCollection_MapHasher
-#include <NCollection_DataMap.hxx>
-
-typedef NCollection_DataMap<GEOMAlgo_PassKey, Standard_Integer, GEOMAlgo_PassKeyMapHasher> GEOMAlgo_DataMapOfPassKeyInteger; 
-typedef GEOMAlgo_DataMapOfPassKeyInteger::Iterator GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger;
- 
-#undef _NCollection_MapHasher
-
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// File:	GEOMAlgo_DataMapOfPassKeyInteger.hxx
+// Created:	Wed Feb 22 10:55:55 2012
+// Author:
+//		<pkv@BDEURI37616>
+
+
+#ifndef GEOMAlgo_DataMapOfPassKeyInteger_HeaderFile
+#define GEOMAlgo_DataMapOfPassKeyInteger_HeaderFile
+
+#include <GEOMAlgo_PassKey.hxx>
+#include <Standard_Integer.hxx>
+#include <GEOMAlgo_PassKeyMapHasher.hxx>
+
+#define _NCollection_MapHasher
+#include <NCollection_DataMap.hxx>
+
+typedef NCollection_DataMap<GEOMAlgo_PassKey, Standard_Integer, GEOMAlgo_PassKeyMapHasher> GEOMAlgo_DataMapOfPassKeyInteger;
+typedef GEOMAlgo_DataMapOfPassKeyInteger::Iterator GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger;
+
+#undef _NCollection_MapHasher
+
+
+#endif
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_DataMapOfPassKeyShapeShape.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_DataMapOfPassKeyShapeShape.hxx
index fe0fd1376..c9a030daa 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_DataMapOfPassKeyShapeShape.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_DataMapOfPassKeyShapeShape.hxx
@@ -1,40 +1,40 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-// File:	GEOMAlgo_DataMapOfPassKeyShapeShape.hxx
-// Created:	Wed Feb 22 11:00:16 2012
-// Author:	
-//		<pkv@BDEURI37616>
-
-
-#ifndef GEOMAlgo_DataMapOfPassKeyShapeShape_HeaderFile
-#define GEOMAlgo_DataMapOfPassKeyShapeShape_HeaderFile
-
-#include <GEOMAlgo_PassKey.hxx>
-#include <TopoDS_Shape.hxx>
-#include <GEOMAlgo_PassKeyMapHasher.hxx>
-
-#define _NCollection_MapHasher
-#include <NCollection_DataMap.hxx>
-
-
-typedef NCollection_DataMap<GEOMAlgo_PassKey, TopoDS_Shape, GEOMAlgo_PassKeyMapHasher> GEOMAlgo_DataMapOfPassKeyShapeShape;
-typedef GEOMAlgo_DataMapOfPassKeyShapeShape::Iterator GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyShapeShape;
- 
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// File:	GEOMAlgo_DataMapOfPassKeyShapeShape.hxx
+// Created:	Wed Feb 22 11:00:16 2012
+// Author:
+//		<pkv@BDEURI37616>
+
+
+#ifndef GEOMAlgo_DataMapOfPassKeyShapeShape_HeaderFile
+#define GEOMAlgo_DataMapOfPassKeyShapeShape_HeaderFile
+
+#include <GEOMAlgo_PassKey.hxx>
+#include <TopoDS_Shape.hxx>
+#include <GEOMAlgo_PassKeyMapHasher.hxx>
+
+#define _NCollection_MapHasher
+#include <NCollection_DataMap.hxx>
+
+
+typedef NCollection_DataMap<GEOMAlgo_PassKey, TopoDS_Shape, GEOMAlgo_PassKeyMapHasher> GEOMAlgo_DataMapOfPassKeyShapeShape;
+typedef GEOMAlgo_DataMapOfPassKeyShapeShape::Iterator GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyShapeShape;
+
+
+#endif
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_DataMapOfRealListOfShape.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_DataMapOfRealListOfShape.hxx
index b308f2097..179402f9e 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_DataMapOfRealListOfShape.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_DataMapOfRealListOfShape.hxx
@@ -1,43 +1,43 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-// File:	GEOMAlgo_DataMapOfRealListOfShape.hxx
-// Created:	Wed Feb 22 10:51:48 2012
-// Author:	
-//		<pkv@BDEURI37616>
-
-
-#ifndef GEOMAlgo_DataMapOfRealListOfShape_HeaderFile
-#define GEOMAlgo_DataMapOfRealListOfShape_HeaderFile
-
-#include <Standard_Real.hxx>
-#include <TopTools_ListOfShape.hxx>
-#include <TColStd_MapRealHasher.hxx>
-
-
-#define _NCollection_MapHasher
-#include <NCollection_DataMap.hxx>
-
-typedef NCollection_DataMap<Standard_Real, TopTools_ListOfShape, TColStd_MapRealHasher> GEOMAlgo_DataMapOfRealListOfShape; 
-typedef GEOMAlgo_DataMapOfRealListOfShape::Iterator GEOMAlgo_DataMapIteratorOfDataMapOfRealListOfShape;
- 
-#undef _NCollection_MapHasher
-
-
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// File:	GEOMAlgo_DataMapOfRealListOfShape.hxx
+// Created:	Wed Feb 22 10:51:48 2012
+// Author:
+//		<pkv@BDEURI37616>
+
+
+#ifndef GEOMAlgo_DataMapOfRealListOfShape_HeaderFile
+#define GEOMAlgo_DataMapOfRealListOfShape_HeaderFile
+
+#include <Standard_Real.hxx>
+#include <TopTools_ListOfShape.hxx>
+#include <TColStd_MapRealHasher.hxx>
+
+
+#define _NCollection_MapHasher
+#include <NCollection_DataMap.hxx>
+
+typedef NCollection_DataMap<Standard_Real, TopTools_ListOfShape, TColStd_MapRealHasher> GEOMAlgo_DataMapOfRealListOfShape;
+typedef GEOMAlgo_DataMapOfRealListOfShape::Iterator GEOMAlgo_DataMapIteratorOfDataMapOfRealListOfShape;
+
+#undef _NCollection_MapHasher
+
+
+
+#endif
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_DataMapOfShapeMapOfShape.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_DataMapOfShapeMapOfShape.hxx
index bc0228692..510f4373c 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_DataMapOfShapeMapOfShape.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_DataMapOfShapeMapOfShape.hxx
@@ -1,44 +1,44 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-// File:	GEOMAlgo_DataMapOfShapeMapOfShape.hxx
-// Created:	Wed Feb 22 11:07:16 2012
-// Author:	
-//		<pkv@BDEURI37616>
-
-
-#ifndef GEOMAlgo_DataMapOfShapeMapOfShape_HeaderFile
-#define GEOMAlgo_DataMapOfShapeMapOfShape_HeaderFile
-
-
-#include <TopoDS_Shape.hxx>
-#include <TopTools_MapOfShape.hxx>
-#include <TopTools_ShapeMapHasher.hxx>
-
-#define _NCollection_MapHasher
-#include <NCollection_DataMap.hxx>
-
-
-typedef NCollection_DataMap<TopoDS_Shape, TopTools_MapOfShape, TopTools_ShapeMapHasher> GEOMAlgo_DataMapOfShapeMapOfShape; 
-typedef GEOMAlgo_DataMapOfShapeMapOfShape::Iterator GEOMAlgo_DataMapIteratorOfDataMapOfShapeMapOfShape;
- 
-#undef _NCollection_MapHasher
-
-
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// File:	GEOMAlgo_DataMapOfShapeMapOfShape.hxx
+// Created:	Wed Feb 22 11:07:16 2012
+// Author:
+//		<pkv@BDEURI37616>
+
+
+#ifndef GEOMAlgo_DataMapOfShapeMapOfShape_HeaderFile
+#define GEOMAlgo_DataMapOfShapeMapOfShape_HeaderFile
+
+
+#include <TopoDS_Shape.hxx>
+#include <TopTools_MapOfShape.hxx>
+#include <TopTools_ShapeMapHasher.hxx>
+
+#define _NCollection_MapHasher
+#include <NCollection_DataMap.hxx>
+
+
+typedef NCollection_DataMap<TopoDS_Shape, TopTools_MapOfShape, TopTools_ShapeMapHasher> GEOMAlgo_DataMapOfShapeMapOfShape;
+typedef GEOMAlgo_DataMapOfShapeMapOfShape::Iterator GEOMAlgo_DataMapIteratorOfDataMapOfShapeMapOfShape;
+
+#undef _NCollection_MapHasher
+
+
+
+#endif
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_DataMapOfShapePnt.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_DataMapOfShapePnt.hxx
index 8285a4b8b..c552d1c81 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_DataMapOfShapePnt.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_DataMapOfShapePnt.hxx
@@ -1,44 +1,44 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-// File:	GEOMAlgo_DataMapOfShapePnt.hxx
-// Created:	Wed Feb 22 11:10:15 2012
-// Author:	
-//		<pkv@BDEURI37616>
-
-
-#ifndef GEOMAlgo_DataMapOfShapePnt_HeaderFile
-#define GEOMAlgo_DataMapOfShapePnt_HeaderFile
-
-
-#include <TopoDS_Shape.hxx>
-#include <gp_Pnt.hxx>
-#include <TopTools_ShapeMapHasher.hxx>
-
-#define _NCollection_MapHasher
-#include <NCollection_DataMap.hxx>
-#include <gp_Pnt.hxx>
-
-typedef NCollection_DataMap<TopoDS_Shape, gp_Pnt, TopTools_ShapeMapHasher> GEOMAlgo_DataMapOfShapePnt; 
-typedef GEOMAlgo_DataMapOfShapePnt::Iterator GEOMAlgo_DataMapIteratorOfDataMapOfShapePnt;
- 
-#undef _NCollection_MapHasher
-
-
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// File:	GEOMAlgo_DataMapOfShapePnt.hxx
+// Created:	Wed Feb 22 11:10:15 2012
+// Author:
+//		<pkv@BDEURI37616>
+
+
+#ifndef GEOMAlgo_DataMapOfShapePnt_HeaderFile
+#define GEOMAlgo_DataMapOfShapePnt_HeaderFile
+
+
+#include <TopoDS_Shape.hxx>
+#include <gp_Pnt.hxx>
+#include <TopTools_ShapeMapHasher.hxx>
+
+#define _NCollection_MapHasher
+#include <NCollection_DataMap.hxx>
+#include <gp_Pnt.hxx>
+
+typedef NCollection_DataMap<TopoDS_Shape, gp_Pnt, TopTools_ShapeMapHasher> GEOMAlgo_DataMapOfShapePnt;
+typedef GEOMAlgo_DataMapOfShapePnt::Iterator GEOMAlgo_DataMapIteratorOfDataMapOfShapePnt;
+
+#undef _NCollection_MapHasher
+
+
+
+#endif
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_DataMapOfShapeReal.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_DataMapOfShapeReal.hxx
index 6ce7d5361..cc20d7e16 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_DataMapOfShapeReal.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_DataMapOfShapeReal.hxx
@@ -1,41 +1,41 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-// File:	GEOMAlgo_DataMapOfShapeReal.hxx
-// Created:	Wed Feb 22 10:47:23 2012
-// Author:	
-//		<pkv@BDEURI37616>
-
-
-#ifndef GEOMAlgo_DataMapOfShapeReal_HeaderFile
-#define GEOMAlgo_DataMapOfShapeReal_HeaderFile
-
-#include <TopoDS_Shape.hxx>
-#include <Standard_Real.hxx>
-#include <TopTools_ShapeMapHasher.hxx>
-
-#define _NCollection_MapHasher
-#include <NCollection_DataMap.hxx>
-
-typedef NCollection_DataMap<TopoDS_Shape, Standard_Real, TopTools_ShapeMapHasher> GEOMAlgo_DataMapOfShapeReal; 
-typedef GEOMAlgo_DataMapOfShapeReal::Iterator GEOMAlgo_DataMapIteratorOfDataMapOfShapeReal;
- 
-#undef _NCollection_MapHasher
-
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// File:	GEOMAlgo_DataMapOfShapeReal.hxx
+// Created:	Wed Feb 22 10:47:23 2012
+// Author:
+//		<pkv@BDEURI37616>
+
+
+#ifndef GEOMAlgo_DataMapOfShapeReal_HeaderFile
+#define GEOMAlgo_DataMapOfShapeReal_HeaderFile
+
+#include <TopoDS_Shape.hxx>
+#include <Standard_Real.hxx>
+#include <TopTools_ShapeMapHasher.hxx>
+
+#define _NCollection_MapHasher
+#include <NCollection_DataMap.hxx>
+
+typedef NCollection_DataMap<TopoDS_Shape, Standard_Real, TopTools_ShapeMapHasher> GEOMAlgo_DataMapOfShapeReal;
+typedef GEOMAlgo_DataMapOfShapeReal::Iterator GEOMAlgo_DataMapIteratorOfDataMapOfShapeReal;
+
+#undef _NCollection_MapHasher
+
+
+#endif
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_DataMapOfShapeShapeSet.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_DataMapOfShapeShapeSet.hxx
index cf356a4aa..4430717c3 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_DataMapOfShapeShapeSet.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_DataMapOfShapeShapeSet.hxx
@@ -1,42 +1,42 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-// File:	GEOMAlgo_DataMapOfShapeShapeSet.hxx
-// Created:	Wed Feb 22 08:36:15 2012
-// Author:	
-//		<pkv@BDEURI37616>
-
-
-#ifndef GEOMAlgo_DataMapOfShapeShapeSet_HeaderFile
-#define GEOMAlgo_DataMapOfShapeShapeSet_HeaderFile
-
-#include <TopoDS_Shape.hxx>
-#include <GEOMAlgo_ShapeSet.hxx>
-#include <TopTools_ShapeMapHasher.hxx>
-
-#define _NCollection_MapHasher
-#include <NCollection_DataMap.hxx>
-
-
-typedef NCollection_DataMap<TopoDS_Shape, GEOMAlgo_ShapeSet, TopTools_ShapeMapHasher> GEOMAlgo_DataMapOfShapeShapeSet; 
-typedef GEOMAlgo_DataMapOfShapeShapeSet::Iterator GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet;
- 
-#undef _NCollection_MapHasher
-
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// File:	GEOMAlgo_DataMapOfShapeShapeSet.hxx
+// Created:	Wed Feb 22 08:36:15 2012
+// Author:
+//		<pkv@BDEURI37616>
+
+
+#ifndef GEOMAlgo_DataMapOfShapeShapeSet_HeaderFile
+#define GEOMAlgo_DataMapOfShapeShapeSet_HeaderFile
+
+#include <TopoDS_Shape.hxx>
+#include <GEOMAlgo_ShapeSet.hxx>
+#include <TopTools_ShapeMapHasher.hxx>
+
+#define _NCollection_MapHasher
+#include <NCollection_DataMap.hxx>
+
+
+typedef NCollection_DataMap<TopoDS_Shape, GEOMAlgo_ShapeSet, TopTools_ShapeMapHasher> GEOMAlgo_DataMapOfShapeShapeSet;
+typedef GEOMAlgo_DataMapOfShapeShapeSet::Iterator GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet;
+
+#undef _NCollection_MapHasher
+
+
+#endif
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_FinderShapeOn.cxx b/src/GEOMAlgo_NEW/GEOMAlgo_FinderShapeOn.cxx
index f9759ac95..4708ce554 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_FinderShapeOn.cxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_FinderShapeOn.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File:        GEOMAlgo_FinderShapeOn.cxx
 // Created:     Tue Jan 11 14:44:31 2005
@@ -75,7 +76,7 @@
 
 //=======================================================================
 //function : GEOMAlgo_FinderShapeOn
-//purpose  : 
+//purpose  :
 //=======================================================================
 GEOMAlgo_FinderShapeOn::GEOMAlgo_FinderShapeOn()
 :
@@ -88,14 +89,14 @@ GEOMAlgo_FinderShapeOn::GEOMAlgo_FinderShapeOn()
 }
 //=======================================================================
 //function : ~
-//purpose  : 
+//purpose  :
 //=======================================================================
 GEOMAlgo_FinderShapeOn::~GEOMAlgo_FinderShapeOn()
 {
 }
 //=======================================================================
 //function : SetSurface
-//purpose  : 
+//purpose  :
 //=======================================================================
 void GEOMAlgo_FinderShapeOn::SetSurface(const Handle(Geom_Surface)& aS)
 {
@@ -103,7 +104,7 @@ void GEOMAlgo_FinderShapeOn::SetSurface(const Handle(Geom_Surface)& aS)
 }
 //=======================================================================
 //function : Surface
-//purpose  : 
+//purpose  :
 //=======================================================================
 const Handle(Geom_Surface)& GEOMAlgo_FinderShapeOn::Surface() const
 {
@@ -111,7 +112,7 @@ const Handle(Geom_Surface)& GEOMAlgo_FinderShapeOn::Surface() const
 }
 //=======================================================================
 //function : SetShapeType
-//purpose  : 
+//purpose  :
 //=======================================================================
 void GEOMAlgo_FinderShapeOn::SetShapeType(const TopAbs_ShapeEnum aType)
 {
@@ -119,7 +120,7 @@ void GEOMAlgo_FinderShapeOn::SetShapeType(const TopAbs_ShapeEnum aType)
 }
 //=======================================================================
 //function : ShapeType
-//purpose  : 
+//purpose  :
 //=======================================================================
 TopAbs_ShapeEnum GEOMAlgo_FinderShapeOn::ShapeType()const
 {
@@ -127,7 +128,7 @@ TopAbs_ShapeEnum GEOMAlgo_FinderShapeOn::ShapeType()const
 }
 //=======================================================================
 //function : SetState
-//purpose  : 
+//purpose  :
 //=======================================================================
 void GEOMAlgo_FinderShapeOn::SetState(const GEOMAlgo_State aState)
 {
@@ -135,7 +136,7 @@ void GEOMAlgo_FinderShapeOn::SetState(const GEOMAlgo_State aState)
 }
 //=======================================================================
 //function : State
-//purpose  : 
+//purpose  :
 //=======================================================================
 GEOMAlgo_State GEOMAlgo_FinderShapeOn::State() const
 {
@@ -143,7 +144,7 @@ GEOMAlgo_State GEOMAlgo_FinderShapeOn::State() const
 }
 //=======================================================================
 // function: Shapes
-// purpose: 
+// purpose:
 //=======================================================================
 const TopTools_ListOfShape& GEOMAlgo_FinderShapeOn::Shapes() const
 {
@@ -169,7 +170,7 @@ const TopTools_ListOfShape& GEOMAlgo_FinderShapeOn::Shapes() const
 }
 //=======================================================================
 //function : Perform
-//purpose  : 
+//purpose  :
 //=======================================================================
 void GEOMAlgo_FinderShapeOn::Perform()
 {
@@ -215,10 +216,10 @@ void GEOMAlgo_FinderShapeOn::Perform()
 }
 //=======================================================================
 //function : FindVertices
-//purpose  : 
+//purpose  :
 //=======================================================================
 void GEOMAlgo_FinderShapeOn::FindVertices()
-{ 
+{
   Standard_Integer i, aNb, iErr;
   TopAbs_State aSt;
   TopAbs_Orientation aOr;
@@ -250,7 +251,7 @@ void GEOMAlgo_FinderShapeOn::FindVertices()
 }
 //=======================================================================
 //function : Find
-//purpose  : 
+//purpose  :
 //=======================================================================
 void GEOMAlgo_FinderShapeOn::Find()
 {
@@ -292,7 +293,7 @@ void GEOMAlgo_FinderShapeOn::Find()
 }
 //=======================================================================
 //function : Find
-//purpose  : 
+//purpose  :
 //=======================================================================
 void GEOMAlgo_FinderShapeOn::Find(const TopoDS_Shape& aS)
 {
@@ -317,7 +318,7 @@ void GEOMAlgo_FinderShapeOn::Find(const TopoDS_Shape& aS)
     myErrorStatus=31; // DSFiller failed
     return;
   }
-  // 
+  //
   // 2. Find shapes
   GEOMAlgo_ShapeSolid* pSS;
   GEOMAlgo_VertexSolid aVXS;
@@ -358,21 +359,21 @@ void GEOMAlgo_FinderShapeOn::Find(const TopoDS_Shape& aS)
     const TopTools_ListOfShape& aLS=pSS->Shapes(aSts[i]);
     aIt.Initialize(aLS);
     for (; aIt.More(); aIt.Next()) {
-      const TopoDS_Shape& aSImage=aIt.Value(); 
-      if (myImages.IsBound(aSImage)) { 
-        const TopoDS_Shape& aSx=myImages.Find(aSImage); 
+      const TopoDS_Shape& aSImage=aIt.Value();
+      if (myImages.IsBound(aSImage)) {
+        const TopoDS_Shape& aSx=myImages.Find(aSImage);
         myMSS.Add(aSx, aSts[i]);
       }
       else {
         myErrorStatus=33;// can not find original shape
-        return; 
+        return;
       }
     }
   }
 }
 //=======================================================================
 //function : MakeArgument1
-//purpose  : 
+//purpose  :
 //=======================================================================
 void GEOMAlgo_FinderShapeOn::MakeArgument1()
 {
@@ -432,7 +433,7 @@ void GEOMAlgo_FinderShapeOn::MakeArgument1()
         break;
       }
     }
-  } //  
+  } //
   else {
     aBB.MakeFace(aFace, mySurface, myTolerance);
   }
@@ -446,7 +447,7 @@ void GEOMAlgo_FinderShapeOn::MakeArgument1()
 }
 //=======================================================================
 //function : MakeArgument2
-//purpose  : 
+//purpose  :
 //=======================================================================
 void GEOMAlgo_FinderShapeOn::MakeArgument2()
 {
@@ -463,7 +464,7 @@ void GEOMAlgo_FinderShapeOn::MakeArgument2()
 }
 //=======================================================================
 //function : CheckData
-//purpose  : 
+//purpose  :
 //=======================================================================
 void GEOMAlgo_FinderShapeOn::CheckData()
 {
@@ -487,7 +488,7 @@ void GEOMAlgo_FinderShapeOn::CheckData()
     return;
   }
   //
-  if (myState==GEOMAlgo_ST_UNKNOWN || 
+  if (myState==GEOMAlgo_ST_UNKNOWN ||
       myState==GEOMAlgo_ST_INOUT) {
     myErrorStatus=13; // unallowed state type
     return;
@@ -496,7 +497,7 @@ void GEOMAlgo_FinderShapeOn::CheckData()
 //
 //=======================================================================
 //function : CopySource
-//purpose  : 
+//purpose  :
 //=======================================================================
 void GEOMAlgo_FinderShapeOn::CopySource(const TopoDS_Shape& aE,
                                         TopTools_DataMapOfShapeShape& aImages,
@@ -536,7 +537,7 @@ void GEOMAlgo_FinderShapeOn::CopySource(const TopoDS_Shape& aE,
     const TopoDS_Shape& aV=aIt.Value();
     TopoDS_Shape aVx;
     //
-    CopySource (aV, aImages, aOriginals, aVx);  
+    CopySource (aV, aImages, aOriginals, aVx);
     //
     aVx.Orientation(aV.Orientation());
     BB.Add(aEx, aVx);
@@ -547,9 +548,9 @@ void GEOMAlgo_FinderShapeOn::CopySource(const TopoDS_Shape& aE,
 //
 //=======================================================================
 //function : BuildTriangulation
-//purpose  : 
+//purpose  :
 //=======================================================================
-Standard_Boolean 
+Standard_Boolean
   GEOMAlgo_FinderShapeOn::BuildTriangulation (const TopoDS_Shape& theShape)
 {
   // calculate deflection
@@ -603,8 +604,8 @@ Standard_Boolean
 //
 // 10 -mySurface=NULL
 // 11 -myShape=NULL
-// 12 -unallowed type of sub-shapes 
-// 13 -unallowed state  
+// 12 -unallowed type of sub-shapes
+// 13 -unallowed state
 // 20 -can not build the face
 // 30 -wrong args are used for DSFiller
 // 31 -DSFiller failed
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_FinderShapeOn.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_FinderShapeOn.hxx
index 8d6cbdb83..a05b902b9 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_FinderShapeOn.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_FinderShapeOn.hxx
@@ -1,120 +1,121 @@
-
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
-// File:        GEOMAlgo_FinderShapeOn.hxx
-// Created:     Tue Jan 11 14:44:31 2005
-// Author:      Peter KURNEV
-
-#ifndef _GEOMAlgo_FinderShapeOn_HeaderFile
-#define _GEOMAlgo_FinderShapeOn_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_Macro.hxx>
-#include <Handle_Geom_Surface.hxx>
-#include <TopAbs_ShapeEnum.hxx>
-#include <GEOMAlgo_State.hxx>
-#include <TopoDS_Shape.hxx>
-#include <TopTools_ListOfShape.hxx>
-#include <TopTools_DataMapOfShapeShape.hxx>
-#include <GEOMAlgo_IndexedDataMapOfShapeState.hxx>
-#include <Standard_Boolean.hxx>
-#include <GEOMAlgo_ShapeAlgo.hxx>
-#include <Geom_Surface.hxx>
-#include <TopoDS_Shape.hxx>
-
-//=======================================================================
-//function : GEOMAlgo_FinderShapeOn
-//purpose  : 
-//=======================================================================
-class GEOMAlgo_FinderShapeOn  : public GEOMAlgo_ShapeAlgo 
-{
- public:
-  Standard_EXPORT
-    GEOMAlgo_FinderShapeOn();
-  
-  Standard_EXPORT
-    virtual ~GEOMAlgo_FinderShapeOn();
-  
-  Standard_EXPORT
-    virtual  void Perform() ;
-  
-  Standard_EXPORT
-    void SetSurface(const Handle(Geom_Surface)& aS) ;
-  
-  Standard_EXPORT
-    void SetShapeType(const TopAbs_ShapeEnum aST) ;
-  
-  Standard_EXPORT
-    void SetState(const GEOMAlgo_State aSF) ;
-  
-  Standard_EXPORT
-    const Handle_Geom_Surface& Surface() const;
-  
-  Standard_EXPORT
-    TopAbs_ShapeEnum ShapeType() const;
-  
-  Standard_EXPORT
-    GEOMAlgo_State State() const;
-  
-  Standard_EXPORT
-    const TopTools_ListOfShape& Shapes() const;
-  
-  Standard_EXPORT
-    static  void CopySource(const TopoDS_Shape& aS,
-			    TopTools_DataMapOfShapeShape& aImages,
-			    TopTools_DataMapOfShapeShape& aOriginals,
-			    TopoDS_Shape& aSC) ;
-  
-  Standard_EXPORT   
-    static  Standard_Boolean BuildTriangulation(const TopoDS_Shape& aS) ;
-
-protected:
-  Standard_EXPORT
-    virtual  void CheckData() ;
-  
-  Standard_EXPORT
-    void MakeArgument1() ;
-  
-  Standard_EXPORT
-    void MakeArgument2() ;
-  
-  Standard_EXPORT
-    void Find() ;
-  
-  Standard_EXPORT
-    void Find(const TopoDS_Shape& aS) ;
-  
-  Standard_EXPORT
-    void FindVertices() ;
-
-
-  Handle_Geom_Surface mySurface;
-  TopAbs_ShapeEnum myShapeType;
-  GEOMAlgo_State myState;
-  TopoDS_Shape myArg1;
-  TopoDS_Shape myArg2;
-  TopTools_ListOfShape myLS;
-  TopTools_DataMapOfShapeShape myImages;
-  GEOMAlgo_IndexedDataMapOfShapeState myMSS;
-  Standard_Boolean myIsAnalytic;
-};
-#endif
+
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File:        GEOMAlgo_FinderShapeOn.hxx
+// Created:     Tue Jan 11 14:44:31 2005
+// Author:      Peter KURNEV
+
+#ifndef _GEOMAlgo_FinderShapeOn_HeaderFile
+#define _GEOMAlgo_FinderShapeOn_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Macro.hxx>
+#include <Handle_Geom_Surface.hxx>
+#include <TopAbs_ShapeEnum.hxx>
+#include <GEOMAlgo_State.hxx>
+#include <TopoDS_Shape.hxx>
+#include <TopTools_ListOfShape.hxx>
+#include <TopTools_DataMapOfShapeShape.hxx>
+#include <GEOMAlgo_IndexedDataMapOfShapeState.hxx>
+#include <Standard_Boolean.hxx>
+#include <GEOMAlgo_ShapeAlgo.hxx>
+#include <Geom_Surface.hxx>
+#include <TopoDS_Shape.hxx>
+
+//=======================================================================
+//function : GEOMAlgo_FinderShapeOn
+//purpose  :
+//=======================================================================
+class GEOMAlgo_FinderShapeOn  : public GEOMAlgo_ShapeAlgo
+{
+ public:
+  Standard_EXPORT
+    GEOMAlgo_FinderShapeOn();
+
+  Standard_EXPORT
+    virtual ~GEOMAlgo_FinderShapeOn();
+
+  Standard_EXPORT
+    virtual  void Perform() ;
+
+  Standard_EXPORT
+    void SetSurface(const Handle(Geom_Surface)& aS) ;
+
+  Standard_EXPORT
+    void SetShapeType(const TopAbs_ShapeEnum aST) ;
+
+  Standard_EXPORT
+    void SetState(const GEOMAlgo_State aSF) ;
+
+  Standard_EXPORT
+    const Handle_Geom_Surface& Surface() const;
+
+  Standard_EXPORT
+    TopAbs_ShapeEnum ShapeType() const;
+
+  Standard_EXPORT
+    GEOMAlgo_State State() const;
+
+  Standard_EXPORT
+    const TopTools_ListOfShape& Shapes() const;
+
+  Standard_EXPORT
+    static  void CopySource(const TopoDS_Shape& aS,
+			    TopTools_DataMapOfShapeShape& aImages,
+			    TopTools_DataMapOfShapeShape& aOriginals,
+			    TopoDS_Shape& aSC) ;
+
+  Standard_EXPORT
+    static  Standard_Boolean BuildTriangulation(const TopoDS_Shape& aS) ;
+
+protected:
+  Standard_EXPORT
+    virtual  void CheckData() ;
+
+  Standard_EXPORT
+    void MakeArgument1() ;
+
+  Standard_EXPORT
+    void MakeArgument2() ;
+
+  Standard_EXPORT
+    void Find() ;
+
+  Standard_EXPORT
+    void Find(const TopoDS_Shape& aS) ;
+
+  Standard_EXPORT
+    void FindVertices() ;
+
+
+  Handle_Geom_Surface mySurface;
+  TopAbs_ShapeEnum myShapeType;
+  GEOMAlgo_State myState;
+  TopoDS_Shape myArg1;
+  TopoDS_Shape myArg2;
+  TopTools_ListOfShape myLS;
+  TopTools_DataMapOfShapeShape myImages;
+  GEOMAlgo_IndexedDataMapOfShapeState myMSS;
+  Standard_Boolean myIsAnalytic;
+};
+#endif
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_FinderShapeOn1.cxx b/src/GEOMAlgo_NEW/GEOMAlgo_FinderShapeOn1.cxx
index eb28835e9..9c943ac43 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_FinderShapeOn1.cxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_FinderShapeOn1.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File:        GEOMAlgo_FinderShapeOn1.cxx
 // Created:     Fri Mar  4 10:31:06 2005
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_FinderShapeOn1.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_FinderShapeOn1.hxx
index 301a1a9e7..90995d9a2 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_FinderShapeOn1.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_FinderShapeOn1.hxx
@@ -1,145 +1,146 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
-// File:        GEOMAlgo_FinderShapeOn1.hxx
-// Created:     Fri Mar  4 10:31:06 2005
-// Author:      Peter KURNEV
-
-#ifndef _GEOMAlgo_FinderShapeOn1_HeaderFile
-#define _GEOMAlgo_FinderShapeOn1_HeaderFile
-
-#include <GEOMAlgo_State.hxx>
-#include <GEOMAlgo_IndexedDataMapOfShapeState.hxx>
-#include <GEOMAlgo_ShapeAlgo.hxx>
-#include <GEOMAlgo_ListOfPnt.hxx>
-
-#include <TopAbs_State.hxx>
-#include <TopAbs_ShapeEnum.hxx>
-#include <TopoDS_Face.hxx>
-#include <TopoDS_Edge.hxx>
-#include <TopTools_ListOfShape.hxx>
-
-#include <Geom_Surface.hxx>
-#include <Handle_Geom_Surface.hxx>
-#include <GeomAdaptor_Surface.hxx>
-
-#include <gp_Pnt.hxx>
-
-#include <Standard.hxx>
-#include <Standard_Macro.hxx>
-#include <Standard_Integer.hxx>
-
-//=======================================================================
-//function : GEOMAlgo_FinderShapeOn1
-//purpose  :
-//=======================================================================
-class GEOMAlgo_FinderShapeOn1  : public GEOMAlgo_ShapeAlgo
-{
- public:
-  Standard_EXPORT
-    GEOMAlgo_FinderShapeOn1();
-
-  Standard_EXPORT
-    virtual ~GEOMAlgo_FinderShapeOn1();
-
-  Standard_EXPORT
-    void SetSurface(const Handle(Geom_Surface)& aS) ;
-
-  Standard_EXPORT
-    void SetShapeType(const TopAbs_ShapeEnum aST) ;
-
-  Standard_EXPORT
-    void SetState(const GEOMAlgo_State aSF) ;
-
-  Standard_EXPORT
-    void SetNbPntsMin(const Standard_Integer aNb) ;
-
-  Standard_EXPORT
-    Standard_Integer NbPntsMin() const;
-
-  Standard_EXPORT
-    void SetNbPntsMax(const Standard_Integer aNb) ;
-
-  Standard_EXPORT
-    Standard_Integer NbPntsMax() const;
-
-  Standard_EXPORT
-    const Handle_Geom_Surface& Surface() const;
-
-  Standard_EXPORT
-    TopAbs_ShapeEnum ShapeType() const;
-
-  Standard_EXPORT
-    GEOMAlgo_State State() const;
-
-  Standard_EXPORT
-    virtual  void Perform() ;
-
-  Standard_EXPORT
-    const TopTools_ListOfShape& Shapes() const;
-
-  Standard_EXPORT
-    const GEOMAlgo_IndexedDataMapOfShapeState& MSS() const;
-
- protected:
-  Standard_EXPORT
-    virtual  void CheckData() ;
-
-  Standard_EXPORT
-    void ProcessVertices() ;
-
-  Standard_EXPORT
-    void ProcessEdges() ;
-
-  Standard_EXPORT
-    void ProcessFaces() ;
-
-  Standard_EXPORT
-    void ProcessSolids() ;
-
-  Standard_EXPORT
-    void InnerPoints(const TopoDS_Face& aF,
-                     GEOMAlgo_ListOfPnt& aLP) ;
-
-  Standard_EXPORT
-    void InnerPoints(const TopoDS_Edge& aE,
-                     GEOMAlgo_ListOfPnt& aLP) ;
-
-  Standard_EXPORT
-    void InnerPoints(const TopoDS_Edge& aE,
-                     const Standard_Integer aNbPnts,
-                     GEOMAlgo_ListOfPnt& aLP) ;
-
-  Standard_EXPORT
-    virtual  TopAbs_State GetPointState(const gp_Pnt& aP) ;
-
-
-  Handle_Geom_Surface mySurface;
-  TopAbs_ShapeEnum myShapeType;
-  GEOMAlgo_State myState;
-  Standard_Integer myNbPntsMin;
-  Standard_Integer myNbPntsMax;
-  GeomAdaptor_Surface myGAS;
-  TopTools_ListOfShape myLS;
-  GEOMAlgo_IndexedDataMapOfShapeState myMSS;
-};
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File:        GEOMAlgo_FinderShapeOn1.hxx
+// Created:     Fri Mar  4 10:31:06 2005
+// Author:      Peter KURNEV
+
+#ifndef _GEOMAlgo_FinderShapeOn1_HeaderFile
+#define _GEOMAlgo_FinderShapeOn1_HeaderFile
+
+#include <GEOMAlgo_State.hxx>
+#include <GEOMAlgo_IndexedDataMapOfShapeState.hxx>
+#include <GEOMAlgo_ShapeAlgo.hxx>
+#include <GEOMAlgo_ListOfPnt.hxx>
+
+#include <TopAbs_State.hxx>
+#include <TopAbs_ShapeEnum.hxx>
+#include <TopoDS_Face.hxx>
+#include <TopoDS_Edge.hxx>
+#include <TopTools_ListOfShape.hxx>
+
+#include <Geom_Surface.hxx>
+#include <Handle_Geom_Surface.hxx>
+#include <GeomAdaptor_Surface.hxx>
+
+#include <gp_Pnt.hxx>
+
+#include <Standard.hxx>
+#include <Standard_Macro.hxx>
+#include <Standard_Integer.hxx>
+
+//=======================================================================
+//function : GEOMAlgo_FinderShapeOn1
+//purpose  :
+//=======================================================================
+class GEOMAlgo_FinderShapeOn1  : public GEOMAlgo_ShapeAlgo
+{
+ public:
+  Standard_EXPORT
+    GEOMAlgo_FinderShapeOn1();
+
+  Standard_EXPORT
+    virtual ~GEOMAlgo_FinderShapeOn1();
+
+  Standard_EXPORT
+    void SetSurface(const Handle(Geom_Surface)& aS) ;
+
+  Standard_EXPORT
+    void SetShapeType(const TopAbs_ShapeEnum aST) ;
+
+  Standard_EXPORT
+    void SetState(const GEOMAlgo_State aSF) ;
+
+  Standard_EXPORT
+    void SetNbPntsMin(const Standard_Integer aNb) ;
+
+  Standard_EXPORT
+    Standard_Integer NbPntsMin() const;
+
+  Standard_EXPORT
+    void SetNbPntsMax(const Standard_Integer aNb) ;
+
+  Standard_EXPORT
+    Standard_Integer NbPntsMax() const;
+
+  Standard_EXPORT
+    const Handle_Geom_Surface& Surface() const;
+
+  Standard_EXPORT
+    TopAbs_ShapeEnum ShapeType() const;
+
+  Standard_EXPORT
+    GEOMAlgo_State State() const;
+
+  Standard_EXPORT
+    virtual  void Perform() ;
+
+  Standard_EXPORT
+    const TopTools_ListOfShape& Shapes() const;
+
+  Standard_EXPORT
+    const GEOMAlgo_IndexedDataMapOfShapeState& MSS() const;
+
+ protected:
+  Standard_EXPORT
+    virtual  void CheckData() ;
+
+  Standard_EXPORT
+    void ProcessVertices() ;
+
+  Standard_EXPORT
+    void ProcessEdges() ;
+
+  Standard_EXPORT
+    void ProcessFaces() ;
+
+  Standard_EXPORT
+    void ProcessSolids() ;
+
+  Standard_EXPORT
+    void InnerPoints(const TopoDS_Face& aF,
+                     GEOMAlgo_ListOfPnt& aLP) ;
+
+  Standard_EXPORT
+    void InnerPoints(const TopoDS_Edge& aE,
+                     GEOMAlgo_ListOfPnt& aLP) ;
+
+  Standard_EXPORT
+    void InnerPoints(const TopoDS_Edge& aE,
+                     const Standard_Integer aNbPnts,
+                     GEOMAlgo_ListOfPnt& aLP) ;
+
+  Standard_EXPORT
+    virtual  TopAbs_State GetPointState(const gp_Pnt& aP) ;
+
+
+  Handle_Geom_Surface mySurface;
+  TopAbs_ShapeEnum myShapeType;
+  GEOMAlgo_State myState;
+  Standard_Integer myNbPntsMin;
+  Standard_Integer myNbPntsMax;
+  GeomAdaptor_Surface myGAS;
+  TopTools_ListOfShape myLS;
+  GEOMAlgo_IndexedDataMapOfShapeState myMSS;
+};
+
+#endif
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_FinderShapeOn2.cxx b/src/GEOMAlgo_NEW/GEOMAlgo_FinderShapeOn2.cxx
index e437f0c04..020703409 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_FinderShapeOn2.cxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_FinderShapeOn2.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -81,7 +81,7 @@
 
 //=======================================================================
 //function : GEOMAlgo_FinderShapeOn1
-//purpose  : 
+//purpose  :
 //=======================================================================
   GEOMAlgo_FinderShapeOn2::GEOMAlgo_FinderShapeOn2()
 :
@@ -95,14 +95,14 @@
 }
 //=======================================================================
 //function : ~
-//purpose  : 
+//purpose  :
 //=======================================================================
   GEOMAlgo_FinderShapeOn2::~GEOMAlgo_FinderShapeOn2()
 {
 }
 //=======================================================================
 //function : SetClsf
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_FinderShapeOn2::SetClsf(const Handle(GEOMAlgo_Clsf)& aClsf)
 {
@@ -110,7 +110,7 @@
 }
 //=======================================================================
 //function : Clsf
-//purpose  : 
+//purpose  :
 //=======================================================================
   const Handle(GEOMAlgo_Clsf)& GEOMAlgo_FinderShapeOn2::Clsf() const
 {
@@ -118,7 +118,7 @@
 }
 //=======================================================================
 //function : SetShapeType
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_FinderShapeOn2::SetShapeType(const TopAbs_ShapeEnum aType)
 {
@@ -126,7 +126,7 @@
 }
 //=======================================================================
 //function : ShapeType
-//purpose  : 
+//purpose  :
 //=======================================================================
   TopAbs_ShapeEnum GEOMAlgo_FinderShapeOn2::ShapeType()const
 {
@@ -134,7 +134,7 @@
 }
 //=======================================================================
 //function : SetState
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_FinderShapeOn2::SetState(const GEOMAlgo_State aState)
 {
@@ -142,7 +142,7 @@
 }
 //=======================================================================
 //function : State
-//purpose  : 
+//purpose  :
 //=======================================================================
   GEOMAlgo_State GEOMAlgo_FinderShapeOn2::State() const
 {
@@ -150,7 +150,7 @@
 }
 //=======================================================================
 //function : SetNbPntsMin
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_FinderShapeOn2::SetNbPntsMin(const Standard_Integer aNb)
 {
@@ -158,7 +158,7 @@
 }
 //=======================================================================
 //function : NbPntsMin
-//purpose  : 
+//purpose  :
 //=======================================================================
   Standard_Integer GEOMAlgo_FinderShapeOn2::NbPntsMin()const
 {
@@ -166,7 +166,7 @@
 }
 //=======================================================================
 //function : SetNbPntsMax
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_FinderShapeOn2::SetNbPntsMax(const Standard_Integer aNb)
 {
@@ -174,7 +174,7 @@
 }
 //=======================================================================
 //function : NbPntsMax
-//purpose  : 
+//purpose  :
 //=======================================================================
   Standard_Integer GEOMAlgo_FinderShapeOn2::NbPntsMax()const
 {
@@ -182,7 +182,7 @@
 }
 //=======================================================================
 // function: MSS
-// purpose: 
+// purpose:
 //=======================================================================
   const GEOMAlgo_IndexedDataMapOfShapeState& GEOMAlgo_FinderShapeOn2::MSS() const
 {
@@ -190,7 +190,7 @@
 }
 //=======================================================================
 // function: Shapes
-// purpose: 
+// purpose:
 //=======================================================================
   const TopTools_ListOfShape& GEOMAlgo_FinderShapeOn2::Shapes() const
 {
@@ -211,7 +211,7 @@
 }
 //=======================================================================
 //function : Perform
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_FinderShapeOn2::Perform()
 {
@@ -258,12 +258,12 @@
   }
   //
   // 4
-  ProcessSolids(); 
+  ProcessSolids();
   //
 }
 //=======================================================================
 //function : CheckData
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_FinderShapeOn2::CheckData()
 {
@@ -296,7 +296,7 @@
     return;
   }
   //
-  if (myState==GEOMAlgo_ST_UNKNOWN || 
+  if (myState==GEOMAlgo_ST_UNKNOWN ||
       myState==GEOMAlgo_ST_INOUT) {
     myErrorStatus=13; // unallowed state type
     return;
@@ -304,7 +304,7 @@
 }
 //=======================================================================
 //function : ProcessVertices
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_FinderShapeOn2::ProcessVertices()
 {
@@ -345,7 +345,7 @@
 }
 //=======================================================================
 //function : ProcessEdges
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_FinderShapeOn2::ProcessEdges()
 {
@@ -385,14 +385,14 @@
     }
     //
     if (BRep_Tool::Degenerated(aE)) {
-      myMSS.Add(aE, aSt); 
+      myMSS.Add(aE, aSt);
       continue;
     }
     //
     if (myState==GEOMAlgo_ST_ON) {
       Standard_Boolean bCanBeON;
       Standard_Real aT1, aT2;
-      Handle(Geom_Curve) aC; 
+      Handle(Geom_Curve) aC;
       //
       aC=BRep_Tool::Curve(aE, aT1, aT2);
       bCanBeON=myClsf->CanBeON(aC);
@@ -403,7 +403,7 @@
     //
     InnerPoints(aE, aLP);
     if (myErrorStatus) {
-      return;  
+      return;
     }
     //
     bIsConformState=Standard_True;
@@ -433,7 +433,7 @@
       }
     }
     //
-    aSt=aSC.State();    
+    aSt=aSC.State();
     //
     bIsConformState=GEOMAlgo_SurfaceTools::IsConformState(aSt, myState);
     if (myShapeType==TopAbs_EDGE) {
@@ -444,11 +444,11 @@
     else if (bIsConformState || aSt==TopAbs_ON) {
       myMSS.Add(aE, aSt);
     }
-  } //  for (i=1; i<=aNb; ++i) next edge 
+  } //  for (i=1; i<=aNb; ++i) next edge
 }
 //=======================================================================
 //function : ProcessFaces
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_FinderShapeOn2::ProcessFaces()
 {
@@ -528,7 +528,7 @@
       }
     }
     //
-    aSt=aSC.State();    
+    aSt=aSC.State();
     //
     bIsConformState=GEOMAlgo_SurfaceTools::IsConformState(aSt, myState);
     if (myShapeType==TopAbs_FACE) {
@@ -539,11 +539,11 @@
     else if (bIsConformState || aSt==TopAbs_ON) {
       myMSS.Add(aF, aSt);
     }
-  }//  for (i=1; i<=aNb; ++i) next face 
+  }//  for (i=1; i<=aNb; ++i) next face
 }
 //=======================================================================
 //function : ProcessSolids
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_FinderShapeOn2::ProcessSolids()
 {
@@ -579,7 +579,7 @@
       continue; // face has non-conformed state,skip solid
     }
     //
-    aSt=aSC.State();    
+    aSt=aSC.State();
     //
     bIsConformState=GEOMAlgo_SurfaceTools::IsConformState(aSt, myState);
     if (bIsConformState) {
@@ -590,7 +590,7 @@
 //
 //=======================================================================
 //function : InnerPoints
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_FinderShapeOn2::InnerPoints(const TopoDS_Face& aF,
                                           GEOMAlgo_ListOfPnt& aLP)
@@ -665,7 +665,7 @@
     }
   }
   //
-  // inner nodes=all_nodes - boundary_nodes 
+  // inner nodes=all_nodes - boundary_nodes
   j1=aNodes.Lower();
   j2=aNodes.Upper();
   for (j=j1; j<=j2; ++j) {
@@ -677,7 +677,7 @@
   //
   aNb=aLP.Extent();
   //
-  if (!aNb && myNbPntsMin) { 
+  if (!aNb && myNbPntsMin) {
     // try to fill it yourself
     Standard_Boolean bIsDone;
     Standard_Integer aN1, aN2;
@@ -737,12 +737,12 @@
           break;
         }// if (iCnt>1)
       }// for (; aIt.More(); aIt.Next())
-    }// if (aType==GeomAbs_Plane || aType==GeomAbs_Cylinder) 
-  }// if (!aNb && myNbPntsMin) { 
+    }// if (aType==GeomAbs_Plane || aType==GeomAbs_Cylinder)
+  }// if (!aNb && myNbPntsMin) {
 }
 //=======================================================================
 //function : InnerPoints
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_FinderShapeOn2::InnerPoints(const TopoDS_Edge& aE,
                                           GEOMAlgo_ListOfPnt& aLP)
@@ -790,7 +790,7 @@
   }
   //
   aNb=aLP.Extent();
-  if (!aNb && myNbPntsMin) { 
+  if (!aNb && myNbPntsMin) {
     // try to fill it yourself
     InnerPoints(aE, myNbPntsMin, aLP);
     aNb=aLP.Extent();
@@ -798,7 +798,7 @@
 }
 //=======================================================================
 //function : InnerPoints
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_FinderShapeOn2::InnerPoints(const TopoDS_Edge& aE,
                                           const Standard_Integer aNbPntsMin,
@@ -836,8 +836,8 @@
 //
 // 10 -myClsf=NULL
 // 11 -myShape=NULL
-// 12 -unallowed type of sub-shapes 
-// 13 -unallowed state  
+// 12 -unallowed type of sub-shapes
+// 13 -unallowed state
 // 15 -unallowed surface type
 // 20- no triangulation found
 // 30- can not obtain the line from the link
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_FinderShapeOn2.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_FinderShapeOn2.hxx
index d05875763..a70d04e2c 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_FinderShapeOn2.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_FinderShapeOn2.hxx
@@ -1,136 +1,136 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-// File:        GEOMAlgo_FinderShapeOn2.hxx
-// Created:     Fri Mar  4 10:31:06 2005
-// Author:      Peter KURNEV
-//              <pkv@irinox>
-//
-#ifndef _GEOMAlgo_FinderShapeOn2_HeaderFile
-#define _GEOMAlgo_FinderShapeOn2_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_Macro.hxx>
-#include <TopAbs_ShapeEnum.hxx>
-#include <GEOMAlgo_State.hxx>
-#include <Standard_Integer.hxx>
-//#include <Handle_GEOMAlgo_Clsf.hxx>
-#include <GEOMAlgo_Clsf.hxx>
-#include <TopTools_ListOfShape.hxx>
-#include <GEOMAlgo_IndexedDataMapOfShapeState.hxx>
-#include <GEOMAlgo_ShapeAlgo.hxx>
-#include <GEOMAlgo_Clsf.hxx>
-#include <TopoDS_Face.hxx>
-#include <TopoDS_Edge.hxx>
-#include <GEOMAlgo_ListOfPnt.hxx>
-
-//=======================================================================
-//function : GEOMAlgo_FinderShapeOn2
-//purpose  : 
-//=======================================================================
-class GEOMAlgo_FinderShapeOn2  : public GEOMAlgo_ShapeAlgo 
-{
- public:
-  Standard_EXPORT
-    GEOMAlgo_FinderShapeOn2();
-  
-  Standard_EXPORT
-    virtual ~GEOMAlgo_FinderShapeOn2();
-  
-  Standard_EXPORT
-    void SetClsf(const Handle(GEOMAlgo_Clsf)& aClsf) ;
-  
-  Standard_EXPORT
-    const Handle_GEOMAlgo_Clsf& Clsf() const;
-  
-  Standard_EXPORT
-    void SetShapeType(const TopAbs_ShapeEnum aST) ;
-  
-  Standard_EXPORT
-    TopAbs_ShapeEnum ShapeType() const;
-  
-  Standard_EXPORT
-    void SetState(const GEOMAlgo_State aSF) ;
-  
-  Standard_EXPORT
-    GEOMAlgo_State State() const;
-  
-  Standard_EXPORT
-    void SetNbPntsMin(const Standard_Integer aNb) ;
-  
-  Standard_EXPORT
-    Standard_Integer NbPntsMin() const;
-  
-  Standard_EXPORT
-    void SetNbPntsMax(const Standard_Integer aNb) ;
-  
-  Standard_EXPORT
-    Standard_Integer NbPntsMax() const;
-  
-  Standard_EXPORT
-    virtual  void Perform() ;
-  
-  Standard_EXPORT
-    const TopTools_ListOfShape& Shapes() const;
-  
-  Standard_EXPORT
-    const GEOMAlgo_IndexedDataMapOfShapeState& MSS() const;
-
-protected:
-  Standard_EXPORT
-    virtual  void CheckData() ;
-  
-  Standard_EXPORT
-    void ProcessVertices() ;
-  
-  Standard_EXPORT
-    void ProcessEdges() ;
-  
-  Standard_EXPORT
-    void ProcessFaces() ;
-  
-  Standard_EXPORT
-    void ProcessSolids() ;
-  
-  Standard_EXPORT
-    void InnerPoints(const TopoDS_Face& aF,
-		     GEOMAlgo_ListOfPnt& aLP) ;
-  
-  Standard_EXPORT
-    void InnerPoints(const TopoDS_Edge& aE,
-		     GEOMAlgo_ListOfPnt& aLP) ;
-  
-  Standard_EXPORT
-    void InnerPoints(const TopoDS_Edge& aE,
-		     const Standard_Integer aNbPnts,
-		     GEOMAlgo_ListOfPnt& aLP) ;
-
-
-  TopAbs_ShapeEnum myShapeType;
-  GEOMAlgo_State myState;
-  Standard_Integer myNbPntsMin;
-  Standard_Integer myNbPntsMax;
-  Handle_GEOMAlgo_Clsf myClsf;
-  TopTools_ListOfShape myLS;
-  GEOMAlgo_IndexedDataMapOfShapeState myMSS;
-};
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// File:        GEOMAlgo_FinderShapeOn2.hxx
+// Created:     Fri Mar  4 10:31:06 2005
+// Author:      Peter KURNEV
+//              <pkv@irinox>
+//
+#ifndef _GEOMAlgo_FinderShapeOn2_HeaderFile
+#define _GEOMAlgo_FinderShapeOn2_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Macro.hxx>
+#include <TopAbs_ShapeEnum.hxx>
+#include <GEOMAlgo_State.hxx>
+#include <Standard_Integer.hxx>
+//#include <Handle_GEOMAlgo_Clsf.hxx>
+#include <GEOMAlgo_Clsf.hxx>
+#include <TopTools_ListOfShape.hxx>
+#include <GEOMAlgo_IndexedDataMapOfShapeState.hxx>
+#include <GEOMAlgo_ShapeAlgo.hxx>
+#include <GEOMAlgo_Clsf.hxx>
+#include <TopoDS_Face.hxx>
+#include <TopoDS_Edge.hxx>
+#include <GEOMAlgo_ListOfPnt.hxx>
+
+//=======================================================================
+//function : GEOMAlgo_FinderShapeOn2
+//purpose  :
+//=======================================================================
+class GEOMAlgo_FinderShapeOn2  : public GEOMAlgo_ShapeAlgo
+{
+ public:
+  Standard_EXPORT
+    GEOMAlgo_FinderShapeOn2();
+
+  Standard_EXPORT
+    virtual ~GEOMAlgo_FinderShapeOn2();
+
+  Standard_EXPORT
+    void SetClsf(const Handle(GEOMAlgo_Clsf)& aClsf) ;
+
+  Standard_EXPORT
+    const Handle_GEOMAlgo_Clsf& Clsf() const;
+
+  Standard_EXPORT
+    void SetShapeType(const TopAbs_ShapeEnum aST) ;
+
+  Standard_EXPORT
+    TopAbs_ShapeEnum ShapeType() const;
+
+  Standard_EXPORT
+    void SetState(const GEOMAlgo_State aSF) ;
+
+  Standard_EXPORT
+    GEOMAlgo_State State() const;
+
+  Standard_EXPORT
+    void SetNbPntsMin(const Standard_Integer aNb) ;
+
+  Standard_EXPORT
+    Standard_Integer NbPntsMin() const;
+
+  Standard_EXPORT
+    void SetNbPntsMax(const Standard_Integer aNb) ;
+
+  Standard_EXPORT
+    Standard_Integer NbPntsMax() const;
+
+  Standard_EXPORT
+    virtual  void Perform() ;
+
+  Standard_EXPORT
+    const TopTools_ListOfShape& Shapes() const;
+
+  Standard_EXPORT
+    const GEOMAlgo_IndexedDataMapOfShapeState& MSS() const;
+
+protected:
+  Standard_EXPORT
+    virtual  void CheckData() ;
+
+  Standard_EXPORT
+    void ProcessVertices() ;
+
+  Standard_EXPORT
+    void ProcessEdges() ;
+
+  Standard_EXPORT
+    void ProcessFaces() ;
+
+  Standard_EXPORT
+    void ProcessSolids() ;
+
+  Standard_EXPORT
+    void InnerPoints(const TopoDS_Face& aF,
+		     GEOMAlgo_ListOfPnt& aLP) ;
+
+  Standard_EXPORT
+    void InnerPoints(const TopoDS_Edge& aE,
+		     GEOMAlgo_ListOfPnt& aLP) ;
+
+  Standard_EXPORT
+    void InnerPoints(const TopoDS_Edge& aE,
+		     const Standard_Integer aNbPnts,
+		     GEOMAlgo_ListOfPnt& aLP) ;
+
+
+  TopAbs_ShapeEnum myShapeType;
+  GEOMAlgo_State myState;
+  Standard_Integer myNbPntsMin;
+  Standard_Integer myNbPntsMax;
+  Handle_GEOMAlgo_Clsf myClsf;
+  TopTools_ListOfShape myLS;
+  GEOMAlgo_IndexedDataMapOfShapeState myMSS;
+};
+
+#endif
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_FinderShapeOnQuad.cxx b/src/GEOMAlgo_NEW/GEOMAlgo_FinderShapeOnQuad.cxx
index 7805ad133..2c4d0afea 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_FinderShapeOnQuad.cxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_FinderShapeOnQuad.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -89,7 +89,7 @@ GEOMAlgo_FinderShapeOnQuad::GEOMAlgo_FinderShapeOnQuad(const gp_Pnt & theTopLeft
 
 //=======================================================================
 //function : CheckData
-//purpose  : 
+//purpose  :
 //=======================================================================
 
 void GEOMAlgo_FinderShapeOnQuad::CheckData()
@@ -101,10 +101,10 @@ void GEOMAlgo_FinderShapeOnQuad::CheckData()
 
 //=======================================================================
 //function : GetPointState
-//purpose  : 
+//purpose  :
 //=======================================================================
 
-TopAbs_State GEOMAlgo_FinderShapeOnQuad::GetPointState(const gp_Pnt& aP) 
+TopAbs_State GEOMAlgo_FinderShapeOnQuad::GetPointState(const gp_Pnt& aP)
 {
   // Return IN if aP has TopAbs_IN with all sides.
   // In the case of concave quadrangle, return IN if
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_FinderShapeOnQuad.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_FinderShapeOnQuad.hxx
index d24d64c8d..e2239123b 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_FinderShapeOnQuad.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_FinderShapeOnQuad.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_GetInPlace.cxx b/src/GEOMAlgo_NEW/GEOMAlgo_GetInPlace.cxx
index 5edc9fffc..852f600e5 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_GetInPlace.cxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_GetInPlace.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_GetInPlace.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_GetInPlace.hxx
index cf3c61f0b..a8ff2a558 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_GetInPlace.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_GetInPlace.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -20,7 +20,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 // File:        GEOMAlgo_GetInPlace.hxx
-// Created:     
+// Created:
 // Author:      Peter KURNEV
 
 #ifndef _GEOMAlgo_GetInPlace_HeaderFile
@@ -47,13 +47,13 @@
 
 //=======================================================================
 /**
- * The implementation of iterator of intersected  shapes 
+ * The implementation of iterator of intersected  shapes
  * for Get In Place Algorithm.
  * The intersection is in terms of 3D bounding boxes.
  */
 //=======================================================================
 //class    : GEOMAlgo_GetInPlaceIterator
-//purpose  : 
+//purpose  :
 //=======================================================================
 class GEOMAlgo_GetInPlaceIterator  {
  public:
@@ -62,19 +62,19 @@ class GEOMAlgo_GetInPlaceIterator  {
    */
   //Standard_EXPORT
     GEOMAlgo_GetInPlaceIterator();
-  
+
   /**
    * Destructor.
    */
   //Standard_EXPORT
     virtual ~GEOMAlgo_GetInPlaceIterator();
-  
+
   /**
    * Clear the internal content.
    */
   //Standard_EXPORT
     void Clear() ;
-  
+
   /**
    * Append the pair of intersected shapes.
    * @param theCS
@@ -82,7 +82,7 @@ class GEOMAlgo_GetInPlaceIterator  {
    */
   //Standard_EXPORT
     void AppendPair(const NMTTools_CoupleOfShape& theCS) ;
-  
+
   /**
    * Initialize the iterator.
    * @param theT1
@@ -90,7 +90,7 @@ class GEOMAlgo_GetInPlaceIterator  {
    * @param theT2
    *   The type of (sub)shape Where.
    */
-  //Standard_EXPORT 
+  //Standard_EXPORT
     void Initialize(const TopAbs_ShapeEnum theT1,
 		    const TopAbs_ShapeEnum theT2) ;
   /**
@@ -98,18 +98,18 @@ class GEOMAlgo_GetInPlaceIterator  {
    * @return
    *   Standard_True if there are pairs to iterare.
    */
-  //Standard_EXPORT   
+  //Standard_EXPORT
     Standard_Boolean More() const;
-  
+
   /**
    * Shift to the next pair.
    */
   //Standard_EXPORT
     void Next() ;
-  
+
   /**
    * Returns the pair of intersected shapes.
-   * @return  
+   * @return
    *   The pair of intersected shapes.
    */
   //Standard_EXPORT
@@ -120,7 +120,7 @@ protected:
   NMTTools_ListOfCoupleOfShape myLists[10];
   NMTTools_ListOfCoupleOfShape myEmptyList;
   NMTTools_ListIteratorOfListOfCoupleOfShape myIterator;
-  
+
 private:
 };
 
@@ -128,12 +128,12 @@ private:
 //=======================================================================
 /**
  * The implementation of Get In Place Algorithm.
- * The algorithm provides the search the argument [What] 
- * in the shape [Where]. 
+ * The algorithm provides the search the argument [What]
+ * in the shape [Where].
  */
 //=======================================================================
 //class    : GEOMAlgo_GetInPlace
-//purpose  : 
+//purpose  :
 //=======================================================================
 class GEOMAlgo_GetInPlace  : public GEOMAlgo_GluerAlgo,
                              public GEOMAlgo_Algo
@@ -151,81 +151,81 @@ class GEOMAlgo_GetInPlace  : public GEOMAlgo_GluerAlgo,
     virtual ~GEOMAlgo_GetInPlace();
   /**
    * Modifier. Sets the shape where the search is intended.
-   * @param theShape 
+   * @param theShape
    *   The shape where the search is intended.
    */
   Standard_EXPORT
     virtual void SetShapeWhere(const TopoDS_Shape& theShape) ;
-  
+
   /**
    * Selector. Returns the shape where the search is intended.
-   * @return 
+   * @return
    *   The shape where the search is intended.
    */
   Standard_EXPORT
     const TopoDS_Shape& ShapeWhere() const;
-  
+
   /**
    * Modifier. Sets the tolerance of mass.
-   * @param theTol 
+   * @param theTol
    *   The value tolerance of mass.
    */
   Standard_EXPORT
     void SetTolMass(const Standard_Real theTol) ;
-  
+
   /**
    * Selector. Returns the value tolerance of mass.
-   * @return 
+   * @return
    *   The value tolerance of mass.
    */
   Standard_EXPORT
     Standard_Real TolMass() const;
-  
+
   /**
    * Modifier. Sets the tolerance of center of gravily.
-   * @param theTol 
+   * @param theTol
    *   The value tolerance of center of gravily.
    */
   Standard_EXPORT
     void SetTolCG(const Standard_Real theTol) ;
-  
+
   /**
    * Selector. Returns the tolerance of center of gravily.
-   * @return  
+   * @return
    *   The value tolerance of center of gravily.
    */
   Standard_EXPORT
     Standard_Real TolCG() const;
-  
+
   /**
    * Perform the algorithm.
    */
   Standard_EXPORT
     virtual  void Perform() ;
-  
+
   /**
    * Returns state of the search.
-   * @return  
+   * @return
    *   Standard_True if the argument is found.
    */
   Standard_EXPORT
     Standard_Boolean IsFound() const;
-  
+
   /**
    * Checks data
    */
-  Standard_EXPORT   
+  Standard_EXPORT
     virtual  void CheckData() ;
-  
+
   /**
    * Clear the internal content.
    */
   Standard_EXPORT
     virtual  void Clear() ;
-  
+
   /**
    * Returns the map of shapes IN.
-   * @return 
+   * @return
    ** Returns the map of shapes IN.
    * The Key - the (sub)shape of the argument [What].
    * The Item- the (sub)shapes of the shape [Where] that have
@@ -233,10 +233,10 @@ class GEOMAlgo_GetInPlace  : public GEOMAlgo_GluerAlgo,
   */
   Standard_EXPORT
     const GEOMAlgo_DataMapOfShapeMapOfShape& ShapesIn() const;
-   
+
   /**
    * Returns the map of shapes ON.
-   * @return 
+   * @return
    * Returns the map of shapes ON.
    * The Key - the (sub)shape of the argument [What].
    * The Item- the (sub)shapes of the shape [Where] that have
@@ -248,61 +248,61 @@ class GEOMAlgo_GetInPlace  : public GEOMAlgo_GluerAlgo,
 protected:
   Standard_EXPORT
     void Intersect() ;
-  
-  Standard_EXPORT 
+
+  Standard_EXPORT
     void PerformVV() ;
-  
-  Standard_EXPORT 
+
+  Standard_EXPORT
     void PerformVE() ;
-  
-  Standard_EXPORT  
+
+  Standard_EXPORT
     void PerformEE() ;
-  
-  Standard_EXPORT  
+
+  Standard_EXPORT
     void PerformVF() ;
-  
-  Standard_EXPORT 
+
+  Standard_EXPORT
     void PerformEF() ;
-  
-  Standard_EXPORT  
+
+  Standard_EXPORT
     void PerformFF() ;
-  
-  Standard_EXPORT  
+
+  Standard_EXPORT
     void FillEdgesOn() ;
-  
-  Standard_EXPORT   
+
+  Standard_EXPORT
     void FillFacesOn() ;
-  
-  Standard_EXPORT   
+
+  Standard_EXPORT
     void FillSolidsOn() ;
-  
-  Standard_EXPORT  
+
+  Standard_EXPORT
     void PerformZF() ;
-  
-  Standard_EXPORT  
+
+  Standard_EXPORT
     void PerformZZ() ;
-  
-  Standard_EXPORT  
+
+  Standard_EXPORT
     void FillImages() ;
-  
-  Standard_EXPORT  
+
+  Standard_EXPORT
     void FillImagesCompound(const TopoDS_Shape& theS) ;
-  
-  Standard_EXPORT  
+
+  Standard_EXPORT
     void CheckGProps() ;
-  
-  Standard_EXPORT  
+
+  Standard_EXPORT
     void CheckGProps(const TopoDS_Shape& theS) ;
-  
-  Standard_EXPORT    
+
+  Standard_EXPORT
     void FillShapesIn(const TopoDS_Shape& theS1,
 		      const TopoDS_Shape& theS2) ;
-  
-  Standard_EXPORT   
+
+  Standard_EXPORT
     void FillShapesOn(const TopoDS_Shape& theS1,
 		      const TopoDS_Shape& theS2) ;
-  
-  Standard_EXPORT 
+
+  Standard_EXPORT
     Standard_Boolean CheckCoincidence(const TopoDS_Shape& theS1,
 				      const TopoDS_Shape& theS2);
 
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_GetInPlace_1.cxx b/src/GEOMAlgo_NEW/GEOMAlgo_GetInPlace_1.cxx
index 3bdce9c51..25f418db4 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_GetInPlace_1.cxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_GetInPlace_1.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File:	GEOMAlgo_GetInPlace_1.cxx
 // Author:	Peter KURNEV
@@ -63,29 +64,29 @@
 
 
 
-static 
-  Standard_Integer PntInEdge(const TopoDS_Edge& aF, 
+static
+  Standard_Integer PntInEdge(const TopoDS_Edge& aF,
 			     gp_Pnt& aP);
-static 
-  Standard_Integer PntInEdge(const TopoDS_Edge& aF, 
+static
+  Standard_Integer PntInEdge(const TopoDS_Edge& aF,
 			     gp_Pnt& aP,
 			     Standard_Real& aT);
-static 
-  Standard_Integer PntInFace(const TopoDS_Face& aF, 
+static
+  Standard_Integer PntInFace(const TopoDS_Face& aF,
 			     gp_Pnt& aP);
-static 
-  Standard_Integer PntInFace(const TopoDS_Face& aF, 
+static
+  Standard_Integer PntInFace(const TopoDS_Face& aF,
 			     gp_Pnt& aP,
 			     gp_Pnt2d& theP2D);
-static 
-  Standard_Integer PntInSolid(const TopoDS_Solid& aZ, 
+static
+  Standard_Integer PntInSolid(const TopoDS_Solid& aZ,
 			      const Standard_Real aTol,
 			      gp_Pnt& aP);
-			      
+
 
 //=======================================================================
 //function : CheckCoincidence
-//purpose  : 
+//purpose  :
 //=======================================================================
 Standard_Boolean GEOMAlgo_GetInPlace::CheckCoincidence(const TopoDS_Shape& aS1,
 						       const TopoDS_Shape& aS2)
@@ -122,12 +123,12 @@ Standard_Boolean GEOMAlgo_GetInPlace::CheckCoincidence(const TopoDS_Shape& aS1,
     //
     else if (aType2==TopAbs_FACE) {
       const TopoDS_Face& aF2=*((TopoDS_Face*)&aS2);
-      iErr=PntInFace(aF2, aP2); 
+      iErr=PntInFace(aF2, aP2);
     }
     //
     else if (aType2==TopAbs_SOLID) {
       const TopoDS_Solid& aZ2=*((TopoDS_Solid*)&aS2);
-      iErr=PntInSolid(aZ2, myTolerance, aP2); 
+      iErr=PntInSolid(aZ2, myTolerance, aP2);
     }
     //
     else {
@@ -158,7 +159,7 @@ Standard_Boolean GEOMAlgo_GetInPlace::CheckCoincidence(const TopoDS_Shape& aS1,
       if (aDmin < myTolerance) {
 	dT=1.e-12;
 	BRep_Tool::Curve(aE1, aT1, aT2);
-        if(aT > (aT1-dT) && aT < (aT2+dT)) {  
+        if(aT > (aT1-dT) && aT < (aT2+dT)) {
 	  bOk=Standard_True;
 	}
       }
@@ -172,7 +173,7 @@ Standard_Boolean GEOMAlgo_GetInPlace::CheckCoincidence(const TopoDS_Shape& aS1,
     const TopoDS_Face& aF1=*((TopoDS_Face*)&aS1);
     //
     bOk=myContext->IsValidPointForFace(aP2, aF1, myTolerance);
-  }  
+  }
   //
   else if (aType1==TopAbs_SOLID) {
     const TopoDS_Solid& aZ1=*((TopoDS_Solid*)&aS1);
@@ -193,11 +194,11 @@ Standard_Boolean GEOMAlgo_GetInPlace::CheckCoincidence(const TopoDS_Shape& aS1,
 //
 //=======================================================================
 //function : PntInEdge
-//purpose  : 
+//purpose  :
 //=======================================================================
 Standard_Integer PntInEdge(const TopoDS_Edge& aE,
 			   gp_Pnt& aP)
-			   
+
 {
   Standard_Integer iErr;
   Standard_Real aT;
@@ -208,7 +209,7 @@ Standard_Integer PntInEdge(const TopoDS_Edge& aE,
 }
 //=======================================================================
 //function : PntInEdge
-//purpose  : 
+//purpose  :
 //=======================================================================
 Standard_Integer PntInEdge(const TopoDS_Edge& aE,
 			   gp_Pnt& aP,
@@ -228,7 +229,7 @@ Standard_Integer PntInEdge(const TopoDS_Edge& aE,
 }
 //=======================================================================
 //function : PntInSolid
-//purpose  : 
+//purpose  :
 //=======================================================================
 Standard_Integer PntInSolid(const TopoDS_Solid& aZ,
 			    const Standard_Real aTol,
@@ -239,7 +240,7 @@ Standard_Integer PntInSolid(const TopoDS_Solid& aZ,
   gp_Pnt aPx;
   gp_Pnt2d aP2Dx;
   gp_Vec aDNx;
-  
+
   TopoDS_Face aF;
   TopExp_Explorer aExp;
   //
@@ -267,24 +268,24 @@ Standard_Integer PntInSolid(const TopoDS_Solid& aZ,
 }
 //=======================================================================
 //function : PntInFace
-//purpose  : 
+//purpose  :
 //=======================================================================
-Standard_Integer PntInFace(const TopoDS_Face& aF, 
+Standard_Integer PntInFace(const TopoDS_Face& aF,
 			   gp_Pnt& aP)
 {
-  Standard_Integer iErr; 
+  Standard_Integer iErr;
   //
   gp_Pnt2d aP2Dx;
   //
-  iErr=PntInFace(aF, aP, aP2Dx); 
+  iErr=PntInFace(aF, aP, aP2Dx);
   //
   return iErr;
 }
 //=======================================================================
 //function : PntInFace
-//purpose  : 
+//purpose  :
 //=======================================================================
-Standard_Integer PntInFace(const TopoDS_Face& aF, 
+Standard_Integer PntInFace(const TopoDS_Face& aF,
 			   gp_Pnt& theP,
 			   gp_Pnt2d& theP2D)
 {
@@ -310,8 +311,8 @@ Standard_Integer PntInFace(const TopoDS_Face& aF,
   aTolTangfIntr=1.e-10;
   //
   Geom2dHatch_Intersector aIntr(aTotArcIntr, aTolTangfIntr);
-  Geom2dHatch_Hatcher aHatcher(aIntr, 
-			       aTolHatch2D, aTolHatch3D, 
+  Geom2dHatch_Hatcher aHatcher(aIntr,
+			       aTolHatch2D, aTolHatch3D,
 			       Standard_True, Standard_False);
   //
   iErr=0;
@@ -319,7 +320,7 @@ Standard_Integer PntInFace(const TopoDS_Face& aF,
   //
   aFF=aF;
   aFF.Orientation (TopAbs_FORWARD);
-  // 
+  //
   aS=BRep_Tool::Surface(aFF);
   BRepTools::UVBounds(aFF, aUMin, aUMax, aVMin, aVMax);
   //
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_GetInPlace_2.cxx b/src/GEOMAlgo_NEW/GEOMAlgo_GetInPlace_2.cxx
index 7378e0e51..3114f3688 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_GetInPlace_2.cxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_GetInPlace_2.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -20,7 +20,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 // File:	GEOMAlgo_GetInPlace_2.cxx
-// Created:	
+// Created:
 // Author:	Peter KURNEV
 
 #include <GEOMAlgo_GetInPlace.hxx>
@@ -50,12 +50,12 @@
 static
   Standard_Integer Dimension(const TopAbs_ShapeEnum aType);
 static
-  void PointProperties(const TopoDS_Shape& aS, 
+  void PointProperties(const TopoDS_Shape& aS,
 		       GProp_GProps& aGProps);
 
 //=======================================================================
 //function : CheckGProps
-//purpose  : 
+//purpose  :
 //=======================================================================
 void GEOMAlgo_GetInPlace::CheckGProps()
 {
@@ -64,7 +64,7 @@ void GEOMAlgo_GetInPlace::CheckGProps()
 }
 //=======================================================================
 //function : CheckGProps
-//purpose  : 
+//purpose  :
 //=======================================================================
 void GEOMAlgo_GetInPlace::CheckGProps(const TopoDS_Shape& aS1)
 {
@@ -154,7 +154,7 @@ void GEOMAlgo_GetInPlace::CheckGProps(const TopoDS_Shape& aS1)
 }
 //=======================================================================
 //function : Dimension
-//purpose  : 
+//purpose  :
 //=======================================================================
 Standard_Integer Dimension(const TopAbs_ShapeEnum aType)
 {
@@ -184,10 +184,10 @@ Standard_Integer Dimension(const TopAbs_ShapeEnum aType)
 }
 //=======================================================================
 //class : GEOMAlgo_GProps
-//purpose  : 
+//purpose  :
 //=======================================================================
 class GEOMAlgo_GProps : public GProp_GProps {
- public: 
+ public:
   GEOMAlgo_GProps() : GProp_GProps() {
   };
   //
@@ -207,10 +207,10 @@ class GEOMAlgo_GProps : public GProp_GProps {
 };
 //=======================================================================
 //function : PointProperties
-//purpose  : 
+//purpose  :
 //=======================================================================
 void PointProperties(const TopoDS_Shape& aS, GProp_GProps& aGProps)
-{ 
+{
   Standard_Integer i, aNbS;
   Standard_Real aDensity;
   gp_Pnt aPX;
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_GetInPlace_3.cxx b/src/GEOMAlgo_NEW/GEOMAlgo_GetInPlace_3.cxx
index 6f86b5442..3cc870da4 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_GetInPlace_3.cxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_GetInPlace_3.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -20,7 +20,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 // File:	GEOMAlgo_GetInPlaceIterator.cxx
-// Created:	
+// Created:
 // Author:	Peter KURNEV
 
 #include <GEOMAlgo_GetInPlace.hxx>
@@ -32,8 +32,8 @@ static
 				 const TopAbs_ShapeEnum aType2);
 
 //=======================================================================
-//function : 
-//purpose  : 
+//function :
+//purpose  :
 //=======================================================================
 GEOMAlgo_GetInPlaceIterator::GEOMAlgo_GetInPlaceIterator()
 {
@@ -41,14 +41,14 @@ GEOMAlgo_GetInPlaceIterator::GEOMAlgo_GetInPlaceIterator()
 }
 //=======================================================================
 //function : ~
-//purpose  : 
+//purpose  :
 //=======================================================================
 GEOMAlgo_GetInPlaceIterator::~GEOMAlgo_GetInPlaceIterator()
 {
 }
 //=======================================================================
 //function : Clear
-//purpose  : 
+//purpose  :
 //=======================================================================
 void GEOMAlgo_GetInPlaceIterator::Clear()
 {
@@ -60,7 +60,7 @@ void GEOMAlgo_GetInPlaceIterator::Clear()
 }
 //=======================================================================
 //function : AppendPair
-//purpose  : 
+//purpose  :
 //=======================================================================
 void GEOMAlgo_GetInPlaceIterator::AppendPair(const NMTTools_CoupleOfShape& theCS)
 {
@@ -79,7 +79,7 @@ void GEOMAlgo_GetInPlaceIterator::AppendPair(const NMTTools_CoupleOfShape& theCS
 }
 //=======================================================================
 //function : ShapeWhere
-//purpose  : 
+//purpose  :
 //=======================================================================
 void GEOMAlgo_GetInPlaceIterator::Initialize(const TopAbs_ShapeEnum aType1,
 					     const TopAbs_ShapeEnum aType2)
@@ -96,7 +96,7 @@ void GEOMAlgo_GetInPlaceIterator::Initialize(const TopAbs_ShapeEnum aType1,
 }
 //=======================================================================
 // function: More
-// purpose: 
+// purpose:
 //=======================================================================
 Standard_Boolean GEOMAlgo_GetInPlaceIterator::More()const
 {
@@ -104,7 +104,7 @@ Standard_Boolean GEOMAlgo_GetInPlaceIterator::More()const
 }
 //=======================================================================
 // function: Next
-// purpose: 
+// purpose:
 //=======================================================================
 void GEOMAlgo_GetInPlaceIterator::Next()
 {
@@ -112,7 +112,7 @@ void GEOMAlgo_GetInPlaceIterator::Next()
 }
 //=======================================================================
 // function: Value
-// purpose: 
+// purpose:
 //=======================================================================
 const NMTTools_CoupleOfShape& GEOMAlgo_GetInPlaceIterator::Value()const
 {
@@ -120,7 +120,7 @@ const NMTTools_CoupleOfShape& GEOMAlgo_GetInPlaceIterator::Value()const
 }
 //=======================================================================
 //function : TypeToInteger
-//purpose  : 
+//purpose  :
 //=======================================================================
 Standard_Integer TypeToInteger(const TopAbs_ShapeEnum aType1,
 			       const TopAbs_ShapeEnum aType2)
@@ -168,5 +168,5 @@ Standard_Integer TypeToInteger(const TopAbs_ShapeEnum aType1,
       iRet=9;
     }
   }
-  return iRet; 
+  return iRet;
 }
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_GlueAnalyser.cxx b/src/GEOMAlgo_NEW/GEOMAlgo_GlueAnalyser.cxx
index 1f5999aa6..1d5b99e36 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_GlueAnalyser.cxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_GlueAnalyser.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File:        GEOMAlgo_GlueDetector.cxx
 // Created:     Wed Dec 15 11:08:09 2004
@@ -60,8 +61,8 @@
 #include <BRepBndLib.hxx>
 
 //=======================================================================
-//function : 
-//purpose  : 
+//function :
+//purpose  :
 //=======================================================================
   GEOMAlgo_GlueAnalyser::GEOMAlgo_GlueAnalyser()
 :
@@ -69,13 +70,13 @@
 {}
 //=======================================================================
 //function : ~
-//purpose  : 
+//purpose  :
 //=======================================================================
   GEOMAlgo_GlueAnalyser::~GEOMAlgo_GlueAnalyser()
 {}
 //=======================================================================
 //function : HasSolidsToGlue
-//purpose  : 
+//purpose  :
 //=======================================================================
   Standard_Boolean GEOMAlgo_GlueAnalyser::HasSolidsToGlue()const
 {
@@ -83,7 +84,7 @@
 }
 //=======================================================================
 //function : HasSolidsAlone
-//purpose  : 
+//purpose  :
 //=======================================================================
   Standard_Boolean GEOMAlgo_GlueAnalyser::HasSolidsAlone()const
 {
@@ -91,7 +92,7 @@
 }
 //=======================================================================
 //function : SolidsToGlue
-//purpose  : 
+//purpose  :
 //=======================================================================
   const GEOMAlgo_ListOfCoupleOfShapes& GEOMAlgo_GlueAnalyser::SolidsToGlue()const
 {
@@ -99,7 +100,7 @@
 }
 //=======================================================================
 //function : SolidsAlone
-//purpose  : 
+//purpose  :
 //=======================================================================
   const TopTools_ListOfShape& GEOMAlgo_GlueAnalyser::SolidsAlone()const
 {
@@ -107,7 +108,7 @@
 }
 //=======================================================================
 //function : Perform
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_GlueAnalyser::Perform()
 {
@@ -152,7 +153,7 @@
 }
 //=======================================================================
 //function : DetectVertices
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_GlueAnalyser::DetectVertices()
 {
@@ -183,11 +184,11 @@
     const TopoDS_Shape& aV=aMV(i);
     Bnd_Box aBox;
     //
-    aBox.SetGap(myTol); 
+    aBox.SetGap(myTol);
     BRepBndLib::Add(aV, aBox);
     aHAB->SetValue(i, aBox);
     aMIS.Add(i, aV);
-    aMSB.Add(aV, aBox); 
+    aMSB.Add(aV, aBox);
   }
   //
   aBSB.Initialize(aHAB);
@@ -203,7 +204,7 @@
     const TColStd_ListOfInteger& aLI=aBSB.Compare(aBoxV);
     aNbVSD=aLI.Extent();
     if (!aNbVSD) {
-      myErrorStatus=3; // it must not be 
+      myErrorStatus=3; // it must not be
       return;
     }
     //
@@ -239,7 +240,7 @@
 }
 //=======================================================================
 //function : DetectFaces
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_GlueAnalyser::DetectFaces()
 {
@@ -247,7 +248,7 @@
 }
 //=======================================================================
 //function : DetectEdges
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_GlueAnalyser::DetectEdges()
 {
@@ -255,7 +256,7 @@
 }
 //=======================================================================
 //function : DetectShapes
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_GlueAnalyser::DetectShapes(const TopAbs_ShapeEnum aType)
 {
@@ -273,7 +274,7 @@
   aNbF=aMF.Extent();
   for (i=1; i<=aNbF; ++i) {
     const TopoDS_Shape& aS=aMF(i);
-    // 
+    //
     //aPKF.Clear();//qft
     if (aType==TopAbs_FACE) {
       const TopoDS_Face& aF=TopoDS::Face(aS);
@@ -333,7 +334,7 @@
 }
 //=======================================================================
 //function : DetectSolids
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_GlueAnalyser::DetectSolids()
 {
@@ -406,7 +407,7 @@
   //
   mySolidsToGlue.Clear();
   mySolidsAlone.Clear();
-  
+
   //
   aNbC=aMPKLS.Extent();
   if (!aNbC) {
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_GlueAnalyser.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_GlueAnalyser.hxx
index d79c8294f..359407edb 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_GlueAnalyser.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_GlueAnalyser.hxx
@@ -1,86 +1,87 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
-// File:        GEOMAlgo_GlueDetector.hxx
-// Created:     Wed Dec 15 11:08:09 2004
-// Author:      Peter KURNEV
-
-#ifndef _GEOMAlgo_GlueAnalyser_HeaderFile
-#define _GEOMAlgo_GlueAnalyser_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_Macro.hxx>
-#include <GEOMAlgo_ListOfCoupleOfShapes.hxx>
-#include <TopTools_ListOfShape.hxx>
-#include <GEOMAlgo_Gluer.hxx>
-#include <Standard_Boolean.hxx>
-#include <TopAbs_ShapeEnum.hxx>
-
-//=======================================================================
-//function : GEOMAlgo_GlueAnalyser
-//purpose  : 
-//=======================================================================
-class GEOMAlgo_GlueAnalyser  : public GEOMAlgo_Gluer 
-{
- public:
-  Standard_EXPORT
-    GEOMAlgo_GlueAnalyser();
-
-  Standard_EXPORT
-    virtual ~GEOMAlgo_GlueAnalyser();
-  
-  Standard_EXPORT
-    virtual  void Perform() ;
-  
-  Standard_EXPORT
-    Standard_Boolean HasSolidsToGlue() const;
-  
-  Standard_EXPORT
-    const GEOMAlgo_ListOfCoupleOfShapes& SolidsToGlue() const;
-  
-  Standard_EXPORT
-    Standard_Boolean HasSolidsAlone() const;
-  
-  Standard_EXPORT
-    const TopTools_ListOfShape& SolidsAlone() const;
-
- protected:
-  Standard_EXPORT
-    void DetectVertices() ;
-  
-  Standard_EXPORT
-    void DetectEdges() ;
-  
-  Standard_EXPORT
-    void DetectFaces() ;
-  
-  Standard_EXPORT
-    void DetectShapes(const TopAbs_ShapeEnum aType) ;
-  
-  Standard_EXPORT
-    void DetectSolids() ;
-
-
-  GEOMAlgo_ListOfCoupleOfShapes mySolidsToGlue;
-  TopTools_ListOfShape mySolidsAlone;
-};
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File:        GEOMAlgo_GlueDetector.hxx
+// Created:     Wed Dec 15 11:08:09 2004
+// Author:      Peter KURNEV
+
+#ifndef _GEOMAlgo_GlueAnalyser_HeaderFile
+#define _GEOMAlgo_GlueAnalyser_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Macro.hxx>
+#include <GEOMAlgo_ListOfCoupleOfShapes.hxx>
+#include <TopTools_ListOfShape.hxx>
+#include <GEOMAlgo_Gluer.hxx>
+#include <Standard_Boolean.hxx>
+#include <TopAbs_ShapeEnum.hxx>
+
+//=======================================================================
+//function : GEOMAlgo_GlueAnalyser
+//purpose  :
+//=======================================================================
+class GEOMAlgo_GlueAnalyser  : public GEOMAlgo_Gluer
+{
+ public:
+  Standard_EXPORT
+    GEOMAlgo_GlueAnalyser();
+
+  Standard_EXPORT
+    virtual ~GEOMAlgo_GlueAnalyser();
+
+  Standard_EXPORT
+    virtual  void Perform() ;
+
+  Standard_EXPORT
+    Standard_Boolean HasSolidsToGlue() const;
+
+  Standard_EXPORT
+    const GEOMAlgo_ListOfCoupleOfShapes& SolidsToGlue() const;
+
+  Standard_EXPORT
+    Standard_Boolean HasSolidsAlone() const;
+
+  Standard_EXPORT
+    const TopTools_ListOfShape& SolidsAlone() const;
+
+ protected:
+  Standard_EXPORT
+    void DetectVertices() ;
+
+  Standard_EXPORT
+    void DetectEdges() ;
+
+  Standard_EXPORT
+    void DetectFaces() ;
+
+  Standard_EXPORT
+    void DetectShapes(const TopAbs_ShapeEnum aType) ;
+
+  Standard_EXPORT
+    void DetectSolids() ;
+
+
+  GEOMAlgo_ListOfCoupleOfShapes mySolidsToGlue;
+  TopTools_ListOfShape mySolidsAlone;
+};
+
+#endif
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_GlueDetector.cxx b/src/GEOMAlgo_NEW/GEOMAlgo_GlueDetector.cxx
index 9ad02088c..fb8d5dfdc 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_GlueDetector.cxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_GlueDetector.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File:        GEOMAlgo_GlueDetector.cxx
 // Author:      Peter KURNEV
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_GlueDetector.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_GlueDetector.hxx
index 459d24d4e..dc588eacd 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_GlueDetector.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_GlueDetector.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File:        GEOMAlgo_GlueDetector.hxx
 // Author:      Peter KURNEV
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_Gluer.cxx b/src/GEOMAlgo_NEW/GEOMAlgo_Gluer.cxx
index a57d23644..322d1ba31 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_Gluer.cxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_Gluer.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -84,7 +84,7 @@
 
 #include <GEOMAlgo_IndexedDataMapOfIntegerShape.hxx>
 #include <GEOMAlgo_IndexedDataMapOfShapeBox.hxx>
-#include <GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape.hxx> 
+#include <GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape.hxx>
 #include <GEOMAlgo_PassKeyShape.hxx>
 #include <GEOMAlgo_Tools.hxx>
 //
@@ -94,13 +94,13 @@
 #include <NMTDS_IndexedDataMapOfShapeBndSphere.hxx>
 
 //
-static 
+static
   void GetSubShapes(const TopoDS_Shape& aS,
 		    TopTools_IndexedMapOfShape& aMSS);
 
 //=======================================================================
 //function : GEOMAlgo_Gluer
-//purpose  : 
+//purpose  :
 //=======================================================================
 GEOMAlgo_Gluer::GEOMAlgo_Gluer()
 :
@@ -114,14 +114,14 @@ GEOMAlgo_Gluer::GEOMAlgo_Gluer()
 }
 //=======================================================================
 //function : ~GEOMAlgo_Gluer
-//purpose  : 
+//purpose  :
 //=======================================================================
 GEOMAlgo_Gluer::~GEOMAlgo_Gluer()
 {
 }
 //=======================================================================
 //function : SetCheckGeometry
-//purpose  : 
+//purpose  :
 //=======================================================================
 void GEOMAlgo_Gluer::SetCheckGeometry(const Standard_Boolean aFlag)
 {
@@ -129,7 +129,7 @@ void GEOMAlgo_Gluer::SetCheckGeometry(const Standard_Boolean aFlag)
 }
 //=======================================================================
 //function : CheckGeometry
-//purpose  : 
+//purpose  :
 //=======================================================================
 Standard_Boolean GEOMAlgo_Gluer::CheckGeometry() const
 {
@@ -137,7 +137,7 @@ Standard_Boolean GEOMAlgo_Gluer::CheckGeometry() const
 }
 //=======================================================================
 //function : SetKeepNonSolids
-//purpose  : 
+//purpose  :
 //=======================================================================
 void GEOMAlgo_Gluer::SetKeepNonSolids(const Standard_Boolean aFlag)
 {
@@ -145,15 +145,15 @@ void GEOMAlgo_Gluer::SetKeepNonSolids(const Standard_Boolean aFlag)
 }
 //=======================================================================
 //function : KeepNonSolids
-//purpose  : 
+//purpose  :
 //=======================================================================
-Standard_Boolean GEOMAlgo_Gluer::KeepNonSolids()const 
+Standard_Boolean GEOMAlgo_Gluer::KeepNonSolids()const
 {
   return myKeepNonSolids;
 }
 //=======================================================================
 //function : AloneShapes
-//purpose  : 
+//purpose  :
 //=======================================================================
 Standard_Integer GEOMAlgo_Gluer::AloneShapes()const
 {
@@ -161,7 +161,7 @@ Standard_Integer GEOMAlgo_Gluer::AloneShapes()const
 }
 //=======================================================================
 //function : Images
-//purpose  : 
+//purpose  :
 //=======================================================================
 const TopTools_DataMapOfShapeListOfShape& GEOMAlgo_Gluer::Images()const
 {
@@ -169,7 +169,7 @@ const TopTools_DataMapOfShapeListOfShape& GEOMAlgo_Gluer::Images()const
 }
 //=======================================================================
 //function : Origins
-//purpose  : 
+//purpose  :
 //=======================================================================
 const TopTools_DataMapOfShapeShape& GEOMAlgo_Gluer::Origins()const
 {
@@ -177,7 +177,7 @@ const TopTools_DataMapOfShapeShape& GEOMAlgo_Gluer::Origins()const
 }
 //=======================================================================
 //function : Perform
-//purpose  : 
+//purpose  :
 //=======================================================================
 void GEOMAlgo_Gluer::Perform()
 {
@@ -207,7 +207,7 @@ void GEOMAlgo_Gluer::Perform()
 
 //=======================================================================
 //function : MakeVertices
-//purpose  : 
+//purpose  :
 //=======================================================================
 void GEOMAlgo_Gluer::MakeVertices()
 {
@@ -254,7 +254,7 @@ void GEOMAlgo_Gluer::MakeVertices()
     aTreeFiller.Add(i, aBox);
     //
     aMIS.Add(i, aV);
-    aMSB.Add(aV, aBox); 
+    aMSB.Add(aV, aBox);
   }
   //
   aTreeFiller.Fill();
@@ -294,7 +294,7 @@ void GEOMAlgo_Gluer::MakeVertices()
 	//
 	aNbVSD=aBBTree.Select(aSelector);
 	if (!aNbVSD) {
-	  continue;  // it must not be 
+	  continue;  // it must not be
 	}
 	//
 	const TColStd_ListOfInteger& aLI=aSelector.Indices();
@@ -398,7 +398,7 @@ void GEOMAlgo_Gluer::MakeVertices()
 }
 //=======================================================================
 //function : MakeSubShapes
-//purpose  : 
+//purpose  :
 //=======================================================================
 void GEOMAlgo_Gluer::MakeSubShapes (const TopoDS_Shape&  theShape,
                                     TopTools_MapOfShape& theMS,
@@ -503,7 +503,7 @@ void GEOMAlgo_Gluer::MakeSubShapes (const TopoDS_Shape&  theShape,
 }
 //=======================================================================
 //function : MakeSolids
-//purpose  : 
+//purpose  :
 //=======================================================================
 void GEOMAlgo_Gluer::MakeSolids()
 {
@@ -527,7 +527,7 @@ void GEOMAlgo_Gluer::MakeSolids()
 }
 //=======================================================================
 //function : MakeShells
-//purpose  : 
+//purpose  :
 //=======================================================================
 void GEOMAlgo_Gluer::MakeShells()
 {
@@ -575,7 +575,7 @@ void GEOMAlgo_Gluer::MakeShells()
 }
 //=======================================================================
 //function : MakeFaces
-//purpose  : 
+//purpose  :
 //=======================================================================
 void GEOMAlgo_Gluer::MakeFaces()
 {
@@ -583,7 +583,7 @@ void GEOMAlgo_Gluer::MakeFaces()
 }
 //=======================================================================
 //function : MakeEdges
-//purpose  : 
+//purpose  :
 //=======================================================================
 void GEOMAlgo_Gluer::MakeEdges()
 {
@@ -591,7 +591,7 @@ void GEOMAlgo_Gluer::MakeEdges()
 }
 //=======================================================================
 //function : MakeShapes
-//purpose  : 
+//purpose  :
 //=======================================================================
 void GEOMAlgo_Gluer::MakeShapes(const TopAbs_ShapeEnum aType)
 {
@@ -610,7 +610,7 @@ void GEOMAlgo_Gluer::MakeShapes(const TopAbs_ShapeEnum aType)
   aNbF=aMF.Extent();
   for (i=1; i<=aNbF; ++i) {
     const TopoDS_Shape& aS=aMF(i);
-    // 
+    //
     if (aType==TopAbs_FACE) {
       const TopoDS_Face& aF=TopoDS::Face(aS);
       FacePassKey(aF, aPKF);
@@ -637,7 +637,7 @@ void GEOMAlgo_Gluer::MakeShapes(const TopAbs_ShapeEnum aType)
   }
   // check geometric coincidence
   if (myCheckGeometry) {
-    iErr=GEOMAlgo_Tools::RefineSDShapes(aMPKLF, myTol, myContext); 
+    iErr=GEOMAlgo_Tools::RefineSDShapes(aMPKLF, myTol, myContext);
     if (iErr) {
       myErrorStatus=200;
       return;
@@ -667,7 +667,7 @@ void GEOMAlgo_Gluer::MakeShapes(const TopAbs_ShapeEnum aType)
       }
     }
     //
-    if (bHasNewSubShape) { 
+    if (bHasNewSubShape) {
       if (aType==TopAbs_FACE) {
 	TopoDS_Face aNewFace;
 	//
@@ -697,7 +697,7 @@ void GEOMAlgo_Gluer::MakeShapes(const TopAbs_ShapeEnum aType)
 }
 //=======================================================================
 //function : CheckResult
-//purpose  : 
+//purpose  :
 //=======================================================================
 void GEOMAlgo_Gluer::CheckResult()
 {
@@ -705,9 +705,9 @@ void GEOMAlgo_Gluer::CheckResult()
   //
   if (myResult.IsNull()) {
     myErrorStatus=6;
-    return; 
+    return;
   }
-  // 
+  //
   Standard_Boolean bFound;
   Standard_Integer i, j, aNbS, aNbFS, aNbSx;
   TopTools_IndexedMapOfShape aMS, aMFS;
@@ -716,7 +716,7 @@ void GEOMAlgo_Gluer::CheckResult()
   TopExp::MapShapesAndAncestors(myResult, TopAbs_FACE, TopAbs_SOLID, aMFR);
   TopExp::MapShapes(myResult, TopAbs_SOLID, aMS);
   //
-  
+
   myNbAlone=0;
   aNbS=aMS.Extent();
   for (i=1; i<=aNbS; ++i) {
@@ -748,7 +748,7 @@ void GEOMAlgo_Gluer::CheckResult()
 }
 //=======================================================================
 //function : CheckData
-//purpose  : 
+//purpose  :
 //=======================================================================
 void GEOMAlgo_Gluer::CheckData()
 {
@@ -756,12 +756,12 @@ void GEOMAlgo_Gluer::CheckData()
   //
   if (myShape.IsNull()) {
     myErrorStatus=5;
-    return; 
+    return;
   }
 }
 //=======================================================================
 //function : InnerTolerance
-//purpose  : 
+//purpose  :
 //=======================================================================
 void GEOMAlgo_Gluer::InnerTolerance()
 {
@@ -794,9 +794,9 @@ void GEOMAlgo_Gluer::InnerTolerance()
 }
 //=======================================================================
 //function : FacePassKey
-//purpose  : 
+//purpose  :
 //=======================================================================
-void GEOMAlgo_Gluer::FacePassKey(const TopoDS_Face& aF, 
+void GEOMAlgo_Gluer::FacePassKey(const TopoDS_Face& aF,
 				 GEOMAlgo_PassKeyShape& aPK)
 {
   Standard_Integer i, aNbE;
@@ -819,9 +819,9 @@ void GEOMAlgo_Gluer::FacePassKey(const TopoDS_Face& aF,
 }
 //=======================================================================
 //function : EdgePassKey
-//purpose  : 
+//purpose  :
 //=======================================================================
-void GEOMAlgo_Gluer::EdgePassKey(const TopoDS_Edge& aE, 
+void GEOMAlgo_Gluer::EdgePassKey(const TopoDS_Edge& aE,
 				 GEOMAlgo_PassKeyShape& aPK)
 {
   TopoDS_Vertex aV1, aV2;
@@ -838,9 +838,9 @@ void GEOMAlgo_Gluer::EdgePassKey(const TopoDS_Edge& aE,
 }
 //=======================================================================
 //function : MakeVertex
-//purpose  : 
+//purpose  :
 //=======================================================================
-void GEOMAlgo_Gluer::MakeVertex(const TopTools_ListOfShape& aLV, 
+void GEOMAlgo_Gluer::MakeVertex(const TopTools_ListOfShape& aLV,
 				TopoDS_Vertex& aNewVertex)
 {
   Standard_Integer aNbV;
@@ -884,9 +884,9 @@ void GEOMAlgo_Gluer::MakeVertex(const TopTools_ListOfShape& aLV,
 }
 //=======================================================================
 //function : MakeEdge
-//purpose  : 
+//purpose  :
 //=======================================================================
-void GEOMAlgo_Gluer::MakeEdge(const TopoDS_Edge& aE, 
+void GEOMAlgo_Gluer::MakeEdge(const TopoDS_Edge& aE,
 			      TopoDS_Edge& aNewEdge)
 {
   myErrorStatus=0;
@@ -933,14 +933,14 @@ void GEOMAlgo_Gluer::MakeEdge(const TopoDS_Edge& aE,
   }
   //
   else {
-    BOPTools_Tools::MakeSplitEdge(aEx, aVR1, aT1, aVR2, aT2, aNewEdge); 
+    BOPTools_Tools::MakeSplitEdge(aEx, aVR1, aT1, aVR2, aT2, aNewEdge);
   }
 }
 //=======================================================================
 //function : MakeFace
-//purpose  : 
+//purpose  :
 //=======================================================================
-void GEOMAlgo_Gluer::MakeFace(const TopoDS_Face& aF, 
+void GEOMAlgo_Gluer::MakeFace(const TopoDS_Face& aF,
 			      TopoDS_Face& aNewFace)
 {
   myErrorStatus=0;
@@ -982,8 +982,8 @@ void GEOMAlgo_Gluer::MakeFace(const TopoDS_Face& aF,
 	  GEOMAlgo_Tools::RefinePCurveForEdgeOnFace(aER, aFFWD, aUMin, aUMax);
 	}
 	BOPTools_Tools2D::BuildPCurveForEdgeOnFace(aER, aFFWD);
-	
-	// orient image 
+
+	// orient image
 	bIsToReverse=BOPTools_Tools3D::IsSplitToReverse1(aER, aE, myContext);
 	if (bIsToReverse) {
 	  aER.Reverse();
@@ -1008,7 +1008,7 @@ void GEOMAlgo_Gluer::MakeFace(const TopoDS_Face& aF,
 }
 //=======================================================================
 //function : IsToReverse
-//purpose  : 
+//purpose  :
 //=======================================================================
 Standard_Boolean GEOMAlgo_Gluer::IsToReverse(const TopoDS_Face& aFR,
 					     const TopoDS_Face& aF)
@@ -1054,7 +1054,7 @@ Standard_Boolean GEOMAlgo_Gluer::IsToReverse(const TopoDS_Face& aFR,
 }
 //=======================================================================
 //function : HasNewSubShape
-//purpose  : 
+//purpose  :
 //=======================================================================
 Standard_Boolean GEOMAlgo_Gluer::HasNewSubShape(const TopoDS_Shape& aS)const
 {
@@ -1087,7 +1087,7 @@ Standard_Boolean GEOMAlgo_Gluer::HasNewSubShape(const TopoDS_Shape& aS)const
 }
 //=======================================================================
 //function : GetSubShapes
-//purpose  : 
+//purpose  :
 //=======================================================================
 void GetSubShapes(const TopoDS_Shape& aS,
 		  TopTools_IndexedMapOfShape& aMSS)
@@ -1111,9 +1111,9 @@ void GetSubShapes(const TopoDS_Shape& aS,
 }
 //=======================================================================
 //function : Modified
-//purpose  : 
+//purpose  :
 //=======================================================================
-const TopTools_ListOfShape& GEOMAlgo_Gluer::Modified (const TopoDS_Shape& aS) 
+const TopTools_ListOfShape& GEOMAlgo_Gluer::Modified (const TopoDS_Shape& aS)
 {
   TopAbs_ShapeEnum aType;
   //
@@ -1121,11 +1121,11 @@ const TopTools_ListOfShape& GEOMAlgo_Gluer::Modified (const TopoDS_Shape& aS)
   //
   aType=aS.ShapeType();
   if (aType==TopAbs_VERTEX ||
-      aType==TopAbs_EDGE   || 
-      aType==TopAbs_WIRE   || 
-      aType==TopAbs_FACE   || 
-      aType==TopAbs_SHELL  || 
-      aType==TopAbs_SOLID) {  
+      aType==TopAbs_EDGE   ||
+      aType==TopAbs_WIRE   ||
+      aType==TopAbs_FACE   ||
+      aType==TopAbs_SHELL  ||
+      aType==TopAbs_SOLID) {
     if(myOrigins.IsBound(aS)) {
       const TopoDS_Shape& aSnew=myOrigins.Find(aS);
       if (!aSnew.IsSame(aS)) {
@@ -1138,7 +1138,7 @@ const TopTools_ListOfShape& GEOMAlgo_Gluer::Modified (const TopoDS_Shape& aS)
 }
 //=======================================================================
 //function : Generated
-//purpose  : 
+//purpose  :
 //=======================================================================
 const TopTools_ListOfShape& GEOMAlgo_Gluer::Generated(const TopoDS_Shape& )
 {
@@ -1147,7 +1147,7 @@ const TopTools_ListOfShape& GEOMAlgo_Gluer::Generated(const TopoDS_Shape& )
 }
 //=======================================================================
 //function : IsDeleted
-//purpose  : 
+//purpose  :
 //=======================================================================
 Standard_Boolean GEOMAlgo_Gluer::IsDeleted (const TopoDS_Shape& aS)
 {
@@ -1162,7 +1162,7 @@ Standard_Boolean GEOMAlgo_Gluer::IsDeleted (const TopoDS_Shape& aS)
 //
 // ErrorStatus
 //
-// 1   - the object is just initialized 
+// 1   - the object is just initialized
 // 2   - no vertices found in source shape
 // 3   - nb same domain vertices for the vertex Vi =0
 // 4   - nb same domain edges(faces) for the edge Ei(face Fi)  =0
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_Gluer.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_Gluer.hxx
index ee7db356e..406004e7c 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_Gluer.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_Gluer.hxx
@@ -1,164 +1,164 @@
-
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-
-// File:	GEOMAlgo_Gluer.hxx
-// Created:	Sat Dec 04 12:45:53 2004
-// Author:	Peter KURNEV
-//		<peter@PREFEX>
-//
-#ifndef _GEOMAlgo_Gluer_HeaderFile
-#define _GEOMAlgo_Gluer_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_Macro.hxx>
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
-#include <TopTools_DataMapOfShapeListOfShape.hxx>
-#include <TopTools_DataMapOfShapeShape.hxx>
-#include <Standard_Integer.hxx>
-#include <TopTools_ListOfShape.hxx>
-#include <GEOMAlgo_ShapeAlgo.hxx>
-#include <TopAbs_ShapeEnum.hxx>
-#include <TopoDS_Shape.hxx>
-#include <TopoDS_Edge.hxx>
-#include <TopoDS_Face.hxx>
-#include <TopoDS_Vertex.hxx>
-#include <GEOMAlgo_PassKeyShape.hxx>
-#include <TopTools_MapOfShape.hxx>
-#include <TopoDS_Compound.hxx>
-
-//=======================================================================
-//class    : GEOMAlgo_Gluer
-//purpose  : 
-//=======================================================================
-class GEOMAlgo_Gluer  : public GEOMAlgo_ShapeAlgo {
-public:
-  Standard_EXPORT
-    GEOMAlgo_Gluer();
-
-  Standard_EXPORT
-    virtual ~GEOMAlgo_Gluer();
-  
-  Standard_EXPORT
-    void SetCheckGeometry(const Standard_Boolean aFlag) ;
-  
-  Standard_EXPORT
-    Standard_Boolean CheckGeometry() const;
-  
-  Standard_EXPORT
-    void SetKeepNonSolids(const Standard_Boolean aFlag) ;
-  
-  Standard_EXPORT
-    Standard_Boolean KeepNonSolids() const;
-  
-  Standard_EXPORT
-    virtual  void Perform() ;
-  
-  Standard_EXPORT
-    Standard_Integer AloneShapes() const;
-  
-  Standard_EXPORT
-    const TopTools_ListOfShape& Modified(const TopoDS_Shape& S) ;
-  
-  Standard_EXPORT
-    const TopTools_ListOfShape& Generated(const TopoDS_Shape& S) ;
-  
-  Standard_EXPORT
-    Standard_Boolean IsDeleted(const TopoDS_Shape& S) ;
-  
-  Standard_EXPORT
-    const TopTools_DataMapOfShapeListOfShape& Images() const;
-  
-  Standard_EXPORT
-    const TopTools_DataMapOfShapeShape& Origins() const;
-
- protected:
-  Standard_EXPORT
-    virtual  void CheckData() ;
-  
-  Standard_EXPORT
-    virtual  void CheckResult() ;
-  
-  Standard_EXPORT
-    void MakeVertices() ;
-  
-  Standard_EXPORT
-    void MakeEdges() ;
-  
-  Standard_EXPORT
-    void MakeFaces() ;
-  
-  Standard_EXPORT
-    void MakeShapes(const TopAbs_ShapeEnum aType) ;
-  
-  Standard_EXPORT
-    void MakeShells() ;
-  
-  Standard_EXPORT
-    void MakeSolids() ;
-  
-  Standard_EXPORT
-    void InnerTolerance() ;
-  
-  Standard_EXPORT
-    void EdgePassKey(const TopoDS_Edge& aE,
-		     GEOMAlgo_PassKeyShape& aPK) ;
-  
-  Standard_EXPORT
-    void FacePassKey(const TopoDS_Face& aF,
-		     GEOMAlgo_PassKeyShape& aPK) ;
-  
-  Standard_EXPORT
-    void MakeVertex(const TopTools_ListOfShape& aLV,
-		    TopoDS_Vertex& aNewV) ;
-  
-  Standard_EXPORT
-    void MakeEdge(const TopoDS_Edge& aEdge,
-		  TopoDS_Edge& aNewEdge) ;
-  
-  Standard_EXPORT
-    void MakeFace(const TopoDS_Face& aFace,
-		  TopoDS_Face& aNewEdge) ;
-  
-  Standard_EXPORT
-    Standard_Boolean IsToReverse(const TopoDS_Face& aFR,
-				 const TopoDS_Face& aF) ;
-  
-  Standard_EXPORT
-    Standard_Boolean HasNewSubShape(const TopoDS_Shape& aS) const;
-  
-  Standard_EXPORT
-    void MakeSubShapes(const TopoDS_Shape& aS,
-		       TopTools_MapOfShape& aM,
-		       TopoDS_Compound& aC) ;
-
-
-  Standard_Boolean myCheckGeometry;
-  Standard_Boolean myKeepNonSolids;
-  Standard_Real myTol;
-  TopTools_DataMapOfShapeListOfShape myImages;
-  TopTools_DataMapOfShapeShape myOrigins;
-  Standard_Integer myNbAlone;
-  TopTools_ListOfShape myGenerated;
-};
-#endif
+
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File:	GEOMAlgo_Gluer.hxx
+// Created:	Sat Dec 04 12:45:53 2004
+// Author:	Peter KURNEV
+//		<peter@PREFEX>
+//
+#ifndef _GEOMAlgo_Gluer_HeaderFile
+#define _GEOMAlgo_Gluer_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Macro.hxx>
+#include <Standard_Boolean.hxx>
+#include <Standard_Real.hxx>
+#include <TopTools_DataMapOfShapeListOfShape.hxx>
+#include <TopTools_DataMapOfShapeShape.hxx>
+#include <Standard_Integer.hxx>
+#include <TopTools_ListOfShape.hxx>
+#include <GEOMAlgo_ShapeAlgo.hxx>
+#include <TopAbs_ShapeEnum.hxx>
+#include <TopoDS_Shape.hxx>
+#include <TopoDS_Edge.hxx>
+#include <TopoDS_Face.hxx>
+#include <TopoDS_Vertex.hxx>
+#include <GEOMAlgo_PassKeyShape.hxx>
+#include <TopTools_MapOfShape.hxx>
+#include <TopoDS_Compound.hxx>
+
+//=======================================================================
+//class    : GEOMAlgo_Gluer
+//purpose  :
+//=======================================================================
+class GEOMAlgo_Gluer  : public GEOMAlgo_ShapeAlgo {
+public:
+  Standard_EXPORT
+    GEOMAlgo_Gluer();
+
+  Standard_EXPORT
+    virtual ~GEOMAlgo_Gluer();
+
+  Standard_EXPORT
+    void SetCheckGeometry(const Standard_Boolean aFlag) ;
+
+  Standard_EXPORT
+    Standard_Boolean CheckGeometry() const;
+
+  Standard_EXPORT
+    void SetKeepNonSolids(const Standard_Boolean aFlag) ;
+
+  Standard_EXPORT
+    Standard_Boolean KeepNonSolids() const;
+
+  Standard_EXPORT
+    virtual  void Perform() ;
+
+  Standard_EXPORT
+    Standard_Integer AloneShapes() const;
+
+  Standard_EXPORT
+    const TopTools_ListOfShape& Modified(const TopoDS_Shape& S) ;
+
+  Standard_EXPORT
+    const TopTools_ListOfShape& Generated(const TopoDS_Shape& S) ;
+
+  Standard_EXPORT
+    Standard_Boolean IsDeleted(const TopoDS_Shape& S) ;
+
+  Standard_EXPORT
+    const TopTools_DataMapOfShapeListOfShape& Images() const;
+
+  Standard_EXPORT
+    const TopTools_DataMapOfShapeShape& Origins() const;
+
+ protected:
+  Standard_EXPORT
+    virtual  void CheckData() ;
+
+  Standard_EXPORT
+    virtual  void CheckResult() ;
+
+  Standard_EXPORT
+    void MakeVertices() ;
+
+  Standard_EXPORT
+    void MakeEdges() ;
+
+  Standard_EXPORT
+    void MakeFaces() ;
+
+  Standard_EXPORT
+    void MakeShapes(const TopAbs_ShapeEnum aType) ;
+
+  Standard_EXPORT
+    void MakeShells() ;
+
+  Standard_EXPORT
+    void MakeSolids() ;
+
+  Standard_EXPORT
+    void InnerTolerance() ;
+
+  Standard_EXPORT
+    void EdgePassKey(const TopoDS_Edge& aE,
+		     GEOMAlgo_PassKeyShape& aPK) ;
+
+  Standard_EXPORT
+    void FacePassKey(const TopoDS_Face& aF,
+		     GEOMAlgo_PassKeyShape& aPK) ;
+
+  Standard_EXPORT
+    void MakeVertex(const TopTools_ListOfShape& aLV,
+		    TopoDS_Vertex& aNewV) ;
+
+  Standard_EXPORT
+    void MakeEdge(const TopoDS_Edge& aEdge,
+		  TopoDS_Edge& aNewEdge) ;
+
+  Standard_EXPORT
+    void MakeFace(const TopoDS_Face& aFace,
+		  TopoDS_Face& aNewEdge) ;
+
+  Standard_EXPORT
+    Standard_Boolean IsToReverse(const TopoDS_Face& aFR,
+				 const TopoDS_Face& aF) ;
+
+  Standard_EXPORT
+    Standard_Boolean HasNewSubShape(const TopoDS_Shape& aS) const;
+
+  Standard_EXPORT
+    void MakeSubShapes(const TopoDS_Shape& aS,
+		       TopTools_MapOfShape& aM,
+		       TopoDS_Compound& aC) ;
+
+
+  Standard_Boolean myCheckGeometry;
+  Standard_Boolean myKeepNonSolids;
+  Standard_Real myTol;
+  TopTools_DataMapOfShapeListOfShape myImages;
+  TopTools_DataMapOfShapeShape myOrigins;
+  Standard_Integer myNbAlone;
+  TopTools_ListOfShape myGenerated;
+};
+#endif
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_Gluer2.cxx b/src/GEOMAlgo_NEW/GEOMAlgo_Gluer2.cxx
index 6fe64807e..0a7b969bf 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_Gluer2.cxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_Gluer2.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File:        GEOMAlgo_Gluer2.cxx
 // Author:      Peter KURNEV
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_Gluer2.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_Gluer2.hxx
index 3cbeb7b2c..f380802b9 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_Gluer2.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_Gluer2.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File:        GEOMAlgo_Gluer2.hxx
 // Author:      Peter KURNEV
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_Gluer2_1.cxx b/src/GEOMAlgo_NEW/GEOMAlgo_Gluer2_1.cxx
index e14f54b55..400613da7 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_Gluer2_1.cxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_Gluer2_1.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File:     GEOMAlgo_Gluer2_1.cxx
 // Author:   Peter KURNEV
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_Gluer2_2.cxx b/src/GEOMAlgo_NEW/GEOMAlgo_Gluer2_2.cxx
index 91c620053..375036bfc 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_Gluer2_2.cxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_Gluer2_2.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -20,7 +20,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 // File:	GEOMAlgo_Gluer2_2.cxx
-// Created:	
+// Created:
 // Author:	Peter KURNEV
 //		<peter@PREFEX>
 //
@@ -36,25 +36,25 @@
 
 //=======================================================================
 //function : PrepareHistory
-//purpose  : 
+//purpose  :
 //=======================================================================
 void GEOMAlgo_Gluer2::PrepareHistory()
 {
   //Standard_Boolean bHasImage, bContainsSD;
   //
-  // 1. Clearing 
+  // 1. Clearing
   GEOMAlgo_BuilderShape::PrepareHistory();
-  //  
+  //
   if(myShape.IsNull()) {
     return;
   }
   //
-  GEOMAlgo_Gluer2::MapShapes(myShape, myMapShape);  
+  GEOMAlgo_Gluer2::MapShapes(myShape, myMapShape);
   //
 }
 //=======================================================================
 //function : Generated
-//purpose  : 
+//purpose  :
 //=======================================================================
 const TopTools_ListOfShape& GEOMAlgo_Gluer2::Generated(const TopoDS_Shape& )
 {
@@ -63,7 +63,7 @@ const TopTools_ListOfShape& GEOMAlgo_Gluer2::Generated(const TopoDS_Shape& )
 }
 //=======================================================================
 //function : Modified
-//purpose  : 
+//purpose  :
 //=======================================================================
 const TopTools_ListOfShape& GEOMAlgo_Gluer2::Modified(const TopoDS_Shape& theS)
 {
@@ -74,8 +74,8 @@ const TopTools_ListOfShape& GEOMAlgo_Gluer2::Modified(const TopoDS_Shape& theS)
   myHistShapes.Clear();
   //
   aType=theS.ShapeType();
-  if (!(aType==TopAbs_VERTEX || aType==TopAbs_EDGE || 
-	aType==TopAbs_FACE || aType==TopAbs_SOLID)) { 
+  if (!(aType==TopAbs_VERTEX || aType==TopAbs_EDGE ||
+	aType==TopAbs_FACE || aType==TopAbs_SOLID)) {
     return myHistShapes;
   }
   //
@@ -110,7 +110,7 @@ const TopTools_ListOfShape& GEOMAlgo_Gluer2::Modified(const TopoDS_Shape& theS)
 }
 //=======================================================================
 //function : IsDeleted
-//purpose  : 
+//purpose  :
 //=======================================================================
 Standard_Boolean GEOMAlgo_Gluer2::IsDeleted(const TopoDS_Shape& theS)
 {
@@ -140,7 +140,7 @@ Standard_Boolean GEOMAlgo_Gluer2::IsDeleted(const TopoDS_Shape& theS)
 }
 //=======================================================================
 //function : MapShapes
-//purpose  : 
+//purpose  :
 //=======================================================================
 void GEOMAlgo_Gluer2::MapShapes(const TopoDS_Shape& theS,
 				TopTools_MapOfShape& theM)
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_Gluer2_3.cxx b/src/GEOMAlgo_NEW/GEOMAlgo_Gluer2_3.cxx
index 751573e39..5ccb17521 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_Gluer2_3.cxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_Gluer2_3.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File:   GEOMAlgo_Gluer2_3.cxx
 // Author: Peter KURNEV
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_GluerAlgo.cxx b/src/GEOMAlgo_NEW/GEOMAlgo_GluerAlgo.cxx
index dac56165f..fe6f82a2c 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_GluerAlgo.cxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_GluerAlgo.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -20,7 +20,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 // File:	GEOMAlgo_GluerAlgo.cxx
-// Created:	
+// Created:
 // Author:	Peter KURNEV
 //		<peter@PREFEX>
 //
@@ -30,7 +30,7 @@
 
 //=======================================================================
 //function : GEOMAlgo_GluerAlgo
-//purpose  : 
+//purpose  :
 //=======================================================================
 GEOMAlgo_GluerAlgo::GEOMAlgo_GluerAlgo()
 {
@@ -39,14 +39,14 @@ GEOMAlgo_GluerAlgo::GEOMAlgo_GluerAlgo()
 }
 //=======================================================================
 //function : ~GEOMAlgo_GluerAlgo
-//purpose  : 
+//purpose  :
 //=======================================================================
 GEOMAlgo_GluerAlgo::~GEOMAlgo_GluerAlgo()
 {
 }
 //=======================================================================
 //function : SetArgument
-//purpose  : 
+//purpose  :
 //=======================================================================
 void GEOMAlgo_GluerAlgo::SetArgument(const TopoDS_Shape& theShape)
 {
@@ -54,7 +54,7 @@ void GEOMAlgo_GluerAlgo::SetArgument(const TopoDS_Shape& theShape)
 }
 //=======================================================================
 //function : Argument
-//purpose  : 
+//purpose  :
 //=======================================================================
 const TopoDS_Shape& GEOMAlgo_GluerAlgo::Argument()const
 {
@@ -62,7 +62,7 @@ const TopoDS_Shape& GEOMAlgo_GluerAlgo::Argument()const
 }
 //=======================================================================
 //function : SetTolerance
-//purpose  : 
+//purpose  :
 //=======================================================================
 void GEOMAlgo_GluerAlgo::SetTolerance(const Standard_Real aT)
 {
@@ -70,7 +70,7 @@ void GEOMAlgo_GluerAlgo::SetTolerance(const Standard_Real aT)
 }
 //=======================================================================
 //function : Tolerance
-//purpose  : 
+//purpose  :
 //=======================================================================
 Standard_Real GEOMAlgo_GluerAlgo::Tolerance()const
 {
@@ -79,7 +79,7 @@ Standard_Real GEOMAlgo_GluerAlgo::Tolerance()const
 
 //=======================================================================
 //function : SetCheckGeometry
-//purpose  : 
+//purpose  :
 //=======================================================================
 void GEOMAlgo_GluerAlgo::SetCheckGeometry(const Standard_Boolean aFlag)
 {
@@ -87,7 +87,7 @@ void GEOMAlgo_GluerAlgo::SetCheckGeometry(const Standard_Boolean aFlag)
 }
 //=======================================================================
 //function : CheckGeometry
-//purpose  : 
+//purpose  :
 //=======================================================================
 Standard_Boolean GEOMAlgo_GluerAlgo::CheckGeometry() const
 {
@@ -95,7 +95,7 @@ Standard_Boolean GEOMAlgo_GluerAlgo::CheckGeometry() const
 }
 //=======================================================================
 //function : SetContext
-//purpose  : 
+//purpose  :
 //=======================================================================
 void GEOMAlgo_GluerAlgo::SetContext(const Handle(IntTools_Context)& theContext)
 {
@@ -103,7 +103,7 @@ void GEOMAlgo_GluerAlgo::SetContext(const Handle(IntTools_Context)& theContext)
 }
 //=======================================================================
 //function : Context
-//purpose  : 
+//purpose  :
 //=======================================================================
 const Handle(IntTools_Context)& GEOMAlgo_GluerAlgo::Context()
 {
@@ -111,7 +111,7 @@ const Handle(IntTools_Context)& GEOMAlgo_GluerAlgo::Context()
 }
 //=======================================================================
 //function : Images
-//purpose  : 
+//purpose  :
 //=======================================================================
 const TopTools_DataMapOfShapeListOfShape& GEOMAlgo_GluerAlgo::Images()const
 {
@@ -119,7 +119,7 @@ const TopTools_DataMapOfShapeListOfShape& GEOMAlgo_GluerAlgo::Images()const
 }
 //=======================================================================
 //function : Origins
-//purpose  : 
+//purpose  :
 //=======================================================================
 const TopTools_DataMapOfShapeShape& GEOMAlgo_GluerAlgo::Origins()const
 {
@@ -127,7 +127,7 @@ const TopTools_DataMapOfShapeShape& GEOMAlgo_GluerAlgo::Origins()const
 }
 //=======================================================================
 //function : Clear
-//purpose  : 
+//purpose  :
 //=======================================================================
 void GEOMAlgo_GluerAlgo::Clear()
 {
@@ -136,7 +136,7 @@ void GEOMAlgo_GluerAlgo::Clear()
 }
 //=======================================================================
 //function : Perform
-//purpose  : 
+//purpose  :
 //=======================================================================
 void GEOMAlgo_GluerAlgo::Perform()
 {
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_GluerAlgo.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_GluerAlgo.hxx
index 603484424..97f9b9ad1 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_GluerAlgo.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_GluerAlgo.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -20,7 +20,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 // File:        GEOMAlgo_GluerAlgo.hxx
-// Created:     
+// Created:
 // Author:      Peter KURNEV
 //              <pkv@irinox>
 //
@@ -38,51 +38,51 @@
 
 //=======================================================================
 //class    : GEOMAlgo_GluerAlgo
-//purpose  : 
+//purpose  :
 //=======================================================================
 class GEOMAlgo_GluerAlgo {
 public:
 
-  Standard_EXPORT 
+  Standard_EXPORT
     GEOMAlgo_GluerAlgo();
 
-  Standard_EXPORT 
+  Standard_EXPORT
     virtual ~GEOMAlgo_GluerAlgo();
 
-  Standard_EXPORT 
+  Standard_EXPORT
     virtual void SetArgument(const TopoDS_Shape& theShape) ;
 
-  Standard_EXPORT 
+  Standard_EXPORT
     const TopoDS_Shape& Argument() const;
-  
-  Standard_EXPORT 
+
+  Standard_EXPORT
     void SetTolerance(const Standard_Real aT) ;
-  
-  Standard_EXPORT 
+
+  Standard_EXPORT
     Standard_Real Tolerance() const;
-  
-  Standard_EXPORT 
+
+  Standard_EXPORT
     void SetCheckGeometry(const Standard_Boolean aFlag) ;
-  
-  Standard_EXPORT 
+
+  Standard_EXPORT
     Standard_Boolean CheckGeometry() const;
-  
-  Standard_EXPORT 
+
+  Standard_EXPORT
     virtual  void Perform() ;
-  
-  Standard_EXPORT 
+
+  Standard_EXPORT
     virtual  void Clear() ;
-  
-  Standard_EXPORT 
+
+  Standard_EXPORT
     void SetContext(const Handle(IntTools_Context)&) ;
-  
-  Standard_EXPORT 
+
+  Standard_EXPORT
     const Handle(IntTools_Context)& Context() ;
-  
-  Standard_EXPORT 
+
+  Standard_EXPORT
     const TopTools_DataMapOfShapeListOfShape& Images() const;
-  
-  Standard_EXPORT 
+
+  Standard_EXPORT
     const TopTools_DataMapOfShapeShape& Origins() const;
 
 protected:
@@ -92,7 +92,7 @@ protected:
   Handle(IntTools_Context) myContext;
   TopTools_DataMapOfShapeListOfShape myImages;
   TopTools_DataMapOfShapeShape myOrigins;
-  
+
 private:
 };
 #endif
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_HAlgo.cxx b/src/GEOMAlgo_NEW/GEOMAlgo_HAlgo.cxx
index 1629942bc..b07876a31 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_HAlgo.cxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_HAlgo.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -31,8 +31,8 @@ IMPLEMENT_STANDARD_HANDLE(GEOMAlgo_HAlgo, MMgt_TShared);
 IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_HAlgo, MMgt_TShared);
 
 //=======================================================================
-// function: 
-// purpose: 
+// function:
+// purpose:
 //=======================================================================
   GEOMAlgo_HAlgo::GEOMAlgo_HAlgo()
 :
@@ -41,14 +41,14 @@ IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_HAlgo, MMgt_TShared);
 {}
 //=======================================================================
 // function: ~
-// purpose: 
+// purpose:
 //=======================================================================
   GEOMAlgo_HAlgo::~GEOMAlgo_HAlgo()
 {
 }
 //=======================================================================
 // function: CheckData
-// purpose: 
+// purpose:
 //=======================================================================
   void GEOMAlgo_HAlgo::CheckData()
 {
@@ -56,7 +56,7 @@ IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_HAlgo, MMgt_TShared);
 }
 //=======================================================================
 // function: CheckResult
-// purpose: 
+// purpose:
 //=======================================================================
   void GEOMAlgo_HAlgo::CheckResult()
 {
@@ -64,7 +64,7 @@ IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_HAlgo, MMgt_TShared);
 }
 //=======================================================================
 // function: ErrorStatus
-// purpose: 
+// purpose:
 //=======================================================================
   Standard_Integer GEOMAlgo_HAlgo::ErrorStatus()const
 {
@@ -72,7 +72,7 @@ IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_HAlgo, MMgt_TShared);
 }
 //=======================================================================
 // function: WarningStatus
-// purpose: 
+// purpose:
 //=======================================================================
   Standard_Integer GEOMAlgo_HAlgo::WarningStatus()const
 {
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_HAlgo.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_HAlgo.hxx
index c1b0cb62e..52340ed2e 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_HAlgo.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_HAlgo.hxx
@@ -1,75 +1,75 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-
-// File:        GEOMAlgo_HAlgo.hxx
-// Created:     Sat Dec 04 12:39:47 2004
-// Author:      Peter KURNEV
-//              <peter@PREFEX>
-//
-
-#ifndef _GEOMAlgo_HAlgo_HeaderFile
-#define _GEOMAlgo_HAlgo_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_DefineHandle.hxx>
-//#include <Handle_GEOMAlgo_HAlgo.hxx>
-#include <Standard_Integer.hxx>
-#include <MMgt_TShared.hxx>
-
-DEFINE_STANDARD_HANDLE(GEOMAlgo_HAlgo, MMgt_TShared);
-
-//=======================================================================
-//class    : GEOMAlgo_HAlgo
-//purpose  : 
-//=======================================================================
-class GEOMAlgo_HAlgo : public MMgt_TShared 
-{
- public:
-  Standard_EXPORT
-    virtual  void Perform()  = 0;
-  
-  Standard_EXPORT
-    virtual  void CheckData() ;
-  
-  Standard_EXPORT
-    virtual  void CheckResult() ;
-  
-  Standard_EXPORT
-    Standard_Integer ErrorStatus() const;
-  
-  Standard_EXPORT
-    Standard_Integer WarningStatus() const;
-
-  DEFINE_STANDARD_RTTI(GEOMAlgo_HAlgo);
-
- protected:
-  Standard_EXPORT
-    GEOMAlgo_HAlgo();
-
-  Standard_EXPORT
-    virtual ~GEOMAlgo_HAlgo();
-
-  Standard_Integer myErrorStatus;
-  Standard_Integer myWarningStatus;
-
-};
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File:        GEOMAlgo_HAlgo.hxx
+// Created:     Sat Dec 04 12:39:47 2004
+// Author:      Peter KURNEV
+//              <peter@PREFEX>
+//
+
+#ifndef _GEOMAlgo_HAlgo_HeaderFile
+#define _GEOMAlgo_HAlgo_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_DefineHandle.hxx>
+//#include <Handle_GEOMAlgo_HAlgo.hxx>
+#include <Standard_Integer.hxx>
+#include <MMgt_TShared.hxx>
+
+DEFINE_STANDARD_HANDLE(GEOMAlgo_HAlgo, MMgt_TShared);
+
+//=======================================================================
+//class    : GEOMAlgo_HAlgo
+//purpose  :
+//=======================================================================
+class GEOMAlgo_HAlgo : public MMgt_TShared
+{
+ public:
+  Standard_EXPORT
+    virtual  void Perform()  = 0;
+
+  Standard_EXPORT
+    virtual  void CheckData() ;
+
+  Standard_EXPORT
+    virtual  void CheckResult() ;
+
+  Standard_EXPORT
+    Standard_Integer ErrorStatus() const;
+
+  Standard_EXPORT
+    Standard_Integer WarningStatus() const;
+
+  DEFINE_STANDARD_RTTI(GEOMAlgo_HAlgo);
+
+ protected:
+  Standard_EXPORT
+    GEOMAlgo_HAlgo();
+
+  Standard_EXPORT
+    virtual ~GEOMAlgo_HAlgo();
+
+  Standard_Integer myErrorStatus;
+  Standard_Integer myWarningStatus;
+
+};
+#endif
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_IndexedDataMapOfIntegerShape.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_IndexedDataMapOfIntegerShape.hxx
index 7830f72d5..125122452 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_IndexedDataMapOfIntegerShape.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_IndexedDataMapOfIntegerShape.hxx
@@ -1,44 +1,44 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-// File:	GEOMAlgo_IndexedDataMapOfIntegerShape.hxx
-// Created:	Wed Feb 22 11:22:18 2012
-// Author:	
-//		<pkv@BDEURI37616>
-
-
-#ifndef GEOMAlgo_IndexedDataMapOfIntegerShape_HeaderFile
-#define GEOMAlgo_IndexedDataMapOfIntegerShape_HeaderFile
-
-
-
-#include <TopoDS_Shape.hxx>  
-#include <Standard_Integer.hxx>
-#include <TColStd_MapIntegerHasher.hxx>
-
-#define _NCollection_MapHasher
-#include <NCollection_IndexedDataMap.hxx>
-
-
-typedef NCollection_IndexedDataMap<Standard_Integer, TopoDS_Shape, TColStd_MapIntegerHasher> GEOMAlgo_IndexedDataMapOfIntegerShape; 
- 
-#undef _NCollection_MapHasher
-
-
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// File:	GEOMAlgo_IndexedDataMapOfIntegerShape.hxx
+// Created:	Wed Feb 22 11:22:18 2012
+// Author:
+//		<pkv@BDEURI37616>
+
+
+#ifndef GEOMAlgo_IndexedDataMapOfIntegerShape_HeaderFile
+#define GEOMAlgo_IndexedDataMapOfIntegerShape_HeaderFile
+
+
+
+#include <TopoDS_Shape.hxx>
+#include <Standard_Integer.hxx>
+#include <TColStd_MapIntegerHasher.hxx>
+
+#define _NCollection_MapHasher
+#include <NCollection_IndexedDataMap.hxx>
+
+
+typedef NCollection_IndexedDataMap<Standard_Integer, TopoDS_Shape, TColStd_MapIntegerHasher> GEOMAlgo_IndexedDataMapOfIntegerShape;
+
+#undef _NCollection_MapHasher
+
+
+
+#endif
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape.hxx
index 0a2e82979..5c22084a6 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape.hxx
@@ -1,43 +1,43 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-// File:	GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape.hxx
-// Created:	Wed Feb 22 11:24:27 2012
-// Author:	
-//		<pkv@BDEURI37616>
-
-
-#ifndef GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape_HeaderFile
-#define GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape_HeaderFile
-
-#include <GEOMAlgo_PassKeyShape.hxx>
-#include <TopTools_ListOfShape.hxx>
-#include <GEOMAlgo_PassKeyShapeMapHasher.hxx>
-
-
-#define _NCollection_MapHasher
-#include <NCollection_IndexedDataMap.hxx>
-
-
-typedef NCollection_IndexedDataMap<GEOMAlgo_PassKeyShape, TopTools_ListOfShape, GEOMAlgo_PassKeyShapeMapHasher> GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape; 
- 
-#undef _NCollection_MapHasher
-
-
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// File:	GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape.hxx
+// Created:	Wed Feb 22 11:24:27 2012
+// Author:
+//		<pkv@BDEURI37616>
+
+
+#ifndef GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape_HeaderFile
+#define GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape_HeaderFile
+
+#include <GEOMAlgo_PassKeyShape.hxx>
+#include <TopTools_ListOfShape.hxx>
+#include <GEOMAlgo_PassKeyShapeMapHasher.hxx>
+
+
+#define _NCollection_MapHasher
+#include <NCollection_IndexedDataMap.hxx>
+
+
+typedef NCollection_IndexedDataMap<GEOMAlgo_PassKeyShape, TopTools_ListOfShape, GEOMAlgo_PassKeyShapeMapHasher> GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape;
+
+#undef _NCollection_MapHasher
+
+
+
+#endif
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_IndexedDataMapOfShapeBox.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_IndexedDataMapOfShapeBox.hxx
index 3f5d11d64..7cd8010fe 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_IndexedDataMapOfShapeBox.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_IndexedDataMapOfShapeBox.hxx
@@ -1,44 +1,44 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-// File:	GEOMAlgo_IndexedDataMapOfShapeBox.hxx
-// Created:	Wed Feb 22 11:14:14 2012
-// Author:	
-//		<pkv@BDEURI37616>
-
-
-#ifndef GEOMAlgo_IndexedDataMapOfShapeBox_HeaderFile
-#define GEOMAlgo_IndexedDataMapOfShapeBox_HeaderFile
-
-
-#include <TopoDS_Shape.hxx>  
-#include <TopTools_ShapeMapHasher.hxx>
-#include <Bnd_Box.hxx>
-
-#define _NCollection_MapHasher
-#include <NCollection_IndexedDataMap.hxx>
-
-
-typedef NCollection_IndexedDataMap<TopoDS_Shape, Bnd_Box, TopTools_ShapeMapHasher> GEOMAlgo_IndexedDataMapOfShapeBox; 
- 
-#undef _NCollection_MapHasher
-
-
-
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// File:	GEOMAlgo_IndexedDataMapOfShapeBox.hxx
+// Created:	Wed Feb 22 11:14:14 2012
+// Author:
+//		<pkv@BDEURI37616>
+
+
+#ifndef GEOMAlgo_IndexedDataMapOfShapeBox_HeaderFile
+#define GEOMAlgo_IndexedDataMapOfShapeBox_HeaderFile
+
+
+#include <TopoDS_Shape.hxx>
+#include <TopTools_ShapeMapHasher.hxx>
+#include <Bnd_Box.hxx>
+
+#define _NCollection_MapHasher
+#include <NCollection_IndexedDataMap.hxx>
+
+
+typedef NCollection_IndexedDataMap<TopoDS_Shape, Bnd_Box, TopTools_ShapeMapHasher> GEOMAlgo_IndexedDataMapOfShapeBox;
+
+#undef _NCollection_MapHasher
+
+
+
+
+#endif
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_IndexedDataMapOfShapeShapeInfo.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_IndexedDataMapOfShapeShapeInfo.hxx
index 8f4a308dc..09be03fe8 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_IndexedDataMapOfShapeShapeInfo.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_IndexedDataMapOfShapeShapeInfo.hxx
@@ -1,43 +1,43 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-// File:	GEOMAlgo_IndexedDataMapOfShapeShapeInfo.hxx
-// Created:	Wed Feb 22 11:16:54 2012
-// Author:	
-//		<pkv@BDEURI37616>
-
-
-#ifndef GEOMAlgo_IndexedDataMapOfShapeShapeInfo_HeaderFile
-#define GEOMAlgo_IndexedDataMapOfShapeShapeInfo_HeaderFile
-
-
-#include <TopoDS_Shape.hxx>  
-#include <TopTools_ShapeMapHasher.hxx>
-#include <GEOMAlgo_ShapeInfo.hxx>
-
-#define _NCollection_MapHasher
-#include <NCollection_IndexedDataMap.hxx>
-
-typedef NCollection_IndexedDataMap<TopoDS_Shape, GEOMAlgo_ShapeInfo, TopTools_ShapeMapHasher> GEOMAlgo_IndexedDataMapOfShapeShapeInfo; 
- 
-#undef _NCollection_MapHasher
-
-
-
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// File:	GEOMAlgo_IndexedDataMapOfShapeShapeInfo.hxx
+// Created:	Wed Feb 22 11:16:54 2012
+// Author:
+//		<pkv@BDEURI37616>
+
+
+#ifndef GEOMAlgo_IndexedDataMapOfShapeShapeInfo_HeaderFile
+#define GEOMAlgo_IndexedDataMapOfShapeShapeInfo_HeaderFile
+
+
+#include <TopoDS_Shape.hxx>
+#include <TopTools_ShapeMapHasher.hxx>
+#include <GEOMAlgo_ShapeInfo.hxx>
+
+#define _NCollection_MapHasher
+#include <NCollection_IndexedDataMap.hxx>
+
+typedef NCollection_IndexedDataMap<TopoDS_Shape, GEOMAlgo_ShapeInfo, TopTools_ShapeMapHasher> GEOMAlgo_IndexedDataMapOfShapeShapeInfo;
+
+#undef _NCollection_MapHasher
+
+
+
+
+#endif
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_IndexedDataMapOfShapeState.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_IndexedDataMapOfShapeState.hxx
index 06a74a174..35f5d3650 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_IndexedDataMapOfShapeState.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_IndexedDataMapOfShapeState.hxx
@@ -1,43 +1,60 @@
-/// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-// File:	GEOMAlgo_IndexedDataMapOfShapeState.hxx
-// Created:	Wed Feb 22 11:19:56 2012
-// Author:	
-//		<pkv@BDEURI37616>
-
-
-#ifndef GEOMAlgo_IndexedDataMapOfShapeState_HeaderFile
-#define GEOMAlgo_IndexedDataMapOfShapeState_HeaderFile
-
-
-
-#include <TopoDS_Shape.hxx>  
-#include <TopTools_ShapeMapHasher.hxx>
-#include <TopAbs_State.hxx>
-
-#define _NCollection_MapHasher
-#include <NCollection_IndexedDataMap.hxx>
-
-typedef NCollection_IndexedDataMap<TopoDS_Shape, TopAbs_State, TopTools_ShapeMapHasher> GEOMAlgo_IndexedDataMapOfShapeState; 
- 
-#undef _NCollection_MapHasher
-
-
-
-#endif
+/// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+///
+/// This library is free software; you can redistribute it and/or
+/// modify it under the terms of the GNU Lesser General Public
+/// License as published by the Free Software Foundation; either
+/// version 2.1 of the License.
+///
+/// This library is distributed in the hope that it will be useful,
+/// but WITHOUT ANY WARRANTY; without even the implied warranty of
+/// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+/// Lesser General Public License for more details.
+///
+/// You should have received a copy of the GNU Lesser General Public
+/// License along with this library; if not, write to the Free Software
+/// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+///
+/// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+///
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// File:	GEOMAlgo_IndexedDataMapOfShapeState.hxx
+// Created:	Wed Feb 22 11:19:56 2012
+// Author:
+//		<pkv@BDEURI37616>
+
+
+#ifndef GEOMAlgo_IndexedDataMapOfShapeState_HeaderFile
+#define GEOMAlgo_IndexedDataMapOfShapeState_HeaderFile
+
+
+
+#include <TopoDS_Shape.hxx>
+#include <TopTools_ShapeMapHasher.hxx>
+#include <TopAbs_State.hxx>
+
+#define _NCollection_MapHasher
+#include <NCollection_IndexedDataMap.hxx>
+
+typedef NCollection_IndexedDataMap<TopoDS_Shape, TopAbs_State, TopTools_ShapeMapHasher> GEOMAlgo_IndexedDataMapOfShapeState;
+
+#undef _NCollection_MapHasher
+
+
+
+#endif
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_KindOfBounds.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_KindOfBounds.hxx
index 6de8485ad..83646c9ef 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_KindOfBounds.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_KindOfBounds.hxx
@@ -1,37 +1,37 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-
-#ifndef _GEOMAlgo_KindOfBounds_HeaderFile
-#define _GEOMAlgo_KindOfBounds_HeaderFile
-
-
-enum GEOMAlgo_KindOfBounds {
-GEOMAlgo_KB_UNKNOWN,
-GEOMAlgo_KB_TRIMMED,
-GEOMAlgo_KB_INFINITE
-};
-
-#ifndef _Standard_PrimitiveTypes_HeaderFile
-#include <Standard_PrimitiveTypes.hxx>
-#endif
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+#ifndef _GEOMAlgo_KindOfBounds_HeaderFile
+#define _GEOMAlgo_KindOfBounds_HeaderFile
+
+
+enum GEOMAlgo_KindOfBounds {
+GEOMAlgo_KB_UNKNOWN,
+GEOMAlgo_KB_TRIMMED,
+GEOMAlgo_KB_INFINITE
+};
+
+#ifndef _Standard_PrimitiveTypes_HeaderFile
+#include <Standard_PrimitiveTypes.hxx>
+#endif
+
+#endif
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_KindOfClosed.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_KindOfClosed.hxx
index 5e7ccdcde..fecd41494 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_KindOfClosed.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_KindOfClosed.hxx
@@ -1,36 +1,36 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-#ifndef _GEOMAlgo_KindOfClosed_HeaderFile
-#define _GEOMAlgo_KindOfClosed_HeaderFile
-
-
-enum GEOMAlgo_KindOfClosed {
-GEOMAlgo_KC_UNKNOWN,
-GEOMAlgo_KC_CLOSED,
-GEOMAlgo_KC_NOTCLOSED
-};
-
-#ifndef _Standard_PrimitiveTypes_HeaderFile
-#include <Standard_PrimitiveTypes.hxx>
-#endif
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+#ifndef _GEOMAlgo_KindOfClosed_HeaderFile
+#define _GEOMAlgo_KindOfClosed_HeaderFile
+
+
+enum GEOMAlgo_KindOfClosed {
+GEOMAlgo_KC_UNKNOWN,
+GEOMAlgo_KC_CLOSED,
+GEOMAlgo_KC_NOTCLOSED
+};
+
+#ifndef _Standard_PrimitiveTypes_HeaderFile
+#include <Standard_PrimitiveTypes.hxx>
+#endif
+
+#endif
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_KindOfName.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_KindOfName.hxx
index 5b1362bcc..8c4241edd 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_KindOfName.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_KindOfName.hxx
@@ -1,54 +1,54 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-
-#ifndef _GEOMAlgo_KindOfName_HeaderFile
-#define _GEOMAlgo_KindOfName_HeaderFile
-
-
-enum GEOMAlgo_KindOfName {
-GEOMAlgo_KN_UNKNOWN,
-GEOMAlgo_KN_SPHERE,
-GEOMAlgo_KN_CYLINDER,
-GEOMAlgo_KN_TORUS,
-GEOMAlgo_KN_CONE,
-GEOMAlgo_KN_ELLIPSE,
-GEOMAlgo_KN_CIRCLE,
-GEOMAlgo_KN_PLANE,
-GEOMAlgo_KN_LINE,
-GEOMAlgo_KN_BOX,
-GEOMAlgo_KN_SEGMENT,
-GEOMAlgo_KN_ARCCIRCLE,
-GEOMAlgo_KN_POLYGON,
-GEOMAlgo_KN_POLYHEDRON,
-GEOMAlgo_KN_DISKCIRCLE,
-GEOMAlgo_KN_DISKELLIPSE,
-GEOMAlgo_KN_RECTANGLE,
-GEOMAlgo_KN_TRIANGLE,
-GEOMAlgo_KN_QUADRANGLE,
-GEOMAlgo_KN_ARCELLIPSE
-};
-
-#ifndef _Standard_PrimitiveTypes_HeaderFile
-#include <Standard_PrimitiveTypes.hxx>
-#endif
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+#ifndef _GEOMAlgo_KindOfName_HeaderFile
+#define _GEOMAlgo_KindOfName_HeaderFile
+
+
+enum GEOMAlgo_KindOfName {
+GEOMAlgo_KN_UNKNOWN,
+GEOMAlgo_KN_SPHERE,
+GEOMAlgo_KN_CYLINDER,
+GEOMAlgo_KN_TORUS,
+GEOMAlgo_KN_CONE,
+GEOMAlgo_KN_ELLIPSE,
+GEOMAlgo_KN_CIRCLE,
+GEOMAlgo_KN_PLANE,
+GEOMAlgo_KN_LINE,
+GEOMAlgo_KN_BOX,
+GEOMAlgo_KN_SEGMENT,
+GEOMAlgo_KN_ARCCIRCLE,
+GEOMAlgo_KN_POLYGON,
+GEOMAlgo_KN_POLYHEDRON,
+GEOMAlgo_KN_DISKCIRCLE,
+GEOMAlgo_KN_DISKELLIPSE,
+GEOMAlgo_KN_RECTANGLE,
+GEOMAlgo_KN_TRIANGLE,
+GEOMAlgo_KN_QUADRANGLE,
+GEOMAlgo_KN_ARCELLIPSE
+};
+
+#ifndef _Standard_PrimitiveTypes_HeaderFile
+#include <Standard_PrimitiveTypes.hxx>
+#endif
+
+#endif
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_KindOfShape.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_KindOfShape.hxx
index d6a005740..899598a0b 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_KindOfShape.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_KindOfShape.hxx
@@ -1,44 +1,44 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-#ifndef _GEOMAlgo_KindOfShape_HeaderFile
-#define _GEOMAlgo_KindOfShape_HeaderFile
-
-
-enum GEOMAlgo_KindOfShape {
-GEOMAlgo_KS_UNKNOWN,
-GEOMAlgo_KS_SPHERE,
-GEOMAlgo_KS_CYLINDER,
-GEOMAlgo_KS_BOX,
-GEOMAlgo_KS_TORUS,
-GEOMAlgo_KS_CONE,
-GEOMAlgo_KS_ELLIPSE,
-GEOMAlgo_KS_PLANE,
-GEOMAlgo_KS_CIRCLE,
-GEOMAlgo_KS_LINE,
-GEOMAlgo_KS_DEGENERATED
-};
-
-#ifndef _Standard_PrimitiveTypes_HeaderFile
-#include <Standard_PrimitiveTypes.hxx>
-#endif
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+#ifndef _GEOMAlgo_KindOfShape_HeaderFile
+#define _GEOMAlgo_KindOfShape_HeaderFile
+
+
+enum GEOMAlgo_KindOfShape {
+GEOMAlgo_KS_UNKNOWN,
+GEOMAlgo_KS_SPHERE,
+GEOMAlgo_KS_CYLINDER,
+GEOMAlgo_KS_BOX,
+GEOMAlgo_KS_TORUS,
+GEOMAlgo_KS_CONE,
+GEOMAlgo_KS_ELLIPSE,
+GEOMAlgo_KS_PLANE,
+GEOMAlgo_KS_CIRCLE,
+GEOMAlgo_KS_LINE,
+GEOMAlgo_KS_DEGENERATED
+};
+
+#ifndef _Standard_PrimitiveTypes_HeaderFile
+#include <Standard_PrimitiveTypes.hxx>
+#endif
+
+#endif
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_ListIteratorOfListOfCoupleOfShapes.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_ListIteratorOfListOfCoupleOfShapes.hxx
index 967af8a30..8c19aa07e 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_ListIteratorOfListOfCoupleOfShapes.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_ListIteratorOfListOfCoupleOfShapes.hxx
@@ -1,31 +1,31 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-// File:	GEOMAlgo_ListIteratorOfListOfCoupleOfShapes.hxx
-// Created:	Wed Feb 22 08:26:34 2012
-// Author:	
-//		<pkv@BDEURI37616>
-
-#ifndef GEOMAlgo_ListIteratorOfListOfCoupleOfShapes_HeaderFile
-#define GEOMAlgo_ListIteratorOfListOfCoupleOfShapes_HeaderFile
-
-#ifndef GEOMAlgo_ListOfCoupleOfShapes_HeaderFile
-#include <GEOMAlgo_ListOfCoupleOfShapes.hxx>
-#endif
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// File:	GEOMAlgo_ListIteratorOfListOfCoupleOfShapes.hxx
+// Created:	Wed Feb 22 08:26:34 2012
+// Author:
+//		<pkv@BDEURI37616>
+
+#ifndef GEOMAlgo_ListIteratorOfListOfCoupleOfShapes_HeaderFile
+#define GEOMAlgo_ListIteratorOfListOfCoupleOfShapes_HeaderFile
+
+#ifndef GEOMAlgo_ListOfCoupleOfShapes_HeaderFile
+#include <GEOMAlgo_ListOfCoupleOfShapes.hxx>
+#endif
+
+#endif
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_ListIteratorOfListOfPnt.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_ListIteratorOfListOfPnt.hxx
index f30e69409..ff1f10c7e 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_ListIteratorOfListOfPnt.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_ListIteratorOfListOfPnt.hxx
@@ -1,32 +1,32 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-// File:	GEOMAlgo_ListIteratorOfListOfPnt.hxx
-// Created:	Wed Feb 22 08:33:12 2012
-// Author:	
-//		<pkv@BDEURI37616>
-
-
-#ifndef GEOMAlgo_ListIteratorOfListOfPnt_HeaderFile
-#define GEOMAlgo_ListIteratorOfListOfPnt_HeaderFile
-
-#ifndef GEOMAlgo_ListOfPnt_HeaderFile
-#include <GEOMAlgo_ListOfPnt.hxx>
-#endif
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// File:	GEOMAlgo_ListIteratorOfListOfPnt.hxx
+// Created:	Wed Feb 22 08:33:12 2012
+// Author:
+//		<pkv@BDEURI37616>
+
+
+#ifndef GEOMAlgo_ListIteratorOfListOfPnt_HeaderFile
+#define GEOMAlgo_ListIteratorOfListOfPnt_HeaderFile
+
+#ifndef GEOMAlgo_ListOfPnt_HeaderFile
+#include <GEOMAlgo_ListOfPnt.hxx>
+#endif
+
+#endif
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_ListOfCoupleOfShapes.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_ListOfCoupleOfShapes.hxx
index 594195c7a..53954a6a8 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_ListOfCoupleOfShapes.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_ListOfCoupleOfShapes.hxx
@@ -1,33 +1,34 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
-// File:	GEOMAlgo_ListOfCoupleOfShapes.hxx
-// Created:	Wed Feb 22 08:23:27 2012
-// Author:	
-//		<pkv@BDEURI37616>
-
-#ifndef GEOMAlgo_ListOfCoupleOfShapes_HeaderFile
-#define GEOMAlgo_ListOfCoupleOfShapes_HeaderFile
-
-#include <NCollection_List.hxx>   
-#include <GEOMAlgo_CoupleOfShapes.hxx>
-
-typedef NCollection_List<GEOMAlgo_CoupleOfShapes> GEOMAlgo_ListOfCoupleOfShapes; 
-typedef GEOMAlgo_ListOfCoupleOfShapes::Iterator GEOMAlgo_ListIteratorOfListOfCoupleOfShapes;
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File:	GEOMAlgo_ListOfCoupleOfShapes.hxx
+// Created:	Wed Feb 22 08:23:27 2012
+// Author:
+//		<pkv@BDEURI37616>
+
+#ifndef GEOMAlgo_ListOfCoupleOfShapes_HeaderFile
+#define GEOMAlgo_ListOfCoupleOfShapes_HeaderFile
+
+#include <NCollection_List.hxx>
+#include <GEOMAlgo_CoupleOfShapes.hxx>
+
+typedef NCollection_List<GEOMAlgo_CoupleOfShapes> GEOMAlgo_ListOfCoupleOfShapes;
+typedef GEOMAlgo_ListOfCoupleOfShapes::Iterator GEOMAlgo_ListIteratorOfListOfCoupleOfShapes;
+
+#endif
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_ListOfPnt.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_ListOfPnt.hxx
index 9e7469c12..385ebee9d 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_ListOfPnt.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_ListOfPnt.hxx
@@ -1,35 +1,35 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-// File:	GEOMAlgo_ListOfPnt.hxx
-// Created:	Wed Feb 22 08:31:47 2012
-// Author:	
-//		<pkv@BDEURI37616>
-
-
-#ifndef GEOMAlgo_ListOfPnt_HeaderFile
-#define GEOMAlgo_ListOfPnt_HeaderFile
-
-#include <NCollection_List.hxx>   
-#include <gp_Pnt.hxx>
-
-typedef NCollection_List<gp_Pnt> GEOMAlgo_ListOfPnt; 
-typedef GEOMAlgo_ListOfPnt::Iterator GEOMAlgo_ListIteratorOfListOfPnt;
-
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// File:	GEOMAlgo_ListOfPnt.hxx
+// Created:	Wed Feb 22 08:31:47 2012
+// Author:
+//		<pkv@BDEURI37616>
+
+
+#ifndef GEOMAlgo_ListOfPnt_HeaderFile
+#define GEOMAlgo_ListOfPnt_HeaderFile
+
+#include <NCollection_List.hxx>
+#include <gp_Pnt.hxx>
+
+typedef NCollection_List<gp_Pnt> GEOMAlgo_ListOfPnt;
+typedef GEOMAlgo_ListOfPnt::Iterator GEOMAlgo_ListIteratorOfListOfPnt;
+
+
+#endif
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_PWireEdgeSet.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_PWireEdgeSet.hxx
index d6a2f22a6..f803f847f 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_PWireEdgeSet.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_PWireEdgeSet.hxx
@@ -1,35 +1,35 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-
-// File:        GEOMAlgo_PWireEdgeSet.hxx
-// Created:     
-// Author:      Peter KURNEV
-//              <peter@PREFEX>
-//
-#ifndef _GEOMAlgo_PWireEdgeSet_HeaderFile
-#define _GEOMAlgo_PWireEdgeSet_HeaderFile
-
-class GEOMAlgo_WireEdgeSet;
-
-typedef GEOMAlgo_WireEdgeSet* GEOMAlgo_PWireEdgeSet;
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File:        GEOMAlgo_PWireEdgeSet.hxx
+// Created:
+// Author:      Peter KURNEV
+//              <peter@PREFEX>
+//
+#ifndef _GEOMAlgo_PWireEdgeSet_HeaderFile
+#define _GEOMAlgo_PWireEdgeSet_HeaderFile
+
+class GEOMAlgo_WireEdgeSet;
+
+typedef GEOMAlgo_WireEdgeSet* GEOMAlgo_PWireEdgeSet;
+
+#endif
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_PassKey.cxx b/src/GEOMAlgo_NEW/GEOMAlgo_PassKey.cxx
index 2d9301a62..8f6f949e4 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_PassKey.cxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_PassKey.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -21,7 +21,7 @@
 //
 
 // File:        GEOMAlgo_PassKey.cxx
-// Created:     
+// Created:
 // Author:      Peter KURNEV
 //              <peter@PREFEX>
 //
@@ -33,7 +33,7 @@
 #include <TColStd_ListOfInteger.hxx>
 
 #ifdef WNT
-#pragma warning( disable : 4101) 
+#pragma warning( disable : 4101)
 #endif
 
 static
@@ -42,15 +42,15 @@ static
 
 //=======================================================================
 //function :
-//purpose  : 
+//purpose  :
 //=======================================================================
   GEOMAlgo_PassKey::GEOMAlgo_PassKey()
 {
- Clear(); 
+ Clear();
 }
 //=======================================================================
 //function :
-//purpose  : 
+//purpose  :
 //=======================================================================
   GEOMAlgo_PassKey::GEOMAlgo_PassKey(const GEOMAlgo_PassKey& aOther)
 {
@@ -60,7 +60,7 @@ static
 }
 //=======================================================================
 //function :Assign
-//purpose  : 
+//purpose  :
 //=======================================================================
   GEOMAlgo_PassKey& GEOMAlgo_PassKey::Assign(const GEOMAlgo_PassKey& aOther)
 {
@@ -71,14 +71,14 @@ static
 }
 //=======================================================================
 //function :~
-//purpose  : 
+//purpose  :
 //=======================================================================
   GEOMAlgo_PassKey::~GEOMAlgo_PassKey()
 {
 }
 //=======================================================================
 //function :Clear
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_PassKey::Clear()
 {
@@ -88,10 +88,10 @@ static
 }
 //=======================================================================
 //function :SetIds
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_PassKey::SetIds(const Standard_Integer aId1)
-                               
+
 {
   Clear();
   myNbIds=1;
@@ -100,7 +100,7 @@ static
 }
 //=======================================================================
 //function :SetIds
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_PassKey::SetIds(const Standard_Integer aId1,
                                 const Standard_Integer aId2)
@@ -113,7 +113,7 @@ static
 }
 //=======================================================================
 //function :SetIds
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_PassKey::SetIds(const Standard_Integer aId1,
                                 const Standard_Integer aId2,
@@ -128,13 +128,13 @@ static
 }
 //=======================================================================
 //function :SetIds
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_PassKey::SetIds(const Standard_Integer aId1,
                                 const Standard_Integer aId2,
                                 const Standard_Integer aId3,
                                 const Standard_Integer aId4)
-{ 
+{
   TColStd_ListOfInteger aLI;
   //
   aLI.Append(aId1);
@@ -145,7 +145,7 @@ static
 }
 //=======================================================================
 //function :SetIds
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_PassKey::SetIds(const TColStd_ListOfInteger& aLI)
 {
@@ -167,7 +167,7 @@ static
 }
 //=======================================================================
 //function :NbIds
-//purpose  : 
+//purpose  :
 //=======================================================================
   Standard_Integer GEOMAlgo_PassKey::NbIds()const
 {
@@ -175,7 +175,7 @@ static
 }
 //=======================================================================
 //function :Id
-//purpose  : 
+//purpose  :
 //=======================================================================
   Standard_Integer GEOMAlgo_PassKey::Id(const Standard_Integer aIndex) const
 {
@@ -186,7 +186,7 @@ static
 }
 //=======================================================================
 //function :IsEqual
-//purpose  : 
+//purpose  :
 //=======================================================================
   Standard_Boolean GEOMAlgo_PassKey::IsEqual(const GEOMAlgo_PassKey& aOther) const
 {
@@ -208,7 +208,7 @@ static
 }
 //=======================================================================
 //function : HashCode
-//purpose  : 
+//purpose  :
 //=======================================================================
   Standard_Integer GEOMAlgo_PassKey::HashCode(const Standard_Integer aUpper) const
 {
@@ -216,14 +216,14 @@ static
 }
 //=======================================================================
 //function : Dump
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_PassKey::Dump(const Standard_Integer )const
 {
 }
 //=======================================================================
 // function: NormalizedId
-// purpose : 
+// purpose :
 //=======================================================================
 Standard_Integer NormalizedId(const Standard_Integer aId,
                               const Standard_Integer aDiv)
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_PassKey.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_PassKey.hxx
index 85040e083..9a992f205 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_PassKey.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_PassKey.hxx
@@ -1,104 +1,104 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-
-// File:        GEOMAlgo_PassKey.hxx
-// Created:     
-// Author:      Peter KURNEV
-//              <peter@PREFEX>
-//
-#ifndef _GEOMAlgo_PassKey_HeaderFile
-#define _GEOMAlgo_PassKey_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_Macro.hxx>
-#include <Standard_Integer.hxx>
-#include <TColStd_IndexedMapOfInteger.hxx>
-#include <Standard_Boolean.hxx>
-#include <TColStd_ListOfInteger.hxx>
-
-//=======================================================================
-//class : GEOMAlgo_PassKey
-//purpose  : 
-//=======================================================================
-class GEOMAlgo_PassKey  {
- public:
-  Standard_EXPORT
-    GEOMAlgo_PassKey();
-
-  Standard_EXPORT
-    virtual ~GEOMAlgo_PassKey();
-  
-  Standard_EXPORT
-    GEOMAlgo_PassKey(const GEOMAlgo_PassKey& Other);
-  
-  Standard_EXPORT
-    GEOMAlgo_PassKey& Assign(const GEOMAlgo_PassKey& Other) ;
-    
-  GEOMAlgo_PassKey& operator =(const GEOMAlgo_PassKey& Other) {
-    return Assign(Other);
-  }
-  
-  Standard_EXPORT
-    void Clear() ;
-  
-  Standard_EXPORT
-    void SetIds(const Standard_Integer aI1) ;
-  
-  Standard_EXPORT
-    void SetIds(const Standard_Integer aI1,
-		const Standard_Integer aI2) ;
-  
-  Standard_EXPORT
-    void SetIds(const Standard_Integer aI1,
-		const Standard_Integer aI2,
-		const Standard_Integer aI3) ;
-  
-  Standard_EXPORT
-    void SetIds(const Standard_Integer aI1,
-		const Standard_Integer aI2,
-		const Standard_Integer aI3,
-		const Standard_Integer aI4) ;
-  
-  Standard_EXPORT
-    void SetIds(const TColStd_ListOfInteger& aLS) ;
-  
-  Standard_EXPORT
-    Standard_Integer NbIds() const;
-  
-  Standard_EXPORT
-    Standard_Boolean IsEqual(const GEOMAlgo_PassKey& aOther) const;
-  
-  Standard_EXPORT
-    Standard_Integer HashCode(const Standard_Integer Upper) const;
-  
-  Standard_EXPORT
-    Standard_Integer Id(const Standard_Integer aIndex) const;
-  
-  Standard_EXPORT
-    void Dump(const Standard_Integer aHex = 0) const;
-
- protected:
-  Standard_Integer myNbIds;
-  Standard_Integer mySum;
-  TColStd_IndexedMapOfInteger myMap;
-};
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File:        GEOMAlgo_PassKey.hxx
+// Created:
+// Author:      Peter KURNEV
+//              <peter@PREFEX>
+//
+#ifndef _GEOMAlgo_PassKey_HeaderFile
+#define _GEOMAlgo_PassKey_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Macro.hxx>
+#include <Standard_Integer.hxx>
+#include <TColStd_IndexedMapOfInteger.hxx>
+#include <Standard_Boolean.hxx>
+#include <TColStd_ListOfInteger.hxx>
+
+//=======================================================================
+//class : GEOMAlgo_PassKey
+//purpose  :
+//=======================================================================
+class GEOMAlgo_PassKey  {
+ public:
+  Standard_EXPORT
+    GEOMAlgo_PassKey();
+
+  Standard_EXPORT
+    virtual ~GEOMAlgo_PassKey();
+
+  Standard_EXPORT
+    GEOMAlgo_PassKey(const GEOMAlgo_PassKey& Other);
+
+  Standard_EXPORT
+    GEOMAlgo_PassKey& Assign(const GEOMAlgo_PassKey& Other) ;
+
+  GEOMAlgo_PassKey& operator =(const GEOMAlgo_PassKey& Other) {
+    return Assign(Other);
+  }
+
+  Standard_EXPORT
+    void Clear() ;
+
+  Standard_EXPORT
+    void SetIds(const Standard_Integer aI1) ;
+
+  Standard_EXPORT
+    void SetIds(const Standard_Integer aI1,
+		const Standard_Integer aI2) ;
+
+  Standard_EXPORT
+    void SetIds(const Standard_Integer aI1,
+		const Standard_Integer aI2,
+		const Standard_Integer aI3) ;
+
+  Standard_EXPORT
+    void SetIds(const Standard_Integer aI1,
+		const Standard_Integer aI2,
+		const Standard_Integer aI3,
+		const Standard_Integer aI4) ;
+
+  Standard_EXPORT
+    void SetIds(const TColStd_ListOfInteger& aLS) ;
+
+  Standard_EXPORT
+    Standard_Integer NbIds() const;
+
+  Standard_EXPORT
+    Standard_Boolean IsEqual(const GEOMAlgo_PassKey& aOther) const;
+
+  Standard_EXPORT
+    Standard_Integer HashCode(const Standard_Integer Upper) const;
+
+  Standard_EXPORT
+    Standard_Integer Id(const Standard_Integer aIndex) const;
+
+  Standard_EXPORT
+    void Dump(const Standard_Integer aHex = 0) const;
+
+ protected:
+  Standard_Integer myNbIds;
+  Standard_Integer mySum;
+  TColStd_IndexedMapOfInteger myMap;
+};
+#endif
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_PassKeyMapHasher.cxx b/src/GEOMAlgo_NEW/GEOMAlgo_PassKeyMapHasher.cxx
index 70ab9f3bc..32e62875c 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_PassKeyMapHasher.cxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_PassKeyMapHasher.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -21,7 +21,7 @@
 //
 
 // File:        GEOMAlgo_PassKeyMapHasher.cxx
-// Created:     
+// Created:
 // Author:      Peter KURNEV
 //              <pkv@irinox>
 //
@@ -29,7 +29,7 @@
 
 //=======================================================================
 //function : HashCode
-//purpose  : 
+//purpose  :
 //=======================================================================
   Standard_Integer GEOMAlgo_PassKeyMapHasher::HashCode(const GEOMAlgo_PassKey& aPK,
                                                        const Standard_Integer Upper)
@@ -38,7 +38,7 @@
 }
 //=======================================================================
 //function :IsEqual
-//purpose  : 
+//purpose  :
 //=======================================================================
   Standard_Boolean GEOMAlgo_PassKeyMapHasher::IsEqual(const GEOMAlgo_PassKey& aPK1,
                                                       const GEOMAlgo_PassKey& aPK2)
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_PassKeyMapHasher.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_PassKeyMapHasher.hxx
index 29e4b2d38..0b3039f1e 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_PassKeyMapHasher.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_PassKeyMapHasher.hxx
@@ -1,51 +1,51 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-
-// File:        GEOMAlgo_PassKeyMapHasher.hxx
-// Created:     
-// Author:      Peter KURNEV
-//              <pkv@irinox>
-//
-#ifndef _GEOMAlgo_PassKeyMapHasher_HeaderFile
-#define _GEOMAlgo_PassKeyMapHasher_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_Macro.hxx>
-#include <Standard_Integer.hxx>
-#include <Standard_Boolean.hxx>
-#include <GEOMAlgo_PassKey.hxx>
-
-//=======================================================================
-//class : GEOMAlgo_PassKeyMapHasher
-//purpose  : 
-//=======================================================================
-class GEOMAlgo_PassKeyMapHasher  {
- public:
-  Standard_EXPORT
-    static  Standard_Integer HashCode(const GEOMAlgo_PassKey& aPKey,
-				      const Standard_Integer Upper) ;
-  
-  Standard_EXPORT   
-    static  Standard_Boolean IsEqual(const GEOMAlgo_PassKey& aPKey1,
-				     const GEOMAlgo_PassKey& aPKey2) ;
-};
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File:        GEOMAlgo_PassKeyMapHasher.hxx
+// Created:
+// Author:      Peter KURNEV
+//              <pkv@irinox>
+//
+#ifndef _GEOMAlgo_PassKeyMapHasher_HeaderFile
+#define _GEOMAlgo_PassKeyMapHasher_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Macro.hxx>
+#include <Standard_Integer.hxx>
+#include <Standard_Boolean.hxx>
+#include <GEOMAlgo_PassKey.hxx>
+
+//=======================================================================
+//class : GEOMAlgo_PassKeyMapHasher
+//purpose  :
+//=======================================================================
+class GEOMAlgo_PassKeyMapHasher  {
+ public:
+  Standard_EXPORT
+    static  Standard_Integer HashCode(const GEOMAlgo_PassKey& aPKey,
+				      const Standard_Integer Upper) ;
+
+  Standard_EXPORT
+    static  Standard_Boolean IsEqual(const GEOMAlgo_PassKey& aPKey1,
+				     const GEOMAlgo_PassKey& aPKey2) ;
+};
+#endif
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_PassKeyShape.cxx b/src/GEOMAlgo_NEW/GEOMAlgo_PassKeyShape.cxx
index 107660912..3aa4f4b04 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_PassKeyShape.cxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_PassKeyShape.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -21,7 +21,7 @@
 //
 
 // File:        GEOMAlgo_PassKeyShape.cxx
-// Created:     
+// Created:
 // Author:      Peter KURNEV
 //              <pkv@irinox>
 //
@@ -31,12 +31,12 @@
 #include <TopTools_ListIteratorOfListOfShape.hxx>
 
 
-static 
+static
   Standard_Integer NormalizedId(const Standard_Integer aId,
                                 const Standard_Integer aDiv);
 //=======================================================================
 //function :
-//purpose  : 
+//purpose  :
 //=======================================================================
   GEOMAlgo_PassKeyShape::GEOMAlgo_PassKeyShape()
 {
@@ -44,7 +44,7 @@ static
 }
 //=======================================================================
 //function :
-//purpose  : 
+//purpose  :
 //=======================================================================
   GEOMAlgo_PassKeyShape::GEOMAlgo_PassKeyShape(const GEOMAlgo_PassKeyShape& aOther)
 {
@@ -55,14 +55,14 @@ static
 }
 //=======================================================================
 //function :~
-//purpose  : 
+//purpose  :
 //=======================================================================
   GEOMAlgo_PassKeyShape::~GEOMAlgo_PassKeyShape()
 {
 }
 //=======================================================================
 //function :Assign
-//purpose  : 
+//purpose  :
 //=======================================================================
   GEOMAlgo_PassKeyShape& GEOMAlgo_PassKeyShape::Assign(const GEOMAlgo_PassKeyShape& aOther)
 {
@@ -74,7 +74,7 @@ static
 }
 //=======================================================================
 //function :Clear
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_PassKeyShape::Clear()
 {
@@ -84,10 +84,10 @@ static
 }
 //=======================================================================
 //function :SetShapes
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_PassKeyShape::SetShapes(const TopoDS_Shape& aS1)
-                               
+
 {
   Standard_Integer aHC;
   //
@@ -99,7 +99,7 @@ static
 }
 //=======================================================================
 //function :SetShapes
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_PassKeyShape::SetShapes(const TopoDS_Shape& aS1,
                                         const TopoDS_Shape& aS2)
@@ -112,7 +112,7 @@ static
 }
 //=======================================================================
 //function :SetShapes
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_PassKeyShape::SetShapes(const TopoDS_Shape& aS1,
                                         const TopoDS_Shape& aS2,
@@ -127,7 +127,7 @@ static
 }
 //=======================================================================
 //function :SetShapes
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_PassKeyShape::SetShapes(const TopoDS_Shape& aS1,
                                         const TopoDS_Shape& aS2,
@@ -144,7 +144,7 @@ static
 }
 //=======================================================================
 //function :SetShapes
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_PassKeyShape::SetShapes(const TopTools_ListOfShape& aLS)
 {
@@ -167,7 +167,7 @@ static
 }
 //=======================================================================
 //function :NbIds
-//purpose  : 
+//purpose  :
 //=======================================================================
   Standard_Integer GEOMAlgo_PassKeyShape::NbIds()const
 {
@@ -175,7 +175,7 @@ static
 }
 //=======================================================================
 //function :IsEqual
-//purpose  : 
+//purpose  :
 //=======================================================================
   Standard_Boolean GEOMAlgo_PassKeyShape::IsEqual(const GEOMAlgo_PassKeyShape& aOther) const
 {
@@ -197,7 +197,7 @@ static
 }
 //=======================================================================
 //function : HashCode
-//purpose  : 
+//purpose  :
 //=======================================================================
   Standard_Integer GEOMAlgo_PassKeyShape::HashCode(const Standard_Integer aUpper) const
 {
@@ -205,14 +205,14 @@ static
 }
 //=======================================================================
 //function : Dump
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_PassKeyShape::Dump(const Standard_Integer)const
 {
 }
 //=======================================================================
 // function: NormalizedId
-// purpose : 
+// purpose :
 //=======================================================================
 Standard_Integer NormalizedId(const Standard_Integer aId,
                               const Standard_Integer aDiv)
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_PassKeyShape.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_PassKeyShape.hxx
index b74bb02b7..1f886be33 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_PassKeyShape.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_PassKeyShape.hxx
@@ -1,105 +1,105 @@
-
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-
-// File:        GEOMAlgo_PassKeyShape.hxx
-// Created:     
-// Author:      Peter KURNEV
-//              <pkv@irinox>
-//
-#ifndef _GEOMAlgo_PassKeyShape_HeaderFile
-#define _GEOMAlgo_PassKeyShape_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_Macro.hxx>
-#include <Standard_Integer.hxx>
-#include <TopTools_IndexedMapOfShape.hxx>
-#include <Standard_Boolean.hxx>
-#include <TopoDS_Shape.hxx>
-#include <TopTools_ListOfShape.hxx>
-
-
-//=======================================================================
-//class    : GEOMAlgo_PassKeyShape
-//purpose  : 
-//=======================================================================
-class GEOMAlgo_PassKeyShape  {
- public:
-  Standard_EXPORT
-    GEOMAlgo_PassKeyShape();
-  
-  Standard_EXPORT 
-    virtual ~GEOMAlgo_PassKeyShape();
-  
-  Standard_EXPORT
-    GEOMAlgo_PassKeyShape(const GEOMAlgo_PassKeyShape& Other);
-  
-  Standard_EXPORT
-    GEOMAlgo_PassKeyShape& Assign(const GEOMAlgo_PassKeyShape& Other) ;
-    
-  GEOMAlgo_PassKeyShape& operator =(const GEOMAlgo_PassKeyShape& Other) {
-    return Assign(Other);
-  }
-  
-  Standard_EXPORT
-    void SetShapes(const TopoDS_Shape& aS) ;
-  
-  Standard_EXPORT
-    void SetShapes(const TopoDS_Shape& aS1,
-		   const TopoDS_Shape& aS2) ;
-  
-  Standard_EXPORT
-    void SetShapes(const TopoDS_Shape& aS1,
-		   const TopoDS_Shape& aS2,
-		   const TopoDS_Shape& aS3) ;
-  
-  Standard_EXPORT
-    void SetShapes(const TopoDS_Shape& aS1,
-		   const TopoDS_Shape& aS2,
-		   const TopoDS_Shape& aS3,
-		   const TopoDS_Shape& aS4) ;
-  
-  Standard_EXPORT
-    void SetShapes(const TopTools_ListOfShape& aLS) ;
-  
-  Standard_EXPORT
-    void Clear() ;
-  
-  Standard_EXPORT
-    Standard_Integer NbIds() const;
-  
-  Standard_EXPORT
-    Standard_Boolean IsEqual(const GEOMAlgo_PassKeyShape& aOther) const;
-  
-  Standard_EXPORT
-    Standard_Integer HashCode(const Standard_Integer Upper) const;
-  
-  Standard_EXPORT
-    void Dump(const Standard_Integer aHex = 0) const;
-
-protected:
-  Standard_Integer myNbIds;
-  Standard_Integer mySum;
-  Standard_Integer myUpper;
-  TopTools_IndexedMapOfShape myMap;
-};
-#endif
+
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File:        GEOMAlgo_PassKeyShape.hxx
+// Created:
+// Author:      Peter KURNEV
+//              <pkv@irinox>
+//
+#ifndef _GEOMAlgo_PassKeyShape_HeaderFile
+#define _GEOMAlgo_PassKeyShape_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Macro.hxx>
+#include <Standard_Integer.hxx>
+#include <TopTools_IndexedMapOfShape.hxx>
+#include <Standard_Boolean.hxx>
+#include <TopoDS_Shape.hxx>
+#include <TopTools_ListOfShape.hxx>
+
+
+//=======================================================================
+//class    : GEOMAlgo_PassKeyShape
+//purpose  :
+//=======================================================================
+class GEOMAlgo_PassKeyShape  {
+ public:
+  Standard_EXPORT
+    GEOMAlgo_PassKeyShape();
+
+  Standard_EXPORT
+    virtual ~GEOMAlgo_PassKeyShape();
+
+  Standard_EXPORT
+    GEOMAlgo_PassKeyShape(const GEOMAlgo_PassKeyShape& Other);
+
+  Standard_EXPORT
+    GEOMAlgo_PassKeyShape& Assign(const GEOMAlgo_PassKeyShape& Other) ;
+
+  GEOMAlgo_PassKeyShape& operator =(const GEOMAlgo_PassKeyShape& Other) {
+    return Assign(Other);
+  }
+
+  Standard_EXPORT
+    void SetShapes(const TopoDS_Shape& aS) ;
+
+  Standard_EXPORT
+    void SetShapes(const TopoDS_Shape& aS1,
+		   const TopoDS_Shape& aS2) ;
+
+  Standard_EXPORT
+    void SetShapes(const TopoDS_Shape& aS1,
+		   const TopoDS_Shape& aS2,
+		   const TopoDS_Shape& aS3) ;
+
+  Standard_EXPORT
+    void SetShapes(const TopoDS_Shape& aS1,
+		   const TopoDS_Shape& aS2,
+		   const TopoDS_Shape& aS3,
+		   const TopoDS_Shape& aS4) ;
+
+  Standard_EXPORT
+    void SetShapes(const TopTools_ListOfShape& aLS) ;
+
+  Standard_EXPORT
+    void Clear() ;
+
+  Standard_EXPORT
+    Standard_Integer NbIds() const;
+
+  Standard_EXPORT
+    Standard_Boolean IsEqual(const GEOMAlgo_PassKeyShape& aOther) const;
+
+  Standard_EXPORT
+    Standard_Integer HashCode(const Standard_Integer Upper) const;
+
+  Standard_EXPORT
+    void Dump(const Standard_Integer aHex = 0) const;
+
+protected:
+  Standard_Integer myNbIds;
+  Standard_Integer mySum;
+  Standard_Integer myUpper;
+  TopTools_IndexedMapOfShape myMap;
+};
+#endif
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_PassKeyShapeMapHasher.cxx b/src/GEOMAlgo_NEW/GEOMAlgo_PassKeyShapeMapHasher.cxx
index 2c534d892..d90110080 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_PassKeyShapeMapHasher.cxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_PassKeyShapeMapHasher.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -21,7 +21,7 @@
 //
 
 // File:        GEOMAlgo_PassKeyMapHasher.cxx
-// Created:     
+// Created:
 // Author:      Peter KURNEV
 //              <pkv@irinox>
 //
@@ -29,7 +29,7 @@
 
 //=======================================================================
 //function : HashCode
-//purpose  : 
+//purpose  :
 //=======================================================================
   Standard_Integer GEOMAlgo_PassKeyShapeMapHasher::HashCode(const GEOMAlgo_PassKeyShape& aPK,
                                                             const Standard_Integer Upper)
@@ -38,7 +38,7 @@
 }
 //=======================================================================
 //function :IsEqual
-//purpose  : 
+//purpose  :
 //=======================================================================
   Standard_Boolean GEOMAlgo_PassKeyShapeMapHasher::IsEqual(const GEOMAlgo_PassKeyShape& aPK1,
                                                            const GEOMAlgo_PassKeyShape& aPK2)
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_PassKeyShapeMapHasher.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_PassKeyShapeMapHasher.hxx
index 018f5f979..41f15bf3e 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_PassKeyShapeMapHasher.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_PassKeyShapeMapHasher.hxx
@@ -1,52 +1,52 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-
-// File:        GEOMAlgo_PassKeyMapHasher.hxx
-// Created:     
-// Author:      Peter KURNEV
-//              <pkv@irinox>
-//
-#ifndef _GEOMAlgo_PassKeyShapeMapHasher_HeaderFile
-#define _GEOMAlgo_PassKeyShapeMapHasher_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_Macro.hxx>
-#include <Standard_Integer.hxx>
-#include <Standard_Boolean.hxx>
-#include <GEOMAlgo_PassKeyShape.hxx>
-
-//=======================================================================
-//class    : GEOMAlgo_PassKeyShapeMapHasher
-//purpose  : 
-//=======================================================================
-class GEOMAlgo_PassKeyShapeMapHasher  
-{
- public:
-  Standard_EXPORT
-    static  Standard_Integer HashCode(const GEOMAlgo_PassKeyShape& aPKey,
-				      const Standard_Integer Upper) ;
-  
-  Standard_EXPORT
-    static  Standard_Boolean IsEqual(const GEOMAlgo_PassKeyShape& aPKey1,
-				     const GEOMAlgo_PassKeyShape& aPKey2) ;
-};
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File:        GEOMAlgo_PassKeyMapHasher.hxx
+// Created:
+// Author:      Peter KURNEV
+//              <pkv@irinox>
+//
+#ifndef _GEOMAlgo_PassKeyShapeMapHasher_HeaderFile
+#define _GEOMAlgo_PassKeyShapeMapHasher_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Macro.hxx>
+#include <Standard_Integer.hxx>
+#include <Standard_Boolean.hxx>
+#include <GEOMAlgo_PassKeyShape.hxx>
+
+//=======================================================================
+//class    : GEOMAlgo_PassKeyShapeMapHasher
+//purpose  :
+//=======================================================================
+class GEOMAlgo_PassKeyShapeMapHasher
+{
+ public:
+  Standard_EXPORT
+    static  Standard_Integer HashCode(const GEOMAlgo_PassKeyShape& aPKey,
+				      const Standard_Integer Upper) ;
+
+  Standard_EXPORT
+    static  Standard_Boolean IsEqual(const GEOMAlgo_PassKeyShape& aPKey1,
+				     const GEOMAlgo_PassKeyShape& aPKey2) ;
+};
+#endif
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_ShapeAlgo.cxx b/src/GEOMAlgo_NEW/GEOMAlgo_ShapeAlgo.cxx
index 4e906bffc..b24f71b7a 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_ShapeAlgo.cxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_ShapeAlgo.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -30,25 +30,25 @@
 
 //=======================================================================
 //function : GEOMAlgo_ShapeAlgo
-//purpose  : 
+//purpose  :
 //=======================================================================
 GEOMAlgo_ShapeAlgo::GEOMAlgo_ShapeAlgo()
-: 
+:
   GEOMAlgo_Algo()
 {
   myTolerance=0.0001;
 }
-       
+
 //=======================================================================
 //function : ~
-//purpose  : 
+//purpose  :
 //=======================================================================
 GEOMAlgo_ShapeAlgo::~GEOMAlgo_ShapeAlgo()
 {
 }
 //=======================================================================
 //function : SetContext
-//purpose  : 
+//purpose  :
 //=======================================================================
 void GEOMAlgo_ShapeAlgo::SetContext(const Handle(IntTools_Context)& theContext)
 {
@@ -56,15 +56,15 @@ void GEOMAlgo_ShapeAlgo::SetContext(const Handle(IntTools_Context)& theContext)
 }
 //=======================================================================
 //function : Context
-//purpose  : 
+//purpose  :
 //=======================================================================
-const Handle(IntTools_Context)& GEOMAlgo_ShapeAlgo::Context()const 
+const Handle(IntTools_Context)& GEOMAlgo_ShapeAlgo::Context()const
 {
   return myContext;
 }
 //=======================================================================
 //function : SetShape
-//purpose  : 
+//purpose  :
 //=======================================================================
 void GEOMAlgo_ShapeAlgo::SetShape(const TopoDS_Shape& aS)
 {
@@ -72,7 +72,7 @@ void GEOMAlgo_ShapeAlgo::SetShape(const TopoDS_Shape& aS)
 }
 //=======================================================================
 //function : Shape
-//purpose  : 
+//purpose  :
 //=======================================================================
 const TopoDS_Shape& GEOMAlgo_ShapeAlgo::Shape()const
 {
@@ -80,7 +80,7 @@ const TopoDS_Shape& GEOMAlgo_ShapeAlgo::Shape()const
 }
 //=======================================================================
 //function : SetTolerance
-//purpose  : 
+//purpose  :
 //=======================================================================
 void GEOMAlgo_ShapeAlgo::SetTolerance(const Standard_Real aT)
 {
@@ -88,7 +88,7 @@ void GEOMAlgo_ShapeAlgo::SetTolerance(const Standard_Real aT)
 }
 //=======================================================================
 //function : Tolerance
-//purpose  : 
+//purpose  :
 //=======================================================================
 Standard_Real GEOMAlgo_ShapeAlgo::Tolerance()const
 {
@@ -96,7 +96,7 @@ Standard_Real GEOMAlgo_ShapeAlgo::Tolerance()const
 }
 //=======================================================================
 //function : Result
-//purpose  : 
+//purpose  :
 //=======================================================================
 const TopoDS_Shape& GEOMAlgo_ShapeAlgo::Result()const
 {
@@ -104,7 +104,7 @@ const TopoDS_Shape& GEOMAlgo_ShapeAlgo::Result()const
 }
 //=======================================================================
 //function : Perform
-//purpose  : 
+//purpose  :
 //=======================================================================
 void GEOMAlgo_ShapeAlgo::Perform()
 {
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_ShapeAlgo.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_ShapeAlgo.hxx
index f1e2be117..98a8c0b3f 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_ShapeAlgo.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_ShapeAlgo.hxx
@@ -1,85 +1,85 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-
-// File:        GEOMAlgo_ShapeAlgo.hxx
-// Created:     Tue Dec  7 12:06:54 2004
-// Author:      Peter KURNEV
-//              <pkv@irinox>
-//
-#ifndef _GEOMAlgo_ShapeAlgo_HeaderFile
-#define _GEOMAlgo_ShapeAlgo_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_Macro.hxx>
-#include <TopoDS_Shape.hxx>
-#include <Standard_Real.hxx>
-#include <Handle_IntTools_Context.hxx>
-#include <GEOMAlgo_Algo.hxx>
-
-//=======================================================================
-//class    : GEOMAlgo_ShapeAlgo
-//purpose  : 
-//=======================================================================
-class GEOMAlgo_ShapeAlgo  : public GEOMAlgo_Algo 
-{
- public:
-
-  //! Sets cashed geometrical tools <br>
-  Standard_EXPORT
-    void SetContext(const Handle(IntTools_Context)& theContext) ;
-  
-  //! Returns cashed geometrical tools <br>
-  Standard_EXPORT
-    const Handle_IntTools_Context& Context() const;
-  
-  Standard_EXPORT
-    void SetShape(const TopoDS_Shape& aS) ;
-  
-  Standard_EXPORT
-    void SetTolerance(const Standard_Real aT) ;
-  
-  Standard_EXPORT
-    const TopoDS_Shape& Shape() const;
-  
-  Standard_EXPORT
-    Standard_Real Tolerance() const;
-  
-  Standard_EXPORT
-    const TopoDS_Shape& Result() const;
-  
-  Standard_EXPORT
-    virtual  void Perform() ;
-
-protected:
-  Standard_EXPORT
-    GEOMAlgo_ShapeAlgo();
-  
-  Standard_EXPORT
-    virtual ~GEOMAlgo_ShapeAlgo();
-
-
-  TopoDS_Shape myShape;
-  Standard_Real myTolerance;
-  TopoDS_Shape myResult;
-  Handle_IntTools_Context myContext;
-};
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File:        GEOMAlgo_ShapeAlgo.hxx
+// Created:     Tue Dec  7 12:06:54 2004
+// Author:      Peter KURNEV
+//              <pkv@irinox>
+//
+#ifndef _GEOMAlgo_ShapeAlgo_HeaderFile
+#define _GEOMAlgo_ShapeAlgo_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Macro.hxx>
+#include <TopoDS_Shape.hxx>
+#include <Standard_Real.hxx>
+#include <Handle_IntTools_Context.hxx>
+#include <GEOMAlgo_Algo.hxx>
+
+//=======================================================================
+//class    : GEOMAlgo_ShapeAlgo
+//purpose  :
+//=======================================================================
+class GEOMAlgo_ShapeAlgo  : public GEOMAlgo_Algo
+{
+ public:
+
+  //! Sets cashed geometrical tools <br>
+  Standard_EXPORT
+    void SetContext(const Handle(IntTools_Context)& theContext) ;
+
+  //! Returns cashed geometrical tools <br>
+  Standard_EXPORT
+    const Handle_IntTools_Context& Context() const;
+
+  Standard_EXPORT
+    void SetShape(const TopoDS_Shape& aS) ;
+
+  Standard_EXPORT
+    void SetTolerance(const Standard_Real aT) ;
+
+  Standard_EXPORT
+    const TopoDS_Shape& Shape() const;
+
+  Standard_EXPORT
+    Standard_Real Tolerance() const;
+
+  Standard_EXPORT
+    const TopoDS_Shape& Result() const;
+
+  Standard_EXPORT
+    virtual  void Perform() ;
+
+protected:
+  Standard_EXPORT
+    GEOMAlgo_ShapeAlgo();
+
+  Standard_EXPORT
+    virtual ~GEOMAlgo_ShapeAlgo();
+
+
+  TopoDS_Shape myShape;
+  Standard_Real myTolerance;
+  TopoDS_Shape myResult;
+  Handle_IntTools_Context myContext;
+};
+#endif
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_ShapeInfo.cxx b/src/GEOMAlgo_NEW/GEOMAlgo_ShapeInfo.cxx
index 91f490e70..63d0ff90d 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_ShapeInfo.cxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_ShapeInfo.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -25,20 +25,20 @@ static
 static
   void DumpKindOfShape(const GEOMAlgo_KindOfShape aKS);
 static
-  void DumpKindOfClosed(const GEOMAlgo_KindOfClosed aKC); 
+  void DumpKindOfClosed(const GEOMAlgo_KindOfClosed aKC);
 static
   void DumpKindOfBounds(const GEOMAlgo_KindOfBounds aKB);
 static
   void DumpKindOfName(const GEOMAlgo_KindOfName aKS);
 static
-  void DumpPosition(const gp_Ax3& aAx3); 
+  void DumpPosition(const gp_Ax3& aAx3);
 static
   void DumpLocation(const gp_Pnt& aP);
 static
   void DumpDirection(const gp_Dir& aD);
 //=======================================================================
-//function : 
-//purpose  : 
+//function :
+//purpose  :
 //=======================================================================
   GEOMAlgo_ShapeInfo::GEOMAlgo_ShapeInfo()
 {
@@ -46,14 +46,14 @@ static
 }
 //=======================================================================
 //function : ~
-//purpose  : 
+//purpose  :
 //=======================================================================
   GEOMAlgo_ShapeInfo::~GEOMAlgo_ShapeInfo()
 {
 }
 //=======================================================================
 //function : Reset
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_ShapeInfo::Reset()
 {
@@ -82,15 +82,15 @@ static
 }
 //=======================================================================
 //function : SetType
-//purpose  : 
+//purpose  :
 //=======================================================================
-  void GEOMAlgo_ShapeInfo::SetType(const TopAbs_ShapeEnum aType) 
+  void GEOMAlgo_ShapeInfo::SetType(const TopAbs_ShapeEnum aType)
 {
   myType=aType;
 }
 //=======================================================================
 //function : Type
-//purpose  : 
+//purpose  :
 //=======================================================================
   TopAbs_ShapeEnum GEOMAlgo_ShapeInfo::Type() const
 {
@@ -98,13 +98,13 @@ static
 }
 //=======================================================================
 //function : SetNbSubShapes
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_ShapeInfo::SetNbSubShapes(const TopAbs_ShapeEnum aType,
-                                          const Standard_Integer aNb) 
+                                          const Standard_Integer aNb)
 {
   Standard_Integer iN;
-  
+
   iN=TypeToInteger(aType);
   if (iN>=0 && iN<myNbTypes) {
     myNbSubShapes[iN]=aNb;
@@ -112,12 +112,12 @@ static
 }
 //=======================================================================
 //function : NbSubShapes
-//purpose  : 
+//purpose  :
 //=======================================================================
   Standard_Integer GEOMAlgo_ShapeInfo::NbSubShapes(const TopAbs_ShapeEnum aType) const
 {
   Standard_Integer iN;
-  
+
   iN=TypeToInteger(aType);
   if (iN>=0 && iN<myNbTypes) {
     return myNbSubShapes[iN];
@@ -126,15 +126,15 @@ static
 }
 //=======================================================================
 //function : SetKindOfShape
-//purpose  : 
+//purpose  :
 //=======================================================================
-  void GEOMAlgo_ShapeInfo::SetKindOfShape(const GEOMAlgo_KindOfShape aT) 
+  void GEOMAlgo_ShapeInfo::SetKindOfShape(const GEOMAlgo_KindOfShape aT)
 {
   myKindOfShape=aT;
 }
 //=======================================================================
 //function : KindOfShape
-//purpose  : 
+//purpose  :
 //=======================================================================
   GEOMAlgo_KindOfShape GEOMAlgo_ShapeInfo::KindOfShape() const
 {
@@ -142,15 +142,15 @@ static
 }
 //=======================================================================
 //function : SetKindOfName
-//purpose  : 
+//purpose  :
 //=======================================================================
-  void GEOMAlgo_ShapeInfo::SetKindOfName(const GEOMAlgo_KindOfName aT) 
+  void GEOMAlgo_ShapeInfo::SetKindOfName(const GEOMAlgo_KindOfName aT)
 {
   myKindOfName=aT;
 }
 //=======================================================================
 //function : KindOfName
-//purpose  : 
+//purpose  :
 //=======================================================================
   GEOMAlgo_KindOfName GEOMAlgo_ShapeInfo::KindOfName() const
 {
@@ -158,15 +158,15 @@ static
 }
 //=======================================================================
 //function : SetKindOfBounds
-//purpose  : 
+//purpose  :
 //=======================================================================
-  void GEOMAlgo_ShapeInfo::SetKindOfBounds(const GEOMAlgo_KindOfBounds aT) 
+  void GEOMAlgo_ShapeInfo::SetKindOfBounds(const GEOMAlgo_KindOfBounds aT)
 {
   myKindOfBounds=aT;
 }
 //=======================================================================
 //function : KindOfBounds
-//purpose  : 
+//purpose  :
 //=======================================================================
   GEOMAlgo_KindOfBounds GEOMAlgo_ShapeInfo::KindOfBounds() const
 {
@@ -174,15 +174,15 @@ static
 }
 //=======================================================================
 //function : SetKindOfClosed
-//purpose  : 
+//purpose  :
 //=======================================================================
-  void GEOMAlgo_ShapeInfo::SetKindOfClosed(const GEOMAlgo_KindOfClosed aT) 
+  void GEOMAlgo_ShapeInfo::SetKindOfClosed(const GEOMAlgo_KindOfClosed aT)
 {
   myKindOfClosed=aT;
 }
 //=======================================================================
 //function : KindOfClosed
-//purpose  : 
+//purpose  :
 //=======================================================================
   GEOMAlgo_KindOfClosed GEOMAlgo_ShapeInfo::KindOfClosed() const
 {
@@ -190,15 +190,15 @@ static
 }
 //=======================================================================
 //function : SetLocation
-//purpose  : 
+//purpose  :
 //=======================================================================
-  void GEOMAlgo_ShapeInfo::SetLocation(const gp_Pnt& aP) 
+  void GEOMAlgo_ShapeInfo::SetLocation(const gp_Pnt& aP)
 {
   myLocation=aP;
 }
 //=======================================================================
 //function : Location
-//purpose  : 
+//purpose  :
 //=======================================================================
   const gp_Pnt& GEOMAlgo_ShapeInfo::Location() const
 {
@@ -206,15 +206,15 @@ static
 }
 //=======================================================================
 //function : SetDirection
-//purpose  : 
+//purpose  :
 //=======================================================================
-  void GEOMAlgo_ShapeInfo::SetDirection(const gp_Dir& aD) 
+  void GEOMAlgo_ShapeInfo::SetDirection(const gp_Dir& aD)
 {
   myDirection=aD;
 }
 //=======================================================================
 //function : Direction
-//purpose  : 
+//purpose  :
 //=======================================================================
   const gp_Dir& GEOMAlgo_ShapeInfo::Direction() const
 {
@@ -222,24 +222,24 @@ static
 }
 //=======================================================================
 //function : SetPosition
-//purpose  : 
+//purpose  :
 //=======================================================================
-  void GEOMAlgo_ShapeInfo::SetPosition(const gp_Ax2& aAx2) 
+  void GEOMAlgo_ShapeInfo::SetPosition(const gp_Ax2& aAx2)
 {
   gp_Ax3 aAx3(aAx2);
   SetPosition(aAx3);
 }
 //=======================================================================
 //function : SetPosition
-//purpose  : 
+//purpose  :
 //=======================================================================
-  void GEOMAlgo_ShapeInfo::SetPosition(const gp_Ax3& aAx3) 
+  void GEOMAlgo_ShapeInfo::SetPosition(const gp_Ax3& aAx3)
 {
   myPosition=aAx3;
 }
 //=======================================================================
 //function : Position
-//purpose  : 
+//purpose  :
 //=======================================================================
   const gp_Ax3& GEOMAlgo_ShapeInfo::Position() const
 {
@@ -248,15 +248,15 @@ static
 
 //=======================================================================
 //function : SetPnt1
-//purpose  : 
+//purpose  :
 //=======================================================================
-  void GEOMAlgo_ShapeInfo::SetPnt1(const gp_Pnt& aP) 
+  void GEOMAlgo_ShapeInfo::SetPnt1(const gp_Pnt& aP)
 {
   myPnt1=aP;
 }
 //=======================================================================
 //function : Pnt1
-//purpose  : 
+//purpose  :
 //=======================================================================
   const gp_Pnt& GEOMAlgo_ShapeInfo::Pnt1() const
 {
@@ -264,15 +264,15 @@ static
 }
 //=======================================================================
 //function : SetPnt2
-//purpose  : 
+//purpose  :
 //=======================================================================
-  void GEOMAlgo_ShapeInfo::SetPnt2(const gp_Pnt& aP) 
+  void GEOMAlgo_ShapeInfo::SetPnt2(const gp_Pnt& aP)
 {
   myPnt2=aP;
 }
 //=======================================================================
 //function : Pnt2
-//purpose  : 
+//purpose  :
 //=======================================================================
   const gp_Pnt& GEOMAlgo_ShapeInfo::Pnt2() const
 {
@@ -280,15 +280,15 @@ static
 }
 //=======================================================================
 //function : SetRadius1
-//purpose  : 
+//purpose  :
 //=======================================================================
-  void GEOMAlgo_ShapeInfo::SetRadius1(const Standard_Real aR) 
+  void GEOMAlgo_ShapeInfo::SetRadius1(const Standard_Real aR)
 {
   myRadius1=aR;
 }
 //=======================================================================
 //function : Radius1
-//purpose  : 
+//purpose  :
 //=======================================================================
   Standard_Real GEOMAlgo_ShapeInfo::Radius1() const
 {
@@ -296,15 +296,15 @@ static
 }
 //=======================================================================
 //function : SetRadius2
-//purpose  : 
+//purpose  :
 //=======================================================================
-  void GEOMAlgo_ShapeInfo::SetRadius2(const Standard_Real aR) 
+  void GEOMAlgo_ShapeInfo::SetRadius2(const Standard_Real aR)
 {
   myRadius2=aR;
 }
 //=======================================================================
 //function : Radius2
-//purpose  : 
+//purpose  :
 //=======================================================================
   Standard_Real GEOMAlgo_ShapeInfo::Radius2() const
 {
@@ -312,15 +312,15 @@ static
 }
 //=======================================================================
 //function : SetLength
-//purpose  : 
+//purpose  :
 //=======================================================================
-  void GEOMAlgo_ShapeInfo::SetLength(const Standard_Real aL) 
+  void GEOMAlgo_ShapeInfo::SetLength(const Standard_Real aL)
 {
   myLength=aL;
 }
 //=======================================================================
 //function : Length
-//purpose  : 
+//purpose  :
 //=======================================================================
   Standard_Real GEOMAlgo_ShapeInfo::Length() const
 {
@@ -328,15 +328,15 @@ static
 }
 //=======================================================================
 //function : SetWidth
-//purpose  : 
+//purpose  :
 //=======================================================================
-  void GEOMAlgo_ShapeInfo::SetWidth(const Standard_Real aW) 
+  void GEOMAlgo_ShapeInfo::SetWidth(const Standard_Real aW)
 {
   myWidth=aW;
 }
 //=======================================================================
 //function : Width
-//purpose  : 
+//purpose  :
 //=======================================================================
   Standard_Real GEOMAlgo_ShapeInfo::Width() const
 {
@@ -344,15 +344,15 @@ static
 }
 //=======================================================================
 //function : SetHeight
-//purpose  : 
+//purpose  :
 //=======================================================================
-  void GEOMAlgo_ShapeInfo::SetHeight(const Standard_Real aH) 
+  void GEOMAlgo_ShapeInfo::SetHeight(const Standard_Real aH)
 {
   myHeight=aH;
 }
 //=======================================================================
 //function : Height
-//purpose  : 
+//purpose  :
 //=======================================================================
   Standard_Real GEOMAlgo_ShapeInfo::Height() const
 {
@@ -360,7 +360,7 @@ static
 }
 //=======================================================================
 //function : TypeToInteger
-//purpose  : 
+//purpose  :
 //=======================================================================
 Standard_Integer TypeToInteger(const TopAbs_ShapeEnum aType)
 {
@@ -371,7 +371,7 @@ Standard_Integer TypeToInteger(const TopAbs_ShapeEnum aType)
 }
 //=======================================================================
 //function : Dump
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_ShapeInfo::Dump()const
 {
@@ -416,7 +416,7 @@ Standard_Integer TypeToInteger(const TopAbs_ShapeEnum aType)
 }
 //=======================================================================
 //function : DumpCompound
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_ShapeInfo::DumpCompound()const
 {
@@ -451,7 +451,7 @@ Standard_Integer TypeToInteger(const TopAbs_ShapeEnum aType)
 }
 //=======================================================================
 //function : DumpCompSolid
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_ShapeInfo::DumpCompSolid()const
 {
@@ -483,7 +483,7 @@ Standard_Integer TypeToInteger(const TopAbs_ShapeEnum aType)
 
 //=======================================================================
 //function : DumpSolid
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_ShapeInfo::DumpSolid()const
 {
@@ -540,7 +540,7 @@ Standard_Integer TypeToInteger(const TopAbs_ShapeEnum aType)
   }
   else if (aKN==GEOMAlgo_KN_BOX) {
     DumpLocation (myLocation);
-    DumpPosition (myPosition); 
+    DumpPosition (myPosition);
     printf("  Length    : %.3lf\n", myLength);
     printf("  Width     : %.3lf\n", myWidth);
     printf("  Height    : %.3lf\n", myHeight);
@@ -549,7 +549,7 @@ Standard_Integer TypeToInteger(const TopAbs_ShapeEnum aType)
 
 //=======================================================================
 //function : DumpFace
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_ShapeInfo::DumpFace()const
 {
@@ -634,13 +634,13 @@ Standard_Integer TypeToInteger(const TopAbs_ShapeEnum aType)
     printf("  Radius1   : %.3lf\n", myRadius1);
     printf("  Radius2   : %.3lf\n", myRadius2);
   }
-  
+
 
   printf("\n");
 }
 //=======================================================================
 //function : DumpShell
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_ShapeInfo::DumpShell()const
 {
@@ -661,7 +661,7 @@ Standard_Integer TypeToInteger(const TopAbs_ShapeEnum aType)
 }
 //=======================================================================
 //function : DumpWire
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_ShapeInfo::DumpWire()const
 {
@@ -681,7 +681,7 @@ Standard_Integer TypeToInteger(const TopAbs_ShapeEnum aType)
 }
 //=======================================================================
 //function : DumpEdge
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_ShapeInfo::DumpEdge()const
 {
@@ -718,7 +718,7 @@ Standard_Integer TypeToInteger(const TopAbs_ShapeEnum aType)
     printf("  Pnt1 : %.3lf %.3lf %.3lf\n", aX, aY, aZ);
     myPnt2.Coord(aX, aY, aZ);
     printf("  Pnt2 : %.3lf %.3lf %.3lf\n", aX, aY, aZ);
-    
+
   }
   else if (aKN==GEOMAlgo_KN_CIRCLE) {
     DumpLocation (myLocation);
@@ -754,7 +754,7 @@ Standard_Integer TypeToInteger(const TopAbs_ShapeEnum aType)
 }
 //=======================================================================
 //function : DumpVertex
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_ShapeInfo::DumpVertex()const
 {
@@ -763,7 +763,7 @@ Standard_Integer TypeToInteger(const TopAbs_ShapeEnum aType)
 }
 //=======================================================================
 //function : DumpLocation
-//purpose  : 
+//purpose  :
 //=======================================================================
   void DumpLocation(const gp_Pnt& aP)
 {
@@ -774,7 +774,7 @@ Standard_Integer TypeToInteger(const TopAbs_ShapeEnum aType)
 }
 //=======================================================================
 //function : DumpDirection
-//purpose  : 
+//purpose  :
 //=======================================================================
   void DumpDirection(const gp_Dir& aD)
 {
@@ -785,9 +785,9 @@ Standard_Integer TypeToInteger(const TopAbs_ShapeEnum aType)
 }
 //=======================================================================
 //function : DumpPosition
-//purpose  : 
+//purpose  :
 //=======================================================================
-void DumpPosition(const gp_Ax3& aAx3) 
+void DumpPosition(const gp_Ax3& aAx3)
 {
   const gp_Dir& aDZ=aAx3.Axis().Direction();
   const gp_Dir& aDX=aAx3.XDirection();
@@ -796,49 +796,49 @@ void DumpPosition(const gp_Ax3& aAx3)
   printf("  Axis: %.3lf %.3lf %.3lf \n", aDZ.X(), aDZ.Y(), aDZ.Z());
   printf("  X   : %.3lf %.3lf %.3lf \n", aDX.X(), aDX.Y(), aDX.Z());
   printf("  Y   : %.3lf %.3lf %.3lf \n", aDY.X(), aDY.Y(), aDY.Z());
-} 
+}
 //=======================================================================
 //function : DumpKindOfBounds
-//purpose  : 
+//purpose  :
 //=======================================================================
 void DumpKindOfBounds(const GEOMAlgo_KindOfBounds aKB)
 {
   const char *pStr[]={
-    "KB_UNKNOWN", 
-    "KB_TRIMMED", 
+    "KB_UNKNOWN",
+    "KB_TRIMMED",
     "KB_INFINITE"
   };
   int i;
   //
   i=(Standard_Integer)aKB;
   printf(" KindOfBounds: %s\n", pStr[i]);
-  
+
 }
 //=======================================================================
 //function : DumpKindOfClosed
-//purpose  : 
+//purpose  :
 //=======================================================================
 void DumpKindOfClosed(const GEOMAlgo_KindOfClosed aKC)
 {
   const char *pStr[]={
-    "KC_UNKNOWN", 
-    "KC_CLOSED", 
+    "KC_UNKNOWN",
+    "KC_CLOSED",
     "KC_NOTCLOSED"
   };
   int i;
   //
   i=(Standard_Integer)aKC;
   printf(" KindOfClosed: %s\n", pStr[i]);
-  
+
 }
 //=======================================================================
 //function : DumpKindOfShape
-//purpose  : 
+//purpose  :
 //=======================================================================
 void DumpKindOfShape(const GEOMAlgo_KindOfShape aKS)
 {
   const char *pStr[]={
-    "KS_UNKNOWN", 
+    "KS_UNKNOWN",
     "KS_SPHERE",
     "KS_CYLINDER",
     "KS_BOX",
@@ -846,9 +846,9 @@ void DumpKindOfShape(const GEOMAlgo_KindOfShape aKS)
     "KS_CONE",
     "KS_ELLIPSE",
     "KS_PLANE",
-    "KS_CIRCLE", 
-    "KS_LINE", 
-    "KS_DEGENERATED" 
+    "KS_CIRCLE",
+    "KS_LINE",
+    "KS_DEGENERATED"
     };
   int i;
   //
@@ -857,12 +857,12 @@ void DumpKindOfShape(const GEOMAlgo_KindOfShape aKS)
 }
 //=======================================================================
 //function : DumpKindOfName
-//purpose  : 
+//purpose  :
 //=======================================================================
 void DumpKindOfName(const GEOMAlgo_KindOfName aKS)
 {
   const char *pStr[]={
-    "KN_UNKNOWN", 
+    "KN_UNKNOWN",
     "KN_SPHERE",
     "KN_CYLINDER",
     "KN_TORUS",
@@ -870,18 +870,18 @@ void DumpKindOfName(const GEOMAlgo_KindOfName aKS)
     "KN_ELLIPSE",
     "KN_CIRCLE",
     "KN_PLANE",
-    "KN_LINE", 
-    "KN_BOX", 
-    "KN_SEGMENT", 
-    "KN_ARCCIRCLE", 
-    "KN_POLYGON", 
+    "KN_LINE",
+    "KN_BOX",
+    "KN_SEGMENT",
+    "KN_ARCCIRCLE",
+    "KN_POLYGON",
     "KN_POLYHEDRON",
     "KN_DISKCIRCLE",
     "KN_DISKELLIPSE",
     "KN_RECTANGLE",
     "KN_TRIANGLE",
-    "KN_QUADRANGLE", 
-    "KN_ARCELLIPSE" 
+    "KN_QUADRANGLE",
+    "KN_ARCELLIPSE"
     };
   int i;
   //
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_ShapeInfo.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_ShapeInfo.hxx
index 718edb3d0..3f8323ecd 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_ShapeInfo.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_ShapeInfo.hxx
@@ -1,202 +1,202 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-
-
-#ifndef _GEOMAlgo_ShapeInfo_HeaderFile
-#define _GEOMAlgo_ShapeInfo_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_Macro.hxx>
-#include <TopAbs_ShapeEnum.hxx>
-#include <Standard_Integer.hxx>
-#include <GEOMAlgo_KindOfShape.hxx>
-#include <GEOMAlgo_KindOfName.hxx>
-#include <GEOMAlgo_KindOfBounds.hxx>
-#include <GEOMAlgo_KindOfClosed.hxx>
-#include <gp_Pnt.hxx>
-#include <gp_Dir.hxx>
-#include <gp_Ax3.hxx>
-#include <Standard_Real.hxx>
-#include <gp_Ax2.hxx>
-
-
-
-//=======================================================================
-//class : GEOMAlgo_ShapeInfo
-//purpose  : 
-//=======================================================================
-class GEOMAlgo_ShapeInfo  
-{
- public:
-  Standard_EXPORT
-    GEOMAlgo_ShapeInfo();
-
-  Standard_EXPORT
-    virtual ~GEOMAlgo_ShapeInfo();
-  
-  Standard_EXPORT
-    void Reset() ;
-  
-  Standard_EXPORT
-    void SetType(const TopAbs_ShapeEnum aType) ;
-  
-  Standard_EXPORT
-    TopAbs_ShapeEnum Type() const;
-  
-  Standard_EXPORT
-    void SetNbSubShapes(const TopAbs_ShapeEnum aType,const Standard_Integer aNb) ;
-  
-  Standard_EXPORT
-    Standard_Integer NbSubShapes(const TopAbs_ShapeEnum aType) const;
-  
-  Standard_EXPORT
-    void SetKindOfShape(const GEOMAlgo_KindOfShape aT) ;
-  
-  Standard_EXPORT
-    GEOMAlgo_KindOfShape KindOfShape() const;
-  
-  Standard_EXPORT
-    void SetKindOfName(const GEOMAlgo_KindOfName aT) ;
-  
-  Standard_EXPORT
-    GEOMAlgo_KindOfName KindOfName() const;
-  
-  Standard_EXPORT
-    void SetKindOfBounds(const GEOMAlgo_KindOfBounds aT) ;
-  
-  Standard_EXPORT
-    GEOMAlgo_KindOfBounds KindOfBounds() const;
-  
-  Standard_EXPORT
-    void SetKindOfClosed(const GEOMAlgo_KindOfClosed aT) ;
-  
-  Standard_EXPORT
-    GEOMAlgo_KindOfClosed KindOfClosed() const;
-  
-  Standard_EXPORT
-    void SetLocation(const gp_Pnt& aP) ;
-  
-  Standard_EXPORT
-    const gp_Pnt& Location() const;
-  
-  Standard_EXPORT
-    void SetDirection(const gp_Dir& aD) ;
-  
-  Standard_EXPORT
-    const gp_Dir& Direction() const;
-  
-  Standard_EXPORT
-    void SetPosition(const gp_Ax2& aAx2) ;
-  
-  Standard_EXPORT
-    void SetPosition(const gp_Ax3& aAx3) ;
-  
-  Standard_EXPORT
-    const gp_Ax3& Position() const;
-  
-  Standard_EXPORT
-    void SetPnt1(const gp_Pnt& aP) ;
-  
-  Standard_EXPORT
-    const gp_Pnt& Pnt1() const;
-  
-  Standard_EXPORT
-    void SetPnt2(const gp_Pnt& aP) ;
-  
-  Standard_EXPORT
-    const gp_Pnt& Pnt2() const;
-  
-  Standard_EXPORT
-    void SetRadius1(const Standard_Real aR) ;
-  
-  Standard_EXPORT
-    Standard_Real Radius1() const;
-  
-  Standard_EXPORT
-    void SetRadius2(const Standard_Real aR) ;
-  
-  Standard_EXPORT
-    Standard_Real Radius2() const;
-  
-  Standard_EXPORT
-    void SetLength(const Standard_Real aL) ;
-  
-  Standard_EXPORT
-    Standard_Real Length() const;
-  
-  Standard_EXPORT
-    void SetWidth(const Standard_Real aW) ;
-  
-  Standard_EXPORT
-    Standard_Real Width() const;
-  
-  Standard_EXPORT
-    void SetHeight(const Standard_Real aH) ;
-  
-  Standard_EXPORT
-    Standard_Real Height() const;
-  
-  Standard_EXPORT
-    void Dump() const;
-
- protected:
-  Standard_EXPORT
-    void DumpVertex() const;
-  
-  Standard_EXPORT
-    void DumpEdge() const;
-  
-  Standard_EXPORT
-    void DumpWire() const;
-  
-  Standard_EXPORT
-    void DumpFace() const;
-  
-  Standard_EXPORT
-    void DumpShell() const;
-  
-  Standard_EXPORT
-    void DumpSolid() const;
-  
-  Standard_EXPORT
-    void DumpCompSolid() const;
-  
-  Standard_EXPORT
-    void DumpCompound() const;
-
-
-  TopAbs_ShapeEnum myType;
-  Standard_Integer myNbSubShapes[9];
-  GEOMAlgo_KindOfShape myKindOfShape;
-  GEOMAlgo_KindOfName myKindOfName;
-  GEOMAlgo_KindOfBounds myKindOfBounds;
-  GEOMAlgo_KindOfClosed myKindOfClosed;
-  gp_Pnt myLocation;
-  gp_Dir myDirection;
-  gp_Ax3 myPosition;
-  Standard_Real myRadius1;
-  Standard_Real myRadius2;
-  Standard_Real myLength;
-  Standard_Real myWidth;
-  Standard_Real myHeight;
-  gp_Pnt myPnt1;
-  gp_Pnt myPnt2;
-  Standard_Integer myNbTypes;
-};
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+
+#ifndef _GEOMAlgo_ShapeInfo_HeaderFile
+#define _GEOMAlgo_ShapeInfo_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Macro.hxx>
+#include <TopAbs_ShapeEnum.hxx>
+#include <Standard_Integer.hxx>
+#include <GEOMAlgo_KindOfShape.hxx>
+#include <GEOMAlgo_KindOfName.hxx>
+#include <GEOMAlgo_KindOfBounds.hxx>
+#include <GEOMAlgo_KindOfClosed.hxx>
+#include <gp_Pnt.hxx>
+#include <gp_Dir.hxx>
+#include <gp_Ax3.hxx>
+#include <Standard_Real.hxx>
+#include <gp_Ax2.hxx>
+
+
+
+//=======================================================================
+//class : GEOMAlgo_ShapeInfo
+//purpose  :
+//=======================================================================
+class GEOMAlgo_ShapeInfo
+{
+ public:
+  Standard_EXPORT
+    GEOMAlgo_ShapeInfo();
+
+  Standard_EXPORT
+    virtual ~GEOMAlgo_ShapeInfo();
+
+  Standard_EXPORT
+    void Reset() ;
+
+  Standard_EXPORT
+    void SetType(const TopAbs_ShapeEnum aType) ;
+
+  Standard_EXPORT
+    TopAbs_ShapeEnum Type() const;
+
+  Standard_EXPORT
+    void SetNbSubShapes(const TopAbs_ShapeEnum aType,const Standard_Integer aNb) ;
+
+  Standard_EXPORT
+    Standard_Integer NbSubShapes(const TopAbs_ShapeEnum aType) const;
+
+  Standard_EXPORT
+    void SetKindOfShape(const GEOMAlgo_KindOfShape aT) ;
+
+  Standard_EXPORT
+    GEOMAlgo_KindOfShape KindOfShape() const;
+
+  Standard_EXPORT
+    void SetKindOfName(const GEOMAlgo_KindOfName aT) ;
+
+  Standard_EXPORT
+    GEOMAlgo_KindOfName KindOfName() const;
+
+  Standard_EXPORT
+    void SetKindOfBounds(const GEOMAlgo_KindOfBounds aT) ;
+
+  Standard_EXPORT
+    GEOMAlgo_KindOfBounds KindOfBounds() const;
+
+  Standard_EXPORT
+    void SetKindOfClosed(const GEOMAlgo_KindOfClosed aT) ;
+
+  Standard_EXPORT
+    GEOMAlgo_KindOfClosed KindOfClosed() const;
+
+  Standard_EXPORT
+    void SetLocation(const gp_Pnt& aP) ;
+
+  Standard_EXPORT
+    const gp_Pnt& Location() const;
+
+  Standard_EXPORT
+    void SetDirection(const gp_Dir& aD) ;
+
+  Standard_EXPORT
+    const gp_Dir& Direction() const;
+
+  Standard_EXPORT
+    void SetPosition(const gp_Ax2& aAx2) ;
+
+  Standard_EXPORT
+    void SetPosition(const gp_Ax3& aAx3) ;
+
+  Standard_EXPORT
+    const gp_Ax3& Position() const;
+
+  Standard_EXPORT
+    void SetPnt1(const gp_Pnt& aP) ;
+
+  Standard_EXPORT
+    const gp_Pnt& Pnt1() const;
+
+  Standard_EXPORT
+    void SetPnt2(const gp_Pnt& aP) ;
+
+  Standard_EXPORT
+    const gp_Pnt& Pnt2() const;
+
+  Standard_EXPORT
+    void SetRadius1(const Standard_Real aR) ;
+
+  Standard_EXPORT
+    Standard_Real Radius1() const;
+
+  Standard_EXPORT
+    void SetRadius2(const Standard_Real aR) ;
+
+  Standard_EXPORT
+    Standard_Real Radius2() const;
+
+  Standard_EXPORT
+    void SetLength(const Standard_Real aL) ;
+
+  Standard_EXPORT
+    Standard_Real Length() const;
+
+  Standard_EXPORT
+    void SetWidth(const Standard_Real aW) ;
+
+  Standard_EXPORT
+    Standard_Real Width() const;
+
+  Standard_EXPORT
+    void SetHeight(const Standard_Real aH) ;
+
+  Standard_EXPORT
+    Standard_Real Height() const;
+
+  Standard_EXPORT
+    void Dump() const;
+
+ protected:
+  Standard_EXPORT
+    void DumpVertex() const;
+
+  Standard_EXPORT
+    void DumpEdge() const;
+
+  Standard_EXPORT
+    void DumpWire() const;
+
+  Standard_EXPORT
+    void DumpFace() const;
+
+  Standard_EXPORT
+    void DumpShell() const;
+
+  Standard_EXPORT
+    void DumpSolid() const;
+
+  Standard_EXPORT
+    void DumpCompSolid() const;
+
+  Standard_EXPORT
+    void DumpCompound() const;
+
+
+  TopAbs_ShapeEnum myType;
+  Standard_Integer myNbSubShapes[9];
+  GEOMAlgo_KindOfShape myKindOfShape;
+  GEOMAlgo_KindOfName myKindOfName;
+  GEOMAlgo_KindOfBounds myKindOfBounds;
+  GEOMAlgo_KindOfClosed myKindOfClosed;
+  gp_Pnt myLocation;
+  gp_Dir myDirection;
+  gp_Ax3 myPosition;
+  Standard_Real myRadius1;
+  Standard_Real myRadius2;
+  Standard_Real myLength;
+  Standard_Real myWidth;
+  Standard_Real myHeight;
+  gp_Pnt myPnt1;
+  gp_Pnt myPnt2;
+  Standard_Integer myNbTypes;
+};
+#endif
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_ShapeInfoFiller.cxx b/src/GEOMAlgo_NEW/GEOMAlgo_ShapeInfoFiller.cxx
index ff610d962..614852e72 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_ShapeInfoFiller.cxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_ShapeInfoFiller.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -57,7 +57,7 @@
 
 
 
-static 
+static
   Standard_Boolean IsAllowedType(const GeomAbs_CurveType aCT);
 static
   Standard_Boolean IsAllowedType(const GeomAbs_SurfaceType aST);
@@ -67,8 +67,8 @@ static
   Standard_Integer NbShells(const TopoDS_Solid& aS);
 
 //=======================================================================
-//function : 
-//purpose  : 
+//function :
+//purpose  :
 //=======================================================================
   GEOMAlgo_ShapeInfoFiller::GEOMAlgo_ShapeInfoFiller()
 :
@@ -78,14 +78,14 @@ static
 }
 //=======================================================================
 //function : ~
-//purpose  : 
+//purpose  :
 //=======================================================================
   GEOMAlgo_ShapeInfoFiller::~GEOMAlgo_ShapeInfoFiller()
 {
 }
 //=======================================================================
 //function : SetTolerance
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_ShapeInfoFiller::SetTolerance(const Standard_Real aT)
 {
@@ -93,7 +93,7 @@ static
 }
 //=======================================================================
 //function : Tolerance
-//purpose  : 
+//purpose  :
 //=======================================================================
   Standard_Real GEOMAlgo_ShapeInfoFiller::Tolerance()const
 {
@@ -101,15 +101,15 @@ static
 }
 //=======================================================================
 //function : SetShape
-//purpose  : 
+//purpose  :
 //=======================================================================
-  void GEOMAlgo_ShapeInfoFiller::SetShape(const TopoDS_Shape& aS) 
+  void GEOMAlgo_ShapeInfoFiller::SetShape(const TopoDS_Shape& aS)
 {
   myShape=aS;
 }
 //=======================================================================
 //function : Shape
-//purpose  : 
+//purpose  :
 //=======================================================================
   const TopoDS_Shape& GEOMAlgo_ShapeInfoFiller::Shape() const
 {
@@ -117,15 +117,15 @@ static
 }
 //=======================================================================
 //function : Info
-//purpose  : 
+//purpose  :
 //=======================================================================
   const GEOMAlgo_ShapeInfo& GEOMAlgo_ShapeInfoFiller::Info() const
 {
-  return Info(myShape); 
+  return Info(myShape);
 }
 //=======================================================================
 //function : Info
-//purpose  : 
+//purpose  :
 //=======================================================================
   const GEOMAlgo_ShapeInfo& GEOMAlgo_ShapeInfoFiller::Info(const TopoDS_Shape& aS) const
 {
@@ -135,12 +135,12 @@ static
       return aInfo;
     }
   }
-  return myEmptyInfo; 
+  return myEmptyInfo;
 }
 
 //=======================================================================
 //function : CheckData
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_ShapeInfoFiller::CheckData()
 {
@@ -153,9 +153,9 @@ static
 }
 //=======================================================================
 //function : Perform
-//purpose  : 
+//purpose  :
 //=======================================================================
-  void GEOMAlgo_ShapeInfoFiller::Perform() 
+  void GEOMAlgo_ShapeInfoFiller::Perform()
 {
   myErrorStatus=0;
   //
@@ -169,8 +169,8 @@ static
   FillShape(myShape);
 }
 //=======================================================================
-//function :FillShape 
-//purpose  : 
+//function :FillShape
+//purpose  :
 //=======================================================================
   void GEOMAlgo_ShapeInfoFiller::FillShape(const TopoDS_Shape& aS)
 {
@@ -182,7 +182,7 @@ static
     case TopAbs_VERTEX:
       FillVertex(aS);
       break;
-    //  
+    //
     case TopAbs_EDGE:
       FillEdge(aS);
       break;
@@ -201,14 +201,14 @@ static
     case TopAbs_COMPOUND:
       FillContainer(aS);
       break;
-    // 
+    //
     default:
       break;
   }
 }
 //=======================================================================
-//function :FillSubShapes 
-//purpose  : 
+//function :FillSubShapes
+//purpose  :
 //=======================================================================
   void GEOMAlgo_ShapeInfoFiller::FillSubShapes(const TopoDS_Shape& aS)
 {
@@ -222,9 +222,9 @@ static
 }
 //=======================================================================
 //function : FillContainer
-//purpose  : 
+//purpose  :
 //=======================================================================
-  void GEOMAlgo_ShapeInfoFiller::FillContainer(const TopoDS_Shape& aS) 
+  void GEOMAlgo_ShapeInfoFiller::FillContainer(const TopoDS_Shape& aS)
 {
   myErrorStatus=0;
   //
@@ -267,9 +267,9 @@ static
 }
 //=======================================================================
 //function : FillSolid
-//purpose  : 
+//purpose  :
 //=======================================================================
-  void GEOMAlgo_ShapeInfoFiller::FillSolid(const TopoDS_Shape& aS) 
+  void GEOMAlgo_ShapeInfoFiller::FillSolid(const TopoDS_Shape& aS)
 {
   Standard_Integer aNbShells;
   TopoDS_Solid aSd;
@@ -299,18 +299,18 @@ static
   FillDetails(aSd);
 }
 //=======================================================================
-//function :FillFace 
-//purpose  : 
+//function :FillFace
+//purpose  :
 //=======================================================================
-  void GEOMAlgo_ShapeInfoFiller::FillFace(const TopoDS_Shape& aS) 
+  void GEOMAlgo_ShapeInfoFiller::FillFace(const TopoDS_Shape& aS)
 {
   myErrorStatus=0;
   //
   Standard_Boolean bIsAllowedType;
-  Standard_Integer aNbWires;//, iRet 
+  Standard_Integer aNbWires;//, iRet
   Standard_Boolean bInf, bInfU1, bInfU2, bInfV1, bInfV2;
   Standard_Real aUMin, aUMax, aVMin, aVMax, aR1, aR2;
-  gp_Pnt aP0; 
+  gp_Pnt aP0;
   gp_Dir aDN;
   gp_Ax3 aAx3;
   GeomAbs_SurfaceType aST;
@@ -399,7 +399,7 @@ static
     //
     FillDetails(aF, aSphere);
   }// else if (aST==GeomAbs_Sphere) {
-  // 
+  //
   // 3. Cylinder
   else if (aST==GeomAbs_Cylinder) {
     gp_Cylinder aCyl;
@@ -431,7 +431,7 @@ static
     }
     FillDetails(aF, aCyl);
   }
-  // 
+  //
   // 4. Cone
   else if (aST==GeomAbs_Cone) {
     gp_Cone aCone;
@@ -463,7 +463,7 @@ static
     }
     FillDetails(aF, aCone);
   }
-  // 
+  //
   // 5. Torus
   else if (aST==GeomAbs_Torus) {
     gp_Torus aTorus;
@@ -488,10 +488,10 @@ static
   }
 }
 //=======================================================================
-//function :FillEdge 
-//purpose  : 
+//function :FillEdge
+//purpose  :
 //=======================================================================
-  void GEOMAlgo_ShapeInfoFiller::FillEdge(const TopoDS_Shape& aS) 
+  void GEOMAlgo_ShapeInfoFiller::FillEdge(const TopoDS_Shape& aS)
 {
   myErrorStatus=0;
   //
@@ -616,7 +616,7 @@ static
       aInfo.SetKindOfName(GEOMAlgo_KN_ARCCIRCLE);
       //
       gp_Vec aVecX(aP, aP1);
-      gp_Dir aDirX(aVecX); 
+      gp_Dir aDirX(aVecX);
       gp_Ax2 aAx2new(aP, aAx2.Direction(), aDirX);
       aInfo.SetPosition(aAx2new);
     }
@@ -658,7 +658,7 @@ static
       aInfo.SetKindOfName(GEOMAlgo_KN_ARCELLIPSE);
       //
       gp_Vec aVecX(aP, aP1);
-      gp_Dir aDirX(aVecX); 
+      gp_Dir aDirX(aVecX);
       gp_Ax2 aAx2new(aP, aAx2.Direction(), aDirX);
       aInfo.SetPosition(aAx2new);
     }
@@ -667,10 +667,10 @@ static
   FillSubShapes(aS);
 }
 //=======================================================================
-//function :FillVertex 
-//purpose  : 
+//function :FillVertex
+//purpose  :
 //=======================================================================
-  void GEOMAlgo_ShapeInfoFiller::FillVertex(const TopoDS_Shape& aS) 
+  void GEOMAlgo_ShapeInfoFiller::FillVertex(const TopoDS_Shape& aS)
 {
   myErrorStatus=0;
   //
@@ -695,7 +695,7 @@ static
 }
 //=======================================================================
 //function : FillNbSubshapes
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_ShapeInfoFiller::FillNbSubShapes(const TopoDS_Shape& aS,
                                                  GEOMAlgo_ShapeInfo& aInfo)
@@ -704,7 +704,7 @@ static
   //
   Standard_Integer i, aNb, aNbS;
   TopTools_IndexedMapOfShape aM;
-  TopAbs_ShapeEnum aST; 
+  TopAbs_ShapeEnum aST;
   TopAbs_ShapeEnum aTypes[]= {
     //TopAbs_FACE, TopAbs_EDGE, TopAbs_VERTEX
     TopAbs_COMPOUND,
@@ -716,7 +716,7 @@ static
     TopAbs_EDGE,
     TopAbs_VERTEX
   };
-  
+
   //
   aST=aS.ShapeType();
   aNb=sizeof(aTypes)/sizeof(aTypes[0]);
@@ -731,8 +731,8 @@ static
   }
 }
 //=======================================================================
-//function :NbShells 
-//purpose  : 
+//function :NbShells
+//purpose  :
 //=======================================================================
 Standard_Integer NbShells(const TopoDS_Solid& aSd)
 {
@@ -750,7 +750,7 @@ Standard_Integer NbShells(const TopoDS_Solid& aSd)
 }
 //=======================================================================
 //function : NbWires
-//purpose  : 
+//purpose  :
 //=======================================================================
 Standard_Integer NbWires(const TopoDS_Face& aF)
 {
@@ -768,7 +768,7 @@ Standard_Integer NbWires(const TopoDS_Face& aF)
 }
 //=======================================================================
 //function : IsAllowedType
-//purpose  : 
+//purpose  :
 //=======================================================================
 Standard_Boolean IsAllowedType(const GeomAbs_CurveType aCT)
 {
@@ -788,14 +788,14 @@ Standard_Boolean IsAllowedType(const GeomAbs_CurveType aCT)
 }
 //=======================================================================
 //function : IsAllowedType
-//purpose  : 
+//purpose  :
 //=======================================================================
 Standard_Boolean IsAllowedType(const GeomAbs_SurfaceType aST)
 {
   Standard_Boolean bRet;
   Standard_Integer i, aNb;
   GeomAbs_SurfaceType aTypes[]={
-    GeomAbs_Plane, GeomAbs_Cylinder, 
+    GeomAbs_Plane, GeomAbs_Cylinder,
     GeomAbs_Cone,  GeomAbs_Sphere,
     GeomAbs_Torus
   };
@@ -810,9 +810,9 @@ Standard_Boolean IsAllowedType(const GeomAbs_SurfaceType aST)
 }
 //
 // myErrorStatus
-// 
+//
 // 0  - Ok
 // 1  - The object is just initialized
 //
-// 10 - Null shape 
+// 10 - Null shape
 // 11 - circle/ellipse edge without vertices
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_ShapeInfoFiller.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_ShapeInfoFiller.hxx
index f1ff90bec..5e71ec394 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_ShapeInfoFiller.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_ShapeInfoFiller.hxx
@@ -1,123 +1,123 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-#ifndef _GEOMAlgo_ShapeInfoFiller_HeaderFile
-#define _GEOMAlgo_ShapeInfoFiller_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_Macro.hxx>
-#include <TopoDS_Shape.hxx>
-#include <GEOMAlgo_ShapeInfo.hxx>
-#include <GEOMAlgo_IndexedDataMapOfShapeShapeInfo.hxx>
-#include <Standard_Real.hxx>
-#include <GEOMAlgo_Algo.hxx>
-#include <TopoDS_Face.hxx>
-#include <gp_Pln.hxx>
-#include <gp_Sphere.hxx>
-#include <gp_Cylinder.hxx>
-#include <gp_Cone.hxx>
-#include <gp_Torus.hxx>
-#include <TopoDS_Solid.hxx>
-
-//=======================================================================
-//class    : GEOMAlgo_ShapeInfoFiller
-//purpose  : 
-//=======================================================================
-class GEOMAlgo_ShapeInfoFiller  : public GEOMAlgo_Algo 
-{
- public:
-  Standard_EXPORT
-    GEOMAlgo_ShapeInfoFiller();
-  
-  Standard_EXPORT
-    virtual ~GEOMAlgo_ShapeInfoFiller();
-  
-  Standard_EXPORT
-    void SetShape(const TopoDS_Shape& aS) ;
-  
-  Standard_EXPORT
-    const TopoDS_Shape& Shape() const;
-  
-  Standard_EXPORT
-    void SetTolerance(const Standard_Real aT) ;
-  
-  Standard_EXPORT
-    Standard_Real Tolerance() const;
-  
-  Standard_EXPORT
-    const GEOMAlgo_ShapeInfo& Info() const;
-  
-  Standard_EXPORT
-    const GEOMAlgo_ShapeInfo& Info(const TopoDS_Shape& aS) const;
-  
-  Standard_EXPORT
-    virtual  void Perform() ;
-
- protected:
-  Standard_EXPORT
-    virtual  void CheckData() ;
-  
-  Standard_EXPORT
-    void FillNbSubShapes(const TopoDS_Shape& aS,GEOMAlgo_ShapeInfo& aInfo) ;
-  
-  Standard_EXPORT
-    void FillSubShapes(const TopoDS_Shape& aS) ;
-  
-  Standard_EXPORT
-    void FillShape(const TopoDS_Shape& aS) ;
-  
-  Standard_EXPORT
-    void FillVertex(const TopoDS_Shape& aS) ;
-  
-  Standard_EXPORT
-    void FillEdge(const TopoDS_Shape& aS) ;
-  
-  Standard_EXPORT
-    void FillFace(const TopoDS_Shape& aS) ;
-  
-  Standard_EXPORT
-    void FillSolid(const TopoDS_Shape& aS) ;
-  
-  Standard_EXPORT
-    void FillContainer(const TopoDS_Shape& aS) ;
-  
-  Standard_EXPORT
-    void FillDetails(const TopoDS_Face& aF,const gp_Pln& aPln) ;
-  
-  Standard_EXPORT
-    void FillDetails(const TopoDS_Face& aF,const gp_Sphere& aSph) ;
-  
-  Standard_EXPORT
-    void FillDetails(const TopoDS_Face& aF,const gp_Cylinder& aCyl) ;
-  
-  Standard_EXPORT
-    void FillDetails(const TopoDS_Face& aF,const gp_Cone& aCone) ;
-  
-  Standard_EXPORT
-    void FillDetails(const TopoDS_Face& aF,const gp_Torus& aTorus) ;
-  
-  Standard_EXPORT
-    void FillDetails(const TopoDS_Solid& aS) ;
-
-
-  TopoDS_Shape myShape;
-  GEOMAlgo_ShapeInfo myEmptyInfo;
-  GEOMAlgo_IndexedDataMapOfShapeShapeInfo myMapInfo;
-  Standard_Real myTolerance;
-};
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+#ifndef _GEOMAlgo_ShapeInfoFiller_HeaderFile
+#define _GEOMAlgo_ShapeInfoFiller_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Macro.hxx>
+#include <TopoDS_Shape.hxx>
+#include <GEOMAlgo_ShapeInfo.hxx>
+#include <GEOMAlgo_IndexedDataMapOfShapeShapeInfo.hxx>
+#include <Standard_Real.hxx>
+#include <GEOMAlgo_Algo.hxx>
+#include <TopoDS_Face.hxx>
+#include <gp_Pln.hxx>
+#include <gp_Sphere.hxx>
+#include <gp_Cylinder.hxx>
+#include <gp_Cone.hxx>
+#include <gp_Torus.hxx>
+#include <TopoDS_Solid.hxx>
+
+//=======================================================================
+//class    : GEOMAlgo_ShapeInfoFiller
+//purpose  :
+//=======================================================================
+class GEOMAlgo_ShapeInfoFiller  : public GEOMAlgo_Algo
+{
+ public:
+  Standard_EXPORT
+    GEOMAlgo_ShapeInfoFiller();
+
+  Standard_EXPORT
+    virtual ~GEOMAlgo_ShapeInfoFiller();
+
+  Standard_EXPORT
+    void SetShape(const TopoDS_Shape& aS) ;
+
+  Standard_EXPORT
+    const TopoDS_Shape& Shape() const;
+
+  Standard_EXPORT
+    void SetTolerance(const Standard_Real aT) ;
+
+  Standard_EXPORT
+    Standard_Real Tolerance() const;
+
+  Standard_EXPORT
+    const GEOMAlgo_ShapeInfo& Info() const;
+
+  Standard_EXPORT
+    const GEOMAlgo_ShapeInfo& Info(const TopoDS_Shape& aS) const;
+
+  Standard_EXPORT
+    virtual  void Perform() ;
+
+ protected:
+  Standard_EXPORT
+    virtual  void CheckData() ;
+
+  Standard_EXPORT
+    void FillNbSubShapes(const TopoDS_Shape& aS,GEOMAlgo_ShapeInfo& aInfo) ;
+
+  Standard_EXPORT
+    void FillSubShapes(const TopoDS_Shape& aS) ;
+
+  Standard_EXPORT
+    void FillShape(const TopoDS_Shape& aS) ;
+
+  Standard_EXPORT
+    void FillVertex(const TopoDS_Shape& aS) ;
+
+  Standard_EXPORT
+    void FillEdge(const TopoDS_Shape& aS) ;
+
+  Standard_EXPORT
+    void FillFace(const TopoDS_Shape& aS) ;
+
+  Standard_EXPORT
+    void FillSolid(const TopoDS_Shape& aS) ;
+
+  Standard_EXPORT
+    void FillContainer(const TopoDS_Shape& aS) ;
+
+  Standard_EXPORT
+    void FillDetails(const TopoDS_Face& aF,const gp_Pln& aPln) ;
+
+  Standard_EXPORT
+    void FillDetails(const TopoDS_Face& aF,const gp_Sphere& aSph) ;
+
+  Standard_EXPORT
+    void FillDetails(const TopoDS_Face& aF,const gp_Cylinder& aCyl) ;
+
+  Standard_EXPORT
+    void FillDetails(const TopoDS_Face& aF,const gp_Cone& aCone) ;
+
+  Standard_EXPORT
+    void FillDetails(const TopoDS_Face& aF,const gp_Torus& aTorus) ;
+
+  Standard_EXPORT
+    void FillDetails(const TopoDS_Solid& aS) ;
+
+
+  TopoDS_Shape myShape;
+  GEOMAlgo_ShapeInfo myEmptyInfo;
+  GEOMAlgo_IndexedDataMapOfShapeShapeInfo myMapInfo;
+  Standard_Real myTolerance;
+};
+#endif
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_ShapeInfoFiller_1.cxx b/src/GEOMAlgo_NEW/GEOMAlgo_ShapeInfoFiller_1.cxx
index a77a09718..c641edd85 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_ShapeInfoFiller_1.cxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_ShapeInfoFiller_1.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -15,6 +15,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include <GEOMAlgo_ShapeInfoFiller.hxx>
 
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_ShapeSet.cxx b/src/GEOMAlgo_NEW/GEOMAlgo_ShapeSet.cxx
index 764c19e4a..3e84aa098 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_ShapeSet.cxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_ShapeSet.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -21,8 +21,8 @@
 //
 
 // File:        GEOMAlgo_ShapeSet.cxx
-// Created:     
-// Author:      Peter KURNEV 
+// Created:
+// Author:      Peter KURNEV
 //
 #include <GEOMAlgo_ShapeSet.hxx>
 
@@ -32,15 +32,15 @@
 #include <TopTools_MapIteratorOfMapOfOrientedShape.hxx>
 
 //=======================================================================
-//function : 
-//purpose  : 
+//function :
+//purpose  :
 //=======================================================================
   GEOMAlgo_ShapeSet::GEOMAlgo_ShapeSet()
 {
 }
 //=======================================================================
 //function : Clear
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_ShapeSet::Clear()
 {
@@ -49,7 +49,7 @@
 }
 //=======================================================================
 //function : Add
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_ShapeSet::Add(const TopoDS_Shape& theShape)
 {
@@ -59,7 +59,7 @@
 }
 //=======================================================================
 //function : Add
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_ShapeSet::Add(const TopoDS_Shape& theShape,
                               const TopAbs_ShapeEnum theType)
@@ -76,7 +76,7 @@
 }
 //=======================================================================
 //function : Add
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_ShapeSet::Add(const TopTools_ListOfShape& theLS)
 {
@@ -91,8 +91,8 @@
   }
 }
 //=======================================================================
-//function :GetSet 
-//purpose  : 
+//function :GetSet
+//purpose  :
 //=======================================================================
   const TopTools_ListOfShape& GEOMAlgo_ShapeSet::GetSet()const
 {
@@ -100,7 +100,7 @@
 }
 //=======================================================================
 //function : Contains
-//purpose  : 
+//purpose  :
 //=======================================================================
   Standard_Boolean GEOMAlgo_ShapeSet::Contains(const GEOMAlgo_ShapeSet& theOther)const
 {
@@ -125,7 +125,7 @@
 }
 //=======================================================================
 //function : Subtract
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_ShapeSet::Subtract(const GEOMAlgo_ShapeSet& theOther)
 {
@@ -148,7 +148,7 @@
 //modified by NIZNHY-PKV Wed Oct 28 13:51:36 2010f
 //=======================================================================
 //function : IsEqual
-//purpose  : 
+//purpose  :
 //=======================================================================
   Standard_Boolean GEOMAlgo_ShapeSet::IsEqual(const GEOMAlgo_ShapeSet& theOther)const
 {
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_ShapeSet.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_ShapeSet.hxx
index 4d031d111..b304a8bba 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_ShapeSet.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_ShapeSet.hxx
@@ -1,92 +1,92 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-
-// File:        GEOMAlgo_ShapeSet.hxx
-// Created:     
-// Author:      Peter KURNEV 
-//
-#ifndef _GEOMAlgo_ShapeSet_HeaderFile
-#define _GEOMAlgo_ShapeSet_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_Macro.hxx>
-#include <TopTools_MapOfOrientedShape.hxx>
-#include <TopTools_ListOfShape.hxx>
-#include <TopAbs_ShapeEnum.hxx>
-#include <Standard_Boolean.hxx>
-#include <TopoDS_Shape.hxx>
-
-//! Implementation some formal <br>
-//!          opereations with Set of shapes <br>
-//=======================================================================
-//class    : GEOMAlgo_ShapeSet
-//purpose  : 
-//=======================================================================
-class GEOMAlgo_ShapeSet  
-{
- public:
-  //! Empty constructor <br>
-  Standard_EXPORT
-    GEOMAlgo_ShapeSet();
-  
-  //! Adds shapes from the list theLS to the Set <br>
-  Standard_EXPORT
-    void Add(const TopTools_ListOfShape& theLS) ;
-  
-  //! Adds shape theShape to the Set <br>
-  Standard_EXPORT
-    void Add(const TopoDS_Shape& theShape) ;
-  
-  //! Adds sub-shapes of shape theShape, <br>
-  //!          that have type theType to the Set <br>
-  Standard_EXPORT
-    void Add(const TopoDS_Shape& theShape,const TopAbs_ShapeEnum theType) ;
-  
-  //! Removes shapes of theSet from the Set <br>
-  Standard_EXPORT
-    void Subtract(const GEOMAlgo_ShapeSet& theSet) ;
-  
-  //! Clears internal fields <br>
-  Standard_EXPORT     void Clear() ;
-  
-  //! Returns True if the Set contains <br>
-  //!          all shapes of theSet <br>
-  Standard_EXPORT
-    Standard_Boolean Contains(const GEOMAlgo_ShapeSet& theSet) const;
-  
-  //! Returns the Set <br>
-  Standard_EXPORT
-    const TopTools_ListOfShape& GetSet() const;
-  
-  //! Returns True if the Set==theSet <br>
-  Standard_EXPORT
-    Standard_Boolean IsEqual(const GEOMAlgo_ShapeSet& theOther) const;
-  
-  Standard_Boolean operator ==(const GEOMAlgo_ShapeSet& theOther) const {
-    return IsEqual(theOther);
-  }
-
- protected:
-  TopTools_MapOfOrientedShape myMap;
-  TopTools_ListOfShape myList;
-};
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File:        GEOMAlgo_ShapeSet.hxx
+// Created:
+// Author:      Peter KURNEV
+//
+#ifndef _GEOMAlgo_ShapeSet_HeaderFile
+#define _GEOMAlgo_ShapeSet_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Macro.hxx>
+#include <TopTools_MapOfOrientedShape.hxx>
+#include <TopTools_ListOfShape.hxx>
+#include <TopAbs_ShapeEnum.hxx>
+#include <Standard_Boolean.hxx>
+#include <TopoDS_Shape.hxx>
+
+//! Implementation some formal <br>
+//!          opereations with Set of shapes <br>
+//=======================================================================
+//class    : GEOMAlgo_ShapeSet
+//purpose  :
+//=======================================================================
+class GEOMAlgo_ShapeSet
+{
+ public:
+  //! Empty constructor <br>
+  Standard_EXPORT
+    GEOMAlgo_ShapeSet();
+
+  //! Adds shapes from the list theLS to the Set <br>
+  Standard_EXPORT
+    void Add(const TopTools_ListOfShape& theLS) ;
+
+  //! Adds shape theShape to the Set <br>
+  Standard_EXPORT
+    void Add(const TopoDS_Shape& theShape) ;
+
+  //! Adds sub-shapes of shape theShape, <br>
+  //!          that have type theType to the Set <br>
+  Standard_EXPORT
+    void Add(const TopoDS_Shape& theShape,const TopAbs_ShapeEnum theType) ;
+
+  //! Removes shapes of theSet from the Set <br>
+  Standard_EXPORT
+    void Subtract(const GEOMAlgo_ShapeSet& theSet) ;
+
+  //! Clears internal fields <br>
+  Standard_EXPORT     void Clear() ;
+
+  //! Returns True if the Set contains <br>
+  //!          all shapes of theSet <br>
+  Standard_EXPORT
+    Standard_Boolean Contains(const GEOMAlgo_ShapeSet& theSet) const;
+
+  //! Returns the Set <br>
+  Standard_EXPORT
+    const TopTools_ListOfShape& GetSet() const;
+
+  //! Returns True if the Set==theSet <br>
+  Standard_EXPORT
+    Standard_Boolean IsEqual(const GEOMAlgo_ShapeSet& theOther) const;
+
+  Standard_Boolean operator ==(const GEOMAlgo_ShapeSet& theOther) const {
+    return IsEqual(theOther);
+  }
+
+ protected:
+  TopTools_MapOfOrientedShape myMap;
+  TopTools_ListOfShape myList;
+};
+#endif
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_ShapeSolid.cxx b/src/GEOMAlgo_NEW/GEOMAlgo_ShapeSolid.cxx
index 4aaa2fb15..04f69b29a 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_ShapeSolid.cxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_ShapeSolid.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -32,7 +32,7 @@
 
 //=======================================================================
 //function : GEOMAlgo_ShapeSolid
-//purpose  : 
+//purpose  :
 //=======================================================================
 GEOMAlgo_ShapeSolid::GEOMAlgo_ShapeSolid()
 :
@@ -43,14 +43,14 @@ GEOMAlgo_ShapeSolid::GEOMAlgo_ShapeSolid()
 }
 //=======================================================================
 //function : ~
-//purpose  : 
+//purpose  :
 //=======================================================================
 GEOMAlgo_ShapeSolid::~GEOMAlgo_ShapeSolid()
 {
 }
 //=======================================================================
 //function : SetFiller
-//purpose  : 
+//purpose  :
 //=======================================================================
 void GEOMAlgo_ShapeSolid::SetFiller(const BOPTools_DSFiller& aDSFiller)
 {
@@ -58,7 +58,7 @@ void GEOMAlgo_ShapeSolid::SetFiller(const BOPTools_DSFiller& aDSFiller)
 }
 //=======================================================================
 // function: Shapes
-// purpose: 
+// purpose:
 //=======================================================================
 const TopTools_ListOfShape& GEOMAlgo_ShapeSolid::Shapes(const TopAbs_State aState) const
 {
@@ -73,10 +73,10 @@ const TopTools_ListOfShape& GEOMAlgo_ShapeSolid::Shapes(const TopAbs_State aStat
       break;
     case TopAbs_ON:
       pL=&myLSON;
-      break;  
+      break;
     default:
       pL=&myLSON;
-      break; 
+      break;
   }
   return *pL;
 }
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_ShapeSolid.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_ShapeSolid.hxx
index 02879b5f8..47e3edac7 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_ShapeSolid.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_ShapeSolid.hxx
@@ -1,73 +1,73 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-
-// File:        GEOMAlgo_ShapeSolid.hxx
-// Created:     Thu Jan 13 12:54:48 2005
-// Author:      Peter KURNEV
-//              <pkv@irinox>
-//
-#ifndef _GEOMAlgo_ShapeSolid_HeaderFile
-#define _GEOMAlgo_ShapeSolid_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_Macro.hxx>
-#include <TopTools_ListOfShape.hxx>
-#include <Standard_Integer.hxx>
-#include <BOPTools_PDSFiller.hxx>
-#include <GEOMAlgo_Algo.hxx>
-#include <TopAbs_State.hxx>
-#include <BOPTools_DSFiller.hxx>
-
-//=======================================================================
-//function : GEOMAlgo_ShapeSolid
-//purpose  : 
-//=======================================================================
-class GEOMAlgo_ShapeSolid  : public GEOMAlgo_Algo 
-{
- public:
-  Standard_EXPORT
-    void SetFiller(const BOPTools_DSFiller& aDSF) ;
-  
-  Standard_EXPORT
-    virtual ~GEOMAlgo_ShapeSolid();
-  
-  Standard_EXPORT
-    const TopTools_ListOfShape& Shapes(const TopAbs_State aState) const;
-
-protected:
-  Standard_EXPORT
-    GEOMAlgo_ShapeSolid();
-  
-  Standard_EXPORT
-    virtual  void BuildResult()  = 0;
-  
-  Standard_EXPORT
-    virtual  void Prepare()  = 0;
-
-
-  TopTools_ListOfShape myLSIN;
-  TopTools_ListOfShape myLSOUT;
-  TopTools_ListOfShape myLSON;
-  Standard_Integer myRank;
-  BOPTools_PDSFiller myDSFiller;
-};
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File:        GEOMAlgo_ShapeSolid.hxx
+// Created:     Thu Jan 13 12:54:48 2005
+// Author:      Peter KURNEV
+//              <pkv@irinox>
+//
+#ifndef _GEOMAlgo_ShapeSolid_HeaderFile
+#define _GEOMAlgo_ShapeSolid_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Macro.hxx>
+#include <TopTools_ListOfShape.hxx>
+#include <Standard_Integer.hxx>
+#include <BOPTools_PDSFiller.hxx>
+#include <GEOMAlgo_Algo.hxx>
+#include <TopAbs_State.hxx>
+#include <BOPTools_DSFiller.hxx>
+
+//=======================================================================
+//function : GEOMAlgo_ShapeSolid
+//purpose  :
+//=======================================================================
+class GEOMAlgo_ShapeSolid  : public GEOMAlgo_Algo
+{
+ public:
+  Standard_EXPORT
+    void SetFiller(const BOPTools_DSFiller& aDSF) ;
+
+  Standard_EXPORT
+    virtual ~GEOMAlgo_ShapeSolid();
+
+  Standard_EXPORT
+    const TopTools_ListOfShape& Shapes(const TopAbs_State aState) const;
+
+protected:
+  Standard_EXPORT
+    GEOMAlgo_ShapeSolid();
+
+  Standard_EXPORT
+    virtual  void BuildResult()  = 0;
+
+  Standard_EXPORT
+    virtual  void Prepare()  = 0;
+
+
+  TopTools_ListOfShape myLSIN;
+  TopTools_ListOfShape myLSOUT;
+  TopTools_ListOfShape myLSON;
+  Standard_Integer myRank;
+  BOPTools_PDSFiller myDSFiller;
+};
+#endif
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_ShellSolid.cxx b/src/GEOMAlgo_NEW/GEOMAlgo_ShellSolid.cxx
index a99df120e..c032c1111 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_ShellSolid.cxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_ShellSolid.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -75,7 +75,7 @@
 
 //=======================================================================
 //function : GEOMAlgo_ShellSolid
-//purpose  : 
+//purpose  :
 //=======================================================================
 GEOMAlgo_ShellSolid::GEOMAlgo_ShellSolid()
 :
@@ -84,16 +84,16 @@ GEOMAlgo_ShellSolid::GEOMAlgo_ShellSolid()
 }
 //=======================================================================
 //function : ~
-//purpose  : 
+//purpose  :
 //=======================================================================
 GEOMAlgo_ShellSolid::~GEOMAlgo_ShellSolid()
 {
 }
 //=======================================================================
-// function: 
-// purpose: 
+// function:
+// purpose:
 //=======================================================================
-void GEOMAlgo_ShellSolid::Perform() 
+void GEOMAlgo_ShellSolid::Perform()
 {
   myErrorStatus=0;
   //
@@ -124,12 +124,12 @@ void GEOMAlgo_ShellSolid::Perform()
 }
 //=======================================================================
 // function: Prepare
-// purpose: 
+// purpose:
 //=======================================================================
-void GEOMAlgo_ShellSolid::Prepare() 
+void GEOMAlgo_ShellSolid::Prepare()
 {
   const BOPTools_PaveFiller& aPaveFiller=myDSFiller->PaveFiller();
-  // 
+  //
   // 1 States
   BOPTools_SolidStateFiller aStateFiller(aPaveFiller);
   aStateFiller.Do();
@@ -147,9 +147,9 @@ void GEOMAlgo_ShellSolid::Prepare()
 }
 //=================================================================================
 // function: BuildResult
-// purpose: 
+// purpose:
 //=================================================================================
-void GEOMAlgo_ShellSolid::BuildResult() 
+void GEOMAlgo_ShellSolid::BuildResult()
 {
   Standard_Boolean bIsTouchCase;
   Standard_Integer i, j, nF1, nF2, aNbFFs, aNbS, aNbCurves, nSp, iRank1;
@@ -261,7 +261,7 @@ void GEOMAlgo_ShellSolid::BuildResult()
           aTol=1.e-7;
           //
           BOPTools_Tools3D::PointNearEdge(aE, aF1, aP2D, aP3D);
-          const TopoDS_Solid& aRefSolid=(myRank==1) ? 
+          const TopoDS_Solid& aRefSolid=(myRank==1) ?
             TopoDS::Solid(aDS.Tool()) : TopoDS::Solid(aDS.Object());
           //
           BOPTools_PaveFiller* pPF=(BOPTools_PaveFiller*)& aPaveFiller;
@@ -276,15 +276,15 @@ void GEOMAlgo_ShellSolid::BuildResult()
           else if (aSt==TopAbs_OUT) {
             myLSOUT.Append(aF1);
           }
-        } 
-        break; 
-      } // if (aNbPB<2) { 
+        }
+        break;
+      } // if (aNbPB<2) {
     } //for (; anExp.More(); anExp.Next())
-  } 
+  }
 }
 //=======================================================================
 // function: DetectSDFaces
-// purpose: 
+// purpose:
 //=======================================================================
 void GEOMAlgo_ShellSolid::DetectSDFaces()
 {
@@ -299,9 +299,9 @@ void GEOMAlgo_ShellSolid::DetectSDFaces()
   aNb=aFFs.Extent();
   for (i=1; i<=aNb; i++) {
     bFlag=Standard_False;
-    
+
     BOPTools_SSInterference& aFF=aFFs(i);
-    
+
     nF1=aFF.Index1();
     nF2=aFF.Index2();
     const TopoDS_Face& aF1=TopoDS::Face(aDS.Shape(nF1));
@@ -314,11 +314,11 @@ void GEOMAlgo_ShellSolid::DetectSDFaces()
     if (!aNbSps) {
       continue;
     }
-    
+
     const BOPTools_PaveBlock& aPB=aLPB.First();
     const TopoDS_Edge& aSpE=TopoDS::Edge(aDS.Shape(aPB.Edge()));
-    
-    BOPTools_Tools3D::GetNormalToFaceOnEdge (aSpE, aF1, aDNF1); 
+
+    BOPTools_Tools3D::GetNormalToFaceOnEdge (aSpE, aF1, aDNF1);
     BOPTools_Tools3D::GetNormalToFaceOnEdge (aSpE, aF2, aDNF2);
     iSenseFlag=BOPTools_Tools3D::SenseFlag (aDNF1, aDNF2);
     //
@@ -327,13 +327,13 @@ void GEOMAlgo_ShellSolid::DetectSDFaces()
     //
       TopoDS_Face aF1FWD=aF1;
       aF1FWD.Orientation (TopAbs_FORWARD);
-      
+
       BOP_WireEdgeSet aWES (aF1FWD);
       BOP_SDFWESFiller aWESFiller(nF1, nF2, *myDSFiller);
       aWESFiller.SetSenseFlag(iSenseFlag);
       aWESFiller.SetOperation(BOP_COMMON);
       aWESFiller.Do(aWES);
-      
+
       BOP_FaceBuilder aFB;
       aFB.Do(aWES);
       const TopTools_ListOfShape& aLF=aFB.NewFaces();
@@ -348,7 +348,7 @@ void GEOMAlgo_ShellSolid::DetectSDFaces()
           //
           Standard_Boolean bIsValidIn2D, bNegativeFlag;
           bIsValidIn2D=BOPTools_Tools3D::IsValidArea (aFaceResult, bNegativeFlag);
-          if (bIsValidIn2D) { 
+          if (bIsValidIn2D) {
             //if(CheckSameDomainFaceInside(aFaceResult, aF2)) {
             iZone=1;
             break;
@@ -357,15 +357,15 @@ void GEOMAlgo_ShellSolid::DetectSDFaces()
           //
         }
       }
-      
-      if (iZone) { 
+
+      if (iZone) {
         bFlag=Standard_True;
         aFF.SetStatesMap(aWESFiller.StatesMap());
       }
-      
+
     }// if (iSenseFlag)
-  
+
   aFF.SetTangentFacesFlag(bFlag);
   aFF.SetSenseFlag (iSenseFlag);
-  }// end of for (i=1; i<=aNb; i++) 
+  }// end of for (i=1; i<=aNb; i++)
 }
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_ShellSolid.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_ShellSolid.hxx
index 63bed90a1..941405861 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_ShellSolid.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_ShellSolid.hxx
@@ -1,61 +1,61 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-
-// File:        GEOMAlgo_ShellSolid.hxx
-// Created:     Wed Jan 12 12:49:45 2005
-// Author:      Peter KURNEV
-//              <pkv@irinox>
-//
-#ifndef _GEOMAlgo_ShellSolid_HeaderFile
-#define _GEOMAlgo_ShellSolid_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_Macro.hxx>
-#include <GEOMAlgo_ShapeSolid.hxx>
-
-//=======================================================================
-//class    : GEOMAlgo_ShellSolid
-//purpose  : 
-//=======================================================================
-class GEOMAlgo_ShellSolid  : public GEOMAlgo_ShapeSolid 
-{
- public:
-  Standard_EXPORT
-    GEOMAlgo_ShellSolid();
-  
-  Standard_EXPORT
-    virtual ~GEOMAlgo_ShellSolid();
-  
-  Standard_EXPORT
-    virtual  void Perform() ;
-
- protected:
-  Standard_EXPORT
-    virtual  void Prepare() ;
-  
-  Standard_EXPORT
-    virtual  void BuildResult() ;
-  
-  Standard_EXPORT
-    void DetectSDFaces() ;
-};
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File:        GEOMAlgo_ShellSolid.hxx
+// Created:     Wed Jan 12 12:49:45 2005
+// Author:      Peter KURNEV
+//              <pkv@irinox>
+//
+#ifndef _GEOMAlgo_ShellSolid_HeaderFile
+#define _GEOMAlgo_ShellSolid_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Macro.hxx>
+#include <GEOMAlgo_ShapeSolid.hxx>
+
+//=======================================================================
+//class    : GEOMAlgo_ShellSolid
+//purpose  :
+//=======================================================================
+class GEOMAlgo_ShellSolid  : public GEOMAlgo_ShapeSolid
+{
+ public:
+  Standard_EXPORT
+    GEOMAlgo_ShellSolid();
+
+  Standard_EXPORT
+    virtual ~GEOMAlgo_ShellSolid();
+
+  Standard_EXPORT
+    virtual  void Perform() ;
+
+ protected:
+  Standard_EXPORT
+    virtual  void Prepare() ;
+
+  Standard_EXPORT
+    virtual  void BuildResult() ;
+
+  Standard_EXPORT
+    void DetectSDFaces() ;
+};
+#endif
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_SolidSolid.cxx b/src/GEOMAlgo_NEW/GEOMAlgo_SolidSolid.cxx
index 5ea46988d..31ea5d161 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_SolidSolid.cxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_SolidSolid.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -44,7 +44,7 @@
 
 //=======================================================================
 //function : GEOMAlgo_SolidSolid
-//purpose  : 
+//purpose  :
 //=======================================================================
 GEOMAlgo_SolidSolid::GEOMAlgo_SolidSolid()
 :
@@ -53,32 +53,32 @@ GEOMAlgo_SolidSolid::GEOMAlgo_SolidSolid()
 }
 //=======================================================================
 //function : ~
-//purpose  : 
+//purpose  :
 //=======================================================================
 GEOMAlgo_SolidSolid::~GEOMAlgo_SolidSolid()
 {
 }
 //=======================================================================
 // function: SetShape2
-// purpose: 
+// purpose:
 //=======================================================================
 void GEOMAlgo_SolidSolid::SetShape2(const TopoDS_Shape& aS2)
 {
   myS2=aS2;
-} 
+}
 //=======================================================================
 // function: Shape2
-// purpose: 
+// purpose:
 //=======================================================================
 const TopoDS_Shape& GEOMAlgo_SolidSolid::Shape2()const
 {
   return myS2;
-} 
+}
 //=======================================================================
 // function: Perform
-// purpose: 
+// purpose:
 //=======================================================================
-void GEOMAlgo_SolidSolid::Perform() 
+void GEOMAlgo_SolidSolid::Perform()
 {
   myErrorStatus=0;
   try {
@@ -108,9 +108,9 @@ void GEOMAlgo_SolidSolid::Perform()
 }
 //=================================================================================
 // function: BuildResult
-// purpose: 
+// purpose:
 //=================================================================================
-void GEOMAlgo_SolidSolid::BuildResult() 
+void GEOMAlgo_SolidSolid::BuildResult()
 {
   myErrorStatus=0;
   //
@@ -122,7 +122,7 @@ void GEOMAlgo_SolidSolid::BuildResult()
   GEOMAlgo_IndexedDataMapOfShapeState aMFS;
   //
   // 1. classify the faces
-  GEOMAlgo_ShellSolid::BuildResult(); 
+  GEOMAlgo_ShellSolid::BuildResult();
   //
   // 2. fill Shape-State map
   aIt.Initialize(myLSIN);
@@ -163,9 +163,9 @@ void GEOMAlgo_SolidSolid::BuildResult()
     for(j=1; j<aNbF; ++j) {
       const TopoDS_Shape& aF=aMF(j);
       //
-      if (!aMFS.Contains(aF)) {// the face is intesected 
+      if (!aMFS.Contains(aF)) {// the face is intesected
         ++aNbFINTR;
-        break; 
+        break;
       }
       //
       aState=aMFS.FindFromKey(aF);
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_SolidSolid.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_SolidSolid.hxx
index c99846cba..5a49654e4 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_SolidSolid.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_SolidSolid.hxx
@@ -1,65 +1,65 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-
-// File:        GEOMAlgo_SolidSolid.hxx
-// Created:     Wed Jan 26 12:06:26 2005
-// Author:      Peter KURNEV
-//              <pkv@irinox>
-//
-#ifndef _GEOMAlgo_SolidSolid_HeaderFile
-#define _GEOMAlgo_SolidSolid_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_Macro.hxx>
-#include <TopoDS_Shape.hxx>
-#include <GEOMAlgo_ShellSolid.hxx>
-
-//=======================================================================
-//function : GEOMAlgo_SolidSolid
-//purpose  : 
-//=======================================================================
-class GEOMAlgo_SolidSolid  : public GEOMAlgo_ShellSolid 
-{
- public:
-  Standard_EXPORT
-    GEOMAlgo_SolidSolid();
-
-  Standard_EXPORT
-    virtual ~GEOMAlgo_SolidSolid();
-  
-  Standard_EXPORT   
-    virtual  void Perform() ;
-  
-  Standard_EXPORT
-    void SetShape2(const TopoDS_Shape& aS) ;
-  
-  Standard_EXPORT
-    const TopoDS_Shape& Shape2() const;
-
-protected:
-  Standard_EXPORT
-    virtual  void BuildResult() ;
-
-
-  TopoDS_Shape myS2;
-};
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File:        GEOMAlgo_SolidSolid.hxx
+// Created:     Wed Jan 26 12:06:26 2005
+// Author:      Peter KURNEV
+//              <pkv@irinox>
+//
+#ifndef _GEOMAlgo_SolidSolid_HeaderFile
+#define _GEOMAlgo_SolidSolid_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Macro.hxx>
+#include <TopoDS_Shape.hxx>
+#include <GEOMAlgo_ShellSolid.hxx>
+
+//=======================================================================
+//function : GEOMAlgo_SolidSolid
+//purpose  :
+//=======================================================================
+class GEOMAlgo_SolidSolid  : public GEOMAlgo_ShellSolid
+{
+ public:
+  Standard_EXPORT
+    GEOMAlgo_SolidSolid();
+
+  Standard_EXPORT
+    virtual ~GEOMAlgo_SolidSolid();
+
+  Standard_EXPORT
+    virtual  void Perform() ;
+
+  Standard_EXPORT
+    void SetShape2(const TopoDS_Shape& aS) ;
+
+  Standard_EXPORT
+    const TopoDS_Shape& Shape2() const;
+
+protected:
+  Standard_EXPORT
+    virtual  void BuildResult() ;
+
+
+  TopoDS_Shape myS2;
+};
+#endif
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_Splitter.cxx b/src/GEOMAlgo_NEW/GEOMAlgo_Splitter.cxx
index 61f31aab8..7411dce89 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_Splitter.cxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_Splitter.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_Splitter.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_Splitter.hxx
index 3a4c9ef12..469080fe6 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_Splitter.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_Splitter.hxx
@@ -1,98 +1,97 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//
-//  File:   GEOMAlgo_Splitter.hxx
-//
-//  Author: Peter KURNEV
-//
-#ifndef _GEOMAlgo_Splitter_HeaderFile
-#define _GEOMAlgo_Splitter_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_Macro.hxx>
-#include <TopTools_ListOfShape.hxx>
-#include <TopTools_MapOfShape.hxx>
-#include <TopAbs_ShapeEnum.hxx>
-#include <Standard_Integer.hxx>
-#include <GEOMAlgo_Builder.hxx>
-#include <TopoDS_Shape.hxx>
-
-//! Implementation of Gluing Operation Algorithm (GA) <br>
-//=======================================================================
-//function : GEOMAlgo_Splitter
-//purpose  : 
-//=======================================================================
-class GEOMAlgo_Splitter  : public GEOMAlgo_Builder 
-{
- public:
-
-  //!  Empty constructor <br>
-  Standard_EXPORT
-    GEOMAlgo_Splitter();
-
-  Standard_EXPORT
-    virtual ~GEOMAlgo_Splitter();
-  
-  //!  Clears internal fields and arguments <br>
-  Standard_EXPORT
-    virtual  void Clear() ;
-  
-  //!  Adds Tool argument theShape of the operation <br>
-  Standard_EXPORT
-    virtual  void AddTool(const TopoDS_Shape& theShape) ;
-  
-  //!  Returns the arguments of the operation <br>
-  Standard_EXPORT
-    const TopTools_ListOfShape& Tools() const;
-  
-  Standard_EXPORT
-    void SetLimit(const TopAbs_ShapeEnum aLimit) ;
-  
-  Standard_EXPORT
-    TopAbs_ShapeEnum Limit() const;
-  
-  Standard_EXPORT
-    void SetLimitMode(const Standard_Integer aLimitMode) ;
-  
-  Standard_EXPORT
-    Standard_Integer LimitMode() const;
-  //!  Adds Tool arguments of the operation as <br>
-  //!           shapes of upper level of container shape theShape <br>
-  //! ===================================================== <br>
-  Standard_EXPORT
-    void AddToolCompound(const TopoDS_Shape& theShape) ;
-
- protected:
-  //! Build the resulting shapes of type theType <br>
-  Standard_EXPORT
-    virtual  void BuildResult(const TopAbs_ShapeEnum theType) ;
-  //!  Provides post-tratment actions <br>
-  Standard_EXPORT
-    virtual  void PostTreat() ;
-
-
-  TopTools_ListOfShape myTools;
-  TopTools_MapOfShape myMapTools;
-  TopAbs_ShapeEnum myLimit;
-  Standard_Integer myLimitMode;
-};
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+//  File:   GEOMAlgo_Splitter.hxx
+//
+//  Author: Peter KURNEV
+//
+#ifndef _GEOMAlgo_Splitter_HeaderFile
+#define _GEOMAlgo_Splitter_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Macro.hxx>
+#include <TopTools_ListOfShape.hxx>
+#include <TopTools_MapOfShape.hxx>
+#include <TopAbs_ShapeEnum.hxx>
+#include <Standard_Integer.hxx>
+#include <GEOMAlgo_Builder.hxx>
+#include <TopoDS_Shape.hxx>
+
+//! Implementation of Gluing Operation Algorithm (GA) <br>
+//=======================================================================
+//function : GEOMAlgo_Splitter
+//purpose  :
+//=======================================================================
+class GEOMAlgo_Splitter  : public GEOMAlgo_Builder
+{
+ public:
+
+  //!  Empty constructor <br>
+  Standard_EXPORT
+    GEOMAlgo_Splitter();
+
+  Standard_EXPORT
+    virtual ~GEOMAlgo_Splitter();
+
+  //!  Clears internal fields and arguments <br>
+  Standard_EXPORT
+    virtual  void Clear() ;
+
+  //!  Adds Tool argument theShape of the operation <br>
+  Standard_EXPORT
+    virtual  void AddTool(const TopoDS_Shape& theShape) ;
+
+  //!  Returns the arguments of the operation <br>
+  Standard_EXPORT
+    const TopTools_ListOfShape& Tools() const;
+
+  Standard_EXPORT
+    void SetLimit(const TopAbs_ShapeEnum aLimit) ;
+
+  Standard_EXPORT
+    TopAbs_ShapeEnum Limit() const;
+
+  Standard_EXPORT
+    void SetLimitMode(const Standard_Integer aLimitMode) ;
+
+  Standard_EXPORT
+    Standard_Integer LimitMode() const;
+  //!  Adds Tool arguments of the operation as <br>
+  //!           shapes of upper level of container shape theShape <br>
+  //! ===================================================== <br>
+  Standard_EXPORT
+    void AddToolCompound(const TopoDS_Shape& theShape) ;
+
+ protected:
+  //! Build the resulting shapes of type theType <br>
+  Standard_EXPORT
+    virtual  void BuildResult(const TopAbs_ShapeEnum theType) ;
+  //!  Provides post-tratment actions <br>
+  Standard_EXPORT
+    virtual  void PostTreat() ;
+
+
+  TopTools_ListOfShape myTools;
+  TopTools_MapOfShape myMapTools;
+  TopAbs_ShapeEnum myLimit;
+  Standard_Integer myLimitMode;
+};
+#endif
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_State.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_State.hxx
index d6dceb72b..423d494b2 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_State.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_State.hxx
@@ -1,40 +1,40 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-
-
-#ifndef _GEOMAlgo_State_HeaderFile
-#define _GEOMAlgo_State_HeaderFile
-enum GEOMAlgo_State {
-  GEOMAlgo_ST_UNKNOWN,
-  GEOMAlgo_ST_IN,
-  GEOMAlgo_ST_OUT,
-  GEOMAlgo_ST_ON,
-  GEOMAlgo_ST_ONIN,
-  GEOMAlgo_ST_ONOUT,
-  GEOMAlgo_ST_INOUT
-};
-
-#ifndef _Standard_PrimitiveTypes_HeaderFile
-#include <Standard_PrimitiveTypes.hxx>
-#endif
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+
+#ifndef _GEOMAlgo_State_HeaderFile
+#define _GEOMAlgo_State_HeaderFile
+enum GEOMAlgo_State {
+  GEOMAlgo_ST_UNKNOWN,
+  GEOMAlgo_ST_IN,
+  GEOMAlgo_ST_OUT,
+  GEOMAlgo_ST_ON,
+  GEOMAlgo_ST_ONIN,
+  GEOMAlgo_ST_ONOUT,
+  GEOMAlgo_ST_INOUT
+};
+
+#ifndef _Standard_PrimitiveTypes_HeaderFile
+#include <Standard_PrimitiveTypes.hxx>
+#endif
+
+#endif
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_StateCollector.cxx b/src/GEOMAlgo_NEW/GEOMAlgo_StateCollector.cxx
index 6a0754a4f..5e593541f 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_StateCollector.cxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_StateCollector.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -29,9 +29,9 @@
 
 //=======================================================================
 //function : GEOMAlgo_StateCollector
-//purpose  : 
+//purpose  :
 //=======================================================================
-GEOMAlgo_StateCollector::GEOMAlgo_StateCollector() 
+GEOMAlgo_StateCollector::GEOMAlgo_StateCollector()
 {
   myCounter[0]=0;
   myCounter[1]=0;
@@ -39,9 +39,9 @@ GEOMAlgo_StateCollector::GEOMAlgo_StateCollector()
 }
 //=======================================================================
 //function : AppendState
-//purpose  : 
+//purpose  :
 //=======================================================================
-Standard_Boolean GEOMAlgo_StateCollector::AppendState(const TopAbs_State aSt) 
+Standard_Boolean GEOMAlgo_StateCollector::AppendState(const TopAbs_State aSt)
 {
   Standard_Boolean bIsToBreak;
   //
@@ -51,7 +51,7 @@ Standard_Boolean GEOMAlgo_StateCollector::AppendState(const TopAbs_State aSt)
       break;
     case TopAbs_OUT:
       ++myCounter[1];
-      break; 
+      break;
     case TopAbs_ON:
       ++myCounter[2];
       break;
@@ -64,9 +64,9 @@ Standard_Boolean GEOMAlgo_StateCollector::AppendState(const TopAbs_State aSt)
 }
 //=======================================================================
 //function : State
-//purpose  : 
+//purpose  :
 //=======================================================================
-TopAbs_State GEOMAlgo_StateCollector::State()const 
+TopAbs_State GEOMAlgo_StateCollector::State()const
 {
   TopAbs_State aSt;
   //
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_StateCollector.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_StateCollector.hxx
index 39cad18b8..5ac5a96cf 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_StateCollector.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_StateCollector.hxx
@@ -1,56 +1,56 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-
-// File:        GEOMAlgo_StateCollector.hxx
-// Created:     Thu Mar 10 09:42:11 2005
-// Author:      Peter KURNEV
-//              <pkv@irinox>
-//
-#ifndef _GEOMAlgo_StateCollector_HeaderFile
-#define _GEOMAlgo_StateCollector_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_Macro.hxx>
-#include <Standard_Integer.hxx>
-#include <Standard_Boolean.hxx>
-#include <TopAbs_State.hxx>
-
-//=======================================================================
-// class   : GEOMAlgo_StateCollector
-//purpose  : 
-//=======================================================================
-class GEOMAlgo_StateCollector  
-{
- public:
-  Standard_EXPORT
-    GEOMAlgo_StateCollector();
-  
-  Standard_EXPORT
-    Standard_Boolean AppendState(const TopAbs_State aSt) ;
-  
-  Standard_EXPORT
-    TopAbs_State State() const;
-
- protected:
-  Standard_Integer myCounter[3];
-};
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File:        GEOMAlgo_StateCollector.hxx
+// Created:     Thu Mar 10 09:42:11 2005
+// Author:      Peter KURNEV
+//              <pkv@irinox>
+//
+#ifndef _GEOMAlgo_StateCollector_HeaderFile
+#define _GEOMAlgo_StateCollector_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Macro.hxx>
+#include <Standard_Integer.hxx>
+#include <Standard_Boolean.hxx>
+#include <TopAbs_State.hxx>
+
+//=======================================================================
+// class   : GEOMAlgo_StateCollector
+//purpose  :
+//=======================================================================
+class GEOMAlgo_StateCollector
+{
+ public:
+  Standard_EXPORT
+    GEOMAlgo_StateCollector();
+
+  Standard_EXPORT
+    Standard_Boolean AppendState(const TopAbs_State aSt) ;
+
+  Standard_EXPORT
+    TopAbs_State State() const;
+
+ protected:
+  Standard_Integer myCounter[3];
+};
+#endif
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_SurfaceTools.cxx b/src/GEOMAlgo_NEW/GEOMAlgo_SurfaceTools.cxx
index b725fb6af..f9d0f036b 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_SurfaceTools.cxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_SurfaceTools.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -45,7 +45,7 @@
 
 //=======================================================================
 //function : GetState
-//purpose  : 
+//purpose  :
 //=======================================================================
  Standard_Integer GEOMAlgo_SurfaceTools::GetState(const gp_Pnt& aP,
                                                   const GeomAdaptor_Surface& aGAS,
@@ -69,19 +69,19 @@
     aR=0.;
     aDp=GEOMAlgo_SurfaceTools::Distance(aP, aPln);
     break;
-  
-  case GeomAbs_Cylinder: 
+
+  case GeomAbs_Cylinder:
     aCyl=aGAS.Cylinder();
     aR=aCyl.Radius();
     aDp=GEOMAlgo_SurfaceTools::Distance(aP, aCyl);
-    break; 
+    break;
 
-  case GeomAbs_Sphere: 
+  case GeomAbs_Sphere:
     aSph=aGAS.Sphere();
     aR=aSph.Radius();
     aDp=GEOMAlgo_SurfaceTools::Distance(aP, aSph);
     break;
-    
+
   default:
     iErr=1; // unprocessed surface type
     break;
@@ -101,7 +101,7 @@
 }
 //=======================================================================
 //function : GetState
-//purpose  : 
+//purpose  :
 //=======================================================================
  Standard_Integer GEOMAlgo_SurfaceTools::GetState(const gp_Pnt& aP,
                                                   const Handle(Geom_Surface)& aSurf,
@@ -120,7 +120,7 @@
 }
 //=======================================================================
 //function : ReverseState
-//purpose  : 
+//purpose  :
 //=======================================================================
  TopAbs_State GEOMAlgo_SurfaceTools::ReverseState(const TopAbs_State aState)
 {
@@ -141,9 +141,9 @@
 }
 //=======================================================================
 //function : Distance
-//purpose  : 
+//purpose  :
 //=======================================================================
-Standard_Real GEOMAlgo_SurfaceTools::Distance(const gp_Pnt& aP, 
+Standard_Real GEOMAlgo_SurfaceTools::Distance(const gp_Pnt& aP,
                                               const gp_Sphere& aSph)
 {
   Standard_Real aD;
@@ -155,9 +155,9 @@ Standard_Real GEOMAlgo_SurfaceTools::Distance(const gp_Pnt& aP,
 }
 //=======================================================================
 //function : Distance
-//purpose  : 
+//purpose  :
 //=======================================================================
-Standard_Real GEOMAlgo_SurfaceTools::Distance(const gp_Pnt& aP, 
+Standard_Real GEOMAlgo_SurfaceTools::Distance(const gp_Pnt& aP,
                                               const gp_Cylinder& aCyl)
 {
   Standard_Real aD;
@@ -170,9 +170,9 @@ Standard_Real GEOMAlgo_SurfaceTools::Distance(const gp_Pnt& aP,
 }
 //=======================================================================
 //function : Distance
-//purpose  : 
+//purpose  :
 //=======================================================================
-Standard_Real GEOMAlgo_SurfaceTools::Distance(const gp_Pnt& aP, 
+Standard_Real GEOMAlgo_SurfaceTools::Distance(const gp_Pnt& aP,
                                               const gp_Pln& aPL)
 {
   Standard_Real aD;
@@ -188,7 +188,7 @@ Standard_Real GEOMAlgo_SurfaceTools::Distance(const gp_Pnt& aP,
 }
 //=======================================================================
 //function : IsCoaxial
-//purpose  : 
+//purpose  :
 //=======================================================================
 Standard_Boolean GEOMAlgo_SurfaceTools::IsCoaxial(const gp_Pnt& aP1,
                                                   const gp_Pnt& aP2,
@@ -213,7 +213,7 @@ Standard_Boolean GEOMAlgo_SurfaceTools::IsCoaxial(const gp_Pnt& aP1,
 }
 //=======================================================================
 //function : IsAnalytic
-//purpose  : 
+//purpose  :
 //=======================================================================
 Standard_Boolean GEOMAlgo_SurfaceTools::IsAnalytic(const Handle(Geom_Surface)& aSurf)
 {
@@ -223,14 +223,14 @@ Standard_Boolean GEOMAlgo_SurfaceTools::IsAnalytic(const Handle(Geom_Surface)& a
   //
   aGAS.Load(aSurf);
   aType=aGAS.GetType();
-  bRet=(aType==GeomAbs_Plane || 
+  bRet=(aType==GeomAbs_Plane ||
         aType==GeomAbs_Cylinder ||
         aType==GeomAbs_Sphere);
   return bRet;
 }
 //=======================================================================
 //function : IsConformState
-//purpose  : 
+//purpose  :
 //=======================================================================
 Standard_Boolean GEOMAlgo_SurfaceTools::IsConformState(const TopAbs_State aST1,
                                                        const GEOMAlgo_State aST2)
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_SurfaceTools.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_SurfaceTools.hxx
index c848c2251..565a95172 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_SurfaceTools.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_SurfaceTools.hxx
@@ -1,94 +1,94 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-
-// File:        GEOMAlgo_SurfaceTools.hxx
-// Created:     Thu Jan 27 11:05:16 2005
-// Author:      Peter KURNEV
-//              <pkv@irinox>
-//
-#ifndef _GEOMAlgo_SurfaceTools_HeaderFile
-#define _GEOMAlgo_SurfaceTools_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_Macro.hxx>
-#include <Standard_Boolean.hxx>
-#include <Handle_Geom_Surface.hxx>
-#include <Standard_Real.hxx>
-#include <TopAbs_State.hxx>
-#include <GEOMAlgo_State.hxx>
-#include <Standard_Integer.hxx>
-#include <Geom_Surface.hxx>
-#include <gp_Pnt.hxx>
-#include <gp_Cylinder.hxx>
-#include <GeomAdaptor_Surface.hxx>
-#include <gp_Pln.hxx>
-#include <gp_Sphere.hxx>
-
-
-//=======================================================================
-//function : GEOMAlgo_SurfaceTools
-//purpose  : 
-//=======================================================================
-class GEOMAlgo_SurfaceTools  
-{
- public:
-  Standard_EXPORT
-    static  Standard_Boolean IsAnalytic(const Handle(Geom_Surface)& aS) ;
-  
-  Standard_EXPORT
-    static  Standard_Boolean IsCoaxial(const gp_Pnt& aP1,
-				       const gp_Pnt& aP2,
-				       const gp_Cylinder& aCyl,
-				       const Standard_Real aTol) ;
-  
-  Standard_EXPORT
-    static  Standard_Boolean IsConformState(const TopAbs_State aST1,
-					    const GEOMAlgo_State aST2) ;
-  
-  Standard_EXPORT
-    static  Standard_Integer GetState(const gp_Pnt& aP,
-				      const GeomAdaptor_Surface& aS,
-				      const Standard_Real aTol,TopAbs_State& aSt) ;
-  
-  Standard_EXPORT
-    static  Standard_Integer GetState(const gp_Pnt& aP,
-				      const Handle(Geom_Surface)& aS,
-				      const Standard_Real aTol,
-				      TopAbs_State& aSt) ;
-  
-  Standard_EXPORT
-    static  Standard_Real Distance(const gp_Pnt& aP,
-				   const gp_Pln& aPln) ;
-  
-  Standard_EXPORT
-    static  Standard_Real Distance(const gp_Pnt& aP,
-				   const gp_Cylinder& aCyl) ;
-  
-  Standard_EXPORT   
-    static  Standard_Real Distance(const gp_Pnt& aP,
-				   const gp_Sphere& aSph) ;
-  
-  Standard_EXPORT
-    static  TopAbs_State ReverseState(const TopAbs_State aSt) ;
-
-};
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File:        GEOMAlgo_SurfaceTools.hxx
+// Created:     Thu Jan 27 11:05:16 2005
+// Author:      Peter KURNEV
+//              <pkv@irinox>
+//
+#ifndef _GEOMAlgo_SurfaceTools_HeaderFile
+#define _GEOMAlgo_SurfaceTools_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Macro.hxx>
+#include <Standard_Boolean.hxx>
+#include <Handle_Geom_Surface.hxx>
+#include <Standard_Real.hxx>
+#include <TopAbs_State.hxx>
+#include <GEOMAlgo_State.hxx>
+#include <Standard_Integer.hxx>
+#include <Geom_Surface.hxx>
+#include <gp_Pnt.hxx>
+#include <gp_Cylinder.hxx>
+#include <GeomAdaptor_Surface.hxx>
+#include <gp_Pln.hxx>
+#include <gp_Sphere.hxx>
+
+
+//=======================================================================
+//function : GEOMAlgo_SurfaceTools
+//purpose  :
+//=======================================================================
+class GEOMAlgo_SurfaceTools
+{
+ public:
+  Standard_EXPORT
+    static  Standard_Boolean IsAnalytic(const Handle(Geom_Surface)& aS) ;
+
+  Standard_EXPORT
+    static  Standard_Boolean IsCoaxial(const gp_Pnt& aP1,
+				       const gp_Pnt& aP2,
+				       const gp_Cylinder& aCyl,
+				       const Standard_Real aTol) ;
+
+  Standard_EXPORT
+    static  Standard_Boolean IsConformState(const TopAbs_State aST1,
+					    const GEOMAlgo_State aST2) ;
+
+  Standard_EXPORT
+    static  Standard_Integer GetState(const gp_Pnt& aP,
+				      const GeomAdaptor_Surface& aS,
+				      const Standard_Real aTol,TopAbs_State& aSt) ;
+
+  Standard_EXPORT
+    static  Standard_Integer GetState(const gp_Pnt& aP,
+				      const Handle(Geom_Surface)& aS,
+				      const Standard_Real aTol,
+				      TopAbs_State& aSt) ;
+
+  Standard_EXPORT
+    static  Standard_Real Distance(const gp_Pnt& aP,
+				   const gp_Pln& aPln) ;
+
+  Standard_EXPORT
+    static  Standard_Real Distance(const gp_Pnt& aP,
+				   const gp_Cylinder& aCyl) ;
+
+  Standard_EXPORT
+    static  Standard_Real Distance(const gp_Pnt& aP,
+				   const gp_Sphere& aSph) ;
+
+  Standard_EXPORT
+    static  TopAbs_State ReverseState(const TopAbs_State aSt) ;
+
+};
+#endif
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_Tools.cxx b/src/GEOMAlgo_NEW/GEOMAlgo_Tools.cxx
index 556e082dc..8ae8a8e8f 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_Tools.cxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_Tools.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File:        GEOMAlgo_Tools.cxx
 // Created:     Mon Dec  6 11:35:29 2004
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_Tools.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_Tools.hxx
index f81530e03..d4345eec7 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_Tools.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_Tools.hxx
@@ -1,120 +1,121 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
-// File:        GEOMAlgo_Tools.hxx
-// Created:     Mon Dec  6 11:35:29 2004
-// Author:      Peter KURNEV
-
-#ifndef _GEOMAlgo_Tools_HeaderFile
-#define _GEOMAlgo_Tools_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_Macro.hxx>
-#include <Standard_Boolean.hxx>
-#include <Standard_Integer.hxx>
-#include <Standard_Real.hxx>
-#include <Handle_IntTools_Context.hxx>
-#include <Handle_Geom_Surface.hxx>
-#include <TopoDS_Shape.hxx>
-#include <GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape.hxx>
-#include <IntTools_Context.hxx>
-#include <TopTools_ListOfShape.hxx>
-#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
-#include <gp_Pnt.hxx>
-#include <TopoDS_Edge.hxx>
-#include <TopoDS_Face.hxx>
-#include <Geom_Surface.hxx>
-
-//=======================================================================
-//class    : GEOMAlgo_Tools
-//purpose  : 
-//=======================================================================
-class GEOMAlgo_Tools 
- {
-public:
-  Standard_EXPORT
-    static  Standard_Boolean IsCompositeShape(const TopoDS_Shape& aS) ;
-  
-  Standard_EXPORT
-    static  Standard_Integer RefineSDShapes(GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape& aMSD,
-					    const Standard_Real aTol,
-					    const Handle(IntTools_Context)& aCtx) ;
-  
-  Standard_EXPORT
-    static  Standard_Integer FindSDShapes(const TopTools_ListOfShape& aLE,
-					  const Standard_Real aTol,
-					  TopTools_IndexedDataMapOfShapeListOfShape& aMEE,
-					  const Handle(IntTools_Context)& aCtx) ;
-  
-  Standard_EXPORT
-    static  Standard_Integer FindSDShapes(const TopoDS_Shape& aE1,
-					  const TopTools_ListOfShape& aLE,
-					  const Standard_Real aTol,
-					  TopTools_ListOfShape& aLESD,
-					  const Handle(IntTools_Context)& aCtx) ;
-  
-  Standard_EXPORT
-    static  Standard_Boolean ProjectPointOnShape(const gp_Pnt& aP1,
-						 const TopoDS_Shape& aS,gp_Pnt& aP2,
-						 const Handle(IntTools_Context)& aCtx) ;
-  
-  Standard_EXPORT
-    static  void PointOnShape(const TopoDS_Shape& aS,
-			      gp_Pnt& aP3D) ;
-  
-  Standard_EXPORT
-    static  void PointOnEdge(const TopoDS_Edge& aE,
-			     gp_Pnt& aP3D) ;
-  
-  Standard_EXPORT
-    static  void PointOnEdge(const TopoDS_Edge& aE,
-			     const Standard_Real aT,gp_Pnt& aP3D) ;
-  
-  Standard_EXPORT
-    static  void PointOnFace(const TopoDS_Face& aF,
-			     gp_Pnt& aP3D) ;
-  
-  Standard_EXPORT
-    static  void PointOnFace(const TopoDS_Face& aF,
-			     const Standard_Real aU,
-			     const Standard_Real aV,
-			     gp_Pnt& aP3D) ;
-  
-  Standard_EXPORT
-    static  void RefinePCurveForEdgeOnFace(const TopoDS_Edge& aE,
-					   const TopoDS_Face& aF,
-					   const Standard_Real aU1,
-					   const Standard_Real aU2) ;
-  
-  Standard_EXPORT
-    static  Standard_Boolean IsUPeriodic(const Handle(Geom_Surface)& aS) ;
-  
-  Standard_EXPORT
-    static  Standard_Boolean CorrectWires(const TopoDS_Shape& aS) ;
-  
-  Standard_EXPORT
-    static  Standard_Integer BuildPCurveForEdgeOnFace(const TopoDS_Edge& aE,
-						      const TopoDS_Edge& aEold,
-						      const TopoDS_Face& aF,
-						      const Handle(IntTools_Context)& aCtx) ;
-  
-};
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File:        GEOMAlgo_Tools.hxx
+// Created:     Mon Dec  6 11:35:29 2004
+// Author:      Peter KURNEV
+
+#ifndef _GEOMAlgo_Tools_HeaderFile
+#define _GEOMAlgo_Tools_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Macro.hxx>
+#include <Standard_Boolean.hxx>
+#include <Standard_Integer.hxx>
+#include <Standard_Real.hxx>
+#include <Handle_IntTools_Context.hxx>
+#include <Handle_Geom_Surface.hxx>
+#include <TopoDS_Shape.hxx>
+#include <GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape.hxx>
+#include <IntTools_Context.hxx>
+#include <TopTools_ListOfShape.hxx>
+#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
+#include <gp_Pnt.hxx>
+#include <TopoDS_Edge.hxx>
+#include <TopoDS_Face.hxx>
+#include <Geom_Surface.hxx>
+
+//=======================================================================
+//class    : GEOMAlgo_Tools
+//purpose  :
+//=======================================================================
+class GEOMAlgo_Tools
+ {
+public:
+  Standard_EXPORT
+    static  Standard_Boolean IsCompositeShape(const TopoDS_Shape& aS) ;
+
+  Standard_EXPORT
+    static  Standard_Integer RefineSDShapes(GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape& aMSD,
+					    const Standard_Real aTol,
+					    const Handle(IntTools_Context)& aCtx) ;
+
+  Standard_EXPORT
+    static  Standard_Integer FindSDShapes(const TopTools_ListOfShape& aLE,
+					  const Standard_Real aTol,
+					  TopTools_IndexedDataMapOfShapeListOfShape& aMEE,
+					  const Handle(IntTools_Context)& aCtx) ;
+
+  Standard_EXPORT
+    static  Standard_Integer FindSDShapes(const TopoDS_Shape& aE1,
+					  const TopTools_ListOfShape& aLE,
+					  const Standard_Real aTol,
+					  TopTools_ListOfShape& aLESD,
+					  const Handle(IntTools_Context)& aCtx) ;
+
+  Standard_EXPORT
+    static  Standard_Boolean ProjectPointOnShape(const gp_Pnt& aP1,
+						 const TopoDS_Shape& aS,gp_Pnt& aP2,
+						 const Handle(IntTools_Context)& aCtx) ;
+
+  Standard_EXPORT
+    static  void PointOnShape(const TopoDS_Shape& aS,
+			      gp_Pnt& aP3D) ;
+
+  Standard_EXPORT
+    static  void PointOnEdge(const TopoDS_Edge& aE,
+			     gp_Pnt& aP3D) ;
+
+  Standard_EXPORT
+    static  void PointOnEdge(const TopoDS_Edge& aE,
+			     const Standard_Real aT,gp_Pnt& aP3D) ;
+
+  Standard_EXPORT
+    static  void PointOnFace(const TopoDS_Face& aF,
+			     gp_Pnt& aP3D) ;
+
+  Standard_EXPORT
+    static  void PointOnFace(const TopoDS_Face& aF,
+			     const Standard_Real aU,
+			     const Standard_Real aV,
+			     gp_Pnt& aP3D) ;
+
+  Standard_EXPORT
+    static  void RefinePCurveForEdgeOnFace(const TopoDS_Edge& aE,
+					   const TopoDS_Face& aF,
+					   const Standard_Real aU1,
+					   const Standard_Real aU2) ;
+
+  Standard_EXPORT
+    static  Standard_Boolean IsUPeriodic(const Handle(Geom_Surface)& aS) ;
+
+  Standard_EXPORT
+    static  Standard_Boolean CorrectWires(const TopoDS_Shape& aS) ;
+
+  Standard_EXPORT
+    static  Standard_Integer BuildPCurveForEdgeOnFace(const TopoDS_Edge& aE,
+						      const TopoDS_Edge& aEold,
+						      const TopoDS_Face& aF,
+						      const Handle(IntTools_Context)& aCtx) ;
+
+};
+#endif
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_Tools3D.cxx b/src/GEOMAlgo_NEW/GEOMAlgo_Tools3D.cxx
index 7ca1bf360..81d7b75e1 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_Tools3D.cxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_Tools3D.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -1182,9 +1182,9 @@ void GetApproxNormalToFaceOnEdge (const TopoDS_Edge& aEx,
 //modified by NIZNHY-PKV Tue Nov 22 10:36:59 2011f
 //=======================================================================
 //function : PntInFace
-//purpose  : 
+//purpose  :
 //=======================================================================
-Standard_Integer GEOMAlgo_Tools3D::PntInFace(const TopoDS_Face& aF, 
+Standard_Integer GEOMAlgo_Tools3D::PntInFace(const TopoDS_Face& aF,
 					     gp_Pnt& theP,
 					     gp_Pnt2d& theP2D)
 {
@@ -1210,8 +1210,8 @@ Standard_Integer GEOMAlgo_Tools3D::PntInFace(const TopoDS_Face& aF,
   aTolTangfIntr=1.e-10;
   //
   Geom2dHatch_Intersector aIntr(aTotArcIntr, aTolTangfIntr);
-  Geom2dHatch_Hatcher aHatcher(aIntr, 
-			       aTolHatch2D, aTolHatch3D, 
+  Geom2dHatch_Hatcher aHatcher(aIntr,
+			       aTolHatch2D, aTolHatch3D,
 			       Standard_True, Standard_False);
   //
   iErr=0;
@@ -1219,7 +1219,7 @@ Standard_Integer GEOMAlgo_Tools3D::PntInFace(const TopoDS_Face& aF,
   //
   aFF=aF;
   aFF.Orientation (TopAbs_FORWARD);
-  // 
+  //
   aS=BRep_Tool::Surface(aFF);
   BRepTools::UVBounds(aFF, aUMin, aUMax, aVMin, aVMax);
   //
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_Tools3D.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_Tools3D.hxx
index b62fb00c6..d23d73b60 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_Tools3D.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_Tools3D.hxx
@@ -1,240 +1,240 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//  File    : GEOMAlgo_Tools3D.hxx
-//  Created :
-//  Author  : Peter KURNEV
-
-#ifndef _GEOMAlgo_Tools3D_HeaderFile
-#define _GEOMAlgo_Tools3D_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_Macro.hxx>
-#include <Standard_Boolean.hxx>
-#include <Handle_IntTools_Context.hxx>
-#include <Standard_Integer.hxx>
-#include <TopAbs_ShapeEnum.hxx>
-#include <TopAbs_State.hxx>
-#include <Standard_Real.hxx>
-#include <NMTTools_ListOfCoupleOfShape.hxx>
-#include <TopoDS_Shape.hxx>
-#include <IntTools_Context.hxx>
-#include <TopoDS_Face.hxx>
-#include <TopoDS_Edge.hxx>
-#include <TopTools_ListOfShape.hxx>
-#include <TopTools_IndexedMapOfShape.hxx>
-#include <TopoDS_Solid.hxx>
-#include <gp_Pnt.hxx>
-#include <TopoDS_Vertex.hxx>
-#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
-#include <gp_Pnt2d.hxx>
-
-
-//!  Auxiliary tools for Algorithms <br>
-//=======================================================================
-//class    : GEOMAlgo_Tools3D
-//purpose  : 
-//=======================================================================
-class GEOMAlgo_Tools3D  {
- public:
-  //! Returns True if the shape theSplit has opposite <br>
-  //!          direction than theShape <br>
-  //!          theContext - cashed geometrical tools <br>
-  Standard_EXPORT
-    static  Standard_Boolean IsSplitToReverse(const TopoDS_Shape& theSplit,
-					      const TopoDS_Shape& theShape,
-					      const Handle(IntTools_Context)& theContext) ;
-  
-  //! Returns True if normal direction of the face <br>
-  //!          theShape is not the same as for the face <br>
-  //!          theSplit <br>
-  //!          theContext - cashed geometrical tools <br>
-  Standard_EXPORT
-    static  Standard_Boolean IsSplitToReverse(const TopoDS_Face& theSplit,
-					      const TopoDS_Face& theShape,
-					      const Handle(IntTools_Context)& theContext) ;
-  
-  //! Returns True if tangent direction of the edge <br>
-  //!          theEdge is not the same as for the edge <br>
-  //!          theSplit <br>
-  //!          theContext - cashed geometrical tools <br>
-  Standard_EXPORT
-    static  Standard_Boolean IsSplitToReverse(const TopoDS_Edge& theEdge,
-					      const TopoDS_Edge& theSplit,
-					      const Handle(IntTools_Context)& theContext) ;
-  
-  //! For the couple of faces theF1, theF2 <br>
-  //!          computes sense value <br>
-  //!          Returns 0 if the faces are not sensible <br>
-  //!          Returns 1 if the faces have same sense <br>
-  //!          Returns 2 if the faces have opposite sense <br>
-  Standard_EXPORT   
-    static  Standard_Integer Sense(const TopoDS_Face& theF1,
-				   const TopoDS_Face& theF2) ;
-  
-  //! Makes new face theF2 from surface and wires <br>
-  //!          of the face theF1 <br>
-  Standard_EXPORT
-    static  void CopyFace(const TopoDS_Face& theF1,
-			  TopoDS_Face& theF2) ;
-  
-  //! Makes empty shape theShape of the type theType <br>
-  Standard_EXPORT
-    static  void MakeContainer(const TopAbs_ShapeEnum theType,
-			       TopoDS_Shape& theShape) ;
-  
-  //! For the list of faces theLS build block <br>
-  //!          theLSCB in terms of connexity by edges <br>
-  //!          theMapAvoid - set of edges to avoid for <br>
-  //!          the treatment <br>
-  Standard_EXPORT
-    static  void MakeConnexityBlock(const TopTools_ListOfShape& theLS,
-				    const TopTools_IndexedMapOfShape& theMapAvoid,
-				    TopTools_ListOfShape& theLSCB) ;
-  
-  //! Computes the 3-D state of the shape theShape <br>
-  //!          toward solid theSolid. <br>
-  //!          theTol - value of precision of computation <br>
-  //!          theContext- cahed geometrical tools <br>
-  //!          Returns 3-D state. <br>
-  Standard_EXPORT
-    static  TopAbs_State ComputeStateByOnePoint(const TopoDS_Shape& theShape,
-						const TopoDS_Solid& theSolid,
-						const Standard_Real theTol,
-						const Handle(IntTools_Context)& theContext) ;
-  
-  //! Computes the 3-D state of the point thePoint <br>
-  //!          toward solid theSolid. <br>
-  //!          theTol - value of precision of computation <br>
-  //!          theContext- cahed geometrical tools <br>
-  //!          Returns 3-D state. <br>
-  Standard_EXPORT
-    static  TopAbs_State ComputeState(const gp_Pnt& thePoint,
-				      const TopoDS_Solid& theSolid,
-				      const Standard_Real theTol,
-				      const Handle(IntTools_Context)& theContext) ;
-  
-  //! Computes the 3-D state of the vertex theVertex <br>
-  //!          toward solid theSolid. <br>
-  //!          theTol - value of precision of computation <br>
-  //!          theContext- cahed geometrical tools <br>
-  //!          Returns 3-D state. <br>
-  Standard_EXPORT   
-    static  TopAbs_State ComputeState(const TopoDS_Vertex& theVertex,
-				      const TopoDS_Solid& theSolid,
-				      const Standard_Real theTol,
-				      const Handle(IntTools_Context)& theContext) ;
-  
-  //! Computes the 3-D state of the edge theEdge <br>
-  //!          toward solid theSolid. <br>
-  //!          theTol - value of precision of computation <br>
-  //!          theContext- cahed geometrical tools <br>
-  //!          Returns 3-D state. <br>
-  Standard_EXPORT  
-    static  TopAbs_State ComputeState(const TopoDS_Edge& theEdge,
-				      const TopoDS_Solid& theSolid,
-				      const Standard_Real theTol,
-				      const Handle(IntTools_Context)& theContext) ;
-  
-  //! Computes the 3-D state of the face theFace <br>
-  //!          toward solid theSolid. <br>
-  //!          theTol - value of precision of computation <br>
-  //!          theBounds - set of edges of theFace to avoid <br>
-  //!          theContext- cahed geometrical tools <br>
-  //!          Returns 3-D state. <br>
-  Standard_EXPORT   
-    static  TopAbs_State ComputeState(const TopoDS_Face& theFace,
-				      const TopoDS_Solid& theSolid,
-				      const Standard_Real theTol,
-				      const TopTools_IndexedMapOfShape& theBounds,
-				      const Handle(IntTools_Context)& theContext) ;
-  
-  //! Returns True if the face theFace is inside of the <br>
-  //!          couple of faces theFace1, theFace2. <br>
-  //!          The faces theFace, theFace1, theFace2  must <br>
-  //!          share the edge theEdge <br>
-  Standard_EXPORT
-    static  Standard_Boolean IsInternalFace(const TopoDS_Face& theFace,
-					    const TopoDS_Edge& theEdge,
-					    const TopoDS_Face& theFace1,
-					    const TopoDS_Face& theFace2,
-					    const Handle(IntTools_Context)& theContext) ;
-  
-  //! Returns True if the face theFace is inside of the <br>
-  //!          appropriate couple of faces (from the set theLF)    . <br>
-  //!          The faces of the set theLF and theFace  must <br>
-  //!          share the edge theEdge <br>
-  Standard_EXPORT
-    static  Standard_Boolean IsInternalFace(const TopoDS_Face& theFace,
-					    const TopoDS_Edge& theEdge,
-					    const TopTools_ListOfShape& theLF,
-					    const Handle(IntTools_Context)& theContext) ;
-  
-  //! Returns True if the face theFace is inside the <br>
-  //!          solid theSolid. <br>
-  //!          theMEF - Map Edge/Faces for theSolid <br>
-  //!          theTol - value of precision of computation <br>
-  //!          theContext- cahed geometrical tools <br>
-  Standard_EXPORT
-    static  Standard_Boolean IsInternalFace(const TopoDS_Face& theFace,
-					    const TopoDS_Solid& theSolid,
-					    const TopTools_IndexedDataMapOfShapeListOfShape& theMEF,
-					    const Standard_Real theTol,
-					    const Handle(IntTools_Context)& theContext) ;
-  
-  //!  For the face theFace and its edge theEdge <br>
-  //!           finds the face suitable to produce shell. <br>
-  //!           theLCEF - set of faces to search. All faces <br>
-  //!           from theLCEF must share edge theEdge <br>
-  Standard_EXPORT
-    static  void GetFaceOff(const TopoDS_Edge& theEdge,
-			    const TopoDS_Face& theFace,
-			    const NMTTools_ListOfCoupleOfShape& theLCEF,
-			    TopoDS_Face& theFaceOff) ;
-
-  //! For the face theFace gets the edge theEdgeOnF <br>
-  //!          that is the same as theEdge <br>
-  //!          Returns True if such edge exists <br>
-  //!          Returns False if there is no such edge <br>
-  Standard_EXPORT
-    static  Standard_Boolean GetEdgeOnFace(const TopoDS_Edge& theEdge,
-					   const TopoDS_Face& theFace,
-					   TopoDS_Edge& theEdgeOnF) ;
-  
-  //! Returns True if the face theFace contains <br>
-  //!          the edge theEdge but with opposite orientation. <br>
-  //!          If the method  returns True theEdgeOff is the <br>
-  //!          edge founded <br>
-  Standard_EXPORT
-    static  Standard_Boolean GetEdgeOff(const TopoDS_Edge& theEdge,
-					const TopoDS_Face& theFace,
-					TopoDS_Edge& theEdgeOff) ;
-  
-  //! Computes a point <theP> inside the face <theF>. <br>
-  //!          <theP2D> -  2D  representation of <theP> <br>
-  //!          on the surface of <theF> <br>
-  //!          Returns 0 in case of success. <br>
-  Standard_EXPORT
-    static  Standard_Integer PntInFace(const TopoDS_Face& theF,
-				       gp_Pnt& theP,
-				       gp_Pnt2d& theP2D) ;
-};
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+//  File    : GEOMAlgo_Tools3D.hxx
+//  Created :
+//  Author  : Peter KURNEV
+
+#ifndef _GEOMAlgo_Tools3D_HeaderFile
+#define _GEOMAlgo_Tools3D_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Macro.hxx>
+#include <Standard_Boolean.hxx>
+#include <Handle_IntTools_Context.hxx>
+#include <Standard_Integer.hxx>
+#include <TopAbs_ShapeEnum.hxx>
+#include <TopAbs_State.hxx>
+#include <Standard_Real.hxx>
+#include <NMTTools_ListOfCoupleOfShape.hxx>
+#include <TopoDS_Shape.hxx>
+#include <IntTools_Context.hxx>
+#include <TopoDS_Face.hxx>
+#include <TopoDS_Edge.hxx>
+#include <TopTools_ListOfShape.hxx>
+#include <TopTools_IndexedMapOfShape.hxx>
+#include <TopoDS_Solid.hxx>
+#include <gp_Pnt.hxx>
+#include <TopoDS_Vertex.hxx>
+#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
+#include <gp_Pnt2d.hxx>
+
+
+//!  Auxiliary tools for Algorithms <br>
+//=======================================================================
+//class    : GEOMAlgo_Tools3D
+//purpose  :
+//=======================================================================
+class GEOMAlgo_Tools3D  {
+ public:
+  //! Returns True if the shape theSplit has opposite <br>
+  //!          direction than theShape <br>
+  //!          theContext - cashed geometrical tools <br>
+  Standard_EXPORT
+    static  Standard_Boolean IsSplitToReverse(const TopoDS_Shape& theSplit,
+					      const TopoDS_Shape& theShape,
+					      const Handle(IntTools_Context)& theContext) ;
+
+  //! Returns True if normal direction of the face <br>
+  //!          theShape is not the same as for the face <br>
+  //!          theSplit <br>
+  //!          theContext - cashed geometrical tools <br>
+  Standard_EXPORT
+    static  Standard_Boolean IsSplitToReverse(const TopoDS_Face& theSplit,
+					      const TopoDS_Face& theShape,
+					      const Handle(IntTools_Context)& theContext) ;
+
+  //! Returns True if tangent direction of the edge <br>
+  //!          theEdge is not the same as for the edge <br>
+  //!          theSplit <br>
+  //!          theContext - cashed geometrical tools <br>
+  Standard_EXPORT
+    static  Standard_Boolean IsSplitToReverse(const TopoDS_Edge& theEdge,
+					      const TopoDS_Edge& theSplit,
+					      const Handle(IntTools_Context)& theContext) ;
+
+  //! For the couple of faces theF1, theF2 <br>
+  //!          computes sense value <br>
+  //!          Returns 0 if the faces are not sensible <br>
+  //!          Returns 1 if the faces have same sense <br>
+  //!          Returns 2 if the faces have opposite sense <br>
+  Standard_EXPORT
+    static  Standard_Integer Sense(const TopoDS_Face& theF1,
+				   const TopoDS_Face& theF2) ;
+
+  //! Makes new face theF2 from surface and wires <br>
+  //!          of the face theF1 <br>
+  Standard_EXPORT
+    static  void CopyFace(const TopoDS_Face& theF1,
+			  TopoDS_Face& theF2) ;
+
+  //! Makes empty shape theShape of the type theType <br>
+  Standard_EXPORT
+    static  void MakeContainer(const TopAbs_ShapeEnum theType,
+			       TopoDS_Shape& theShape) ;
+
+  //! For the list of faces theLS build block <br>
+  //!          theLSCB in terms of connexity by edges <br>
+  //!          theMapAvoid - set of edges to avoid for <br>
+  //!          the treatment <br>
+  Standard_EXPORT
+    static  void MakeConnexityBlock(const TopTools_ListOfShape& theLS,
+				    const TopTools_IndexedMapOfShape& theMapAvoid,
+				    TopTools_ListOfShape& theLSCB) ;
+
+  //! Computes the 3-D state of the shape theShape <br>
+  //!          toward solid theSolid. <br>
+  //!          theTol - value of precision of computation <br>
+  //!          theContext- cahed geometrical tools <br>
+  //!          Returns 3-D state. <br>
+  Standard_EXPORT
+    static  TopAbs_State ComputeStateByOnePoint(const TopoDS_Shape& theShape,
+						const TopoDS_Solid& theSolid,
+						const Standard_Real theTol,
+						const Handle(IntTools_Context)& theContext) ;
+
+  //! Computes the 3-D state of the point thePoint <br>
+  //!          toward solid theSolid. <br>
+  //!          theTol - value of precision of computation <br>
+  //!          theContext- cahed geometrical tools <br>
+  //!          Returns 3-D state. <br>
+  Standard_EXPORT
+    static  TopAbs_State ComputeState(const gp_Pnt& thePoint,
+				      const TopoDS_Solid& theSolid,
+				      const Standard_Real theTol,
+				      const Handle(IntTools_Context)& theContext) ;
+
+  //! Computes the 3-D state of the vertex theVertex <br>
+  //!          toward solid theSolid. <br>
+  //!          theTol - value of precision of computation <br>
+  //!          theContext- cahed geometrical tools <br>
+  //!          Returns 3-D state. <br>
+  Standard_EXPORT
+    static  TopAbs_State ComputeState(const TopoDS_Vertex& theVertex,
+				      const TopoDS_Solid& theSolid,
+				      const Standard_Real theTol,
+				      const Handle(IntTools_Context)& theContext) ;
+
+  //! Computes the 3-D state of the edge theEdge <br>
+  //!          toward solid theSolid. <br>
+  //!          theTol - value of precision of computation <br>
+  //!          theContext- cahed geometrical tools <br>
+  //!          Returns 3-D state. <br>
+  Standard_EXPORT
+    static  TopAbs_State ComputeState(const TopoDS_Edge& theEdge,
+				      const TopoDS_Solid& theSolid,
+				      const Standard_Real theTol,
+				      const Handle(IntTools_Context)& theContext) ;
+
+  //! Computes the 3-D state of the face theFace <br>
+  //!          toward solid theSolid. <br>
+  //!          theTol - value of precision of computation <br>
+  //!          theBounds - set of edges of theFace to avoid <br>
+  //!          theContext- cahed geometrical tools <br>
+  //!          Returns 3-D state. <br>
+  Standard_EXPORT
+    static  TopAbs_State ComputeState(const TopoDS_Face& theFace,
+				      const TopoDS_Solid& theSolid,
+				      const Standard_Real theTol,
+				      const TopTools_IndexedMapOfShape& theBounds,
+				      const Handle(IntTools_Context)& theContext) ;
+
+  //! Returns True if the face theFace is inside of the <br>
+  //!          couple of faces theFace1, theFace2. <br>
+  //!          The faces theFace, theFace1, theFace2  must <br>
+  //!          share the edge theEdge <br>
+  Standard_EXPORT
+    static  Standard_Boolean IsInternalFace(const TopoDS_Face& theFace,
+					    const TopoDS_Edge& theEdge,
+					    const TopoDS_Face& theFace1,
+					    const TopoDS_Face& theFace2,
+					    const Handle(IntTools_Context)& theContext) ;
+
+  //! Returns True if the face theFace is inside of the <br>
+  //!          appropriate couple of faces (from the set theLF)    . <br>
+  //!          The faces of the set theLF and theFace  must <br>
+  //!          share the edge theEdge <br>
+  Standard_EXPORT
+    static  Standard_Boolean IsInternalFace(const TopoDS_Face& theFace,
+					    const TopoDS_Edge& theEdge,
+					    const TopTools_ListOfShape& theLF,
+					    const Handle(IntTools_Context)& theContext) ;
+
+  //! Returns True if the face theFace is inside the <br>
+  //!          solid theSolid. <br>
+  //!          theMEF - Map Edge/Faces for theSolid <br>
+  //!          theTol - value of precision of computation <br>
+  //!          theContext- cahed geometrical tools <br>
+  Standard_EXPORT
+    static  Standard_Boolean IsInternalFace(const TopoDS_Face& theFace,
+					    const TopoDS_Solid& theSolid,
+					    const TopTools_IndexedDataMapOfShapeListOfShape& theMEF,
+					    const Standard_Real theTol,
+					    const Handle(IntTools_Context)& theContext) ;
+
+  //!  For the face theFace and its edge theEdge <br>
+  //!           finds the face suitable to produce shell. <br>
+  //!           theLCEF - set of faces to search. All faces <br>
+  //!           from theLCEF must share edge theEdge <br>
+  Standard_EXPORT
+    static  void GetFaceOff(const TopoDS_Edge& theEdge,
+			    const TopoDS_Face& theFace,
+			    const NMTTools_ListOfCoupleOfShape& theLCEF,
+			    TopoDS_Face& theFaceOff) ;
+
+  //! For the face theFace gets the edge theEdgeOnF <br>
+  //!          that is the same as theEdge <br>
+  //!          Returns True if such edge exists <br>
+  //!          Returns False if there is no such edge <br>
+  Standard_EXPORT
+    static  Standard_Boolean GetEdgeOnFace(const TopoDS_Edge& theEdge,
+					   const TopoDS_Face& theFace,
+					   TopoDS_Edge& theEdgeOnF) ;
+
+  //! Returns True if the face theFace contains <br>
+  //!          the edge theEdge but with opposite orientation. <br>
+  //!          If the method  returns True theEdgeOff is the <br>
+  //!          edge founded <br>
+  Standard_EXPORT
+    static  Standard_Boolean GetEdgeOff(const TopoDS_Edge& theEdge,
+					const TopoDS_Face& theFace,
+					TopoDS_Edge& theEdgeOff) ;
+
+  //! Computes a point <theP> inside the face <theF>. <br>
+  //!          <theP2D> -  2D  representation of <theP> <br>
+  //!          on the surface of <theF> <br>
+  //!          Returns 0 in case of success. <br>
+  Standard_EXPORT
+    static  Standard_Integer PntInFace(const TopoDS_Face& theF,
+				       gp_Pnt& theP,
+				       gp_Pnt2d& theP2D) ;
+};
+#endif
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_Tools_1.cxx b/src/GEOMAlgo_NEW/GEOMAlgo_Tools_1.cxx
index 2ad9095e2..56caf6c91 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_Tools_1.cxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_Tools_1.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -57,8 +57,8 @@
 #include <TopTools_DataMapIteratorOfDataMapOfShapeListOfShape.hxx>
 #include <BRepTools.hxx>
 
-static 
-  inline Standard_Boolean IsEqual(const TopoDS_Shape& aS1, 
+static
+  inline Standard_Boolean IsEqual(const TopoDS_Shape& aS1,
 				  const TopoDS_Shape& aS2) {
   return TopTools_ShapeMapHasher::IsEqual(aS1, aS2);
 }
@@ -69,7 +69,7 @@ static
 
 //=======================================================================
 //function : CorrectWires
-//purpose  : 
+//purpose  :
 //=======================================================================
   Standard_Boolean GEOMAlgo_Tools::CorrectWires(const TopoDS_Shape& aShape)
 {
@@ -79,7 +79,7 @@ static
   TopTools_MapOfShape aMF;
   GeomAdaptor_Surface aGAS;
   GeomAbs_SurfaceType aTS;
-  TopLoc_Location aLoc; 
+  TopLoc_Location aLoc;
   //
   bRet=Standard_False;
   //
@@ -105,7 +105,7 @@ static
 }
 //=======================================================================
 //class: GEOMAlgo_InfoEdge
-//purpose  : 
+//purpose  :
 //=======================================================================
 class GEOMAlgo_InfoEdge {
  public:
@@ -118,7 +118,7 @@ class GEOMAlgo_InfoEdge {
   ~GEOMAlgo_InfoEdge(){
   };
   //
-  void Init(const TopoDS_Edge& aE, 
+  void Init(const TopoDS_Edge& aE,
 	    const TopoDS_Face& aF);
   //
   void SetTolInt(const Standard_Real aTolInt) {
@@ -158,14 +158,14 @@ class GEOMAlgo_InfoEdge {
   Handle(Geom_Curve) myC3D;
 };
 //
-typedef NCollection_DataMap<TopoDS_Shape, GEOMAlgo_InfoEdge> GEOMAlgo_DataMapOfShapeInfoEdge; 
-typedef GEOMAlgo_DataMapOfShapeInfoEdge::Iterator GEOMAlgo_DataMapIteratorOfDataMapOfShapeInfoEdge; 
+typedef NCollection_DataMap<TopoDS_Shape, GEOMAlgo_InfoEdge> GEOMAlgo_DataMapOfShapeInfoEdge;
+typedef GEOMAlgo_DataMapOfShapeInfoEdge::Iterator GEOMAlgo_DataMapIteratorOfDataMapOfShapeInfoEdge;
 
 //=======================================================================
 //function : Init
-//purpose  : 
+//purpose  :
 //=======================================================================
-  void GEOMAlgo_InfoEdge::Init(const TopoDS_Edge& aE, 
+  void GEOMAlgo_InfoEdge::Init(const TopoDS_Edge& aE,
 			       const TopoDS_Face& aF)
 {
   Standard_Real aT1, aT2, aT1x, aT2x;
@@ -198,7 +198,7 @@ typedef GEOMAlgo_DataMapOfShapeInfoEdge::Iterator GEOMAlgo_DataMapIteratorOfData
 }
 //=======================================================================
 //function : CorrectWire
-//purpose  : 
+//purpose  :
 //=======================================================================
 Standard_Boolean CorrectWire(const TopoDS_Wire& aW,
 			     const TopoDS_Face& aF)
@@ -218,7 +218,7 @@ Standard_Boolean CorrectWire(const TopoDS_Wire& aW,
   aItW.Initialize(aW);
   for (; aItW.More(); aItW.Next()) {
     const TopoDS_Edge& aE=*((TopoDS_Edge*)&aItW.Value());
-    
+
     aItE.Initialize(aE);
     for (aNbV=0; aItE.More(); aItE.Next(), ++aNbV) {
     }
@@ -275,17 +275,17 @@ Standard_Boolean CorrectWire(const TopoDS_Wire& aW,
     aTolV=BRep_Tool::Tolerance(aV);
     //
     const TopoDS_Edge& aE1=*((TopoDS_Edge*)&aLE.First());
-    const GEOMAlgo_InfoEdge& aIE1=aDMEIE.Find(aE1); 
+    const GEOMAlgo_InfoEdge& aIE1=aDMEIE.Find(aE1);
     const Geom2dAdaptor_Curve& aGAC1=aIE1.Adaptor();
     const IntRes2d_Domain& aDomain1=aIE1.Domain();
     //
-    const TopoDS_Edge& aE2=*((TopoDS_Edge*)&aLE.Last()); 
+    const TopoDS_Edge& aE2=*((TopoDS_Edge*)&aLE.Last());
     const GEOMAlgo_InfoEdge& aIE2=aDMEIE.Find(aE2);
     const Geom2dAdaptor_Curve& aGAC2=aIE2.Adaptor();
     const IntRes2d_Domain& aDomain2=aIE2.Domain();
     //
     aInter.Perform(aGAC1, aDomain1,aGAC2, aDomain2, aTolInt, aTolInt);
-    if(!aInter.IsDone()) { 
+    if(!aInter.IsDone()) {
       continue;
     }
     //
@@ -314,7 +314,7 @@ Standard_Boolean CorrectWire(const TopoDS_Wire& aW,
 	  aS->D0(aP2D1.X(), aP2D1.Y(), aP3D1);
 	}
 	//
-	const Handle(Geom_Curve)& aC3D2=aIE2.Curve();   
+	const Handle(Geom_Curve)& aC3D2=aIE2.Curve();
 	if (!aC3D2.IsNull()) {
 	  aP3D2=aC3D2->Value(aIP_ParamOnSecond);
 	}
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_VertexSolid.cxx b/src/GEOMAlgo_NEW/GEOMAlgo_VertexSolid.cxx
index f1c6743e6..76d087cff 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_VertexSolid.cxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_VertexSolid.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -60,7 +60,7 @@
 
 //=======================================================================
 //function : GEOMAlgo_VertexSolid
-//purpose  : 
+//purpose  :
 //=======================================================================
 GEOMAlgo_VertexSolid::GEOMAlgo_VertexSolid()
 :
@@ -69,14 +69,14 @@ GEOMAlgo_VertexSolid::GEOMAlgo_VertexSolid()
 }
 //=======================================================================
 //function : ~
-//purpose  : 
+//purpose  :
 //=======================================================================
 GEOMAlgo_VertexSolid::~GEOMAlgo_VertexSolid()
 {
 }
 //=======================================================================
 // function: Perform
-// purpose: 
+// purpose:
 //=======================================================================
 void GEOMAlgo_VertexSolid::Perform()
 {
@@ -104,7 +104,7 @@ void GEOMAlgo_VertexSolid::Perform()
     myRank=(aNbF) ? 2 : 1;
     //
     bIsNewFiller=myDSFiller->IsNewFiller();
-    
+
     if (bIsNewFiller) {
       Prepare();
       myDSFiller->SetNewFiller(!bIsNewFiller);
@@ -115,10 +115,10 @@ void GEOMAlgo_VertexSolid::Perform()
   catch (Standard_Failure) {
     myErrorStatus = 12;
   }
-} 
+}
 //=======================================================================
 // function: Prepare
-// purpose: 
+// purpose:
 //=======================================================================
 void GEOMAlgo_VertexSolid::Prepare()
 {
@@ -135,7 +135,7 @@ void GEOMAlgo_VertexSolid::Prepare()
   BOPTools_InterferencePool* pIP=(BOPTools_InterferencePool*) &aIP;
   BOPTools_CArray1OfVVInterference& aVVs=pIP->VVInterferences();
   const BOPTools_PaveFiller& aPF=myDSFiller->PaveFiller();
-  BOPTools_PaveFiller* pPF=(BOPTools_PaveFiller*)&aPF; 
+  BOPTools_PaveFiller* pPF=(BOPTools_PaveFiller*)&aPF;
   const Handle(IntTools_Context)& aCtx=pPF->Context();
   //
   const TopoDS_Shape& aObj=aDS.Object();
@@ -177,12 +177,12 @@ void GEOMAlgo_VertexSolid::Prepare()
         pDS->SetState (n2, BooleanOperations_ON);
         iFound=1;
         break;
-      } 
+      }
     }
     if (iFound) {
       continue;
     }
-    // 
+    //
     aP3D=BRep_Tool::Pnt(aV);
     aTol=1.E-7;
     aSC.Perform(aP3D, aTol);
@@ -197,7 +197,7 @@ void GEOMAlgo_VertexSolid::Prepare()
 }
 //=======================================================================
 // function: BuildResult
-// purpose: 
+// purpose:
 //=======================================================================
 void GEOMAlgo_VertexSolid::BuildResult()
 {
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_VertexSolid.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_VertexSolid.hxx
index 84dc807ad..5e10a6060 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_VertexSolid.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_VertexSolid.hxx
@@ -1,58 +1,58 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-
-// File:        GEOMAlgo_VertexSolid.hxx
-// Created:     Wed Jan 12 16:36:40 2005
-// Author:      Peter KURNEV
-//              <pkv@irinox>
-//
-#ifndef _GEOMAlgo_VertexSolid_HeaderFile
-#define _GEOMAlgo_VertexSolid_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_Macro.hxx>
-#include <GEOMAlgo_ShapeSolid.hxx>
-
-//=======================================================================
-//class    : GEOMAlgo_VertexSolid
-//purpose  : 
-//=======================================================================
-class GEOMAlgo_VertexSolid  : public GEOMAlgo_ShapeSolid
-{
- public:
-  Standard_EXPORT
-    GEOMAlgo_VertexSolid();
-  
-  Standard_EXPORT
-    virtual ~GEOMAlgo_VertexSolid();
-  
-  Standard_EXPORT
-    virtual  void Perform() ;
-
-protected:
-  Standard_EXPORT
-    virtual  void Prepare() ;
-  
-  Standard_EXPORT
-    virtual  void BuildResult() ;
-};
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File:        GEOMAlgo_VertexSolid.hxx
+// Created:     Wed Jan 12 16:36:40 2005
+// Author:      Peter KURNEV
+//              <pkv@irinox>
+//
+#ifndef _GEOMAlgo_VertexSolid_HeaderFile
+#define _GEOMAlgo_VertexSolid_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Macro.hxx>
+#include <GEOMAlgo_ShapeSolid.hxx>
+
+//=======================================================================
+//class    : GEOMAlgo_VertexSolid
+//purpose  :
+//=======================================================================
+class GEOMAlgo_VertexSolid  : public GEOMAlgo_ShapeSolid
+{
+ public:
+  Standard_EXPORT
+    GEOMAlgo_VertexSolid();
+
+  Standard_EXPORT
+    virtual ~GEOMAlgo_VertexSolid();
+
+  Standard_EXPORT
+    virtual  void Perform() ;
+
+protected:
+  Standard_EXPORT
+    virtual  void Prepare() ;
+
+  Standard_EXPORT
+    virtual  void BuildResult() ;
+};
+#endif
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_WESCorrector.cxx b/src/GEOMAlgo_NEW/GEOMAlgo_WESCorrector.cxx
index ad12730f0..be0077da3 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_WESCorrector.cxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_WESCorrector.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File:        NMTAlgo_WESCorrector.cxx
 // Author:      Peter KURNEV
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_WESCorrector.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_WESCorrector.hxx
index ac0cd72f7..8348935fc 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_WESCorrector.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_WESCorrector.hxx
@@ -1,87 +1,87 @@
-
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-// File:        NMTAlgo_WESCorrector.hxx
-// Created:     
-// Author:      Peter KURNEV
-//              <pkv@irinox>
-//
-#ifndef _GEOMAlgo_WESCorrector_HeaderFile
-#define _GEOMAlgo_WESCorrector_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_Macro.hxx>
-#include <GEOMAlgo_PWireEdgeSet.hxx>
-#include <GEOMAlgo_WireEdgeSet.hxx>
-#include <BOP_ListOfConnexityBlock.hxx>
-#include <GEOMAlgo_Algo.hxx>
-
-
-//!  The algorithm to change the Wire Edges Set (WES) contents. <br>
-//!   The NewWES will contain only wires instead of wires and edges. <br>
-//=======================================================================
-//class    : GEOMAlgo_WESCorrector
-//purpose  : 
-//=======================================================================
-class GEOMAlgo_WESCorrector  : public GEOMAlgo_Algo 
-{
- public:
-  //! Empty constructor; <br>
-  //! <br>
-  Standard_EXPORT
-    GEOMAlgo_WESCorrector();
-
-  Standard_EXPORT
-    virtual ~GEOMAlgo_WESCorrector();
-  
-  //! Modifier <br>
-  Standard_EXPORT
-    void SetWES(const GEOMAlgo_WireEdgeSet& aWES) ;
-  
-  //! Performs the algorithm that  consists  of  two  steps <br>
-  //! 1. Make conexity blocks (  DoConnexityBlocks()  ) <br>
-  //! 2. Make corrections     (  DoCorrections()  ) <br>
-  Standard_EXPORT   
-    virtual  void Perform() ;
-  
-  //! Selector <br>
-  Standard_EXPORT
-    GEOMAlgo_WireEdgeSet& WES() ;
-  
-  //! Selector <br>
-  Standard_EXPORT
-    GEOMAlgo_WireEdgeSet& NewWES() ;
-
-protected:
-  Standard_EXPORT
-    void DoConnexityBlocks() ;
-  
-  Standard_EXPORT
-    void DoCorrections() ;
-
-
-  GEOMAlgo_PWireEdgeSet myWES;
-  GEOMAlgo_WireEdgeSet myNewWES;
-  BOP_ListOfConnexityBlock myConnexityBlocks;
-};
-
-#endif
+
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// File:        NMTAlgo_WESCorrector.hxx
+// Created:
+// Author:      Peter KURNEV
+//              <pkv@irinox>
+//
+#ifndef _GEOMAlgo_WESCorrector_HeaderFile
+#define _GEOMAlgo_WESCorrector_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Macro.hxx>
+#include <GEOMAlgo_PWireEdgeSet.hxx>
+#include <GEOMAlgo_WireEdgeSet.hxx>
+#include <BOP_ListOfConnexityBlock.hxx>
+#include <GEOMAlgo_Algo.hxx>
+
+
+//!  The algorithm to change the Wire Edges Set (WES) contents. <br>
+//!   The NewWES will contain only wires instead of wires and edges. <br>
+//=======================================================================
+//class    : GEOMAlgo_WESCorrector
+//purpose  :
+//=======================================================================
+class GEOMAlgo_WESCorrector  : public GEOMAlgo_Algo
+{
+ public:
+  //! Empty constructor; <br>
+  //! <br>
+  Standard_EXPORT
+    GEOMAlgo_WESCorrector();
+
+  Standard_EXPORT
+    virtual ~GEOMAlgo_WESCorrector();
+
+  //! Modifier <br>
+  Standard_EXPORT
+    void SetWES(const GEOMAlgo_WireEdgeSet& aWES) ;
+
+  //! Performs the algorithm that  consists  of  two  steps <br>
+  //! 1. Make conexity blocks (  DoConnexityBlocks()  ) <br>
+  //! 2. Make corrections     (  DoCorrections()  ) <br>
+  Standard_EXPORT
+    virtual  void Perform() ;
+
+  //! Selector <br>
+  Standard_EXPORT
+    GEOMAlgo_WireEdgeSet& WES() ;
+
+  //! Selector <br>
+  Standard_EXPORT
+    GEOMAlgo_WireEdgeSet& NewWES() ;
+
+protected:
+  Standard_EXPORT
+    void DoConnexityBlocks() ;
+
+  Standard_EXPORT
+    void DoCorrections() ;
+
+
+  GEOMAlgo_PWireEdgeSet myWES;
+  GEOMAlgo_WireEdgeSet myNewWES;
+  BOP_ListOfConnexityBlock myConnexityBlocks;
+};
+
+#endif
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_WESScaler.cxx b/src/GEOMAlgo_NEW/GEOMAlgo_WESScaler.cxx
index 8f3cf2241..aea8c7fad 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_WESScaler.cxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_WESScaler.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -17,8 +17,8 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 // File:	GEOMAlgo_WESScaler.cxx
-// Created:	
-// Author:	
+// Created:
+// Author:
 //		<pkv@VORTEX>
 
 
@@ -39,10 +39,10 @@
 
 
 //=======================================================================
-//function : 
-//purpose  : 
+//function :
+//purpose  :
 //=======================================================================
-  GEOMAlgo_WESScaler::GEOMAlgo_WESScaler() 
+  GEOMAlgo_WESScaler::GEOMAlgo_WESScaler()
 :
   GEOMAlgo_Algo()
 {
@@ -50,14 +50,14 @@
 }
 //=======================================================================
 //function : ~
-//purpose  : 
+//purpose  :
 //=======================================================================
-  GEOMAlgo_WESScaler::~GEOMAlgo_WESScaler() 
+  GEOMAlgo_WESScaler::~GEOMAlgo_WESScaler()
 {
 }
 //=======================================================================
 // function: SetScale
-// purpose: 
+// purpose:
 //=======================================================================
   void GEOMAlgo_WESScaler::SetScale (const Standard_Real aScale)
 {
@@ -65,15 +65,15 @@
 }
 //=======================================================================
 // function: Scale
-// purpose: 
+// purpose:
 //=======================================================================
-  Standard_Real GEOMAlgo_WESScaler::Scale()const 
+  Standard_Real GEOMAlgo_WESScaler::Scale()const
 {
   return myScale;
 }
 //=======================================================================
 // function: SetFace
-// purpose: 
+// purpose:
 //=======================================================================
   void GEOMAlgo_WESScaler::SetFace(const TopoDS_Face& aF)
 {
@@ -81,7 +81,7 @@
 }
 //=======================================================================
 // function: Face
-// purpose: 
+// purpose:
 //=======================================================================
   const TopoDS_Face& GEOMAlgo_WESScaler::Face()const
 {
@@ -89,7 +89,7 @@
 }
 //=======================================================================
 // function: SetEdges
-// purpose: 
+// purpose:
 //=======================================================================
   void GEOMAlgo_WESScaler::SetEdges(const TopTools_ListOfShape& aLE)
 {
@@ -97,7 +97,7 @@
 }
 //=======================================================================
 // function: Edges
-// purpose: 
+// purpose:
 //=======================================================================
   const TopTools_ListOfShape& GEOMAlgo_WESScaler::Edges()const
 {
@@ -105,7 +105,7 @@
 }
 //=======================================================================
 // function: FaceScaled
-// purpose: 
+// purpose:
 //=======================================================================
   const TopoDS_Face& GEOMAlgo_WESScaler::FaceScaled()const
 {
@@ -113,7 +113,7 @@
 }
 //=======================================================================
 // function: EdgesScaled
-// purpose: 
+// purpose:
 //=======================================================================
   const TopTools_ListOfShape& GEOMAlgo_WESScaler::EdgesScaled()const
 {
@@ -121,7 +121,7 @@
 }
 //=======================================================================
 // function: Image
-// purpose: 
+// purpose:
 //=======================================================================
   const TopoDS_Shape& GEOMAlgo_WESScaler::Image (const TopoDS_Shape& aS) const
 {
@@ -132,7 +132,7 @@
 }
 //=======================================================================
 // function: Origin
-// purpose: 
+// purpose:
 //=======================================================================
   const TopoDS_Shape& GEOMAlgo_WESScaler::Origin (const TopoDS_Shape& aS) const
 {
@@ -143,7 +143,7 @@
 }
 //=======================================================================
 // function: Images
-// purpose: 
+// purpose:
 //=======================================================================
   const GEOMAlgo_DataMapOfOrientedShapeShape& GEOMAlgo_WESScaler::Images () const
 {
@@ -151,7 +151,7 @@
 }
 //=======================================================================
 // function: Origins
-// purpose: 
+// purpose:
 //=======================================================================
   const GEOMAlgo_DataMapOfOrientedShapeShape& GEOMAlgo_WESScaler::Origins () const
 {
@@ -159,7 +159,7 @@
 }
 //=======================================================================
 // function: CheckData
-// purpose: 
+// purpose:
 //=======================================================================
   void GEOMAlgo_WESScaler::CheckData()
 {
@@ -179,7 +179,7 @@
 }
 //=======================================================================
 // function: Perform
-// purpose: 
+// purpose:
 //=======================================================================
   void GEOMAlgo_WESScaler::Perform()
 {
@@ -235,7 +235,7 @@
   //
   const TopoDS_Shape& aSR=aBT.Shape();
   //
-  // Refined image face FR 
+  // Refined image face FR
   aFR=aSR.EmptyCopied();
   aItS.Initialize(aSR);
   for (i=0; aItS.More(); aItS.Next(),++i) {
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_WESScaler.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_WESScaler.hxx
index 4cb2050f3..bd1d1d5ee 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_WESScaler.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_WESScaler.hxx
@@ -1,110 +1,110 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-// File:	GEOMAlgo_WESScaler.hxx
-// Created:	
-// Author:	
-//		<pkv@VORTEX>
-
-#ifndef _GEOMAlgo_WESScaler_HeaderFile
-#define _GEOMAlgo_WESScaler_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_Macro.hxx>
-#include <Standard_Real.hxx>
-#include <TopoDS_Face.hxx>
-#include <TopTools_ListOfShape.hxx>
-#include <GEOMAlgo_DataMapOfOrientedShapeShape.hxx>
-#include <TopoDS_Shape.hxx>
-#include <GEOMAlgo_Algo.hxx>
-
-//=======================================================================
-//function : GEOMAlgo_WESScaler
-//purpose  : 
-//=======================================================================
-class GEOMAlgo_WESScaler  : public GEOMAlgo_Algo 
-{
-public:
-  //! Empty constructor <br>
-  Standard_EXPORT
-    GEOMAlgo_WESScaler();
-
-  Standard_EXPORT
-    virtual ~GEOMAlgo_WESScaler();
-  
-  //! Modifier <br>
-  Standard_EXPORT
-    void SetScale(const Standard_Real aWES) ;
-  
-  //! Selector <br>
-  Standard_EXPORT
-    Standard_Real Scale() const;
-  
-  Standard_EXPORT
-    void SetFace(const TopoDS_Face& aF) ;
-  
-  Standard_EXPORT
-    const TopoDS_Face& Face() const;
-  
-  Standard_EXPORT
-    void SetEdges(const TopTools_ListOfShape& aLE) ;
-  
-  Standard_EXPORT
-    const TopTools_ListOfShape& Edges() const;
-  
-  //!  Performs the algorithm <br>
-  Standard_EXPORT
-    virtual  void Perform() ;
-  
-  Standard_EXPORT
-    const TopoDS_Face& FaceScaled() const;
-  
-  Standard_EXPORT
-    const TopTools_ListOfShape& EdgesScaled() const;
-  
-  Standard_EXPORT
-    const TopoDS_Shape& Image(const TopoDS_Shape& aS) const;
-  
-  Standard_EXPORT
-    const TopoDS_Shape& Origin(const TopoDS_Shape& aS) const;
-  
-  //! Selector <br>
-  Standard_EXPORT
-    const GEOMAlgo_DataMapOfOrientedShapeShape& Images() const;
-  
-  //! Selector <br>
-  Standard_EXPORT
-    const GEOMAlgo_DataMapOfOrientedShapeShape& Origins() const;
-
- protected:
-
-  //!  Performs the algorithm <br>
-  Standard_EXPORT   virtual  void CheckData() ;
-  
-  
-  Standard_Real myScale;
-  TopoDS_Face myFace;
-  TopTools_ListOfShape myEdges;
-  TopoDS_Face myFaceScaled;
-  TopTools_ListOfShape myEdgesScaled;
-  GEOMAlgo_DataMapOfOrientedShapeShape myImages;
-  GEOMAlgo_DataMapOfOrientedShapeShape myOrigins;
-  TopoDS_Shape myShapeTmp;
-};
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// File:	GEOMAlgo_WESScaler.hxx
+// Created:
+// Author:
+//		<pkv@VORTEX>
+
+#ifndef _GEOMAlgo_WESScaler_HeaderFile
+#define _GEOMAlgo_WESScaler_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Macro.hxx>
+#include <Standard_Real.hxx>
+#include <TopoDS_Face.hxx>
+#include <TopTools_ListOfShape.hxx>
+#include <GEOMAlgo_DataMapOfOrientedShapeShape.hxx>
+#include <TopoDS_Shape.hxx>
+#include <GEOMAlgo_Algo.hxx>
+
+//=======================================================================
+//function : GEOMAlgo_WESScaler
+//purpose  :
+//=======================================================================
+class GEOMAlgo_WESScaler  : public GEOMAlgo_Algo
+{
+public:
+  //! Empty constructor <br>
+  Standard_EXPORT
+    GEOMAlgo_WESScaler();
+
+  Standard_EXPORT
+    virtual ~GEOMAlgo_WESScaler();
+
+  //! Modifier <br>
+  Standard_EXPORT
+    void SetScale(const Standard_Real aWES) ;
+
+  //! Selector <br>
+  Standard_EXPORT
+    Standard_Real Scale() const;
+
+  Standard_EXPORT
+    void SetFace(const TopoDS_Face& aF) ;
+
+  Standard_EXPORT
+    const TopoDS_Face& Face() const;
+
+  Standard_EXPORT
+    void SetEdges(const TopTools_ListOfShape& aLE) ;
+
+  Standard_EXPORT
+    const TopTools_ListOfShape& Edges() const;
+
+  //!  Performs the algorithm <br>
+  Standard_EXPORT
+    virtual  void Perform() ;
+
+  Standard_EXPORT
+    const TopoDS_Face& FaceScaled() const;
+
+  Standard_EXPORT
+    const TopTools_ListOfShape& EdgesScaled() const;
+
+  Standard_EXPORT
+    const TopoDS_Shape& Image(const TopoDS_Shape& aS) const;
+
+  Standard_EXPORT
+    const TopoDS_Shape& Origin(const TopoDS_Shape& aS) const;
+
+  //! Selector <br>
+  Standard_EXPORT
+    const GEOMAlgo_DataMapOfOrientedShapeShape& Images() const;
+
+  //! Selector <br>
+  Standard_EXPORT
+    const GEOMAlgo_DataMapOfOrientedShapeShape& Origins() const;
+
+ protected:
+
+  //!  Performs the algorithm <br>
+  Standard_EXPORT   virtual  void CheckData() ;
+
+
+  Standard_Real myScale;
+  TopoDS_Face myFace;
+  TopTools_ListOfShape myEdges;
+  TopoDS_Face myFaceScaled;
+  TopTools_ListOfShape myEdgesScaled;
+  GEOMAlgo_DataMapOfOrientedShapeShape myImages;
+  GEOMAlgo_DataMapOfOrientedShapeShape myOrigins;
+  TopoDS_Shape myShapeTmp;
+};
+
+#endif
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_WireEdgeSet.cxx b/src/GEOMAlgo_NEW/GEOMAlgo_WireEdgeSet.cxx
index bffb2e9f7..5a39f0e10 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_WireEdgeSet.cxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_WireEdgeSet.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -21,15 +21,15 @@
 //
 
 // File:        GEOMAlgo_WireEdgeSet.cxx
-// Created:     
+// Created:
 // Author:      Peter KURNEV
 //              <pkv@irinox>
 //
 #include <GEOMAlgo_WireEdgeSet.hxx>
 
 //=======================================================================
-//function : 
-//purpose  : 
+//function :
+//purpose  :
 //=======================================================================
   GEOMAlgo_WireEdgeSet::GEOMAlgo_WireEdgeSet()
 {
@@ -38,7 +38,7 @@
 
 //=======================================================================
 //function : Clear
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_WireEdgeSet::Clear()
 {
@@ -47,7 +47,7 @@
 }
 //=======================================================================
 //function : SetFace
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_WireEdgeSet::SetFace(const TopoDS_Face& aF)
 {
@@ -55,15 +55,15 @@
 }
 //=======================================================================
 //function : Face
-//purpose  : 
+//purpose  :
 //=======================================================================
-  const TopoDS_Face& GEOMAlgo_WireEdgeSet::Face()const 
+  const TopoDS_Face& GEOMAlgo_WireEdgeSet::Face()const
 {
   return myFace;
 }
 //=======================================================================
 //function : AddStartElement
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_WireEdgeSet::AddStartElement(const TopoDS_Shape& aE)
 {
@@ -71,7 +71,7 @@
 }
 //=======================================================================
 //function : StartElements
-//purpose  : 
+//purpose  :
 //=======================================================================
   const  TopTools_ListOfShape& GEOMAlgo_WireEdgeSet::StartElements()const
 {
@@ -79,7 +79,7 @@
 }
 //=======================================================================
 //function : AddShape
-//purpose  : 
+//purpose  :
 //=======================================================================
   void GEOMAlgo_WireEdgeSet::AddShape(const TopoDS_Shape& aW)
 {
@@ -87,7 +87,7 @@
 }
 //=======================================================================
 //function : Shapes
-//purpose  : 
+//purpose  :
 //=======================================================================
   const  TopTools_ListOfShape& GEOMAlgo_WireEdgeSet::Shapes()const
 {
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_WireEdgeSet.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_WireEdgeSet.hxx
index 26dbe6724..97708870e 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_WireEdgeSet.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_WireEdgeSet.hxx
@@ -1,73 +1,73 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-
-// File:        GEOMAlgo_WireEdgeSet.hxx
-// Created:     
-// Author:      Peter KURNEV
-//              <pkv@irinox>
-//
-
-#ifndef _GEOMAlgo_WireEdgeSet_HeaderFile
-#define _GEOMAlgo_WireEdgeSet_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_Macro.hxx>
-#include <TopoDS_Face.hxx>
-#include <TopTools_ListOfShape.hxx>
-#include <TopoDS_Shape.hxx>
-
-//=======================================================================
-//function : GEOMAlgo_WireEdgeSet
-//purpose  : 
-//=======================================================================
-class GEOMAlgo_WireEdgeSet  {
- public:
-  Standard_EXPORT
-    GEOMAlgo_WireEdgeSet();
-  
-  Standard_EXPORT
-    void Clear() ;
-  
-  Standard_EXPORT
-    void SetFace(const TopoDS_Face& aF) ;
-  
-  Standard_EXPORT
-    const TopoDS_Face& Face() const;
-  
-  Standard_EXPORT
-    void AddStartElement(const TopoDS_Shape& sS) ;
-  
-  Standard_EXPORT
-    const TopTools_ListOfShape& StartElements() const;
-  
-  Standard_EXPORT
-    void AddShape(const TopoDS_Shape& sS) ;
-  
-  Standard_EXPORT
-    const TopTools_ListOfShape& Shapes() const;
-
-protected:
-  TopoDS_Face myFace;
-  TopTools_ListOfShape myStartShapes;
-  TopTools_ListOfShape myShapes;
-};
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File:        GEOMAlgo_WireEdgeSet.hxx
+// Created:
+// Author:      Peter KURNEV
+//              <pkv@irinox>
+//
+
+#ifndef _GEOMAlgo_WireEdgeSet_HeaderFile
+#define _GEOMAlgo_WireEdgeSet_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Macro.hxx>
+#include <TopoDS_Face.hxx>
+#include <TopTools_ListOfShape.hxx>
+#include <TopoDS_Shape.hxx>
+
+//=======================================================================
+//function : GEOMAlgo_WireEdgeSet
+//purpose  :
+//=======================================================================
+class GEOMAlgo_WireEdgeSet  {
+ public:
+  Standard_EXPORT
+    GEOMAlgo_WireEdgeSet();
+
+  Standard_EXPORT
+    void Clear() ;
+
+  Standard_EXPORT
+    void SetFace(const TopoDS_Face& aF) ;
+
+  Standard_EXPORT
+    const TopoDS_Face& Face() const;
+
+  Standard_EXPORT
+    void AddStartElement(const TopoDS_Shape& sS) ;
+
+  Standard_EXPORT
+    const TopTools_ListOfShape& StartElements() const;
+
+  Standard_EXPORT
+    void AddShape(const TopoDS_Shape& sS) ;
+
+  Standard_EXPORT
+    const TopTools_ListOfShape& Shapes() const;
+
+protected:
+  TopoDS_Face myFace;
+  TopTools_ListOfShape myStartShapes;
+  TopTools_ListOfShape myShapes;
+};
+#endif
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_WireSolid.cxx b/src/GEOMAlgo_NEW/GEOMAlgo_WireSolid.cxx
index 1afe2ea8e..3acfda53c 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_WireSolid.cxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_WireSolid.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -47,23 +47,23 @@
 
 //=======================================================================
 //function : GEOMAlgo_WireSolid
-//purpose  : 
+//purpose  :
 //=======================================================================
 GEOMAlgo_WireSolid::GEOMAlgo_WireSolid()
-: 
+:
   GEOMAlgo_ShapeSolid()
 {
 }
 //=======================================================================
 //function : ~
-//purpose  : 
+//purpose  :
 //=======================================================================
 GEOMAlgo_WireSolid::~GEOMAlgo_WireSolid()
 {
 }
 //=======================================================================
 // function: Perform
-// purpose: 
+// purpose:
 //=======================================================================
 void GEOMAlgo_WireSolid::Perform()
 {
@@ -82,7 +82,7 @@ void GEOMAlgo_WireSolid::Perform()
     Standard_Boolean bIsNewFiller;
     //
     bIsNewFiller=myDSFiller->IsNewFiller();
-    
+
     if (bIsNewFiller) {
       Prepare();
       myDSFiller->SetNewFiller(!bIsNewFiller);
@@ -93,10 +93,10 @@ void GEOMAlgo_WireSolid::Perform()
   catch (Standard_Failure) {
     myErrorStatus= 12;
   }
-} 
+}
 //=======================================================================
 // function: Prepare
-// purpose: 
+// purpose:
 //=======================================================================
 void GEOMAlgo_WireSolid::Prepare()
 {
@@ -108,7 +108,7 @@ void GEOMAlgo_WireSolid::Prepare()
 }
 //=======================================================================
 // function: BuildResult
-// purpose: 
+// purpose:
 //=======================================================================
 void GEOMAlgo_WireSolid::BuildResult()
 {
@@ -166,7 +166,7 @@ void GEOMAlgo_WireSolid::BuildResult()
         }
         else if (aState==BooleanOperations_ON) {
           myLSON.Append(aE);
-        } 
+        }
       }
     }
   }
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_WireSolid.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_WireSolid.hxx
index b2097ddab..93a5463ed 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_WireSolid.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_WireSolid.hxx
@@ -1,58 +1,58 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-
-// File:        GEOMAlgo_WireSolid.hxx
-// Created:     Wed Jan 12 10:19:31 2005
-// Author:      Peter KURNEV
-//              <pkv@irinox>
-
-#ifndef _GEOMAlgo_WireSolid_HeaderFile
-#define _GEOMAlgo_WireSolid_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_Macro.hxx>
-#include <GEOMAlgo_ShapeSolid.hxx>
-
-//=======================================================================
-//class    : GEOMAlgo_WireSolid
-//purpose  : 
-//=======================================================================
-class GEOMAlgo_WireSolid  : public GEOMAlgo_ShapeSolid 
-{
- public:
-  Standard_EXPORT
-    GEOMAlgo_WireSolid();
-  
-  Standard_EXPORT
-    virtual ~GEOMAlgo_WireSolid();
-  
-  Standard_EXPORT
-    virtual  void Perform() ;
- 
- protected:
-  Standard_EXPORT
-    virtual  void Prepare() ;
-  
-  Standard_EXPORT
-    virtual  void BuildResult() ;
-};
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File:        GEOMAlgo_WireSolid.hxx
+// Created:     Wed Jan 12 10:19:31 2005
+// Author:      Peter KURNEV
+//              <pkv@irinox>
+
+#ifndef _GEOMAlgo_WireSolid_HeaderFile
+#define _GEOMAlgo_WireSolid_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Macro.hxx>
+#include <GEOMAlgo_ShapeSolid.hxx>
+
+//=======================================================================
+//class    : GEOMAlgo_WireSolid
+//purpose  :
+//=======================================================================
+class GEOMAlgo_WireSolid  : public GEOMAlgo_ShapeSolid
+{
+ public:
+  Standard_EXPORT
+    GEOMAlgo_WireSolid();
+
+  Standard_EXPORT
+    virtual ~GEOMAlgo_WireSolid();
+
+  Standard_EXPORT
+    virtual  void Perform() ;
+
+ protected:
+  Standard_EXPORT
+    virtual  void Prepare() ;
+
+  Standard_EXPORT
+    virtual  void BuildResult() ;
+};
+#endif
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_WireSplitter.cxx b/src/GEOMAlgo_NEW/GEOMAlgo_WireSplitter.cxx
index 84bad20bc..faa6f295a 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_WireSplitter.cxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_WireSplitter.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File:        GEOMAlgo_WireSplitter.cxx
 // Author:      Peter KURNEV
@@ -113,15 +114,15 @@ static
                       const TopoDS_Face& aF);
 static
   Standard_Real Tolerance2D (const TopoDS_Vertex& aV,
-                            const GeomAdaptor_Surface& aGAS);   
+                            const GeomAdaptor_Surface& aGAS);
 
 static
   Standard_Integer NbWaysOut(const BOP_ListOfEdgeInfo& );
 //
 
 //=======================================================================
-// function: 
-// purpose: 
+// function:
+// purpose:
 //=======================================================================
   GEOMAlgo_WireSplitter::GEOMAlgo_WireSplitter()
 :
@@ -131,14 +132,14 @@ static
 }
 //=======================================================================
 // function: ~
-// purpose: 
+// purpose:
 //=======================================================================
   GEOMAlgo_WireSplitter::~GEOMAlgo_WireSplitter()
 {
 }
 //=======================================================================
 // function: SetFace
-// purpose: 
+// purpose:
 //=======================================================================
   void GEOMAlgo_WireSplitter::SetFace(const TopoDS_Face& aFace)
 {
@@ -146,7 +147,7 @@ static
 }
 //=======================================================================
 // function: Face
-// purpose: 
+// purpose:
 //=======================================================================
   const TopoDS_Face& GEOMAlgo_WireSplitter::Face()const
 {
@@ -154,7 +155,7 @@ static
 }
 //=======================================================================
 // function: SetEdges
-// purpose: 
+// purpose:
 //=======================================================================
   void GEOMAlgo_WireSplitter::SetEdges(const TopTools_ListOfShape& aLE)
 {
@@ -174,7 +175,7 @@ static
 }
 //=======================================================================
 // function: Edges
-// purpose: 
+// purpose:
 //=======================================================================
   const TopTools_ListOfShape& GEOMAlgo_WireSplitter::Edges()const
 {
@@ -182,7 +183,7 @@ static
 }
 //=======================================================================
 // function: IsNothingToDo
-// purpose: 
+// purpose:
 //=======================================================================
   Standard_Boolean GEOMAlgo_WireSplitter::IsNothingToDo()const
 {
@@ -190,7 +191,7 @@ static
 }
 //=======================================================================
 // function: Shapes
-// purpose: 
+// purpose:
 //=======================================================================
   const BOPTColStd_ListOfListOfShape& GEOMAlgo_WireSplitter::Shapes()const
 {
@@ -198,7 +199,7 @@ static
 }
 //=======================================================================
 // function: Perform
-// purpose: 
+// purpose:
 //=======================================================================
   void GEOMAlgo_WireSplitter::Perform()
 {
@@ -208,7 +209,7 @@ static
   Standard_Integer index, i, aNb, aCntIn, aCntOut;
   Standard_Boolean anIsIn;
   Standard_Real anAngle;
-  
+
   BOP_ListOfEdgeInfo emptyInfo;
   TopTools_ListIteratorOfListOfShape anItList;
   //
@@ -231,12 +232,12 @@ static
       if (!index) {
         index=mySmartMap.Add(aVertex, emptyInfo);
       }
-      
+
       BOP_ListOfEdgeInfo& aListOfEInfo=mySmartMap(index);
 
       BOP_EdgeInfo aEInfo;
       aEInfo.SetEdge(anEdge);
-      
+
       TopAbs_Orientation anOr=aVertex.Orientation();
 
       if (anOr==TopAbs_FORWARD) {
@@ -253,9 +254,9 @@ static
   //
   aNb=mySmartMap.Extent();
   //
-  // 2. myNothingToDo 
+  // 2. myNothingToDo
   myNothingToDo=Standard_True;
-  
+
   for (i=1; i<=aNb; i++) {
     aCntIn=0;
     aCntOut=0;
@@ -280,16 +281,16 @@ static
   // Each vertex has one edge In and one - Out. Good. But it is not enought
   // to consider that nothing to do with this. We must check edges on TShape
   // coinsidence. If there are such edges there is something to do with.
-  // 
+  //
   if (myNothingToDo) {
     Standard_Integer aNbE, aNbMapEE;
     TopTools_IndexedDataMapOfShapeListOfShape aMapEE;
     aNbE=myEdges.Extent();
-    
+
     anItList.Initialize(myEdges);
     for (; anItList.More(); anItList.Next()) {
       const TopoDS_Shape& aE = anItList.Value();
-      
+
       if (!aMapEE.Contains(aE)) {
         TopTools_ListOfShape aLEx;
         aLEx.Append(aE);
@@ -300,7 +301,7 @@ static
         aLEx.Append(aE);
       }
     }
-    
+
     Standard_Boolean bFlag;
     bFlag=Standard_True;
     aNbMapEE=aMapEE.Extent();
@@ -326,7 +327,7 @@ static
     }
     myNothingToDo=myNothingToDo && bFlag;
   }
-  // 
+  //
   //
   if (myNothingToDo) {
     myErrorStatus=0;
@@ -353,45 +354,45 @@ static
         aVV.Orientation(TopAbs_REVERSED);
         anAngle=Angle2D (aVV, aE, myFace, aGAS, Standard_True);
       }
-      // 
+      //
       else { // OUT
         //
         aVV.Orientation(TopAbs_FORWARD);
         anAngle=Angle2D (aVV, aE, myFace, aGAS, Standard_False);
       }
       anEdgeInfo.SetAngle(anAngle);
-      
+
     }
   }
   //
   // 4. Do
   //
   Standard_Boolean anIsOut, anIsNotPassed;
-  
+
   TopTools_SequenceOfShape aLS, aVertVa;
   TColgp_SequenceOfPnt2d aCoordVa;
-  
+
   BOP_ListIteratorOfListOfEdgeInfo anIt;
 
   for (i=1; i<=aNb; i++) {
     const TopoDS_Vertex aVa=TopoDS::Vertex (mySmartMap.FindKey(i));
     const BOP_ListOfEdgeInfo& aLEInfo=mySmartMap(i);
-    
+
     anIt.Initialize(aLEInfo);
     for (; anIt.More(); anIt.Next()) {
       BOP_EdgeInfo& anEdgeInfo=anIt.Value();
       const TopoDS_Edge& aEOuta=anEdgeInfo.Edge();
-      
+
       anIsOut=!anEdgeInfo.IsIn();
       anIsNotPassed=!anEdgeInfo.Passed();
-      
+
       if (anIsOut && anIsNotPassed) {
         //
         aLS.Clear();
         aVertVa.Clear();
         aCoordVa.Clear();
         //
-        Path(aGAS, myFace, aVa, aEOuta, anEdgeInfo, aLS, 
+        Path(aGAS, myFace, aVa, aEOuta, anEdgeInfo, aLS,
              aVertVa, aCoordVa, myShapes, mySmartMap);
       }
     }
@@ -402,7 +403,7 @@ static
     TopoDS_Vertex aV1, aV2;
     BOPTColStd_ListOfListOfShape aShapes;
     BOPTColStd_ListIteratorOfListOfListOfShape anItW(myShapes);
-    
+
     for (; anItW.More(); anItW.Next()) {
       TopTools_IndexedMapOfShape aMV, aME;
       const TopTools_ListOfShape& aLE=anItW.Value();
@@ -433,7 +434,7 @@ static
 }
 //=======================================================================
 // function: Path
-// purpose: 
+// purpose:
 //=======================================================================
   void Path (const GeomAdaptor_Surface& aGAS,
              const TopoDS_Face& myFace,
@@ -445,12 +446,12 @@ static
              TColgp_SequenceOfPnt2d& aCoordVa,
              BOPTColStd_ListOfListOfShape& myShapes,
              BOP_IndexedDataMapOfVertexListEdgeInfo& mySmartMap)
-                               
+
 {
   Standard_Integer i,j, aNb, aNbj;
   Standard_Real aTol, anAngleIn, anAngleOut, anAngle, aMinAngle;
   Standard_Real aTol2D, aTol2D2;
-  Standard_Real aTol2, aD2;//, aTolUVb, aTolVVb;  
+  Standard_Real aTol2, aD2;//, aTolUVb, aTolVVb;
   Standard_Boolean anIsSameV2d, anIsSameV, anIsFound, anIsOut, anIsNotPassed;
   BOP_ListIteratorOfListOfEdgeInfo anIt;
   TopoDS_Vertex aVb;
@@ -460,7 +461,7 @@ static
   //
   // append block
   //
-  // Do not escape through edge from which you enter 
+  // Do not escape through edge from which you enter
   aNb=aLS.Length();
   if (aNb==1) {
     const TopoDS_Shape& anEPrev=aLS(aNb);
@@ -473,12 +474,12 @@ static
   anEdgeInfo.SetPassed(Standard_True);
   aLS.Append(aEOuta);
   aVertVa.Append(aVa);
-  
+
   TopoDS_Vertex pVa=aVa;
   pVa.Orientation(TopAbs_FORWARD);
   gp_Pnt2d aPa=Coord2d(pVa, aEOuta, myFace);
   aCoordVa.Append(aPa);
-  
+
   GetNextVertex (pVa, aEOuta, aVb);
 
   gp_Pnt2d aPb=Coord2d(aVb, aEOuta, myFace);
@@ -569,11 +570,11 @@ static
     const TopoDS_Edge& aE=anEI.Edge();
     anIsOut=!anEI.IsIn();
     anIsNotPassed=!anEI.Passed();
-    
+
     if (anIsOut && anIsNotPassed) {
       aCurIndexE++;
       //
-      // Is there one way to go out of the vertex 
+      // Is there one way to go out of the vertex
       // we have to use it only.
       Standard_Integer iCnt;
       iCnt=NbWaysOut (aLEInfo);
@@ -610,16 +611,16 @@ static
         anIsFound=Standard_True;
       }
     }
-  } // for (; anIt.More(); anIt.Next()) 
+  } // for (; anIt.More(); anIt.Next())
   //
   if (!anIsFound) {
     // no way to go . (Error)
     return;
   }
-  
+
   aEOutb=pEdgeInfo->Edge();
   //
-  Path (aGAS, myFace, aVb, aEOutb, *pEdgeInfo, aLS, 
+  Path (aGAS, myFace, aVb, aEOutb, *pEdgeInfo, aLS,
         aVertVa, aCoordVa, myShapes, mySmartMap);
 }
 //=======================================================================
@@ -649,7 +650,7 @@ static
 // purpose:
 //=======================================================================
  Standard_Real Tolerance2D (const TopoDS_Vertex& aV,
-                            const GeomAdaptor_Surface& aGAS)                 
+                            const GeomAdaptor_Surface& aGAS)
 {
   Standard_Real aTol2D, anUr, aVr, aTolV3D;
   GeomAbs_SurfaceType aType;
@@ -733,19 +734,19 @@ static
   if (AIn >= aTwoPi) {
     AIn=AIn-aTwoPi;
   }
-  
+
   if (AOut >= aTwoPi) {
     AOut=AOut-aTwoPi;
   }
 
   A1 = AIn + M_PI;
-  
+
   if (A1 >= aTwoPi) {
     A1=A1-aTwoPi;
   }
-  
+
   A2=AOut;
-  
+
   dA=A1-A2;
   if (dA <= 0.) {
     dA=aTwoPi+dA;
@@ -763,7 +764,7 @@ static
 }
 //=======================================================================
 // function: GetNextVertex
-// purpose: 
+// purpose:
 //=======================================================================
  void GetNextVertex(const TopoDS_Vertex& aV,
                     const TopoDS_Edge& aE,
@@ -783,7 +784,7 @@ static
 }
 //=======================================================================
 // function: Angle2D
-// purpose: 
+// purpose:
 //=======================================================================
   Standard_Real Angle2D (const TopoDS_Vertex& aV,
                          const TopoDS_Edge& anEdge,
@@ -801,7 +802,7 @@ static
     return 0.;
   }
   //
-  BOPTools_Tools2D::CurveOnSurface (anEdge, myFace, aC2D, 
+  BOPTools_Tools2D::CurveOnSurface (anEdge, myFace, aC2D,
                                     aFirst, aLast, aToler, Standard_True);
   //dt=1.e-7;
   dt=2.*Tolerance2D(aV, aGAS);
@@ -810,7 +811,7 @@ static
   if(dt > aTX) {
     // to save direction of the curve as much as it possible
     // in the case of big tolerances
-    dt = aTX; 
+    dt = aTX;
   }
   //
   if (fabs (aTV-aFirst) < fabs(aTV - aLast)) {
@@ -839,7 +840,7 @@ static
 }
 //=======================================================================
 // function: Angle
-// purpose: 
+// purpose:
 //=======================================================================
 Standard_Real Angle (const gp_Dir2d& aDir2D)
 {
@@ -854,7 +855,7 @@ Standard_Real Angle (const gp_Dir2d& aDir2D)
 //
 //=======================================================================
 // function: NbWaysOut
-// purpose: 
+// purpose:
 //=======================================================================
 Standard_Integer NbWaysOut(const BOP_ListOfEdgeInfo& aLEInfo)
 {
diff --git a/src/GEOMAlgo_NEW/GEOMAlgo_WireSplitter.hxx b/src/GEOMAlgo_NEW/GEOMAlgo_WireSplitter.hxx
index 8108443a4..cbfc9ff05 100644
--- a/src/GEOMAlgo_NEW/GEOMAlgo_WireSplitter.hxx
+++ b/src/GEOMAlgo_NEW/GEOMAlgo_WireSplitter.hxx
@@ -1,83 +1,84 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
-// File:        GEOMAlgo_WireSplitter.hxx
-// Author:      Peter KURNEV
-
-#ifndef _GEOMAlgo_WireSplitter_HeaderFile
-#define _GEOMAlgo_WireSplitter_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_Macro.hxx>
-#include <TopoDS_Face.hxx>
-#include <Standard_Boolean.hxx>
-#include <BOPTColStd_ListOfListOfShape.hxx>
-#include <BOP_IndexedDataMapOfVertexListEdgeInfo.hxx>
-#include <TopTools_ListOfShape.hxx>
-#include <GEOMAlgo_Algo.hxx>
-
-//!  the algorithm to split multiconnexed set of edges <br>
-//!  wires on a face onto simple connexed wires <br>
-//!  . <br>
-//=======================================================================
-//class    : GEOMAlgo_WireSplitter
-//purpose  : 
-//=======================================================================
-class GEOMAlgo_WireSplitter  : public GEOMAlgo_Algo 
-{
-public:
-  Standard_EXPORT   
-    GEOMAlgo_WireSplitter();
-
-  Standard_EXPORT 
-    virtual ~GEOMAlgo_WireSplitter();
-  
-  Standard_EXPORT
-    void SetFace(const TopoDS_Face& aF) ;
-  
-  Standard_EXPORT
-    void SetEdges(const TopTools_ListOfShape& aLE) ;
-  
-  Standard_EXPORT
-    const TopTools_ListOfShape& Edges() const;
-  
-  Standard_EXPORT
-    virtual  void Perform() ;
-  
-  Standard_EXPORT
-    Standard_Boolean IsNothingToDo() const;
-  
-  Standard_EXPORT
-    const TopoDS_Face& Face() const;
-  
-  Standard_EXPORT
-    const BOPTColStd_ListOfListOfShape& Shapes() const;
-
-protected:
-  TopoDS_Face myFace;
-  Standard_Boolean myIsDone;
-  Standard_Boolean myNothingToDo;
-  BOPTColStd_ListOfListOfShape myShapes;
-  BOP_IndexedDataMapOfVertexListEdgeInfo mySmartMap;
-  TopTools_ListOfShape myEdges;
-};
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File:        GEOMAlgo_WireSplitter.hxx
+// Author:      Peter KURNEV
+
+#ifndef _GEOMAlgo_WireSplitter_HeaderFile
+#define _GEOMAlgo_WireSplitter_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Macro.hxx>
+#include <TopoDS_Face.hxx>
+#include <Standard_Boolean.hxx>
+#include <BOPTColStd_ListOfListOfShape.hxx>
+#include <BOP_IndexedDataMapOfVertexListEdgeInfo.hxx>
+#include <TopTools_ListOfShape.hxx>
+#include <GEOMAlgo_Algo.hxx>
+
+//!  the algorithm to split multiconnexed set of edges <br>
+//!  wires on a face onto simple connexed wires <br>
+//!  . <br>
+//=======================================================================
+//class    : GEOMAlgo_WireSplitter
+//purpose  :
+//=======================================================================
+class GEOMAlgo_WireSplitter  : public GEOMAlgo_Algo
+{
+public:
+  Standard_EXPORT
+    GEOMAlgo_WireSplitter();
+
+  Standard_EXPORT
+    virtual ~GEOMAlgo_WireSplitter();
+
+  Standard_EXPORT
+    void SetFace(const TopoDS_Face& aF) ;
+
+  Standard_EXPORT
+    void SetEdges(const TopTools_ListOfShape& aLE) ;
+
+  Standard_EXPORT
+    const TopTools_ListOfShape& Edges() const;
+
+  Standard_EXPORT
+    virtual  void Perform() ;
+
+  Standard_EXPORT
+    Standard_Boolean IsNothingToDo() const;
+
+  Standard_EXPORT
+    const TopoDS_Face& Face() const;
+
+  Standard_EXPORT
+    const BOPTColStd_ListOfListOfShape& Shapes() const;
+
+protected:
+  TopoDS_Face myFace;
+  Standard_Boolean myIsDone;
+  Standard_Boolean myNothingToDo;
+  BOPTColStd_ListOfListOfShape myShapes;
+  BOP_IndexedDataMapOfVertexListEdgeInfo mySmartMap;
+  TopTools_ListOfShape myEdges;
+};
+
+#endif
diff --git a/src/GEOMAlgo_NEW/Handle_BlockFix_BlockFixAPI.hxx b/src/GEOMAlgo_NEW/Handle_BlockFix_BlockFixAPI.hxx
index bc7daabef..3fce5be46 100644
--- a/src/GEOMAlgo_NEW/Handle_BlockFix_BlockFixAPI.hxx
+++ b/src/GEOMAlgo_NEW/Handle_BlockFix_BlockFixAPI.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -42,24 +42,24 @@ Standard_EXPORT Handle_Standard_Type& STANDARD_TYPE(BlockFix_BlockFixAPI);
 
 class Handle(BlockFix_BlockFixAPI) : public Handle(MMgt_TShared) {
   public:
-    void* operator new(size_t,void* anAddress) 
+    void* operator new(size_t,void* anAddress)
       {
         return anAddress;
       }
-    void* operator new(size_t size) 
-      { 
-        return Standard::Allocate(size); 
+    void* operator new(size_t size)
+      {
+        return Standard::Allocate(size);
       }
-    void  operator delete(void *anAddress) 
-      { 
-        if (anAddress) Standard::Free((Standard_Address&)anAddress); 
+    void  operator delete(void *anAddress)
+      {
+        if (anAddress) Standard::Free((Standard_Address&)anAddress);
       }
-    Handle(BlockFix_BlockFixAPI)():Handle(MMgt_TShared)() {} 
-    Handle(BlockFix_BlockFixAPI)(const Handle(BlockFix_BlockFixAPI)& aHandle) : Handle(MMgt_TShared)(aHandle) 
+    Handle(BlockFix_BlockFixAPI)():Handle(MMgt_TShared)() {}
+    Handle(BlockFix_BlockFixAPI)(const Handle(BlockFix_BlockFixAPI)& aHandle) : Handle(MMgt_TShared)(aHandle)
      {
      }
 
-    Handle(BlockFix_BlockFixAPI)(const BlockFix_BlockFixAPI* anItem) : Handle(MMgt_TShared)((MMgt_TShared *)anItem) 
+    Handle(BlockFix_BlockFixAPI)(const BlockFix_BlockFixAPI* anItem) : Handle(MMgt_TShared)((MMgt_TShared *)anItem)
      {
      }
 
@@ -75,18 +75,18 @@ class Handle(BlockFix_BlockFixAPI) : public Handle(MMgt_TShared) {
       return *this;
      }
 
-    BlockFix_BlockFixAPI* operator->() 
+    BlockFix_BlockFixAPI* operator->()
      {
       return (BlockFix_BlockFixAPI *)ControlAccess();
      }
 
-    BlockFix_BlockFixAPI* operator->() const 
+    BlockFix_BlockFixAPI* operator->() const
      {
       return (BlockFix_BlockFixAPI *)ControlAccess();
      }
 
    Standard_EXPORT ~Handle(BlockFix_BlockFixAPI)();
- 
+
    Standard_EXPORT static const Handle(BlockFix_BlockFixAPI) DownCast(const Handle(Standard_Transient)& AnObject);
 };
 #endif
diff --git a/src/GEOMAlgo_NEW/Handle_BlockFix_PeriodicSurfaceModifier.hxx b/src/GEOMAlgo_NEW/Handle_BlockFix_PeriodicSurfaceModifier.hxx
index 93fd00c01..1cb29e022 100644
--- a/src/GEOMAlgo_NEW/Handle_BlockFix_PeriodicSurfaceModifier.hxx
+++ b/src/GEOMAlgo_NEW/Handle_BlockFix_PeriodicSurfaceModifier.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -42,24 +42,24 @@ Standard_EXPORT Handle_Standard_Type& STANDARD_TYPE(BlockFix_PeriodicSurfaceModi
 
 class Handle(BlockFix_PeriodicSurfaceModifier) : public Handle(BRepTools_Modification) {
   public:
-    void* operator new(size_t,void* anAddress) 
+    void* operator new(size_t,void* anAddress)
       {
         return anAddress;
       }
-    void* operator new(size_t size) 
-      { 
-        return Standard::Allocate(size); 
+    void* operator new(size_t size)
+      {
+        return Standard::Allocate(size);
       }
-    void  operator delete(void *anAddress) 
-      { 
-        if (anAddress) Standard::Free((Standard_Address&)anAddress); 
+    void  operator delete(void *anAddress)
+      {
+        if (anAddress) Standard::Free((Standard_Address&)anAddress);
       }
-    Handle(BlockFix_PeriodicSurfaceModifier)():Handle(BRepTools_Modification)() {} 
-    Handle(BlockFix_PeriodicSurfaceModifier)(const Handle(BlockFix_PeriodicSurfaceModifier)& aHandle) : Handle(BRepTools_Modification)(aHandle) 
+    Handle(BlockFix_PeriodicSurfaceModifier)():Handle(BRepTools_Modification)() {}
+    Handle(BlockFix_PeriodicSurfaceModifier)(const Handle(BlockFix_PeriodicSurfaceModifier)& aHandle) : Handle(BRepTools_Modification)(aHandle)
      {
      }
 
-    Handle(BlockFix_PeriodicSurfaceModifier)(const BlockFix_PeriodicSurfaceModifier* anItem) : Handle(BRepTools_Modification)((BRepTools_Modification *)anItem) 
+    Handle(BlockFix_PeriodicSurfaceModifier)(const BlockFix_PeriodicSurfaceModifier* anItem) : Handle(BRepTools_Modification)((BRepTools_Modification *)anItem)
      {
      }
 
@@ -75,18 +75,18 @@ class Handle(BlockFix_PeriodicSurfaceModifier) : public Handle(BRepTools_Modific
       return *this;
      }
 
-    BlockFix_PeriodicSurfaceModifier* operator->() 
+    BlockFix_PeriodicSurfaceModifier* operator->()
      {
       return (BlockFix_PeriodicSurfaceModifier *)ControlAccess();
      }
 
-    BlockFix_PeriodicSurfaceModifier* operator->() const 
+    BlockFix_PeriodicSurfaceModifier* operator->() const
      {
       return (BlockFix_PeriodicSurfaceModifier *)ControlAccess();
      }
 
    Standard_EXPORT ~Handle(BlockFix_PeriodicSurfaceModifier)();
- 
+
    Standard_EXPORT static const Handle(BlockFix_PeriodicSurfaceModifier) DownCast(const Handle(Standard_Transient)& AnObject);
 };
 #endif
diff --git a/src/GEOMAlgo_NEW/Handle_BlockFix_SphereSpaceModifier.hxx b/src/GEOMAlgo_NEW/Handle_BlockFix_SphereSpaceModifier.hxx
index 29253a81a..33dc8a198 100644
--- a/src/GEOMAlgo_NEW/Handle_BlockFix_SphereSpaceModifier.hxx
+++ b/src/GEOMAlgo_NEW/Handle_BlockFix_SphereSpaceModifier.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -42,24 +42,24 @@ Standard_EXPORT Handle_Standard_Type& STANDARD_TYPE(BlockFix_SphereSpaceModifier
 
 class Handle(BlockFix_SphereSpaceModifier) : public Handle(BRepTools_Modification) {
   public:
-    void* operator new(size_t,void* anAddress) 
+    void* operator new(size_t,void* anAddress)
       {
         return anAddress;
       }
-    void* operator new(size_t size) 
-      { 
-        return Standard::Allocate(size); 
+    void* operator new(size_t size)
+      {
+        return Standard::Allocate(size);
       }
-    void  operator delete(void *anAddress) 
-      { 
-        if (anAddress) Standard::Free((Standard_Address&)anAddress); 
+    void  operator delete(void *anAddress)
+      {
+        if (anAddress) Standard::Free((Standard_Address&)anAddress);
       }
-    Handle(BlockFix_SphereSpaceModifier)():Handle(BRepTools_Modification)() {} 
-    Handle(BlockFix_SphereSpaceModifier)(const Handle(BlockFix_SphereSpaceModifier)& aHandle) : Handle(BRepTools_Modification)(aHandle) 
+    Handle(BlockFix_SphereSpaceModifier)():Handle(BRepTools_Modification)() {}
+    Handle(BlockFix_SphereSpaceModifier)(const Handle(BlockFix_SphereSpaceModifier)& aHandle) : Handle(BRepTools_Modification)(aHandle)
      {
      }
 
-    Handle(BlockFix_SphereSpaceModifier)(const BlockFix_SphereSpaceModifier* anItem) : Handle(BRepTools_Modification)((BRepTools_Modification *)anItem) 
+    Handle(BlockFix_SphereSpaceModifier)(const BlockFix_SphereSpaceModifier* anItem) : Handle(BRepTools_Modification)((BRepTools_Modification *)anItem)
      {
      }
 
@@ -75,18 +75,18 @@ class Handle(BlockFix_SphereSpaceModifier) : public Handle(BRepTools_Modificatio
       return *this;
      }
 
-    BlockFix_SphereSpaceModifier* operator->() 
+    BlockFix_SphereSpaceModifier* operator->()
      {
       return (BlockFix_SphereSpaceModifier *)ControlAccess();
      }
 
-    BlockFix_SphereSpaceModifier* operator->() const 
+    BlockFix_SphereSpaceModifier* operator->() const
      {
       return (BlockFix_SphereSpaceModifier *)ControlAccess();
      }
 
    Standard_EXPORT ~Handle(BlockFix_SphereSpaceModifier)();
- 
+
    Standard_EXPORT static const Handle(BlockFix_SphereSpaceModifier) DownCast(const Handle(Standard_Transient)& AnObject);
 };
 #endif
diff --git a/src/GEOMAlgo_NEW/Makefile.am b/src/GEOMAlgo_NEW/Makefile.am
index ce5047db3..ef79bda69 100644
--- a/src/GEOMAlgo_NEW/Makefile.am
+++ b/src/GEOMAlgo_NEW/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -15,6 +15,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
 
 # GEOM GEOMAlgo : tools for Glue Faces algorithm
 # File   : Makefile.am
diff --git a/src/GEOMBase/GEOMBase.cxx b/src/GEOMBase/GEOMBase.cxx
index e9cab04ab..1df7a528c 100644
--- a/src/GEOMBase/GEOMBase.cxx
+++ b/src/GEOMBase/GEOMBase.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMBase/GEOMBase.h b/src/GEOMBase/GEOMBase.h
index 70f17f8cb..84ab6ee14 100644
--- a/src/GEOMBase/GEOMBase.h
+++ b/src/GEOMBase/GEOMBase.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMBase/GEOMBase.pro b/src/GEOMBase/GEOMBase.pro
index afa8768d4..042776a5d 100644
--- a/src/GEOMBase/GEOMBase.pro
+++ b/src/GEOMBase/GEOMBase.pro
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMBase/GEOMBase_Helper.cxx b/src/GEOMBase/GEOMBase_Helper.cxx
index 151f62277..006e6a391 100755
--- a/src/GEOMBase/GEOMBase_Helper.cxx
+++ b/src/GEOMBase/GEOMBase_Helper.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMBase/GEOMBase_Helper.h b/src/GEOMBase/GEOMBase_Helper.h
index cb4c9f415..1b93bd1ce 100755
--- a/src/GEOMBase/GEOMBase_Helper.h
+++ b/src/GEOMBase/GEOMBase_Helper.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMBase/GEOMBase_Skeleton.cxx b/src/GEOMBase/GEOMBase_Skeleton.cxx
index 471982ddb..57be34955 100644
--- a/src/GEOMBase/GEOMBase_Skeleton.cxx
+++ b/src/GEOMBase/GEOMBase_Skeleton.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMBase/GEOMBase_Skeleton.h b/src/GEOMBase/GEOMBase_Skeleton.h
index 392347f10..bb6d75434 100644
--- a/src/GEOMBase/GEOMBase_Skeleton.h
+++ b/src/GEOMBase/GEOMBase_Skeleton.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMBase/GEOM_GEOMBase.hxx b/src/GEOMBase/GEOM_GEOMBase.hxx
index dcead6541..343fc4d39 100755
--- a/src/GEOMBase/GEOM_GEOMBase.hxx
+++ b/src/GEOMBase/GEOM_GEOMBase.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMBase/GEOM_GenericObjPtr.cxx b/src/GEOMBase/GEOM_GenericObjPtr.cxx
index 890bb4d42..11d483133 100644
--- a/src/GEOMBase/GEOM_GenericObjPtr.cxx
+++ b/src/GEOMBase/GEOM_GenericObjPtr.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMBase/GEOM_GenericObjPtr.h b/src/GEOMBase/GEOM_GenericObjPtr.h
index fa48ae28d..b4ece1236 100644
--- a/src/GEOMBase/GEOM_GenericObjPtr.h
+++ b/src/GEOMBase/GEOM_GenericObjPtr.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMBase/GEOM_Operation.cxx b/src/GEOMBase/GEOM_Operation.cxx
index a133e09aa..da43f6770 100644
--- a/src/GEOMBase/GEOM_Operation.cxx
+++ b/src/GEOMBase/GEOM_Operation.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMBase/GEOM_Operation.h b/src/GEOMBase/GEOM_Operation.h
index 8180e60c7..bc33e9d60 100644
--- a/src/GEOMBase/GEOM_Operation.h
+++ b/src/GEOMBase/GEOM_Operation.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMBase/Makefile.am b/src/GEOMBase/Makefile.am
index 77d1624c3..c66a80519 100644
--- a/src/GEOMBase/Makefile.am
+++ b/src/GEOMBase/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMClient/GEOMClient.pro b/src/GEOMClient/GEOMClient.pro
index 0abb59461..22cd6b25a 100644
--- a/src/GEOMClient/GEOMClient.pro
+++ b/src/GEOMClient/GEOMClient.pro
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMClient/GEOM_Client.cxx b/src/GEOMClient/GEOM_Client.cxx
index 7a598d9b8..52e007c28 100644
--- a/src/GEOMClient/GEOM_Client.cxx
+++ b/src/GEOMClient/GEOM_Client.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMClient/GEOM_Client.hxx b/src/GEOMClient/GEOM_Client.hxx
index 304b26207..717efb331 100644
--- a/src/GEOMClient/GEOM_Client.hxx
+++ b/src/GEOMClient/GEOM_Client.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMClient/Makefile.am b/src/GEOMClient/Makefile.am
index 5fdb72cd1..b3addc3b2 100644
--- a/src/GEOMClient/Makefile.am
+++ b/src/GEOMClient/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMFiltersSelection/GEOMFiltersSelection.pro b/src/GEOMFiltersSelection/GEOMFiltersSelection.pro
index c07da99fd..0b76082f9 100644
--- a/src/GEOMFiltersSelection/GEOMFiltersSelection.pro
+++ b/src/GEOMFiltersSelection/GEOMFiltersSelection.pro
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMFiltersSelection/GEOM_CompoundFilter.cxx b/src/GEOMFiltersSelection/GEOM_CompoundFilter.cxx
index 6c25bcc54..ee6b3a6ce 100644
--- a/src/GEOMFiltersSelection/GEOM_CompoundFilter.cxx
+++ b/src/GEOMFiltersSelection/GEOM_CompoundFilter.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMFiltersSelection/GEOM_CompoundFilter.h b/src/GEOMFiltersSelection/GEOM_CompoundFilter.h
index a044b1584..8a4ad1173 100644
--- a/src/GEOMFiltersSelection/GEOM_CompoundFilter.h
+++ b/src/GEOMFiltersSelection/GEOM_CompoundFilter.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMFiltersSelection/GEOM_EdgeFilter.cxx b/src/GEOMFiltersSelection/GEOM_EdgeFilter.cxx
index 778482b65..1217b7363 100644
--- a/src/GEOMFiltersSelection/GEOM_EdgeFilter.cxx
+++ b/src/GEOMFiltersSelection/GEOM_EdgeFilter.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMFiltersSelection/GEOM_EdgeFilter.h b/src/GEOMFiltersSelection/GEOM_EdgeFilter.h
index b43a01fad..305043d38 100644
--- a/src/GEOMFiltersSelection/GEOM_EdgeFilter.h
+++ b/src/GEOMFiltersSelection/GEOM_EdgeFilter.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMFiltersSelection/GEOM_FaceFilter.cxx b/src/GEOMFiltersSelection/GEOM_FaceFilter.cxx
index b9ee8122b..a7e517850 100644
--- a/src/GEOMFiltersSelection/GEOM_FaceFilter.cxx
+++ b/src/GEOMFiltersSelection/GEOM_FaceFilter.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMFiltersSelection/GEOM_FaceFilter.h b/src/GEOMFiltersSelection/GEOM_FaceFilter.h
index 8540b09c5..ff493286b 100644
--- a/src/GEOMFiltersSelection/GEOM_FaceFilter.h
+++ b/src/GEOMFiltersSelection/GEOM_FaceFilter.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMFiltersSelection/GEOM_LogicalFilter.cxx b/src/GEOMFiltersSelection/GEOM_LogicalFilter.cxx
index 54b121e2f..152ed3328 100644
--- a/src/GEOMFiltersSelection/GEOM_LogicalFilter.cxx
+++ b/src/GEOMFiltersSelection/GEOM_LogicalFilter.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMFiltersSelection/GEOM_LogicalFilter.h b/src/GEOMFiltersSelection/GEOM_LogicalFilter.h
index 7368016cc..f4e2708f4 100644
--- a/src/GEOMFiltersSelection/GEOM_LogicalFilter.h
+++ b/src/GEOMFiltersSelection/GEOM_LogicalFilter.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMFiltersSelection/GEOM_OCCFilter.cxx b/src/GEOMFiltersSelection/GEOM_OCCFilter.cxx
index accf5e5ce..d4a5b43db 100644
--- a/src/GEOMFiltersSelection/GEOM_OCCFilter.cxx
+++ b/src/GEOMFiltersSelection/GEOM_OCCFilter.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMFiltersSelection/GEOM_OCCFilter.h b/src/GEOMFiltersSelection/GEOM_OCCFilter.h
index d1c0d0a60..12eb978b4 100644
--- a/src/GEOMFiltersSelection/GEOM_OCCFilter.h
+++ b/src/GEOMFiltersSelection/GEOM_OCCFilter.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMFiltersSelection/GEOM_PreviewFilter.cxx b/src/GEOMFiltersSelection/GEOM_PreviewFilter.cxx
index 9da40c64b..ed3f34777 100644
--- a/src/GEOMFiltersSelection/GEOM_PreviewFilter.cxx
+++ b/src/GEOMFiltersSelection/GEOM_PreviewFilter.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMFiltersSelection/GEOM_PreviewFilter.h b/src/GEOMFiltersSelection/GEOM_PreviewFilter.h
index b13434088..8054810b3 100644
--- a/src/GEOMFiltersSelection/GEOM_PreviewFilter.h
+++ b/src/GEOMFiltersSelection/GEOM_PreviewFilter.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMFiltersSelection/GEOM_SelectionFilter.cxx b/src/GEOMFiltersSelection/GEOM_SelectionFilter.cxx
index 127251aef..35fc57020 100644
--- a/src/GEOMFiltersSelection/GEOM_SelectionFilter.cxx
+++ b/src/GEOMFiltersSelection/GEOM_SelectionFilter.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMFiltersSelection/GEOM_SelectionFilter.h b/src/GEOMFiltersSelection/GEOM_SelectionFilter.h
index d3dbad1df..d05a19fd3 100644
--- a/src/GEOMFiltersSelection/GEOM_SelectionFilter.h
+++ b/src/GEOMFiltersSelection/GEOM_SelectionFilter.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMFiltersSelection/GEOM_TypeFilter.cxx b/src/GEOMFiltersSelection/GEOM_TypeFilter.cxx
index 827b1d7c1..d1e6821cf 100644
--- a/src/GEOMFiltersSelection/GEOM_TypeFilter.cxx
+++ b/src/GEOMFiltersSelection/GEOM_TypeFilter.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMFiltersSelection/GEOM_TypeFilter.h b/src/GEOMFiltersSelection/GEOM_TypeFilter.h
index 436193ea3..67fac3498 100644
--- a/src/GEOMFiltersSelection/GEOM_TypeFilter.h
+++ b/src/GEOMFiltersSelection/GEOM_TypeFilter.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMFiltersSelection/Makefile.am b/src/GEOMFiltersSelection/Makefile.am
index 0ceda7e29..ff104eef4 100644
--- a/src/GEOMFiltersSelection/Makefile.am
+++ b/src/GEOMFiltersSelection/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMGUI/GEOMGUI.cxx b/src/GEOMGUI/GEOMGUI.cxx
index 34699bd47..b87f89833 100644
--- a/src/GEOMGUI/GEOMGUI.cxx
+++ b/src/GEOMGUI/GEOMGUI.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMGUI/GEOMGUI.h b/src/GEOMGUI/GEOMGUI.h
index 2405efdff..87b76ed24 100644
--- a/src/GEOMGUI/GEOMGUI.h
+++ b/src/GEOMGUI/GEOMGUI.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMGUI/GEOMGUI.pro b/src/GEOMGUI/GEOMGUI.pro
index 9965d2af3..b34f6bb46 100644
--- a/src/GEOMGUI/GEOMGUI.pro
+++ b/src/GEOMGUI/GEOMGUI.pro
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMGUI/GEOMGUI_OCCSelector.cxx b/src/GEOMGUI/GEOMGUI_OCCSelector.cxx
index dd64ed526..e2008bfa8 100644
--- a/src/GEOMGUI/GEOMGUI_OCCSelector.cxx
+++ b/src/GEOMGUI/GEOMGUI_OCCSelector.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMGUI/GEOMGUI_OCCSelector.h b/src/GEOMGUI/GEOMGUI_OCCSelector.h
index 0355b599b..d082d4e86 100644
--- a/src/GEOMGUI/GEOMGUI_OCCSelector.h
+++ b/src/GEOMGUI/GEOMGUI_OCCSelector.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMGUI/GEOMGUI_Selection.cxx b/src/GEOMGUI/GEOMGUI_Selection.cxx
index d7977004b..ac9db21f1 100644
--- a/src/GEOMGUI/GEOMGUI_Selection.cxx
+++ b/src/GEOMGUI/GEOMGUI_Selection.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMGUI/GEOMGUI_Selection.h b/src/GEOMGUI/GEOMGUI_Selection.h
index ed9ed7182..93f243bdd 100644
--- a/src/GEOMGUI/GEOMGUI_Selection.h
+++ b/src/GEOMGUI/GEOMGUI_Selection.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMGUI/GEOM_Displayer.cxx b/src/GEOMGUI/GEOM_Displayer.cxx
index ea0fbcade..a6abae6f5 100644
--- a/src/GEOMGUI/GEOM_Displayer.cxx
+++ b/src/GEOMGUI/GEOM_Displayer.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // GEOM GEOMGUI : GUI for Geometry component
 // File   : GEOM_Displayer.cxx
diff --git a/src/GEOMGUI/GEOM_Displayer.h b/src/GEOMGUI/GEOM_Displayer.h
index c7ced1329..07305f66b 100644
--- a/src/GEOMGUI/GEOM_Displayer.h
+++ b/src/GEOMGUI/GEOM_Displayer.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMGUI/GEOM_GEOMGUI.hxx b/src/GEOMGUI/GEOM_GEOMGUI.hxx
index abfd3e6d8..4017f21be 100755
--- a/src/GEOMGUI/GEOM_GEOMGUI.hxx
+++ b/src/GEOMGUI/GEOM_GEOMGUI.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMGUI/GeometryGUI.cxx b/src/GEOMGUI/GeometryGUI.cxx
index b9fa45797..ee66a0b50 100644
--- a/src/GEOMGUI/GeometryGUI.cxx
+++ b/src/GEOMGUI/GeometryGUI.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMGUI/GeometryGUI.h b/src/GEOMGUI/GeometryGUI.h
index ccb81254b..bde9446a7 100644
--- a/src/GEOMGUI/GeometryGUI.h
+++ b/src/GEOMGUI/GeometryGUI.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // GEOM GEOMGUI : GUI for Geometry component
 // File   : GeometryGUI.h
diff --git a/src/GEOMGUI/GeometryGUI_Operations.h b/src/GEOMGUI/GeometryGUI_Operations.h
index c21e405e2..816c5a61c 100644
--- a/src/GEOMGUI/GeometryGUI_Operations.h
+++ b/src/GEOMGUI/GeometryGUI_Operations.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMGUI/GeometryGUI_Swig.cxx b/src/GEOMGUI/GeometryGUI_Swig.cxx
index edfbf6e1c..59410211f 100644
--- a/src/GEOMGUI/GeometryGUI_Swig.cxx
+++ b/src/GEOMGUI/GeometryGUI_Swig.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMGUI/GeometryGUI_Swig.hxx b/src/GEOMGUI/GeometryGUI_Swig.hxx
index dc7771c90..0f93ab727 100644
--- a/src/GEOMGUI/GeometryGUI_Swig.hxx
+++ b/src/GEOMGUI/GeometryGUI_Swig.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMGUI/GeometryGUI_Swig.i b/src/GEOMGUI/GeometryGUI_Swig.i
index 392f9ca08..d5bdfdf1a 100644
--- a/src/GEOMGUI/GeometryGUI_Swig.i
+++ b/src/GEOMGUI/GeometryGUI_Swig.i
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMGUI/Makefile.am b/src/GEOMGUI/Makefile.am
index 056df6e05..2ac3a347b 100644
--- a/src/GEOMGUI/Makefile.am
+++ b/src/GEOMGUI/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMImpl/GEOMImpl.pro b/src/GEOMImpl/GEOMImpl.pro
index 54e4146dc..90ca4d89c 100644
--- a/src/GEOMImpl/GEOMImpl.pro
+++ b/src/GEOMImpl/GEOMImpl.pro
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMImpl/GEOMImpl_3DSketcherDriver.cxx b/src/GEOMImpl/GEOMImpl_3DSketcherDriver.cxx
index e132786db..5c00c4655 100755
--- a/src/GEOMImpl/GEOMImpl_3DSketcherDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_3DSketcherDriver.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMImpl/GEOMImpl_3DSketcherDriver.hxx b/src/GEOMImpl/GEOMImpl_3DSketcherDriver.hxx
index ff1ed680b..0bf85bd21 100755
--- a/src/GEOMImpl/GEOMImpl_3DSketcherDriver.hxx
+++ b/src/GEOMImpl/GEOMImpl_3DSketcherDriver.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMImpl/GEOMImpl_ArcDriver.cxx b/src/GEOMImpl/GEOMImpl_ArcDriver.cxx
index 5479ab218..77ec4b0ba 100644
--- a/src/GEOMImpl/GEOMImpl_ArcDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_ArcDriver.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_ArcDriver.hxx b/src/GEOMImpl/GEOMImpl_ArcDriver.hxx
index 6ba4029c6..ccd0f06d5 100644
--- a/src/GEOMImpl/GEOMImpl_ArcDriver.hxx
+++ b/src/GEOMImpl/GEOMImpl_ArcDriver.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_ArchimedeDriver.cxx b/src/GEOMImpl/GEOMImpl_ArchimedeDriver.cxx
index 3be550a49..33ac44dcc 100644
--- a/src/GEOMImpl/GEOMImpl_ArchimedeDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_ArchimedeDriver.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include "GEOMImpl_ArchimedeDriver.hxx"
 #include "GEOMImpl_IArchimede.hxx"
diff --git a/src/GEOMImpl/GEOMImpl_ArchimedeDriver.hxx b/src/GEOMImpl/GEOMImpl_ArchimedeDriver.hxx
index a6607042f..881ab28b3 100644
--- a/src/GEOMImpl/GEOMImpl_ArchimedeDriver.hxx
+++ b/src/GEOMImpl/GEOMImpl_ArchimedeDriver.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_Block6Explorer.cxx b/src/GEOMImpl/GEOMImpl_Block6Explorer.cxx
index 0acbe7b20..8df19bd1e 100644
--- a/src/GEOMImpl/GEOMImpl_Block6Explorer.cxx
+++ b/src/GEOMImpl/GEOMImpl_Block6Explorer.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include <Standard_Stream.hxx>
 
diff --git a/src/GEOMImpl/GEOMImpl_Block6Explorer.hxx b/src/GEOMImpl/GEOMImpl_Block6Explorer.hxx
index 5f559a507..9684e465d 100644
--- a/src/GEOMImpl/GEOMImpl_Block6Explorer.hxx
+++ b/src/GEOMImpl/GEOMImpl_Block6Explorer.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 //  File   : GEOMImpl_Block6Explorer.hxx
 //  Module : GEOMImpl
diff --git a/src/GEOMImpl/GEOMImpl_BlockDriver.cxx b/src/GEOMImpl/GEOMImpl_BlockDriver.cxx
index a1b8ad4a4..f13daca80 100644
--- a/src/GEOMImpl/GEOMImpl_BlockDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_BlockDriver.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_BlockDriver.hxx b/src/GEOMImpl/GEOMImpl_BlockDriver.hxx
index f5e0c0a27..49d78409b 100644
--- a/src/GEOMImpl/GEOMImpl_BlockDriver.hxx
+++ b/src/GEOMImpl/GEOMImpl_BlockDriver.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_BooleanDriver.cxx b/src/GEOMImpl/GEOMImpl_BooleanDriver.cxx
index 1adfe3cc4..1582f9126 100644
--- a/src/GEOMImpl/GEOMImpl_BooleanDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_BooleanDriver.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include <GEOMImpl_BooleanDriver.hxx>
 #include <GEOMImpl_IBoolean.hxx>
diff --git a/src/GEOMImpl/GEOMImpl_BooleanDriver.hxx b/src/GEOMImpl/GEOMImpl_BooleanDriver.hxx
index 21394c619..0ed0fb6b5 100644
--- a/src/GEOMImpl/GEOMImpl_BooleanDriver.hxx
+++ b/src/GEOMImpl/GEOMImpl_BooleanDriver.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_BoxDriver.cxx b/src/GEOMImpl/GEOMImpl_BoxDriver.cxx
index d150a3e85..5c0b20a6a 100644
--- a/src/GEOMImpl/GEOMImpl_BoxDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_BoxDriver.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_BoxDriver.hxx b/src/GEOMImpl/GEOMImpl_BoxDriver.hxx
index f12c236d2..e719958d1 100644
--- a/src/GEOMImpl/GEOMImpl_BoxDriver.hxx
+++ b/src/GEOMImpl/GEOMImpl_BoxDriver.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_ChamferDriver.cxx b/src/GEOMImpl/GEOMImpl_ChamferDriver.cxx
index fdbfda86e..d24bce73e 100644
--- a/src/GEOMImpl/GEOMImpl_ChamferDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_ChamferDriver.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include <Standard_Stream.hxx>
 
diff --git a/src/GEOMImpl/GEOMImpl_ChamferDriver.hxx b/src/GEOMImpl/GEOMImpl_ChamferDriver.hxx
index fb24299d0..9c1f9ac04 100644
--- a/src/GEOMImpl/GEOMImpl_ChamferDriver.hxx
+++ b/src/GEOMImpl/GEOMImpl_ChamferDriver.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_CircleDriver.cxx b/src/GEOMImpl/GEOMImpl_CircleDriver.cxx
index cb253dd23..b26507e88 100644
--- a/src/GEOMImpl/GEOMImpl_CircleDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_CircleDriver.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_CircleDriver.hxx b/src/GEOMImpl/GEOMImpl_CircleDriver.hxx
index 151ccc66d..e16f9941f 100644
--- a/src/GEOMImpl/GEOMImpl_CircleDriver.hxx
+++ b/src/GEOMImpl/GEOMImpl_CircleDriver.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_ConeDriver.cxx b/src/GEOMImpl/GEOMImpl_ConeDriver.cxx
index 6f6174ae2..551bb904f 100644
--- a/src/GEOMImpl/GEOMImpl_ConeDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_ConeDriver.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_ConeDriver.hxx b/src/GEOMImpl/GEOMImpl_ConeDriver.hxx
index fea45650c..35a772838 100644
--- a/src/GEOMImpl/GEOMImpl_ConeDriver.hxx
+++ b/src/GEOMImpl/GEOMImpl_ConeDriver.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_CopyDriver.cxx b/src/GEOMImpl/GEOMImpl_CopyDriver.cxx
index ef18d6dbc..5d9f31591 100644
--- a/src/GEOMImpl/GEOMImpl_CopyDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_CopyDriver.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_CopyDriver.hxx b/src/GEOMImpl/GEOMImpl_CopyDriver.hxx
index b0d1d36b3..8fd0f4d69 100644
--- a/src/GEOMImpl/GEOMImpl_CopyDriver.hxx
+++ b/src/GEOMImpl/GEOMImpl_CopyDriver.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_CylinderDriver.cxx b/src/GEOMImpl/GEOMImpl_CylinderDriver.cxx
index 18c2a7693..e381da9c9 100644
--- a/src/GEOMImpl/GEOMImpl_CylinderDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_CylinderDriver.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_CylinderDriver.hxx b/src/GEOMImpl/GEOMImpl_CylinderDriver.hxx
index 88894eb44..055679c2e 100644
--- a/src/GEOMImpl/GEOMImpl_CylinderDriver.hxx
+++ b/src/GEOMImpl/GEOMImpl_CylinderDriver.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_DiskDriver.cxx b/src/GEOMImpl/GEOMImpl_DiskDriver.cxx
index 80de7842e..8876bc45f 100755
--- a/src/GEOMImpl/GEOMImpl_DiskDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_DiskDriver.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMImpl/GEOMImpl_DiskDriver.hxx b/src/GEOMImpl/GEOMImpl_DiskDriver.hxx
index 98a748658..d595e219d 100755
--- a/src/GEOMImpl/GEOMImpl_DiskDriver.hxx
+++ b/src/GEOMImpl/GEOMImpl_DiskDriver.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMImpl/GEOMImpl_EllipseDriver.cxx b/src/GEOMImpl/GEOMImpl_EllipseDriver.cxx
index da2bc9ffc..90aa414da 100644
--- a/src/GEOMImpl/GEOMImpl_EllipseDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_EllipseDriver.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_EllipseDriver.hxx b/src/GEOMImpl/GEOMImpl_EllipseDriver.hxx
index 0879e8a46..fda0a9273 100644
--- a/src/GEOMImpl/GEOMImpl_EllipseDriver.hxx
+++ b/src/GEOMImpl/GEOMImpl_EllipseDriver.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_ExportDriver.cxx b/src/GEOMImpl/GEOMImpl_ExportDriver.cxx
index e0577a442..27c5f8bb4 100644
--- a/src/GEOMImpl/GEOMImpl_ExportDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_ExportDriver.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_ExportDriver.hxx b/src/GEOMImpl/GEOMImpl_ExportDriver.hxx
index 0bc573937..806437da9 100644
--- a/src/GEOMImpl/GEOMImpl_ExportDriver.hxx
+++ b/src/GEOMImpl/GEOMImpl_ExportDriver.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_FaceDriver.cxx b/src/GEOMImpl/GEOMImpl_FaceDriver.cxx
index 771bc4c24..4aafb7114 100755
--- a/src/GEOMImpl/GEOMImpl_FaceDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_FaceDriver.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMImpl/GEOMImpl_FaceDriver.hxx b/src/GEOMImpl/GEOMImpl_FaceDriver.hxx
index a87ae2e55..0a1aee235 100755
--- a/src/GEOMImpl/GEOMImpl_FaceDriver.hxx
+++ b/src/GEOMImpl/GEOMImpl_FaceDriver.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMImpl/GEOMImpl_Fillet1d.cxx b/src/GEOMImpl/GEOMImpl_Fillet1d.cxx
index eecfee7ab..c4780bd33 100644
--- a/src/GEOMImpl/GEOMImpl_Fillet1d.cxx
+++ b/src/GEOMImpl/GEOMImpl_Fillet1d.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -15,6 +15,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 //  File   : GEOMImpl_Fillet1d.cxx
 //  Module : GEOMImpl
diff --git a/src/GEOMImpl/GEOMImpl_Fillet1d.hxx b/src/GEOMImpl/GEOMImpl_Fillet1d.hxx
index 5e5e52607..1fb32c489 100644
--- a/src/GEOMImpl/GEOMImpl_Fillet1d.hxx
+++ b/src/GEOMImpl/GEOMImpl_Fillet1d.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMImpl/GEOMImpl_Fillet1dDriver.cxx b/src/GEOMImpl/GEOMImpl_Fillet1dDriver.cxx
index 1e2bb562f..bd99d94d7 100644
--- a/src/GEOMImpl/GEOMImpl_Fillet1dDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_Fillet1dDriver.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -15,6 +15,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include <Standard_Stream.hxx>
 
diff --git a/src/GEOMImpl/GEOMImpl_Fillet1dDriver.hxx b/src/GEOMImpl/GEOMImpl_Fillet1dDriver.hxx
index 997391ba5..87b9ce897 100644
--- a/src/GEOMImpl/GEOMImpl_Fillet1dDriver.hxx
+++ b/src/GEOMImpl/GEOMImpl_Fillet1dDriver.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMImpl/GEOMImpl_Fillet2dDriver.cxx b/src/GEOMImpl/GEOMImpl_Fillet2dDriver.cxx
index 0fb59351e..76049a6f4 100755
--- a/src/GEOMImpl/GEOMImpl_Fillet2dDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_Fillet2dDriver.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -15,6 +15,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include <Standard_Stream.hxx>
 
diff --git a/src/GEOMImpl/GEOMImpl_Fillet2dDriver.hxx b/src/GEOMImpl/GEOMImpl_Fillet2dDriver.hxx
index c6684d3e3..c3ba4df28 100755
--- a/src/GEOMImpl/GEOMImpl_Fillet2dDriver.hxx
+++ b/src/GEOMImpl/GEOMImpl_Fillet2dDriver.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMImpl/GEOMImpl_FilletDriver.cxx b/src/GEOMImpl/GEOMImpl_FilletDriver.cxx
index 355f4f95d..01d1dcd2b 100644
--- a/src/GEOMImpl/GEOMImpl_FilletDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_FilletDriver.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_FilletDriver.hxx b/src/GEOMImpl/GEOMImpl_FilletDriver.hxx
index 4698a15c5..b1ba69bb2 100644
--- a/src/GEOMImpl/GEOMImpl_FilletDriver.hxx
+++ b/src/GEOMImpl/GEOMImpl_FilletDriver.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_FillingDriver.cxx b/src/GEOMImpl/GEOMImpl_FillingDriver.cxx
index 15442235c..1126965ac 100644
--- a/src/GEOMImpl/GEOMImpl_FillingDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_FillingDriver.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include <Standard_Stream.hxx>
 
diff --git a/src/GEOMImpl/GEOMImpl_FillingDriver.hxx b/src/GEOMImpl/GEOMImpl_FillingDriver.hxx
index 75b0939ed..0fb90d0aa 100644
--- a/src/GEOMImpl/GEOMImpl_FillingDriver.hxx
+++ b/src/GEOMImpl/GEOMImpl_FillingDriver.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_Gen.cxx b/src/GEOMImpl/GEOMImpl_Gen.cxx
index 281165e9d..6fd6cb8dd 100644
--- a/src/GEOMImpl/GEOMImpl_Gen.cxx
+++ b/src/GEOMImpl/GEOMImpl_Gen.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_Gen.hxx b/src/GEOMImpl/GEOMImpl_Gen.hxx
index 0fa65fdea..8378dbe55 100644
--- a/src/GEOMImpl/GEOMImpl_Gen.hxx
+++ b/src/GEOMImpl/GEOMImpl_Gen.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_GlueDriver.cxx b/src/GEOMImpl/GEOMImpl_GlueDriver.cxx
index 464a545b4..1a979d751 100644
--- a/src/GEOMImpl/GEOMImpl_GlueDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_GlueDriver.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include <Standard_Stream.hxx>
 
diff --git a/src/GEOMImpl/GEOMImpl_GlueDriver.hxx b/src/GEOMImpl/GEOMImpl_GlueDriver.hxx
index 44672db8b..9337f2782 100644
--- a/src/GEOMImpl/GEOMImpl_GlueDriver.hxx
+++ b/src/GEOMImpl/GEOMImpl_GlueDriver.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_HealingDriver.cxx b/src/GEOMImpl/GEOMImpl_HealingDriver.cxx
index fe08dc9e5..f21bc14f9 100644
--- a/src/GEOMImpl/GEOMImpl_HealingDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_HealingDriver.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_HealingDriver.hxx b/src/GEOMImpl/GEOMImpl_HealingDriver.hxx
index 7b6a2b73d..9493912d9 100644
--- a/src/GEOMImpl/GEOMImpl_HealingDriver.hxx
+++ b/src/GEOMImpl/GEOMImpl_HealingDriver.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx b/src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx
index 76962b988..12d2e4df2 100644
--- a/src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx
+++ b/src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include <Standard_Stream.hxx>
 
diff --git a/src/GEOMImpl/GEOMImpl_I3DPrimOperations.hxx b/src/GEOMImpl/GEOMImpl_I3DPrimOperations.hxx
index dd066a215..c567d0333 100644
--- a/src/GEOMImpl/GEOMImpl_I3DPrimOperations.hxx
+++ b/src/GEOMImpl/GEOMImpl_I3DPrimOperations.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_I3DSketcher.hxx b/src/GEOMImpl/GEOMImpl_I3DSketcher.hxx
index d8650e15f..fa6e04639 100755
--- a/src/GEOMImpl/GEOMImpl_I3DSketcher.hxx
+++ b/src/GEOMImpl/GEOMImpl_I3DSketcher.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMImpl/GEOMImpl_IAdvancedOperations.cxx b/src/GEOMImpl/GEOMImpl_IAdvancedOperations.cxx
index 15a0b8a53..810b6ceb8 100644
--- a/src/GEOMImpl/GEOMImpl_IAdvancedOperations.cxx
+++ b/src/GEOMImpl/GEOMImpl_IAdvancedOperations.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMImpl/GEOMImpl_IAdvancedOperations.hxx b/src/GEOMImpl/GEOMImpl_IAdvancedOperations.hxx
index 5c644a2b8..6c0d3f677 100644
--- a/src/GEOMImpl/GEOMImpl_IAdvancedOperations.hxx
+++ b/src/GEOMImpl/GEOMImpl_IAdvancedOperations.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMImpl/GEOMImpl_IArc.hxx b/src/GEOMImpl/GEOMImpl_IArc.hxx
index 1705af180..7927ef77b 100644
--- a/src/GEOMImpl/GEOMImpl_IArc.hxx
+++ b/src/GEOMImpl/GEOMImpl_IArc.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_IArchimede.hxx b/src/GEOMImpl/GEOMImpl_IArchimede.hxx
index f62f13a35..68721becf 100644
--- a/src/GEOMImpl/GEOMImpl_IArchimede.hxx
+++ b/src/GEOMImpl/GEOMImpl_IArchimede.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_IBasicOperations.cxx b/src/GEOMImpl/GEOMImpl_IBasicOperations.cxx
index 9d8799c6d..e29905bd3 100644
--- a/src/GEOMImpl/GEOMImpl_IBasicOperations.cxx
+++ b/src/GEOMImpl/GEOMImpl_IBasicOperations.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include <Standard_Stream.hxx>
 
diff --git a/src/GEOMImpl/GEOMImpl_IBasicOperations.hxx b/src/GEOMImpl/GEOMImpl_IBasicOperations.hxx
index a4d624e7b..1e743415f 100644
--- a/src/GEOMImpl/GEOMImpl_IBasicOperations.hxx
+++ b/src/GEOMImpl/GEOMImpl_IBasicOperations.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_IBlockTrsf.hxx b/src/GEOMImpl/GEOMImpl_IBlockTrsf.hxx
index 129b5db8a..5505f3c20 100644
--- a/src/GEOMImpl/GEOMImpl_IBlockTrsf.hxx
+++ b/src/GEOMImpl/GEOMImpl_IBlockTrsf.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_IBlocks.hxx b/src/GEOMImpl/GEOMImpl_IBlocks.hxx
index 19119f867..c237641d5 100644
--- a/src/GEOMImpl/GEOMImpl_IBlocks.hxx
+++ b/src/GEOMImpl/GEOMImpl_IBlocks.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx b/src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx
index 899afc083..42aaa4260 100644
--- a/src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx
+++ b/src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifdef WNT
 #pragma warning( disable:4786 )
diff --git a/src/GEOMImpl/GEOMImpl_IBlocksOperations.hxx b/src/GEOMImpl/GEOMImpl_IBlocksOperations.hxx
index 612f13a08..f702da402 100644
--- a/src/GEOMImpl/GEOMImpl_IBlocksOperations.hxx
+++ b/src/GEOMImpl/GEOMImpl_IBlocksOperations.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_IBoolean.hxx b/src/GEOMImpl/GEOMImpl_IBoolean.hxx
index d82beab05..39696d85c 100644
--- a/src/GEOMImpl/GEOMImpl_IBoolean.hxx
+++ b/src/GEOMImpl/GEOMImpl_IBoolean.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_IBooleanOperations.cxx b/src/GEOMImpl/GEOMImpl_IBooleanOperations.cxx
index c2c1164fe..3be15dbeb 100644
--- a/src/GEOMImpl/GEOMImpl_IBooleanOperations.cxx
+++ b/src/GEOMImpl/GEOMImpl_IBooleanOperations.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include <Standard_Stream.hxx>
 
diff --git a/src/GEOMImpl/GEOMImpl_IBooleanOperations.hxx b/src/GEOMImpl/GEOMImpl_IBooleanOperations.hxx
index d4d9eecbb..75a094544 100644
--- a/src/GEOMImpl/GEOMImpl_IBooleanOperations.hxx
+++ b/src/GEOMImpl/GEOMImpl_IBooleanOperations.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_IBox.hxx b/src/GEOMImpl/GEOMImpl_IBox.hxx
index a5b4a8fdf..006900598 100644
--- a/src/GEOMImpl/GEOMImpl_IBox.hxx
+++ b/src/GEOMImpl/GEOMImpl_IBox.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_IChamfer.hxx b/src/GEOMImpl/GEOMImpl_IChamfer.hxx
index ff0c2a8f2..a06d14f48 100644
--- a/src/GEOMImpl/GEOMImpl_IChamfer.hxx
+++ b/src/GEOMImpl/GEOMImpl_IChamfer.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_ICircle.hxx b/src/GEOMImpl/GEOMImpl_ICircle.hxx
index a7199eb31..12f1b5c2b 100644
--- a/src/GEOMImpl/GEOMImpl_ICircle.hxx
+++ b/src/GEOMImpl/GEOMImpl_ICircle.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_ICone.hxx b/src/GEOMImpl/GEOMImpl_ICone.hxx
index 7a6cc0abe..351e18f45 100644
--- a/src/GEOMImpl/GEOMImpl_ICone.hxx
+++ b/src/GEOMImpl/GEOMImpl_ICone.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_ICopy.hxx b/src/GEOMImpl/GEOMImpl_ICopy.hxx
index a0c9e51e4..8d7b218cb 100644
--- a/src/GEOMImpl/GEOMImpl_ICopy.hxx
+++ b/src/GEOMImpl/GEOMImpl_ICopy.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx b/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx
index c9c68ab5c..ca1ac5db0 100644
--- a/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx
+++ b/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifdef WNT
 // E.A. : On windows with python 2.6, there is a conflict
diff --git a/src/GEOMImpl/GEOMImpl_ICurvesOperations.hxx b/src/GEOMImpl/GEOMImpl_ICurvesOperations.hxx
index 4f8f3a8ad..2e71bbd38 100644
--- a/src/GEOMImpl/GEOMImpl_ICurvesOperations.hxx
+++ b/src/GEOMImpl/GEOMImpl_ICurvesOperations.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_ICylinder.hxx b/src/GEOMImpl/GEOMImpl_ICylinder.hxx
index f8bcf646d..236eabdc9 100644
--- a/src/GEOMImpl/GEOMImpl_ICylinder.hxx
+++ b/src/GEOMImpl/GEOMImpl_ICylinder.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_IDisk.hxx b/src/GEOMImpl/GEOMImpl_IDisk.hxx
index 75ea7ca04..94d4ad96c 100755
--- a/src/GEOMImpl/GEOMImpl_IDisk.hxx
+++ b/src/GEOMImpl/GEOMImpl_IDisk.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMImpl/GEOMImpl_IEllipse.hxx b/src/GEOMImpl/GEOMImpl_IEllipse.hxx
index 3168917f3..a77b7b8e4 100644
--- a/src/GEOMImpl/GEOMImpl_IEllipse.hxx
+++ b/src/GEOMImpl/GEOMImpl_IEllipse.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_IFace.hxx b/src/GEOMImpl/GEOMImpl_IFace.hxx
index add9e6526..11e9e5d7f 100755
--- a/src/GEOMImpl/GEOMImpl_IFace.hxx
+++ b/src/GEOMImpl/GEOMImpl_IFace.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMImpl/GEOMImpl_IFillet.hxx b/src/GEOMImpl/GEOMImpl_IFillet.hxx
index a10c0c603..8bcea7c67 100644
--- a/src/GEOMImpl/GEOMImpl_IFillet.hxx
+++ b/src/GEOMImpl/GEOMImpl_IFillet.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_IFillet1d.hxx b/src/GEOMImpl/GEOMImpl_IFillet1d.hxx
index ff7bca4e3..484d92b65 100644
--- a/src/GEOMImpl/GEOMImpl_IFillet1d.hxx
+++ b/src/GEOMImpl/GEOMImpl_IFillet1d.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMImpl/GEOMImpl_IFillet2d.hxx b/src/GEOMImpl/GEOMImpl_IFillet2d.hxx
index 6ddc7d9be..5f68d9425 100755
--- a/src/GEOMImpl/GEOMImpl_IFillet2d.hxx
+++ b/src/GEOMImpl/GEOMImpl_IFillet2d.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMImpl/GEOMImpl_IFilling.hxx b/src/GEOMImpl/GEOMImpl_IFilling.hxx
index c3545fa88..b08de436e 100644
--- a/src/GEOMImpl/GEOMImpl_IFilling.hxx
+++ b/src/GEOMImpl/GEOMImpl_IFilling.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_IGlue.hxx b/src/GEOMImpl/GEOMImpl_IGlue.hxx
index 8eb16d868..ef53547e0 100644
--- a/src/GEOMImpl/GEOMImpl_IGlue.hxx
+++ b/src/GEOMImpl/GEOMImpl_IGlue.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_IGroupOperations.cxx b/src/GEOMImpl/GEOMImpl_IGroupOperations.cxx
index 5c6619e41..522d5cf38 100644
--- a/src/GEOMImpl/GEOMImpl_IGroupOperations.cxx
+++ b/src/GEOMImpl/GEOMImpl_IGroupOperations.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include <Standard_Stream.hxx>
 
diff --git a/src/GEOMImpl/GEOMImpl_IGroupOperations.hxx b/src/GEOMImpl/GEOMImpl_IGroupOperations.hxx
index 019f6b5f8..0b6a89110 100644
--- a/src/GEOMImpl/GEOMImpl_IGroupOperations.hxx
+++ b/src/GEOMImpl/GEOMImpl_IGroupOperations.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_IHealing.hxx b/src/GEOMImpl/GEOMImpl_IHealing.hxx
index 6626c088e..91f8c34f0 100755
--- a/src/GEOMImpl/GEOMImpl_IHealing.hxx
+++ b/src/GEOMImpl/GEOMImpl_IHealing.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_IHealingOperations.cxx b/src/GEOMImpl/GEOMImpl_IHealingOperations.cxx
index 5c6ea1f38..9043f811a 100644
--- a/src/GEOMImpl/GEOMImpl_IHealingOperations.cxx
+++ b/src/GEOMImpl/GEOMImpl_IHealingOperations.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifdef WNT
 #pragma warning( disable:4786 )
diff --git a/src/GEOMImpl/GEOMImpl_IHealingOperations.hxx b/src/GEOMImpl/GEOMImpl_IHealingOperations.hxx
index 4f06b235b..e65976190 100644
--- a/src/GEOMImpl/GEOMImpl_IHealingOperations.hxx
+++ b/src/GEOMImpl/GEOMImpl_IHealingOperations.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_IImportExport.hxx b/src/GEOMImpl/GEOMImpl_IImportExport.hxx
index 2286b78c4..282bab97d 100644
--- a/src/GEOMImpl/GEOMImpl_IImportExport.hxx
+++ b/src/GEOMImpl/GEOMImpl_IImportExport.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx b/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx
index 1d262172b..3bb7cec61 100644
--- a/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx
+++ b/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include <Standard_Stream.hxx>
 
diff --git a/src/GEOMImpl/GEOMImpl_IInsertOperations.hxx b/src/GEOMImpl/GEOMImpl_IInsertOperations.hxx
index 57fa8b1a6..e60c22b32 100644
--- a/src/GEOMImpl/GEOMImpl_IInsertOperations.hxx
+++ b/src/GEOMImpl/GEOMImpl_IInsertOperations.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _GEOMImpl_IInsertOperations_HXX_
 #define _GEOMImpl_IInsertOperations_HXX_
diff --git a/src/GEOMImpl/GEOMImpl_ILine.hxx b/src/GEOMImpl/GEOMImpl_ILine.hxx
index 57af3d558..2bb7fdf91 100644
--- a/src/GEOMImpl/GEOMImpl_ILine.hxx
+++ b/src/GEOMImpl/GEOMImpl_ILine.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_ILocalOperations.cxx b/src/GEOMImpl/GEOMImpl_ILocalOperations.cxx
index 5715b5c50..92b3c91a4 100644
--- a/src/GEOMImpl/GEOMImpl_ILocalOperations.cxx
+++ b/src/GEOMImpl/GEOMImpl_ILocalOperations.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include <Standard_Stream.hxx>
 
diff --git a/src/GEOMImpl/GEOMImpl_ILocalOperations.hxx b/src/GEOMImpl/GEOMImpl_ILocalOperations.hxx
index 6847460a5..e1588da41 100644
--- a/src/GEOMImpl/GEOMImpl_ILocalOperations.hxx
+++ b/src/GEOMImpl/GEOMImpl_ILocalOperations.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_IMarker.hxx b/src/GEOMImpl/GEOMImpl_IMarker.hxx
index 54b65a924..a756a94ca 100644
--- a/src/GEOMImpl/GEOMImpl_IMarker.hxx
+++ b/src/GEOMImpl/GEOMImpl_IMarker.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_IMeasure.hxx b/src/GEOMImpl/GEOMImpl_IMeasure.hxx
index 6f36b474b..a58ffcbb5 100644
--- a/src/GEOMImpl/GEOMImpl_IMeasure.hxx
+++ b/src/GEOMImpl/GEOMImpl_IMeasure.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx b/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx
index 1d04c2844..73800fb7f 100644
--- a/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx
+++ b/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include <Standard_Stream.hxx>
 
diff --git a/src/GEOMImpl/GEOMImpl_IMeasureOperations.hxx b/src/GEOMImpl/GEOMImpl_IMeasureOperations.hxx
index 5a3966ddc..d84b8743c 100644
--- a/src/GEOMImpl/GEOMImpl_IMeasureOperations.hxx
+++ b/src/GEOMImpl/GEOMImpl_IMeasureOperations.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _GEOMImpl_IMeasureOperations_HXX_
 #define _GEOMImpl_IMeasureOperations_HXX_
diff --git a/src/GEOMImpl/GEOMImpl_IMirror.hxx b/src/GEOMImpl/GEOMImpl_IMirror.hxx
index ac02c4398..569f95f96 100644
--- a/src/GEOMImpl/GEOMImpl_IMirror.hxx
+++ b/src/GEOMImpl/GEOMImpl_IMirror.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_IOffset.hxx b/src/GEOMImpl/GEOMImpl_IOffset.hxx
index 2a2018254..f70a2a1d2 100644
--- a/src/GEOMImpl/GEOMImpl_IOffset.hxx
+++ b/src/GEOMImpl/GEOMImpl_IOffset.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_IPartition.hxx b/src/GEOMImpl/GEOMImpl_IPartition.hxx
index b027cb7ed..ae2dd72be 100644
--- a/src/GEOMImpl/GEOMImpl_IPartition.hxx
+++ b/src/GEOMImpl/GEOMImpl_IPartition.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_IPipe.hxx b/src/GEOMImpl/GEOMImpl_IPipe.hxx
index 3e22d42fb..fe349157a 100644
--- a/src/GEOMImpl/GEOMImpl_IPipe.hxx
+++ b/src/GEOMImpl/GEOMImpl_IPipe.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_IPipeBiNormal.hxx b/src/GEOMImpl/GEOMImpl_IPipeBiNormal.hxx
index 4d6daf576..14a86dba0 100644
--- a/src/GEOMImpl/GEOMImpl_IPipeBiNormal.hxx
+++ b/src/GEOMImpl/GEOMImpl_IPipeBiNormal.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMImpl/GEOMImpl_IPipeDiffSect.hxx b/src/GEOMImpl/GEOMImpl_IPipeDiffSect.hxx
index 1963c1c9f..dbdb52601 100644
--- a/src/GEOMImpl/GEOMImpl_IPipeDiffSect.hxx
+++ b/src/GEOMImpl/GEOMImpl_IPipeDiffSect.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_IPipeShellSect.hxx b/src/GEOMImpl/GEOMImpl_IPipeShellSect.hxx
index 9c2fe810a..0b3f35fd4 100644
--- a/src/GEOMImpl/GEOMImpl_IPipeShellSect.hxx
+++ b/src/GEOMImpl/GEOMImpl_IPipeShellSect.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMImpl/GEOMImpl_IPipeTShape.hxx b/src/GEOMImpl/GEOMImpl_IPipeTShape.hxx
index bbb55b574..8048d0313 100644
--- a/src/GEOMImpl/GEOMImpl_IPipeTShape.hxx
+++ b/src/GEOMImpl/GEOMImpl_IPipeTShape.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMImpl/GEOMImpl_IPlane.hxx b/src/GEOMImpl/GEOMImpl_IPlane.hxx
index 22b93efc6..ebdca4a7b 100644
--- a/src/GEOMImpl/GEOMImpl_IPlane.hxx
+++ b/src/GEOMImpl/GEOMImpl_IPlane.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_IPoint.hxx b/src/GEOMImpl/GEOMImpl_IPoint.hxx
index 7e633fbe0..85267e0ec 100755
--- a/src/GEOMImpl/GEOMImpl_IPoint.hxx
+++ b/src/GEOMImpl/GEOMImpl_IPoint.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_IPolyline.hxx b/src/GEOMImpl/GEOMImpl_IPolyline.hxx
index f39ae5db5..3375e8721 100644
--- a/src/GEOMImpl/GEOMImpl_IPolyline.hxx
+++ b/src/GEOMImpl/GEOMImpl_IPolyline.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_IPosition.hxx b/src/GEOMImpl/GEOMImpl_IPosition.hxx
index edd31257a..ccfc0505b 100644
--- a/src/GEOMImpl/GEOMImpl_IPosition.hxx
+++ b/src/GEOMImpl/GEOMImpl_IPosition.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_IPrism.hxx b/src/GEOMImpl/GEOMImpl_IPrism.hxx
index fafa69514..0e28b29ac 100644
--- a/src/GEOMImpl/GEOMImpl_IPrism.hxx
+++ b/src/GEOMImpl/GEOMImpl_IPrism.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_IRevolution.hxx b/src/GEOMImpl/GEOMImpl_IRevolution.hxx
index b69289cbf..ffca037bb 100644
--- a/src/GEOMImpl/GEOMImpl_IRevolution.hxx
+++ b/src/GEOMImpl/GEOMImpl_IRevolution.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_IRotate.hxx b/src/GEOMImpl/GEOMImpl_IRotate.hxx
index c157b9363..cbe19f34a 100644
--- a/src/GEOMImpl/GEOMImpl_IRotate.hxx
+++ b/src/GEOMImpl/GEOMImpl_IRotate.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_IScale.hxx b/src/GEOMImpl/GEOMImpl_IScale.hxx
index c46b2ed0c..54731b8bf 100644
--- a/src/GEOMImpl/GEOMImpl_IScale.hxx
+++ b/src/GEOMImpl/GEOMImpl_IScale.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_IShapes.hxx b/src/GEOMImpl/GEOMImpl_IShapes.hxx
index e11bbd0a1..e3238cb79 100644
--- a/src/GEOMImpl/GEOMImpl_IShapes.hxx
+++ b/src/GEOMImpl/GEOMImpl_IShapes.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx b/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx
index a81ba2464..01cd12806 100644
--- a/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx
+++ b/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 //  File      : GEOMImpl_IShapesOperations.cxx
 //  Created   :
diff --git a/src/GEOMImpl/GEOMImpl_IShapesOperations.hxx b/src/GEOMImpl/GEOMImpl_IShapesOperations.hxx
index e483b524f..93971ff83 100644
--- a/src/GEOMImpl/GEOMImpl_IShapesOperations.hxx
+++ b/src/GEOMImpl/GEOMImpl_IShapesOperations.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_ISketcher.hxx b/src/GEOMImpl/GEOMImpl_ISketcher.hxx
index 70843d3e0..0918083a5 100644
--- a/src/GEOMImpl/GEOMImpl_ISketcher.hxx
+++ b/src/GEOMImpl/GEOMImpl_ISketcher.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_ISphere.hxx b/src/GEOMImpl/GEOMImpl_ISphere.hxx
index edd66fd26..d5bcf07ee 100644
--- a/src/GEOMImpl/GEOMImpl_ISphere.hxx
+++ b/src/GEOMImpl/GEOMImpl_ISphere.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_ISpline.hxx b/src/GEOMImpl/GEOMImpl_ISpline.hxx
index 09ab46494..b20a7e6dc 100644
--- a/src/GEOMImpl/GEOMImpl_ISpline.hxx
+++ b/src/GEOMImpl/GEOMImpl_ISpline.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_IThruSections.hxx b/src/GEOMImpl/GEOMImpl_IThruSections.hxx
index 0ff4d8fc9..b78157131 100644
--- a/src/GEOMImpl/GEOMImpl_IThruSections.hxx
+++ b/src/GEOMImpl/GEOMImpl_IThruSections.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_ITorus.hxx b/src/GEOMImpl/GEOMImpl_ITorus.hxx
index 98499c44d..3c0c7b212 100644
--- a/src/GEOMImpl/GEOMImpl_ITorus.hxx
+++ b/src/GEOMImpl/GEOMImpl_ITorus.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_ITransformOperations.cxx b/src/GEOMImpl/GEOMImpl_ITransformOperations.cxx
index 3e8134ecd..07098c561 100644
--- a/src/GEOMImpl/GEOMImpl_ITransformOperations.cxx
+++ b/src/GEOMImpl/GEOMImpl_ITransformOperations.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include <Standard_Stream.hxx>
 
diff --git a/src/GEOMImpl/GEOMImpl_ITransformOperations.hxx b/src/GEOMImpl/GEOMImpl_ITransformOperations.hxx
index 6dcc32c54..270854229 100644
--- a/src/GEOMImpl/GEOMImpl_ITransformOperations.hxx
+++ b/src/GEOMImpl/GEOMImpl_ITransformOperations.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_ITranslate.hxx b/src/GEOMImpl/GEOMImpl_ITranslate.hxx
index 5f16ac6c9..4abbdcc86 100755
--- a/src/GEOMImpl/GEOMImpl_ITranslate.hxx
+++ b/src/GEOMImpl/GEOMImpl_ITranslate.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_IVector.hxx b/src/GEOMImpl/GEOMImpl_IVector.hxx
index a7492997b..02a8dc8a9 100644
--- a/src/GEOMImpl/GEOMImpl_IVector.hxx
+++ b/src/GEOMImpl/GEOMImpl_IVector.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_ImportDriver.cxx b/src/GEOMImpl/GEOMImpl_ImportDriver.cxx
index b81e779cf..ee1495f0e 100644
--- a/src/GEOMImpl/GEOMImpl_ImportDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_ImportDriver.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_ImportDriver.hxx b/src/GEOMImpl/GEOMImpl_ImportDriver.hxx
index 02ea019b5..0c625e05c 100644
--- a/src/GEOMImpl/GEOMImpl_ImportDriver.hxx
+++ b/src/GEOMImpl/GEOMImpl_ImportDriver.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_LineDriver.cxx b/src/GEOMImpl/GEOMImpl_LineDriver.cxx
index aed706d64..0ec1efec4 100644
--- a/src/GEOMImpl/GEOMImpl_LineDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_LineDriver.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_LineDriver.hxx b/src/GEOMImpl/GEOMImpl_LineDriver.hxx
index 7d3d64409..01d24c309 100644
--- a/src/GEOMImpl/GEOMImpl_LineDriver.hxx
+++ b/src/GEOMImpl/GEOMImpl_LineDriver.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_MarkerDriver.cxx b/src/GEOMImpl/GEOMImpl_MarkerDriver.cxx
index 7c26f7b79..25f22d214 100644
--- a/src/GEOMImpl/GEOMImpl_MarkerDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_MarkerDriver.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_MarkerDriver.hxx b/src/GEOMImpl/GEOMImpl_MarkerDriver.hxx
index b81ff9a64..eafcc60ef 100644
--- a/src/GEOMImpl/GEOMImpl_MarkerDriver.hxx
+++ b/src/GEOMImpl/GEOMImpl_MarkerDriver.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_MeasureDriver.cxx b/src/GEOMImpl/GEOMImpl_MeasureDriver.cxx
index cf0181db6..5e014b4eb 100644
--- a/src/GEOMImpl/GEOMImpl_MeasureDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_MeasureDriver.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_MeasureDriver.hxx b/src/GEOMImpl/GEOMImpl_MeasureDriver.hxx
index 1f21b3726..aa49703b1 100644
--- a/src/GEOMImpl/GEOMImpl_MeasureDriver.hxx
+++ b/src/GEOMImpl/GEOMImpl_MeasureDriver.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_MirrorDriver.cxx b/src/GEOMImpl/GEOMImpl_MirrorDriver.cxx
index 0090fa03a..3c08295b9 100644
--- a/src/GEOMImpl/GEOMImpl_MirrorDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_MirrorDriver.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_MirrorDriver.hxx b/src/GEOMImpl/GEOMImpl_MirrorDriver.hxx
index 4df7d2d64..c9d7cf497 100644
--- a/src/GEOMImpl/GEOMImpl_MirrorDriver.hxx
+++ b/src/GEOMImpl/GEOMImpl_MirrorDriver.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_OffsetDriver.cxx b/src/GEOMImpl/GEOMImpl_OffsetDriver.cxx
index 944f18f27..7bcf8af96 100644
--- a/src/GEOMImpl/GEOMImpl_OffsetDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_OffsetDriver.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_OffsetDriver.hxx b/src/GEOMImpl/GEOMImpl_OffsetDriver.hxx
index 8b0ab7217..3d9c2974e 100644
--- a/src/GEOMImpl/GEOMImpl_OffsetDriver.hxx
+++ b/src/GEOMImpl/GEOMImpl_OffsetDriver.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_PartitionDriver.cxx b/src/GEOMImpl/GEOMImpl_PartitionDriver.cxx
index c91c65b52..703735b22 100644
--- a/src/GEOMImpl/GEOMImpl_PartitionDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_PartitionDriver.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_PartitionDriver.hxx b/src/GEOMImpl/GEOMImpl_PartitionDriver.hxx
index f5f7ac0f6..10b250455 100644
--- a/src/GEOMImpl/GEOMImpl_PartitionDriver.hxx
+++ b/src/GEOMImpl/GEOMImpl_PartitionDriver.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_PipeDriver.cxx b/src/GEOMImpl/GEOMImpl_PipeDriver.cxx
index 2a5bcadca..05081feb5 100644
--- a/src/GEOMImpl/GEOMImpl_PipeDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_PipeDriver.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include <Standard_Stream.hxx>
 
diff --git a/src/GEOMImpl/GEOMImpl_PipeDriver.hxx b/src/GEOMImpl/GEOMImpl_PipeDriver.hxx
index 2ff074fe6..829072875 100644
--- a/src/GEOMImpl/GEOMImpl_PipeDriver.hxx
+++ b/src/GEOMImpl/GEOMImpl_PipeDriver.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_PipeTShapeDriver.cxx b/src/GEOMImpl/GEOMImpl_PipeTShapeDriver.cxx
index 7e20b90c4..025042282 100644
--- a/src/GEOMImpl/GEOMImpl_PipeTShapeDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_PipeTShapeDriver.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMImpl/GEOMImpl_PipeTShapeDriver.hxx b/src/GEOMImpl/GEOMImpl_PipeTShapeDriver.hxx
index deb39d2c7..90d8f35ec 100644
--- a/src/GEOMImpl/GEOMImpl_PipeTShapeDriver.hxx
+++ b/src/GEOMImpl/GEOMImpl_PipeTShapeDriver.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMImpl/GEOMImpl_PlaneDriver.cxx b/src/GEOMImpl/GEOMImpl_PlaneDriver.cxx
index 6549eb316..e1968567b 100644
--- a/src/GEOMImpl/GEOMImpl_PlaneDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_PlaneDriver.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include <Standard_Stream.hxx>
 
diff --git a/src/GEOMImpl/GEOMImpl_PlaneDriver.hxx b/src/GEOMImpl/GEOMImpl_PlaneDriver.hxx
index 6da09fd2e..c5cc4678e 100644
--- a/src/GEOMImpl/GEOMImpl_PlaneDriver.hxx
+++ b/src/GEOMImpl/GEOMImpl_PlaneDriver.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_PointDriver.cxx b/src/GEOMImpl/GEOMImpl_PointDriver.cxx
index 6fe35c0ee..b25807bd0 100644
--- a/src/GEOMImpl/GEOMImpl_PointDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_PointDriver.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_PointDriver.hxx b/src/GEOMImpl/GEOMImpl_PointDriver.hxx
index f20f55694..44841b5e2 100644
--- a/src/GEOMImpl/GEOMImpl_PointDriver.hxx
+++ b/src/GEOMImpl/GEOMImpl_PointDriver.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_PolylineDriver.cxx b/src/GEOMImpl/GEOMImpl_PolylineDriver.cxx
index 054e2dd13..abeac9b21 100644
--- a/src/GEOMImpl/GEOMImpl_PolylineDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_PolylineDriver.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_PolylineDriver.hxx b/src/GEOMImpl/GEOMImpl_PolylineDriver.hxx
index 4e66ec46f..690c9489d 100644
--- a/src/GEOMImpl/GEOMImpl_PolylineDriver.hxx
+++ b/src/GEOMImpl/GEOMImpl_PolylineDriver.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_PositionDriver.cxx b/src/GEOMImpl/GEOMImpl_PositionDriver.cxx
index cd2d34473..be11e7dbb 100644
--- a/src/GEOMImpl/GEOMImpl_PositionDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_PositionDriver.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_PositionDriver.hxx b/src/GEOMImpl/GEOMImpl_PositionDriver.hxx
index 5216874e6..debb73126 100644
--- a/src/GEOMImpl/GEOMImpl_PositionDriver.hxx
+++ b/src/GEOMImpl/GEOMImpl_PositionDriver.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_PrismDriver.cxx b/src/GEOMImpl/GEOMImpl_PrismDriver.cxx
index b827850ab..5a21f3b06 100644
--- a/src/GEOMImpl/GEOMImpl_PrismDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_PrismDriver.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_PrismDriver.hxx b/src/GEOMImpl/GEOMImpl_PrismDriver.hxx
index a1f8d4dcc..b7adffaf3 100644
--- a/src/GEOMImpl/GEOMImpl_PrismDriver.hxx
+++ b/src/GEOMImpl/GEOMImpl_PrismDriver.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_ProjectionDriver.cxx b/src/GEOMImpl/GEOMImpl_ProjectionDriver.cxx
index 7d54ebca8..f96171b1d 100644
--- a/src/GEOMImpl/GEOMImpl_ProjectionDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_ProjectionDriver.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_ProjectionDriver.hxx b/src/GEOMImpl/GEOMImpl_ProjectionDriver.hxx
index 803979d1a..5243d47ad 100644
--- a/src/GEOMImpl/GEOMImpl_ProjectionDriver.hxx
+++ b/src/GEOMImpl/GEOMImpl_ProjectionDriver.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_RevolutionDriver.cxx b/src/GEOMImpl/GEOMImpl_RevolutionDriver.cxx
index 1f00dc0db..ea72dd7c3 100644
--- a/src/GEOMImpl/GEOMImpl_RevolutionDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_RevolutionDriver.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_RevolutionDriver.hxx b/src/GEOMImpl/GEOMImpl_RevolutionDriver.hxx
index 3387e305f..35d392778 100644
--- a/src/GEOMImpl/GEOMImpl_RevolutionDriver.hxx
+++ b/src/GEOMImpl/GEOMImpl_RevolutionDriver.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_RotateDriver.cxx b/src/GEOMImpl/GEOMImpl_RotateDriver.cxx
index b77ce06da..9f1e3035b 100644
--- a/src/GEOMImpl/GEOMImpl_RotateDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_RotateDriver.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include <Standard_Stream.hxx>
 
diff --git a/src/GEOMImpl/GEOMImpl_RotateDriver.hxx b/src/GEOMImpl/GEOMImpl_RotateDriver.hxx
index 5da91d516..c770afd6c 100644
--- a/src/GEOMImpl/GEOMImpl_RotateDriver.hxx
+++ b/src/GEOMImpl/GEOMImpl_RotateDriver.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_ScaleDriver.cxx b/src/GEOMImpl/GEOMImpl_ScaleDriver.cxx
index 10250b771..bf211f710 100644
--- a/src/GEOMImpl/GEOMImpl_ScaleDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_ScaleDriver.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include <Standard_Stream.hxx>
 
diff --git a/src/GEOMImpl/GEOMImpl_ScaleDriver.hxx b/src/GEOMImpl/GEOMImpl_ScaleDriver.hxx
index 9875b529c..b71827c74 100644
--- a/src/GEOMImpl/GEOMImpl_ScaleDriver.hxx
+++ b/src/GEOMImpl/GEOMImpl_ScaleDriver.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_ShapeDriver.cxx b/src/GEOMImpl/GEOMImpl_ShapeDriver.cxx
index f538cd337..c05db9fc1 100644
--- a/src/GEOMImpl/GEOMImpl_ShapeDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_ShapeDriver.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include <GEOMImpl_ShapeDriver.hxx>
 
diff --git a/src/GEOMImpl/GEOMImpl_ShapeDriver.hxx b/src/GEOMImpl/GEOMImpl_ShapeDriver.hxx
index a63a297b8..41c0fd6ae 100644
--- a/src/GEOMImpl/GEOMImpl_ShapeDriver.hxx
+++ b/src/GEOMImpl/GEOMImpl_ShapeDriver.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_SketcherDriver.cxx b/src/GEOMImpl/GEOMImpl_SketcherDriver.cxx
index 95605cb8f..70e627719 100644
--- a/src/GEOMImpl/GEOMImpl_SketcherDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_SketcherDriver.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_SketcherDriver.hxx b/src/GEOMImpl/GEOMImpl_SketcherDriver.hxx
index 63bf2de9f..13acfcbeb 100644
--- a/src/GEOMImpl/GEOMImpl_SketcherDriver.hxx
+++ b/src/GEOMImpl/GEOMImpl_SketcherDriver.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_SphereDriver.cxx b/src/GEOMImpl/GEOMImpl_SphereDriver.cxx
index 40f45a266..daacff0ac 100644
--- a/src/GEOMImpl/GEOMImpl_SphereDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_SphereDriver.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_SphereDriver.hxx b/src/GEOMImpl/GEOMImpl_SphereDriver.hxx
index b10dec319..8e7f66c40 100644
--- a/src/GEOMImpl/GEOMImpl_SphereDriver.hxx
+++ b/src/GEOMImpl/GEOMImpl_SphereDriver.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_SplineDriver.cxx b/src/GEOMImpl/GEOMImpl_SplineDriver.cxx
index 457c70ae9..c87cdbc09 100644
--- a/src/GEOMImpl/GEOMImpl_SplineDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_SplineDriver.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_SplineDriver.hxx b/src/GEOMImpl/GEOMImpl_SplineDriver.hxx
index 58e891732..28202814a 100644
--- a/src/GEOMImpl/GEOMImpl_SplineDriver.hxx
+++ b/src/GEOMImpl/GEOMImpl_SplineDriver.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_ThruSectionsDriver.cxx b/src/GEOMImpl/GEOMImpl_ThruSectionsDriver.cxx
index ce41d5ec1..2ea0ccd27 100644
--- a/src/GEOMImpl/GEOMImpl_ThruSectionsDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_ThruSectionsDriver.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_ThruSectionsDriver.hxx b/src/GEOMImpl/GEOMImpl_ThruSectionsDriver.hxx
index 65bfb87b3..d750b63ff 100644
--- a/src/GEOMImpl/GEOMImpl_ThruSectionsDriver.hxx
+++ b/src/GEOMImpl/GEOMImpl_ThruSectionsDriver.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_TorusDriver.cxx b/src/GEOMImpl/GEOMImpl_TorusDriver.cxx
index af1bca662..434135a84 100644
--- a/src/GEOMImpl/GEOMImpl_TorusDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_TorusDriver.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_TorusDriver.hxx b/src/GEOMImpl/GEOMImpl_TorusDriver.hxx
index 0a5c404a8..a3947304d 100644
--- a/src/GEOMImpl/GEOMImpl_TorusDriver.hxx
+++ b/src/GEOMImpl/GEOMImpl_TorusDriver.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_TranslateDriver.cxx b/src/GEOMImpl/GEOMImpl_TranslateDriver.cxx
index 2e8ec8c0a..575cbaea9 100644
--- a/src/GEOMImpl/GEOMImpl_TranslateDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_TranslateDriver.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_TranslateDriver.hxx b/src/GEOMImpl/GEOMImpl_TranslateDriver.hxx
index ae5d151dd..687f21925 100644
--- a/src/GEOMImpl/GEOMImpl_TranslateDriver.hxx
+++ b/src/GEOMImpl/GEOMImpl_TranslateDriver.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOMImpl_Types.hxx b/src/GEOMImpl/GEOMImpl_Types.hxx
index 6b61e8899..a18cd853c 100755
--- a/src/GEOMImpl/GEOMImpl_Types.hxx
+++ b/src/GEOMImpl/GEOMImpl_Types.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 
 // GEOM_Object types
diff --git a/src/GEOMImpl/GEOMImpl_VectorDriver.cxx b/src/GEOMImpl/GEOMImpl_VectorDriver.cxx
index df75e4241..8e8cd9705 100644
--- a/src/GEOMImpl/GEOMImpl_VectorDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_VectorDriver.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include <Standard_Stream.hxx>
 
diff --git a/src/GEOMImpl/GEOMImpl_VectorDriver.hxx b/src/GEOMImpl/GEOMImpl_VectorDriver.hxx
index 4fb7b6452..8210bf0d7 100644
--- a/src/GEOMImpl/GEOMImpl_VectorDriver.hxx
+++ b/src/GEOMImpl/GEOMImpl_VectorDriver.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/GEOM_GEOMImpl.hxx b/src/GEOMImpl/GEOM_GEOMImpl.hxx
index 49e6efbe3..413561cbe 100755
--- a/src/GEOMImpl/GEOM_GEOMImpl.hxx
+++ b/src/GEOMImpl/GEOM_GEOMImpl.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMImpl/Makefile.am b/src/GEOMImpl/Makefile.am
index c77071890..dc948c6e9 100644
--- a/src/GEOMImpl/Makefile.am
+++ b/src/GEOMImpl/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -15,6 +15,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
 
 #  GEOM GEOM : implementaion of GEOM_Gen.idl
 #  File   : Makefile.in
diff --git a/src/GEOMToolsGUI/GEOMToolsGUI.cxx b/src/GEOMToolsGUI/GEOMToolsGUI.cxx
index 0234bd4bc..f0acaa34f 100644
--- a/src/GEOMToolsGUI/GEOMToolsGUI.cxx
+++ b/src/GEOMToolsGUI/GEOMToolsGUI.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // GEOM GEOMGUI : GUI for Geometry component
 // File   : GEOMBase_Tools.cxx
diff --git a/src/GEOMToolsGUI/GEOMToolsGUI.h b/src/GEOMToolsGUI/GEOMToolsGUI.h
index e6b80f3cc..4241124f6 100644
--- a/src/GEOMToolsGUI/GEOMToolsGUI.h
+++ b/src/GEOMToolsGUI/GEOMToolsGUI.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMToolsGUI/GEOMToolsGUI.pro b/src/GEOMToolsGUI/GEOMToolsGUI.pro
index 85fc42038..4ce202f75 100644
--- a/src/GEOMToolsGUI/GEOMToolsGUI.pro
+++ b/src/GEOMToolsGUI/GEOMToolsGUI.pro
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx
index 9057a8988..3c801ec66 100644
--- a/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx
+++ b/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 //  GEOM GEOMGUI : GUI for Geometry component
 //  File   : GEOMToolsGUI_1.cxx
diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_DeflectionDlg.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_DeflectionDlg.cxx
index bc9e9ea63..428c91c47 100644
--- a/src/GEOMToolsGUI/GEOMToolsGUI_DeflectionDlg.cxx
+++ b/src/GEOMToolsGUI/GEOMToolsGUI_DeflectionDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_DeflectionDlg.h b/src/GEOMToolsGUI/GEOMToolsGUI_DeflectionDlg.h
index cc17d568b..99778e9a5 100644
--- a/src/GEOMToolsGUI/GEOMToolsGUI_DeflectionDlg.h
+++ b/src/GEOMToolsGUI/GEOMToolsGUI_DeflectionDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_DeleteDlg.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_DeleteDlg.cxx
index e88652ea8..f6e065984 100644
--- a/src/GEOMToolsGUI/GEOMToolsGUI_DeleteDlg.cxx
+++ b/src/GEOMToolsGUI/GEOMToolsGUI_DeleteDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_DeleteDlg.h b/src/GEOMToolsGUI/GEOMToolsGUI_DeleteDlg.h
index e9c7d269f..8db7d4c27 100644
--- a/src/GEOMToolsGUI/GEOMToolsGUI_DeleteDlg.h
+++ b/src/GEOMToolsGUI/GEOMToolsGUI_DeleteDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_LineWidthDlg.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_LineWidthDlg.cxx
index 49c845da2..478cc5710 100644
--- a/src/GEOMToolsGUI/GEOMToolsGUI_LineWidthDlg.cxx
+++ b/src/GEOMToolsGUI/GEOMToolsGUI_LineWidthDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_LineWidthDlg.h b/src/GEOMToolsGUI/GEOMToolsGUI_LineWidthDlg.h
index 09bfe4446..5efa2e25a 100644
--- a/src/GEOMToolsGUI/GEOMToolsGUI_LineWidthDlg.h
+++ b/src/GEOMToolsGUI/GEOMToolsGUI_LineWidthDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.cxx
index 54131a27f..4ba147b78 100644
--- a/src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.cxx
+++ b/src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -15,6 +15,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File   : GEOMToolsGUI_MarkerDlg.cxx
 // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.h b/src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.h
index c07ff8625..b550ee235 100644
--- a/src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.h
+++ b/src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_MaterialPropertiesDlg.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_MaterialPropertiesDlg.cxx
index 3622c8a5c..c82bd4839 100644
--- a/src/GEOMToolsGUI/GEOMToolsGUI_MaterialPropertiesDlg.cxx
+++ b/src/GEOMToolsGUI/GEOMToolsGUI_MaterialPropertiesDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -15,6 +15,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File   : GEOMToolsGUI_MaterialPropertiesDlg.cxx
 // Author : Margarita KARPUNINA, Open CASCADE S.A.S. (margarita.karpunina@opencascade.com)
diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_MaterialPropertiesDlg.h b/src/GEOMToolsGUI/GEOMToolsGUI_MaterialPropertiesDlg.h
index edaf28761..e53a029e6 100644
--- a/src/GEOMToolsGUI/GEOMToolsGUI_MaterialPropertiesDlg.h
+++ b/src/GEOMToolsGUI/GEOMToolsGUI_MaterialPropertiesDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_NbIsosDlg.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_NbIsosDlg.cxx
index 62bea0e9b..3e8b8ec1d 100644
--- a/src/GEOMToolsGUI/GEOMToolsGUI_NbIsosDlg.cxx
+++ b/src/GEOMToolsGUI/GEOMToolsGUI_NbIsosDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_NbIsosDlg.h b/src/GEOMToolsGUI/GEOMToolsGUI_NbIsosDlg.h
index afd34467c..5ee0c90fa 100644
--- a/src/GEOMToolsGUI/GEOMToolsGUI_NbIsosDlg.h
+++ b/src/GEOMToolsGUI/GEOMToolsGUI_NbIsosDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_PublishDlg.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_PublishDlg.cxx
index e0c6180d8..5d16cbe7b 100644
--- a/src/GEOMToolsGUI/GEOMToolsGUI_PublishDlg.cxx
+++ b/src/GEOMToolsGUI/GEOMToolsGUI_PublishDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_PublishDlg.h b/src/GEOMToolsGUI/GEOMToolsGUI_PublishDlg.h
index 3cd2dfd68..65d460d69 100644
--- a/src/GEOMToolsGUI/GEOMToolsGUI_PublishDlg.h
+++ b/src/GEOMToolsGUI/GEOMToolsGUI_PublishDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.cxx
index 2de71038a..3bcbc16ea 100644
--- a/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.cxx
+++ b/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.h b/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.h
index dbda18deb..8a3debd2c 100644
--- a/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.h
+++ b/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMToolsGUI/GEOM_ToolsGUI.hxx b/src/GEOMToolsGUI/GEOM_ToolsGUI.hxx
index 7eea88108..b35820b28 100755
--- a/src/GEOMToolsGUI/GEOM_ToolsGUI.hxx
+++ b/src/GEOMToolsGUI/GEOM_ToolsGUI.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOMToolsGUI/Makefile.am b/src/GEOMToolsGUI/Makefile.am
index c3a32d6f4..e77822def 100644
--- a/src/GEOMToolsGUI/Makefile.am
+++ b/src/GEOMToolsGUI/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOM_I/GEOM_DumpPython.cc b/src/GEOM_I/GEOM_DumpPython.cc
index 8085eadc3..4661de78e 100644
--- a/src/GEOM_I/GEOM_DumpPython.cc
+++ b/src/GEOM_I/GEOM_DumpPython.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM_I/GEOM_GEOM_I.hxx b/src/GEOM_I/GEOM_GEOM_I.hxx
index 1bec29a56..d57cf9de3 100755
--- a/src/GEOM_I/GEOM_GEOM_I.hxx
+++ b/src/GEOM_I/GEOM_GEOM_I.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM_I/GEOM_Gen_i.cc b/src/GEOM_I/GEOM_Gen_i.cc
index b439d8877..a3184ee93 100644
--- a/src/GEOM_I/GEOM_Gen_i.cc
+++ b/src/GEOM_I/GEOM_Gen_i.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM_I/GEOM_Gen_i.hh b/src/GEOM_I/GEOM_Gen_i.hh
index c82d7e9b8..9e65dea0c 100644
--- a/src/GEOM_I/GEOM_Gen_i.hh
+++ b/src/GEOM_I/GEOM_Gen_i.hh
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM_I/GEOM_I.pro b/src/GEOM_I/GEOM_I.pro
index ee4c702ff..72acbcd55 100644
--- a/src/GEOM_I/GEOM_I.pro
+++ b/src/GEOM_I/GEOM_I.pro
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOM_I/GEOM_I3DPrimOperations_i.cc b/src/GEOM_I/GEOM_I3DPrimOperations_i.cc
index 2175cc50d..76febf836 100644
--- a/src/GEOM_I/GEOM_I3DPrimOperations_i.cc
+++ b/src/GEOM_I/GEOM_I3DPrimOperations_i.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM_I/GEOM_I3DPrimOperations_i.hh b/src/GEOM_I/GEOM_I3DPrimOperations_i.hh
index 3b64361d8..05a748932 100644
--- a/src/GEOM_I/GEOM_I3DPrimOperations_i.hh
+++ b/src/GEOM_I/GEOM_I3DPrimOperations_i.hh
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM_I/GEOM_IAdvancedOperations_i.cc b/src/GEOM_I/GEOM_IAdvancedOperations_i.cc
index bc17d5b32..271c3cecb 100644
--- a/src/GEOM_I/GEOM_IAdvancedOperations_i.cc
+++ b/src/GEOM_I/GEOM_IAdvancedOperations_i.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOM_I/GEOM_IAdvancedOperations_i.hh b/src/GEOM_I/GEOM_IAdvancedOperations_i.hh
index 6d91d86ac..d0d3308c7 100644
--- a/src/GEOM_I/GEOM_IAdvancedOperations_i.hh
+++ b/src/GEOM_I/GEOM_IAdvancedOperations_i.hh
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOM_I/GEOM_IBasicOperations_i.cc b/src/GEOM_I/GEOM_IBasicOperations_i.cc
index 397b25c27..47979c7b0 100644
--- a/src/GEOM_I/GEOM_IBasicOperations_i.cc
+++ b/src/GEOM_I/GEOM_IBasicOperations_i.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM_I/GEOM_IBasicOperations_i.hh b/src/GEOM_I/GEOM_IBasicOperations_i.hh
index 6f29a9a85..841a08221 100644
--- a/src/GEOM_I/GEOM_IBasicOperations_i.hh
+++ b/src/GEOM_I/GEOM_IBasicOperations_i.hh
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM_I/GEOM_IBlocksOperations_i.cc b/src/GEOM_I/GEOM_IBlocksOperations_i.cc
index 9ecf62a22..0c1917d46 100644
--- a/src/GEOM_I/GEOM_IBlocksOperations_i.cc
+++ b/src/GEOM_I/GEOM_IBlocksOperations_i.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM_I/GEOM_IBlocksOperations_i.hh b/src/GEOM_I/GEOM_IBlocksOperations_i.hh
index 7c6ea6ed0..a801a1e7e 100644
--- a/src/GEOM_I/GEOM_IBlocksOperations_i.hh
+++ b/src/GEOM_I/GEOM_IBlocksOperations_i.hh
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM_I/GEOM_IBooleanOperations_i.cc b/src/GEOM_I/GEOM_IBooleanOperations_i.cc
index b5de528b0..d6ae76235 100644
--- a/src/GEOM_I/GEOM_IBooleanOperations_i.cc
+++ b/src/GEOM_I/GEOM_IBooleanOperations_i.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM_I/GEOM_IBooleanOperations_i.hh b/src/GEOM_I/GEOM_IBooleanOperations_i.hh
index 194536af0..3a31252b7 100644
--- a/src/GEOM_I/GEOM_IBooleanOperations_i.hh
+++ b/src/GEOM_I/GEOM_IBooleanOperations_i.hh
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM_I/GEOM_ICurvesOperations_i.cc b/src/GEOM_I/GEOM_ICurvesOperations_i.cc
index 078950c30..b5109c9bb 100644
--- a/src/GEOM_I/GEOM_ICurvesOperations_i.cc
+++ b/src/GEOM_I/GEOM_ICurvesOperations_i.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM_I/GEOM_ICurvesOperations_i.hh b/src/GEOM_I/GEOM_ICurvesOperations_i.hh
index 31e1eff4f..5fc09cc55 100644
--- a/src/GEOM_I/GEOM_ICurvesOperations_i.hh
+++ b/src/GEOM_I/GEOM_ICurvesOperations_i.hh
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM_I/GEOM_IGroupOperations_i.cc b/src/GEOM_I/GEOM_IGroupOperations_i.cc
index f5911b9de..3a8cef597 100644
--- a/src/GEOM_I/GEOM_IGroupOperations_i.cc
+++ b/src/GEOM_I/GEOM_IGroupOperations_i.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM_I/GEOM_IGroupOperations_i.hh b/src/GEOM_I/GEOM_IGroupOperations_i.hh
index 365be8b18..b3871e0fe 100644
--- a/src/GEOM_I/GEOM_IGroupOperations_i.hh
+++ b/src/GEOM_I/GEOM_IGroupOperations_i.hh
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM_I/GEOM_IHealingOperations_i.cc b/src/GEOM_I/GEOM_IHealingOperations_i.cc
index de555e86a..6926a8e19 100644
--- a/src/GEOM_I/GEOM_IHealingOperations_i.cc
+++ b/src/GEOM_I/GEOM_IHealingOperations_i.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM_I/GEOM_IHealingOperations_i.hh b/src/GEOM_I/GEOM_IHealingOperations_i.hh
index 61dd4cc6b..b7344e9cc 100644
--- a/src/GEOM_I/GEOM_IHealingOperations_i.hh
+++ b/src/GEOM_I/GEOM_IHealingOperations_i.hh
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM_I/GEOM_IInsertOperations_i.cc b/src/GEOM_I/GEOM_IInsertOperations_i.cc
index 406a2a3b8..e27a6876b 100644
--- a/src/GEOM_I/GEOM_IInsertOperations_i.cc
+++ b/src/GEOM_I/GEOM_IInsertOperations_i.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifdef WNT
 #pragma warning( disable:4786 )
diff --git a/src/GEOM_I/GEOM_IInsertOperations_i.hh b/src/GEOM_I/GEOM_IInsertOperations_i.hh
index 5326b8dc3..a7f8cf1dd 100644
--- a/src/GEOM_I/GEOM_IInsertOperations_i.hh
+++ b/src/GEOM_I/GEOM_IInsertOperations_i.hh
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _GEOM_IInsertOperations_i_HeaderFile
 #define _GEOM_IInsertOperations_i_HeaderFile
diff --git a/src/GEOM_I/GEOM_ILocalOperations_i.cc b/src/GEOM_I/GEOM_ILocalOperations_i.cc
index 989271011..ec764c2be 100644
--- a/src/GEOM_I/GEOM_ILocalOperations_i.cc
+++ b/src/GEOM_I/GEOM_ILocalOperations_i.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM_I/GEOM_ILocalOperations_i.hh b/src/GEOM_I/GEOM_ILocalOperations_i.hh
index dfcda451d..432f56ffc 100644
--- a/src/GEOM_I/GEOM_ILocalOperations_i.hh
+++ b/src/GEOM_I/GEOM_ILocalOperations_i.hh
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM_I/GEOM_IMeasureOperations_i.cc b/src/GEOM_I/GEOM_IMeasureOperations_i.cc
index 80126995a..ffbdcd5d4 100644
--- a/src/GEOM_I/GEOM_IMeasureOperations_i.cc
+++ b/src/GEOM_I/GEOM_IMeasureOperations_i.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include <Standard_Stream.hxx>
 
diff --git a/src/GEOM_I/GEOM_IMeasureOperations_i.hh b/src/GEOM_I/GEOM_IMeasureOperations_i.hh
index 344a9def0..4534dc45e 100644
--- a/src/GEOM_I/GEOM_IMeasureOperations_i.hh
+++ b/src/GEOM_I/GEOM_IMeasureOperations_i.hh
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _GEOM_IMeasureOperations_i_HeaderFile
 #define _GEOM_IMeasureOperations_i_HeaderFile
diff --git a/src/GEOM_I/GEOM_IOperations_i.cc b/src/GEOM_I/GEOM_IOperations_i.cc
index 2da985594..b56c32942 100644
--- a/src/GEOM_I/GEOM_IOperations_i.cc
+++ b/src/GEOM_I/GEOM_IOperations_i.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM_I/GEOM_IOperations_i.hh b/src/GEOM_I/GEOM_IOperations_i.hh
index 63fe191a6..dc45fffa3 100644
--- a/src/GEOM_I/GEOM_IOperations_i.hh
+++ b/src/GEOM_I/GEOM_IOperations_i.hh
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM_I/GEOM_IShapesOperations_i.cc b/src/GEOM_I/GEOM_IShapesOperations_i.cc
index b3a363628..ca40dbf23 100644
--- a/src/GEOM_I/GEOM_IShapesOperations_i.cc
+++ b/src/GEOM_I/GEOM_IShapesOperations_i.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM_I/GEOM_IShapesOperations_i.hh b/src/GEOM_I/GEOM_IShapesOperations_i.hh
index 4b5ad0318..cd1a5756e 100644
--- a/src/GEOM_I/GEOM_IShapesOperations_i.hh
+++ b/src/GEOM_I/GEOM_IShapesOperations_i.hh
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM_I/GEOM_ITransformOperations_i.cc b/src/GEOM_I/GEOM_ITransformOperations_i.cc
index 79659a878..59bc4a293 100644
--- a/src/GEOM_I/GEOM_ITransformOperations_i.cc
+++ b/src/GEOM_I/GEOM_ITransformOperations_i.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM_I/GEOM_ITransformOperations_i.hh b/src/GEOM_I/GEOM_ITransformOperations_i.hh
index 4b0797135..f01f08c22 100644
--- a/src/GEOM_I/GEOM_ITransformOperations_i.hh
+++ b/src/GEOM_I/GEOM_ITransformOperations_i.hh
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM_I/GEOM_Object_i.cc b/src/GEOM_I/GEOM_Object_i.cc
index e18ad60d5..ca0775fd0 100644
--- a/src/GEOM_I/GEOM_Object_i.cc
+++ b/src/GEOM_I/GEOM_Object_i.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM_I/GEOM_Object_i.hh b/src/GEOM_I/GEOM_Object_i.hh
index 29e25abdc..d52baa1c8 100644
--- a/src/GEOM_I/GEOM_Object_i.hh
+++ b/src/GEOM_I/GEOM_Object_i.hh
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM_I/Makefile.am b/src/GEOM_I/Makefile.am
index 62337f46a..e6f4a825c 100644
--- a/src/GEOM_I/Makefile.am
+++ b/src/GEOM_I/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -15,6 +15,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
 
 #  GEOM GEOM : implementaion of GEOM_Gen.idl
 #  File   : Makefile.in
diff --git a/src/GEOM_I_Superv/GEOM_I_Superv.hxx b/src/GEOM_I_Superv/GEOM_I_Superv.hxx
index b13115a87..a32e932bf 100755
--- a/src/GEOM_I_Superv/GEOM_I_Superv.hxx
+++ b/src/GEOM_I_Superv/GEOM_I_Superv.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM_I_Superv/GEOM_List_i.hh b/src/GEOM_I_Superv/GEOM_List_i.hh
index 940f02e9f..39f4e5d71 100644
--- a/src/GEOM_I_Superv/GEOM_List_i.hh
+++ b/src/GEOM_I_Superv/GEOM_List_i.hh
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM_I_Superv/GEOM_Superv_i.cc b/src/GEOM_I_Superv/GEOM_Superv_i.cc
index f650a6e88..e29a8faa9 100644
--- a/src/GEOM_I_Superv/GEOM_Superv_i.cc
+++ b/src/GEOM_I_Superv/GEOM_Superv_i.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM_I_Superv/GEOM_Superv_i.hh b/src/GEOM_I_Superv/GEOM_Superv_i.hh
index 7b3591500..67ccd80dd 100644
--- a/src/GEOM_I_Superv/GEOM_Superv_i.hh
+++ b/src/GEOM_I_Superv/GEOM_Superv_i.hh
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM_I_Superv/Makefile.am b/src/GEOM_I_Superv/Makefile.am
index 1bee76813..2cf693d60 100644
--- a/src/GEOM_I_Superv/Makefile.am
+++ b/src/GEOM_I_Superv/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -15,6 +15,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
 
 #  GEOM GEOM : implementaion of GEOM_Superv.idl
 #  File   : Makefile.in
diff --git a/src/GEOM_PY/Makefile.am b/src/GEOM_PY/Makefile.am
index 5a719cbdc..d22a74031 100644
--- a/src/GEOM_PY/Makefile.am
+++ b/src/GEOM_PY/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOM_PY/__init__.py b/src/GEOM_PY/__init__.py
index a7689e0a4..7d1d2dd2d 100644
--- a/src/GEOM_PY/__init__.py
+++ b/src/GEOM_PY/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOM_PY/geomtools.py b/src/GEOM_PY/geomtools.py
index 3b37982f3..5a2062330 100644
--- a/src/GEOM_PY/geomtools.py
+++ b/src/GEOM_PY/geomtools.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOM_PY/sketcher.py b/src/GEOM_PY/sketcher.py
index 252bf607f..aeba6b43b 100644
--- a/src/GEOM_PY/sketcher.py
+++ b/src/GEOM_PY/sketcher.py
@@ -1,6 +1,6 @@
 # -*- coding: iso-8859-1 -*-
 #
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -18,7 +18,6 @@
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
-# (gboulant - 26/11/2008)
 """
 This module provides the user with a simple python API to realize
 various sketches from the GEOM text user interface.
diff --git a/src/GEOM_PY/structelem/Makefile.am b/src/GEOM_PY/structelem/Makefile.am
index db361c611..de334fe4f 100644
--- a/src/GEOM_PY/structelem/Makefile.am
+++ b/src/GEOM_PY/structelem/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOM_PY/structelem/__init__.py b/src/GEOM_PY/structelem/__init__.py
index 7c0eb4f63..8f90c0002 100644
--- a/src/GEOM_PY/structelem/__init__.py
+++ b/src/GEOM_PY/structelem/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOM_PY/structelem/orientation.py b/src/GEOM_PY/structelem/orientation.py
index 44c9b90f9..7ecae7789 100644
--- a/src/GEOM_PY/structelem/orientation.py
+++ b/src/GEOM_PY/structelem/orientation.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOM_PY/structelem/parts.py b/src/GEOM_PY/structelem/parts.py
index c2acc85c7..9a4ba87b2 100644
--- a/src/GEOM_PY/structelem/parts.py
+++ b/src/GEOM_PY/structelem/parts.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOM_SWIG/GEOM_Nut.py b/src/GEOM_SWIG/GEOM_Nut.py
index aee9826bf..66ff092f3 100755
--- a/src/GEOM_SWIG/GEOM_Nut.py
+++ b/src/GEOM_SWIG/GEOM_Nut.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM_SWIG/GEOM_ObjectInfo.py b/src/GEOM_SWIG/GEOM_ObjectInfo.py
index 5adbe7d71..8678a9de6 100644
--- a/src/GEOM_SWIG/GEOM_ObjectInfo.py
+++ b/src/GEOM_SWIG/GEOM_ObjectInfo.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOM_SWIG/GEOM_Partition1.py b/src/GEOM_SWIG/GEOM_Partition1.py
index 2a65bcd1d..c99748582 100755
--- a/src/GEOM_SWIG/GEOM_Partition1.py
+++ b/src/GEOM_SWIG/GEOM_Partition1.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM_SWIG/GEOM_Partition2.py b/src/GEOM_SWIG/GEOM_Partition2.py
index 3859ec9f7..838693dbb 100755
--- a/src/GEOM_SWIG/GEOM_Partition2.py
+++ b/src/GEOM_SWIG/GEOM_Partition2.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM_SWIG/GEOM_Partition3.py b/src/GEOM_SWIG/GEOM_Partition3.py
index 1cdf3a9ee..7fcbc8019 100755
--- a/src/GEOM_SWIG/GEOM_Partition3.py
+++ b/src/GEOM_SWIG/GEOM_Partition3.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM_SWIG/GEOM_Partition4.py b/src/GEOM_SWIG/GEOM_Partition4.py
index ef67e2c70..b0240a5e7 100755
--- a/src/GEOM_SWIG/GEOM_Partition4.py
+++ b/src/GEOM_SWIG/GEOM_Partition4.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM_SWIG/GEOM_Partition5.py b/src/GEOM_SWIG/GEOM_Partition5.py
index c8e2019f9..8c22f0db4 100755
--- a/src/GEOM_SWIG/GEOM_Partition5.py
+++ b/src/GEOM_SWIG/GEOM_Partition5.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM_SWIG/GEOM_Sketcher.py b/src/GEOM_SWIG/GEOM_Sketcher.py
index 086c38ffb..e67172c27 100644
--- a/src/GEOM_SWIG/GEOM_Sketcher.py
+++ b/src/GEOM_SWIG/GEOM_Sketcher.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM_SWIG/GEOM_Spanner.py b/src/GEOM_SWIG/GEOM_Spanner.py
index ca8bb0b12..05c23aed6 100644
--- a/src/GEOM_SWIG/GEOM_Spanner.py
+++ b/src/GEOM_SWIG/GEOM_Spanner.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM_SWIG/GEOM_TestAll.py b/src/GEOM_SWIG/GEOM_TestAll.py
index ce2bf13eb..3e7c14dc2 100644
--- a/src/GEOM_SWIG/GEOM_TestAll.py
+++ b/src/GEOM_SWIG/GEOM_TestAll.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM_SWIG/GEOM_TestHealing.py b/src/GEOM_SWIG/GEOM_TestHealing.py
index ba0fe67da..6fe6df6c0 100644
--- a/src/GEOM_SWIG/GEOM_TestHealing.py
+++ b/src/GEOM_SWIG/GEOM_TestHealing.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM_SWIG/GEOM_TestMeasures.py b/src/GEOM_SWIG/GEOM_TestMeasures.py
index 14a3f5743..1621f2bf4 100644
--- a/src/GEOM_SWIG/GEOM_TestMeasures.py
+++ b/src/GEOM_SWIG/GEOM_TestMeasures.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
 
 def TestMeasureOperations (geompy, math):
 
diff --git a/src/GEOM_SWIG/GEOM_TestOthers.py b/src/GEOM_SWIG/GEOM_TestOthers.py
index 899743909..e9f0b373d 100644
--- a/src/GEOM_SWIG/GEOM_TestOthers.py
+++ b/src/GEOM_SWIG/GEOM_TestOthers.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM_SWIG/GEOM_blocks.py b/src/GEOM_SWIG/GEOM_blocks.py
index 43995fcdf..3acf5f5fa 100644
--- a/src/GEOM_SWIG/GEOM_blocks.py
+++ b/src/GEOM_SWIG/GEOM_blocks.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM_SWIG/GEOM_cyl2complementary.py b/src/GEOM_SWIG/GEOM_cyl2complementary.py
index 524f170b5..07ff303bb 100755
--- a/src/GEOM_SWIG/GEOM_cyl2complementary.py
+++ b/src/GEOM_SWIG/GEOM_cyl2complementary.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM_SWIG/GEOM_example.py b/src/GEOM_SWIG/GEOM_example.py
index c1daf023d..4e7e6bd97 100644
--- a/src/GEOM_SWIG/GEOM_example.py
+++ b/src/GEOM_SWIG/GEOM_example.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM_SWIG/GEOM_example2.py b/src/GEOM_SWIG/GEOM_example2.py
index 95ecbcdbc..9c18c56cf 100644
--- a/src/GEOM_SWIG/GEOM_example2.py
+++ b/src/GEOM_SWIG/GEOM_example2.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM_SWIG/GEOM_example3.py b/src/GEOM_SWIG/GEOM_example3.py
index c0b20b604..8e8c4b40b 100644
--- a/src/GEOM_SWIG/GEOM_example3.py
+++ b/src/GEOM_SWIG/GEOM_example3.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM_SWIG/GEOM_example4.py b/src/GEOM_SWIG/GEOM_example4.py
index d532e7cb3..701d40b72 100755
--- a/src/GEOM_SWIG/GEOM_example4.py
+++ b/src/GEOM_SWIG/GEOM_example4.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM_SWIG/GEOM_example5.py b/src/GEOM_SWIG/GEOM_example5.py
index c296262bc..4caaeb7ac 100644
--- a/src/GEOM_SWIG/GEOM_example5.py
+++ b/src/GEOM_SWIG/GEOM_example5.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM_SWIG/GEOM_example6.py b/src/GEOM_SWIG/GEOM_example6.py
index 4c51c1ca7..0041e1c4a 100755
--- a/src/GEOM_SWIG/GEOM_example6.py
+++ b/src/GEOM_SWIG/GEOM_example6.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOM_SWIG/GEOM_example7.py b/src/GEOM_SWIG/GEOM_example7.py
index e4795d9ee..fa7179665 100644
--- a/src/GEOM_SWIG/GEOM_example7.py
+++ b/src/GEOM_SWIG/GEOM_example7.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOM_SWIG/GEOM_moteur.py b/src/GEOM_SWIG/GEOM_moteur.py
index 7be19849c..b39172c3a 100644
--- a/src/GEOM_SWIG/GEOM_moteur.py
+++ b/src/GEOM_SWIG/GEOM_moteur.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM_SWIG/GEOM_shared_modules.py b/src/GEOM_SWIG/GEOM_shared_modules.py
index 1713dde24..cd25ebeec 100644
--- a/src/GEOM_SWIG/GEOM_shared_modules.py
+++ b/src/GEOM_SWIG/GEOM_shared_modules.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM_SWIG/GEOM_shellSolid.py b/src/GEOM_SWIG/GEOM_shellSolid.py
index 2d37ca4e6..bc935d538 100755
--- a/src/GEOM_SWIG/GEOM_shellSolid.py
+++ b/src/GEOM_SWIG/GEOM_shellSolid.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM_SWIG/GEOM_tube_geom.py b/src/GEOM_SWIG/GEOM_tube_geom.py
index 2f48d98df..fe81b8419 100755
--- a/src/GEOM_SWIG/GEOM_tube_geom.py
+++ b/src/GEOM_SWIG/GEOM_tube_geom.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM_SWIG/GEOM_tube_geom_gg2.py b/src/GEOM_SWIG/GEOM_tube_geom_gg2.py
index e513a4cbc..ee57b7b6c 100755
--- a/src/GEOM_SWIG/GEOM_tube_geom_gg2.py
+++ b/src/GEOM_SWIG/GEOM_tube_geom_gg2.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM_SWIG/GEOM_usinggeom.py b/src/GEOM_SWIG/GEOM_usinggeom.py
index 4d687a223..5093069d5 100644
--- a/src/GEOM_SWIG/GEOM_usinggeom.py
+++ b/src/GEOM_SWIG/GEOM_usinggeom.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM_SWIG/Makefile.am b/src/GEOM_SWIG/Makefile.am
index a97a7051a..3fe82e1a4 100644
--- a/src/GEOM_SWIG/Makefile.am
+++ b/src/GEOM_SWIG/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOM_SWIG/PAL_MESH_019_020_geometry.py b/src/GEOM_SWIG/PAL_MESH_019_020_geometry.py
index efe494c38..72a71c35e 100755
--- a/src/GEOM_SWIG/PAL_MESH_019_020_geometry.py
+++ b/src/GEOM_SWIG/PAL_MESH_019_020_geometry.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM_SWIG/PAL_MESH_028_geometry.py b/src/GEOM_SWIG/PAL_MESH_028_geometry.py
index af15dbab3..d6815151e 100755
--- a/src/GEOM_SWIG/PAL_MESH_028_geometry.py
+++ b/src/GEOM_SWIG/PAL_MESH_028_geometry.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM_SWIG/PAL_MESH_030_geometry.py b/src/GEOM_SWIG/PAL_MESH_030_geometry.py
index 7425518dd..8480121c3 100755
--- a/src/GEOM_SWIG/PAL_MESH_030_geometry.py
+++ b/src/GEOM_SWIG/PAL_MESH_030_geometry.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM_SWIG/PAL_MESH_033_geometry.py b/src/GEOM_SWIG/PAL_MESH_033_geometry.py
index 570cb1eea..d624639c6 100755
--- a/src/GEOM_SWIG/PAL_MESH_033_geometry.py
+++ b/src/GEOM_SWIG/PAL_MESH_033_geometry.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM_SWIG/PAL_MESH_035_geometry.py b/src/GEOM_SWIG/PAL_MESH_035_geometry.py
index d2e22107e..9b3a28054 100755
--- a/src/GEOM_SWIG/PAL_MESH_035_geometry.py
+++ b/src/GEOM_SWIG/PAL_MESH_035_geometry.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM_SWIG/batchmode_geompy.py b/src/GEOM_SWIG/batchmode_geompy.py
index b386a9fe6..9d45b34ac 100644
--- a/src/GEOM_SWIG/batchmode_geompy.py
+++ b/src/GEOM_SWIG/batchmode_geompy.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM_SWIG/geompy.py b/src/GEOM_SWIG/geompy.py
index 88ea36e4e..13df41063 100644
--- a/src/GEOM_SWIG/geompy.py
+++ b/src/GEOM_SWIG/geompy.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GEOM_SWIG/geompyDC.py b/src/GEOM_SWIG/geompyDC.py
index a7dd223ec..ed2bc507d 100644
--- a/src/GEOM_SWIG/geompyDC.py
+++ b/src/GEOM_SWIG/geompyDC.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOM_SWIG_WITHIHM/Makefile.am b/src/GEOM_SWIG_WITHIHM/Makefile.am
index caa187713..e468bfb0d 100644
--- a/src/GEOM_SWIG_WITHIHM/Makefile.am
+++ b/src/GEOM_SWIG_WITHIHM/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/GEOM_SWIG_WITHIHM/libGEOM_Swig.i b/src/GEOM_SWIG_WITHIHM/libGEOM_Swig.i
index 8c07c985a..fc1b8fea4 100644
--- a/src/GEOM_SWIG_WITHIHM/libGEOM_Swig.i
+++ b/src/GEOM_SWIG_WITHIHM/libGEOM_Swig.i
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/GenerationGUI/GenerationGUI.cxx b/src/GenerationGUI/GenerationGUI.cxx
index 05e33db79..b341a92b0 100644
--- a/src/GenerationGUI/GenerationGUI.cxx
+++ b/src/GenerationGUI/GenerationGUI.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GenerationGUI/GenerationGUI.h b/src/GenerationGUI/GenerationGUI.h
index 36ac53a72..90514bd76 100644
--- a/src/GenerationGUI/GenerationGUI.h
+++ b/src/GenerationGUI/GenerationGUI.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GenerationGUI/GenerationGUI.pro b/src/GenerationGUI/GenerationGUI.pro
index 9f39debe5..c4ac131d8 100644
--- a/src/GenerationGUI/GenerationGUI.pro
+++ b/src/GenerationGUI/GenerationGUI.pro
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/GenerationGUI/GenerationGUI_FillingDlg.cxx b/src/GenerationGUI/GenerationGUI_FillingDlg.cxx
index 670dee884..a33b8d974 100644
--- a/src/GenerationGUI/GenerationGUI_FillingDlg.cxx
+++ b/src/GenerationGUI/GenerationGUI_FillingDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GenerationGUI/GenerationGUI_FillingDlg.h b/src/GenerationGUI/GenerationGUI_FillingDlg.h
index ea0ad0466..b9b02eaf8 100644
--- a/src/GenerationGUI/GenerationGUI_FillingDlg.h
+++ b/src/GenerationGUI/GenerationGUI_FillingDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GenerationGUI/GenerationGUI_PipeDlg.cxx b/src/GenerationGUI/GenerationGUI_PipeDlg.cxx
index e0fe69fbf..42abb189e 100644
--- a/src/GenerationGUI/GenerationGUI_PipeDlg.cxx
+++ b/src/GenerationGUI/GenerationGUI_PipeDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GenerationGUI/GenerationGUI_PipeDlg.h b/src/GenerationGUI/GenerationGUI_PipeDlg.h
index 177cd14e0..eb69a3196 100644
--- a/src/GenerationGUI/GenerationGUI_PipeDlg.h
+++ b/src/GenerationGUI/GenerationGUI_PipeDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GenerationGUI/GenerationGUI_PrismDlg.cxx b/src/GenerationGUI/GenerationGUI_PrismDlg.cxx
index a2b0c5ec7..b5cc5e31a 100644
--- a/src/GenerationGUI/GenerationGUI_PrismDlg.cxx
+++ b/src/GenerationGUI/GenerationGUI_PrismDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GenerationGUI/GenerationGUI_PrismDlg.h b/src/GenerationGUI/GenerationGUI_PrismDlg.h
index b86811278..5b1524517 100644
--- a/src/GenerationGUI/GenerationGUI_PrismDlg.h
+++ b/src/GenerationGUI/GenerationGUI_PrismDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GenerationGUI/GenerationGUI_RevolDlg.cxx b/src/GenerationGUI/GenerationGUI_RevolDlg.cxx
index 7e3d3819f..5e1e3f022 100644
--- a/src/GenerationGUI/GenerationGUI_RevolDlg.cxx
+++ b/src/GenerationGUI/GenerationGUI_RevolDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // GEOM GEOMGUI : GUI for Geometry component
 // File   : GenerationGUI_RevolDlg.cxx
diff --git a/src/GenerationGUI/GenerationGUI_RevolDlg.h b/src/GenerationGUI/GenerationGUI_RevolDlg.h
index eedcbdafb..e39eff4a0 100644
--- a/src/GenerationGUI/GenerationGUI_RevolDlg.h
+++ b/src/GenerationGUI/GenerationGUI_RevolDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GenerationGUI/Makefile.am b/src/GenerationGUI/Makefile.am
index 34d8e4c0f..35afde04d 100644
--- a/src/GenerationGUI/Makefile.am
+++ b/src/GenerationGUI/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/GroupGUI/GroupGUI.cxx b/src/GroupGUI/GroupGUI.cxx
index f7b9f8409..990263407 100644
--- a/src/GroupGUI/GroupGUI.cxx
+++ b/src/GroupGUI/GroupGUI.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GroupGUI/GroupGUI.h b/src/GroupGUI/GroupGUI.h
index 7d0b8d992..8cb96b913 100644
--- a/src/GroupGUI/GroupGUI.h
+++ b/src/GroupGUI/GroupGUI.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GroupGUI/GroupGUI_GroupDlg.cxx b/src/GroupGUI/GroupGUI_GroupDlg.cxx
index d3c7e224a..45ce5dece 100644
--- a/src/GroupGUI/GroupGUI_GroupDlg.cxx
+++ b/src/GroupGUI/GroupGUI_GroupDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 //  GEOM GEOMGUI : GUI for Geometry component
 //  File   : GroupGUI_GroupDlg.cxx
diff --git a/src/GroupGUI/GroupGUI_GroupDlg.h b/src/GroupGUI/GroupGUI_GroupDlg.h
index 49faaa0e0..438f52b10 100644
--- a/src/GroupGUI/GroupGUI_GroupDlg.h
+++ b/src/GroupGUI/GroupGUI_GroupDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/GroupGUI/Makefile.am b/src/GroupGUI/Makefile.am
index 49c452d59..068c3587a 100755
--- a/src/GroupGUI/Makefile.am
+++ b/src/GroupGUI/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/IGESExport/IGESExport.cxx b/src/IGESExport/IGESExport.cxx
index 3315225ad..1349b8a96 100644
--- a/src/IGESExport/IGESExport.cxx
+++ b/src/IGESExport/IGESExport.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File:        IGESExport.cxx
 // Created:     Wed May 19 14:49:45 2004
diff --git a/src/IGESExport/IGESExport.pro b/src/IGESExport/IGESExport.pro
index f7112d826..3b6b758e3 100644
--- a/src/IGESExport/IGESExport.pro
+++ b/src/IGESExport/IGESExport.pro
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/IGESExport/Makefile.am b/src/IGESExport/Makefile.am
index 1836ee606..694aee5b0 100644
--- a/src/IGESExport/Makefile.am
+++ b/src/IGESExport/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/IGESImport/IGESImport.cxx b/src/IGESImport/IGESImport.cxx
index 791e3a2ad..cff70de18 100644
--- a/src/IGESImport/IGESImport.cxx
+++ b/src/IGESImport/IGESImport.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/IGESImport/IGESImport.pro b/src/IGESImport/IGESImport.pro
index 01c9122ec..f38bdf6d4 100644
--- a/src/IGESImport/IGESImport.pro
+++ b/src/IGESImport/IGESImport.pro
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/IGESImport/Makefile.am b/src/IGESImport/Makefile.am
index c6f42b323..b6001bf34 100644
--- a/src/IGESImport/Makefile.am
+++ b/src/IGESImport/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/Makefile.am b/src/Makefile.am
index 7464d1502..795831ae7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -15,6 +15,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
 
 # File    : Makefile.am
 # Author  : Alexander BORODIN, Open CASCADE S.A.S. (alexander.borodin@opencascade.com)
diff --git a/src/Material/Makefile.am b/src/Material/Makefile.am
index 34347a0f1..ae98e6205 100644
--- a/src/Material/Makefile.am
+++ b/src/Material/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/Material/Material.h b/src/Material/Material.h
index 6bf4c0624..c7ec1339d 100644
--- a/src/Material/Material.h
+++ b/src/Material/Material.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/Material/Material_Model.cxx b/src/Material/Material_Model.cxx
index a3fe7c876..4f9655744 100644
--- a/src/Material/Material_Model.cxx
+++ b/src/Material/Material_Model.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/Material/Material_Model.h b/src/Material/Material_Model.h
index 8543e7a5c..a2014a4f0 100644
--- a/src/Material/Material_Model.h
+++ b/src/Material/Material_Model.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/Material/Material_ResourceMgr.cxx b/src/Material/Material_ResourceMgr.cxx
index ccb2cd427..4f23c6d66 100644
--- a/src/Material/Material_ResourceMgr.cxx
+++ b/src/Material/Material_ResourceMgr.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/Material/Material_ResourceMgr.h b/src/Material/Material_ResourceMgr.h
index a78203320..769b74d34 100644
--- a/src/Material/Material_ResourceMgr.h
+++ b/src/Material/Material_ResourceMgr.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/Material/resources/SalomeMaterial.xml b/src/Material/resources/SalomeMaterial.xml
index 9741ce641..4dfa41716 100644
--- a/src/Material/resources/SalomeMaterial.xml
+++ b/src/Material/resources/SalomeMaterial.xml
@@ -1,5 +1,5 @@
 <!--
-  Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+  Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 
   Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
   CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/MeasureGUI/Makefile.am b/src/MeasureGUI/Makefile.am
index 766128d86..8b0541a9a 100644
--- a/src/MeasureGUI/Makefile.am
+++ b/src/MeasureGUI/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -15,6 +15,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
 
 # GEOM MEASUREGUI : 
 # File    : Makefile.am
diff --git a/src/MeasureGUI/MeasureGUI.cxx b/src/MeasureGUI/MeasureGUI.cxx
index 7b21bcb05..e1ddbfcff 100644
--- a/src/MeasureGUI/MeasureGUI.cxx
+++ b/src/MeasureGUI/MeasureGUI.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // GEOM GEOMGUI : GUI for Geometry component
 // File   : MeasureGUI.cxx
diff --git a/src/MeasureGUI/MeasureGUI.h b/src/MeasureGUI/MeasureGUI.h
index d196684f8..ce2aeb277 100644
--- a/src/MeasureGUI/MeasureGUI.h
+++ b/src/MeasureGUI/MeasureGUI.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/MeasureGUI/MeasureGUI_AngleDlg.cxx b/src/MeasureGUI/MeasureGUI_AngleDlg.cxx
index c473dd78d..90a87dcd9 100644
--- a/src/MeasureGUI/MeasureGUI_AngleDlg.cxx
+++ b/src/MeasureGUI/MeasureGUI_AngleDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -15,6 +15,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // GEOM GEOMGUI : GUI for Geometry component
 // File   : MeasureGUI_AngleDlg.cxx
diff --git a/src/MeasureGUI/MeasureGUI_AngleDlg.h b/src/MeasureGUI/MeasureGUI_AngleDlg.h
index bf1eb24c0..fa24fbdda 100644
--- a/src/MeasureGUI/MeasureGUI_AngleDlg.h
+++ b/src/MeasureGUI/MeasureGUI_AngleDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/MeasureGUI/MeasureGUI_BndBoxDlg.cxx b/src/MeasureGUI/MeasureGUI_BndBoxDlg.cxx
index a319b3f1f..3544009ac 100644
--- a/src/MeasureGUI/MeasureGUI_BndBoxDlg.cxx
+++ b/src/MeasureGUI/MeasureGUI_BndBoxDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/MeasureGUI/MeasureGUI_BndBoxDlg.h b/src/MeasureGUI/MeasureGUI_BndBoxDlg.h
index c0b824565..8fd3af034 100644
--- a/src/MeasureGUI/MeasureGUI_BndBoxDlg.h
+++ b/src/MeasureGUI/MeasureGUI_BndBoxDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/MeasureGUI/MeasureGUI_CenterMassDlg.cxx b/src/MeasureGUI/MeasureGUI_CenterMassDlg.cxx
index 534f677db..84676e669 100644
--- a/src/MeasureGUI/MeasureGUI_CenterMassDlg.cxx
+++ b/src/MeasureGUI/MeasureGUI_CenterMassDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/MeasureGUI/MeasureGUI_CenterMassDlg.h b/src/MeasureGUI/MeasureGUI_CenterMassDlg.h
index 5dfce20b2..d3100620e 100644
--- a/src/MeasureGUI/MeasureGUI_CenterMassDlg.h
+++ b/src/MeasureGUI/MeasureGUI_CenterMassDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/MeasureGUI/MeasureGUI_CheckCompoundOfBlocksDlg.cxx b/src/MeasureGUI/MeasureGUI_CheckCompoundOfBlocksDlg.cxx
index 2c8166beb..ac4272130 100644
--- a/src/MeasureGUI/MeasureGUI_CheckCompoundOfBlocksDlg.cxx
+++ b/src/MeasureGUI/MeasureGUI_CheckCompoundOfBlocksDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/MeasureGUI/MeasureGUI_CheckCompoundOfBlocksDlg.h b/src/MeasureGUI/MeasureGUI_CheckCompoundOfBlocksDlg.h
index efee68c60..ddbde0949 100644
--- a/src/MeasureGUI/MeasureGUI_CheckCompoundOfBlocksDlg.h
+++ b/src/MeasureGUI/MeasureGUI_CheckCompoundOfBlocksDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/MeasureGUI/MeasureGUI_CheckSelfIntersectionsDlg.cxx b/src/MeasureGUI/MeasureGUI_CheckSelfIntersectionsDlg.cxx
index 886549598..df12686dd 100644
--- a/src/MeasureGUI/MeasureGUI_CheckSelfIntersectionsDlg.cxx
+++ b/src/MeasureGUI/MeasureGUI_CheckSelfIntersectionsDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // GEOM GEOMGUI : GUI for Geometry component
 // File   : MeasureGUI_CheckSelfIntersectionsDlg.cxx
diff --git a/src/MeasureGUI/MeasureGUI_CheckSelfIntersectionsDlg.h b/src/MeasureGUI/MeasureGUI_CheckSelfIntersectionsDlg.h
index c98ec1365..8671706b3 100644
--- a/src/MeasureGUI/MeasureGUI_CheckSelfIntersectionsDlg.h
+++ b/src/MeasureGUI/MeasureGUI_CheckSelfIntersectionsDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // GEOM GEOMGUI : GUI for Geometry component
 // File   : MeasureGUI_CheckSelfIntersectionsDlg.h
diff --git a/src/MeasureGUI/MeasureGUI_CheckShapeDlg.cxx b/src/MeasureGUI/MeasureGUI_CheckShapeDlg.cxx
index d1bb67f72..7cd562cd7 100644
--- a/src/MeasureGUI/MeasureGUI_CheckShapeDlg.cxx
+++ b/src/MeasureGUI/MeasureGUI_CheckShapeDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/MeasureGUI/MeasureGUI_CheckShapeDlg.h b/src/MeasureGUI/MeasureGUI_CheckShapeDlg.h
index 815a247e4..ebb8ccc70 100644
--- a/src/MeasureGUI/MeasureGUI_CheckShapeDlg.h
+++ b/src/MeasureGUI/MeasureGUI_CheckShapeDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/MeasureGUI/MeasureGUI_DistanceDlg.cxx b/src/MeasureGUI/MeasureGUI_DistanceDlg.cxx
index f3493ec0a..ffd630a9a 100644
--- a/src/MeasureGUI/MeasureGUI_DistanceDlg.cxx
+++ b/src/MeasureGUI/MeasureGUI_DistanceDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/MeasureGUI/MeasureGUI_DistanceDlg.h b/src/MeasureGUI/MeasureGUI_DistanceDlg.h
index f679ac808..2c4e9c56d 100644
--- a/src/MeasureGUI/MeasureGUI_DistanceDlg.h
+++ b/src/MeasureGUI/MeasureGUI_DistanceDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/MeasureGUI/MeasureGUI_InertiaDlg.cxx b/src/MeasureGUI/MeasureGUI_InertiaDlg.cxx
index abd4759a9..389345dd9 100644
--- a/src/MeasureGUI/MeasureGUI_InertiaDlg.cxx
+++ b/src/MeasureGUI/MeasureGUI_InertiaDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/MeasureGUI/MeasureGUI_InertiaDlg.h b/src/MeasureGUI/MeasureGUI_InertiaDlg.h
index f71cb3533..6e57605ab 100644
--- a/src/MeasureGUI/MeasureGUI_InertiaDlg.h
+++ b/src/MeasureGUI/MeasureGUI_InertiaDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/MeasureGUI/MeasureGUI_MaxToleranceDlg.cxx b/src/MeasureGUI/MeasureGUI_MaxToleranceDlg.cxx
index 6f39591b8..a886d9a84 100644
--- a/src/MeasureGUI/MeasureGUI_MaxToleranceDlg.cxx
+++ b/src/MeasureGUI/MeasureGUI_MaxToleranceDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/MeasureGUI/MeasureGUI_MaxToleranceDlg.h b/src/MeasureGUI/MeasureGUI_MaxToleranceDlg.h
index e494cd362..52f764d6e 100644
--- a/src/MeasureGUI/MeasureGUI_MaxToleranceDlg.h
+++ b/src/MeasureGUI/MeasureGUI_MaxToleranceDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/MeasureGUI/MeasureGUI_NormaleDlg.cxx b/src/MeasureGUI/MeasureGUI_NormaleDlg.cxx
index 4b8ab9329..6484ad1f2 100644
--- a/src/MeasureGUI/MeasureGUI_NormaleDlg.cxx
+++ b/src/MeasureGUI/MeasureGUI_NormaleDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/MeasureGUI/MeasureGUI_NormaleDlg.h b/src/MeasureGUI/MeasureGUI_NormaleDlg.h
index 3a3cba8ea..faf262bb7 100644
--- a/src/MeasureGUI/MeasureGUI_NormaleDlg.h
+++ b/src/MeasureGUI/MeasureGUI_NormaleDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/MeasureGUI/MeasureGUI_PointDlg.cxx b/src/MeasureGUI/MeasureGUI_PointDlg.cxx
index 21f515a1a..d68c20512 100644
--- a/src/MeasureGUI/MeasureGUI_PointDlg.cxx
+++ b/src/MeasureGUI/MeasureGUI_PointDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/MeasureGUI/MeasureGUI_PointDlg.h b/src/MeasureGUI/MeasureGUI_PointDlg.h
index c284a7c19..8e43c0292 100644
--- a/src/MeasureGUI/MeasureGUI_PointDlg.h
+++ b/src/MeasureGUI/MeasureGUI_PointDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/MeasureGUI/MeasureGUI_PropertiesDlg.cxx b/src/MeasureGUI/MeasureGUI_PropertiesDlg.cxx
index ec0838f6a..426be51d1 100644
--- a/src/MeasureGUI/MeasureGUI_PropertiesDlg.cxx
+++ b/src/MeasureGUI/MeasureGUI_PropertiesDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/MeasureGUI/MeasureGUI_PropertiesDlg.h b/src/MeasureGUI/MeasureGUI_PropertiesDlg.h
index c937dd339..c8e37fd78 100644
--- a/src/MeasureGUI/MeasureGUI_PropertiesDlg.h
+++ b/src/MeasureGUI/MeasureGUI_PropertiesDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/MeasureGUI/MeasureGUI_Skeleton.cxx b/src/MeasureGUI/MeasureGUI_Skeleton.cxx
index 66a5f36fb..83ca1072c 100644
--- a/src/MeasureGUI/MeasureGUI_Skeleton.cxx
+++ b/src/MeasureGUI/MeasureGUI_Skeleton.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/MeasureGUI/MeasureGUI_Skeleton.h b/src/MeasureGUI/MeasureGUI_Skeleton.h
index 8cb28df26..737732bbd 100644
--- a/src/MeasureGUI/MeasureGUI_Skeleton.h
+++ b/src/MeasureGUI/MeasureGUI_Skeleton.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/MeasureGUI/MeasureGUI_WhatisDlg.cxx b/src/MeasureGUI/MeasureGUI_WhatisDlg.cxx
index 5c615a42f..7c528b4b9 100644
--- a/src/MeasureGUI/MeasureGUI_WhatisDlg.cxx
+++ b/src/MeasureGUI/MeasureGUI_WhatisDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/MeasureGUI/MeasureGUI_WhatisDlg.h b/src/MeasureGUI/MeasureGUI_WhatisDlg.h
index 399769f6d..c5e31ccbd 100644
--- a/src/MeasureGUI/MeasureGUI_WhatisDlg.h
+++ b/src/MeasureGUI/MeasureGUI_WhatisDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/MeasureGUI/MeasureGUI_Widgets.cxx b/src/MeasureGUI/MeasureGUI_Widgets.cxx
index 81cd4bb39..5cb2936fd 100644
--- a/src/MeasureGUI/MeasureGUI_Widgets.cxx
+++ b/src/MeasureGUI/MeasureGUI_Widgets.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/MeasureGUI/MeasureGUI_Widgets.h b/src/MeasureGUI/MeasureGUI_Widgets.h
index cbdf8ffbb..17067d067 100644
--- a/src/MeasureGUI/MeasureGUI_Widgets.h
+++ b/src/MeasureGUI/MeasureGUI_Widgets.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/NMTDS/Handle_NMTDS_DataMapNodeOfDataMapOfIntegerMapOfInteger.hxx b/src/NMTDS/Handle_NMTDS_DataMapNodeOfDataMapOfIntegerMapOfInteger.hxx
index 62796b182..8de3ea25d 100644
--- a/src/NMTDS/Handle_NMTDS_DataMapNodeOfDataMapOfIntegerMapOfInteger.hxx
+++ b/src/NMTDS/Handle_NMTDS_DataMapNodeOfDataMapOfIntegerMapOfInteger.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/NMTDS/Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerIndexedDataMapOfShapeInteger.hxx b/src/NMTDS/Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerIndexedDataMapOfShapeInteger.hxx
index f69f8948c..965b6cfcf 100644
--- a/src/NMTDS/Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerIndexedDataMapOfShapeInteger.hxx
+++ b/src/NMTDS/Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerIndexedDataMapOfShapeInteger.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape.hxx b/src/NMTDS/Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape.hxx
index b57f82fd7..e07627aec 100644
--- a/src/NMTDS/Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape.hxx
+++ b/src/NMTDS/Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere.hxx b/src/NMTDS/Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere.hxx
index e78314cf5..7bac03fc0 100644
--- a/src/NMTDS/Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere.hxx
+++ b/src/NMTDS/Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/NMTDS/Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBox.hxx b/src/NMTDS/Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBox.hxx
index b4d4a6b62..8f35c8719 100644
--- a/src/NMTDS/Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBox.hxx
+++ b/src/NMTDS/Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBox.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/Handle_NMTDS_ListNodeOfListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx b/src/NMTDS/Handle_NMTDS_ListNodeOfListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx
index 630bdb40b..520709f89 100644
--- a/src/NMTDS/Handle_NMTDS_ListNodeOfListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx
+++ b/src/NMTDS/Handle_NMTDS_ListNodeOfListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/Handle_NMTDS_ListNodeOfListOfPair.hxx b/src/NMTDS/Handle_NMTDS_ListNodeOfListOfPair.hxx
index 39d49e534..4262ba849 100644
--- a/src/NMTDS/Handle_NMTDS_ListNodeOfListOfPair.hxx
+++ b/src/NMTDS/Handle_NMTDS_ListNodeOfListOfPair.hxx
@@ -1,23 +1,24 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _Handle_NMTDS_ListNodeOfListOfPair_HeaderFile
 #define _Handle_NMTDS_ListNodeOfListOfPair_HeaderFile
diff --git a/src/NMTDS/Handle_NMTDS_ListNodeOfListOfPairBoolean.hxx b/src/NMTDS/Handle_NMTDS_ListNodeOfListOfPairBoolean.hxx
index bf4025362..3d61c80e2 100644
--- a/src/NMTDS/Handle_NMTDS_ListNodeOfListOfPairBoolean.hxx
+++ b/src/NMTDS/Handle_NMTDS_ListNodeOfListOfPairBoolean.hxx
@@ -1,23 +1,24 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _Handle_NMTDS_ListNodeOfListOfPairBoolean_HeaderFile
 #define _Handle_NMTDS_ListNodeOfListOfPairBoolean_HeaderFile
diff --git a/src/NMTDS/Handle_NMTDS_ListNodeOfListOfPassKey.hxx b/src/NMTDS/Handle_NMTDS_ListNodeOfListOfPassKey.hxx
index ba6f85af8..33d31ff1f 100644
--- a/src/NMTDS/Handle_NMTDS_ListNodeOfListOfPassKey.hxx
+++ b/src/NMTDS/Handle_NMTDS_ListNodeOfListOfPassKey.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/Handle_NMTDS_ListNodeOfListOfPassKeyBoolean.hxx b/src/NMTDS/Handle_NMTDS_ListNodeOfListOfPassKeyBoolean.hxx
index f3846466c..12f0edcf2 100644
--- a/src/NMTDS/Handle_NMTDS_ListNodeOfListOfPassKeyBoolean.hxx
+++ b/src/NMTDS/Handle_NMTDS_ListNodeOfListOfPassKeyBoolean.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/Handle_NMTDS_StdMapNodeOfMapOfPairBoolean.hxx b/src/NMTDS/Handle_NMTDS_StdMapNodeOfMapOfPairBoolean.hxx
index 84112e209..9aaee498a 100644
--- a/src/NMTDS/Handle_NMTDS_StdMapNodeOfMapOfPairBoolean.hxx
+++ b/src/NMTDS/Handle_NMTDS_StdMapNodeOfMapOfPairBoolean.hxx
@@ -1,23 +1,24 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _Handle_NMTDS_StdMapNodeOfMapOfPairBoolean_HeaderFile
 #define _Handle_NMTDS_StdMapNodeOfMapOfPairBoolean_HeaderFile
diff --git a/src/NMTDS/Handle_NMTDS_StdMapNodeOfMapOfPassKey.hxx b/src/NMTDS/Handle_NMTDS_StdMapNodeOfMapOfPassKey.hxx
index b413a219f..927c075aa 100644
--- a/src/NMTDS/Handle_NMTDS_StdMapNodeOfMapOfPassKey.hxx
+++ b/src/NMTDS/Handle_NMTDS_StdMapNodeOfMapOfPassKey.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/Handle_NMTDS_StdMapNodeOfMapOfPassKeyBoolean.hxx b/src/NMTDS/Handle_NMTDS_StdMapNodeOfMapOfPassKeyBoolean.hxx
index 1829b8e4f..8a889dda8 100644
--- a/src/NMTDS/Handle_NMTDS_StdMapNodeOfMapOfPassKeyBoolean.hxx
+++ b/src/NMTDS/Handle_NMTDS_StdMapNodeOfMapOfPassKeyBoolean.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/Makefile.am b/src/NMTDS/Makefile.am
index ecef7e050..b3976a622 100644
--- a/src/NMTDS/Makefile.am
+++ b/src/NMTDS/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -15,6 +15,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
 
 #  GEOM NMTAlgo : partition algorithm
 #  File   : Makefile.in
diff --git a/src/NMTDS/NMTDS.cdl b/src/NMTDS/NMTDS.cdl
index 8e678d405..5845f0ad0 100644
--- a/src/NMTDS/NMTDS.cdl
+++ b/src/NMTDS/NMTDS.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 -- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/NMTDS.pro b/src/NMTDS/NMTDS.pro
index d41ffa6fe..524fa4f29 100644
--- a/src/NMTDS/NMTDS.pro
+++ b/src/NMTDS/NMTDS.pro
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/NMTDS/NMTDS_BndSphere.cdl b/src/NMTDS/NMTDS_BndSphere.cdl
index f60da4932..25a63c885 100644
--- a/src/NMTDS/NMTDS_BndSphere.cdl
+++ b/src/NMTDS/NMTDS_BndSphere.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- This library is free software; you can redistribute it and/or
 -- modify it under the terms of the GNU Lesser General Public
diff --git a/src/NMTDS/NMTDS_BndSphere.cxx b/src/NMTDS/NMTDS_BndSphere.cxx
index af8c0c4d1..f67212dc1 100644
--- a/src/NMTDS/NMTDS_BndSphere.cxx
+++ b/src/NMTDS/NMTDS_BndSphere.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/NMTDS/NMTDS_BndSphere.hxx b/src/NMTDS/NMTDS_BndSphere.hxx
index 7b5e23e6c..2ae2cb390 100644
--- a/src/NMTDS/NMTDS_BndSphere.hxx
+++ b/src/NMTDS/NMTDS_BndSphere.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/NMTDS/NMTDS_BndSphere.ixx b/src/NMTDS/NMTDS_BndSphere.ixx
index 1cf5404e0..fb01dda00 100644
--- a/src/NMTDS/NMTDS_BndSphere.ixx
+++ b/src/NMTDS/NMTDS_BndSphere.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/NMTDS/NMTDS_BndSphere.jxx b/src/NMTDS/NMTDS_BndSphere.jxx
index 699c2a272..00ab43301 100644
--- a/src/NMTDS/NMTDS_BndSphere.jxx
+++ b/src/NMTDS/NMTDS_BndSphere.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/NMTDS/NMTDS_BndSphere.lxx b/src/NMTDS/NMTDS_BndSphere.lxx
index 582e8d290..a7be22637 100644
--- a/src/NMTDS/NMTDS_BndSphere.lxx
+++ b/src/NMTDS/NMTDS_BndSphere.lxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/NMTDS/NMTDS_BndSphereTree.cxx b/src/NMTDS/NMTDS_BndSphereTree.cxx
index f5f810fc4..a6b449ac9 100644
--- a/src/NMTDS/NMTDS_BndSphereTree.cxx
+++ b/src/NMTDS/NMTDS_BndSphereTree.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/NMTDS/NMTDS_BndSphereTree.hxx b/src/NMTDS/NMTDS_BndSphereTree.hxx
index 518745cf7..1721f1dc0 100644
--- a/src/NMTDS/NMTDS_BndSphereTree.hxx
+++ b/src/NMTDS/NMTDS_BndSphereTree.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/NMTDS/NMTDS_BoxBndTree.cxx b/src/NMTDS/NMTDS_BoxBndTree.cxx
index 100d9857c..055007096 100644
--- a/src/NMTDS/NMTDS_BoxBndTree.cxx
+++ b/src/NMTDS/NMTDS_BoxBndTree.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/NMTDS_BoxBndTree.hxx b/src/NMTDS/NMTDS_BoxBndTree.hxx
index 171da43ae..9ab98bb43 100755
--- a/src/NMTDS/NMTDS_BoxBndTree.hxx
+++ b/src/NMTDS/NMTDS_BoxBndTree.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/NMTDS_CArray1OfIndexRange.hxx b/src/NMTDS/NMTDS_CArray1OfIndexRange.hxx
index 78abab26c..8c50b819b 100644
--- a/src/NMTDS/NMTDS_CArray1OfIndexRange.hxx
+++ b/src/NMTDS/NMTDS_CArray1OfIndexRange.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _NMTDS_CArray1OfIndexRange_HeaderFile
 #define _NMTDS_CArray1OfIndexRange_HeaderFile
diff --git a/src/NMTDS/NMTDS_CArray1OfIndexRange_0.cxx b/src/NMTDS/NMTDS_CArray1OfIndexRange_0.cxx
index a9c32d62e..3920609b2 100644
--- a/src/NMTDS/NMTDS_CArray1OfIndexRange_0.cxx
+++ b/src/NMTDS/NMTDS_CArray1OfIndexRange_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/NMTDS_DataMapIteratorOfDataMapOfIntegerMapOfInteger.hxx b/src/NMTDS/NMTDS_DataMapIteratorOfDataMapOfIntegerMapOfInteger.hxx
index 2c1df380d..37c111b84 100644
--- a/src/NMTDS/NMTDS_DataMapIteratorOfDataMapOfIntegerMapOfInteger.hxx
+++ b/src/NMTDS/NMTDS_DataMapIteratorOfDataMapOfIntegerMapOfInteger.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/NMTDS/NMTDS_DataMapIteratorOfDataMapOfIntegerMapOfInteger_0.cxx b/src/NMTDS/NMTDS_DataMapIteratorOfDataMapOfIntegerMapOfInteger_0.cxx
index 7f5ab6964..6b84e611e 100644
--- a/src/NMTDS/NMTDS_DataMapIteratorOfDataMapOfIntegerMapOfInteger_0.cxx
+++ b/src/NMTDS/NMTDS_DataMapIteratorOfDataMapOfIntegerMapOfInteger_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/NMTDS/NMTDS_DataMapNodeOfDataMapOfIntegerMapOfInteger.hxx b/src/NMTDS/NMTDS_DataMapNodeOfDataMapOfIntegerMapOfInteger.hxx
index d31ac8768..8ca3cb1c7 100644
--- a/src/NMTDS/NMTDS_DataMapNodeOfDataMapOfIntegerMapOfInteger.hxx
+++ b/src/NMTDS/NMTDS_DataMapNodeOfDataMapOfIntegerMapOfInteger.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/NMTDS/NMTDS_DataMapNodeOfDataMapOfIntegerMapOfInteger_0.cxx b/src/NMTDS/NMTDS_DataMapNodeOfDataMapOfIntegerMapOfInteger_0.cxx
index 4bdaffb35..ebe774718 100644
--- a/src/NMTDS/NMTDS_DataMapNodeOfDataMapOfIntegerMapOfInteger_0.cxx
+++ b/src/NMTDS/NMTDS_DataMapNodeOfDataMapOfIntegerMapOfInteger_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/NMTDS/NMTDS_DataMapOfIntegerMapOfInteger.hxx b/src/NMTDS/NMTDS_DataMapOfIntegerMapOfInteger.hxx
index 06494e1a3..2b8e12b0d 100644
--- a/src/NMTDS/NMTDS_DataMapOfIntegerMapOfInteger.hxx
+++ b/src/NMTDS/NMTDS_DataMapOfIntegerMapOfInteger.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -15,6 +15,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _NMTDS_DataMapOfIntegerMapOfInteger_HeaderFile
 #define _NMTDS_DataMapOfIntegerMapOfInteger_HeaderFile
diff --git a/src/NMTDS/NMTDS_DataMapOfIntegerMapOfInteger_0.cxx b/src/NMTDS/NMTDS_DataMapOfIntegerMapOfInteger_0.cxx
index 00e94c760..8eec6f6f8 100644
--- a/src/NMTDS/NMTDS_DataMapOfIntegerMapOfInteger_0.cxx
+++ b/src/NMTDS/NMTDS_DataMapOfIntegerMapOfInteger_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/NMTDS/NMTDS_IndexRange.cdl b/src/NMTDS/NMTDS_IndexRange.cdl
index 353eb8b87..9584167eb 100644
--- a/src/NMTDS/NMTDS_IndexRange.cdl
+++ b/src/NMTDS/NMTDS_IndexRange.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 -- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/NMTDS_IndexRange.cxx b/src/NMTDS/NMTDS_IndexRange.cxx
index 798a6dad8..5a6e5a05f 100644
--- a/src/NMTDS/NMTDS_IndexRange.cxx
+++ b/src/NMTDS/NMTDS_IndexRange.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/NMTDS_IndexRange.hxx b/src/NMTDS/NMTDS_IndexRange.hxx
index 2a7a152e2..223277bc9 100644
--- a/src/NMTDS/NMTDS_IndexRange.hxx
+++ b/src/NMTDS/NMTDS_IndexRange.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/NMTDS_IndexRange.ixx b/src/NMTDS/NMTDS_IndexRange.ixx
index 03bdbba36..ad27de88d 100644
--- a/src/NMTDS/NMTDS_IndexRange.ixx
+++ b/src/NMTDS/NMTDS_IndexRange.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/NMTDS_IndexRange.jxx b/src/NMTDS/NMTDS_IndexRange.jxx
index 4a50e2f52..12d5916ef 100644
--- a/src/NMTDS/NMTDS_IndexRange.jxx
+++ b/src/NMTDS/NMTDS_IndexRange.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerIndexedDataMapOfShapeInteger.hxx b/src/NMTDS/NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerIndexedDataMapOfShapeInteger.hxx
index 6b06b3e3b..9d2ab4e81 100644
--- a/src/NMTDS/NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerIndexedDataMapOfShapeInteger.hxx
+++ b/src/NMTDS/NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerIndexedDataMapOfShapeInteger.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerIndexedDataMapOfShapeInteger_0.cxx b/src/NMTDS/NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerIndexedDataMapOfShapeInteger_0.cxx
index 205b8e4d0..e16a95041 100644
--- a/src/NMTDS/NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerIndexedDataMapOfShapeInteger_0.cxx
+++ b/src/NMTDS/NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerIndexedDataMapOfShapeInteger_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape.hxx b/src/NMTDS/NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape.hxx
index 46f885532..8aff27799 100644
--- a/src/NMTDS/NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape.hxx
+++ b/src/NMTDS/NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape_0.cxx b/src/NMTDS/NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape_0.cxx
index ee03aa28c..752ed5342 100644
--- a/src/NMTDS/NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape_0.cxx
+++ b/src/NMTDS/NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere.hxx b/src/NMTDS/NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere.hxx
index ba267a420..1fa4e7f46 100644
--- a/src/NMTDS/NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere.hxx
+++ b/src/NMTDS/NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/NMTDS/NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere_0.cxx b/src/NMTDS/NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere_0.cxx
index 0f53830c6..296bc7d73 100644
--- a/src/NMTDS/NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere_0.cxx
+++ b/src/NMTDS/NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/NMTDS/NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBox.hxx b/src/NMTDS/NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBox.hxx
index e378f9265..6d3d29799 100644
--- a/src/NMTDS/NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBox.hxx
+++ b/src/NMTDS/NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBox.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBox_0.cxx b/src/NMTDS/NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBox_0.cxx
index c12f0e2e7..4cfc11d1c 100644
--- a/src/NMTDS/NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBox_0.cxx
+++ b/src/NMTDS/NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBox_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/NMTDS_IndexedDataMapOfIntegerIndexedDataMapOfShapeInteger.hxx b/src/NMTDS/NMTDS_IndexedDataMapOfIntegerIndexedDataMapOfShapeInteger.hxx
index 6a25d0770..78df45139 100644
--- a/src/NMTDS/NMTDS_IndexedDataMapOfIntegerIndexedDataMapOfShapeInteger.hxx
+++ b/src/NMTDS/NMTDS_IndexedDataMapOfIntegerIndexedDataMapOfShapeInteger.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _NMTDS_IndexedDataMapOfIntegerIndexedDataMapOfShapeInteger_HeaderFile
 #define _NMTDS_IndexedDataMapOfIntegerIndexedDataMapOfShapeInteger_HeaderFile
diff --git a/src/NMTDS/NMTDS_IndexedDataMapOfIntegerIndexedDataMapOfShapeInteger_0.cxx b/src/NMTDS/NMTDS_IndexedDataMapOfIntegerIndexedDataMapOfShapeInteger_0.cxx
index e0ee10027..da098cd29 100644
--- a/src/NMTDS/NMTDS_IndexedDataMapOfIntegerIndexedDataMapOfShapeInteger_0.cxx
+++ b/src/NMTDS/NMTDS_IndexedDataMapOfIntegerIndexedDataMapOfShapeInteger_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/NMTDS_IndexedDataMapOfIntegerShape.hxx b/src/NMTDS/NMTDS_IndexedDataMapOfIntegerShape.hxx
index f4405a215..8c58c5c5a 100644
--- a/src/NMTDS/NMTDS_IndexedDataMapOfIntegerShape.hxx
+++ b/src/NMTDS/NMTDS_IndexedDataMapOfIntegerShape.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _NMTDS_IndexedDataMapOfIntegerShape_HeaderFile
 #define _NMTDS_IndexedDataMapOfIntegerShape_HeaderFile
diff --git a/src/NMTDS/NMTDS_IndexedDataMapOfIntegerShape_0.cxx b/src/NMTDS/NMTDS_IndexedDataMapOfIntegerShape_0.cxx
index cf0b18c57..1e3d33618 100644
--- a/src/NMTDS/NMTDS_IndexedDataMapOfIntegerShape_0.cxx
+++ b/src/NMTDS/NMTDS_IndexedDataMapOfIntegerShape_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/NMTDS_IndexedDataMapOfShapeBndSphere.hxx b/src/NMTDS/NMTDS_IndexedDataMapOfShapeBndSphere.hxx
index db75c3a34..176cabb3c 100644
--- a/src/NMTDS/NMTDS_IndexedDataMapOfShapeBndSphere.hxx
+++ b/src/NMTDS/NMTDS_IndexedDataMapOfShapeBndSphere.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -15,6 +15,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _NMTDS_IndexedDataMapOfShapeBndSphere_HeaderFile
 #define _NMTDS_IndexedDataMapOfShapeBndSphere_HeaderFile
diff --git a/src/NMTDS/NMTDS_IndexedDataMapOfShapeBndSphere_0.cxx b/src/NMTDS/NMTDS_IndexedDataMapOfShapeBndSphere_0.cxx
index e96d9d38d..3ee2d9d75 100644
--- a/src/NMTDS/NMTDS_IndexedDataMapOfShapeBndSphere_0.cxx
+++ b/src/NMTDS/NMTDS_IndexedDataMapOfShapeBndSphere_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/NMTDS/NMTDS_IndexedDataMapOfShapeBox.hxx b/src/NMTDS/NMTDS_IndexedDataMapOfShapeBox.hxx
index 2492f25af..f7a8b9b8a 100644
--- a/src/NMTDS/NMTDS_IndexedDataMapOfShapeBox.hxx
+++ b/src/NMTDS/NMTDS_IndexedDataMapOfShapeBox.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _NMTDS_IndexedDataMapOfShapeBox_HeaderFile
 #define _NMTDS_IndexedDataMapOfShapeBox_HeaderFile
diff --git a/src/NMTDS/NMTDS_IndexedDataMapOfShapeBox_0.cxx b/src/NMTDS/NMTDS_IndexedDataMapOfShapeBox_0.cxx
index b5bfaaa9a..662654d37 100644
--- a/src/NMTDS/NMTDS_IndexedDataMapOfShapeBox_0.cxx
+++ b/src/NMTDS/NMTDS_IndexedDataMapOfShapeBox_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/NMTDS_InterfPool.cdl b/src/NMTDS/NMTDS_InterfPool.cdl
index 188357053..3f009341c 100644
--- a/src/NMTDS/NMTDS_InterfPool.cdl
+++ b/src/NMTDS/NMTDS_InterfPool.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- This library is free software; you can redistribute it and/or
 -- modify it under the terms of the GNU Lesser General Public
diff --git a/src/NMTDS/NMTDS_InterfPool.cxx b/src/NMTDS/NMTDS_InterfPool.cxx
index a4b6132df..945161996 100644
--- a/src/NMTDS/NMTDS_InterfPool.cxx
+++ b/src/NMTDS/NMTDS_InterfPool.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -15,6 +15,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File:        NMTDS_InterfPool.cxx
 // Author:      Peter KURNEV
diff --git a/src/NMTDS/NMTDS_InterfPool.hxx b/src/NMTDS/NMTDS_InterfPool.hxx
index cbb6cded6..f3947ec72 100644
--- a/src/NMTDS/NMTDS_InterfPool.hxx
+++ b/src/NMTDS/NMTDS_InterfPool.hxx
@@ -1,20 +1,21 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _NMTDS_InterfPool_HeaderFile
 #define _NMTDS_InterfPool_HeaderFile
diff --git a/src/NMTDS/NMTDS_InterfPool.ixx b/src/NMTDS/NMTDS_InterfPool.ixx
index c38b19ea8..f47c11b80 100644
--- a/src/NMTDS/NMTDS_InterfPool.ixx
+++ b/src/NMTDS/NMTDS_InterfPool.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/NMTDS/NMTDS_InterfPool.jxx b/src/NMTDS/NMTDS_InterfPool.jxx
index 96e12ff0a..281442164 100644
--- a/src/NMTDS/NMTDS_InterfPool.jxx
+++ b/src/NMTDS/NMTDS_InterfPool.jxx
@@ -1,20 +1,21 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _NMTDS_PairBoolean_HeaderFile
 #include <NMTDS_PairBoolean.hxx>
diff --git a/src/NMTDS/NMTDS_InterfType.hxx b/src/NMTDS/NMTDS_InterfType.hxx
index 145e248a7..b87a71b78 100644
--- a/src/NMTDS/NMTDS_InterfType.hxx
+++ b/src/NMTDS/NMTDS_InterfType.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/NMTDS/NMTDS_Iterator.cdl b/src/NMTDS/NMTDS_Iterator.cdl
index 1a836be17..f19f77aca 100755
--- a/src/NMTDS/NMTDS_Iterator.cdl
+++ b/src/NMTDS/NMTDS_Iterator.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 -- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/NMTDS_Iterator.cxx b/src/NMTDS/NMTDS_Iterator.cxx
index 3db662e57..4bdba644b 100755
--- a/src/NMTDS/NMTDS_Iterator.cxx
+++ b/src/NMTDS/NMTDS_Iterator.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File:        NMTDS_Iterator.cxx
 // Author:      Peter KURNEV
diff --git a/src/NMTDS/NMTDS_Iterator.hxx b/src/NMTDS/NMTDS_Iterator.hxx
index 3dd7fb3f7..8504349d8 100644
--- a/src/NMTDS/NMTDS_Iterator.hxx
+++ b/src/NMTDS/NMTDS_Iterator.hxx
@@ -1,23 +1,24 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _NMTDS_Iterator_HeaderFile
 #define _NMTDS_Iterator_HeaderFile
diff --git a/src/NMTDS/NMTDS_Iterator.ixx b/src/NMTDS/NMTDS_Iterator.ixx
index 7995348dd..f0d0a4a30 100644
--- a/src/NMTDS/NMTDS_Iterator.ixx
+++ b/src/NMTDS/NMTDS_Iterator.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/NMTDS_Iterator.jxx b/src/NMTDS/NMTDS_Iterator.jxx
index b20bc92c2..4dbc61129 100644
--- a/src/NMTDS/NMTDS_Iterator.jxx
+++ b/src/NMTDS/NMTDS_Iterator.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/NMTDS_IteratorCheckerSI.cdl b/src/NMTDS/NMTDS_IteratorCheckerSI.cdl
index 3c3ecb8cb..7f8850e50 100644
--- a/src/NMTDS/NMTDS_IteratorCheckerSI.cdl
+++ b/src/NMTDS/NMTDS_IteratorCheckerSI.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- This library is free software; you can redistribute it and/or
 -- modify it under the terms of the GNU Lesser General Public
diff --git a/src/NMTDS/NMTDS_IteratorCheckerSI.cxx b/src/NMTDS/NMTDS_IteratorCheckerSI.cxx
index 51ce1bb80..92742abc9 100644
--- a/src/NMTDS/NMTDS_IteratorCheckerSI.cxx
+++ b/src/NMTDS/NMTDS_IteratorCheckerSI.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -15,6 +15,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File:        NMTDS_IteratorChecker.cxx
 // Author:      Peter KURNEV
diff --git a/src/NMTDS/NMTDS_IteratorCheckerSI.hxx b/src/NMTDS/NMTDS_IteratorCheckerSI.hxx
index 1b540ffea..eac4a768e 100644
--- a/src/NMTDS/NMTDS_IteratorCheckerSI.hxx
+++ b/src/NMTDS/NMTDS_IteratorCheckerSI.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/NMTDS/NMTDS_IteratorCheckerSI.ixx b/src/NMTDS/NMTDS_IteratorCheckerSI.ixx
index 511621306..8453f5868 100644
--- a/src/NMTDS/NMTDS_IteratorCheckerSI.ixx
+++ b/src/NMTDS/NMTDS_IteratorCheckerSI.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/NMTDS/NMTDS_IteratorCheckerSI.jxx b/src/NMTDS/NMTDS_IteratorCheckerSI.jxx
index 4ab2a09d7..e6a40defa 100644
--- a/src/NMTDS/NMTDS_IteratorCheckerSI.jxx
+++ b/src/NMTDS/NMTDS_IteratorCheckerSI.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/NMTDS/NMTDS_ListIteratorOfListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx b/src/NMTDS/NMTDS_ListIteratorOfListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx
index f91c7fb8e..ffc908677 100644
--- a/src/NMTDS/NMTDS_ListIteratorOfListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx
+++ b/src/NMTDS/NMTDS_ListIteratorOfListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/NMTDS_ListIteratorOfListOfIndexedDataMapOfShapeAncestorsSuccessors_0.cxx b/src/NMTDS/NMTDS_ListIteratorOfListOfIndexedDataMapOfShapeAncestorsSuccessors_0.cxx
index a4e98c39c..83358d4eb 100644
--- a/src/NMTDS/NMTDS_ListIteratorOfListOfIndexedDataMapOfShapeAncestorsSuccessors_0.cxx
+++ b/src/NMTDS/NMTDS_ListIteratorOfListOfIndexedDataMapOfShapeAncestorsSuccessors_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/NMTDS_ListIteratorOfListOfPair.hxx b/src/NMTDS/NMTDS_ListIteratorOfListOfPair.hxx
index cba16cdaa..30f9b9be3 100644
--- a/src/NMTDS/NMTDS_ListIteratorOfListOfPair.hxx
+++ b/src/NMTDS/NMTDS_ListIteratorOfListOfPair.hxx
@@ -1,23 +1,24 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _NMTDS_ListIteratorOfListOfPair_HeaderFile
 #define _NMTDS_ListIteratorOfListOfPair_HeaderFile
diff --git a/src/NMTDS/NMTDS_ListIteratorOfListOfPairBoolean.hxx b/src/NMTDS/NMTDS_ListIteratorOfListOfPairBoolean.hxx
index 97bc01b72..e6b4c566a 100644
--- a/src/NMTDS/NMTDS_ListIteratorOfListOfPairBoolean.hxx
+++ b/src/NMTDS/NMTDS_ListIteratorOfListOfPairBoolean.hxx
@@ -1,23 +1,24 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _NMTDS_ListIteratorOfListOfPairBoolean_HeaderFile
 #define _NMTDS_ListIteratorOfListOfPairBoolean_HeaderFile
diff --git a/src/NMTDS/NMTDS_ListIteratorOfListOfPairBoolean_0.cxx b/src/NMTDS/NMTDS_ListIteratorOfListOfPairBoolean_0.cxx
index f9b27daaa..dc6e2e8b8 100644
--- a/src/NMTDS/NMTDS_ListIteratorOfListOfPairBoolean_0.cxx
+++ b/src/NMTDS/NMTDS_ListIteratorOfListOfPairBoolean_0.cxx
@@ -1,23 +1,24 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include <NMTDS_ListIteratorOfListOfPairBoolean.hxx>
 
diff --git a/src/NMTDS/NMTDS_ListIteratorOfListOfPair_0.cxx b/src/NMTDS/NMTDS_ListIteratorOfListOfPair_0.cxx
index c186b06d9..b887aa7b9 100644
--- a/src/NMTDS/NMTDS_ListIteratorOfListOfPair_0.cxx
+++ b/src/NMTDS/NMTDS_ListIteratorOfListOfPair_0.cxx
@@ -1,23 +1,24 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include <NMTDS_ListIteratorOfListOfPair.hxx>
 
diff --git a/src/NMTDS/NMTDS_ListIteratorOfListOfPassKey.hxx b/src/NMTDS/NMTDS_ListIteratorOfListOfPassKey.hxx
index 8f6229653..62f8352fa 100644
--- a/src/NMTDS/NMTDS_ListIteratorOfListOfPassKey.hxx
+++ b/src/NMTDS/NMTDS_ListIteratorOfListOfPassKey.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/NMTDS_ListIteratorOfListOfPassKeyBoolean.hxx b/src/NMTDS/NMTDS_ListIteratorOfListOfPassKeyBoolean.hxx
index c23177b37..f9db23ead 100644
--- a/src/NMTDS/NMTDS_ListIteratorOfListOfPassKeyBoolean.hxx
+++ b/src/NMTDS/NMTDS_ListIteratorOfListOfPassKeyBoolean.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/NMTDS_ListIteratorOfListOfPassKeyBoolean_0.cxx b/src/NMTDS/NMTDS_ListIteratorOfListOfPassKeyBoolean_0.cxx
index 0d662f761..3e447305c 100644
--- a/src/NMTDS/NMTDS_ListIteratorOfListOfPassKeyBoolean_0.cxx
+++ b/src/NMTDS/NMTDS_ListIteratorOfListOfPassKeyBoolean_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/NMTDS_ListIteratorOfListOfPassKey_0.cxx b/src/NMTDS/NMTDS_ListIteratorOfListOfPassKey_0.cxx
index 50645de9b..2e1793c2f 100644
--- a/src/NMTDS/NMTDS_ListIteratorOfListOfPassKey_0.cxx
+++ b/src/NMTDS/NMTDS_ListIteratorOfListOfPassKey_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/NMTDS_ListNodeOfListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx b/src/NMTDS/NMTDS_ListNodeOfListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx
index 5d060a9a7..b61612bca 100644
--- a/src/NMTDS/NMTDS_ListNodeOfListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx
+++ b/src/NMTDS/NMTDS_ListNodeOfListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/NMTDS_ListNodeOfListOfIndexedDataMapOfShapeAncestorsSuccessors_0.cxx b/src/NMTDS/NMTDS_ListNodeOfListOfIndexedDataMapOfShapeAncestorsSuccessors_0.cxx
index 83c36360b..8dcfd7540 100644
--- a/src/NMTDS/NMTDS_ListNodeOfListOfIndexedDataMapOfShapeAncestorsSuccessors_0.cxx
+++ b/src/NMTDS/NMTDS_ListNodeOfListOfIndexedDataMapOfShapeAncestorsSuccessors_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/NMTDS_ListNodeOfListOfPair.hxx b/src/NMTDS/NMTDS_ListNodeOfListOfPair.hxx
index bd6aaa8df..64f53eb36 100644
--- a/src/NMTDS/NMTDS_ListNodeOfListOfPair.hxx
+++ b/src/NMTDS/NMTDS_ListNodeOfListOfPair.hxx
@@ -1,23 +1,24 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _NMTDS_ListNodeOfListOfPair_HeaderFile
 #define _NMTDS_ListNodeOfListOfPair_HeaderFile
diff --git a/src/NMTDS/NMTDS_ListNodeOfListOfPairBoolean.hxx b/src/NMTDS/NMTDS_ListNodeOfListOfPairBoolean.hxx
index 2661de064..973c7b1ff 100644
--- a/src/NMTDS/NMTDS_ListNodeOfListOfPairBoolean.hxx
+++ b/src/NMTDS/NMTDS_ListNodeOfListOfPairBoolean.hxx
@@ -1,23 +1,24 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _NMTDS_ListNodeOfListOfPairBoolean_HeaderFile
 #define _NMTDS_ListNodeOfListOfPairBoolean_HeaderFile
diff --git a/src/NMTDS/NMTDS_ListNodeOfListOfPairBoolean_0.cxx b/src/NMTDS/NMTDS_ListNodeOfListOfPairBoolean_0.cxx
index 8aef0cdb3..3f4798ae1 100644
--- a/src/NMTDS/NMTDS_ListNodeOfListOfPairBoolean_0.cxx
+++ b/src/NMTDS/NMTDS_ListNodeOfListOfPairBoolean_0.cxx
@@ -1,23 +1,24 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include <NMTDS_ListNodeOfListOfPairBoolean.hxx>
 
diff --git a/src/NMTDS/NMTDS_ListNodeOfListOfPair_0.cxx b/src/NMTDS/NMTDS_ListNodeOfListOfPair_0.cxx
index d35a153db..bdb6ec4c2 100644
--- a/src/NMTDS/NMTDS_ListNodeOfListOfPair_0.cxx
+++ b/src/NMTDS/NMTDS_ListNodeOfListOfPair_0.cxx
@@ -1,23 +1,24 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include <NMTDS_ListNodeOfListOfPair.hxx>
 
diff --git a/src/NMTDS/NMTDS_ListNodeOfListOfPassKey.hxx b/src/NMTDS/NMTDS_ListNodeOfListOfPassKey.hxx
index 86a966dbb..722700a71 100644
--- a/src/NMTDS/NMTDS_ListNodeOfListOfPassKey.hxx
+++ b/src/NMTDS/NMTDS_ListNodeOfListOfPassKey.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/NMTDS_ListNodeOfListOfPassKeyBoolean.hxx b/src/NMTDS/NMTDS_ListNodeOfListOfPassKeyBoolean.hxx
index b952252f8..56caf5caa 100644
--- a/src/NMTDS/NMTDS_ListNodeOfListOfPassKeyBoolean.hxx
+++ b/src/NMTDS/NMTDS_ListNodeOfListOfPassKeyBoolean.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/NMTDS_ListNodeOfListOfPassKeyBoolean_0.cxx b/src/NMTDS/NMTDS_ListNodeOfListOfPassKeyBoolean_0.cxx
index beed5e0b2..ca21567e3 100644
--- a/src/NMTDS/NMTDS_ListNodeOfListOfPassKeyBoolean_0.cxx
+++ b/src/NMTDS/NMTDS_ListNodeOfListOfPassKeyBoolean_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/NMTDS_ListNodeOfListOfPassKey_0.cxx b/src/NMTDS/NMTDS_ListNodeOfListOfPassKey_0.cxx
index f6dd197a6..f5656e282 100644
--- a/src/NMTDS/NMTDS_ListNodeOfListOfPassKey_0.cxx
+++ b/src/NMTDS/NMTDS_ListNodeOfListOfPassKey_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/NMTDS_ListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx b/src/NMTDS/NMTDS_ListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx
index 47e901258..3f4ab1ee4 100644
--- a/src/NMTDS/NMTDS_ListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx
+++ b/src/NMTDS/NMTDS_ListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/NMTDS_ListOfIndexedDataMapOfShapeAncestorsSuccessors_0.cxx b/src/NMTDS/NMTDS_ListOfIndexedDataMapOfShapeAncestorsSuccessors_0.cxx
index 7fbe65c83..45bcf18f3 100644
--- a/src/NMTDS/NMTDS_ListOfIndexedDataMapOfShapeAncestorsSuccessors_0.cxx
+++ b/src/NMTDS/NMTDS_ListOfIndexedDataMapOfShapeAncestorsSuccessors_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/NMTDS_ListOfPair.hxx b/src/NMTDS/NMTDS_ListOfPair.hxx
index 9da05334d..bc31abbfe 100644
--- a/src/NMTDS/NMTDS_ListOfPair.hxx
+++ b/src/NMTDS/NMTDS_ListOfPair.hxx
@@ -1,23 +1,24 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _NMTDS_ListOfPair_HeaderFile
 #define _NMTDS_ListOfPair_HeaderFile
diff --git a/src/NMTDS/NMTDS_ListOfPairBoolean.hxx b/src/NMTDS/NMTDS_ListOfPairBoolean.hxx
index 7e8d08ad5..e7e0a354a 100644
--- a/src/NMTDS/NMTDS_ListOfPairBoolean.hxx
+++ b/src/NMTDS/NMTDS_ListOfPairBoolean.hxx
@@ -1,23 +1,24 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _NMTDS_ListOfPairBoolean_HeaderFile
 #define _NMTDS_ListOfPairBoolean_HeaderFile
diff --git a/src/NMTDS/NMTDS_ListOfPairBoolean_0.cxx b/src/NMTDS/NMTDS_ListOfPairBoolean_0.cxx
index 40e4ff1c4..08fe7d645 100644
--- a/src/NMTDS/NMTDS_ListOfPairBoolean_0.cxx
+++ b/src/NMTDS/NMTDS_ListOfPairBoolean_0.cxx
@@ -1,23 +1,24 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include <NMTDS_ListOfPairBoolean.hxx>
 
diff --git a/src/NMTDS/NMTDS_ListOfPair_0.cxx b/src/NMTDS/NMTDS_ListOfPair_0.cxx
index ff7491667..f6009aa61 100644
--- a/src/NMTDS/NMTDS_ListOfPair_0.cxx
+++ b/src/NMTDS/NMTDS_ListOfPair_0.cxx
@@ -1,23 +1,24 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include <NMTDS_ListOfPair.hxx>
 
diff --git a/src/NMTDS/NMTDS_ListOfPassKey.hxx b/src/NMTDS/NMTDS_ListOfPassKey.hxx
index a56136834..a6b2dcaa0 100644
--- a/src/NMTDS/NMTDS_ListOfPassKey.hxx
+++ b/src/NMTDS/NMTDS_ListOfPassKey.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/NMTDS_ListOfPassKeyBoolean.hxx b/src/NMTDS/NMTDS_ListOfPassKeyBoolean.hxx
index 5465e823a..4dc70ab2b 100644
--- a/src/NMTDS/NMTDS_ListOfPassKeyBoolean.hxx
+++ b/src/NMTDS/NMTDS_ListOfPassKeyBoolean.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/NMTDS_ListOfPassKeyBoolean_0.cxx b/src/NMTDS/NMTDS_ListOfPassKeyBoolean_0.cxx
index c9ea10967..0dd0e2799 100644
--- a/src/NMTDS/NMTDS_ListOfPassKeyBoolean_0.cxx
+++ b/src/NMTDS/NMTDS_ListOfPassKeyBoolean_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/NMTDS_ListOfPassKey_0.cxx b/src/NMTDS/NMTDS_ListOfPassKey_0.cxx
index 3af94f59f..674622d84 100644
--- a/src/NMTDS/NMTDS_ListOfPassKey_0.cxx
+++ b/src/NMTDS/NMTDS_ListOfPassKey_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/NMTDS_MapIteratorOfMapOfPairBoolean.hxx b/src/NMTDS/NMTDS_MapIteratorOfMapOfPairBoolean.hxx
index 34d774295..21ca725a8 100644
--- a/src/NMTDS/NMTDS_MapIteratorOfMapOfPairBoolean.hxx
+++ b/src/NMTDS/NMTDS_MapIteratorOfMapOfPairBoolean.hxx
@@ -1,23 +1,24 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _NMTDS_MapIteratorOfMapOfPairBoolean_HeaderFile
 #define _NMTDS_MapIteratorOfMapOfPairBoolean_HeaderFile
diff --git a/src/NMTDS/NMTDS_MapIteratorOfMapOfPairBoolean_0.cxx b/src/NMTDS/NMTDS_MapIteratorOfMapOfPairBoolean_0.cxx
index f52475020..85c3bfdf2 100644
--- a/src/NMTDS/NMTDS_MapIteratorOfMapOfPairBoolean_0.cxx
+++ b/src/NMTDS/NMTDS_MapIteratorOfMapOfPairBoolean_0.cxx
@@ -1,23 +1,24 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include <NMTDS_MapIteratorOfMapOfPairBoolean.hxx>
 
diff --git a/src/NMTDS/NMTDS_MapIteratorOfMapOfPassKey.hxx b/src/NMTDS/NMTDS_MapIteratorOfMapOfPassKey.hxx
index 02b57d48a..0945a30ed 100644
--- a/src/NMTDS/NMTDS_MapIteratorOfMapOfPassKey.hxx
+++ b/src/NMTDS/NMTDS_MapIteratorOfMapOfPassKey.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/NMTDS_MapIteratorOfMapOfPassKeyBoolean.hxx b/src/NMTDS/NMTDS_MapIteratorOfMapOfPassKeyBoolean.hxx
index 761daf8f6..e6e0ce631 100644
--- a/src/NMTDS/NMTDS_MapIteratorOfMapOfPassKeyBoolean.hxx
+++ b/src/NMTDS/NMTDS_MapIteratorOfMapOfPassKeyBoolean.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/NMTDS_MapIteratorOfMapOfPassKeyBoolean_0.cxx b/src/NMTDS/NMTDS_MapIteratorOfMapOfPassKeyBoolean_0.cxx
index 6fb40cc83..e29a06d7e 100644
--- a/src/NMTDS/NMTDS_MapIteratorOfMapOfPassKeyBoolean_0.cxx
+++ b/src/NMTDS/NMTDS_MapIteratorOfMapOfPassKeyBoolean_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/NMTDS_MapIteratorOfMapOfPassKey_0.cxx b/src/NMTDS/NMTDS_MapIteratorOfMapOfPassKey_0.cxx
index c4276b9dc..7aa98e781 100644
--- a/src/NMTDS/NMTDS_MapIteratorOfMapOfPassKey_0.cxx
+++ b/src/NMTDS/NMTDS_MapIteratorOfMapOfPassKey_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/NMTDS_MapOfPairBoolean.hxx b/src/NMTDS/NMTDS_MapOfPairBoolean.hxx
index 108319ba0..51e1f0707 100644
--- a/src/NMTDS/NMTDS_MapOfPairBoolean.hxx
+++ b/src/NMTDS/NMTDS_MapOfPairBoolean.hxx
@@ -1,23 +1,24 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _NMTDS_MapOfPairBoolean_HeaderFile
 #define _NMTDS_MapOfPairBoolean_HeaderFile
diff --git a/src/NMTDS/NMTDS_MapOfPairBoolean_0.cxx b/src/NMTDS/NMTDS_MapOfPairBoolean_0.cxx
index 7b21510b5..6906c74c8 100644
--- a/src/NMTDS/NMTDS_MapOfPairBoolean_0.cxx
+++ b/src/NMTDS/NMTDS_MapOfPairBoolean_0.cxx
@@ -1,23 +1,24 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include <NMTDS_MapOfPairBoolean.hxx>
 
diff --git a/src/NMTDS/NMTDS_MapOfPassKey.hxx b/src/NMTDS/NMTDS_MapOfPassKey.hxx
index 54db3f4d0..2c30844b7 100644
--- a/src/NMTDS/NMTDS_MapOfPassKey.hxx
+++ b/src/NMTDS/NMTDS_MapOfPassKey.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/NMTDS_MapOfPassKeyBoolean.hxx b/src/NMTDS/NMTDS_MapOfPassKeyBoolean.hxx
index 4dd296d7f..8dc78dc16 100644
--- a/src/NMTDS/NMTDS_MapOfPassKeyBoolean.hxx
+++ b/src/NMTDS/NMTDS_MapOfPassKeyBoolean.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/NMTDS_MapOfPassKeyBoolean_0.cxx b/src/NMTDS/NMTDS_MapOfPassKeyBoolean_0.cxx
index 08745ad56..47ca945b9 100644
--- a/src/NMTDS/NMTDS_MapOfPassKeyBoolean_0.cxx
+++ b/src/NMTDS/NMTDS_MapOfPassKeyBoolean_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/NMTDS_MapOfPassKey_0.cxx b/src/NMTDS/NMTDS_MapOfPassKey_0.cxx
index fae55c5f1..f14d71e77 100644
--- a/src/NMTDS/NMTDS_MapOfPassKey_0.cxx
+++ b/src/NMTDS/NMTDS_MapOfPassKey_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/NMTDS_PInterfPool.hxx b/src/NMTDS/NMTDS_PInterfPool.hxx
index 64a48965f..2271d5e4b 100644
--- a/src/NMTDS/NMTDS_PInterfPool.hxx
+++ b/src/NMTDS/NMTDS_PInterfPool.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/NMTDS/NMTDS_PIterator.hxx b/src/NMTDS/NMTDS_PIterator.hxx
index 84aa57c54..9fa24a53c 100644
--- a/src/NMTDS/NMTDS_PIterator.hxx
+++ b/src/NMTDS/NMTDS_PIterator.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/NMTDS/NMTDS_PShapesDataStructure.hxx b/src/NMTDS/NMTDS_PShapesDataStructure.hxx
index aae029153..82569ed99 100644
--- a/src/NMTDS/NMTDS_PShapesDataStructure.hxx
+++ b/src/NMTDS/NMTDS_PShapesDataStructure.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/NMTDS_Pair.cdl b/src/NMTDS/NMTDS_Pair.cdl
index 4b5522616..844004da4 100644
--- a/src/NMTDS/NMTDS_Pair.cdl
+++ b/src/NMTDS/NMTDS_Pair.cdl
@@ -1,23 +1,23 @@
---  Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
---  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
---  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+-- Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+-- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 --
---  This library is free software; you can redistribute it and/or
---  modify it under the terms of the GNU Lesser General Public
---  License as published by the Free Software Foundation; either
---  version 2.1 of the License.
+-- This library is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU Lesser General Public
+-- License as published by the Free Software Foundation; either
+-- version 2.1 of the License.
 --
---  This library is distributed in the hope that it will be useful,
---  but WITHOUT ANY WARRANTY; without even the implied warranty of
---  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
---  Lesser General Public License for more details.
+-- This library is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+-- Lesser General Public License for more details.
 --
---  You should have received a copy of the GNU Lesser General Public
---  License along with this library; if not, write to the Free Software
---  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+-- You should have received a copy of the GNU Lesser General Public
+-- License along with this library; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 --
---  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+-- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 --
 
 --  File:	NMTDS_Pair.cdl
diff --git a/src/NMTDS/NMTDS_Pair.cxx b/src/NMTDS/NMTDS_Pair.cxx
index dece0c710..088853004 100644
--- a/src/NMTDS/NMTDS_Pair.cxx
+++ b/src/NMTDS/NMTDS_Pair.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File:        NMTDS_Pair.cxx
 // Author:      Peter KURNEV
diff --git a/src/NMTDS/NMTDS_Pair.hxx b/src/NMTDS/NMTDS_Pair.hxx
index 2b884ec9d..ab359bf1e 100644
--- a/src/NMTDS/NMTDS_Pair.hxx
+++ b/src/NMTDS/NMTDS_Pair.hxx
@@ -1,23 +1,24 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _NMTDS_Pair_HeaderFile
 #define _NMTDS_Pair_HeaderFile
diff --git a/src/NMTDS/NMTDS_Pair.ixx b/src/NMTDS/NMTDS_Pair.ixx
index 359d8ae56..8dfc463e8 100644
--- a/src/NMTDS/NMTDS_Pair.ixx
+++ b/src/NMTDS/NMTDS_Pair.ixx
@@ -1,23 +1,24 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include <NMTDS_Pair.jxx>
 
diff --git a/src/NMTDS/NMTDS_Pair.jxx b/src/NMTDS/NMTDS_Pair.jxx
index f732185d7..caebbd1a7 100644
--- a/src/NMTDS/NMTDS_Pair.jxx
+++ b/src/NMTDS/NMTDS_Pair.jxx
@@ -1,23 +1,24 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _NMTDS_Pair_HeaderFile
 #include <NMTDS_Pair.hxx>
diff --git a/src/NMTDS/NMTDS_PairBoolean.cdl b/src/NMTDS/NMTDS_PairBoolean.cdl
index e20e9e430..87269afec 100644
--- a/src/NMTDS/NMTDS_PairBoolean.cdl
+++ b/src/NMTDS/NMTDS_PairBoolean.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 -- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 --
 -- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+--
 
 --  File:	NMTDS_PairBoolean.cdl
 --  Created:	
diff --git a/src/NMTDS/NMTDS_PairBoolean.cxx b/src/NMTDS/NMTDS_PairBoolean.cxx
index 364694960..f5ebfc9d6 100644
--- a/src/NMTDS/NMTDS_PairBoolean.cxx
+++ b/src/NMTDS/NMTDS_PairBoolean.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File:        NMTDS_PairBoolean.cxx
 // Author:      Peter KURNEV
diff --git a/src/NMTDS/NMTDS_PairBoolean.hxx b/src/NMTDS/NMTDS_PairBoolean.hxx
index 8bf1a29e1..24c4df99b 100644
--- a/src/NMTDS/NMTDS_PairBoolean.hxx
+++ b/src/NMTDS/NMTDS_PairBoolean.hxx
@@ -1,23 +1,24 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _NMTDS_PairBoolean_HeaderFile
 #define _NMTDS_PairBoolean_HeaderFile
diff --git a/src/NMTDS/NMTDS_PairBoolean.ixx b/src/NMTDS/NMTDS_PairBoolean.ixx
index 71fdb731a..ec1a9bfbb 100644
--- a/src/NMTDS/NMTDS_PairBoolean.ixx
+++ b/src/NMTDS/NMTDS_PairBoolean.ixx
@@ -1,23 +1,24 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include <NMTDS_PairBoolean.jxx>
 
diff --git a/src/NMTDS/NMTDS_PairBoolean.jxx b/src/NMTDS/NMTDS_PairBoolean.jxx
index c45fd0355..f501aaa30 100644
--- a/src/NMTDS/NMTDS_PairBoolean.jxx
+++ b/src/NMTDS/NMTDS_PairBoolean.jxx
@@ -1,23 +1,24 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _NMTDS_PairBoolean_HeaderFile
 #include <NMTDS_PairBoolean.hxx>
diff --git a/src/NMTDS/NMTDS_PairMapHasher.cdl b/src/NMTDS/NMTDS_PairMapHasher.cdl
index cf4a80485..244c134ec 100644
--- a/src/NMTDS/NMTDS_PairMapHasher.cdl
+++ b/src/NMTDS/NMTDS_PairMapHasher.cdl
@@ -1,23 +1,24 @@
---  Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
---  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
---  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+-- Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+-- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 --
---  This library is free software; you can redistribute it and/or
---  modify it under the terms of the GNU Lesser General Public
---  License as published by the Free Software Foundation; either
---  version 2.1 of the License.
+-- This library is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU Lesser General Public
+-- License as published by the Free Software Foundation; either
+-- version 2.1 of the License.
 --
---  This library is distributed in the hope that it will be useful,
---  but WITHOUT ANY WARRANTY; without even the implied warranty of
---  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
---  Lesser General Public License for more details.
+-- This library is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+-- Lesser General Public License for more details.
 --
---  You should have received a copy of the GNU Lesser General Public
---  License along with this library; if not, write to the Free Software
---  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+-- You should have received a copy of the GNU Lesser General Public
+-- License along with this library; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+--
+-- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 --
---  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 
 --  File:	NMTDS_PairMapHasher.cdl
 --  Author:	Peter KURNEV
diff --git a/src/NMTDS/NMTDS_PairMapHasher.cxx b/src/NMTDS/NMTDS_PairMapHasher.cxx
index 46c79902b..c3f67e772 100644
--- a/src/NMTDS/NMTDS_PairMapHasher.cxx
+++ b/src/NMTDS/NMTDS_PairMapHasher.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File:        NMTDS_PairMapHasher.cxx
 // Author:      Peter KURNEV
diff --git a/src/NMTDS/NMTDS_PairMapHasher.hxx b/src/NMTDS/NMTDS_PairMapHasher.hxx
index 24858888d..d7be6558d 100644
--- a/src/NMTDS/NMTDS_PairMapHasher.hxx
+++ b/src/NMTDS/NMTDS_PairMapHasher.hxx
@@ -1,23 +1,24 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _NMTDS_PairMapHasher_HeaderFile
 #define _NMTDS_PairMapHasher_HeaderFile
diff --git a/src/NMTDS/NMTDS_PairMapHasher.ixx b/src/NMTDS/NMTDS_PairMapHasher.ixx
index 19a1a77a4..b6f7022d6 100644
--- a/src/NMTDS/NMTDS_PairMapHasher.ixx
+++ b/src/NMTDS/NMTDS_PairMapHasher.ixx
@@ -1,23 +1,24 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include <NMTDS_PairMapHasher.jxx>
 
diff --git a/src/NMTDS/NMTDS_PairMapHasher.jxx b/src/NMTDS/NMTDS_PairMapHasher.jxx
index d4dfdf593..a5c53718e 100644
--- a/src/NMTDS/NMTDS_PairMapHasher.jxx
+++ b/src/NMTDS/NMTDS_PairMapHasher.jxx
@@ -1,23 +1,24 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _NMTDS_Pair_HeaderFile
 #include <NMTDS_Pair.hxx>
diff --git a/src/NMTDS/NMTDS_PassKey.cdl b/src/NMTDS/NMTDS_PassKey.cdl
index 41e2addeb..160ac0039 100755
--- a/src/NMTDS/NMTDS_PassKey.cdl
+++ b/src/NMTDS/NMTDS_PassKey.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 -- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/NMTDS_PassKey.cxx b/src/NMTDS/NMTDS_PassKey.cxx
index 4e2552534..83b05e407 100755
--- a/src/NMTDS/NMTDS_PassKey.cxx
+++ b/src/NMTDS/NMTDS_PassKey.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/NMTDS_PassKey.hxx b/src/NMTDS/NMTDS_PassKey.hxx
index 2c38c1829..ef9c02b12 100644
--- a/src/NMTDS/NMTDS_PassKey.hxx
+++ b/src/NMTDS/NMTDS_PassKey.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/NMTDS_PassKey.ixx b/src/NMTDS/NMTDS_PassKey.ixx
index 67bc34e15..063fcbba1 100644
--- a/src/NMTDS/NMTDS_PassKey.ixx
+++ b/src/NMTDS/NMTDS_PassKey.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/NMTDS_PassKey.jxx b/src/NMTDS/NMTDS_PassKey.jxx
index 522cd4b48..5b85d7891 100644
--- a/src/NMTDS/NMTDS_PassKey.jxx
+++ b/src/NMTDS/NMTDS_PassKey.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/NMTDS_PassKeyBoolean.cdl b/src/NMTDS/NMTDS_PassKeyBoolean.cdl
index d987f0f0d..1d2bdafff 100755
--- a/src/NMTDS/NMTDS_PassKeyBoolean.cdl
+++ b/src/NMTDS/NMTDS_PassKeyBoolean.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 -- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/NMTDS_PassKeyBoolean.cxx b/src/NMTDS/NMTDS_PassKeyBoolean.cxx
index 50af54b5e..dba3d636e 100755
--- a/src/NMTDS/NMTDS_PassKeyBoolean.cxx
+++ b/src/NMTDS/NMTDS_PassKeyBoolean.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/NMTDS_PassKeyBoolean.hxx b/src/NMTDS/NMTDS_PassKeyBoolean.hxx
index 8afba2b5f..d4b49aa56 100644
--- a/src/NMTDS/NMTDS_PassKeyBoolean.hxx
+++ b/src/NMTDS/NMTDS_PassKeyBoolean.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/NMTDS_PassKeyBoolean.ixx b/src/NMTDS/NMTDS_PassKeyBoolean.ixx
index 799fa8f60..b123c3cb1 100644
--- a/src/NMTDS/NMTDS_PassKeyBoolean.ixx
+++ b/src/NMTDS/NMTDS_PassKeyBoolean.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/NMTDS_PassKeyBoolean.jxx b/src/NMTDS/NMTDS_PassKeyBoolean.jxx
index 49111dc29..6fbd11115 100644
--- a/src/NMTDS/NMTDS_PassKeyBoolean.jxx
+++ b/src/NMTDS/NMTDS_PassKeyBoolean.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/NMTDS_PassKeyMapHasher.cdl b/src/NMTDS/NMTDS_PassKeyMapHasher.cdl
index 22547bc9a..45b4709f8 100755
--- a/src/NMTDS/NMTDS_PassKeyMapHasher.cdl
+++ b/src/NMTDS/NMTDS_PassKeyMapHasher.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 -- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/NMTDS_PassKeyMapHasher.cxx b/src/NMTDS/NMTDS_PassKeyMapHasher.cxx
index 28eada2c6..8ce47a026 100755
--- a/src/NMTDS/NMTDS_PassKeyMapHasher.cxx
+++ b/src/NMTDS/NMTDS_PassKeyMapHasher.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/NMTDS_PassKeyMapHasher.hxx b/src/NMTDS/NMTDS_PassKeyMapHasher.hxx
index 24bb192cd..8dd0df515 100644
--- a/src/NMTDS/NMTDS_PassKeyMapHasher.hxx
+++ b/src/NMTDS/NMTDS_PassKeyMapHasher.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/NMTDS_PassKeyMapHasher.ixx b/src/NMTDS/NMTDS_PassKeyMapHasher.ixx
index dd8f74bc5..9088b96af 100644
--- a/src/NMTDS/NMTDS_PassKeyMapHasher.ixx
+++ b/src/NMTDS/NMTDS_PassKeyMapHasher.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/NMTDS_PassKeyMapHasher.jxx b/src/NMTDS/NMTDS_PassKeyMapHasher.jxx
index b69c21e4b..b16c77df8 100644
--- a/src/NMTDS/NMTDS_PassKeyMapHasher.jxx
+++ b/src/NMTDS/NMTDS_PassKeyMapHasher.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/NMTDS_PassKeyShape.cdl b/src/NMTDS/NMTDS_PassKeyShape.cdl
index 5e7592898..4dbd33d59 100644
--- a/src/NMTDS/NMTDS_PassKeyShape.cdl
+++ b/src/NMTDS/NMTDS_PassKeyShape.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- This library is free software; you can redistribute it and/or
 -- modify it under the terms of the GNU Lesser General Public
diff --git a/src/NMTDS/NMTDS_PassKeyShape.cxx b/src/NMTDS/NMTDS_PassKeyShape.cxx
index 7f67a0139..586dd2cc3 100644
--- a/src/NMTDS/NMTDS_PassKeyShape.cxx
+++ b/src/NMTDS/NMTDS_PassKeyShape.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/NMTDS/NMTDS_PassKeyShape.hxx b/src/NMTDS/NMTDS_PassKeyShape.hxx
index d5af189bb..c03f8c394 100644
--- a/src/NMTDS/NMTDS_PassKeyShape.hxx
+++ b/src/NMTDS/NMTDS_PassKeyShape.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/NMTDS/NMTDS_PassKeyShape.ixx b/src/NMTDS/NMTDS_PassKeyShape.ixx
index c288c2f25..21e5656a8 100644
--- a/src/NMTDS/NMTDS_PassKeyShape.ixx
+++ b/src/NMTDS/NMTDS_PassKeyShape.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/NMTDS/NMTDS_PassKeyShape.jxx b/src/NMTDS/NMTDS_PassKeyShape.jxx
index 17455f3c9..be1208a3a 100644
--- a/src/NMTDS/NMTDS_PassKeyShape.jxx
+++ b/src/NMTDS/NMTDS_PassKeyShape.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/NMTDS/NMTDS_PassKeyShapeMapHasher.cdl b/src/NMTDS/NMTDS_PassKeyShapeMapHasher.cdl
index 2f585370d..295e16697 100644
--- a/src/NMTDS/NMTDS_PassKeyShapeMapHasher.cdl
+++ b/src/NMTDS/NMTDS_PassKeyShapeMapHasher.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- This library is free software; you can redistribute it and/or
 -- modify it under the terms of the GNU Lesser General Public
diff --git a/src/NMTDS/NMTDS_PassKeyShapeMapHasher.cxx b/src/NMTDS/NMTDS_PassKeyShapeMapHasher.cxx
index e934a714f..11e4cd82d 100644
--- a/src/NMTDS/NMTDS_PassKeyShapeMapHasher.cxx
+++ b/src/NMTDS/NMTDS_PassKeyShapeMapHasher.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/NMTDS/NMTDS_PassKeyShapeMapHasher.hxx b/src/NMTDS/NMTDS_PassKeyShapeMapHasher.hxx
index 5c718dc44..395e72435 100644
--- a/src/NMTDS/NMTDS_PassKeyShapeMapHasher.hxx
+++ b/src/NMTDS/NMTDS_PassKeyShapeMapHasher.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/NMTDS/NMTDS_PassKeyShapeMapHasher.ixx b/src/NMTDS/NMTDS_PassKeyShapeMapHasher.ixx
index 60c9e363c..a0ec546a1 100644
--- a/src/NMTDS/NMTDS_PassKeyShapeMapHasher.ixx
+++ b/src/NMTDS/NMTDS_PassKeyShapeMapHasher.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/NMTDS/NMTDS_PassKeyShapeMapHasher.jxx b/src/NMTDS/NMTDS_PassKeyShapeMapHasher.jxx
index 37a231375..5ce5c65ff 100644
--- a/src/NMTDS/NMTDS_PassKeyShapeMapHasher.jxx
+++ b/src/NMTDS/NMTDS_PassKeyShapeMapHasher.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/NMTDS/NMTDS_ShapesDataStructure.cdl b/src/NMTDS/NMTDS_ShapesDataStructure.cdl
index 0f2c201f6..869650931 100644
--- a/src/NMTDS/NMTDS_ShapesDataStructure.cdl
+++ b/src/NMTDS/NMTDS_ShapesDataStructure.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 -- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/NMTDS_ShapesDataStructure.cxx b/src/NMTDS/NMTDS_ShapesDataStructure.cxx
index 1fc3741c1..107c5b4d7 100644
--- a/src/NMTDS/NMTDS_ShapesDataStructure.cxx
+++ b/src/NMTDS/NMTDS_ShapesDataStructure.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File:        NMTDS_ShapesDataStructure.cxx
 // Author:      Peter KURNEV
diff --git a/src/NMTDS/NMTDS_ShapesDataStructure.hxx b/src/NMTDS/NMTDS_ShapesDataStructure.hxx
index f8a1180df..484617ff8 100644
--- a/src/NMTDS/NMTDS_ShapesDataStructure.hxx
+++ b/src/NMTDS/NMTDS_ShapesDataStructure.hxx
@@ -1,23 +1,24 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _NMTDS_ShapesDataStructure_HeaderFile
 #define _NMTDS_ShapesDataStructure_HeaderFile
diff --git a/src/NMTDS/NMTDS_ShapesDataStructure.ixx b/src/NMTDS/NMTDS_ShapesDataStructure.ixx
index 22c13a28c..98419c2e2 100644
--- a/src/NMTDS/NMTDS_ShapesDataStructure.ixx
+++ b/src/NMTDS/NMTDS_ShapesDataStructure.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/NMTDS_ShapesDataStructure.jxx b/src/NMTDS/NMTDS_ShapesDataStructure.jxx
index da09c3e38..95f584caa 100644
--- a/src/NMTDS/NMTDS_ShapesDataStructure.jxx
+++ b/src/NMTDS/NMTDS_ShapesDataStructure.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/NMTDS_StdMapNodeOfMapOfPairBoolean.hxx b/src/NMTDS/NMTDS_StdMapNodeOfMapOfPairBoolean.hxx
index 4fa8a6ad3..a6ab8f45c 100644
--- a/src/NMTDS/NMTDS_StdMapNodeOfMapOfPairBoolean.hxx
+++ b/src/NMTDS/NMTDS_StdMapNodeOfMapOfPairBoolean.hxx
@@ -1,23 +1,24 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _NMTDS_StdMapNodeOfMapOfPairBoolean_HeaderFile
 #define _NMTDS_StdMapNodeOfMapOfPairBoolean_HeaderFile
diff --git a/src/NMTDS/NMTDS_StdMapNodeOfMapOfPairBoolean_0.cxx b/src/NMTDS/NMTDS_StdMapNodeOfMapOfPairBoolean_0.cxx
index 4a755b6e8..c0a7c049b 100644
--- a/src/NMTDS/NMTDS_StdMapNodeOfMapOfPairBoolean_0.cxx
+++ b/src/NMTDS/NMTDS_StdMapNodeOfMapOfPairBoolean_0.cxx
@@ -1,23 +1,24 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include <NMTDS_StdMapNodeOfMapOfPairBoolean.hxx>
 
diff --git a/src/NMTDS/NMTDS_StdMapNodeOfMapOfPassKey.hxx b/src/NMTDS/NMTDS_StdMapNodeOfMapOfPassKey.hxx
index 2a9ac2a5a..9df76826f 100644
--- a/src/NMTDS/NMTDS_StdMapNodeOfMapOfPassKey.hxx
+++ b/src/NMTDS/NMTDS_StdMapNodeOfMapOfPassKey.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/NMTDS_StdMapNodeOfMapOfPassKeyBoolean.hxx b/src/NMTDS/NMTDS_StdMapNodeOfMapOfPassKeyBoolean.hxx
index 509924c0c..b1b550978 100644
--- a/src/NMTDS/NMTDS_StdMapNodeOfMapOfPassKeyBoolean.hxx
+++ b/src/NMTDS/NMTDS_StdMapNodeOfMapOfPassKeyBoolean.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/NMTDS_StdMapNodeOfMapOfPassKeyBoolean_0.cxx b/src/NMTDS/NMTDS_StdMapNodeOfMapOfPassKeyBoolean_0.cxx
index c86a9af97..e8f8445f4 100644
--- a/src/NMTDS/NMTDS_StdMapNodeOfMapOfPassKeyBoolean_0.cxx
+++ b/src/NMTDS/NMTDS_StdMapNodeOfMapOfPassKeyBoolean_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/NMTDS_StdMapNodeOfMapOfPassKey_0.cxx b/src/NMTDS/NMTDS_StdMapNodeOfMapOfPassKey_0.cxx
index 5d5cd582a..5a20e13e7 100644
--- a/src/NMTDS/NMTDS_StdMapNodeOfMapOfPassKey_0.cxx
+++ b/src/NMTDS/NMTDS_StdMapNodeOfMapOfPassKey_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS/NMTDS_Tools.cdl b/src/NMTDS/NMTDS_Tools.cdl
index 0c3c29d25..db44b1e58 100644
--- a/src/NMTDS/NMTDS_Tools.cdl
+++ b/src/NMTDS/NMTDS_Tools.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- This library is free software; you can redistribute it and/or
 -- modify it under the terms of the GNU Lesser General Public
diff --git a/src/NMTDS/NMTDS_Tools.cxx b/src/NMTDS/NMTDS_Tools.cxx
index 03755e6dd..cdffe47d3 100644
--- a/src/NMTDS/NMTDS_Tools.cxx
+++ b/src/NMTDS/NMTDS_Tools.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -15,6 +15,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File:        NMTDS_Tools.cxx
 // Created:     Tue Feb 20 14:57:28 2007
diff --git a/src/NMTDS/NMTDS_Tools.hxx b/src/NMTDS/NMTDS_Tools.hxx
index 8e841bd60..2d2a15fac 100644
--- a/src/NMTDS/NMTDS_Tools.hxx
+++ b/src/NMTDS/NMTDS_Tools.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/NMTDS/NMTDS_Tools.ixx b/src/NMTDS/NMTDS_Tools.ixx
index 488ac7d68..a42537372 100644
--- a/src/NMTDS/NMTDS_Tools.ixx
+++ b/src/NMTDS/NMTDS_Tools.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/NMTDS/NMTDS_Tools.jxx b/src/NMTDS/NMTDS_Tools.jxx
index 02dfd8354..056b7a8a3 100644
--- a/src/NMTDS/NMTDS_Tools.jxx
+++ b/src/NMTDS/NMTDS_Tools.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/NMTDS_NEW/NMTDS.cdl b/src/NMTDS_NEW/NMTDS.cdl
index 39ee4546f..de747be18 100644
--- a/src/NMTDS_NEW/NMTDS.cdl
+++ b/src/NMTDS_NEW/NMTDS.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 -- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS_NEW/NMTDS_BndSphere.cxx b/src/NMTDS_NEW/NMTDS_BndSphere.cxx
index 0c5d7e5a7..6d1b2d8b2 100644
--- a/src/NMTDS_NEW/NMTDS_BndSphere.cxx
+++ b/src/NMTDS_NEW/NMTDS_BndSphere.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/NMTDS_NEW/NMTDS_BndSphere.hxx b/src/NMTDS_NEW/NMTDS_BndSphere.hxx
index 8cd676219..9e5f6554e 100644
--- a/src/NMTDS_NEW/NMTDS_BndSphere.hxx
+++ b/src/NMTDS_NEW/NMTDS_BndSphere.hxx
@@ -1,73 +1,73 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-
-// File:	NMTDS_BndSphere.hxx
-// Created:	
-// Author:	Peter KURNEV
-//		<pkv@irinox>
-
-#ifndef _NMTDS_BndSphere_HeaderFile
-#define _NMTDS_BndSphere_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_Macro.hxx>
-#include <gp_Pnt.hxx>
-#include <Standard_Real.hxx>
-#include <Standard_Boolean.hxx>
-
-//=======================================================================
-//class : NMTDS_BndSphere
-//purpose  : 
-//=======================================================================
-class NMTDS_BndSphere  {
- public:
-  Standard_EXPORT   
-    NMTDS_BndSphere();
-  
-  Standard_EXPORT 
-    virtual ~NMTDS_BndSphere();
-  
-  void SetCenter(const gp_Pnt& theP) ;
-  
-  const gp_Pnt& Center() const;
-  
-  void SetRadius(const Standard_Real theR) ;
-  
-  Standard_Real Radius() const;
-  
-  void SetGap(const Standard_Real theGap) ;
-  
-  Standard_Real Gap() const;
-  
-  void Add(const NMTDS_BndSphere& theOther) ;
-  
-  Standard_EXPORT 
-    Standard_Boolean IsOut(const NMTDS_BndSphere& theOther) const;
-  
-  Standard_Real SquareExtent() const;
-
- protected:
-  gp_Pnt myCenter;
-  Standard_Real myRadius;
-  Standard_Real myGap;
-};
-
-#include <NMTDS_BndSphere.lxx>
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File:	NMTDS_BndSphere.hxx
+// Created:	
+// Author:	Peter KURNEV
+//		<pkv@irinox>
+
+#ifndef _NMTDS_BndSphere_HeaderFile
+#define _NMTDS_BndSphere_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Macro.hxx>
+#include <gp_Pnt.hxx>
+#include <Standard_Real.hxx>
+#include <Standard_Boolean.hxx>
+
+//=======================================================================
+//class : NMTDS_BndSphere
+//purpose  : 
+//=======================================================================
+class NMTDS_BndSphere  {
+ public:
+  Standard_EXPORT   
+    NMTDS_BndSphere();
+  
+  Standard_EXPORT 
+    virtual ~NMTDS_BndSphere();
+  
+  void SetCenter(const gp_Pnt& theP) ;
+  
+  const gp_Pnt& Center() const;
+  
+  void SetRadius(const Standard_Real theR) ;
+  
+  Standard_Real Radius() const;
+  
+  void SetGap(const Standard_Real theGap) ;
+  
+  Standard_Real Gap() const;
+  
+  void Add(const NMTDS_BndSphere& theOther) ;
+  
+  Standard_EXPORT 
+    Standard_Boolean IsOut(const NMTDS_BndSphere& theOther) const;
+  
+  Standard_Real SquareExtent() const;
+
+ protected:
+  gp_Pnt myCenter;
+  Standard_Real myRadius;
+  Standard_Real myGap;
+};
+
+#include <NMTDS_BndSphere.lxx>
+
+#endif
diff --git a/src/NMTDS_NEW/NMTDS_BndSphere.lxx b/src/NMTDS_NEW/NMTDS_BndSphere.lxx
index 582e8d290..a7be22637 100644
--- a/src/NMTDS_NEW/NMTDS_BndSphere.lxx
+++ b/src/NMTDS_NEW/NMTDS_BndSphere.lxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/NMTDS_NEW/NMTDS_BndSphereTree.cxx b/src/NMTDS_NEW/NMTDS_BndSphereTree.cxx
index f5f810fc4..a6b449ac9 100644
--- a/src/NMTDS_NEW/NMTDS_BndSphereTree.cxx
+++ b/src/NMTDS_NEW/NMTDS_BndSphereTree.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/NMTDS_NEW/NMTDS_BndSphereTree.hxx b/src/NMTDS_NEW/NMTDS_BndSphereTree.hxx
index 518745cf7..1721f1dc0 100644
--- a/src/NMTDS_NEW/NMTDS_BndSphereTree.hxx
+++ b/src/NMTDS_NEW/NMTDS_BndSphereTree.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/NMTDS_NEW/NMTDS_BoxBndTree.cxx b/src/NMTDS_NEW/NMTDS_BoxBndTree.cxx
index 100d9857c..055007096 100644
--- a/src/NMTDS_NEW/NMTDS_BoxBndTree.cxx
+++ b/src/NMTDS_NEW/NMTDS_BoxBndTree.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS_NEW/NMTDS_BoxBndTree.hxx b/src/NMTDS_NEW/NMTDS_BoxBndTree.hxx
index 171da43ae..9ab98bb43 100644
--- a/src/NMTDS_NEW/NMTDS_BoxBndTree.hxx
+++ b/src/NMTDS_NEW/NMTDS_BoxBndTree.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS_NEW/NMTDS_CArray1OfIndexRange.cxx b/src/NMTDS_NEW/NMTDS_CArray1OfIndexRange.cxx
index d7dbed2c1..c984bebf2 100644
--- a/src/NMTDS_NEW/NMTDS_CArray1OfIndexRange.cxx
+++ b/src/NMTDS_NEW/NMTDS_CArray1OfIndexRange.cxx
@@ -1,40 +1,40 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-
-// File:	NMTDS_CArray1OfIndexRange.hxx
-// Created:	
-// Author:	Peter KURNEV
-//		<pkv@irinox>
-
-#include <NMTDS_CArray1OfIndexRange.hxx>
-
-#ifndef _Standard_OutOfRange_HeaderFile
-#include <Standard_OutOfRange.hxx>
-#endif
-#ifndef _Standard_OutOfMemory_HeaderFile
-#include <Standard_OutOfMemory.hxx>
-#endif
- 
-
-#define Array1Item NMTDS_IndexRange
-#define Array1Item_hxx <NMTDS_IndexRange.hxx>
-#define BOPTColStd_CArray1 NMTDS_CArray1OfIndexRange
-#define BOPTColStd_CArray1_hxx <NMTDS_CArray1OfIndexRange.hxx>
-#include <BOPTColStd_CArray1.gxx>
-
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File:	NMTDS_CArray1OfIndexRange.hxx
+// Created:	
+// Author:	Peter KURNEV
+//		<pkv@irinox>
+
+#include <NMTDS_CArray1OfIndexRange.hxx>
+
+#ifndef _Standard_OutOfRange_HeaderFile
+#include <Standard_OutOfRange.hxx>
+#endif
+#ifndef _Standard_OutOfMemory_HeaderFile
+#include <Standard_OutOfMemory.hxx>
+#endif
+ 
+
+#define Array1Item NMTDS_IndexRange
+#define Array1Item_hxx <NMTDS_IndexRange.hxx>
+#define BOPTColStd_CArray1 NMTDS_CArray1OfIndexRange
+#define BOPTColStd_CArray1_hxx <NMTDS_CArray1OfIndexRange.hxx>
+#include <BOPTColStd_CArray1.gxx>
+
diff --git a/src/NMTDS_NEW/NMTDS_CArray1OfIndexRange.hxx b/src/NMTDS_NEW/NMTDS_CArray1OfIndexRange.hxx
index 1ded0aff1..b2451b241 100644
--- a/src/NMTDS_NEW/NMTDS_CArray1OfIndexRange.hxx
+++ b/src/NMTDS_NEW/NMTDS_CArray1OfIndexRange.hxx
@@ -1,121 +1,121 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-
-// File:	NMTDS_BndSphere.hxx
-// Created:	
-// Author:	Peter KURNEV
-//		<pkv@irinox>
-
-#ifndef _NMTDS_CArray1OfIndexRange_HeaderFile
-#define _NMTDS_CArray1OfIndexRange_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_Macro.hxx>
-#include <Standard_Address.hxx>
-#include <Standard_Integer.hxx>
-#include <Standard_Boolean.hxx>
-#include <NMTDS_IndexRange.hxx>
-
-class Standard_OutOfRange;
-class Standard_OutOfMemory;
-
-
-
-//=======================================================================
-//function : NMTDS_CArray1OfIndexRange
-//purpose  : 
-//=======================================================================
-class NMTDS_CArray1OfIndexRange  {
- public:
-
-  Standard_EXPORT
-    NMTDS_CArray1OfIndexRange(const Standard_Integer Length = 0,
-			      const Standard_Integer BlockLength = 5);
-  
-  Standard_EXPORT   
-    void Resize(const Standard_Integer theNewLength) ;
-  
-  Standard_EXPORT     
-    void Destroy() ;
-
-  ~NMTDS_CArray1OfIndexRange() {
-    Destroy();
-  }
-  
-  Standard_EXPORT
-    Standard_Integer Length() const;
-  
-  Standard_EXPORT
-    Standard_Integer Extent() const;
-  
-  Standard_EXPORT
-    Standard_Integer FactLength() const;
-  
-  Standard_EXPORT
-    Standard_Integer Append(const NMTDS_IndexRange& Value) ;
-  
-  Standard_EXPORT
-    void Remove(const Standard_Integer Index) ;
-  
-  Standard_EXPORT
-    const NMTDS_IndexRange& Value(const Standard_Integer Index) const;
-   
-  const NMTDS_IndexRange& operator ()(const Standard_Integer Index) const {
-    return Value(Index);
-  }
-  
-  Standard_EXPORT
-    NMTDS_IndexRange& ChangeValue(const Standard_Integer Index) ;
-
-    NMTDS_IndexRange& operator ()(const Standard_Integer Index) {
-      return ChangeValue(Index);
-    }
-  
-  Standard_EXPORT
-    void SetBlockLength(const Standard_Integer aBL) ;
-  
-  Standard_EXPORT
-    Standard_Integer BlockLength() const;
-  
-  Standard_EXPORT
-    void Purge() ;
-
- private:
-  Standard_EXPORT
-    NMTDS_CArray1OfIndexRange(const NMTDS_CArray1OfIndexRange& AnArray);
-  
-  Standard_EXPORT
-    NMTDS_CArray1OfIndexRange& Assign(const NMTDS_CArray1OfIndexRange& Other) ;
-  
-  NMTDS_CArray1OfIndexRange& operator =(const NMTDS_CArray1OfIndexRange& Other) {
-    return Assign(Other);
-  }
-  
-  Standard_EXPORT
-    Standard_Boolean IsInvalidIndex(const Standard_Integer Index) const;
-
-
-  Standard_Address myStart;
-  Standard_Integer myLength;
-  Standard_Integer myFactLength;
-  Standard_Integer myBlockLength;
-  Standard_Boolean myIsAllocated;
-};
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File:	NMTDS_BndSphere.hxx
+// Created:	
+// Author:	Peter KURNEV
+//		<pkv@irinox>
+
+#ifndef _NMTDS_CArray1OfIndexRange_HeaderFile
+#define _NMTDS_CArray1OfIndexRange_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Macro.hxx>
+#include <Standard_Address.hxx>
+#include <Standard_Integer.hxx>
+#include <Standard_Boolean.hxx>
+#include <NMTDS_IndexRange.hxx>
+
+class Standard_OutOfRange;
+class Standard_OutOfMemory;
+
+
+
+//=======================================================================
+//function : NMTDS_CArray1OfIndexRange
+//purpose  : 
+//=======================================================================
+class NMTDS_CArray1OfIndexRange  {
+ public:
+
+  Standard_EXPORT
+    NMTDS_CArray1OfIndexRange(const Standard_Integer Length = 0,
+			      const Standard_Integer BlockLength = 5);
+  
+  Standard_EXPORT   
+    void Resize(const Standard_Integer theNewLength) ;
+  
+  Standard_EXPORT     
+    void Destroy() ;
+
+  ~NMTDS_CArray1OfIndexRange() {
+    Destroy();
+  }
+  
+  Standard_EXPORT
+    Standard_Integer Length() const;
+  
+  Standard_EXPORT
+    Standard_Integer Extent() const;
+  
+  Standard_EXPORT
+    Standard_Integer FactLength() const;
+  
+  Standard_EXPORT
+    Standard_Integer Append(const NMTDS_IndexRange& Value) ;
+  
+  Standard_EXPORT
+    void Remove(const Standard_Integer Index) ;
+  
+  Standard_EXPORT
+    const NMTDS_IndexRange& Value(const Standard_Integer Index) const;
+   
+  const NMTDS_IndexRange& operator ()(const Standard_Integer Index) const {
+    return Value(Index);
+  }
+  
+  Standard_EXPORT
+    NMTDS_IndexRange& ChangeValue(const Standard_Integer Index) ;
+
+    NMTDS_IndexRange& operator ()(const Standard_Integer Index) {
+      return ChangeValue(Index);
+    }
+  
+  Standard_EXPORT
+    void SetBlockLength(const Standard_Integer aBL) ;
+  
+  Standard_EXPORT
+    Standard_Integer BlockLength() const;
+  
+  Standard_EXPORT
+    void Purge() ;
+
+ private:
+  Standard_EXPORT
+    NMTDS_CArray1OfIndexRange(const NMTDS_CArray1OfIndexRange& AnArray);
+  
+  Standard_EXPORT
+    NMTDS_CArray1OfIndexRange& Assign(const NMTDS_CArray1OfIndexRange& Other) ;
+  
+  NMTDS_CArray1OfIndexRange& operator =(const NMTDS_CArray1OfIndexRange& Other) {
+    return Assign(Other);
+  }
+  
+  Standard_EXPORT
+    Standard_Boolean IsInvalidIndex(const Standard_Integer Index) const;
+
+
+  Standard_Address myStart;
+  Standard_Integer myLength;
+  Standard_Integer myFactLength;
+  Standard_Integer myBlockLength;
+  Standard_Boolean myIsAllocated;
+};
+
+#endif
diff --git a/src/NMTDS_NEW/NMTDS_DataMapIteratorOfDataMapOfIntegerMapOfInteger.hxx b/src/NMTDS_NEW/NMTDS_DataMapIteratorOfDataMapOfIntegerMapOfInteger.hxx
index 5b2509a7e..e139ab938 100644
--- a/src/NMTDS_NEW/NMTDS_DataMapIteratorOfDataMapOfIntegerMapOfInteger.hxx
+++ b/src/NMTDS_NEW/NMTDS_DataMapIteratorOfDataMapOfIntegerMapOfInteger.hxx
@@ -1,32 +1,32 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-// File:	NMTDS_DataMapIteratorOfDataMapOfIntegerMapOfInteger.hxx
-// Created:	Mon Feb 20 09:31:43 2012
-// Author:	
-//		<pkv@BDEURI37616>
-
-
-#ifndef NMTDS_DataMapIteratorOfDataMapOfIntegerMapOfInteger_HeaderFile
-#define NMTDS_DataMapIteratorOfDataMapOfIntegerMapOfInteger_HeaderFile
-
-#ifndef NMTDS_DataMapOfIntegerMapOfInteger_HeaderFile
-#include <NMTDS_DataMapOfIntegerMapOfInteger.hxx>
-#endif
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// File:	NMTDS_DataMapIteratorOfDataMapOfIntegerMapOfInteger.hxx
+// Created:	Mon Feb 20 09:31:43 2012
+// Author:	
+//		<pkv@BDEURI37616>
+
+
+#ifndef NMTDS_DataMapIteratorOfDataMapOfIntegerMapOfInteger_HeaderFile
+#define NMTDS_DataMapIteratorOfDataMapOfIntegerMapOfInteger_HeaderFile
+
+#ifndef NMTDS_DataMapOfIntegerMapOfInteger_HeaderFile
+#include <NMTDS_DataMapOfIntegerMapOfInteger.hxx>
+#endif
+
+#endif
diff --git a/src/NMTDS_NEW/NMTDS_DataMapOfIntegerMapOfInteger.hxx b/src/NMTDS_NEW/NMTDS_DataMapOfIntegerMapOfInteger.hxx
index 1c413e03b..69278c1a5 100644
--- a/src/NMTDS_NEW/NMTDS_DataMapOfIntegerMapOfInteger.hxx
+++ b/src/NMTDS_NEW/NMTDS_DataMapOfIntegerMapOfInteger.hxx
@@ -1,40 +1,40 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-// File:	NMTDS_DataMapOfIntegerMapOfInteger.hxx
-// Created:	Mon Feb 20 09:27:40 2012
-// Author:	
-//		<pkv@BDEURI37616>
-
-
-#ifndef NMTDS_DataMapOfIntegerMapOfInteger_HeaderFile
-#define NMTDS_DataMapOfIntegerMapOfInteger_HeaderFile
-
-#include <TColStd_MapOfInteger.hxx>
-#include <TColStd_MapIntegerHasher.hxx>
-
-#define _NCollection_MapHasher
-#include <NCollection_DataMap.hxx>
-
-typedef NCollection_DataMap<Standard_Integer, TColStd_MapOfInteger, TColStd_MapIntegerHasher> NMTDS_DataMapOfIntegerMapOfInteger; 
-typedef NMTDS_DataMapOfIntegerMapOfInteger::Iterator NMTDS_DataMapIteratorOfDataMapOfIntegerMapOfInteger; 
- 
-#undef _NCollection_MapHasher
-
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// File:	NMTDS_DataMapOfIntegerMapOfInteger.hxx
+// Created:	Mon Feb 20 09:27:40 2012
+// Author:	
+//		<pkv@BDEURI37616>
+
+
+#ifndef NMTDS_DataMapOfIntegerMapOfInteger_HeaderFile
+#define NMTDS_DataMapOfIntegerMapOfInteger_HeaderFile
+
+#include <TColStd_MapOfInteger.hxx>
+#include <TColStd_MapIntegerHasher.hxx>
+
+#define _NCollection_MapHasher
+#include <NCollection_DataMap.hxx>
+
+typedef NCollection_DataMap<Standard_Integer, TColStd_MapOfInteger, TColStd_MapIntegerHasher> NMTDS_DataMapOfIntegerMapOfInteger; 
+typedef NMTDS_DataMapOfIntegerMapOfInteger::Iterator NMTDS_DataMapIteratorOfDataMapOfIntegerMapOfInteger; 
+ 
+#undef _NCollection_MapHasher
+
+
+#endif
diff --git a/src/NMTDS_NEW/NMTDS_IndexRange.cxx b/src/NMTDS_NEW/NMTDS_IndexRange.cxx
index 2dd892c48..83969f5ae 100644
--- a/src/NMTDS_NEW/NMTDS_IndexRange.cxx
+++ b/src/NMTDS_NEW/NMTDS_IndexRange.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS_NEW/NMTDS_IndexRange.hxx b/src/NMTDS_NEW/NMTDS_IndexRange.hxx
index c0ec21787..84b055745 100644
--- a/src/NMTDS_NEW/NMTDS_IndexRange.hxx
+++ b/src/NMTDS_NEW/NMTDS_IndexRange.hxx
@@ -1,62 +1,62 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-
-// File:        NMTDS_IndexRange.hxx
-// Created:     
-// Author:      Peter KURNEV
-//              <pkv@irinox>
-//
-
-#ifndef _NMTDS_IndexRange_HeaderFile
-#define _NMTDS_IndexRange_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_Macro.hxx>
-#include <Standard_Integer.hxx>
-#include <Standard_Boolean.hxx>
-
-//=======================================================================
-//class    : NMTDS_IndexRange
-//purpose  : 
-//=======================================================================
-class NMTDS_IndexRange  {
- public:
-
-  Standard_EXPORT   
-    NMTDS_IndexRange();
-  
-  Standard_EXPORT     void SetFirst(const Standard_Integer aFirst) ;
-  
-  Standard_EXPORT     void SetLast(const Standard_Integer aLast) ;
-  
-  Standard_EXPORT     Standard_Integer First() const;
-  
-  Standard_EXPORT     Standard_Integer Last() const;
-  
-  Standard_EXPORT     Standard_Boolean IsInRange(const Standard_Integer aIndex) const;
-
-protected:
-  Standard_Integer myFirst;
-  Standard_Integer myLast;
-};
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File:        NMTDS_IndexRange.hxx
+// Created:     
+// Author:      Peter KURNEV
+//              <pkv@irinox>
+//
+
+#ifndef _NMTDS_IndexRange_HeaderFile
+#define _NMTDS_IndexRange_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Macro.hxx>
+#include <Standard_Integer.hxx>
+#include <Standard_Boolean.hxx>
+
+//=======================================================================
+//class    : NMTDS_IndexRange
+//purpose  : 
+//=======================================================================
+class NMTDS_IndexRange  {
+ public:
+
+  Standard_EXPORT   
+    NMTDS_IndexRange();
+  
+  Standard_EXPORT     void SetFirst(const Standard_Integer aFirst) ;
+  
+  Standard_EXPORT     void SetLast(const Standard_Integer aLast) ;
+  
+  Standard_EXPORT     Standard_Integer First() const;
+  
+  Standard_EXPORT     Standard_Integer Last() const;
+  
+  Standard_EXPORT     Standard_Boolean IsInRange(const Standard_Integer aIndex) const;
+
+protected:
+  Standard_Integer myFirst;
+  Standard_Integer myLast;
+};
+
+#endif
diff --git a/src/NMTDS_NEW/NMTDS_IndexedDataMapOfIntegerShape.hxx b/src/NMTDS_NEW/NMTDS_IndexedDataMapOfIntegerShape.hxx
index a3e494189..8ae674ea8 100644
--- a/src/NMTDS_NEW/NMTDS_IndexedDataMapOfIntegerShape.hxx
+++ b/src/NMTDS_NEW/NMTDS_IndexedDataMapOfIntegerShape.hxx
@@ -1,42 +1,42 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-// File:	NMTDS_IndexedDataMapOfIntegerShape.hxx
-// Created:	Mon Feb 20 09:20:07 2012
-// Author:	
-//		<pkv@BDEURI37616>
-
-
-#ifndef NMTDS_IndexedDataMapOfIntegerShape_HeaderFile
-#define NMTDS_IndexedDataMapOfIntegerShape_HeaderFile
-
-#include <TopoDS_Shape.hxx>  
-#include <Standard_Integer.hxx>
-#include <TColStd_MapIntegerHasher.hxx>
-
-#define _NCollection_MapHasher
-#include <NCollection_IndexedDataMap.hxx>
-
-
-typedef NCollection_IndexedDataMap<Standard_Integer, TopoDS_Shape, TColStd_MapIntegerHasher> NMTDS_IndexedDataMapOfIntegerShape; 
- 
-#undef _NCollection_MapHasher
-
-
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// File:	NMTDS_IndexedDataMapOfIntegerShape.hxx
+// Created:	Mon Feb 20 09:20:07 2012
+// Author:	
+//		<pkv@BDEURI37616>
+
+
+#ifndef NMTDS_IndexedDataMapOfIntegerShape_HeaderFile
+#define NMTDS_IndexedDataMapOfIntegerShape_HeaderFile
+
+#include <TopoDS_Shape.hxx>  
+#include <Standard_Integer.hxx>
+#include <TColStd_MapIntegerHasher.hxx>
+
+#define _NCollection_MapHasher
+#include <NCollection_IndexedDataMap.hxx>
+
+
+typedef NCollection_IndexedDataMap<Standard_Integer, TopoDS_Shape, TColStd_MapIntegerHasher> NMTDS_IndexedDataMapOfIntegerShape; 
+ 
+#undef _NCollection_MapHasher
+
+
+
+#endif
diff --git a/src/NMTDS_NEW/NMTDS_IndexedDataMapOfShapeBndSphere.hxx b/src/NMTDS_NEW/NMTDS_IndexedDataMapOfShapeBndSphere.hxx
index 259b5258a..23a1df289 100644
--- a/src/NMTDS_NEW/NMTDS_IndexedDataMapOfShapeBndSphere.hxx
+++ b/src/NMTDS_NEW/NMTDS_IndexedDataMapOfShapeBndSphere.hxx
@@ -1,45 +1,45 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-
-// File:	NMTDS_IndexedDataMapOfShapeBndSphere.hxx
-// Created:	Mon Feb 20 09:17:01 2012
-// Author:	
-//		<pkv@BDEURI37616>
-
-
-#ifndef NMTDS_IndexedDataMapOfShapeBndSphere_HeaderFile
-#define NMTDS_IndexedDataMapOfShapeBndSphere_HeaderFile
-
-#include <TopoDS_Shape.hxx>  
-#include <TopTools_ShapeMapHasher.hxx>
-#include <NMTDS_BndSphere.hxx>
-
-#define _NCollection_MapHasher
-#include <NCollection_IndexedDataMap.hxx>
-
-
-
-typedef NCollection_IndexedDataMap<TopoDS_Shape, NMTDS_BndSphere, TopTools_ShapeMapHasher> NMTDS_IndexedDataMapOfShapeBndSphere; 
- 
-#undef _NCollection_MapHasher
-
-
-
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File:	NMTDS_IndexedDataMapOfShapeBndSphere.hxx
+// Created:	Mon Feb 20 09:17:01 2012
+// Author:	
+//		<pkv@BDEURI37616>
+
+
+#ifndef NMTDS_IndexedDataMapOfShapeBndSphere_HeaderFile
+#define NMTDS_IndexedDataMapOfShapeBndSphere_HeaderFile
+
+#include <TopoDS_Shape.hxx>  
+#include <TopTools_ShapeMapHasher.hxx>
+#include <NMTDS_BndSphere.hxx>
+
+#define _NCollection_MapHasher
+#include <NCollection_IndexedDataMap.hxx>
+
+
+
+typedef NCollection_IndexedDataMap<TopoDS_Shape, NMTDS_BndSphere, TopTools_ShapeMapHasher> NMTDS_IndexedDataMapOfShapeBndSphere; 
+ 
+#undef _NCollection_MapHasher
+
+
+
+
+#endif
diff --git a/src/NMTDS_NEW/NMTDS_IndexedDataMapOfShapeBox.hxx b/src/NMTDS_NEW/NMTDS_IndexedDataMapOfShapeBox.hxx
index c659212fa..7c50c3925 100644
--- a/src/NMTDS_NEW/NMTDS_IndexedDataMapOfShapeBox.hxx
+++ b/src/NMTDS_NEW/NMTDS_IndexedDataMapOfShapeBox.hxx
@@ -1,44 +1,44 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-
-// File:	NMTDS_IndexedDataMapOfShapeBox.hxx
-// Created:	Mon Feb 20 09:17:01 2012
-// Author:	
-//		<pkv@BDEURI37616>
-
-
-#ifndef NMTDS_IndexedDataMapOfShapeBox_HeaderFile
-#define NMTDS_IndexedDataMapOfShapeBox_HeaderFile
-
-#include <TopoDS_Shape.hxx>  
-#include <TopTools_ShapeMapHasher.hxx>
-#include <Bnd_Box.hxx>
-
-#define _NCollection_MapHasher
-#include <NCollection_IndexedDataMap.hxx>
-
-
-typedef NCollection_IndexedDataMap<TopoDS_Shape, Bnd_Box, TopTools_ShapeMapHasher> NMTDS_IndexedDataMapOfShapeBox; 
- 
-#undef _NCollection_MapHasher
-
-
-
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File:	NMTDS_IndexedDataMapOfShapeBox.hxx
+// Created:	Mon Feb 20 09:17:01 2012
+// Author:	
+//		<pkv@BDEURI37616>
+
+
+#ifndef NMTDS_IndexedDataMapOfShapeBox_HeaderFile
+#define NMTDS_IndexedDataMapOfShapeBox_HeaderFile
+
+#include <TopoDS_Shape.hxx>  
+#include <TopTools_ShapeMapHasher.hxx>
+#include <Bnd_Box.hxx>
+
+#define _NCollection_MapHasher
+#include <NCollection_IndexedDataMap.hxx>
+
+
+typedef NCollection_IndexedDataMap<TopoDS_Shape, Bnd_Box, TopTools_ShapeMapHasher> NMTDS_IndexedDataMapOfShapeBox; 
+ 
+#undef _NCollection_MapHasher
+
+
+
+
+#endif
diff --git a/src/NMTDS_NEW/NMTDS_InterfPool.cxx b/src/NMTDS_NEW/NMTDS_InterfPool.cxx
index ac930365c..025946bab 100644
--- a/src/NMTDS_NEW/NMTDS_InterfPool.cxx
+++ b/src/NMTDS_NEW/NMTDS_InterfPool.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -15,6 +15,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File:        NMTDS_InterfPool.cxx
 // Author:      Peter KURNEV
diff --git a/src/NMTDS_NEW/NMTDS_InterfPool.hxx b/src/NMTDS_NEW/NMTDS_InterfPool.hxx
index 8e0ad399e..71dc6c2ae 100644
--- a/src/NMTDS_NEW/NMTDS_InterfPool.hxx
+++ b/src/NMTDS_NEW/NMTDS_InterfPool.hxx
@@ -1,120 +1,123 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
-// File:        NMTDS_InterfPool.hxx
-//
-// Author:      Peter KURNEV
-
-#ifndef _NMTDS_InterfPool_HeaderFile
-#define _NMTDS_InterfPool_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_Macro.hxx>
-
-#include <Standard_Integer.hxx>
-#include <BOPTools_CArray1OfSSInterference.hxx>
-#include <BOPTools_CArray1OfESInterference.hxx>
-#include <BOPTools_CArray1OfVSInterference.hxx>
-#include <BOPTools_CArray1OfEEInterference.hxx>
-#include <BOPTools_CArray1OfVEInterference.hxx>
-#include <BOPTools_CArray1OfVVInterference.hxx>
-#include <Standard_Boolean.hxx>
-#include <NMTDS_InterfType.hxx>
-#include <NMTDS_PairBoolean.hxx>
-#include <NMTDS_MapOfPairBoolean.hxx>
-#include <NMTDS_ListOfPairBoolean.hxx>
-
-//=======================================================================
-//class    : NMTDS_InterfPool
-//purpose  : 
-//=======================================================================
-class NMTDS_InterfPool  {
- public:
-  Standard_EXPORT 
-    NMTDS_InterfPool();
-  Standard_EXPORT 
-    virtual ~NMTDS_InterfPool();
-  
-  Standard_EXPORT
-    Standard_Boolean Add(const NMTDS_PairBoolean& aPKB,
-			 const NMTDS_InterfType aType) ;
-  
-  Standard_EXPORT
-    Standard_Boolean Add(const Standard_Integer aInd1,
-			 const Standard_Integer aInd2,
-			 const NMTDS_InterfType aType) ;
-  
-  Standard_EXPORT
-    Standard_Boolean Add(const Standard_Integer aInd1,
-			 const Standard_Integer aInd2,
-			 const Standard_Boolean bFlag,
-			 const NMTDS_InterfType aType) ;
-  
-  Standard_EXPORT
-    Standard_Boolean Contains(const NMTDS_PairBoolean& aPKB) const;
-  
-  Standard_EXPORT
-    Standard_Boolean Contains(const Standard_Integer aInd1,
-			      const Standard_Integer aInd2) const;
-  
-  Standard_EXPORT
-    const NMTDS_ListOfPairBoolean& Get() const;
-  
-  Standard_EXPORT
-    const NMTDS_ListOfPairBoolean& Get(const NMTDS_InterfType aType) const;
-  
-  Standard_EXPORT
-    const NMTDS_ListOfPairBoolean& Get(const Standard_Integer aInd) const;
-  
-  Standard_EXPORT
-    const NMTDS_ListOfPairBoolean& Get(const Standard_Integer aInd,
-				       const NMTDS_InterfType aType) const;
-  
-  //! Returns the reference to array Of F/F interferences <br>
-  Standard_EXPORT     BOPTools_CArray1OfSSInterference& SSInterferences() ;
-  
-  //! Returns the reference to array Of E/F interferences <br>
-  Standard_EXPORT     BOPTools_CArray1OfESInterference& ESInterferences() ;
-  
-  //! Returns the reference to array Of V/F interferences <br>
-  Standard_EXPORT     BOPTools_CArray1OfVSInterference& VSInterferences() ;
-  
-  //! Returns the reference to arrray Of E/E interferences <br>
-  Standard_EXPORT     BOPTools_CArray1OfEEInterference& EEInterferences() ;
-  
-  //! Returns the reference to arrray Of  V/E interferences <br>
-  Standard_EXPORT     BOPTools_CArray1OfVEInterference& VEInterferences() ;
-  
-  //! Returns the reference to arrray Of  V/V interferences <br>
-  Standard_EXPORT     BOPTools_CArray1OfVVInterference& VVInterferences() ;
-  
-  Standard_EXPORT     void Purge() ;
-
-protected:
-  NMTDS_MapOfPairBoolean myTable[6];
-  NMTDS_ListOfPairBoolean myList;
-  Standard_Integer myMaxInd;
-  BOPTools_CArray1OfSSInterference mySSInterferences;
-  BOPTools_CArray1OfESInterference myESInterferences;
-  BOPTools_CArray1OfVSInterference myVSInterferences;
-  BOPTools_CArray1OfEEInterference myEEInterferences;
-  BOPTools_CArray1OfVEInterference myVEInterferences;
-  BOPTools_CArray1OfVVInterference myVVInterferences;
-
-private:
-};
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File:        NMTDS_InterfPool.hxx
+//
+// Author:      Peter KURNEV
+
+#ifndef _NMTDS_InterfPool_HeaderFile
+#define _NMTDS_InterfPool_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Macro.hxx>
+
+#include <Standard_Integer.hxx>
+#include <BOPTools_CArray1OfSSInterference.hxx>
+#include <BOPTools_CArray1OfESInterference.hxx>
+#include <BOPTools_CArray1OfVSInterference.hxx>
+#include <BOPTools_CArray1OfEEInterference.hxx>
+#include <BOPTools_CArray1OfVEInterference.hxx>
+#include <BOPTools_CArray1OfVVInterference.hxx>
+#include <Standard_Boolean.hxx>
+#include <NMTDS_InterfType.hxx>
+#include <NMTDS_PairBoolean.hxx>
+#include <NMTDS_MapOfPairBoolean.hxx>
+#include <NMTDS_ListOfPairBoolean.hxx>
+
+//=======================================================================
+//class    : NMTDS_InterfPool
+//purpose  : 
+//=======================================================================
+class NMTDS_InterfPool  {
+ public:
+  Standard_EXPORT 
+    NMTDS_InterfPool();
+  Standard_EXPORT 
+    virtual ~NMTDS_InterfPool();
+  
+  Standard_EXPORT
+    Standard_Boolean Add(const NMTDS_PairBoolean& aPKB,
+			 const NMTDS_InterfType aType) ;
+  
+  Standard_EXPORT
+    Standard_Boolean Add(const Standard_Integer aInd1,
+			 const Standard_Integer aInd2,
+			 const NMTDS_InterfType aType) ;
+  
+  Standard_EXPORT
+    Standard_Boolean Add(const Standard_Integer aInd1,
+			 const Standard_Integer aInd2,
+			 const Standard_Boolean bFlag,
+			 const NMTDS_InterfType aType) ;
+  
+  Standard_EXPORT
+    Standard_Boolean Contains(const NMTDS_PairBoolean& aPKB) const;
+  
+  Standard_EXPORT
+    Standard_Boolean Contains(const Standard_Integer aInd1,
+			      const Standard_Integer aInd2) const;
+  
+  Standard_EXPORT
+    const NMTDS_ListOfPairBoolean& Get() const;
+  
+  Standard_EXPORT
+    const NMTDS_ListOfPairBoolean& Get(const NMTDS_InterfType aType) const;
+  
+  Standard_EXPORT
+    const NMTDS_ListOfPairBoolean& Get(const Standard_Integer aInd) const;
+  
+  Standard_EXPORT
+    const NMTDS_ListOfPairBoolean& Get(const Standard_Integer aInd,
+				       const NMTDS_InterfType aType) const;
+  
+  //! Returns the reference to array Of F/F interferences <br>
+  Standard_EXPORT     BOPTools_CArray1OfSSInterference& SSInterferences() ;
+  
+  //! Returns the reference to array Of E/F interferences <br>
+  Standard_EXPORT     BOPTools_CArray1OfESInterference& ESInterferences() ;
+  
+  //! Returns the reference to array Of V/F interferences <br>
+  Standard_EXPORT     BOPTools_CArray1OfVSInterference& VSInterferences() ;
+  
+  //! Returns the reference to arrray Of E/E interferences <br>
+  Standard_EXPORT     BOPTools_CArray1OfEEInterference& EEInterferences() ;
+  
+  //! Returns the reference to arrray Of  V/E interferences <br>
+  Standard_EXPORT     BOPTools_CArray1OfVEInterference& VEInterferences() ;
+  
+  //! Returns the reference to arrray Of  V/V interferences <br>
+  Standard_EXPORT     BOPTools_CArray1OfVVInterference& VVInterferences() ;
+  
+  Standard_EXPORT     void Purge() ;
+
+protected:
+  NMTDS_MapOfPairBoolean myTable[6];
+  NMTDS_ListOfPairBoolean myList;
+  Standard_Integer myMaxInd;
+  BOPTools_CArray1OfSSInterference mySSInterferences;
+  BOPTools_CArray1OfESInterference myESInterferences;
+  BOPTools_CArray1OfVSInterference myVSInterferences;
+  BOPTools_CArray1OfEEInterference myEEInterferences;
+  BOPTools_CArray1OfVEInterference myVEInterferences;
+  BOPTools_CArray1OfVVInterference myVVInterferences;
+
+private:
+};
+
+#endif
diff --git a/src/NMTDS_NEW/NMTDS_InterfType.hxx b/src/NMTDS_NEW/NMTDS_InterfType.hxx
index 7f35b579f..5bf1e72a8 100644
--- a/src/NMTDS_NEW/NMTDS_InterfType.hxx
+++ b/src/NMTDS_NEW/NMTDS_InterfType.hxx
@@ -1,44 +1,44 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-
-// File:	NMTDS_InterfType.hxx
-// Created:	
-// Author:	Peter KURNEV
-//		<pkv@irinox>
-
-
-#ifndef _NMTDS_InterfType_HeaderFile
-#define _NMTDS_InterfType_HeaderFile
-
-
-enum NMTDS_InterfType {
-NMTDS_TI_VV,
-NMTDS_TI_VE,
-NMTDS_TI_VF,
-NMTDS_TI_EE,
-NMTDS_TI_EF,
-NMTDS_TI_FF,
-NMTDS_TI_UNKNOWN
-};
-
-#ifndef _Standard_PrimitiveTypes_HeaderFile
-#include <Standard_PrimitiveTypes.hxx>
-#endif
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File:	NMTDS_InterfType.hxx
+// Created:	
+// Author:	Peter KURNEV
+//		<pkv@irinox>
+
+
+#ifndef _NMTDS_InterfType_HeaderFile
+#define _NMTDS_InterfType_HeaderFile
+
+
+enum NMTDS_InterfType {
+NMTDS_TI_VV,
+NMTDS_TI_VE,
+NMTDS_TI_VF,
+NMTDS_TI_EE,
+NMTDS_TI_EF,
+NMTDS_TI_FF,
+NMTDS_TI_UNKNOWN
+};
+
+#ifndef _Standard_PrimitiveTypes_HeaderFile
+#include <Standard_PrimitiveTypes.hxx>
+#endif
+
+#endif
diff --git a/src/NMTDS_NEW/NMTDS_Iterator.cxx b/src/NMTDS_NEW/NMTDS_Iterator.cxx
index 44f452d82..00bd62623 100644
--- a/src/NMTDS_NEW/NMTDS_Iterator.cxx
+++ b/src/NMTDS_NEW/NMTDS_Iterator.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File:        NMTDS_Iterator.cxx
 // Author:      Peter KURNEV
diff --git a/src/NMTDS_NEW/NMTDS_Iterator.hxx b/src/NMTDS_NEW/NMTDS_Iterator.hxx
index 32a48a406..d1d0ebd92 100644
--- a/src/NMTDS_NEW/NMTDS_Iterator.hxx
+++ b/src/NMTDS_NEW/NMTDS_Iterator.hxx
@@ -1,102 +1,103 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
-// File:        NMTDS_Iterator.hxx
-// Author:      Peter KURNEV
-
-#ifndef _NMTDS_Iterator_HeaderFile
-#define _NMTDS_Iterator_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_Macro.hxx>
-
-#include <Standard_Integer.hxx>
-#include <TColStd_DataMapOfIntegerListOfInteger.hxx>
-#include <TopAbs_ShapeEnum.hxx>
-#include <Standard_Boolean.hxx>
-#include <NMTDS_PShapesDataStructure.hxx>
-#include <NMTDS_ListOfPairBoolean.hxx>
-#include <NMTDS_ListIteratorOfListOfPairBoolean.hxx>
-#include <NMTDS_ShapesDataStructure.hxx>
-
-//=======================================================================
-//class : NMTDS_Iterator
-//purpose  : 
-//=======================================================================
-class NMTDS_Iterator  {
- public:
-  Standard_EXPORT   
-    NMTDS_Iterator();
-
-  Standard_EXPORT 
-    virtual ~NMTDS_Iterator();
-  
-  Standard_EXPORT
-    void SetDS(const NMTDS_PShapesDataStructure& pDS) ;
-  
-  Standard_EXPORT 
-    const NMTDS_ShapesDataStructure& DS() const;
-  
-  Standard_EXPORT 
-    void Initialize(const TopAbs_ShapeEnum aType1,
-		    const TopAbs_ShapeEnum aType2) ;
-  
-  Standard_EXPORT 
-    Standard_Boolean More() const;
-  
-  Standard_EXPORT
-    void Next() ;
-  
-  Standard_EXPORT
-    void Current(Standard_Integer& aIndex1,
-		 Standard_Integer& aIndex2,
-		 Standard_Boolean& aWithSubShape) const;
-  
-  Standard_EXPORT
-    virtual  void Prepare() ;
-  
-  Standard_EXPORT
-    Standard_Integer ExpectedLength() const;
-  
-  Standard_EXPORT 
-    Standard_Integer BlockLength() const;
-  
-  Standard_EXPORT 
-    const TColStd_DataMapOfIntegerListOfInteger& SDVertices() const;
-  
-  Standard_EXPORT 
-    static  void FillMVSD(const TColStd_DataMapOfIntegerListOfInteger& aMVSD1,
-			  TColStd_DataMapOfIntegerListOfInteger& aMVSD2) ;
-
-protected:
-  Standard_EXPORT  
-    virtual  void Intersect() ;
-  //
-  
-  NMTDS_PShapesDataStructure myDS;
-  NMTDS_ListOfPairBoolean myLists[6];
-  NMTDS_ListIteratorOfListOfPairBoolean myIterator;
-  NMTDS_ListOfPairBoolean myEmptyList;
-  Standard_Integer myLength;
-  TColStd_DataMapOfIntegerListOfInteger myMVSD;
-};
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File:        NMTDS_Iterator.hxx
+// Author:      Peter KURNEV
+
+#ifndef _NMTDS_Iterator_HeaderFile
+#define _NMTDS_Iterator_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Macro.hxx>
+
+#include <Standard_Integer.hxx>
+#include <TColStd_DataMapOfIntegerListOfInteger.hxx>
+#include <TopAbs_ShapeEnum.hxx>
+#include <Standard_Boolean.hxx>
+#include <NMTDS_PShapesDataStructure.hxx>
+#include <NMTDS_ListOfPairBoolean.hxx>
+#include <NMTDS_ListIteratorOfListOfPairBoolean.hxx>
+#include <NMTDS_ShapesDataStructure.hxx>
+
+//=======================================================================
+//class : NMTDS_Iterator
+//purpose  : 
+//=======================================================================
+class NMTDS_Iterator  {
+ public:
+  Standard_EXPORT   
+    NMTDS_Iterator();
+
+  Standard_EXPORT 
+    virtual ~NMTDS_Iterator();
+  
+  Standard_EXPORT
+    void SetDS(const NMTDS_PShapesDataStructure& pDS) ;
+  
+  Standard_EXPORT 
+    const NMTDS_ShapesDataStructure& DS() const;
+  
+  Standard_EXPORT 
+    void Initialize(const TopAbs_ShapeEnum aType1,
+		    const TopAbs_ShapeEnum aType2) ;
+  
+  Standard_EXPORT 
+    Standard_Boolean More() const;
+  
+  Standard_EXPORT
+    void Next() ;
+  
+  Standard_EXPORT
+    void Current(Standard_Integer& aIndex1,
+		 Standard_Integer& aIndex2,
+		 Standard_Boolean& aWithSubShape) const;
+  
+  Standard_EXPORT
+    virtual  void Prepare() ;
+  
+  Standard_EXPORT
+    Standard_Integer ExpectedLength() const;
+  
+  Standard_EXPORT 
+    Standard_Integer BlockLength() const;
+  
+  Standard_EXPORT 
+    const TColStd_DataMapOfIntegerListOfInteger& SDVertices() const;
+  
+  Standard_EXPORT 
+    static  void FillMVSD(const TColStd_DataMapOfIntegerListOfInteger& aMVSD1,
+			  TColStd_DataMapOfIntegerListOfInteger& aMVSD2) ;
+
+protected:
+  Standard_EXPORT  
+    virtual  void Intersect() ;
+  //
+  
+  NMTDS_PShapesDataStructure myDS;
+  NMTDS_ListOfPairBoolean myLists[6];
+  NMTDS_ListIteratorOfListOfPairBoolean myIterator;
+  NMTDS_ListOfPairBoolean myEmptyList;
+  Standard_Integer myLength;
+  TColStd_DataMapOfIntegerListOfInteger myMVSD;
+};
+
+#endif
diff --git a/src/NMTDS_NEW/NMTDS_IteratorCheckerSI.cxx b/src/NMTDS_NEW/NMTDS_IteratorCheckerSI.cxx
index 345f6194f..275333e9d 100644
--- a/src/NMTDS_NEW/NMTDS_IteratorCheckerSI.cxx
+++ b/src/NMTDS_NEW/NMTDS_IteratorCheckerSI.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -15,6 +15,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File:        NMTDS_IteratorChecker.hxx
 // Author:      Peter KURNEV
diff --git a/src/NMTDS_NEW/NMTDS_IteratorCheckerSI.hxx b/src/NMTDS_NEW/NMTDS_IteratorCheckerSI.hxx
index 090e18bef..3278a86c4 100644
--- a/src/NMTDS_NEW/NMTDS_IteratorCheckerSI.hxx
+++ b/src/NMTDS_NEW/NMTDS_IteratorCheckerSI.hxx
@@ -1,45 +1,46 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
-// File:        NMTDS_IteratorChecker.cxx
-// Author:      Peter KURNEV
-
-#ifndef _NMTDS_IteratorCheckerSI_HeaderFile
-#define _NMTDS_IteratorCheckerSI_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_Macro.hxx>
-#include <NMTDS_Iterator.hxx>
-
-//=======================================================================
-//class    : NMTDS_IteratorCheckerSI
-//purpose  : 
-//=======================================================================
-class NMTDS_IteratorCheckerSI  : public NMTDS_Iterator {
- public:
-  
-  Standard_EXPORT
-    NMTDS_IteratorCheckerSI();
-  Standard_EXPORT 
-    virtual ~NMTDS_IteratorCheckerSI();
-
-protected:
-  Standard_EXPORT   
-    virtual  void Intersect() ;
-};
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File:        NMTDS_IteratorChecker.cxx
+// Author:      Peter KURNEV
+
+#ifndef _NMTDS_IteratorCheckerSI_HeaderFile
+#define _NMTDS_IteratorCheckerSI_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Macro.hxx>
+#include <NMTDS_Iterator.hxx>
+
+//=======================================================================
+//class    : NMTDS_IteratorCheckerSI
+//purpose  : 
+//=======================================================================
+class NMTDS_IteratorCheckerSI  : public NMTDS_Iterator {
+ public:
+  
+  Standard_EXPORT
+    NMTDS_IteratorCheckerSI();
+  Standard_EXPORT 
+    virtual ~NMTDS_IteratorCheckerSI();
+
+protected:
+  Standard_EXPORT   
+    virtual  void Intersect() ;
+};
+#endif
diff --git a/src/NMTDS_NEW/NMTDS_ListIteratorOfListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx b/src/NMTDS_NEW/NMTDS_ListIteratorOfListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx
index 183f0b5ea..b2738719c 100644
--- a/src/NMTDS_NEW/NMTDS_ListIteratorOfListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx
+++ b/src/NMTDS_NEW/NMTDS_ListIteratorOfListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx
@@ -1,32 +1,32 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-// File:	NMTDS_ListIteratorOfListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx
-// Created:	Mon Feb 20 07:27:34 2012
-// Author:	
-//		<pkv@BDEURI37616>
-
-
-#ifndef NMTDS_ListIteratorOfListOfIndexedDataMapOfShapeAncestorsSuccessors_HeaderFile
-#define NMTDS_ListIteratorOfListOfIndexedDataMapOfShapeAncestorsSuccessors_HeaderFile
-
-#ifndef NMTDS_ListOfIndexedDataMapOfShapeAncestorsSuccessors_HeaderFile
-#include <NMTDS_ListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx>
-#endif 
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// File:	NMTDS_ListIteratorOfListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx
+// Created:	Mon Feb 20 07:27:34 2012
+// Author:	
+//		<pkv@BDEURI37616>
+
+
+#ifndef NMTDS_ListIteratorOfListOfIndexedDataMapOfShapeAncestorsSuccessors_HeaderFile
+#define NMTDS_ListIteratorOfListOfIndexedDataMapOfShapeAncestorsSuccessors_HeaderFile
+
+#ifndef NMTDS_ListOfIndexedDataMapOfShapeAncestorsSuccessors_HeaderFile
+#include <NMTDS_ListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx>
+#endif 
+
+#endif
diff --git a/src/NMTDS_NEW/NMTDS_ListIteratorOfListOfPair.hxx b/src/NMTDS_NEW/NMTDS_ListIteratorOfListOfPair.hxx
index 589ffc38a..958ce936b 100644
--- a/src/NMTDS_NEW/NMTDS_ListIteratorOfListOfPair.hxx
+++ b/src/NMTDS_NEW/NMTDS_ListIteratorOfListOfPair.hxx
@@ -1,32 +1,32 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-// File:	NMTDS_ListIteratorOfListOfPair.hxx
-// Created:	Mon Feb 20 07:27:34 2012
-// Author:	
-//		<pkv@BDEURI37616>
-
-
-#ifndef NMTDS_ListIteratorOfListOfPair_HeaderFile
-#define NMTDS_ListIteratorOfListOfPair_HeaderFile
-
-#ifndef NMTDS_ListOfPair_HeaderFile
-#include <NMTDS_ListOfPair.hxx>
-#endif 
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// File:	NMTDS_ListIteratorOfListOfPair.hxx
+// Created:	Mon Feb 20 07:27:34 2012
+// Author:	
+//		<pkv@BDEURI37616>
+
+
+#ifndef NMTDS_ListIteratorOfListOfPair_HeaderFile
+#define NMTDS_ListIteratorOfListOfPair_HeaderFile
+
+#ifndef NMTDS_ListOfPair_HeaderFile
+#include <NMTDS_ListOfPair.hxx>
+#endif 
+
+#endif
diff --git a/src/NMTDS_NEW/NMTDS_ListIteratorOfListOfPairBoolean.hxx b/src/NMTDS_NEW/NMTDS_ListIteratorOfListOfPairBoolean.hxx
index d0b777299..4353f75be 100644
--- a/src/NMTDS_NEW/NMTDS_ListIteratorOfListOfPairBoolean.hxx
+++ b/src/NMTDS_NEW/NMTDS_ListIteratorOfListOfPairBoolean.hxx
@@ -1,32 +1,32 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-// File:	NMTDS_ListIteratorOfListOfPairBoolean.hxx
-// Created:	Mon Feb 20 07:27:34 2012
-// Author:	
-//		<pkv@BDEURI37616>
-
-
-#ifndef NMTDS_ListIteratorOfListOfPairBoolean_HeaderFile
-#define NMTDS_ListIteratorOfListOfPairBoolean_HeaderFile
-
-#ifndef NMTDS_ListOfPairBoolean_HeaderFile
-#include <NMTDS_ListOfPairBoolean.hxx>
-#endif 
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// File:	NMTDS_ListIteratorOfListOfPairBoolean.hxx
+// Created:	Mon Feb 20 07:27:34 2012
+// Author:	
+//		<pkv@BDEURI37616>
+
+
+#ifndef NMTDS_ListIteratorOfListOfPairBoolean_HeaderFile
+#define NMTDS_ListIteratorOfListOfPairBoolean_HeaderFile
+
+#ifndef NMTDS_ListOfPairBoolean_HeaderFile
+#include <NMTDS_ListOfPairBoolean.hxx>
+#endif 
+
+#endif
diff --git a/src/NMTDS_NEW/NMTDS_ListIteratorOfListOfPassKey.hxx b/src/NMTDS_NEW/NMTDS_ListIteratorOfListOfPassKey.hxx
index c84cf2a14..8f7980ea2 100644
--- a/src/NMTDS_NEW/NMTDS_ListIteratorOfListOfPassKey.hxx
+++ b/src/NMTDS_NEW/NMTDS_ListIteratorOfListOfPassKey.hxx
@@ -1,32 +1,32 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-// File:	NMTDS_ListIteratorOfListOfPassKey.hxx
-// Created:	Mon Feb 20 07:27:34 2012
-// Author:	
-//		<pkv@BDEURI37616>
-
-
-#ifndef NMTDS_ListIteratorOfListOfPassKey_HeaderFile
-#define NMTDS_ListIteratorOfListOfPassKey_HeaderFile
-
-#ifndef NMTDS_ListOfPassKey_HeaderFile
-#include <NMTDS_ListOfPassKey.hxx>
-#endif 
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// File:	NMTDS_ListIteratorOfListOfPassKey.hxx
+// Created:	Mon Feb 20 07:27:34 2012
+// Author:	
+//		<pkv@BDEURI37616>
+
+
+#ifndef NMTDS_ListIteratorOfListOfPassKey_HeaderFile
+#define NMTDS_ListIteratorOfListOfPassKey_HeaderFile
+
+#ifndef NMTDS_ListOfPassKey_HeaderFile
+#include <NMTDS_ListOfPassKey.hxx>
+#endif 
+
+#endif
diff --git a/src/NMTDS_NEW/NMTDS_ListIteratorOfListOfPassKeyBoolean.hxx b/src/NMTDS_NEW/NMTDS_ListIteratorOfListOfPassKeyBoolean.hxx
index 88785d58a..908b61d72 100644
--- a/src/NMTDS_NEW/NMTDS_ListIteratorOfListOfPassKeyBoolean.hxx
+++ b/src/NMTDS_NEW/NMTDS_ListIteratorOfListOfPassKeyBoolean.hxx
@@ -1,32 +1,32 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-// File:	NMTDS_ListIteratorOfListOfPassKeyBoolean.hxx
-// Created:	Mon Feb 20 07:27:34 2012
-// Author:	
-//		<pkv@BDEURI37616>
-
-
-#ifndef NMTDS_ListIteratorOfListOfPassKeyBoolean_HeaderFile
-#define NMTDS_ListIteratorOfListOfPassKeyBoolean_HeaderFile
-
-#ifndef NMTDS_ListOfPassKeyBoolean_HeaderFile
-#include <NMTDS_ListOfPassKeyBoolean.hxx>
-#endif 
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// File:	NMTDS_ListIteratorOfListOfPassKeyBoolean.hxx
+// Created:	Mon Feb 20 07:27:34 2012
+// Author:	
+//		<pkv@BDEURI37616>
+
+
+#ifndef NMTDS_ListIteratorOfListOfPassKeyBoolean_HeaderFile
+#define NMTDS_ListIteratorOfListOfPassKeyBoolean_HeaderFile
+
+#ifndef NMTDS_ListOfPassKeyBoolean_HeaderFile
+#include <NMTDS_ListOfPassKeyBoolean.hxx>
+#endif 
+
+#endif
diff --git a/src/NMTDS_NEW/NMTDS_ListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx b/src/NMTDS_NEW/NMTDS_ListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx
index 06af1646a..f89d3e3ac 100644
--- a/src/NMTDS_NEW/NMTDS_ListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx
+++ b/src/NMTDS_NEW/NMTDS_ListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx
@@ -1,34 +1,34 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-// File:	NMTDS_ListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx
-// Created:	Mon Feb 20 07:27:34 2012
-// Author:	
-//		<pkv@BDEURI37616>
-
-
-#ifndef NMTDS_ListOfIndexedDataMapOfShapeAncestorsSuccessors_HeaderFile
-#define NMTDS_ListOfIndexedDataMapOfShapeAncestorsSuccessors_HeaderFile
-
-#include <NCollection_List.hxx>   
-#include <BooleanOperations_IndexedDataMapOfShapeAncestorsSuccessors.hxx>
-
-typedef NCollection_List<BooleanOperations_IndexedDataMapOfShapeAncestorsSuccessors> NMTDS_ListOfIndexedDataMapOfShapeAncestorsSuccessors; 
-typedef NMTDS_ListOfIndexedDataMapOfShapeAncestorsSuccessors::Iterator NMTDS_ListIteratorOfListOfIndexedDataMapOfShapeAncestorsSuccessors;  
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// File:	NMTDS_ListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx
+// Created:	Mon Feb 20 07:27:34 2012
+// Author:	
+//		<pkv@BDEURI37616>
+
+
+#ifndef NMTDS_ListOfIndexedDataMapOfShapeAncestorsSuccessors_HeaderFile
+#define NMTDS_ListOfIndexedDataMapOfShapeAncestorsSuccessors_HeaderFile
+
+#include <NCollection_List.hxx>   
+#include <BooleanOperations_IndexedDataMapOfShapeAncestorsSuccessors.hxx>
+
+typedef NCollection_List<BooleanOperations_IndexedDataMapOfShapeAncestorsSuccessors> NMTDS_ListOfIndexedDataMapOfShapeAncestorsSuccessors; 
+typedef NMTDS_ListOfIndexedDataMapOfShapeAncestorsSuccessors::Iterator NMTDS_ListIteratorOfListOfIndexedDataMapOfShapeAncestorsSuccessors;  
+
+#endif
diff --git a/src/NMTDS_NEW/NMTDS_ListOfPair.hxx b/src/NMTDS_NEW/NMTDS_ListOfPair.hxx
index 8eb271057..400cd66fb 100644
--- a/src/NMTDS_NEW/NMTDS_ListOfPair.hxx
+++ b/src/NMTDS_NEW/NMTDS_ListOfPair.hxx
@@ -1,34 +1,34 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-// File:	NMTDS_ListOfPair.hxx
-// Created:	Mon Feb 20 07:27:34 2012
-// Author:	
-//		<pkv@BDEURI37616>
-
-
-#ifndef NMTDS_ListOfPair_HeaderFile
-#define NMTDS_ListOfPair_HeaderFile
-
-#include <NCollection_List.hxx>   
-#include <NMTDS_Pair.hxx>
-
-typedef NCollection_List<NMTDS_Pair> NMTDS_ListOfPair; 
-typedef NMTDS_ListOfPair::Iterator NMTDS_ListIteratorOfListOfPair;  
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// File:	NMTDS_ListOfPair.hxx
+// Created:	Mon Feb 20 07:27:34 2012
+// Author:	
+//		<pkv@BDEURI37616>
+
+
+#ifndef NMTDS_ListOfPair_HeaderFile
+#define NMTDS_ListOfPair_HeaderFile
+
+#include <NCollection_List.hxx>   
+#include <NMTDS_Pair.hxx>
+
+typedef NCollection_List<NMTDS_Pair> NMTDS_ListOfPair; 
+typedef NMTDS_ListOfPair::Iterator NMTDS_ListIteratorOfListOfPair;  
+
+#endif
diff --git a/src/NMTDS_NEW/NMTDS_ListOfPairBoolean.hxx b/src/NMTDS_NEW/NMTDS_ListOfPairBoolean.hxx
index 30e021078..e45f4b91a 100644
--- a/src/NMTDS_NEW/NMTDS_ListOfPairBoolean.hxx
+++ b/src/NMTDS_NEW/NMTDS_ListOfPairBoolean.hxx
@@ -1,34 +1,34 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-// File:	NMTDS_ListOfPairBoolean.hxx
-// Created:	Mon Feb 20 07:27:34 2012
-// Author:	
-//		<pkv@BDEURI37616>
-
-
-#ifndef NMTDS_ListOfPairBoolean_HeaderFile
-#define NMTDS_ListOfPairBoolean_HeaderFile
-
-#include <NCollection_List.hxx>   
-#include <NMTDS_PairBoolean.hxx>
-
-typedef NCollection_List<NMTDS_PairBoolean> NMTDS_ListOfPairBoolean; 
-typedef NMTDS_ListOfPairBoolean::Iterator NMTDS_ListIteratorOfListOfPairBoolean;  
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// File:	NMTDS_ListOfPairBoolean.hxx
+// Created:	Mon Feb 20 07:27:34 2012
+// Author:	
+//		<pkv@BDEURI37616>
+
+
+#ifndef NMTDS_ListOfPairBoolean_HeaderFile
+#define NMTDS_ListOfPairBoolean_HeaderFile
+
+#include <NCollection_List.hxx>   
+#include <NMTDS_PairBoolean.hxx>
+
+typedef NCollection_List<NMTDS_PairBoolean> NMTDS_ListOfPairBoolean; 
+typedef NMTDS_ListOfPairBoolean::Iterator NMTDS_ListIteratorOfListOfPairBoolean;  
+
+#endif
diff --git a/src/NMTDS_NEW/NMTDS_ListOfPassKey.hxx b/src/NMTDS_NEW/NMTDS_ListOfPassKey.hxx
index ceb30e996..3c920f215 100644
--- a/src/NMTDS_NEW/NMTDS_ListOfPassKey.hxx
+++ b/src/NMTDS_NEW/NMTDS_ListOfPassKey.hxx
@@ -1,34 +1,34 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-// File:	NMTDS_ListOfPassKey.hxx
-// Created:	Mon Feb 20 07:27:34 2012
-// Author:	
-//		<pkv@BDEURI37616>
-
-
-#ifndef NMTDS_ListOfPassKey_HeaderFile
-#define NMTDS_ListOfPassKey_HeaderFile
-
-#include <NCollection_List.hxx>   
-#include <NMTDS_PassKey.hxx>
-
-typedef NCollection_List<NMTDS_PassKey> NMTDS_ListOfPassKey; 
-typedef NMTDS_ListOfPassKey::Iterator NMTDS_ListIteratorOfListOfPassKey;  
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// File:	NMTDS_ListOfPassKey.hxx
+// Created:	Mon Feb 20 07:27:34 2012
+// Author:	
+//		<pkv@BDEURI37616>
+
+
+#ifndef NMTDS_ListOfPassKey_HeaderFile
+#define NMTDS_ListOfPassKey_HeaderFile
+
+#include <NCollection_List.hxx>   
+#include <NMTDS_PassKey.hxx>
+
+typedef NCollection_List<NMTDS_PassKey> NMTDS_ListOfPassKey; 
+typedef NMTDS_ListOfPassKey::Iterator NMTDS_ListIteratorOfListOfPassKey;  
+
+#endif
diff --git a/src/NMTDS_NEW/NMTDS_ListOfPassKeyBoolean.hxx b/src/NMTDS_NEW/NMTDS_ListOfPassKeyBoolean.hxx
index 369db2149..402b6f1d7 100644
--- a/src/NMTDS_NEW/NMTDS_ListOfPassKeyBoolean.hxx
+++ b/src/NMTDS_NEW/NMTDS_ListOfPassKeyBoolean.hxx
@@ -1,34 +1,34 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-// File:	NMTDS_ListOfPassKeyBoolean.hxx
-// Created:	Mon Feb 20 07:27:34 2012
-// Author:	
-//		<pkv@BDEURI37616>
-
-
-#ifndef NMTDS_ListOfPassKeyBoolean_HeaderFile
-#define NMTDS_ListOfPassKeyBoolean_HeaderFile
-
-#include <NCollection_List.hxx>   
-#include <NMTDS_PassKeyBoolean.hxx>
-
-typedef NCollection_List<NMTDS_PassKeyBoolean> NMTDS_ListOfPassKeyBoolean; 
-typedef NMTDS_ListOfPassKeyBoolean::Iterator NMTDS_ListIteratorOfListOfPassKeyBoolean;  
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// File:	NMTDS_ListOfPassKeyBoolean.hxx
+// Created:	Mon Feb 20 07:27:34 2012
+// Author:	
+//		<pkv@BDEURI37616>
+
+
+#ifndef NMTDS_ListOfPassKeyBoolean_HeaderFile
+#define NMTDS_ListOfPassKeyBoolean_HeaderFile
+
+#include <NCollection_List.hxx>   
+#include <NMTDS_PassKeyBoolean.hxx>
+
+typedef NCollection_List<NMTDS_PassKeyBoolean> NMTDS_ListOfPassKeyBoolean; 
+typedef NMTDS_ListOfPassKeyBoolean::Iterator NMTDS_ListIteratorOfListOfPassKeyBoolean;  
+
+#endif
diff --git a/src/NMTDS_NEW/NMTDS_MapIteratorOfMapOfPairBoolean.hxx b/src/NMTDS_NEW/NMTDS_MapIteratorOfMapOfPairBoolean.hxx
index 45c6df295..5bce39236 100644
--- a/src/NMTDS_NEW/NMTDS_MapIteratorOfMapOfPairBoolean.hxx
+++ b/src/NMTDS_NEW/NMTDS_MapIteratorOfMapOfPairBoolean.hxx
@@ -1,33 +1,33 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-
-// File:	NMTDS_MapIteratorOfMapOfPairBoolean.hxx
-// Created:	Mon Feb 20 08:22:39 2012
-// Author:	
-//		<pkv@BDEURI37616>
-
-
-#ifndef NMTDS_MapIteratorOfMapOfPairBoolean_HeaderFile
-#define NMTDS_MapIteratorOfMapOfPairBoolean_HeaderFile
-
-#ifndef NMTDS_MapOfPairBoolean_HeaderFile
-#include <NMTDS_MapOfPairBoolean.hxx>  
-#endif
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File:	NMTDS_MapIteratorOfMapOfPairBoolean.hxx
+// Created:	Mon Feb 20 08:22:39 2012
+// Author:	
+//		<pkv@BDEURI37616>
+
+
+#ifndef NMTDS_MapIteratorOfMapOfPairBoolean_HeaderFile
+#define NMTDS_MapIteratorOfMapOfPairBoolean_HeaderFile
+
+#ifndef NMTDS_MapOfPairBoolean_HeaderFile
+#include <NMTDS_MapOfPairBoolean.hxx>  
+#endif
+
+#endif
diff --git a/src/NMTDS_NEW/NMTDS_MapIteratorOfMapOfPassKey.hxx b/src/NMTDS_NEW/NMTDS_MapIteratorOfMapOfPassKey.hxx
index cb2ec9454..b96214eda 100644
--- a/src/NMTDS_NEW/NMTDS_MapIteratorOfMapOfPassKey.hxx
+++ b/src/NMTDS_NEW/NMTDS_MapIteratorOfMapOfPassKey.hxx
@@ -1,33 +1,33 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-
-// File:	NMRCol_MapIteratorOfMapOfPassKey.hxx
-// Created:	Mon Feb 20 08:22:39 2012
-// Author:	
-//		<pkv@BDEURI37616>
-
-
-#ifndef NMRCol_MapIteratorOfMapOfPassKey_HeaderFile
-#define NMRCol_MapIteratorOfMapOfPassKey_HeaderFile
-
-#ifndef NMTDS_MapOfPassKey_HeaderFile
-#include <NMTDS_MapOfPassKey.hxx>  
-#endif
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File:	NMRCol_MapIteratorOfMapOfPassKey.hxx
+// Created:	Mon Feb 20 08:22:39 2012
+// Author:	
+//		<pkv@BDEURI37616>
+
+
+#ifndef NMRCol_MapIteratorOfMapOfPassKey_HeaderFile
+#define NMRCol_MapIteratorOfMapOfPassKey_HeaderFile
+
+#ifndef NMTDS_MapOfPassKey_HeaderFile
+#include <NMTDS_MapOfPassKey.hxx>  
+#endif
+
+#endif
diff --git a/src/NMTDS_NEW/NMTDS_MapIteratorOfMapOfPassKeyBoolean.hxx b/src/NMTDS_NEW/NMTDS_MapIteratorOfMapOfPassKeyBoolean.hxx
index 8fc515ce6..db4dc221d 100644
--- a/src/NMTDS_NEW/NMTDS_MapIteratorOfMapOfPassKeyBoolean.hxx
+++ b/src/NMTDS_NEW/NMTDS_MapIteratorOfMapOfPassKeyBoolean.hxx
@@ -1,33 +1,33 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-
-// File:	NMRCol_MapIteratorOfMapOfPassKeyBoolean.hxx
-// Created:	Mon Feb 20 08:22:39 2012
-// Author:	
-//		<pkv@BDEURI37616>
-
-
-#ifndef NMRCol_MapIteratorOfMapOfPassKeyBoolean_HeaderFile
-#define NMRCol_MapIteratorOfMapOfPassKeyBoolean_HeaderFile
-
-#ifndef NMTDS_MapOfPassKeyBoolean_HeaderFile
-#include <NMTDS_MapOfPassKeyBoolean.hxx>  
-#endif
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File:	NMRCol_MapIteratorOfMapOfPassKeyBoolean.hxx
+// Created:	Mon Feb 20 08:22:39 2012
+// Author:	
+//		<pkv@BDEURI37616>
+
+
+#ifndef NMRCol_MapIteratorOfMapOfPassKeyBoolean_HeaderFile
+#define NMRCol_MapIteratorOfMapOfPassKeyBoolean_HeaderFile
+
+#ifndef NMTDS_MapOfPassKeyBoolean_HeaderFile
+#include <NMTDS_MapOfPassKeyBoolean.hxx>  
+#endif
+
+#endif
diff --git a/src/NMTDS_NEW/NMTDS_MapOfPairBoolean.hxx b/src/NMTDS_NEW/NMTDS_MapOfPairBoolean.hxx
index af42e830c..0fdb9c41d 100644
--- a/src/NMTDS_NEW/NMTDS_MapOfPairBoolean.hxx
+++ b/src/NMTDS_NEW/NMTDS_MapOfPairBoolean.hxx
@@ -1,40 +1,40 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-
-// File:	NMTDS_MapOfPairBoolean.hxx
-// Created:	Mon Feb 20 08:19:07 2012
-// Author:	
-//		<pkv@BDEURI37616>
-
-
-#ifndef NMTDS_MapOfPairBoolean_HeaderFile
-#define NMTDS_MapOfPairBoolean_HeaderFile
-
-#include <NMTDS_PairBoolean.hxx>  
-#include <NMTDS_PairMapHasher.hxx>
-
-#define _NCollection_MapHasher
-#include <NCollection_Map.hxx>   
-
-typedef NCollection_Map<NMTDS_PairBoolean, NMTDS_PairMapHasher> NMTDS_MapOfPairBoolean; 
-typedef NMTDS_MapOfPairBoolean::Iterator NMTDS_MapIteratorOfMapOfPairBoolean;  
-
-#undef _NCollection_MapHasher
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File:	NMTDS_MapOfPairBoolean.hxx
+// Created:	Mon Feb 20 08:19:07 2012
+// Author:	
+//		<pkv@BDEURI37616>
+
+
+#ifndef NMTDS_MapOfPairBoolean_HeaderFile
+#define NMTDS_MapOfPairBoolean_HeaderFile
+
+#include <NMTDS_PairBoolean.hxx>  
+#include <NMTDS_PairMapHasher.hxx>
+
+#define _NCollection_MapHasher
+#include <NCollection_Map.hxx>   
+
+typedef NCollection_Map<NMTDS_PairBoolean, NMTDS_PairMapHasher> NMTDS_MapOfPairBoolean; 
+typedef NMTDS_MapOfPairBoolean::Iterator NMTDS_MapIteratorOfMapOfPairBoolean;  
+
+#undef _NCollection_MapHasher
+
+#endif
diff --git a/src/NMTDS_NEW/NMTDS_MapOfPassKey.hxx b/src/NMTDS_NEW/NMTDS_MapOfPassKey.hxx
index 831568394..4648a43cf 100644
--- a/src/NMTDS_NEW/NMTDS_MapOfPassKey.hxx
+++ b/src/NMTDS_NEW/NMTDS_MapOfPassKey.hxx
@@ -1,40 +1,40 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-
-// File:	NMTDS_MapOfPassKey.hxx
-// Created:	Mon Feb 20 08:19:07 2012
-// Author:	
-//		<pkv@BDEURI37616>
-
-
-#ifndef NMTDS_MapOfPassKey_HeaderFile
-#define NMTDS_MapOfPassKey_HeaderFile
-
-#include <NMTDS_PassKey.hxx>  
-#include <NMTDS_PassKeyMapHasher.hxx>
-
-#define _NCollection_MapHasher
-#include <NCollection_Map.hxx>   
-
-typedef NCollection_Map<NMTDS_PassKey, NMTDS_PassKeyMapHasher> NMTDS_MapOfPassKey; 
-typedef NMTDS_MapOfPassKey::Iterator NMTDS_MapIteratorOfMapOfPassKey;  
-
-#undef _NCollection_MapHasher
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File:	NMTDS_MapOfPassKey.hxx
+// Created:	Mon Feb 20 08:19:07 2012
+// Author:	
+//		<pkv@BDEURI37616>
+
+
+#ifndef NMTDS_MapOfPassKey_HeaderFile
+#define NMTDS_MapOfPassKey_HeaderFile
+
+#include <NMTDS_PassKey.hxx>  
+#include <NMTDS_PassKeyMapHasher.hxx>
+
+#define _NCollection_MapHasher
+#include <NCollection_Map.hxx>   
+
+typedef NCollection_Map<NMTDS_PassKey, NMTDS_PassKeyMapHasher> NMTDS_MapOfPassKey; 
+typedef NMTDS_MapOfPassKey::Iterator NMTDS_MapIteratorOfMapOfPassKey;  
+
+#undef _NCollection_MapHasher
+
+#endif
diff --git a/src/NMTDS_NEW/NMTDS_MapOfPassKeyBoolean.hxx b/src/NMTDS_NEW/NMTDS_MapOfPassKeyBoolean.hxx
index b07f2416e..bbc2596e6 100644
--- a/src/NMTDS_NEW/NMTDS_MapOfPassKeyBoolean.hxx
+++ b/src/NMTDS_NEW/NMTDS_MapOfPassKeyBoolean.hxx
@@ -1,40 +1,40 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-
-// File:	NMTDS_MapOfPassKeyBoolean.hxx
-// Created:	Mon Feb 20 08:19:07 2012
-// Author:	
-//		<pkv@BDEURI37616>
-
-
-#ifndef NMTDS_MapOfPassKeyBoolean_HeaderFile
-#define NMTDS_MapOfPassKeyBoolean_HeaderFile
-
-#include <NMTDS_PassKeyBoolean.hxx>  
-#include <NMTDS_PassKeyMapHasher.hxx>
-
-#define _NCollection_MapHasher
-#include <NCollection_Map.hxx>   
-
-typedef NCollection_Map<NMTDS_PassKeyBoolean, NMTDS_PassKeyMapHasher> NMTDS_MapOfPassKeyBoolean; 
-typedef NMTDS_MapOfPassKeyBoolean::Iterator NMTDS_MapIteratorOfMapOfPassKeyBoolean;  
-
-#undef _NCollection_MapHasher
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File:	NMTDS_MapOfPassKeyBoolean.hxx
+// Created:	Mon Feb 20 08:19:07 2012
+// Author:	
+//		<pkv@BDEURI37616>
+
+
+#ifndef NMTDS_MapOfPassKeyBoolean_HeaderFile
+#define NMTDS_MapOfPassKeyBoolean_HeaderFile
+
+#include <NMTDS_PassKeyBoolean.hxx>  
+#include <NMTDS_PassKeyMapHasher.hxx>
+
+#define _NCollection_MapHasher
+#include <NCollection_Map.hxx>   
+
+typedef NCollection_Map<NMTDS_PassKeyBoolean, NMTDS_PassKeyMapHasher> NMTDS_MapOfPassKeyBoolean; 
+typedef NMTDS_MapOfPassKeyBoolean::Iterator NMTDS_MapIteratorOfMapOfPassKeyBoolean;  
+
+#undef _NCollection_MapHasher
+
+#endif
diff --git a/src/NMTDS_NEW/NMTDS_PInterfPool.hxx b/src/NMTDS_NEW/NMTDS_PInterfPool.hxx
index c9973ce47..68a45c7dc 100644
--- a/src/NMTDS_NEW/NMTDS_PInterfPool.hxx
+++ b/src/NMTDS_NEW/NMTDS_PInterfPool.hxx
@@ -1,32 +1,33 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
-// File:        NMTDS_PInterfPool.hxx
-// Author:      Peter KURNEV
-
-#ifndef _NMTDS_PInterfPool_HeaderFile
-#define _NMTDS_PInterfPool_HeaderFile
-
-class NMTDS_InterfPool;
-
-typedef NMTDS_InterfPool* NMTDS_PInterfPool;
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File:        NMTDS_PInterfPool.hxx
+// Author:      Peter KURNEV
+
+#ifndef _NMTDS_PInterfPool_HeaderFile
+#define _NMTDS_PInterfPool_HeaderFile
+
+class NMTDS_InterfPool;
+
+typedef NMTDS_InterfPool* NMTDS_PInterfPool;
+
+#endif
diff --git a/src/NMTDS_NEW/NMTDS_PIterator.hxx b/src/NMTDS_NEW/NMTDS_PIterator.hxx
index 007ce188d..8c745d979 100644
--- a/src/NMTDS_NEW/NMTDS_PIterator.hxx
+++ b/src/NMTDS_NEW/NMTDS_PIterator.hxx
@@ -1,32 +1,33 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
-// File:        NMTDS_PIterator.hxx
-// Author:      Peter KURNEV
-
-#ifndef _NMTDS_PIterator_HeaderFile
-#define _NMTDS_PIterator_HeaderFile
-
-class NMTDS_Iterator;
-
-typedef NMTDS_Iterator* NMTDS_PIterator;
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File:        NMTDS_PIterator.hxx
+// Author:      Peter KURNEV
+
+#ifndef _NMTDS_PIterator_HeaderFile
+#define _NMTDS_PIterator_HeaderFile
+
+class NMTDS_Iterator;
+
+typedef NMTDS_Iterator* NMTDS_PIterator;
+
+#endif
diff --git a/src/NMTDS_NEW/NMTDS_PShapesDataStructure.hxx b/src/NMTDS_NEW/NMTDS_PShapesDataStructure.hxx
index d38652121..66c380da6 100644
--- a/src/NMTDS_NEW/NMTDS_PShapesDataStructure.hxx
+++ b/src/NMTDS_NEW/NMTDS_PShapesDataStructure.hxx
@@ -1,32 +1,33 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
-// File:        NMTDS_PShapesDataStructure.hxx
-// Author:      Peter KURNEV
-
-#ifndef _NMTDS_PShapesDataStructure_HeaderFile
-#define _NMTDS_PShapesDataStructure_HeaderFile
-
-class NMTDS_ShapesDataStructure;
-
-typedef NMTDS_ShapesDataStructure* NMTDS_PShapesDataStructure;
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File:        NMTDS_PShapesDataStructure.hxx
+// Author:      Peter KURNEV
+
+#ifndef _NMTDS_PShapesDataStructure_HeaderFile
+#define _NMTDS_PShapesDataStructure_HeaderFile
+
+class NMTDS_ShapesDataStructure;
+
+typedef NMTDS_ShapesDataStructure* NMTDS_PShapesDataStructure;
+
+#endif
diff --git a/src/NMTDS_NEW/NMTDS_Pair.cxx b/src/NMTDS_NEW/NMTDS_Pair.cxx
index 682bf1587..5e2fd50bc 100644
--- a/src/NMTDS_NEW/NMTDS_Pair.cxx
+++ b/src/NMTDS_NEW/NMTDS_Pair.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File:        NMTDS_Pair.cxx
 // Author:      Peter KURNEV
diff --git a/src/NMTDS_NEW/NMTDS_Pair.hxx b/src/NMTDS_NEW/NMTDS_Pair.hxx
index 4d64b1e48..d0a4de9f9 100644
--- a/src/NMTDS_NEW/NMTDS_Pair.hxx
+++ b/src/NMTDS_NEW/NMTDS_Pair.hxx
@@ -1,72 +1,73 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
-// File:        NMTDS_Pair.hxx
-// Author:      Peter KURNEV
-
-#ifndef _NMTDS_Pair_HeaderFile
-#define _NMTDS_Pair_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_Macro.hxx>
-#include <Standard_Integer.hxx>
-#include <Standard_Boolean.hxx>
-
-//=======================================================================
-//function : NMTDS_Pair
-//purpose  : 
-//=======================================================================
-class NMTDS_Pair  {
- public:
-  Standard_EXPORT   
-    NMTDS_Pair();
-
-  Standard_EXPORT
-    virtual ~NMTDS_Pair();
-  
-  Standard_EXPORT   
-    NMTDS_Pair(const NMTDS_Pair& Other);
-
-  Standard_EXPORT
-    NMTDS_Pair& operator =(const NMTDS_Pair& Other);
-  
-  Standard_EXPORT
-    void Clear() ;
-  
-  Standard_EXPORT
-    void SetIds(const Standard_Integer aI1,
-		const Standard_Integer aI2) ;
-  
-  Standard_EXPORT
-    void Ids(Standard_Integer& aI1,
-	     Standard_Integer& aI2) const;
-  
-  Standard_EXPORT
-    Standard_Boolean IsEqual(const NMTDS_Pair& aOther) const;
-  
-  Standard_EXPORT
-    Standard_Integer HashCode(const Standard_Integer Upper) const;
-
-protected:
-Standard_Integer myId1;
-Standard_Integer myId2;
-};
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File:        NMTDS_Pair.hxx
+// Author:      Peter KURNEV
+
+#ifndef _NMTDS_Pair_HeaderFile
+#define _NMTDS_Pair_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Macro.hxx>
+#include <Standard_Integer.hxx>
+#include <Standard_Boolean.hxx>
+
+//=======================================================================
+//function : NMTDS_Pair
+//purpose  : 
+//=======================================================================
+class NMTDS_Pair  {
+ public:
+  Standard_EXPORT   
+    NMTDS_Pair();
+
+  Standard_EXPORT
+    virtual ~NMTDS_Pair();
+  
+  Standard_EXPORT   
+    NMTDS_Pair(const NMTDS_Pair& Other);
+
+  Standard_EXPORT
+    NMTDS_Pair& operator =(const NMTDS_Pair& Other);
+  
+  Standard_EXPORT
+    void Clear() ;
+  
+  Standard_EXPORT
+    void SetIds(const Standard_Integer aI1,
+		const Standard_Integer aI2) ;
+  
+  Standard_EXPORT
+    void Ids(Standard_Integer& aI1,
+	     Standard_Integer& aI2) const;
+  
+  Standard_EXPORT
+    Standard_Boolean IsEqual(const NMTDS_Pair& aOther) const;
+  
+  Standard_EXPORT
+    Standard_Integer HashCode(const Standard_Integer Upper) const;
+
+protected:
+Standard_Integer myId1;
+Standard_Integer myId2;
+};
+#endif
diff --git a/src/NMTDS_NEW/NMTDS_PairBoolean.cxx b/src/NMTDS_NEW/NMTDS_PairBoolean.cxx
index 4a7a38f8c..9067d5c94 100644
--- a/src/NMTDS_NEW/NMTDS_PairBoolean.cxx
+++ b/src/NMTDS_NEW/NMTDS_PairBoolean.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File:        NMTDS_PairBoolean.cxx
 // Author:      Peter KURNEV
diff --git a/src/NMTDS_NEW/NMTDS_PairBoolean.hxx b/src/NMTDS_NEW/NMTDS_PairBoolean.hxx
index a469b923e..308c8fc05 100644
--- a/src/NMTDS_NEW/NMTDS_PairBoolean.hxx
+++ b/src/NMTDS_NEW/NMTDS_PairBoolean.hxx
@@ -1,57 +1,58 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
-// File:        NMTDS_PairBoolean.hxx
-// Author:      Peter KURNEV
-
-#ifndef _NMTDS_PairBoolean_HeaderFile
-#define _NMTDS_PairBoolean_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_Macro.hxx>
-#include <Standard_Boolean.hxx>
-#include <NMTDS_Pair.hxx>
-
-//=======================================================================
-//class    : NMTDS_PairBoolean
-//purpose  : 
-//=======================================================================
-class NMTDS_PairBoolean  : public NMTDS_Pair {
- public:
-  Standard_EXPORT
-    NMTDS_PairBoolean();
-  
-  Standard_EXPORT
-    virtual ~NMTDS_PairBoolean();
-  
-  Standard_EXPORT
-    void SetFlag(const Standard_Boolean aFlag) ;
- 
-  Standard_EXPORT
-    NMTDS_PairBoolean& operator =(const NMTDS_PairBoolean& Other);
-  
-  Standard_EXPORT
-    Standard_Boolean Flag() const;
-
-protected:
-  Standard_Boolean myFlag;
-};
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File:        NMTDS_PairBoolean.hxx
+// Author:      Peter KURNEV
+
+#ifndef _NMTDS_PairBoolean_HeaderFile
+#define _NMTDS_PairBoolean_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Macro.hxx>
+#include <Standard_Boolean.hxx>
+#include <NMTDS_Pair.hxx>
+
+//=======================================================================
+//class    : NMTDS_PairBoolean
+//purpose  : 
+//=======================================================================
+class NMTDS_PairBoolean  : public NMTDS_Pair {
+ public:
+  Standard_EXPORT
+    NMTDS_PairBoolean();
+  
+  Standard_EXPORT
+    virtual ~NMTDS_PairBoolean();
+  
+  Standard_EXPORT
+    void SetFlag(const Standard_Boolean aFlag) ;
+ 
+  Standard_EXPORT
+    NMTDS_PairBoolean& operator =(const NMTDS_PairBoolean& Other);
+  
+  Standard_EXPORT
+    Standard_Boolean Flag() const;
+
+protected:
+  Standard_Boolean myFlag;
+};
+#endif
diff --git a/src/NMTDS_NEW/NMTDS_PairMapHasher.cxx b/src/NMTDS_NEW/NMTDS_PairMapHasher.cxx
index b07202822..3dadcc181 100644
--- a/src/NMTDS_NEW/NMTDS_PairMapHasher.cxx
+++ b/src/NMTDS_NEW/NMTDS_PairMapHasher.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File:        NMTDS_PairMapHasher.cxx
 // Author:      Peter KURNEV
diff --git a/src/NMTDS_NEW/NMTDS_PairMapHasher.hxx b/src/NMTDS_NEW/NMTDS_PairMapHasher.hxx
index 65c8796f6..19dfea723 100644
--- a/src/NMTDS_NEW/NMTDS_PairMapHasher.hxx
+++ b/src/NMTDS_NEW/NMTDS_PairMapHasher.hxx
@@ -1,48 +1,49 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
-// File:        NMTDS_PairMapHasher.cxx
-// Author:      Peter KURNEV
-
-#ifndef _NMTDS_PairMapHasher_HeaderFile
-#define _NMTDS_PairMapHasher_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_Macro.hxx>
-#include <Standard_Integer.hxx>
-#include <NMTDS_Pair.hxx>
-#include <Standard_Boolean.hxx>
-
-//=======================================================================
-//class    : NMTDS_PairMapHasher
-//purpose  : 
-//=======================================================================
-class NMTDS_PairMapHasher  {
- public:
-  Standard_EXPORT
-    static  Standard_Integer HashCode(const NMTDS_Pair& aPKey,
-				      const Standard_Integer Upper) ;
-  
-  Standard_EXPORT   
-    static  Standard_Boolean IsEqual(const NMTDS_Pair& aPKey1,
-				     const NMTDS_Pair& aPKey2) ;
-};
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File:        NMTDS_PairMapHasher.cxx
+// Author:      Peter KURNEV
+
+#ifndef _NMTDS_PairMapHasher_HeaderFile
+#define _NMTDS_PairMapHasher_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Macro.hxx>
+#include <Standard_Integer.hxx>
+#include <NMTDS_Pair.hxx>
+#include <Standard_Boolean.hxx>
+
+//=======================================================================
+//class    : NMTDS_PairMapHasher
+//purpose  : 
+//=======================================================================
+class NMTDS_PairMapHasher  {
+ public:
+  Standard_EXPORT
+    static  Standard_Integer HashCode(const NMTDS_Pair& aPKey,
+				      const Standard_Integer Upper) ;
+  
+  Standard_EXPORT   
+    static  Standard_Boolean IsEqual(const NMTDS_Pair& aPKey1,
+				     const NMTDS_Pair& aPKey2) ;
+};
+#endif
diff --git a/src/NMTDS_NEW/NMTDS_PassKey.cxx b/src/NMTDS_NEW/NMTDS_PassKey.cxx
index 9f7663696..4d8aa41aa 100644
--- a/src/NMTDS_NEW/NMTDS_PassKey.cxx
+++ b/src/NMTDS_NEW/NMTDS_PassKey.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS_NEW/NMTDS_PassKey.hxx b/src/NMTDS_NEW/NMTDS_PassKey.hxx
index cf8077cdb..88fb6cb0f 100644
--- a/src/NMTDS_NEW/NMTDS_PassKey.hxx
+++ b/src/NMTDS_NEW/NMTDS_PassKey.hxx
@@ -1,103 +1,103 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-
-// File:        NMTDS_PassKey.hxx
-// Created:     
-// Author:      Peter KURNEV
-//              <peter@PREFEX>
-//
-#ifndef _NMTDS_PassKey_HeaderFile
-#define _NMTDS_PassKey_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_Macro.hxx>
-#include <Standard_Integer.hxx>
-#include <TColStd_IndexedMapOfInteger.hxx>
-#include <Standard_Boolean.hxx>
-#include <TColStd_ListOfInteger.hxx>
-
-//=======================================================================
-//function : NMTDS_PassKey
-//purpose  : 
-//=======================================================================
-class NMTDS_PassKey  {
- public:
-  Standard_EXPORT   
-    NMTDS_PassKey();
-  
-  Standard_EXPORT
-    virtual ~NMTDS_PassKey();
-  
-  Standard_EXPORT
-    NMTDS_PassKey(const NMTDS_PassKey& Other);
-
-  Standard_EXPORT 
-    NMTDS_PassKey& operator =(const NMTDS_PassKey& Other);
-  
-  Standard_EXPORT
-    void Clear() ;
-  
-  Standard_EXPORT
-    void SetIds(const Standard_Integer aI1) ;
-  
-  Standard_EXPORT
-    void SetIds(const Standard_Integer aI1,
-		const Standard_Integer aI2) ;
-  
-  Standard_EXPORT
-    void SetIds(const Standard_Integer aI1,
-		const Standard_Integer aI2,
-		const Standard_Integer aI3) ;
-  
-  Standard_EXPORT
-    void SetIds(const Standard_Integer aI1,
-		const Standard_Integer aI2,
-		const Standard_Integer aI3,
-		const Standard_Integer aI4) ;
-  
-  Standard_EXPORT
-    void SetIds(const TColStd_ListOfInteger& aLS) ;
-  
-  Standard_EXPORT
-    Standard_Integer NbIds() const;
-  
-  Standard_EXPORT
-    Standard_Boolean IsEqual(const NMTDS_PassKey& aOther) const;
-  
-  Standard_EXPORT
-    Standard_Integer HashCode(const Standard_Integer Upper) const;
-  
-  Standard_EXPORT
-    Standard_Integer Id(const Standard_Integer aIndex) const;
-  
-  Standard_EXPORT
-    void Ids(Standard_Integer& aI1,Standard_Integer& aI2) const;
-  
-  Standard_EXPORT
-    void Dump(const Standard_Integer aHex = 0) const;
-
-protected:
-  Standard_Integer myNbIds;
-  Standard_Integer mySum;
-  TColStd_IndexedMapOfInteger myMap;
-};
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File:        NMTDS_PassKey.hxx
+// Created:     
+// Author:      Peter KURNEV
+//              <peter@PREFEX>
+//
+#ifndef _NMTDS_PassKey_HeaderFile
+#define _NMTDS_PassKey_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Macro.hxx>
+#include <Standard_Integer.hxx>
+#include <TColStd_IndexedMapOfInteger.hxx>
+#include <Standard_Boolean.hxx>
+#include <TColStd_ListOfInteger.hxx>
+
+//=======================================================================
+//function : NMTDS_PassKey
+//purpose  : 
+//=======================================================================
+class NMTDS_PassKey  {
+ public:
+  Standard_EXPORT   
+    NMTDS_PassKey();
+  
+  Standard_EXPORT
+    virtual ~NMTDS_PassKey();
+  
+  Standard_EXPORT
+    NMTDS_PassKey(const NMTDS_PassKey& Other);
+
+  Standard_EXPORT 
+    NMTDS_PassKey& operator =(const NMTDS_PassKey& Other);
+  
+  Standard_EXPORT
+    void Clear() ;
+  
+  Standard_EXPORT
+    void SetIds(const Standard_Integer aI1) ;
+  
+  Standard_EXPORT
+    void SetIds(const Standard_Integer aI1,
+		const Standard_Integer aI2) ;
+  
+  Standard_EXPORT
+    void SetIds(const Standard_Integer aI1,
+		const Standard_Integer aI2,
+		const Standard_Integer aI3) ;
+  
+  Standard_EXPORT
+    void SetIds(const Standard_Integer aI1,
+		const Standard_Integer aI2,
+		const Standard_Integer aI3,
+		const Standard_Integer aI4) ;
+  
+  Standard_EXPORT
+    void SetIds(const TColStd_ListOfInteger& aLS) ;
+  
+  Standard_EXPORT
+    Standard_Integer NbIds() const;
+  
+  Standard_EXPORT
+    Standard_Boolean IsEqual(const NMTDS_PassKey& aOther) const;
+  
+  Standard_EXPORT
+    Standard_Integer HashCode(const Standard_Integer Upper) const;
+  
+  Standard_EXPORT
+    Standard_Integer Id(const Standard_Integer aIndex) const;
+  
+  Standard_EXPORT
+    void Ids(Standard_Integer& aI1,Standard_Integer& aI2) const;
+  
+  Standard_EXPORT
+    void Dump(const Standard_Integer aHex = 0) const;
+
+protected:
+  Standard_Integer myNbIds;
+  Standard_Integer mySum;
+  TColStd_IndexedMapOfInteger myMap;
+};
+#endif
diff --git a/src/NMTDS_NEW/NMTDS_PassKeyBoolean.cxx b/src/NMTDS_NEW/NMTDS_PassKeyBoolean.cxx
index af9ae8c5e..dc0c77704 100644
--- a/src/NMTDS_NEW/NMTDS_PassKeyBoolean.cxx
+++ b/src/NMTDS_NEW/NMTDS_PassKeyBoolean.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS_NEW/NMTDS_PassKeyBoolean.hxx b/src/NMTDS_NEW/NMTDS_PassKeyBoolean.hxx
index 1e46bf20f..210efb63f 100644
--- a/src/NMTDS_NEW/NMTDS_PassKeyBoolean.hxx
+++ b/src/NMTDS_NEW/NMTDS_PassKeyBoolean.hxx
@@ -1,60 +1,60 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-
-// File:        NMTDS_PassKeyBoolean.hxx
-// Created:     
-// Author:      Peter KURNEV
-//              <pkv@irinox>
-//
-#ifndef _NMTDS_PassKeyBoolean_HeaderFile
-#define _NMTDS_PassKeyBoolean_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_Macro.hxx>
-#include <Standard_Boolean.hxx>
-#include <NMTDS_PassKey.hxx>
-
-//=======================================================================
-//class    : NMTDS_PassKeyBoolean
-//purpose  : 
-//=======================================================================
-class NMTDS_PassKeyBoolean  : public NMTDS_PassKey {
- public:
-  Standard_EXPORT 
-    NMTDS_PassKeyBoolean();
-
-  Standard_EXPORT
-    virtual ~NMTDS_PassKeyBoolean();
-  
-  Standard_EXPORT
-    void SetFlag(const Standard_Boolean aFlag) ;
-  
-  Standard_EXPORT
-    NMTDS_PassKeyBoolean& operator =(const NMTDS_PassKeyBoolean& Other);
-  
-  Standard_EXPORT
-    Standard_Boolean Flag() const;
-
- protected:
-  Standard_Boolean myFlag;
-};
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File:        NMTDS_PassKeyBoolean.hxx
+// Created:     
+// Author:      Peter KURNEV
+//              <pkv@irinox>
+//
+#ifndef _NMTDS_PassKeyBoolean_HeaderFile
+#define _NMTDS_PassKeyBoolean_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Macro.hxx>
+#include <Standard_Boolean.hxx>
+#include <NMTDS_PassKey.hxx>
+
+//=======================================================================
+//class    : NMTDS_PassKeyBoolean
+//purpose  : 
+//=======================================================================
+class NMTDS_PassKeyBoolean  : public NMTDS_PassKey {
+ public:
+  Standard_EXPORT 
+    NMTDS_PassKeyBoolean();
+
+  Standard_EXPORT
+    virtual ~NMTDS_PassKeyBoolean();
+  
+  Standard_EXPORT
+    void SetFlag(const Standard_Boolean aFlag) ;
+  
+  Standard_EXPORT
+    NMTDS_PassKeyBoolean& operator =(const NMTDS_PassKeyBoolean& Other);
+  
+  Standard_EXPORT
+    Standard_Boolean Flag() const;
+
+ protected:
+  Standard_Boolean myFlag;
+};
+#endif
diff --git a/src/NMTDS_NEW/NMTDS_PassKeyMapHasher.cxx b/src/NMTDS_NEW/NMTDS_PassKeyMapHasher.cxx
index a77d8fa34..3b55d93db 100644
--- a/src/NMTDS_NEW/NMTDS_PassKeyMapHasher.cxx
+++ b/src/NMTDS_NEW/NMTDS_PassKeyMapHasher.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTDS_NEW/NMTDS_PassKeyMapHasher.hxx b/src/NMTDS_NEW/NMTDS_PassKeyMapHasher.hxx
index f26688d1a..1ad371c3e 100644
--- a/src/NMTDS_NEW/NMTDS_PassKeyMapHasher.hxx
+++ b/src/NMTDS_NEW/NMTDS_PassKeyMapHasher.hxx
@@ -1,52 +1,52 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-
-// File:        NMTDS_PassKeyMapHasher.hxx
-// Created:     
-// Author:      Peter KURNEV
-//              <pkv@irinox>
-//
-#ifndef _NMTDS_PassKeyMapHasher_HeaderFile
-#define _NMTDS_PassKeyMapHasher_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_Macro.hxx>
-#include <Standard_Integer.hxx>
-#include <NMTDS_PassKey.hxx>
-#include <Standard_Boolean.hxx>
-
-
-//=======================================================================
-//function : NMTDS_PassKeyMapHasher
-//purpose  : 
-//=======================================================================
-class NMTDS_PassKeyMapHasher  {
- public:
-  Standard_EXPORT
-    static  Standard_Integer HashCode(const NMTDS_PassKey& aPKey,
-				      const Standard_Integer Upper) ;
-  
-  Standard_EXPORT   
-    static  Standard_Boolean IsEqual(const NMTDS_PassKey& aPKey1,
-				     const NMTDS_PassKey& aPKey2) ;
-};
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File:        NMTDS_PassKeyMapHasher.hxx
+// Created:     
+// Author:      Peter KURNEV
+//              <pkv@irinox>
+//
+#ifndef _NMTDS_PassKeyMapHasher_HeaderFile
+#define _NMTDS_PassKeyMapHasher_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Macro.hxx>
+#include <Standard_Integer.hxx>
+#include <NMTDS_PassKey.hxx>
+#include <Standard_Boolean.hxx>
+
+
+//=======================================================================
+//function : NMTDS_PassKeyMapHasher
+//purpose  : 
+//=======================================================================
+class NMTDS_PassKeyMapHasher  {
+ public:
+  Standard_EXPORT
+    static  Standard_Integer HashCode(const NMTDS_PassKey& aPKey,
+				      const Standard_Integer Upper) ;
+  
+  Standard_EXPORT   
+    static  Standard_Boolean IsEqual(const NMTDS_PassKey& aPKey1,
+				     const NMTDS_PassKey& aPKey2) ;
+};
+#endif
diff --git a/src/NMTDS_NEW/NMTDS_PassKeyShape.cxx b/src/NMTDS_NEW/NMTDS_PassKeyShape.cxx
index 87ae5d764..5010c582a 100644
--- a/src/NMTDS_NEW/NMTDS_PassKeyShape.cxx
+++ b/src/NMTDS_NEW/NMTDS_PassKeyShape.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/NMTDS_NEW/NMTDS_PassKeyShape.hxx b/src/NMTDS_NEW/NMTDS_PassKeyShape.hxx
index e77c56656..1498499bf 100644
--- a/src/NMTDS_NEW/NMTDS_PassKeyShape.hxx
+++ b/src/NMTDS_NEW/NMTDS_PassKeyShape.hxx
@@ -1,100 +1,100 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-
-// File:        NMTDS_PassKeyShape.hxx
-// Created:     
-// Author:      Peter KURNEV
-//              <pkv@irinox>
-//
-#ifndef _NMTDS_PassKeyShape_HeaderFile
-#define _NMTDS_PassKeyShape_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_Macro.hxx>
-#include <Standard_Integer.hxx>
-#include <TopTools_IndexedMapOfShape.hxx>
-#include <Standard_Boolean.hxx>
-#include <TopoDS_Shape.hxx>
-#include <TopTools_ListOfShape.hxx>
-
-//=======================================================================
-//function : NMTDS_PassKeyShape
-//purpose  : 
-//=======================================================================
-class NMTDS_PassKeyShape  {
- public:
-  Standard_EXPORT
-    NMTDS_PassKeyShape();
-  
-  Standard_EXPORT 
-    virtual ~NMTDS_PassKeyShape();
-  
-  Standard_EXPORT 
-    NMTDS_PassKeyShape(const NMTDS_PassKeyShape& Other);
-  
-  Standard_EXPORT
-    NMTDS_PassKeyShape& Assign(const NMTDS_PassKeyShape& Other) ;
-    
-  NMTDS_PassKeyShape& operator =(const NMTDS_PassKeyShape& Other) {
-    return Assign(Other);
-  }
-  
-  Standard_EXPORT     
-    void SetShapes(const TopoDS_Shape& aS) ;
-  
-  Standard_EXPORT
-    void SetShapes(const TopoDS_Shape& aS1,
-		   const TopoDS_Shape& aS2) ;
-  
-  Standard_EXPORT
-    void SetShapes(const TopoDS_Shape& aS1,
-		   const TopoDS_Shape& aS2,
-		   const TopoDS_Shape& aS3) ;
-  
-  Standard_EXPORT
-    void SetShapes(const TopoDS_Shape& aS1,
-		   const TopoDS_Shape& aS2,
-		   const TopoDS_Shape& aS3,
-		   const TopoDS_Shape& aS4) ;
-  
-  Standard_EXPORT
-    void SetShapes(const TopTools_ListOfShape& aLS) ;
-  
-  Standard_EXPORT
-    void Clear() ;
-  
-  Standard_EXPORT
-    Standard_Integer NbIds() const;
-  
-  Standard_EXPORT
-    Standard_Boolean IsEqual(const NMTDS_PassKeyShape& aOther) const;
-  
-  Standard_EXPORT
-    Standard_Integer HashCode(const Standard_Integer Upper) const;
-  
-  Standard_EXPORT
-    void Dump(const Standard_Integer aHex = 0) const;
-
- protected:
-  Standard_Integer myNbIds;
-  Standard_Integer mySum;
-  Standard_Integer myUpper;
-  TopTools_IndexedMapOfShape myMap;
-};
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File:        NMTDS_PassKeyShape.hxx
+// Created:     
+// Author:      Peter KURNEV
+//              <pkv@irinox>
+//
+#ifndef _NMTDS_PassKeyShape_HeaderFile
+#define _NMTDS_PassKeyShape_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Macro.hxx>
+#include <Standard_Integer.hxx>
+#include <TopTools_IndexedMapOfShape.hxx>
+#include <Standard_Boolean.hxx>
+#include <TopoDS_Shape.hxx>
+#include <TopTools_ListOfShape.hxx>
+
+//=======================================================================
+//function : NMTDS_PassKeyShape
+//purpose  : 
+//=======================================================================
+class NMTDS_PassKeyShape  {
+ public:
+  Standard_EXPORT
+    NMTDS_PassKeyShape();
+  
+  Standard_EXPORT 
+    virtual ~NMTDS_PassKeyShape();
+  
+  Standard_EXPORT 
+    NMTDS_PassKeyShape(const NMTDS_PassKeyShape& Other);
+  
+  Standard_EXPORT
+    NMTDS_PassKeyShape& Assign(const NMTDS_PassKeyShape& Other) ;
+    
+  NMTDS_PassKeyShape& operator =(const NMTDS_PassKeyShape& Other) {
+    return Assign(Other);
+  }
+  
+  Standard_EXPORT     
+    void SetShapes(const TopoDS_Shape& aS) ;
+  
+  Standard_EXPORT
+    void SetShapes(const TopoDS_Shape& aS1,
+		   const TopoDS_Shape& aS2) ;
+  
+  Standard_EXPORT
+    void SetShapes(const TopoDS_Shape& aS1,
+		   const TopoDS_Shape& aS2,
+		   const TopoDS_Shape& aS3) ;
+  
+  Standard_EXPORT
+    void SetShapes(const TopoDS_Shape& aS1,
+		   const TopoDS_Shape& aS2,
+		   const TopoDS_Shape& aS3,
+		   const TopoDS_Shape& aS4) ;
+  
+  Standard_EXPORT
+    void SetShapes(const TopTools_ListOfShape& aLS) ;
+  
+  Standard_EXPORT
+    void Clear() ;
+  
+  Standard_EXPORT
+    Standard_Integer NbIds() const;
+  
+  Standard_EXPORT
+    Standard_Boolean IsEqual(const NMTDS_PassKeyShape& aOther) const;
+  
+  Standard_EXPORT
+    Standard_Integer HashCode(const Standard_Integer Upper) const;
+  
+  Standard_EXPORT
+    void Dump(const Standard_Integer aHex = 0) const;
+
+ protected:
+  Standard_Integer myNbIds;
+  Standard_Integer mySum;
+  Standard_Integer myUpper;
+  TopTools_IndexedMapOfShape myMap;
+};
+#endif
diff --git a/src/NMTDS_NEW/NMTDS_PassKeyShapeMapHasher.cxx b/src/NMTDS_NEW/NMTDS_PassKeyShapeMapHasher.cxx
index 7f43ed16a..4ff71d48e 100644
--- a/src/NMTDS_NEW/NMTDS_PassKeyShapeMapHasher.cxx
+++ b/src/NMTDS_NEW/NMTDS_PassKeyShapeMapHasher.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/NMTDS_NEW/NMTDS_PassKeyShapeMapHasher.hxx b/src/NMTDS_NEW/NMTDS_PassKeyShapeMapHasher.hxx
index e4b600e78..a674091db 100644
--- a/src/NMTDS_NEW/NMTDS_PassKeyShapeMapHasher.hxx
+++ b/src/NMTDS_NEW/NMTDS_PassKeyShapeMapHasher.hxx
@@ -1,48 +1,48 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-
-// File:        NMTDS_PassKeyMapHasher.cxx
-// Created:     
-// Author:      Peter KURNEV
-//              <pkv@irinox>
-//
-#ifndef _NMTDS_PassKeyShapeMapHasher_HeaderFile
-#define _NMTDS_PassKeyShapeMapHasher_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_Macro.hxx>
-#include <Standard_Integer.hxx>
-#include <NMTDS_PassKeyShape.hxx>
-#include <Standard_Boolean.hxx>
-
-//=======================================================================
-//function : NMTDS_PassKeyShapeMapHasher
-//purpose  : 
-//=======================================================================
-class NMTDS_PassKeyShapeMapHasher  {
- public:
-  Standard_EXPORT
-    static  Standard_Integer HashCode(const NMTDS_PassKeyShape& aPKey,
-				      const Standard_Integer Upper) ;
-  
-  Standard_EXPORT
-    static  Standard_Boolean IsEqual(const NMTDS_PassKeyShape& aPKey1,
-				     const NMTDS_PassKeyShape& aPKey2) ;
-};
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File:        NMTDS_PassKeyMapHasher.cxx
+// Created:     
+// Author:      Peter KURNEV
+//              <pkv@irinox>
+//
+#ifndef _NMTDS_PassKeyShapeMapHasher_HeaderFile
+#define _NMTDS_PassKeyShapeMapHasher_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Macro.hxx>
+#include <Standard_Integer.hxx>
+#include <NMTDS_PassKeyShape.hxx>
+#include <Standard_Boolean.hxx>
+
+//=======================================================================
+//function : NMTDS_PassKeyShapeMapHasher
+//purpose  : 
+//=======================================================================
+class NMTDS_PassKeyShapeMapHasher  {
+ public:
+  Standard_EXPORT
+    static  Standard_Integer HashCode(const NMTDS_PassKeyShape& aPKey,
+				      const Standard_Integer Upper) ;
+  
+  Standard_EXPORT
+    static  Standard_Boolean IsEqual(const NMTDS_PassKeyShape& aPKey1,
+				     const NMTDS_PassKeyShape& aPKey2) ;
+};
+#endif
diff --git a/src/NMTDS_NEW/NMTDS_ShapesDataStructure.cxx b/src/NMTDS_NEW/NMTDS_ShapesDataStructure.cxx
index c6e9d4ece..ef679ed2f 100644
--- a/src/NMTDS_NEW/NMTDS_ShapesDataStructure.cxx
+++ b/src/NMTDS_NEW/NMTDS_ShapesDataStructure.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File:        NMTDS_ShapesDataStructure.cxx
 // Author:      Peter KURNEV
diff --git a/src/NMTDS_NEW/NMTDS_ShapesDataStructure.hxx b/src/NMTDS_NEW/NMTDS_ShapesDataStructure.hxx
index 82a88824d..e574b92ec 100644
--- a/src/NMTDS_NEW/NMTDS_ShapesDataStructure.hxx
+++ b/src/NMTDS_NEW/NMTDS_ShapesDataStructure.hxx
@@ -1,74 +1,96 @@
-
-#ifndef _NMTDS_ShapesDataStructure_HeaderFile
-#define _NMTDS_ShapesDataStructure_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_Macro.hxx>
-#include <TopoDS_Shape.hxx>
-#include <NMTDS_CArray1OfIndexRange.hxx>
-#include <TopTools_DataMapOfShapeInteger.hxx>
-#include <BooleanOperations_ShapesDataStructure.hxx>
-#include <Standard_Integer.hxx>
-#include <TopoDS_Shape.hxx>
-#include <NMTDS_CArray1OfIndexRange.hxx>
-#include <BooleanOperations_IndexedDataMapOfShapeAncestorsSuccessors.hxx>
-#include <TColStd_IndexedMapOfInteger.hxx>
-#include <Bnd_Box.hxx>
-
-//=======================================================================
-//class    : NMTDS_ShapesDataStructure
-//purpose  : 
-//=======================================================================
-class NMTDS_ShapesDataStructure  : public BooleanOperations_ShapesDataStructure
-{
- public:
-  Standard_EXPORT
-    NMTDS_ShapesDataStructure();
-  
-  Standard_EXPORT
-    void SetCompositeShape(const TopoDS_Shape& aS) ;
-  
-  Standard_EXPORT
-    void Init() ;
-  
-  Standard_EXPORT
-    const NMTDS_CArray1OfIndexRange& Ranges() const;
-  
-  Standard_EXPORT
-    const TopoDS_Shape& CompositeShape() const;
-  
-  Standard_EXPORT
-    Standard_Integer ShapeRangeIndex(const Standard_Integer aId) const;
-  
-  Standard_EXPORT
-    virtual  Standard_Integer Rank(const Standard_Integer anIndex) const;
-  
-  Standard_EXPORT
-    virtual  Standard_Integer ShapeIndex(const TopoDS_Shape& aS,
-					 const Standard_Integer iRank) const;
-  
-  Standard_EXPORT     
-    void FillMap(const TopoDS_Shape& aS,
-		 BooleanOperations_IndexedDataMapOfShapeAncestorsSuccessors& aMSA,
-		 BooleanOperations_IndexedDataMapOfShapeAncestorsSuccessors& aMS) const;
-  
-  Standard_EXPORT
-    void FillSubshapes(const TopoDS_Shape& aS,
-		       BooleanOperations_IndexedDataMapOfShapeAncestorsSuccessors& aMSA,
-		       BooleanOperations_IndexedDataMapOfShapeAncestorsSuccessors& aMS) const;
-  
-  Standard_EXPORT     
-    void GetAllSuccessors(const Standard_Integer anIndex,
-			  TColStd_IndexedMapOfInteger& aScrs) const;
-  
-  Standard_EXPORT     
-    void ComputeBoxEx(const Standard_Integer anIndex,
-		      Bnd_Box& aBox) const;
-
-
- protected:
-  TopoDS_Shape myCompositeShape;
-  NMTDS_CArray1OfIndexRange myRanges;
-  TopTools_DataMapOfShapeInteger myShapeIndexMap;
-};
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+
+#ifndef _NMTDS_ShapesDataStructure_HeaderFile
+#define _NMTDS_ShapesDataStructure_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Macro.hxx>
+#include <TopoDS_Shape.hxx>
+#include <NMTDS_CArray1OfIndexRange.hxx>
+#include <TopTools_DataMapOfShapeInteger.hxx>
+#include <BooleanOperations_ShapesDataStructure.hxx>
+#include <Standard_Integer.hxx>
+#include <TopoDS_Shape.hxx>
+#include <NMTDS_CArray1OfIndexRange.hxx>
+#include <BooleanOperations_IndexedDataMapOfShapeAncestorsSuccessors.hxx>
+#include <TColStd_IndexedMapOfInteger.hxx>
+#include <Bnd_Box.hxx>
+
+//=======================================================================
+//class    : NMTDS_ShapesDataStructure
+//purpose  : 
+//=======================================================================
+class NMTDS_ShapesDataStructure  : public BooleanOperations_ShapesDataStructure
+{
+ public:
+  Standard_EXPORT
+    NMTDS_ShapesDataStructure();
+  
+  Standard_EXPORT
+    void SetCompositeShape(const TopoDS_Shape& aS) ;
+  
+  Standard_EXPORT
+    void Init() ;
+  
+  Standard_EXPORT
+    const NMTDS_CArray1OfIndexRange& Ranges() const;
+  
+  Standard_EXPORT
+    const TopoDS_Shape& CompositeShape() const;
+  
+  Standard_EXPORT
+    Standard_Integer ShapeRangeIndex(const Standard_Integer aId) const;
+  
+  Standard_EXPORT
+    virtual  Standard_Integer Rank(const Standard_Integer anIndex) const;
+  
+  Standard_EXPORT
+    virtual  Standard_Integer ShapeIndex(const TopoDS_Shape& aS,
+					 const Standard_Integer iRank) const;
+  
+  Standard_EXPORT     
+    void FillMap(const TopoDS_Shape& aS,
+		 BooleanOperations_IndexedDataMapOfShapeAncestorsSuccessors& aMSA,
+		 BooleanOperations_IndexedDataMapOfShapeAncestorsSuccessors& aMS) const;
+  
+  Standard_EXPORT
+    void FillSubshapes(const TopoDS_Shape& aS,
+		       BooleanOperations_IndexedDataMapOfShapeAncestorsSuccessors& aMSA,
+		       BooleanOperations_IndexedDataMapOfShapeAncestorsSuccessors& aMS) const;
+  
+  Standard_EXPORT     
+    void GetAllSuccessors(const Standard_Integer anIndex,
+			  TColStd_IndexedMapOfInteger& aScrs) const;
+  
+  Standard_EXPORT     
+    void ComputeBoxEx(const Standard_Integer anIndex,
+		      Bnd_Box& aBox) const;
+
+
+ protected:
+  TopoDS_Shape myCompositeShape;
+  NMTDS_CArray1OfIndexRange myRanges;
+  TopTools_DataMapOfShapeInteger myShapeIndexMap;
+};
+#endif
diff --git a/src/NMTDS_NEW/NMTDS_Tools.cxx b/src/NMTDS_NEW/NMTDS_Tools.cxx
index c1bcec502..f34ce68e5 100644
--- a/src/NMTDS_NEW/NMTDS_Tools.cxx
+++ b/src/NMTDS_NEW/NMTDS_Tools.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -15,6 +15,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File:        NMTDS_Tools.cxx
 // Created:     Tue Feb 20 14:57:28 2007
diff --git a/src/NMTDS_NEW/NMTDS_Tools.hxx b/src/NMTDS_NEW/NMTDS_Tools.hxx
index 39bda9460..e30d8924c 100644
--- a/src/NMTDS_NEW/NMTDS_Tools.hxx
+++ b/src/NMTDS_NEW/NMTDS_Tools.hxx
@@ -1,62 +1,63 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
-// File:        NMTDS_Tools.hxx
-// Created:     
-// Author:      Peter KURNEV
-
-#ifndef _NMTDS_Tools_HeaderFile
-#define _NMTDS_Tools_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_Macro.hxx>
-#include <Standard_Integer.hxx>
-#include <TopAbs_ShapeEnum.hxx>
-#include <Standard_Boolean.hxx>
-#include <TopoDS_Vertex.hxx>
-#include <TopoDS_Shape.hxx>
-#include <TopTools_IndexedDataMapOfShapeShape.hxx>
-
-//=======================================================================
-//function : NMTDS_Tools
-//purpose  : 
-//=======================================================================
-class NMTDS_Tools 
-{
- public:
-  Standard_EXPORT
-    static  Standard_Integer TypeToInteger(const TopAbs_ShapeEnum aT1,
-					   const TopAbs_ShapeEnum aT2) ;
-  
-  Standard_EXPORT
-    static  Standard_Boolean HasBRep(const TopAbs_ShapeEnum aT) ;
-  
-  Standard_EXPORT
-    static  Standard_Integer ComputeVV(const TopoDS_Vertex& aV1,
-				       const TopoDS_Vertex& aV2) ;
-  
-  Standard_EXPORT
-    static  void CopyShape(const TopoDS_Shape& aS,
-			   TopoDS_Shape& aSC) ;
-  
-  Standard_EXPORT
-    static  void CopyShape(const TopoDS_Shape& aS,
-			   TopoDS_Shape& aSC,
-			   TopTools_IndexedDataMapOfShapeShape& aMSS) ;
-};
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File:        NMTDS_Tools.hxx
+// Created:     
+// Author:      Peter KURNEV
+
+#ifndef _NMTDS_Tools_HeaderFile
+#define _NMTDS_Tools_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Macro.hxx>
+#include <Standard_Integer.hxx>
+#include <TopAbs_ShapeEnum.hxx>
+#include <Standard_Boolean.hxx>
+#include <TopoDS_Vertex.hxx>
+#include <TopoDS_Shape.hxx>
+#include <TopTools_IndexedDataMapOfShapeShape.hxx>
+
+//=======================================================================
+//function : NMTDS_Tools
+//purpose  : 
+//=======================================================================
+class NMTDS_Tools 
+{
+ public:
+  Standard_EXPORT
+    static  Standard_Integer TypeToInteger(const TopAbs_ShapeEnum aT1,
+					   const TopAbs_ShapeEnum aT2) ;
+  
+  Standard_EXPORT
+    static  Standard_Boolean HasBRep(const TopAbs_ShapeEnum aT) ;
+  
+  Standard_EXPORT
+    static  Standard_Integer ComputeVV(const TopoDS_Vertex& aV1,
+				       const TopoDS_Vertex& aV2) ;
+  
+  Standard_EXPORT
+    static  void CopyShape(const TopoDS_Shape& aS,
+			   TopoDS_Shape& aSC) ;
+  
+  Standard_EXPORT
+    static  void CopyShape(const TopoDS_Shape& aS,
+			   TopoDS_Shape& aSC,
+			   TopTools_IndexedDataMapOfShapeShape& aMSS) ;
+};
+#endif
diff --git a/src/NMTTools/Handle_NMTTools_DataMapNodeOfDataMapOfIntegerFaceInfo.hxx b/src/NMTTools/Handle_NMTTools_DataMapNodeOfDataMapOfIntegerFaceInfo.hxx
index 6142c40ce..99ada9439 100644
--- a/src/NMTTools/Handle_NMTTools_DataMapNodeOfDataMapOfIntegerFaceInfo.hxx
+++ b/src/NMTTools/Handle_NMTTools_DataMapNodeOfDataMapOfIntegerFaceInfo.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/Handle_NMTTools_DataMapNodeOfDataMapOfIntegerListOfPaveBlock.hxx b/src/NMTTools/Handle_NMTTools_DataMapNodeOfDataMapOfIntegerListOfPaveBlock.hxx
index dd12e0f70..395931954 100644
--- a/src/NMTTools/Handle_NMTTools_DataMapNodeOfDataMapOfIntegerListOfPaveBlock.hxx
+++ b/src/NMTTools/Handle_NMTTools_DataMapNodeOfDataMapOfIntegerListOfPaveBlock.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/Handle_NMTTools_IndexedDataMapNodeOfIndexedDataMapOfIndexedMapOfInteger.hxx b/src/NMTTools/Handle_NMTTools_IndexedDataMapNodeOfIndexedDataMapOfIndexedMapOfInteger.hxx
index 5b90e5953..bcc2a43be 100644
--- a/src/NMTTools/Handle_NMTTools_IndexedDataMapNodeOfIndexedDataMapOfIndexedMapOfInteger.hxx
+++ b/src/NMTTools/Handle_NMTTools_IndexedDataMapNodeOfIndexedDataMapOfIndexedMapOfInteger.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/Handle_NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapeIndexedMapOfShape.hxx b/src/NMTTools/Handle_NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapeIndexedMapOfShape.hxx
index dbb3655a1..0defab332 100644
--- a/src/NMTTools/Handle_NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapeIndexedMapOfShape.hxx
+++ b/src/NMTTools/Handle_NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapeIndexedMapOfShape.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/Handle_NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapePaveBlock.hxx b/src/NMTTools/Handle_NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapePaveBlock.hxx
index ec31e5f7a..23400bc54 100644
--- a/src/NMTTools/Handle_NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapePaveBlock.hxx
+++ b/src/NMTTools/Handle_NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapePaveBlock.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/Handle_NMTTools_ListNodeOfListOfCommonBlock.hxx b/src/NMTTools/Handle_NMTTools_ListNodeOfListOfCommonBlock.hxx
index a71acd6f2..6013342fa 100644
--- a/src/NMTTools/Handle_NMTTools_ListNodeOfListOfCommonBlock.hxx
+++ b/src/NMTTools/Handle_NMTTools_ListNodeOfListOfCommonBlock.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/Handle_NMTTools_ListNodeOfListOfCoupleOfShape.hxx b/src/NMTTools/Handle_NMTTools_ListNodeOfListOfCoupleOfShape.hxx
index 207ded178..e0e754b7c 100644
--- a/src/NMTTools/Handle_NMTTools_ListNodeOfListOfCoupleOfShape.hxx
+++ b/src/NMTTools/Handle_NMTTools_ListNodeOfListOfCoupleOfShape.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/Handle_NMTTools_StdMapNodeOfMapOfPaveBlock.hxx b/src/NMTTools/Handle_NMTTools_StdMapNodeOfMapOfPaveBlock.hxx
index 6d113bae7..99cac7c03 100644
--- a/src/NMTTools/Handle_NMTTools_StdMapNodeOfMapOfPaveBlock.hxx
+++ b/src/NMTTools/Handle_NMTTools_StdMapNodeOfMapOfPaveBlock.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/Makefile.am b/src/NMTTools/Makefile.am
index 9c7c719e4..8fd58605e 100644
--- a/src/NMTTools/Makefile.am
+++ b/src/NMTTools/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -15,6 +15,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
 
 #  GEOM NMTTools : partition algorithm
 #  File   : Makefile.in
diff --git a/src/NMTTools/NMTTools.cdl b/src/NMTTools/NMTTools.cdl
index 16706b426..ea6271c38 100644
--- a/src/NMTTools/NMTTools.cdl
+++ b/src/NMTTools/NMTTools.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 -- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools.pro b/src/NMTTools/NMTTools.pro
index 88a58d9d4..35300f1fb 100644
--- a/src/NMTTools/NMTTools.pro
+++ b/src/NMTTools/NMTTools.pro
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/NMTTools/NMTTools_CheckerSI.cdl b/src/NMTTools/NMTTools_CheckerSI.cdl
index 8225894fd..3f851d1ed 100644
--- a/src/NMTTools/NMTTools_CheckerSI.cdl
+++ b/src/NMTTools/NMTTools_CheckerSI.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- This library is free software; you can redistribute it and/or
 -- modify it under the terms of the GNU Lesser General Public
diff --git a/src/NMTTools/NMTTools_CheckerSI.cxx b/src/NMTTools/NMTTools_CheckerSI.cxx
index 84278c382..0eb582276 100644
--- a/src/NMTTools/NMTTools_CheckerSI.cxx
+++ b/src/NMTTools/NMTTools_CheckerSI.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -15,6 +15,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 //  File:       NMTTools_CheckerSI.cxx
 //  Created:    Mon Feb 19 11:32:08 2007
diff --git a/src/NMTTools/NMTTools_CheckerSI.hxx b/src/NMTTools/NMTTools_CheckerSI.hxx
index 6da5697c1..254092d6b 100644
--- a/src/NMTTools/NMTTools_CheckerSI.hxx
+++ b/src/NMTTools/NMTTools_CheckerSI.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/NMTTools/NMTTools_CheckerSI.ixx b/src/NMTTools/NMTTools_CheckerSI.ixx
index 70ad726e1..e6edb42a9 100644
--- a/src/NMTTools/NMTTools_CheckerSI.ixx
+++ b/src/NMTTools/NMTTools_CheckerSI.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/NMTTools/NMTTools_CheckerSI.jxx b/src/NMTTools/NMTTools_CheckerSI.jxx
index 5a1399c9d..b6ea6678b 100644
--- a/src/NMTTools/NMTTools_CheckerSI.jxx
+++ b/src/NMTTools/NMTTools_CheckerSI.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/NMTTools/NMTTools_CheckerSI_1.cxx b/src/NMTTools/NMTTools_CheckerSI_1.cxx
index 690159ec3..7b7c7b65b 100755
--- a/src/NMTTools/NMTTools_CheckerSI_1.cxx
+++ b/src/NMTTools/NMTTools_CheckerSI_1.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/NMTTools/NMTTools_CommonBlock.cdl b/src/NMTTools/NMTTools_CommonBlock.cdl
index 985e40f20..74fd31500 100644
--- a/src/NMTTools/NMTTools_CommonBlock.cdl
+++ b/src/NMTTools/NMTTools_CommonBlock.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 -- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_CommonBlock.cxx b/src/NMTTools/NMTTools_CommonBlock.cxx
index 5672d34ec..b6a4f7b34 100644
--- a/src/NMTTools/NMTTools_CommonBlock.cxx
+++ b/src/NMTTools/NMTTools_CommonBlock.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_CommonBlock.hxx b/src/NMTTools/NMTTools_CommonBlock.hxx
index dee73db0b..f8f3f660b 100644
--- a/src/NMTTools/NMTTools_CommonBlock.hxx
+++ b/src/NMTTools/NMTTools_CommonBlock.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_CommonBlock.ixx b/src/NMTTools/NMTTools_CommonBlock.ixx
index 25481fe11..c87a4b4bd 100644
--- a/src/NMTTools/NMTTools_CommonBlock.ixx
+++ b/src/NMTTools/NMTTools_CommonBlock.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_CommonBlock.jxx b/src/NMTTools/NMTTools_CommonBlock.jxx
index 0e92ac3dc..0d105e59a 100644
--- a/src/NMTTools/NMTTools_CommonBlock.jxx
+++ b/src/NMTTools/NMTTools_CommonBlock.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_CommonBlockAPI.cdl b/src/NMTTools/NMTTools_CommonBlockAPI.cdl
index b9e39711f..4a7165ba4 100644
--- a/src/NMTTools/NMTTools_CommonBlockAPI.cdl
+++ b/src/NMTTools/NMTTools_CommonBlockAPI.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 -- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_CommonBlockAPI.cxx b/src/NMTTools/NMTTools_CommonBlockAPI.cxx
index 19a2e68da..5baf7a803 100644
--- a/src/NMTTools/NMTTools_CommonBlockAPI.cxx
+++ b/src/NMTTools/NMTTools_CommonBlockAPI.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_CommonBlockAPI.hxx b/src/NMTTools/NMTTools_CommonBlockAPI.hxx
index 10877ba87..7660db7e5 100644
--- a/src/NMTTools/NMTTools_CommonBlockAPI.hxx
+++ b/src/NMTTools/NMTTools_CommonBlockAPI.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_CommonBlockAPI.ixx b/src/NMTTools/NMTTools_CommonBlockAPI.ixx
index dce0485f1..71403dc0a 100644
--- a/src/NMTTools/NMTTools_CommonBlockAPI.ixx
+++ b/src/NMTTools/NMTTools_CommonBlockAPI.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_CommonBlockAPI.jxx b/src/NMTTools/NMTTools_CommonBlockAPI.jxx
index 72be76bc1..58409071f 100644
--- a/src/NMTTools/NMTTools_CommonBlockAPI.jxx
+++ b/src/NMTTools/NMTTools_CommonBlockAPI.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_CommonBlockPool.hxx b/src/NMTTools/NMTTools_CommonBlockPool.hxx
index cd322c430..734d947c8 100644
--- a/src/NMTTools/NMTTools_CommonBlockPool.hxx
+++ b/src/NMTTools/NMTTools_CommonBlockPool.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _NMTTools_CommonBlockPool_HeaderFile
 #define _NMTTools_CommonBlockPool_HeaderFile
diff --git a/src/NMTTools/NMTTools_CommonBlockPool_0.cxx b/src/NMTTools/NMTTools_CommonBlockPool_0.cxx
index 6704ac733..7de6a1e61 100644
--- a/src/NMTTools/NMTTools_CommonBlockPool_0.cxx
+++ b/src/NMTTools/NMTTools_CommonBlockPool_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_CoupleOfShape.cdl b/src/NMTTools/NMTTools_CoupleOfShape.cdl
index 0661771bc..059a73d2a 100644
--- a/src/NMTTools/NMTTools_CoupleOfShape.cdl
+++ b/src/NMTTools/NMTTools_CoupleOfShape.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 -- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_CoupleOfShape.cxx b/src/NMTTools/NMTTools_CoupleOfShape.cxx
index c05d61cdb..628929de2 100644
--- a/src/NMTTools/NMTTools_CoupleOfShape.cxx
+++ b/src/NMTTools/NMTTools_CoupleOfShape.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_CoupleOfShape.hxx b/src/NMTTools/NMTTools_CoupleOfShape.hxx
index 44afa7bbf..b45a83834 100644
--- a/src/NMTTools/NMTTools_CoupleOfShape.hxx
+++ b/src/NMTTools/NMTTools_CoupleOfShape.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_CoupleOfShape.ixx b/src/NMTTools/NMTTools_CoupleOfShape.ixx
index 83bc30c99..ea67f9ffe 100644
--- a/src/NMTTools/NMTTools_CoupleOfShape.ixx
+++ b/src/NMTTools/NMTTools_CoupleOfShape.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_CoupleOfShape.jxx b/src/NMTTools/NMTTools_CoupleOfShape.jxx
index e3c7b4313..8d29c575d 100644
--- a/src/NMTTools/NMTTools_CoupleOfShape.jxx
+++ b/src/NMTTools/NMTTools_CoupleOfShape.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_DEProcessor.cdl b/src/NMTTools/NMTTools_DEProcessor.cdl
index 86d4c7b88..9167eca63 100644
--- a/src/NMTTools/NMTTools_DEProcessor.cdl
+++ b/src/NMTTools/NMTTools_DEProcessor.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 -- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_DEProcessor.cxx b/src/NMTTools/NMTTools_DEProcessor.cxx
index 0ccdd6ca7..419acdc15 100644
--- a/src/NMTTools/NMTTools_DEProcessor.cxx
+++ b/src/NMTTools/NMTTools_DEProcessor.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_DEProcessor.hxx b/src/NMTTools/NMTTools_DEProcessor.hxx
index bc79cfc13..92acad02a 100644
--- a/src/NMTTools/NMTTools_DEProcessor.hxx
+++ b/src/NMTTools/NMTTools_DEProcessor.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_DEProcessor.ixx b/src/NMTTools/NMTTools_DEProcessor.ixx
index 98a0d822f..037ed882e 100644
--- a/src/NMTTools/NMTTools_DEProcessor.ixx
+++ b/src/NMTTools/NMTTools_DEProcessor.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_DEProcessor.jxx b/src/NMTTools/NMTTools_DEProcessor.jxx
index 6326daa66..234508d56 100644
--- a/src/NMTTools/NMTTools_DEProcessor.jxx
+++ b/src/NMTTools/NMTTools_DEProcessor.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_DataMapIteratorOfDataMapOfIntegerFaceInfo.hxx b/src/NMTTools/NMTTools_DataMapIteratorOfDataMapOfIntegerFaceInfo.hxx
index 991573713..7906e745f 100644
--- a/src/NMTTools/NMTTools_DataMapIteratorOfDataMapOfIntegerFaceInfo.hxx
+++ b/src/NMTTools/NMTTools_DataMapIteratorOfDataMapOfIntegerFaceInfo.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_DataMapIteratorOfDataMapOfIntegerFaceInfo_0.cxx b/src/NMTTools/NMTTools_DataMapIteratorOfDataMapOfIntegerFaceInfo_0.cxx
index 9ded92849..1545f9537 100644
--- a/src/NMTTools/NMTTools_DataMapIteratorOfDataMapOfIntegerFaceInfo_0.cxx
+++ b/src/NMTTools/NMTTools_DataMapIteratorOfDataMapOfIntegerFaceInfo_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_DataMapIteratorOfDataMapOfIntegerListOfPaveBlock.hxx b/src/NMTTools/NMTTools_DataMapIteratorOfDataMapOfIntegerListOfPaveBlock.hxx
index a2641b73b..5f0f0f1ef 100644
--- a/src/NMTTools/NMTTools_DataMapIteratorOfDataMapOfIntegerListOfPaveBlock.hxx
+++ b/src/NMTTools/NMTTools_DataMapIteratorOfDataMapOfIntegerListOfPaveBlock.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_DataMapIteratorOfDataMapOfIntegerListOfPaveBlock_0.cxx b/src/NMTTools/NMTTools_DataMapIteratorOfDataMapOfIntegerListOfPaveBlock_0.cxx
index c27167ad7..bb8c4fcf7 100644
--- a/src/NMTTools/NMTTools_DataMapIteratorOfDataMapOfIntegerListOfPaveBlock_0.cxx
+++ b/src/NMTTools/NMTTools_DataMapIteratorOfDataMapOfIntegerListOfPaveBlock_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_DataMapNodeOfDataMapOfIntegerFaceInfo.hxx b/src/NMTTools/NMTTools_DataMapNodeOfDataMapOfIntegerFaceInfo.hxx
index 451a4d7e6..81562e69a 100644
--- a/src/NMTTools/NMTTools_DataMapNodeOfDataMapOfIntegerFaceInfo.hxx
+++ b/src/NMTTools/NMTTools_DataMapNodeOfDataMapOfIntegerFaceInfo.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_DataMapNodeOfDataMapOfIntegerFaceInfo_0.cxx b/src/NMTTools/NMTTools_DataMapNodeOfDataMapOfIntegerFaceInfo_0.cxx
index e388ec3b9..f4b3e9c0d 100644
--- a/src/NMTTools/NMTTools_DataMapNodeOfDataMapOfIntegerFaceInfo_0.cxx
+++ b/src/NMTTools/NMTTools_DataMapNodeOfDataMapOfIntegerFaceInfo_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_DataMapNodeOfDataMapOfIntegerListOfPaveBlock.hxx b/src/NMTTools/NMTTools_DataMapNodeOfDataMapOfIntegerListOfPaveBlock.hxx
index 7968b4c1f..397cbc06b 100644
--- a/src/NMTTools/NMTTools_DataMapNodeOfDataMapOfIntegerListOfPaveBlock.hxx
+++ b/src/NMTTools/NMTTools_DataMapNodeOfDataMapOfIntegerListOfPaveBlock.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_DataMapNodeOfDataMapOfIntegerListOfPaveBlock_0.cxx b/src/NMTTools/NMTTools_DataMapNodeOfDataMapOfIntegerListOfPaveBlock_0.cxx
index a49c51a78..6b9df9564 100644
--- a/src/NMTTools/NMTTools_DataMapNodeOfDataMapOfIntegerListOfPaveBlock_0.cxx
+++ b/src/NMTTools/NMTTools_DataMapNodeOfDataMapOfIntegerListOfPaveBlock_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_DataMapOfIntegerFaceInfo.hxx b/src/NMTTools/NMTTools_DataMapOfIntegerFaceInfo.hxx
index 508c28f1b..b61ad8d89 100644
--- a/src/NMTTools/NMTTools_DataMapOfIntegerFaceInfo.hxx
+++ b/src/NMTTools/NMTTools_DataMapOfIntegerFaceInfo.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _NMTTools_DataMapOfIntegerFaceInfo_HeaderFile
 #define _NMTTools_DataMapOfIntegerFaceInfo_HeaderFile
diff --git a/src/NMTTools/NMTTools_DataMapOfIntegerFaceInfo_0.cxx b/src/NMTTools/NMTTools_DataMapOfIntegerFaceInfo_0.cxx
index f269d905d..b777f78e2 100644
--- a/src/NMTTools/NMTTools_DataMapOfIntegerFaceInfo_0.cxx
+++ b/src/NMTTools/NMTTools_DataMapOfIntegerFaceInfo_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_DataMapOfIntegerListOfPaveBlock.hxx b/src/NMTTools/NMTTools_DataMapOfIntegerListOfPaveBlock.hxx
index 0cc6bde58..d9a89e0ae 100644
--- a/src/NMTTools/NMTTools_DataMapOfIntegerListOfPaveBlock.hxx
+++ b/src/NMTTools/NMTTools_DataMapOfIntegerListOfPaveBlock.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _NMTTools_DataMapOfIntegerListOfPaveBlock_HeaderFile
 #define _NMTTools_DataMapOfIntegerListOfPaveBlock_HeaderFile
diff --git a/src/NMTTools/NMTTools_DataMapOfIntegerListOfPaveBlock_0.cxx b/src/NMTTools/NMTTools_DataMapOfIntegerListOfPaveBlock_0.cxx
index 11dedb9e5..444e0adf5 100644
--- a/src/NMTTools/NMTTools_DataMapOfIntegerListOfPaveBlock_0.cxx
+++ b/src/NMTTools/NMTTools_DataMapOfIntegerListOfPaveBlock_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_FaceInfo.cdl b/src/NMTTools/NMTTools_FaceInfo.cdl
index 234b304e1..63612bca4 100644
--- a/src/NMTTools/NMTTools_FaceInfo.cdl
+++ b/src/NMTTools/NMTTools_FaceInfo.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 -- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_FaceInfo.cxx b/src/NMTTools/NMTTools_FaceInfo.cxx
index 18e913708..7e50b903d 100644
--- a/src/NMTTools/NMTTools_FaceInfo.cxx
+++ b/src/NMTTools/NMTTools_FaceInfo.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_FaceInfo.hxx b/src/NMTTools/NMTTools_FaceInfo.hxx
index 305cd2304..e60ee29eb 100644
--- a/src/NMTTools/NMTTools_FaceInfo.hxx
+++ b/src/NMTTools/NMTTools_FaceInfo.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_FaceInfo.ixx b/src/NMTTools/NMTTools_FaceInfo.ixx
index 52930fafa..d50d43652 100644
--- a/src/NMTTools/NMTTools_FaceInfo.ixx
+++ b/src/NMTTools/NMTTools_FaceInfo.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_FaceInfo.jxx b/src/NMTTools/NMTTools_FaceInfo.jxx
index 3dc6b725e..14170b963 100644
--- a/src/NMTTools/NMTTools_FaceInfo.jxx
+++ b/src/NMTTools/NMTTools_FaceInfo.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_FaceInfo.lxx b/src/NMTTools/NMTTools_FaceInfo.lxx
index b92bca7b1..b18fb55e7 100644
--- a/src/NMTTools/NMTTools_FaceInfo.lxx
+++ b/src/NMTTools/NMTTools_FaceInfo.lxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_IndexedDataMapNodeOfIndexedDataMapOfIndexedMapOfInteger.hxx b/src/NMTTools/NMTTools_IndexedDataMapNodeOfIndexedDataMapOfIndexedMapOfInteger.hxx
index 16575b963..44cd38099 100644
--- a/src/NMTTools/NMTTools_IndexedDataMapNodeOfIndexedDataMapOfIndexedMapOfInteger.hxx
+++ b/src/NMTTools/NMTTools_IndexedDataMapNodeOfIndexedDataMapOfIndexedMapOfInteger.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_IndexedDataMapNodeOfIndexedDataMapOfIndexedMapOfInteger_0.cxx b/src/NMTTools/NMTTools_IndexedDataMapNodeOfIndexedDataMapOfIndexedMapOfInteger_0.cxx
index 33d4a10ed..e827567d7 100644
--- a/src/NMTTools/NMTTools_IndexedDataMapNodeOfIndexedDataMapOfIndexedMapOfInteger_0.cxx
+++ b/src/NMTTools/NMTTools_IndexedDataMapNodeOfIndexedDataMapOfIndexedMapOfInteger_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapeIndexedMapOfShape.hxx b/src/NMTTools/NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapeIndexedMapOfShape.hxx
index 5593667fb..aa403ccd4 100644
--- a/src/NMTTools/NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapeIndexedMapOfShape.hxx
+++ b/src/NMTTools/NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapeIndexedMapOfShape.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapeIndexedMapOfShape_0.cxx b/src/NMTTools/NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapeIndexedMapOfShape_0.cxx
index 407568dfa..52059dbf0 100644
--- a/src/NMTTools/NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapeIndexedMapOfShape_0.cxx
+++ b/src/NMTTools/NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapeIndexedMapOfShape_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapePaveBlock.hxx b/src/NMTTools/NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapePaveBlock.hxx
index 0bccbcf36..73b41e7a4 100644
--- a/src/NMTTools/NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapePaveBlock.hxx
+++ b/src/NMTTools/NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapePaveBlock.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapePaveBlock_0.cxx b/src/NMTTools/NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapePaveBlock_0.cxx
index bfbedaa89..d3aa8e898 100644
--- a/src/NMTTools/NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapePaveBlock_0.cxx
+++ b/src/NMTTools/NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapePaveBlock_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_IndexedDataMapOfIndexedMapOfInteger.hxx b/src/NMTTools/NMTTools_IndexedDataMapOfIndexedMapOfInteger.hxx
index 0618f69cc..98ebbf2bd 100644
--- a/src/NMTTools/NMTTools_IndexedDataMapOfIndexedMapOfInteger.hxx
+++ b/src/NMTTools/NMTTools_IndexedDataMapOfIndexedMapOfInteger.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _NMTTools_IndexedDataMapOfIndexedMapOfInteger_HeaderFile
 #define _NMTTools_IndexedDataMapOfIndexedMapOfInteger_HeaderFile
diff --git a/src/NMTTools/NMTTools_IndexedDataMapOfIndexedMapOfInteger_0.cxx b/src/NMTTools/NMTTools_IndexedDataMapOfIndexedMapOfInteger_0.cxx
index b2dd73d71..c4a6b83b4 100644
--- a/src/NMTTools/NMTTools_IndexedDataMapOfIndexedMapOfInteger_0.cxx
+++ b/src/NMTTools/NMTTools_IndexedDataMapOfIndexedMapOfInteger_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_IndexedDataMapOfShapeIndexedMapOfShape.hxx b/src/NMTTools/NMTTools_IndexedDataMapOfShapeIndexedMapOfShape.hxx
index 601854b71..37423cac8 100644
--- a/src/NMTTools/NMTTools_IndexedDataMapOfShapeIndexedMapOfShape.hxx
+++ b/src/NMTTools/NMTTools_IndexedDataMapOfShapeIndexedMapOfShape.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _NMTTools_IndexedDataMapOfShapeIndexedMapOfShape_HeaderFile
 #define _NMTTools_IndexedDataMapOfShapeIndexedMapOfShape_HeaderFile
diff --git a/src/NMTTools/NMTTools_IndexedDataMapOfShapeIndexedMapOfShape_0.cxx b/src/NMTTools/NMTTools_IndexedDataMapOfShapeIndexedMapOfShape_0.cxx
index 6a850b471..84a9d226d 100644
--- a/src/NMTTools/NMTTools_IndexedDataMapOfShapeIndexedMapOfShape_0.cxx
+++ b/src/NMTTools/NMTTools_IndexedDataMapOfShapeIndexedMapOfShape_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_IndexedDataMapOfShapePaveBlock.hxx b/src/NMTTools/NMTTools_IndexedDataMapOfShapePaveBlock.hxx
index 4f3c1abc1..5c8f35534 100644
--- a/src/NMTTools/NMTTools_IndexedDataMapOfShapePaveBlock.hxx
+++ b/src/NMTTools/NMTTools_IndexedDataMapOfShapePaveBlock.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _NMTTools_IndexedDataMapOfShapePaveBlock_HeaderFile
 #define _NMTTools_IndexedDataMapOfShapePaveBlock_HeaderFile
diff --git a/src/NMTTools/NMTTools_IndexedDataMapOfShapePaveBlock_0.cxx b/src/NMTTools/NMTTools_IndexedDataMapOfShapePaveBlock_0.cxx
index 0b1fc0cb1..dc3a8b6b9 100644
--- a/src/NMTTools/NMTTools_IndexedDataMapOfShapePaveBlock_0.cxx
+++ b/src/NMTTools/NMTTools_IndexedDataMapOfShapePaveBlock_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_ListIteratorOfListOfCommonBlock.hxx b/src/NMTTools/NMTTools_ListIteratorOfListOfCommonBlock.hxx
index 18a7ac7d9..c27d83824 100644
--- a/src/NMTTools/NMTTools_ListIteratorOfListOfCommonBlock.hxx
+++ b/src/NMTTools/NMTTools_ListIteratorOfListOfCommonBlock.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_ListIteratorOfListOfCommonBlock_0.cxx b/src/NMTTools/NMTTools_ListIteratorOfListOfCommonBlock_0.cxx
index 7e15ab38c..9b50b5a3f 100644
--- a/src/NMTTools/NMTTools_ListIteratorOfListOfCommonBlock_0.cxx
+++ b/src/NMTTools/NMTTools_ListIteratorOfListOfCommonBlock_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_ListIteratorOfListOfCoupleOfShape.hxx b/src/NMTTools/NMTTools_ListIteratorOfListOfCoupleOfShape.hxx
index be07b971d..67d3d4666 100644
--- a/src/NMTTools/NMTTools_ListIteratorOfListOfCoupleOfShape.hxx
+++ b/src/NMTTools/NMTTools_ListIteratorOfListOfCoupleOfShape.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_ListIteratorOfListOfCoupleOfShape_0.cxx b/src/NMTTools/NMTTools_ListIteratorOfListOfCoupleOfShape_0.cxx
index 8b0202304..78ab070b8 100644
--- a/src/NMTTools/NMTTools_ListIteratorOfListOfCoupleOfShape_0.cxx
+++ b/src/NMTTools/NMTTools_ListIteratorOfListOfCoupleOfShape_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_ListNodeOfListOfCommonBlock.hxx b/src/NMTTools/NMTTools_ListNodeOfListOfCommonBlock.hxx
index d31ba005b..89487d9ae 100644
--- a/src/NMTTools/NMTTools_ListNodeOfListOfCommonBlock.hxx
+++ b/src/NMTTools/NMTTools_ListNodeOfListOfCommonBlock.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_ListNodeOfListOfCommonBlock_0.cxx b/src/NMTTools/NMTTools_ListNodeOfListOfCommonBlock_0.cxx
index df093d2bd..318fc7999 100644
--- a/src/NMTTools/NMTTools_ListNodeOfListOfCommonBlock_0.cxx
+++ b/src/NMTTools/NMTTools_ListNodeOfListOfCommonBlock_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_ListNodeOfListOfCoupleOfShape.hxx b/src/NMTTools/NMTTools_ListNodeOfListOfCoupleOfShape.hxx
index 2e6b1dd8e..95f11486e 100644
--- a/src/NMTTools/NMTTools_ListNodeOfListOfCoupleOfShape.hxx
+++ b/src/NMTTools/NMTTools_ListNodeOfListOfCoupleOfShape.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_ListNodeOfListOfCoupleOfShape_0.cxx b/src/NMTTools/NMTTools_ListNodeOfListOfCoupleOfShape_0.cxx
index a51490161..686eb60ed 100644
--- a/src/NMTTools/NMTTools_ListNodeOfListOfCoupleOfShape_0.cxx
+++ b/src/NMTTools/NMTTools_ListNodeOfListOfCoupleOfShape_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_ListOfCommonBlock.hxx b/src/NMTTools/NMTTools_ListOfCommonBlock.hxx
index a257de981..58ebd9ab8 100644
--- a/src/NMTTools/NMTTools_ListOfCommonBlock.hxx
+++ b/src/NMTTools/NMTTools_ListOfCommonBlock.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_ListOfCommonBlock_0.cxx b/src/NMTTools/NMTTools_ListOfCommonBlock_0.cxx
index fc5d50f37..45f562925 100644
--- a/src/NMTTools/NMTTools_ListOfCommonBlock_0.cxx
+++ b/src/NMTTools/NMTTools_ListOfCommonBlock_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_ListOfCoupleOfShape.hxx b/src/NMTTools/NMTTools_ListOfCoupleOfShape.hxx
index d5138fc47..a5c7ba46d 100644
--- a/src/NMTTools/NMTTools_ListOfCoupleOfShape.hxx
+++ b/src/NMTTools/NMTTools_ListOfCoupleOfShape.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_ListOfCoupleOfShape_0.cxx b/src/NMTTools/NMTTools_ListOfCoupleOfShape_0.cxx
index 365d2a022..a849327f6 100644
--- a/src/NMTTools/NMTTools_ListOfCoupleOfShape_0.cxx
+++ b/src/NMTTools/NMTTools_ListOfCoupleOfShape_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_MapIteratorOfMapOfPaveBlock.hxx b/src/NMTTools/NMTTools_MapIteratorOfMapOfPaveBlock.hxx
index a48f4ab3d..ac5c8842a 100644
--- a/src/NMTTools/NMTTools_MapIteratorOfMapOfPaveBlock.hxx
+++ b/src/NMTTools/NMTTools_MapIteratorOfMapOfPaveBlock.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_MapIteratorOfMapOfPaveBlock_0.cxx b/src/NMTTools/NMTTools_MapIteratorOfMapOfPaveBlock_0.cxx
index 70bc6a305..6368221d1 100644
--- a/src/NMTTools/NMTTools_MapIteratorOfMapOfPaveBlock_0.cxx
+++ b/src/NMTTools/NMTTools_MapIteratorOfMapOfPaveBlock_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_MapOfPaveBlock.hxx b/src/NMTTools/NMTTools_MapOfPaveBlock.hxx
index e35192913..f67f29d00 100644
--- a/src/NMTTools/NMTTools_MapOfPaveBlock.hxx
+++ b/src/NMTTools/NMTTools_MapOfPaveBlock.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_MapOfPaveBlock_0.cxx b/src/NMTTools/NMTTools_MapOfPaveBlock_0.cxx
index a23c136c3..4297faa45 100644
--- a/src/NMTTools/NMTTools_MapOfPaveBlock_0.cxx
+++ b/src/NMTTools/NMTTools_MapOfPaveBlock_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_PPaveFiller.hxx b/src/NMTTools/NMTTools_PPaveFiller.hxx
index 469dfb9ec..36c83789f 100644
--- a/src/NMTTools/NMTTools_PPaveFiller.hxx
+++ b/src/NMTTools/NMTTools_PPaveFiller.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_PaveFiller.cdl b/src/NMTTools/NMTTools_PaveFiller.cdl
index 350f48e87..a373a3e36 100644
--- a/src/NMTTools/NMTTools_PaveFiller.cdl
+++ b/src/NMTTools/NMTTools_PaveFiller.cdl
@@ -1,23 +1,23 @@
---  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
---  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
---  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+-- Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+-- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 --
---  This library is free software; you can redistribute it and/or
---  modify it under the terms of the GNU Lesser General Public
---  License as published by the Free Software Foundation; either
---  version 2.1 of the License.
+-- This library is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU Lesser General Public
+-- License as published by the Free Software Foundation; either
+-- version 2.1 of the License.
 --
---  This library is distributed in the hope that it will be useful,
---  but WITHOUT ANY WARRANTY; without even the implied warranty of
---  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
---  Lesser General Public License for more details.
+-- This library is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+-- Lesser General Public License for more details.
 --
---  You should have received a copy of the GNU Lesser General Public
---  License along with this library; if not, write to the Free Software
---  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+-- You should have received a copy of the GNU Lesser General Public
+-- License along with this library; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 --
---  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+-- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 --
 -- File:	NMTTools_PaveFiller.cdl
 -- Created:	
diff --git a/src/NMTTools/NMTTools_PaveFiller.cxx b/src/NMTTools/NMTTools_PaveFiller.cxx
index 8abecf340..ad89441e4 100644
--- a/src/NMTTools/NMTTools_PaveFiller.cxx
+++ b/src/NMTTools/NMTTools_PaveFiller.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File:        NMTTools_PaveFiller.cxx
 // Created:     Fri Dec  5 14:58:54 2003
diff --git a/src/NMTTools/NMTTools_PaveFiller.hxx b/src/NMTTools/NMTTools_PaveFiller.hxx
index 70d59bcbc..360191d0e 100644
--- a/src/NMTTools/NMTTools_PaveFiller.hxx
+++ b/src/NMTTools/NMTTools_PaveFiller.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _NMTTools_PaveFiller_HeaderFile
 #define _NMTTools_PaveFiller_HeaderFile
diff --git a/src/NMTTools/NMTTools_PaveFiller.ixx b/src/NMTTools/NMTTools_PaveFiller.ixx
index a3c6ce1b7..0d15ab0ba 100644
--- a/src/NMTTools/NMTTools_PaveFiller.ixx
+++ b/src/NMTTools/NMTTools_PaveFiller.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_PaveFiller.jxx b/src/NMTTools/NMTTools_PaveFiller.jxx
index da6145fe0..4aab014a5 100644
--- a/src/NMTTools/NMTTools_PaveFiller.jxx
+++ b/src/NMTTools/NMTTools_PaveFiller.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_PaveFiller_0.cxx b/src/NMTTools/NMTTools_PaveFiller_0.cxx
index 87dbeef85..b211a5fc1 100644
--- a/src/NMTTools/NMTTools_PaveFiller_0.cxx
+++ b/src/NMTTools/NMTTools_PaveFiller_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_PaveFiller_1.cxx b/src/NMTTools/NMTTools_PaveFiller_1.cxx
index 031f3abff..ace624b09 100644
--- a/src/NMTTools/NMTTools_PaveFiller_1.cxx
+++ b/src/NMTTools/NMTTools_PaveFiller_1.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_PaveFiller_2.cxx b/src/NMTTools/NMTTools_PaveFiller_2.cxx
index d7ebc4732..4451b9877 100644
--- a/src/NMTTools/NMTTools_PaveFiller_2.cxx
+++ b/src/NMTTools/NMTTools_PaveFiller_2.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File:        NMTTools_PaveFiller_2.cxx
 // Created:     Mon Dec  8 12:02:56 2003
diff --git a/src/NMTTools/NMTTools_PaveFiller_3.cxx b/src/NMTTools/NMTTools_PaveFiller_3.cxx
index bf387e4a2..e9ea74fd9 100644
--- a/src/NMTTools/NMTTools_PaveFiller_3.cxx
+++ b/src/NMTTools/NMTTools_PaveFiller_3.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File:        NMTTools_PaveFiller_3.cxx
 // Created:     Mon Dec  8 16:06:56 2003
diff --git a/src/NMTTools/NMTTools_PaveFiller_4.cxx b/src/NMTTools/NMTTools_PaveFiller_4.cxx
index 7711f2701..d3eb9aab6 100644
--- a/src/NMTTools/NMTTools_PaveFiller_4.cxx
+++ b/src/NMTTools/NMTTools_PaveFiller_4.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_PaveFiller_5.cxx b/src/NMTTools/NMTTools_PaveFiller_5.cxx
index 96ab2796d..d7c385de8 100644
--- a/src/NMTTools/NMTTools_PaveFiller_5.cxx
+++ b/src/NMTTools/NMTTools_PaveFiller_5.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_PaveFiller_6.cxx b/src/NMTTools/NMTTools_PaveFiller_6.cxx
index 43ab91e0f..009f902bf 100644
--- a/src/NMTTools/NMTTools_PaveFiller_6.cxx
+++ b/src/NMTTools/NMTTools_PaveFiller_6.cxx
@@ -1,23 +1,23 @@
-//  Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License.
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
 //
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
 //
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //  File:        NMTTools_PaveFiller_6.cxx
 //  Created:     Fri Dec 19 10:27:31 2003
diff --git a/src/NMTTools/NMTTools_PaveFiller_7.cxx b/src/NMTTools/NMTTools_PaveFiller_7.cxx
index 0960fee58..b771d2396 100644
--- a/src/NMTTools/NMTTools_PaveFiller_7.cxx
+++ b/src/NMTTools/NMTTools_PaveFiller_7.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File:        NMTTools_PaveFiller_7.cxx
 // Author:      Peter KURNEV
diff --git a/src/NMTTools/NMTTools_PaveFiller_8.cxx b/src/NMTTools/NMTTools_PaveFiller_8.cxx
index b4c21b10e..a413fde1c 100644
--- a/src/NMTTools/NMTTools_PaveFiller_8.cxx
+++ b/src/NMTTools/NMTTools_PaveFiller_8.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_PaveFiller_9.cxx b/src/NMTTools/NMTTools_PaveFiller_9.cxx
index 0769dcec0..0e5dd473c 100644
--- a/src/NMTTools/NMTTools_PaveFiller_9.cxx
+++ b/src/NMTTools/NMTTools_PaveFiller_9.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_StdMapNodeOfMapOfPaveBlock.hxx b/src/NMTTools/NMTTools_StdMapNodeOfMapOfPaveBlock.hxx
index d03619469..024c17f19 100644
--- a/src/NMTTools/NMTTools_StdMapNodeOfMapOfPaveBlock.hxx
+++ b/src/NMTTools/NMTTools_StdMapNodeOfMapOfPaveBlock.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_StdMapNodeOfMapOfPaveBlock_0.cxx b/src/NMTTools/NMTTools_StdMapNodeOfMapOfPaveBlock_0.cxx
index 7ef908aeb..aefd735f3 100644
--- a/src/NMTTools/NMTTools_StdMapNodeOfMapOfPaveBlock_0.cxx
+++ b/src/NMTTools/NMTTools_StdMapNodeOfMapOfPaveBlock_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_Tools.cdl b/src/NMTTools/NMTTools_Tools.cdl
index 2d8df63a7..988a299c8 100644
--- a/src/NMTTools/NMTTools_Tools.cdl
+++ b/src/NMTTools/NMTTools_Tools.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 -- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_Tools.cxx b/src/NMTTools/NMTTools_Tools.cxx
index cdbcc5f06..03c3179eb 100644
--- a/src/NMTTools/NMTTools_Tools.cxx
+++ b/src/NMTTools/NMTTools_Tools.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File:        NMTTools_Tools.cxx
 // Created:     Mon Dec  8 10:35:15 2003
diff --git a/src/NMTTools/NMTTools_Tools.hxx b/src/NMTTools/NMTTools_Tools.hxx
index ad75e9298..ac5488668 100644
--- a/src/NMTTools/NMTTools_Tools.hxx
+++ b/src/NMTTools/NMTTools_Tools.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _NMTTools_Tools_HeaderFile
 #define _NMTTools_Tools_HeaderFile
diff --git a/src/NMTTools/NMTTools_Tools.ixx b/src/NMTTools/NMTTools_Tools.ixx
index 062184f06..c7e8694fa 100644
--- a/src/NMTTools/NMTTools_Tools.ixx
+++ b/src/NMTTools/NMTTools_Tools.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools/NMTTools_Tools.jxx b/src/NMTTools/NMTTools_Tools.jxx
index 6ac8a846e..2c70bf463 100644
--- a/src/NMTTools/NMTTools_Tools.jxx
+++ b/src/NMTTools/NMTTools_Tools.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools_NEW/Makefile.am b/src/NMTTools_NEW/Makefile.am
index 221c2c9bf..0bc91529d 100644
--- a/src/NMTTools_NEW/Makefile.am
+++ b/src/NMTTools_NEW/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -15,6 +15,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
 
 #  GEOM NMTTools : partition algorithm
 #  File   : Makefile.in
diff --git a/src/NMTTools_NEW/NMTTools.cdl b/src/NMTTools_NEW/NMTTools.cdl
index 82a03105b..e3ce88466 100644
--- a/src/NMTTools_NEW/NMTTools.cdl
+++ b/src/NMTTools_NEW/NMTTools.cdl
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+-- Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 --
 -- Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 -- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -25,105 +25,105 @@
 -- Author:	Peter KURNEV
 --		<pkv@irinox>
 --
-package NMTTools 
+package NMTTools
 
-	---Purpose: 
+	---Purpose:
+
+uses
 
-uses  
-    
     TCollection,
     TColStd,
-    gp, 
-    TopAbs, 
-    TopoDS, 
-    TopTools, 
+    gp,
+    TopAbs,
+    TopoDS,
+    TopTools,
     Geom2d,
     BooleanOperations,
     BOPTColStd,
     IntTools,
-    BOPTools, 
+    BOPTools,
     NMTDS
 
-is  
-    imported CoupleOfShape from NMTTools; 
-    imported CommonBlock from NMTTools; 
-    imported CommonBlockAPI from NMTTools; 
-    imported FaceInfo from NMTTools; 
-    imported Tools from NMTTools; 
-    imported PaveFiller from NMTTools; 
-    imported PPaveFiller from NMTTools; 
-    imported DEProcessor from NMTTools; 
-    imported CheckerSI from NMTTools; 
-    --  
-    imported ListOfCommonBlock from NMTTools; 
-    imported ListIteratorOfListOfCommonBlock from NMTTools; 
-     
-    imported ListOfCoupleOfShape from NMTTools; 
-    imported ListIteratorOfListOfCoupleOfShape from NMTTools;   
-    
-    imported MapOfPaveBlock from NMTTools;  
-    imported MapIteratorOfMapOfPaveBlock from NMTTools;   
-    
-    imported IndexedDataMapOfIndexedMapOfInteger from NMTTools;  
-    imported IndexedDataMapOfShapePaveBlock from NMTTools;  
-    imported IndexedDataMapOfShapeIndexedMapOfShape from NMTTools;  
- 
-    imported DataMapOfIntegerListOfPaveBlock from NMTTools;  
-    imported DataMapIteratorOfDataMapOfIntegerListOfPaveBlock from NMTTools;  
- 
-    imported DataMapOfIntegerFaceInfo from NMTTools;  
-    imported DataMapIteratorOfDataMapOfIntegerFaceInfo from NMTTools;  
- 
-    imported CommonBlockPool from NMTTools;  
-    
-    -- 
-    --class PaveFiller; 
-    --class Tools; 
-    --class CommonBlock; 
-    --class CommonBlockAPI; 
+is
+    imported CoupleOfShape from NMTTools;
+    imported CommonBlock from NMTTools;
+    imported CommonBlockAPI from NMTTools;
+    imported FaceInfo from NMTTools;
+    imported Tools from NMTTools;
+    imported PaveFiller from NMTTools;
+    imported PPaveFiller from NMTTools;
+    imported DEProcessor from NMTTools;
+    imported CheckerSI from NMTTools;
+    --
+    imported ListOfCommonBlock from NMTTools;
+    imported ListIteratorOfListOfCommonBlock from NMTTools;
+
+    imported ListOfCoupleOfShape from NMTTools;
+    imported ListIteratorOfListOfCoupleOfShape from NMTTools;
+
+    imported MapOfPaveBlock from NMTTools;
+    imported MapIteratorOfMapOfPaveBlock from NMTTools;
+
+    imported IndexedDataMapOfIndexedMapOfInteger from NMTTools;
+    imported IndexedDataMapOfShapePaveBlock from NMTTools;
+    imported IndexedDataMapOfShapeIndexedMapOfShape from NMTTools;
+
+    imported DataMapOfIntegerListOfPaveBlock from NMTTools;
+    imported DataMapIteratorOfDataMapOfIntegerListOfPaveBlock from NMTTools;
+
+    imported DataMapOfIntegerFaceInfo from NMTTools;
+    imported DataMapIteratorOfDataMapOfIntegerFaceInfo from NMTTools;
+
+    imported CommonBlockPool from NMTTools;
+
+    --
+    --class PaveFiller;
+    --class Tools;
+    --class CommonBlock;
+    --class CommonBlockAPI;
     --class FaceInfo;
-    --class CoupleOfShape;  
-    --class CheckerSI; 
-    --class DEProcessor; 
+    --class CoupleOfShape;
+    --class CheckerSI;
+    --class DEProcessor;
     --pointer PPaveFiller to PaveFiller from NMTTools;
     --
-    --class ListOfCommonBlock  instantiates  
-    --	List from TCollection(CommonBlock from NMTTools); 
- 
-    --class ListOfCoupleOfShape  instantiates  
-    --	List from TCollection(CoupleOfShape from NMTTools);  
---	 
-    --class  MapOfPaveBlock  instantiates 
-    --	Map from TCollection   (PaveBlock from BOPTools, 
-    --	    	    	    	PaveBlockMapHasher from BOPTools); 
+    --class ListOfCommonBlock  instantiates
+    --	List from TCollection(CommonBlock from NMTTools);
+
+    --class ListOfCoupleOfShape  instantiates
+    --	List from TCollection(CoupleOfShape from NMTTools);
 --
-    --class IndexedDataMapOfIndexedMapOfInteger instantiates  
-    --	IndexedDataMap from TCollection  (Integer from Standard, 
+    --class  MapOfPaveBlock  instantiates
+    --	Map from TCollection   (PaveBlock from BOPTools,
+    --	    	    	    	PaveBlockMapHasher from BOPTools);
+--
+    --class IndexedDataMapOfIndexedMapOfInteger instantiates
+    --	IndexedDataMap from TCollection  (Integer from Standard,
     --	    	    	    	    	  IndexedMapOfInteger from TColStd,
-    --	    	    	    	    	  MapIntegerHasher from TColStd); 
-	 
-    --class IndexedDataMapOfShapePaveBlock instantiates  
-    --	IndexedDataMap from TCollection  (Shape from TopoDS, 
+    --	    	    	    	    	  MapIntegerHasher from TColStd);
+
+    --class IndexedDataMapOfShapePaveBlock instantiates
+    --	IndexedDataMap from TCollection  (Shape from TopoDS,
     --	    	    	    	    	  PaveBlock from BOPTools,
-    --	    	    	    	    	  ShapeMapHasher from TopTools); 
-    
-    --class IndexedDataMapOfShapeIndexedMapOfShape instantiates  
-    --	IndexedDataMap from TCollection  (Shape from TopoDS, 
+    --	    	    	    	    	  ShapeMapHasher from TopTools);
+
+    --class IndexedDataMapOfShapeIndexedMapOfShape instantiates
+    --	IndexedDataMap from TCollection  (Shape from TopoDS,
     --	    	    	    	    	  IndexedMapOfShape from TopTools,
-    --	    	    	    	    	  ShapeMapHasher from TopTools);   
-					   
---    	 
-    --class DataMapOfIntegerListOfPaveBlock instantiates 
+    --	    	    	    	    	  ShapeMapHasher from TopTools);
+
+--
+    --class DataMapOfIntegerListOfPaveBlock instantiates
     --	DataMap from TCollection(Integer from  Standard,
     --	    	    	    	 ListOfPaveBlock from BOPTools,
-    --				 MapIntegerHasher from TColStd);		 
-    				 
-    --class DataMapOfIntegerFaceInfo instantiates 
-    --	DataMap from TCollection(Integer from  Standard, 
+    --				 MapIntegerHasher from TColStd);
+
+    --class DataMapOfIntegerFaceInfo instantiates
+    --	DataMap from TCollection(Integer from  Standard,
     --                             FaceInfo from  NMTTools,
-    --				 MapIntegerHasher from TColStd); 
---  
-    --class CommonBlockPool    instantiates  
-    --	CArray1 from BOPTColStd (ListOfCommonBlock from NMTTools); 
+    --				 MapIntegerHasher from TColStd);
+--
+    --class CommonBlockPool    instantiates
+    --	CArray1 from BOPTColStd (ListOfCommonBlock from NMTTools);
 --
 end NMTTools;
diff --git a/src/NMTTools_NEW/NMTTools_CheckerSI.cxx b/src/NMTTools_NEW/NMTTools_CheckerSI.cxx
index 037445e16..dd724ba6a 100644
--- a/src/NMTTools_NEW/NMTTools_CheckerSI.cxx
+++ b/src/NMTTools_NEW/NMTTools_CheckerSI.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -30,8 +30,8 @@
 #include <IntTools_Context.hxx>
 
 //=======================================================================
-//function : 
-//purpose  : 
+//function :
+//purpose  :
 //=======================================================================
   NMTTools_CheckerSI::NMTTools_CheckerSI()
 :
@@ -41,14 +41,14 @@
 }
 //=======================================================================
 //function : ~
-//purpose  : 
+//purpose  :
 //=======================================================================
   NMTTools_CheckerSI::~NMTTools_CheckerSI()
 {
 }
 //=======================================================================
 //function : Clear
-//purpose  : 
+//purpose  :
 //=======================================================================
   void NMTTools_CheckerSI::Clear()
 {
@@ -56,7 +56,7 @@
 }
 //=======================================================================
 //function : StopStatus
-//purpose  : 
+//purpose  :
 //=======================================================================
   Standard_Integer NMTTools_CheckerSI::StopStatus()const
 {
@@ -64,7 +64,7 @@
 }
 //=======================================================================
 //function : Init
-//purpose  : 
+//purpose  :
 //=======================================================================
   void NMTTools_CheckerSI::Init()
 {
@@ -91,12 +91,12 @@
   // 4
   myIP=new NMTDS_InterfPool;
   //
-  // 5 
+  // 5
   myContext=new IntTools_Context;
 }
 //=======================================================================
 //function : Perform
-//purpose  : 
+//purpose  :
 //=======================================================================
   void NMTTools_CheckerSI::Perform()
 {
@@ -168,7 +168,7 @@
   //
   MakePCurves();
   //
-  // 7. Postprocessing 
+  // 7. Postprocessing
   UpdatePaveBlocks();
   //
   NMTTools_DEProcessor aDEP(*this);
diff --git a/src/NMTTools_NEW/NMTTools_CheckerSI.hxx b/src/NMTTools_NEW/NMTTools_CheckerSI.hxx
index 27ec729d4..ff9000ad5 100644
--- a/src/NMTTools_NEW/NMTTools_CheckerSI.hxx
+++ b/src/NMTTools_NEW/NMTTools_CheckerSI.hxx
@@ -1,69 +1,69 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-
-//  File:       NMTTools_CheckerSI.hxx
-//  Created:    Mon Feb 19 11:32:08 2007
-//  Author:     Peter KURNEV
-//
-#ifndef _NMTTools_CheckerSI_HeaderFile
-#define _NMTTools_CheckerSI_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_Macro.hxx>
-#include <Standard_Integer.hxx>
-#include <NMTTools_PaveFiller.hxx>
-#include <TopAbs_ShapeEnum.hxx>
-
-//=======================================================================
-//class    : NMTTools_CheckerSI
-//purpose  : 
-//=======================================================================
-class NMTTools_CheckerSI  : public NMTTools_PaveFiller
-{
- public:
-  Standard_EXPORT
-    NMTTools_CheckerSI();
-
-  Standard_EXPORT
-    virtual ~NMTTools_CheckerSI();
-  
-  Standard_EXPORT
-    virtual  void Perform() ;
-  
-  Standard_EXPORT
-    Standard_Integer StopStatus() const;
-
- protected:
-  Standard_EXPORT
-    virtual  void Init() ;
-  
-  Standard_EXPORT
-    virtual  void Clear() ;
-  
-  Standard_EXPORT
-    virtual  void PreparePaveBlocks(const Standard_Integer nE) ;
-  
-  Standard_EXPORT
-    virtual  void PreparePaveBlocks(const TopAbs_ShapeEnum aType1,
-				    const TopAbs_ShapeEnum aType2) ;
-
-
-  Standard_Integer myStopStatus;
-};
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+//  File:       NMTTools_CheckerSI.hxx
+//  Created:    Mon Feb 19 11:32:08 2007
+//  Author:     Peter KURNEV
+//
+#ifndef _NMTTools_CheckerSI_HeaderFile
+#define _NMTTools_CheckerSI_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Macro.hxx>
+#include <Standard_Integer.hxx>
+#include <NMTTools_PaveFiller.hxx>
+#include <TopAbs_ShapeEnum.hxx>
+
+//=======================================================================
+//class    : NMTTools_CheckerSI
+//purpose  :
+//=======================================================================
+class NMTTools_CheckerSI  : public NMTTools_PaveFiller
+{
+ public:
+  Standard_EXPORT
+    NMTTools_CheckerSI();
+
+  Standard_EXPORT
+    virtual ~NMTTools_CheckerSI();
+
+  Standard_EXPORT
+    virtual  void Perform() ;
+
+  Standard_EXPORT
+    Standard_Integer StopStatus() const;
+
+ protected:
+  Standard_EXPORT
+    virtual  void Init() ;
+
+  Standard_EXPORT
+    virtual  void Clear() ;
+
+  Standard_EXPORT
+    virtual  void PreparePaveBlocks(const Standard_Integer nE) ;
+
+  Standard_EXPORT
+    virtual  void PreparePaveBlocks(const TopAbs_ShapeEnum aType1,
+				    const TopAbs_ShapeEnum aType2) ;
+
+
+  Standard_Integer myStopStatus;
+};
+#endif
diff --git a/src/NMTTools_NEW/NMTTools_CheckerSI_1.cxx b/src/NMTTools_NEW/NMTTools_CheckerSI_1.cxx
index 6cc796ac9..eb00dec0f 100644
--- a/src/NMTTools_NEW/NMTTools_CheckerSI_1.cxx
+++ b/src/NMTTools_NEW/NMTTools_CheckerSI_1.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -52,16 +52,16 @@ static
 
 //=======================================================================
 // function: PreparePaveBlocks
-// purpose: 
+// purpose:
 //=======================================================================
-  void NMTTools_CheckerSI::PreparePaveBlocks(const TopAbs_ShapeEnum aType1, 
+  void NMTTools_CheckerSI::PreparePaveBlocks(const TopAbs_ShapeEnum aType1,
                                              const TopAbs_ShapeEnum aType2)
 {
   NMTTools_PaveFiller::PreparePaveBlocks(aType1, aType2);
 }
 //=======================================================================
 // function: PreparePaveBlocks
-// purpose: 
+// purpose:
 //=======================================================================
   void NMTTools_CheckerSI::PreparePaveBlocks(const Standard_Integer nE)
 {
@@ -75,7 +75,7 @@ static
   TopoDS_Vertex aV1, aV2;
   //
   BOPTools_ListOfPaveBlock& aLPB=mySplitShapesPool(myDS->RefEdge(nE));
-  // Edge 
+  // Edge
   aE=TopoDS::Edge(myDS->Shape(nE));
   if (BRep_Tool::Degenerated(aE)) {
     myIsDone=Standard_True;
@@ -83,7 +83,7 @@ static
   }
   //
   BOPTools_PaveSet& aPS=myPavePool(myDS->RefEdge(nE));
-  
+
   BOPTools_PaveBlockIterator aPBIt(nE, aPS);
   for (; aPBIt.More(); aPBIt.Next()) {
     BOPTools_PaveBlock& aPB=aPBIt.Value();
@@ -96,7 +96,7 @@ static
     //
     const BOPTools_Pave& aPave2=aPB.Pave2();
     nV2=aPave2.Index();
-    aV2=TopoDS::Vertex(myDS->Shape(nV2)); 
+    aV2=TopoDS::Vertex(myDS->Shape(nV2));
     aT2=aPave2.Param();
     //
     bIsValid=Standard_True;
@@ -121,13 +121,13 @@ static
     }
     aPB.SetShrunkRange(aSR);
     aLPB.Append(aPB);
-  } //for (; aPBIt.More(); aPBIt.Next()) 
+  } //for (; aPBIt.More(); aPBIt.Next())
   myIsDone=Standard_True;
 }
 
 //=======================================================================
 //function : IsValid
-//purpose  : 
+//purpose  :
 //=======================================================================
 Standard_Boolean IsValid(const TopoDS_Edge& aE,
                          const TopoDS_Vertex& aV,
diff --git a/src/NMTTools_NEW/NMTTools_CommonBlock.cxx b/src/NMTTools_NEW/NMTTools_CommonBlock.cxx
index 6324342d9..701bf3790 100644
--- a/src/NMTTools_NEW/NMTTools_CommonBlock.cxx
+++ b/src/NMTTools_NEW/NMTTools_CommonBlock.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -32,14 +32,14 @@
 
 //=======================================================================
 // function:  NMTTools_CommonBlock::NMTTools_CommonBlock()
-// purpose: 
+// purpose:
 //=======================================================================
   NMTTools_CommonBlock::NMTTools_CommonBlock()
 {
 }
 //=======================================================================
 // function:  AddPaveBlock
-// purpose: 
+// purpose:
 //=======================================================================
   void NMTTools_CommonBlock::AddPaveBlock(const BOPTools_PaveBlock& aPB)
 {
@@ -47,7 +47,7 @@
 }
 //=======================================================================
 // function:  AddFace
-// purpose: 
+// purpose:
 //=======================================================================
   void NMTTools_CommonBlock::AddFace(const Standard_Integer aF)
 {
@@ -55,7 +55,7 @@
 }
 //=======================================================================
 // function:  AddFaces
-// purpose: 
+// purpose:
 //=======================================================================
   void NMTTools_CommonBlock::AddFaces(const TColStd_ListOfInteger& aLF)
 {
@@ -67,7 +67,7 @@
 }
 //=======================================================================
 // function:  PaveBlocks
-// purpose: 
+// purpose:
 //=======================================================================
   const BOPTools_ListOfPaveBlock& NMTTools_CommonBlock::PaveBlocks()const
 {
@@ -75,7 +75,7 @@
 }
 //=======================================================================
 // function:  Faces
-// purpose: 
+// purpose:
 //=======================================================================
   const TColStd_ListOfInteger& NMTTools_CommonBlock::Faces()const
 {
@@ -83,7 +83,7 @@
 }
 //=======================================================================
 // function:  PaveBlock1
-// purpose: 
+// purpose:
 //=======================================================================
   const BOPTools_PaveBlock& NMTTools_CommonBlock::PaveBlock1()const
 {
@@ -91,7 +91,7 @@
 }
 //=======================================================================
 // function:  PaveBlock1
-// purpose: 
+// purpose:
 //=======================================================================
    BOPTools_PaveBlock& NMTTools_CommonBlock::PaveBlock1(const Standard_Integer aIx)
 {
@@ -99,7 +99,7 @@
 }
 //=======================================================================
 // function:  PaveBlockOnEdge
-// purpose: 
+// purpose:
 //=======================================================================
    BOPTools_PaveBlock& NMTTools_CommonBlock::PaveBlockOnEdge(const Standard_Integer aIx)
 {
@@ -118,7 +118,7 @@
 }
 //=======================================================================
 // function:  IsPaveBlockOnFace
-// purpose: 
+// purpose:
 //=======================================================================
   Standard_Boolean NMTTools_CommonBlock::IsPaveBlockOnFace(const Standard_Integer aIx)const
 {
@@ -136,7 +136,7 @@
 }
 //=======================================================================
 // function:  IsPaveBlockOnEdge
-// purpose: 
+// purpose:
 //=======================================================================
   Standard_Boolean NMTTools_CommonBlock::IsPaveBlockOnEdge(const Standard_Integer aIx)const
 {
@@ -155,7 +155,7 @@
 }
 //=======================================================================
 // function:  IsEqual
-// purpose: 
+// purpose:
 //=======================================================================
   Standard_Boolean NMTTools_CommonBlock::IsEqual(const NMTTools_CommonBlock& aOther)const
 {
@@ -189,7 +189,7 @@
 }
 //=======================================================================
 // function:  Contains
-// purpose: 
+// purpose:
 //=======================================================================
   Standard_Boolean NMTTools_CommonBlock::Contains(const BOPTools_PaveBlock& aPBx)const
 {
@@ -215,7 +215,7 @@
 /*
 //=======================================================================
 // function:  SetEdge
-// purpose: 
+// purpose:
 //=======================================================================
   void NMTTools_CommonBlock::SetEdge(const Standard_Integer anEdge)
 {
@@ -229,7 +229,7 @@
 }
 //=======================================================================
 // function:  Edge
-// purpose: 
+// purpose:
 //=======================================================================
   Standard_Integer NMTTools_CommonBlock::Edge()const
 {
diff --git a/src/NMTTools_NEW/NMTTools_CommonBlock.hxx b/src/NMTTools_NEW/NMTTools_CommonBlock.hxx
index 8fabb1143..94dc4d9b2 100644
--- a/src/NMTTools_NEW/NMTTools_CommonBlock.hxx
+++ b/src/NMTTools_NEW/NMTTools_CommonBlock.hxx
@@ -1,91 +1,91 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-
-// File:        NMTTools_CommonBlock.hxx
-// Created:     Tue Dec  9 12:23:29 2003
-// Author:      Peter KURNEV
-//              <pkv@irinox>
-//
-
-#ifndef _NMTTools_CommonBlock_HeaderFile
-#define _NMTTools_CommonBlock_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_Macro.hxx>
-#include <BOPTools_ListOfPaveBlock.hxx>
-#include <TColStd_ListOfInteger.hxx>
-#include <Standard_Integer.hxx>
-#include <Standard_Boolean.hxx>
-#include <BOPTools_PaveBlock.hxx>
-
-
-//=======================================================================
-//function : NMTTools_CommonBlock
-//purpose  : 
-//=======================================================================
-class NMTTools_CommonBlock  {
- public:
-  Standard_EXPORT
-    NMTTools_CommonBlock();
-  
-  Standard_EXPORT
-    void AddPaveBlock(const BOPTools_PaveBlock& aPB) ;
-  
-  Standard_EXPORT
-    void AddFace(const Standard_Integer aF) ;
-  
-  Standard_EXPORT
-    void AddFaces(const TColStd_ListOfInteger& aLF) ;
-  
-  Standard_EXPORT
-    const BOPTools_ListOfPaveBlock& PaveBlocks() const;
-  
-  Standard_EXPORT
-    const TColStd_ListOfInteger& Faces() const;
-  
-  Standard_EXPORT
-    const BOPTools_PaveBlock& PaveBlock1() const;
-  
-  Standard_EXPORT
-    BOPTools_PaveBlock& PaveBlock1(const Standard_Integer anIx) ;
-  
-  Standard_EXPORT
-    BOPTools_PaveBlock& PaveBlockOnEdge(const Standard_Integer anIndex) ;
-  
-  Standard_EXPORT
-    Standard_Boolean IsPaveBlockOnFace(const Standard_Integer anIndex) const;
-  
-  Standard_EXPORT
-    Standard_Boolean IsPaveBlockOnEdge(const Standard_Integer anIndex) const;
-  
-  Standard_EXPORT
-    Standard_Boolean IsEqual(const NMTTools_CommonBlock& aCB) const;
-  
-  Standard_EXPORT
-    Standard_Boolean Contains(const BOPTools_PaveBlock& aPB) const;
-
- protected:
-  BOPTools_ListOfPaveBlock myPaveBlocks;
-  TColStd_ListOfInteger myFaces;
-};
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File:        NMTTools_CommonBlock.hxx
+// Created:     Tue Dec  9 12:23:29 2003
+// Author:      Peter KURNEV
+//              <pkv@irinox>
+//
+
+#ifndef _NMTTools_CommonBlock_HeaderFile
+#define _NMTTools_CommonBlock_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Macro.hxx>
+#include <BOPTools_ListOfPaveBlock.hxx>
+#include <TColStd_ListOfInteger.hxx>
+#include <Standard_Integer.hxx>
+#include <Standard_Boolean.hxx>
+#include <BOPTools_PaveBlock.hxx>
+
+
+//=======================================================================
+//function : NMTTools_CommonBlock
+//purpose  :
+//=======================================================================
+class NMTTools_CommonBlock  {
+ public:
+  Standard_EXPORT
+    NMTTools_CommonBlock();
+
+  Standard_EXPORT
+    void AddPaveBlock(const BOPTools_PaveBlock& aPB) ;
+
+  Standard_EXPORT
+    void AddFace(const Standard_Integer aF) ;
+
+  Standard_EXPORT
+    void AddFaces(const TColStd_ListOfInteger& aLF) ;
+
+  Standard_EXPORT
+    const BOPTools_ListOfPaveBlock& PaveBlocks() const;
+
+  Standard_EXPORT
+    const TColStd_ListOfInteger& Faces() const;
+
+  Standard_EXPORT
+    const BOPTools_PaveBlock& PaveBlock1() const;
+
+  Standard_EXPORT
+    BOPTools_PaveBlock& PaveBlock1(const Standard_Integer anIx) ;
+
+  Standard_EXPORT
+    BOPTools_PaveBlock& PaveBlockOnEdge(const Standard_Integer anIndex) ;
+
+  Standard_EXPORT
+    Standard_Boolean IsPaveBlockOnFace(const Standard_Integer anIndex) const;
+
+  Standard_EXPORT
+    Standard_Boolean IsPaveBlockOnEdge(const Standard_Integer anIndex) const;
+
+  Standard_EXPORT
+    Standard_Boolean IsEqual(const NMTTools_CommonBlock& aCB) const;
+
+  Standard_EXPORT
+    Standard_Boolean Contains(const BOPTools_PaveBlock& aPB) const;
+
+ protected:
+  BOPTools_ListOfPaveBlock myPaveBlocks;
+  TColStd_ListOfInteger myFaces;
+};
+
+#endif
diff --git a/src/NMTTools_NEW/NMTTools_CommonBlockAPI.cxx b/src/NMTTools_NEW/NMTTools_CommonBlockAPI.cxx
index daaa5795e..4593ef860 100644
--- a/src/NMTTools_NEW/NMTTools_CommonBlockAPI.cxx
+++ b/src/NMTTools_NEW/NMTTools_CommonBlockAPI.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -37,7 +37,7 @@
 
 //=======================================================================
 // function:  NMTTools_CommonBlockAPI::NMTTools_CommonBlockAPI
-// purpose: 
+// purpose:
 //=======================================================================
   NMTTools_CommonBlockAPI::NMTTools_CommonBlockAPI (const NMTTools_ListOfCommonBlock& aLCB)
 {
@@ -45,7 +45,7 @@
 }
 //=======================================================================
 // function:  List
-// purpose: 
+// purpose:
 //=======================================================================
   const NMTTools_ListOfCommonBlock& NMTTools_CommonBlockAPI::List () const
 {
@@ -85,7 +85,7 @@
 }
 //=======================================================================
 // function:  IsCommonBlock
-// purpose: 
+// purpose:
 //=======================================================================
   Standard_Boolean NMTTools_CommonBlockAPI::IsCommonBlock(const BOPTools_PaveBlock& aPB) const
 {
@@ -107,7 +107,7 @@
 
 //=======================================================================
 // function:  CommonBlock
-// purpose: 
+// purpose:
 //=======================================================================
   NMTTools_CommonBlock& NMTTools_CommonBlockAPI::CommonBlock(const BOPTools_PaveBlock& aPB)const
 {
diff --git a/src/NMTTools_NEW/NMTTools_CommonBlockAPI.hxx b/src/NMTTools_NEW/NMTTools_CommonBlockAPI.hxx
index def2c49e9..d9c4aa4e7 100644
--- a/src/NMTTools_NEW/NMTTools_CommonBlockAPI.hxx
+++ b/src/NMTTools_NEW/NMTTools_CommonBlockAPI.hxx
@@ -1,74 +1,74 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-
-// File:        NMTTools_CommonBlockAPI.hxx
-// Created:     Mon Dec 15 11:38:04 2003
-// Author:      Peter KURNEV
-//              <pkv@irinox>
-//
-#ifndef _NMTTools_CommonBlockAPI_HeaderFile
-#define _NMTTools_CommonBlockAPI_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_Macro.hxx>
-#include <Standard_Address.hxx>
-#include <BOPTools_ListOfPaveBlock.hxx>
-#include <Standard_Integer.hxx>
-#include <Standard_Boolean.hxx>
-#include <NMTTools_CommonBlock.hxx>
-#include <NMTTools_ListOfCommonBlock.hxx>
-#include <BOPTools_ListOfPaveBlock.hxx>
-#include <BOPTools_PaveBlock.hxx>
-
-//=======================================================================
-//class    : NMTTools_CommonBlockAPI
-//purpose  : 
-//=======================================================================
-class NMTTools_CommonBlockAPI  
-{
- public:
-  Standard_EXPORT
-    NMTTools_CommonBlockAPI(const NMTTools_ListOfCommonBlock& aList);
-  
-//! Selector <br>
-  Standard_EXPORT
-    const NMTTools_ListOfCommonBlock& List() const;
-  
-//! Returns all PaveBlock-s (from the list) that are <br>
-//! common for the given edge with  DS-index <anE> <br>
-  Standard_EXPORT
-    const BOPTools_ListOfPaveBlock& CommonPaveBlocks(const Standard_Integer anE) const;
-  
-//! Returns TRUE if given PaveBlock <aPB> is <br>
-//! common for the Blocks from the list <br>
-  Standard_EXPORT
-    Standard_Boolean IsCommonBlock(const BOPTools_PaveBlock& aPB) const;
-  
-  Standard_EXPORT
-    NMTTools_CommonBlock& CommonBlock(const BOPTools_PaveBlock& aPB) const;
-protected:
-//private:
-
-Standard_Address myListOfCommonBlock;
-BOPTools_ListOfPaveBlock myListOfPaveBlock;
-};
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File:        NMTTools_CommonBlockAPI.hxx
+// Created:     Mon Dec 15 11:38:04 2003
+// Author:      Peter KURNEV
+//              <pkv@irinox>
+//
+#ifndef _NMTTools_CommonBlockAPI_HeaderFile
+#define _NMTTools_CommonBlockAPI_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Macro.hxx>
+#include <Standard_Address.hxx>
+#include <BOPTools_ListOfPaveBlock.hxx>
+#include <Standard_Integer.hxx>
+#include <Standard_Boolean.hxx>
+#include <NMTTools_CommonBlock.hxx>
+#include <NMTTools_ListOfCommonBlock.hxx>
+#include <BOPTools_ListOfPaveBlock.hxx>
+#include <BOPTools_PaveBlock.hxx>
+
+//=======================================================================
+//class    : NMTTools_CommonBlockAPI
+//purpose  :
+//=======================================================================
+class NMTTools_CommonBlockAPI
+{
+ public:
+  Standard_EXPORT
+    NMTTools_CommonBlockAPI(const NMTTools_ListOfCommonBlock& aList);
+
+//! Selector <br>
+  Standard_EXPORT
+    const NMTTools_ListOfCommonBlock& List() const;
+
+//! Returns all PaveBlock-s (from the list) that are <br>
+//! common for the given edge with  DS-index <anE> <br>
+  Standard_EXPORT
+    const BOPTools_ListOfPaveBlock& CommonPaveBlocks(const Standard_Integer anE) const;
+
+//! Returns TRUE if given PaveBlock <aPB> is <br>
+//! common for the Blocks from the list <br>
+  Standard_EXPORT
+    Standard_Boolean IsCommonBlock(const BOPTools_PaveBlock& aPB) const;
+
+  Standard_EXPORT
+    NMTTools_CommonBlock& CommonBlock(const BOPTools_PaveBlock& aPB) const;
+protected:
+//private:
+
+Standard_Address myListOfCommonBlock;
+BOPTools_ListOfPaveBlock myListOfPaveBlock;
+};
+#endif
diff --git a/src/NMTTools_NEW/NMTTools_CommonBlockPool.cxx b/src/NMTTools_NEW/NMTTools_CommonBlockPool.cxx
index 654852c7f..d49252b41 100644
--- a/src/NMTTools_NEW/NMTTools_CommonBlockPool.cxx
+++ b/src/NMTTools_NEW/NMTTools_CommonBlockPool.cxx
@@ -1,42 +1,42 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-
-// File:        NMTTools_CommonBlockPool.cxx
-// Created:     
-// Author:      Peter KURNEV
-//              <pkv@irinox>
-//
-
-
-#include <NMTTools_CommonBlockPool.hxx>
-
-#ifndef _Standard_OutOfRange_HeaderFile
-#include <Standard_OutOfRange.hxx>
-#endif
-#ifndef _Standard_OutOfMemory_HeaderFile
-#include <Standard_OutOfMemory.hxx>
-#endif
- 
-
-#define Array1Item NMTTools_ListOfCommonBlock
-#define Array1Item_hxx <NMTTools_ListOfCommonBlock.hxx>
-#define BOPTColStd_CArray1 NMTTools_CommonBlockPool
-#define BOPTColStd_CArray1_hxx <NMTTools_CommonBlockPool.hxx>
-#include <BOPTColStd_CArray1.gxx>
-
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File:        NMTTools_CommonBlockPool.cxx
+// Created:
+// Author:      Peter KURNEV
+//              <pkv@irinox>
+//
+
+
+#include <NMTTools_CommonBlockPool.hxx>
+
+#ifndef _Standard_OutOfRange_HeaderFile
+#include <Standard_OutOfRange.hxx>
+#endif
+#ifndef _Standard_OutOfMemory_HeaderFile
+#include <Standard_OutOfMemory.hxx>
+#endif
+
+
+#define Array1Item NMTTools_ListOfCommonBlock
+#define Array1Item_hxx <NMTTools_ListOfCommonBlock.hxx>
+#define BOPTColStd_CArray1 NMTTools_CommonBlockPool
+#define BOPTColStd_CArray1_hxx <NMTTools_CommonBlockPool.hxx>
+#include <BOPTColStd_CArray1.gxx>
+
diff --git a/src/NMTTools_NEW/NMTTools_CommonBlockPool.hxx b/src/NMTTools_NEW/NMTTools_CommonBlockPool.hxx
index f50c4471d..57a95d332 100644
--- a/src/NMTTools_NEW/NMTTools_CommonBlockPool.hxx
+++ b/src/NMTTools_NEW/NMTTools_CommonBlockPool.hxx
@@ -1,122 +1,122 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-
-// File:        NMTTools_CommonBlockPool.hxx
-// Created:     
-// Author:      Peter KURNEV
-//              <pkv@irinox>
-//
-
-#ifndef _NMTTools_CommonBlockPool_HeaderFile
-#define _NMTTools_CommonBlockPool_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_Macro.hxx>
-#include <Standard_Address.hxx>
-#include <Standard_Integer.hxx>
-#include <Standard_Boolean.hxx>
-#include <NMTTools_ListOfCommonBlock.hxx>
-
-class Standard_OutOfRange;
-class Standard_OutOfMemory;
-
-
-
-//=======================================================================
-//class : NMTTools_CommonBlockPool
-//purpose  : 
-//=======================================================================
-class NMTTools_CommonBlockPool  
-{
- public:
-  Standard_EXPORT
-    NMTTools_CommonBlockPool(const Standard_Integer Length = 0,const Standard_Integer BlockLength = 5);
-  
-  Standard_EXPORT
-    void Resize(const Standard_Integer theNewLength) ;
-  
-  Standard_EXPORT
-    void Destroy() ;
-
-  ~NMTTools_CommonBlockPool() {
-    Destroy();
-  }
-  
-  Standard_EXPORT
-    Standard_Integer Length() const;
-  
-  Standard_EXPORT
-    Standard_Integer Extent() const;
-  
-  Standard_EXPORT
-    Standard_Integer FactLength() const;
-  
-  Standard_EXPORT
-    Standard_Integer Append(const NMTTools_ListOfCommonBlock& Value) ;
-  
-  Standard_EXPORT
-    void Remove(const Standard_Integer Index) ;
-  
-  Standard_EXPORT
-    const NMTTools_ListOfCommonBlock& Value(const Standard_Integer Index) const;
-   
-  const NMTTools_ListOfCommonBlock& operator ()(const Standard_Integer Index) const {
-    return Value(Index);
-  }
-  
-  Standard_EXPORT
-    NMTTools_ListOfCommonBlock& ChangeValue(const Standard_Integer Index) ;
-    
-  NMTTools_ListOfCommonBlock& operator ()(const Standard_Integer Index) {
-    return ChangeValue(Index);
-  }
-  
-  Standard_EXPORT
-    void SetBlockLength(const Standard_Integer aBL) ;
-  
-  Standard_EXPORT
-    Standard_Integer BlockLength() const;
-  
-  Standard_EXPORT
-    void Purge() ;
-
-protected:
-
-private:
-  Standard_EXPORT
-    NMTTools_CommonBlockPool(const NMTTools_CommonBlockPool& AnArray);
-  
-  Standard_EXPORT
-    NMTTools_CommonBlockPool& Assign(const NMTTools_CommonBlockPool& Other) ;
-    
-  NMTTools_CommonBlockPool& operator =(const NMTTools_CommonBlockPool& Other) {
-    return Assign(Other);
-  }
-  
-  Standard_EXPORT
-    Standard_Boolean IsInvalidIndex(const Standard_Integer Index) const;
-
-
-  Standard_Address myStart;
-  Standard_Integer myLength;
-  Standard_Integer myFactLength;
-  Standard_Integer myBlockLength;
-  Standard_Boolean myIsAllocated;
-};
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File:        NMTTools_CommonBlockPool.hxx
+// Created:
+// Author:      Peter KURNEV
+//              <pkv@irinox>
+//
+
+#ifndef _NMTTools_CommonBlockPool_HeaderFile
+#define _NMTTools_CommonBlockPool_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Macro.hxx>
+#include <Standard_Address.hxx>
+#include <Standard_Integer.hxx>
+#include <Standard_Boolean.hxx>
+#include <NMTTools_ListOfCommonBlock.hxx>
+
+class Standard_OutOfRange;
+class Standard_OutOfMemory;
+
+
+
+//=======================================================================
+//class : NMTTools_CommonBlockPool
+//purpose  :
+//=======================================================================
+class NMTTools_CommonBlockPool
+{
+ public:
+  Standard_EXPORT
+    NMTTools_CommonBlockPool(const Standard_Integer Length = 0,const Standard_Integer BlockLength = 5);
+
+  Standard_EXPORT
+    void Resize(const Standard_Integer theNewLength) ;
+
+  Standard_EXPORT
+    void Destroy() ;
+
+  ~NMTTools_CommonBlockPool() {
+    Destroy();
+  }
+
+  Standard_EXPORT
+    Standard_Integer Length() const;
+
+  Standard_EXPORT
+    Standard_Integer Extent() const;
+
+  Standard_EXPORT
+    Standard_Integer FactLength() const;
+
+  Standard_EXPORT
+    Standard_Integer Append(const NMTTools_ListOfCommonBlock& Value) ;
+
+  Standard_EXPORT
+    void Remove(const Standard_Integer Index) ;
+
+  Standard_EXPORT
+    const NMTTools_ListOfCommonBlock& Value(const Standard_Integer Index) const;
+
+  const NMTTools_ListOfCommonBlock& operator ()(const Standard_Integer Index) const {
+    return Value(Index);
+  }
+
+  Standard_EXPORT
+    NMTTools_ListOfCommonBlock& ChangeValue(const Standard_Integer Index) ;
+
+  NMTTools_ListOfCommonBlock& operator ()(const Standard_Integer Index) {
+    return ChangeValue(Index);
+  }
+
+  Standard_EXPORT
+    void SetBlockLength(const Standard_Integer aBL) ;
+
+  Standard_EXPORT
+    Standard_Integer BlockLength() const;
+
+  Standard_EXPORT
+    void Purge() ;
+
+protected:
+
+private:
+  Standard_EXPORT
+    NMTTools_CommonBlockPool(const NMTTools_CommonBlockPool& AnArray);
+
+  Standard_EXPORT
+    NMTTools_CommonBlockPool& Assign(const NMTTools_CommonBlockPool& Other) ;
+
+  NMTTools_CommonBlockPool& operator =(const NMTTools_CommonBlockPool& Other) {
+    return Assign(Other);
+  }
+
+  Standard_EXPORT
+    Standard_Boolean IsInvalidIndex(const Standard_Integer Index) const;
+
+
+  Standard_Address myStart;
+  Standard_Integer myLength;
+  Standard_Integer myFactLength;
+  Standard_Integer myBlockLength;
+  Standard_Boolean myIsAllocated;
+};
+#endif
diff --git a/src/NMTTools_NEW/NMTTools_CoupleOfShape.cxx b/src/NMTTools_NEW/NMTTools_CoupleOfShape.cxx
index 958b953e1..80726d9bd 100644
--- a/src/NMTTools_NEW/NMTTools_CoupleOfShape.cxx
+++ b/src/NMTTools_NEW/NMTTools_CoupleOfShape.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -29,13 +29,13 @@
 
 //=======================================================================
 // function: NMTTools_CoupleOfShape::NMTTools_CoupleOfShape
-// purpose: 
+// purpose:
 //=======================================================================
   NMTTools_CoupleOfShape::NMTTools_CoupleOfShape()
 {}
 //=======================================================================
 // function: SetShape1
-// purpose: 
+// purpose:
 //=======================================================================
   void NMTTools_CoupleOfShape::SetShape1(const TopoDS_Shape& aS)
 {
@@ -43,7 +43,7 @@
 }
 //=======================================================================
 // function: SetShape2
-// purpose: 
+// purpose:
 //=======================================================================
   void NMTTools_CoupleOfShape::SetShape2(const TopoDS_Shape& aS)
 {
@@ -51,7 +51,7 @@
 }
 //=======================================================================
 // function: Shape1
-// purpose: 
+// purpose:
 //=======================================================================
   const TopoDS_Shape& NMTTools_CoupleOfShape::Shape1()const
 {
@@ -59,7 +59,7 @@
 }
 //=======================================================================
 // function: Shape2
-// purpose: 
+// purpose:
 //=======================================================================
   const TopoDS_Shape& NMTTools_CoupleOfShape::Shape2()const
 {
diff --git a/src/NMTTools_NEW/NMTTools_CoupleOfShape.hxx b/src/NMTTools_NEW/NMTTools_CoupleOfShape.hxx
index 6129512b4..fef9a00fe 100644
--- a/src/NMTTools_NEW/NMTTools_CoupleOfShape.hxx
+++ b/src/NMTTools_NEW/NMTTools_CoupleOfShape.hxx
@@ -1,61 +1,61 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-
-// File:        NMTTools_CoupleOfShape.hxx
-// Created:     Wed Jan 28 15:06:11 2004
-// Author:      Peter KURNEV
-//              <pkv@irinox>
-//
-#ifndef _NMTTools_CoupleOfShape_HeaderFile
-#define _NMTTools_CoupleOfShape_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_Macro.hxx>
-#include <TopoDS_Shape.hxx>
-
-//=======================================================================
-//class    : NMTTools_CoupleOfShape
-//purpose  : 
-//=======================================================================
-class NMTTools_CoupleOfShape  
-{
- public:
-  Standard_EXPORT   
-    NMTTools_CoupleOfShape();
-  
-  Standard_EXPORT     
-    void SetShape1(const TopoDS_Shape& aS) ;
-  
-  Standard_EXPORT
-    void SetShape2(const TopoDS_Shape& aS) ;
-  
-  Standard_EXPORT
-    const TopoDS_Shape& Shape1() const;
-  
-  Standard_EXPORT
-    const TopoDS_Shape& Shape2() const;
-
- protected:
-  TopoDS_Shape myShape1;
-  TopoDS_Shape myShape2;
-};
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File:        NMTTools_CoupleOfShape.hxx
+// Created:     Wed Jan 28 15:06:11 2004
+// Author:      Peter KURNEV
+//              <pkv@irinox>
+//
+#ifndef _NMTTools_CoupleOfShape_HeaderFile
+#define _NMTTools_CoupleOfShape_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Macro.hxx>
+#include <TopoDS_Shape.hxx>
+
+//=======================================================================
+//class    : NMTTools_CoupleOfShape
+//purpose  :
+//=======================================================================
+class NMTTools_CoupleOfShape
+{
+ public:
+  Standard_EXPORT
+    NMTTools_CoupleOfShape();
+
+  Standard_EXPORT
+    void SetShape1(const TopoDS_Shape& aS) ;
+
+  Standard_EXPORT
+    void SetShape2(const TopoDS_Shape& aS) ;
+
+  Standard_EXPORT
+    const TopoDS_Shape& Shape1() const;
+
+  Standard_EXPORT
+    const TopoDS_Shape& Shape2() const;
+
+ protected:
+  TopoDS_Shape myShape1;
+  TopoDS_Shape myShape2;
+};
+#endif
diff --git a/src/NMTTools_NEW/NMTTools_DEProcessor.cxx b/src/NMTTools_NEW/NMTTools_DEProcessor.cxx
index 2b701f0c2..7a1501a38 100644
--- a/src/NMTTools_NEW/NMTTools_DEProcessor.cxx
+++ b/src/NMTTools_NEW/NMTTools_DEProcessor.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -91,8 +91,8 @@
 #include <NMTTools_PaveFiller.hxx>
 
 //=======================================================================
-// function: 
-// purpose: 
+// function:
+// purpose:
 //=======================================================================
   NMTTools_DEProcessor::NMTTools_DEProcessor(NMTTools_PaveFiller& aPaveFiller)
 :
@@ -103,7 +103,7 @@
 }
 //=======================================================================
 // function: IsDone
-// purpose: 
+// purpose:
 //=======================================================================
   Standard_Boolean NMTTools_DEProcessor::IsDone() const
 {
@@ -111,7 +111,7 @@
 }
 //=======================================================================
 // function:  Do
-// purpose: 
+// purpose:
 //=======================================================================
   void NMTTools_DEProcessor::Do()
 {
@@ -131,7 +131,7 @@
 }
 //=======================================================================
 // function:  FindDegeneratedEdges
-// purpose: 
+// purpose:
 //=======================================================================
   void NMTTools_DEProcessor::FindDegeneratedEdges()
 {
@@ -151,7 +151,7 @@
     const TopoDS_Shape aS=myDS->Shape(i);
     if (aS.ShapeType()==TopAbs_EDGE) {
       const TopoDS_Edge& aE=TopoDS::Edge(aS);
-      
+
       if (BRep_Tool::Degenerated(aE)) {
         iRankE=myDS->Rank(i);
         aV=TopExp::FirstVertex(aE);
@@ -182,7 +182,7 @@
 }
 //=======================================================================
 // function:  DoPaves
-// purpose: 
+// purpose:
 //=======================================================================
   void NMTTools_DEProcessor::DoPaves()
 {
@@ -202,7 +202,7 @@
     TColStd_ListIteratorOfListOfInteger anIt(nLF);
     for (; anIt.More(); anIt.Next()) {
       nFD=anIt.Value();
-      
+
       BOPTools_ListOfPaveBlock aLPB;
       FindPaveBlocks(nED, nVD, nFD, aLPB);
       //
@@ -213,7 +213,7 @@
       //
       FillPaveSet (nED, nVD, nFD, aLPB);
     }
-    // 
+    //
     // Fill aSplitEdges for the edge nED
     FillSplitEdgesPool(nED);
     //
@@ -224,7 +224,7 @@
 }
 //=======================================================================
 // function:  FindPaveBlocks
-// purpose: 
+// purpose:
 //=======================================================================
   void NMTTools_DEProcessor::FindPaveBlocks(const Standard_Integer ,
                                             const Standard_Integer nVD,
@@ -245,7 +245,7 @@
       continue;
     }
     //
-    // Split Parts 
+    // Split Parts
     const BOPTools_ListOfPaveBlock& aLPBSplits=aFF.PaveBlocks();
     anIt.Initialize(aLPBSplits);
     for (; anIt.More(); anIt.Next()) {
@@ -267,7 +267,7 @@
     }
     //
     // Section Parts
-    Standard_Integer j, aNbCurves;   
+    Standard_Integer j, aNbCurves;
     //
     BOPTools_SequenceOfCurves& aSC=aFF.Curves();
     aNbCurves=aSC.Length();
@@ -298,7 +298,7 @@
 }
 //=======================================================================
 // function:  FillPaveSet
-// purpose: 
+// purpose:
 //=======================================================================
   void NMTTools_DEProcessor::FillPaveSet (const Standard_Integer nED,
                                           const Standard_Integer nVD,
@@ -313,7 +313,7 @@
   //
   aDT=Precision::PConfusion();
   //
-  BOPTools_PaveSet& aPaveSet= 
+  BOPTools_PaveSet& aPaveSet=
     (myFiller->ChangePavePool()).ChangeValue(myDS->RefEdge(nED));
   //
   // Clear aPaveSet, aSplitEdges
@@ -341,13 +341,13 @@
   BOPTools_Pave aPave2 (nVD, aTD2, BooleanOperations_UnknownInterference);
   aPaveSet.Append(aPave2);
   //
-  // Fill other paves 
+  // Fill other paves
   BOPTools_ListIteratorOfListOfPaveBlock anIt(aLPB);
   for (; anIt.More(); anIt.Next()) {
     const BOPTools_PaveBlock& aPB=anIt.Value();
     nE=aPB.Edge();
     const TopoDS_Edge aE=TopoDS::Edge(myDS->Shape(nE));
-    
+
     Handle(Geom2d_Curve) aC2D=BRep_Tool::CurveOnSurface(aE, aDF, aT1, aT2);
     //
     // Intersection
@@ -367,7 +367,7 @@
     bIsDone=aGInter.IsDone();
     if(bIsDone) {
       aNbPoints=aGInter.NbPoints();
-      if (aNbPoints) { 
+      if (aNbPoints) {
         for (j=1; j<=aNbPoints; ++j) {
           aP2D=aGInter.Point(j).Value();
           Handle(Geom2d_Line) aCLDE;
@@ -384,7 +384,7 @@
           }
           //aCLDE=Handle(Geom2d_Line)::DownCast(aC2DDE1);
           //modified by NIZNHY-PKV Thu Mar 20 17:37:37 2008t
-          
+
           if (aCLDE.IsNull()) {
             continue;
           }
@@ -393,10 +393,10 @@
           aX=ElCLib::Parameter(aLDE, aP2D);
           //
           if (fabs (aX-aTD1) < aDT || fabs (aX-aTD2) < aDT) {
-            continue; 
+            continue;
           }
           if (aX < aTD1 || aX > aTD2) {
-            continue; 
+            continue;
           }
           //
           bRejectFlag=Standard_False;
@@ -411,7 +411,7 @@
             }
           }
           if (bRejectFlag) {
-            continue; 
+            continue;
           }
           //
           BOPTools_Pave aPave(nVD, aX, BooleanOperations_UnknownInterference);
@@ -423,7 +423,7 @@
 }
 //=======================================================================
 // function:  FillSplitEdgesPool
-// purpose: 
+// purpose:
 //=======================================================================
   void NMTTools_DEProcessor::FillSplitEdgesPool (const Standard_Integer nED)
 {
@@ -437,7 +437,7 @@
   const BOPTools_PavePool& aPavePool=myFiller->PavePool();
   BOPTools_PavePool* pPavePool=(BOPTools_PavePool*) &aPavePool;
   BOPTools_PaveSet& aPaveSet= pPavePool->ChangeValue(myDS->RefEdge(nED));
-  
+
   BOPTools_PaveBlockIterator aPBIt(nED, aPaveSet);
   for (; aPBIt.More(); aPBIt.Next()) {
     BOPTools_PaveBlock& aPB=aPBIt.Value();
@@ -446,7 +446,7 @@
 }
 //=======================================================================
 // function:  MakeSplitEdges
-// purpose: 
+// purpose:
 //=======================================================================
   void NMTTools_DEProcessor::MakeSplitEdges (const Standard_Integer nED,
                                              const Standard_Integer nFD)
@@ -504,30 +504,30 @@
   aPBIt.Initialize(aSplitEdges);
   for (; aPBIt.More(); aPBIt.Next()) {
     BOPTools_PaveBlock& aPB=aPBIt.Value();
-    
+
     const BOPTools_Pave& aPave1=aPB.Pave1();
     nV1=aPave1.Index();
     t1=aPave1.Param();
     aV1=TopoDS::Vertex(myDS->GetShape(nV1));
     aV1.Orientation(TopAbs_FORWARD);
-    
+
     const BOPTools_Pave& aPave2=aPB.Pave2();
     nV2=aPave2.Index();
     t2=aPave2.Param();
     aV2=TopoDS::Vertex(myDS->GetShape(nV2));
     aV2.Orientation(TopAbs_REVERSED);
-    
-    MakeSplitEdge(aDE, aDF, aV1, t1, aV2, t2, aESplit); 
+
+    MakeSplitEdge(aDE, aDF, aV1, t1, aV2, t2, aESplit);
     //
     // Add Split Part of the Original Edge to the DS
     BooleanOperations_AncestorsSeqAndSuccessorsSeq anASSeq;
-    
+
     anASSeq.SetNewSuccessor(nV1);
     anASSeq.SetNewOrientation(aV1.Orientation());
-    
+
     anASSeq.SetNewSuccessor(nV2);
     anASSeq.SetNewOrientation(aV2.Orientation());
-    
+
     myDS->InsertShapeAndAncestorsSuccessors(aESplit, anASSeq);
     aNewShapeIndex=myDS->NumberOfInsertedShapes();
     myDS->SetState(aNewShapeIndex, BooleanOperations_UNKNOWN);
@@ -539,7 +539,7 @@
 }
 //=======================================================================
 // function:  MakeSplitEdge
-// purpose: 
+// purpose:
 //=======================================================================
   void NMTTools_DEProcessor::MakeSplitEdge (const TopoDS_Edge&   aE,
                                             const TopoDS_Face&   aF,
diff --git a/src/NMTTools_NEW/NMTTools_DEProcessor.hxx b/src/NMTTools_NEW/NMTTools_DEProcessor.hxx
index 147792f59..e2ee6e089 100644
--- a/src/NMTTools_NEW/NMTTools_DEProcessor.hxx
+++ b/src/NMTTools_NEW/NMTTools_DEProcessor.hxx
@@ -1,117 +1,117 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-
-// File:        NMTTools_DEProcessor.hxx
-// Created:     Wed Sep 12 12:10:52 2001
-// Author:      Peter KURNEV
-//              <pkv@irinox>
-
-#ifndef _NMTTools_DEProcessor_HeaderFile
-#define _NMTTools_DEProcessor_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_Macro.hxx>
-#include <NMTTools_PPaveFiller.hxx>
-#include <NMTDS_PShapesDataStructure.hxx>
-#include <Standard_Boolean.hxx>
-#include <BOPTools_IndexedDataMapOfIntegerDEInfo.hxx>
-#include <NMTTools_PaveFiller.hxx>
-#include <Standard_Integer.hxx>
-#include <Standard_Real.hxx>
-
-
-//! <br>
-//!  The  Algorithm to compute and store in interferences' pool <br>
-//! and in the Data  Structure  the following values <br>
-//! for degenerated edges <br>
-//!         1.  Paves/Pave set(s) <br>
-//!         2.  Split parts <br>
-//!         3.  States (3D) for split parts <br>
-//! <br>
-//=======================================================================
-//class    : NMTTools_DEProcessor
-//purpose  : 
-//=======================================================================
-class NMTTools_DEProcessor  {
-public:
-
-
-  
-//! Constructor <br>
-//! <br>
-//! Constructor <br>
-//! <br>
-  Standard_EXPORT  
-    NMTTools_DEProcessor(NMTTools_PaveFiller& aFiller);
-  
-//! Launches the processor <br>
-  Standard_EXPORT 
-    void Do() ;
-  
-//! Returns TRUE if it is Ok <br>
-  Standard_EXPORT 
-    Standard_Boolean IsDone() const;
-
-
-
-protected:
-  Standard_EXPORT
-    void FindDegeneratedEdges() ;
-  
-  Standard_EXPORT
-    void DoPaves() ;
-  
-  Standard_EXPORT
-    void FindPaveBlocks(const Standard_Integer nED,
-			const Standard_Integer nVD,
-			const Standard_Integer nFD,
-			BOPTools_ListOfPaveBlock& aLPB) ;
-  
-  Standard_EXPORT
-    void FillPaveSet(const Standard_Integer nED,
-		     const Standard_Integer nVD,
-		     const Standard_Integer nFD,
-		     const BOPTools_ListOfPaveBlock& aLPB) ;
-  
-  Standard_EXPORT
-    void FillSplitEdgesPool(const Standard_Integer nED) ;
-  
-  Standard_EXPORT
-    void MakeSplitEdges(const Standard_Integer nED,
-			const Standard_Integer nFD) ;
-  
-  Standard_EXPORT
-    void MakeSplitEdge(const TopoDS_Edge& aS1,
-		       const TopoDS_Face& aF,
-		       const TopoDS_Vertex& aV1,
-		       const Standard_Real aP1,
-		       const TopoDS_Vertex& aV2,
-		       const Standard_Real aP2,
-		       TopoDS_Edge& aNewEdge) ;
-
-
-  NMTTools_PPaveFiller myFiller;
-  NMTDS_PShapesDataStructure myDS;
-  Standard_Boolean myIsDone;
-  BOPTools_IndexedDataMapOfIntegerDEInfo myDEMap;
-};
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File:        NMTTools_DEProcessor.hxx
+// Created:     Wed Sep 12 12:10:52 2001
+// Author:      Peter KURNEV
+//              <pkv@irinox>
+
+#ifndef _NMTTools_DEProcessor_HeaderFile
+#define _NMTTools_DEProcessor_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Macro.hxx>
+#include <NMTTools_PPaveFiller.hxx>
+#include <NMTDS_PShapesDataStructure.hxx>
+#include <Standard_Boolean.hxx>
+#include <BOPTools_IndexedDataMapOfIntegerDEInfo.hxx>
+#include <NMTTools_PaveFiller.hxx>
+#include <Standard_Integer.hxx>
+#include <Standard_Real.hxx>
+
+
+//! <br>
+//!  The  Algorithm to compute and store in interferences' pool <br>
+//! and in the Data  Structure  the following values <br>
+//! for degenerated edges <br>
+//!         1.  Paves/Pave set(s) <br>
+//!         2.  Split parts <br>
+//!         3.  States (3D) for split parts <br>
+//! <br>
+//=======================================================================
+//class    : NMTTools_DEProcessor
+//purpose  :
+//=======================================================================
+class NMTTools_DEProcessor  {
+public:
+
+
+
+//! Constructor <br>
+//! <br>
+//! Constructor <br>
+//! <br>
+  Standard_EXPORT
+    NMTTools_DEProcessor(NMTTools_PaveFiller& aFiller);
+
+//! Launches the processor <br>
+  Standard_EXPORT
+    void Do() ;
+
+//! Returns TRUE if it is Ok <br>
+  Standard_EXPORT
+    Standard_Boolean IsDone() const;
+
+
+
+protected:
+  Standard_EXPORT
+    void FindDegeneratedEdges() ;
+
+  Standard_EXPORT
+    void DoPaves() ;
+
+  Standard_EXPORT
+    void FindPaveBlocks(const Standard_Integer nED,
+			const Standard_Integer nVD,
+			const Standard_Integer nFD,
+			BOPTools_ListOfPaveBlock& aLPB) ;
+
+  Standard_EXPORT
+    void FillPaveSet(const Standard_Integer nED,
+		     const Standard_Integer nVD,
+		     const Standard_Integer nFD,
+		     const BOPTools_ListOfPaveBlock& aLPB) ;
+
+  Standard_EXPORT
+    void FillSplitEdgesPool(const Standard_Integer nED) ;
+
+  Standard_EXPORT
+    void MakeSplitEdges(const Standard_Integer nED,
+			const Standard_Integer nFD) ;
+
+  Standard_EXPORT
+    void MakeSplitEdge(const TopoDS_Edge& aS1,
+		       const TopoDS_Face& aF,
+		       const TopoDS_Vertex& aV1,
+		       const Standard_Real aP1,
+		       const TopoDS_Vertex& aV2,
+		       const Standard_Real aP2,
+		       TopoDS_Edge& aNewEdge) ;
+
+
+  NMTTools_PPaveFiller myFiller;
+  NMTDS_PShapesDataStructure myDS;
+  Standard_Boolean myIsDone;
+  BOPTools_IndexedDataMapOfIntegerDEInfo myDEMap;
+};
+#endif
diff --git a/src/NMTTools_NEW/NMTTools_DataMapIteratorOfDataMapOfIntegerFaceInfo.hxx b/src/NMTTools_NEW/NMTTools_DataMapIteratorOfDataMapOfIntegerFaceInfo.hxx
index 8e071554d..1117b0d7d 100644
--- a/src/NMTTools_NEW/NMTTools_DataMapIteratorOfDataMapOfIntegerFaceInfo.hxx
+++ b/src/NMTTools_NEW/NMTTools_DataMapIteratorOfDataMapOfIntegerFaceInfo.hxx
@@ -1,32 +1,32 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-// File:	NMTTools_DataMapIteratorOfDataMapOfIntegerFaceInfo.hxx
-// Created:	Mon Feb 20 12:24:47 2012
-// Author:	
-//		<pkv@BDEURI37616>
-
-
-#ifndef NMTTools_DataMapIteratorOfDataMapOfIntegerFaceInfo_HeaderFile
-#define NMTTools_DataMapIteratorOfDataMapOfIntegerFaceInfo_HeaderFile
-
-#ifndef NMTTools_DataMapOfIntegerFaceInfo_HeaderFile
-#include <NMTTools_DataMapOfIntegerFaceInfo.hxx>
-#endif
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// File:	NMTTools_DataMapIteratorOfDataMapOfIntegerFaceInfo.hxx
+// Created:	Mon Feb 20 12:24:47 2012
+// Author:
+//		<pkv@BDEURI37616>
+
+
+#ifndef NMTTools_DataMapIteratorOfDataMapOfIntegerFaceInfo_HeaderFile
+#define NMTTools_DataMapIteratorOfDataMapOfIntegerFaceInfo_HeaderFile
+
+#ifndef NMTTools_DataMapOfIntegerFaceInfo_HeaderFile
+#include <NMTTools_DataMapOfIntegerFaceInfo.hxx>
+#endif
+
+#endif
diff --git a/src/NMTTools_NEW/NMTTools_DataMapIteratorOfDataMapOfIntegerListOfPaveBlock.hxx b/src/NMTTools_NEW/NMTTools_DataMapIteratorOfDataMapOfIntegerListOfPaveBlock.hxx
index 82fa67266..415d7db84 100644
--- a/src/NMTTools_NEW/NMTTools_DataMapIteratorOfDataMapOfIntegerListOfPaveBlock.hxx
+++ b/src/NMTTools_NEW/NMTTools_DataMapIteratorOfDataMapOfIntegerListOfPaveBlock.hxx
@@ -1,14 +1,32 @@
-// File:	NMTTools_DataMapIteratorOfDataMapOfIntegerListOfPaveBlock.hxx
-// Created:	Mon Feb 20 12:04:52 2012
-// Author:	
-//		<pkv@BDEURI37616>
-
-
-#ifndef NMTTools_DataMapIteratorOfDataMapOfIntegerListOfPaveBlock_HeaderFile
-#define NMTTools_DataMapIteratorOfDataMapOfIntegerListOfPaveBlock_HeaderFile
-
-#ifndef NMTTools_DataMapOfIntegerListOfPaveBlock_HeaderFile
-#include <NMTTools_DataMapOfIntegerListOfPaveBlock.hxx>
-#endif
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// File:	NMTTools_DataMapIteratorOfDataMapOfIntegerListOfPaveBlock.hxx
+// Created:	Mon Feb 20 12:04:52 2012
+// Author:
+//		<pkv@BDEURI37616>
+
+
+#ifndef NMTTools_DataMapIteratorOfDataMapOfIntegerListOfPaveBlock_HeaderFile
+#define NMTTools_DataMapIteratorOfDataMapOfIntegerListOfPaveBlock_HeaderFile
+
+#ifndef NMTTools_DataMapOfIntegerListOfPaveBlock_HeaderFile
+#include <NMTTools_DataMapOfIntegerListOfPaveBlock.hxx>
+#endif
+
+#endif
diff --git a/src/NMTTools_NEW/NMTTools_DataMapOfIntegerFaceInfo.hxx b/src/NMTTools_NEW/NMTTools_DataMapOfIntegerFaceInfo.hxx
index 99efe576c..7d97931fb 100644
--- a/src/NMTTools_NEW/NMTTools_DataMapOfIntegerFaceInfo.hxx
+++ b/src/NMTTools_NEW/NMTTools_DataMapOfIntegerFaceInfo.hxx
@@ -1,40 +1,40 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-// File:	NMTTools_DataMapOfIntegerFaceInfo.hxx
-// Created:	Mon Feb 20 12:21:55 2012
-// Author:	
-//		<pkv@BDEURI37616>
-
-
-#ifndef NMTTools_DataMapOfIntegerFaceInfo_HeaderFile
-#define NMTTools_DataMapOfIntegerFaceInfo_HeaderFile
-
-#include <NMTTools_FaceInfo.hxx>
-#include <TColStd_MapIntegerHasher.hxx>
-
-#define _NCollection_MapHasher
-#include <NCollection_DataMap.hxx>
-
-typedef NCollection_DataMap<Standard_Integer, NMTTools_FaceInfo, TColStd_MapIntegerHasher> NMTTools_DataMapOfIntegerFaceInfo; 
-typedef NMTTools_DataMapOfIntegerFaceInfo::Iterator NMTTools_DataMapIteratorOfDataMapOfIntegerFaceInfo; 
- 
-#undef _NCollection_MapHasher
-
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// File:	NMTTools_DataMapOfIntegerFaceInfo.hxx
+// Created:	Mon Feb 20 12:21:55 2012
+// Author:
+//		<pkv@BDEURI37616>
+
+
+#ifndef NMTTools_DataMapOfIntegerFaceInfo_HeaderFile
+#define NMTTools_DataMapOfIntegerFaceInfo_HeaderFile
+
+#include <NMTTools_FaceInfo.hxx>
+#include <TColStd_MapIntegerHasher.hxx>
+
+#define _NCollection_MapHasher
+#include <NCollection_DataMap.hxx>
+
+typedef NCollection_DataMap<Standard_Integer, NMTTools_FaceInfo, TColStd_MapIntegerHasher> NMTTools_DataMapOfIntegerFaceInfo;
+typedef NMTTools_DataMapOfIntegerFaceInfo::Iterator NMTTools_DataMapIteratorOfDataMapOfIntegerFaceInfo;
+
+#undef _NCollection_MapHasher
+
+
+#endif
diff --git a/src/NMTTools_NEW/NMTTools_DataMapOfIntegerListOfPaveBlock.hxx b/src/NMTTools_NEW/NMTTools_DataMapOfIntegerListOfPaveBlock.hxx
index 7a3e80549..805c92eca 100644
--- a/src/NMTTools_NEW/NMTTools_DataMapOfIntegerListOfPaveBlock.hxx
+++ b/src/NMTTools_NEW/NMTTools_DataMapOfIntegerListOfPaveBlock.hxx
@@ -1,41 +1,41 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-// File:	NMTTools_DataMapOfIntegerListOfPaveBlock.hxx
-// Created:	Mon Feb 20 09:27:40 2012
-// Author:	
-//		<pkv@BDEURI37616>
-
-
-#ifndef NMTTools_DataMapOfIntegerListOfPaveBlock_HeaderFile
-#define NMTTools_DataMapOfIntegerListOfPaveBlock_HeaderFile
-
-
-#include <TColStd_MapIntegerHasher.hxx>
-#include <BOPTools_ListOfPaveBlock.hxx>
-
-#define _NCollection_MapHasher
-#include <NCollection_DataMap.hxx>
-
-typedef NCollection_DataMap<Standard_Integer, BOPTools_ListOfPaveBlock, TColStd_MapIntegerHasher> NMTTools_DataMapOfIntegerListOfPaveBlock; 
-typedef NMTTools_DataMapOfIntegerListOfPaveBlock::Iterator NMTTools_DataMapIteratorOfDataMapOfIntegerListOfPaveBlock; 
- 
-#undef _NCollection_MapHasher
-
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// File:	NMTTools_DataMapOfIntegerListOfPaveBlock.hxx
+// Created:	Mon Feb 20 09:27:40 2012
+// Author:
+//		<pkv@BDEURI37616>
+
+
+#ifndef NMTTools_DataMapOfIntegerListOfPaveBlock_HeaderFile
+#define NMTTools_DataMapOfIntegerListOfPaveBlock_HeaderFile
+
+
+#include <TColStd_MapIntegerHasher.hxx>
+#include <BOPTools_ListOfPaveBlock.hxx>
+
+#define _NCollection_MapHasher
+#include <NCollection_DataMap.hxx>
+
+typedef NCollection_DataMap<Standard_Integer, BOPTools_ListOfPaveBlock, TColStd_MapIntegerHasher> NMTTools_DataMapOfIntegerListOfPaveBlock;
+typedef NMTTools_DataMapOfIntegerListOfPaveBlock::Iterator NMTTools_DataMapIteratorOfDataMapOfIntegerListOfPaveBlock;
+
+#undef _NCollection_MapHasher
+
+
+#endif
diff --git a/src/NMTTools_NEW/NMTTools_FaceInfo.cxx b/src/NMTTools_NEW/NMTTools_FaceInfo.cxx
index 6cd717aa1..26bbcdcd9 100644
--- a/src/NMTTools_NEW/NMTTools_FaceInfo.cxx
+++ b/src/NMTTools_NEW/NMTTools_FaceInfo.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools_NEW/NMTTools_FaceInfo.hxx b/src/NMTTools_NEW/NMTTools_FaceInfo.hxx
index 3d6218ae2..6a37fb79c 100644
--- a/src/NMTTools_NEW/NMTTools_FaceInfo.hxx
+++ b/src/NMTTools_NEW/NMTTools_FaceInfo.hxx
@@ -1,124 +1,124 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-
-// File:        NMTTools_FaceInfo.hxx
-// Created:     Tue Dec  9 12:23:29 2003
-// Author:      Peter KURNEV
-//              <pkv@irinox>
-//
-#ifndef _NMTTools_FaceInfo_HeaderFile
-#define _NMTTools_FaceInfo_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_Macro.hxx>
-#include <Standard_Integer.hxx>
-#include <NMTTools_MapOfPaveBlock.hxx>
-#include <TColStd_MapOfInteger.hxx>
-#include <NMTTools_MapOfPaveBlock.hxx>
-#include <TColStd_MapOfInteger.hxx>
-
-//=======================================================================
-//class    : NMTTools_FaceInfo
-//purpose  : 
-//=======================================================================
-class NMTTools_FaceInfo  {
- public:
-
-  //! Empty contructor <br>
-  //! <br>
-  NMTTools_FaceInfo();
-      
-  virtual ~NMTTools_FaceInfo();
-  
-  //!  Clears the contents <br>
-      Standard_EXPORT     void Clear() ;
-  
-  //! Modifier <br>
-  //! Sets the index of the face <theI> <br>
-  void SetIndex(const Standard_Integer theI) ;
-  
-  //! Selector <br>
-  //! Returns the index of the face <br>
-  //! <br>
-  //! In <br>
-  //! <br>
-  Standard_Integer Index() const;
-  
-  //! Selector <br>
-  //! Returns the pave blocks of the face <br>
-  //! that  have state In <br>
-  const NMTTools_MapOfPaveBlock& PaveBlocksIn() const;
-  
-//! Selector/Modifier <br>
-  //! Returns the pave blocks <br>
-  //!  of the face <br>
-  //! that  have state In <br>
-  NMTTools_MapOfPaveBlock& ChangePaveBlocksIn() ;
-  
-  //! Selector <br>
-  //! Returns the list of indices for vertices <br>
-  //!  of the face <br>
-  //! that have state In <br>
-  const TColStd_MapOfInteger& VerticesIn() const;
-  
-  //! Selector/Modifier <br>
-  //! Returns the list of indices for vertices <br>
-  //!  of the face <br>
-  //! that have state In <br>
-  //! <br>
-  //! On <br>
-  //! <br>
-  TColStd_MapOfInteger& ChangeVerticesIn() ;
-  
-  //! Selector <br>
-  //! Returns the pave blocks of the face <br>
-  //! that  have state On <br>
-  const NMTTools_MapOfPaveBlock& PaveBlocksOn() const;
-  
-  //! Selector/Modifier <br>
-  //! Returns the pave blocks <br>
-  //!  of the face <br>
-  //! that  have state On <br>
-  NMTTools_MapOfPaveBlock& ChangePaveBlocksOn() ;
-  
-  //! Selector <br>
-  //! Returns the list of indices for vertices <br>
-  //!  of the face <br>
-  //! that have state On <br>
-  const TColStd_MapOfInteger& VerticesOn() const;
-  
-  //! Selector/Modifier <br>
-  //! Returns the list of indices for vertices <br>
-  //!  of the face <br>
-  //! that have state On <br>
-  TColStd_MapOfInteger& ChangeVerticesOn() ;
-  
- protected:
-  Standard_Integer myIndex;
-  NMTTools_MapOfPaveBlock myPaveBlocksIn;
-  TColStd_MapOfInteger myVerticesIn;
-  NMTTools_MapOfPaveBlock myPaveBlocksOn;
-      TColStd_MapOfInteger myVerticesOn;
-};
-
-#include <NMTTools_FaceInfo.lxx>
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File:        NMTTools_FaceInfo.hxx
+// Created:     Tue Dec  9 12:23:29 2003
+// Author:      Peter KURNEV
+//              <pkv@irinox>
+//
+#ifndef _NMTTools_FaceInfo_HeaderFile
+#define _NMTTools_FaceInfo_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Macro.hxx>
+#include <Standard_Integer.hxx>
+#include <NMTTools_MapOfPaveBlock.hxx>
+#include <TColStd_MapOfInteger.hxx>
+#include <NMTTools_MapOfPaveBlock.hxx>
+#include <TColStd_MapOfInteger.hxx>
+
+//=======================================================================
+//class    : NMTTools_FaceInfo
+//purpose  :
+//=======================================================================
+class NMTTools_FaceInfo  {
+ public:
+
+  //! Empty contructor <br>
+  //! <br>
+  NMTTools_FaceInfo();
+
+  virtual ~NMTTools_FaceInfo();
+
+  //!  Clears the contents <br>
+      Standard_EXPORT     void Clear() ;
+
+  //! Modifier <br>
+  //! Sets the index of the face <theI> <br>
+  void SetIndex(const Standard_Integer theI) ;
+
+  //! Selector <br>
+  //! Returns the index of the face <br>
+  //! <br>
+  //! In <br>
+  //! <br>
+  Standard_Integer Index() const;
+
+  //! Selector <br>
+  //! Returns the pave blocks of the face <br>
+  //! that  have state In <br>
+  const NMTTools_MapOfPaveBlock& PaveBlocksIn() const;
+
+//! Selector/Modifier <br>
+  //! Returns the pave blocks <br>
+  //!  of the face <br>
+  //! that  have state In <br>
+  NMTTools_MapOfPaveBlock& ChangePaveBlocksIn() ;
+
+  //! Selector <br>
+  //! Returns the list of indices for vertices <br>
+  //!  of the face <br>
+  //! that have state In <br>
+  const TColStd_MapOfInteger& VerticesIn() const;
+
+  //! Selector/Modifier <br>
+  //! Returns the list of indices for vertices <br>
+  //!  of the face <br>
+  //! that have state In <br>
+  //! <br>
+  //! On <br>
+  //! <br>
+  TColStd_MapOfInteger& ChangeVerticesIn() ;
+
+  //! Selector <br>
+  //! Returns the pave blocks of the face <br>
+  //! that  have state On <br>
+  const NMTTools_MapOfPaveBlock& PaveBlocksOn() const;
+
+  //! Selector/Modifier <br>
+  //! Returns the pave blocks <br>
+  //!  of the face <br>
+  //! that  have state On <br>
+  NMTTools_MapOfPaveBlock& ChangePaveBlocksOn() ;
+
+  //! Selector <br>
+  //! Returns the list of indices for vertices <br>
+  //!  of the face <br>
+  //! that have state On <br>
+  const TColStd_MapOfInteger& VerticesOn() const;
+
+  //! Selector/Modifier <br>
+  //! Returns the list of indices for vertices <br>
+  //!  of the face <br>
+  //! that have state On <br>
+  TColStd_MapOfInteger& ChangeVerticesOn() ;
+
+ protected:
+  Standard_Integer myIndex;
+  NMTTools_MapOfPaveBlock myPaveBlocksIn;
+  TColStd_MapOfInteger myVerticesIn;
+  NMTTools_MapOfPaveBlock myPaveBlocksOn;
+      TColStd_MapOfInteger myVerticesOn;
+};
+
+#include <NMTTools_FaceInfo.lxx>
+#endif
diff --git a/src/NMTTools_NEW/NMTTools_FaceInfo.lxx b/src/NMTTools_NEW/NMTTools_FaceInfo.lxx
index b92bca7b1..7a14228cc 100644
--- a/src/NMTTools_NEW/NMTTools_FaceInfo.lxx
+++ b/src/NMTTools_NEW/NMTTools_FaceInfo.lxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -26,8 +26,8 @@
 //
 
 //=======================================================================
-//function : 
-//purpose  : 
+//function :
+//purpose  :
 //=======================================================================
 inline NMTTools_FaceInfo::NMTTools_FaceInfo()
 :
@@ -36,7 +36,7 @@ inline NMTTools_FaceInfo::NMTTools_FaceInfo()
 }
 //=======================================================================
 //function : ~
-//purpose  : 
+//purpose  :
 //=======================================================================
 inline NMTTools_FaceInfo::~NMTTools_FaceInfo()
 {
@@ -44,7 +44,7 @@ inline NMTTools_FaceInfo::~NMTTools_FaceInfo()
 }
 //=======================================================================
 //function : Clear
-//purpose  : 
+//purpose  :
 //=======================================================================
 inline void NMTTools_FaceInfo::Clear()
 {
@@ -56,7 +56,7 @@ inline void NMTTools_FaceInfo::Clear()
 }
 //=======================================================================
 //function : SetIndex
-//purpose  : 
+//purpose  :
 //=======================================================================
   inline void NMTTools_FaceInfo::SetIndex(const Standard_Integer theI)
 {
@@ -64,7 +64,7 @@ inline void NMTTools_FaceInfo::Clear()
 }
 //=======================================================================
 //function : Index
-//purpose  : 
+//purpose  :
 //=======================================================================
   inline Standard_Integer NMTTools_FaceInfo::Index()const
 {
@@ -72,7 +72,7 @@ inline void NMTTools_FaceInfo::Clear()
 }
 //=======================================================================
 //function : PaveBlockIn
-//purpose  : 
+//purpose  :
 //=======================================================================
   inline const NMTTools_MapOfPaveBlock& NMTTools_FaceInfo::PaveBlocksIn()const
 {
@@ -80,7 +80,7 @@ inline void NMTTools_FaceInfo::Clear()
 }
 //=======================================================================
 //function : ChangePaveBlocksIn
-//purpose  : 
+//purpose  :
 //=======================================================================
   inline NMTTools_MapOfPaveBlock& NMTTools_FaceInfo::ChangePaveBlocksIn()
 {
@@ -88,7 +88,7 @@ inline void NMTTools_FaceInfo::Clear()
 }
 //=======================================================================
 //function : VerticesIn
-//purpose  : 
+//purpose  :
 //=======================================================================
   inline const TColStd_MapOfInteger& NMTTools_FaceInfo::VerticesIn()const
 {
@@ -96,7 +96,7 @@ inline void NMTTools_FaceInfo::Clear()
 }
 //=======================================================================
 //function : ChangeVerticesIn
-//purpose  : 
+//purpose  :
 //=======================================================================
   inline  TColStd_MapOfInteger& NMTTools_FaceInfo::ChangeVerticesIn()
 {
@@ -104,7 +104,7 @@ inline void NMTTools_FaceInfo::Clear()
 }
 //=======================================================================
 //function : PaveBlockOn
-//purpose  : 
+//purpose  :
 //=======================================================================
   inline const NMTTools_MapOfPaveBlock& NMTTools_FaceInfo::PaveBlocksOn()const
 {
@@ -112,7 +112,7 @@ inline void NMTTools_FaceInfo::Clear()
 }
 //=======================================================================
 //function : ChangePaveBlocksOn
-//purpose  : 
+//purpose  :
 //=======================================================================
   inline NMTTools_MapOfPaveBlock& NMTTools_FaceInfo::ChangePaveBlocksOn()
 {
@@ -120,7 +120,7 @@ inline void NMTTools_FaceInfo::Clear()
 }
 //=======================================================================
 //function : VerticesOn
-//purpose  : 
+//purpose  :
 //=======================================================================
   inline const TColStd_MapOfInteger& NMTTools_FaceInfo::VerticesOn()const
 {
@@ -128,7 +128,7 @@ inline void NMTTools_FaceInfo::Clear()
 }
 //=======================================================================
 //function : ChangeVerticesOn
-//purpose  : 
+//purpose  :
 //=======================================================================
   inline  TColStd_MapOfInteger& NMTTools_FaceInfo::ChangeVerticesOn()
 {
diff --git a/src/NMTTools_NEW/NMTTools_IndexedDataMapOfIndexedMapOfInteger.hxx b/src/NMTTools_NEW/NMTTools_IndexedDataMapOfIndexedMapOfInteger.hxx
index 7d3822488..479a13158 100644
--- a/src/NMTTools_NEW/NMTTools_IndexedDataMapOfIndexedMapOfInteger.hxx
+++ b/src/NMTTools_NEW/NMTTools_IndexedDataMapOfIndexedMapOfInteger.hxx
@@ -1,42 +1,42 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-// File:	NMTTools_IndexedDataMapOfIndexedMapOfInteger.hxx
-// Created:	Mon Feb 20 09:20:07 2012
-// Author:	
-//		<pkv@BDEURI37616>
-
-
-#ifndef NMTTools_IndexedDataMapOfIndexedMapOfInteger_HeaderFile
-#define NMTTools_IndexedDataMapOfIndexedMapOfInteger_HeaderFile
-
-
-#include <Standard_Integer.hxx>
-#include <TColStd_MapIntegerHasher.hxx>
-#include <TColStd_IndexedMapOfInteger.hxx>
-
-#define _NCollection_MapHasher
-#include <NCollection_IndexedDataMap.hxx>
-
-typedef NCollection_IndexedDataMap <Standard_Integer, TColStd_IndexedMapOfInteger, TColStd_MapIntegerHasher> NMTTools_IndexedDataMapOfIndexedMapOfInteger; 
- 
-#undef _NCollection_MapHasher
-
-
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// File:	NMTTools_IndexedDataMapOfIndexedMapOfInteger.hxx
+// Created:	Mon Feb 20 09:20:07 2012
+// Author:
+//		<pkv@BDEURI37616>
+
+
+#ifndef NMTTools_IndexedDataMapOfIndexedMapOfInteger_HeaderFile
+#define NMTTools_IndexedDataMapOfIndexedMapOfInteger_HeaderFile
+
+
+#include <Standard_Integer.hxx>
+#include <TColStd_MapIntegerHasher.hxx>
+#include <TColStd_IndexedMapOfInteger.hxx>
+
+#define _NCollection_MapHasher
+#include <NCollection_IndexedDataMap.hxx>
+
+typedef NCollection_IndexedDataMap <Standard_Integer, TColStd_IndexedMapOfInteger, TColStd_MapIntegerHasher> NMTTools_IndexedDataMapOfIndexedMapOfInteger;
+
+#undef _NCollection_MapHasher
+
+
+
+#endif
diff --git a/src/NMTTools_NEW/NMTTools_IndexedDataMapOfShapeIndexedMapOfShape.hxx b/src/NMTTools_NEW/NMTTools_IndexedDataMapOfShapeIndexedMapOfShape.hxx
index ef50fa54d..6dbe387cb 100644
--- a/src/NMTTools_NEW/NMTTools_IndexedDataMapOfShapeIndexedMapOfShape.hxx
+++ b/src/NMTTools_NEW/NMTTools_IndexedDataMapOfShapeIndexedMapOfShape.hxx
@@ -1,47 +1,47 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-// File:	NMTTools_IndexedDataMapOfIndexedMapOfInteger.hxx
-// Created:	Mon Feb 20 09:20:07 2012
-// Author:	
-//		<pkv@BDEURI37616>
-// File:	NMTTools_IndexedDataMapOfShapeIndexedMapOfShape.hxx
-// Created:	Mon Feb 20 11:59:23 2012
-// Author:	
-//		<pkv@BDEURI37616>
-
-
-#ifndef NMTTools_IndexedDataMapOfShapeIndexedMapOfShape_HeaderFile
-#define NMTTools_IndexedDataMapOfShapeIndexedMapOfShape_HeaderFile
-
-
-#include <TopoDS_Shape.hxx>
-#include <TopTools_ShapeMapHasher.hxx>
-#include <TopTools_IndexedMapOfShape.hxx>
-
-#define _NCollection_MapHasher
-#include <NCollection_IndexedDataMap.hxx>
-
-
-typedef NCollection_IndexedDataMap <TopoDS_Shape, TopTools_IndexedMapOfShape, TopTools_ShapeMapHasher> NMTTools_IndexedDataMapOfShapeIndexedMapOfShape; 
- 
-#undef _NCollection_MapHasher
-
-
-#endif
-
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// File:	NMTTools_IndexedDataMapOfIndexedMapOfInteger.hxx
+// Created:	Mon Feb 20 09:20:07 2012
+// Author:
+//		<pkv@BDEURI37616>
+// File:	NMTTools_IndexedDataMapOfShapeIndexedMapOfShape.hxx
+// Created:	Mon Feb 20 11:59:23 2012
+// Author:
+//		<pkv@BDEURI37616>
+
+
+#ifndef NMTTools_IndexedDataMapOfShapeIndexedMapOfShape_HeaderFile
+#define NMTTools_IndexedDataMapOfShapeIndexedMapOfShape_HeaderFile
+
+
+#include <TopoDS_Shape.hxx>
+#include <TopTools_ShapeMapHasher.hxx>
+#include <TopTools_IndexedMapOfShape.hxx>
+
+#define _NCollection_MapHasher
+#include <NCollection_IndexedDataMap.hxx>
+
+
+typedef NCollection_IndexedDataMap <TopoDS_Shape, TopTools_IndexedMapOfShape, TopTools_ShapeMapHasher> NMTTools_IndexedDataMapOfShapeIndexedMapOfShape;
+
+#undef _NCollection_MapHasher
+
+
+#endif
+
diff --git a/src/NMTTools_NEW/NMTTools_IndexedDataMapOfShapePaveBlock.hxx b/src/NMTTools_NEW/NMTTools_IndexedDataMapOfShapePaveBlock.hxx
index 1e96e62bd..db2546036 100644
--- a/src/NMTTools_NEW/NMTTools_IndexedDataMapOfShapePaveBlock.hxx
+++ b/src/NMTTools_NEW/NMTTools_IndexedDataMapOfShapePaveBlock.hxx
@@ -1,40 +1,40 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-// File:	NMTTools_IndexedDataMapOfShapePaveBlock.hxx
-// Created:	Mon Feb 20 11:55:34 2012
-// Author:	
-//		<pkv@BDEURI37616>
-
-
-#ifndef NMTTools_IndexedDataMapOfShapePaveBlock_HeaderFile
-#define NMTTools_IndexedDataMapOfShapePaveBlock_HeaderFile
-
-#include <TopoDS_Shape.hxx>
-#include <TopTools_ShapeMapHasher.hxx>
-#include <BOPTools_PaveBlock.hxx>
-
-#define _NCollection_MapHasher
-#include <NCollection_IndexedDataMap.hxx>
-
-typedef NCollection_IndexedDataMap <TopoDS_Shape, BOPTools_PaveBlock, TopTools_ShapeMapHasher> NMTTools_IndexedDataMapOfShapePaveBlock; 
- 
-#undef _NCollection_MapHasher
-
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// File:	NMTTools_IndexedDataMapOfShapePaveBlock.hxx
+// Created:	Mon Feb 20 11:55:34 2012
+// Author:
+//		<pkv@BDEURI37616>
+
+
+#ifndef NMTTools_IndexedDataMapOfShapePaveBlock_HeaderFile
+#define NMTTools_IndexedDataMapOfShapePaveBlock_HeaderFile
+
+#include <TopoDS_Shape.hxx>
+#include <TopTools_ShapeMapHasher.hxx>
+#include <BOPTools_PaveBlock.hxx>
+
+#define _NCollection_MapHasher
+#include <NCollection_IndexedDataMap.hxx>
+
+typedef NCollection_IndexedDataMap <TopoDS_Shape, BOPTools_PaveBlock, TopTools_ShapeMapHasher> NMTTools_IndexedDataMapOfShapePaveBlock;
+
+#undef _NCollection_MapHasher
+
+
+#endif
diff --git a/src/NMTTools_NEW/NMTTools_ListIteratorOfListOfCommonBlock.hxx b/src/NMTTools_NEW/NMTTools_ListIteratorOfListOfCommonBlock.hxx
index de43fb7e3..160530caf 100644
--- a/src/NMTTools_NEW/NMTTools_ListIteratorOfListOfCommonBlock.hxx
+++ b/src/NMTTools_NEW/NMTTools_ListIteratorOfListOfCommonBlock.hxx
@@ -1,31 +1,31 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-// File:	NMTDS_ListIteratorOfListOfCommonBlock.hxx
-// Created:	Mon Feb 20 11:25:23 2012
-// Author:	
-//		<pkv@BDEURI37616>
-
-#ifndef NMTDS_ListIteratorOfListOfCommonBlock_HeaderFile
-#define NMTDS_ListIteratorOfListOfCommonBlock_HeaderFile
-
-#ifndef NMTTools_ListOfCommonBlock_HeaderFile
-#include <NMTTools_ListOfCommonBlock.hxx>
-#endif
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// File:	NMTDS_ListIteratorOfListOfCommonBlock.hxx
+// Created:	Mon Feb 20 11:25:23 2012
+// Author:
+//		<pkv@BDEURI37616>
+
+#ifndef NMTDS_ListIteratorOfListOfCommonBlock_HeaderFile
+#define NMTDS_ListIteratorOfListOfCommonBlock_HeaderFile
+
+#ifndef NMTTools_ListOfCommonBlock_HeaderFile
+#include <NMTTools_ListOfCommonBlock.hxx>
+#endif
+
+#endif
diff --git a/src/NMTTools_NEW/NMTTools_ListIteratorOfListOfCoupleOfShape.hxx b/src/NMTTools_NEW/NMTTools_ListIteratorOfListOfCoupleOfShape.hxx
index 61dc585b7..0a1b3ca3d 100644
--- a/src/NMTTools_NEW/NMTTools_ListIteratorOfListOfCoupleOfShape.hxx
+++ b/src/NMTTools_NEW/NMTTools_ListIteratorOfListOfCoupleOfShape.hxx
@@ -1,31 +1,31 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-// File:	NMTDS_ListIteratorOfListOfCoupleOfShape.hxx
-// Created:	Mon Feb 20 11:25:23 2012
-// Author:	
-//		<pkv@BDEURI37616>
-
-#ifndef NMTDS_ListIteratorOfListOfCoupleOfShape_HeaderFile
-#define NMTDS_ListIteratorOfListOfCoupleOfShape_HeaderFile
-
-#ifndef NMTTools_ListOfCoupleOfShape_HeaderFile
-#include <NMTTools_ListOfCoupleOfShape.hxx>
-#endif
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// File:	NMTDS_ListIteratorOfListOfCoupleOfShape.hxx
+// Created:	Mon Feb 20 11:25:23 2012
+// Author:
+//		<pkv@BDEURI37616>
+
+#ifndef NMTDS_ListIteratorOfListOfCoupleOfShape_HeaderFile
+#define NMTDS_ListIteratorOfListOfCoupleOfShape_HeaderFile
+
+#ifndef NMTTools_ListOfCoupleOfShape_HeaderFile
+#include <NMTTools_ListOfCoupleOfShape.hxx>
+#endif
+
+#endif
diff --git a/src/NMTTools_NEW/NMTTools_ListOfCommonBlock.hxx b/src/NMTTools_NEW/NMTTools_ListOfCommonBlock.hxx
index 02654de6b..ebca6d403 100644
--- a/src/NMTTools_NEW/NMTTools_ListOfCommonBlock.hxx
+++ b/src/NMTTools_NEW/NMTTools_ListOfCommonBlock.hxx
@@ -1,33 +1,33 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-// File:	NMTTools_ListOfCommonBlock.hxx
-// Created:	Mon Feb 20 07:27:34 2012
-// Author:	
-//		<pkv@BDEURI37616>
-
-#ifndef NMTTools_ListOfCommonBlock_HeaderFile
-#define NMTTools_ListOfCommonBlock_HeaderFile
-
-#include <NCollection_List.hxx>   
-#include <NMTTools_CommonBlock.hxx>
-
-typedef NCollection_List <NMTTools_CommonBlock> NMTTools_ListOfCommonBlock; 
-typedef NMTTools_ListOfCommonBlock::Iterator NMTTools_ListIteratorOfListOfCommonBlock;  
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// File:	NMTTools_ListOfCommonBlock.hxx
+// Created:	Mon Feb 20 07:27:34 2012
+// Author:
+//		<pkv@BDEURI37616>
+
+#ifndef NMTTools_ListOfCommonBlock_HeaderFile
+#define NMTTools_ListOfCommonBlock_HeaderFile
+
+#include <NCollection_List.hxx>
+#include <NMTTools_CommonBlock.hxx>
+
+typedef NCollection_List <NMTTools_CommonBlock> NMTTools_ListOfCommonBlock;
+typedef NMTTools_ListOfCommonBlock::Iterator NMTTools_ListIteratorOfListOfCommonBlock;
+
+#endif
diff --git a/src/NMTTools_NEW/NMTTools_ListOfCoupleOfShape.hxx b/src/NMTTools_NEW/NMTTools_ListOfCoupleOfShape.hxx
index f3e6ae3fb..6660a46f2 100644
--- a/src/NMTTools_NEW/NMTTools_ListOfCoupleOfShape.hxx
+++ b/src/NMTTools_NEW/NMTTools_ListOfCoupleOfShape.hxx
@@ -1,33 +1,33 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-// File:	NMTTools_ListOfCoupleOfShape.hxx
-// Created:	Mon Feb 20 07:27:34 2012
-// Author:	
-//		<pkv@BDEURI37616>
-
-#ifndef NMTTools_ListOfCoupleOfShape_HeaderFile
-#define NMTTools_ListOfCoupleOfShape_HeaderFile
-
-#include <NCollection_List.hxx>   
-#include <NMTTools_CoupleOfShape.hxx>
-
-typedef NCollection_List <NMTTools_CoupleOfShape> NMTTools_ListOfCoupleOfShape; 
-typedef NMTTools_ListOfCoupleOfShape::Iterator NMTTools_ListIteratorOfListOfCoupleOfShape;  
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// File:	NMTTools_ListOfCoupleOfShape.hxx
+// Created:	Mon Feb 20 07:27:34 2012
+// Author:
+//		<pkv@BDEURI37616>
+
+#ifndef NMTTools_ListOfCoupleOfShape_HeaderFile
+#define NMTTools_ListOfCoupleOfShape_HeaderFile
+
+#include <NCollection_List.hxx>
+#include <NMTTools_CoupleOfShape.hxx>
+
+typedef NCollection_List <NMTTools_CoupleOfShape> NMTTools_ListOfCoupleOfShape;
+typedef NMTTools_ListOfCoupleOfShape::Iterator NMTTools_ListIteratorOfListOfCoupleOfShape;
+
+#endif
diff --git a/src/NMTTools_NEW/NMTTools_MapIteratorOfMapOfPaveBlock.hxx b/src/NMTTools_NEW/NMTTools_MapIteratorOfMapOfPaveBlock.hxx
index 6d62fd75a..bf94f3757 100644
--- a/src/NMTTools_NEW/NMTTools_MapIteratorOfMapOfPaveBlock.hxx
+++ b/src/NMTTools_NEW/NMTTools_MapIteratorOfMapOfPaveBlock.hxx
@@ -1,33 +1,32 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//		<pkv@BDEURI37616>
-// File:	NMTTools_MapIteratorOfMapOfPaveBlock.hxx
-// Created:	Mon Feb 20 11:47:30 2012
-// Author:	
-//		<pkv@BDEURI37616>
-
-
-#ifndef NMTTools_MapIteratorOfMapOfPaveBlock_HeaderFile
-#define NMTTools_MapIteratorOfMapOfPaveBlock_HeaderFile
-
-#ifndef NMTTools_MapOfPaveBlock_HeaderFile
-#include <NMTTools_MapOfPaveBlock.hxx>
-#endif
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// File:	NMTTools_MapIteratorOfMapOfPaveBlock.hxx
+// Created:	Mon Feb 20 11:47:30 2012
+// Author:
+//		<pkv@BDEURI37616>
+
+
+#ifndef NMTTools_MapIteratorOfMapOfPaveBlock_HeaderFile
+#define NMTTools_MapIteratorOfMapOfPaveBlock_HeaderFile
+
+#ifndef NMTTools_MapOfPaveBlock_HeaderFile
+#include <NMTTools_MapOfPaveBlock.hxx>
+#endif
+
+#endif
diff --git a/src/NMTTools_NEW/NMTTools_MapOfPaveBlock.hxx b/src/NMTTools_NEW/NMTTools_MapOfPaveBlock.hxx
index 7f97d9942..9def69219 100644
--- a/src/NMTTools_NEW/NMTTools_MapOfPaveBlock.hxx
+++ b/src/NMTTools_NEW/NMTTools_MapOfPaveBlock.hxx
@@ -1,40 +1,40 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-
-// File:	NMTTools_MapOfPaveBlock.hxx
-// Created:	Mon Feb 20 08:19:07 2012
-// Author:	
-//		<pkv@BDEURI37616>
-
-
-#ifndef NMTTools_MapOfPaveBlock_HeaderFile
-#define NMTTools_MapOfPaveBlock_HeaderFile
-
-#include <BOPTools_PaveBlock.hxx>  
-#include <BOPTools_PaveBlockMapHasher.hxx>
-
-#define _NCollection_MapHasher
-#include <NCollection_Map.hxx>   
-
-typedef NCollection_Map<BOPTools_PaveBlock, BOPTools_PaveBlockMapHasher> NMTTools_MapOfPaveBlock; 
-typedef NMTTools_MapOfPaveBlock::Iterator NMTTools_MapIteratorOfMapOfPaveBlock;  
-
-#undef _NCollection_MapHasher
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File:	NMTTools_MapOfPaveBlock.hxx
+// Created:	Mon Feb 20 08:19:07 2012
+// Author:
+//		<pkv@BDEURI37616>
+
+
+#ifndef NMTTools_MapOfPaveBlock_HeaderFile
+#define NMTTools_MapOfPaveBlock_HeaderFile
+
+#include <BOPTools_PaveBlock.hxx>
+#include <BOPTools_PaveBlockMapHasher.hxx>
+
+#define _NCollection_MapHasher
+#include <NCollection_Map.hxx>
+
+typedef NCollection_Map<BOPTools_PaveBlock, BOPTools_PaveBlockMapHasher> NMTTools_MapOfPaveBlock;
+typedef NMTTools_MapOfPaveBlock::Iterator NMTTools_MapIteratorOfMapOfPaveBlock;
+
+#undef _NCollection_MapHasher
+
+#endif
diff --git a/src/NMTTools_NEW/NMTTools_PPaveFiller.hxx b/src/NMTTools_NEW/NMTTools_PPaveFiller.hxx
index f1b7cc0b7..516d71f52 100644
--- a/src/NMTTools_NEW/NMTTools_PPaveFiller.hxx
+++ b/src/NMTTools_NEW/NMTTools_PPaveFiller.hxx
@@ -1,35 +1,35 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-
-// File:        NMTTools_PPaveFiller.hxx
-// Created:     Tue Dec  9 12:23:29 2003
-// Author:      Peter KURNEV
-//              <pkv@irinox>
-//
-#ifndef _NMTTools_PPaveFiller_HeaderFile
-#define _NMTTools_PPaveFiller_HeaderFile
-
-class NMTTools_PaveFiller;
-
-typedef NMTTools_PaveFiller* NMTTools_PPaveFiller;
-
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File:        NMTTools_PPaveFiller.hxx
+// Created:     Tue Dec  9 12:23:29 2003
+// Author:      Peter KURNEV
+//              <pkv@irinox>
+//
+#ifndef _NMTTools_PPaveFiller_HeaderFile
+#define _NMTTools_PPaveFiller_HeaderFile
+
+class NMTTools_PaveFiller;
+
+typedef NMTTools_PaveFiller* NMTTools_PPaveFiller;
+
+#endif
diff --git a/src/NMTTools_NEW/NMTTools_PaveFiller.cxx b/src/NMTTools_NEW/NMTTools_PaveFiller.cxx
index 3a9155b10..b98bc4fa6 100644
--- a/src/NMTTools_NEW/NMTTools_PaveFiller.cxx
+++ b/src/NMTTools_NEW/NMTTools_PaveFiller.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -36,7 +36,7 @@
 
 //=======================================================================
 // function: NMTTools_PaveFiller::NMTTools_PaveFiller
-// purpose: 
+// purpose:
 //=======================================================================
   NMTTools_PaveFiller::NMTTools_PaveFiller()
 {
@@ -49,7 +49,7 @@
 }
 //=======================================================================
 // function: ~
-// purpose: 
+// purpose:
 //=======================================================================
   NMTTools_PaveFiller::~NMTTools_PaveFiller()
 {
@@ -57,19 +57,19 @@
 }
 //=======================================================================
 // function: Clear
-// purpose: 
+// purpose:
 //=======================================================================
   void NMTTools_PaveFiller::Clear()
 {
   if (myDSIt) {
     delete myDSIt;
-  } 
+  }
   if (myDS) {
     delete myDS;
   }
   myDSIt=NULL;
   myDS=NULL;
-  
+
   if (myIP) {
     delete myIP;
   }
@@ -77,7 +77,7 @@
 }
 //=======================================================================
 // function: SetCompositeShape
-// purpose: 
+// purpose:
 //=======================================================================
   void NMTTools_PaveFiller::SetCompositeShape(const TopoDS_Shape& aS)
 {
@@ -85,7 +85,7 @@
 }
 //=======================================================================
 // function: CompositeShape
-// purpose: 
+// purpose:
 //=======================================================================
   const TopoDS_Shape& NMTTools_PaveFiller::CompositeShape()const
 {
@@ -93,7 +93,7 @@
 }
 //=======================================================================
 // function:  DS
-// purpose: 
+// purpose:
 //=======================================================================
   NMTDS_PShapesDataStructure NMTTools_PaveFiller::DS()
 {
@@ -101,7 +101,7 @@
 }
 //=======================================================================
 // function: DSIt
-// purpose: 
+// purpose:
 //=======================================================================
   NMTDS_PIterator NMTTools_PaveFiller::DSIt()
 {
@@ -109,7 +109,7 @@
 }
 //=======================================================================
 // function:  IP
-// purpose: 
+// purpose:
 //=======================================================================
   NMTDS_PInterfPool NMTTools_PaveFiller::IP()
 {
@@ -117,7 +117,7 @@
 }
 //=======================================================================
 // function:IsDone
-// purpose: 
+// purpose:
 //=======================================================================
   Standard_Boolean NMTTools_PaveFiller::IsDone() const
 {
@@ -125,7 +125,7 @@
 }
 //=======================================================================
 // function: Context
-// purpose: 
+// purpose:
 //=======================================================================
   const Handle(IntTools_Context)& NMTTools_PaveFiller::Context() const
 {
@@ -133,7 +133,7 @@
 }
 //=======================================================================
 // function: PavePool
-// purpose: 
+// purpose:
 //=======================================================================
   const BOPTools_PavePool& NMTTools_PaveFiller::PavePool() const
 {
@@ -141,7 +141,7 @@
 }
 //=======================================================================
 // function: ChangePavePool
-// purpose: 
+// purpose:
 //=======================================================================
   BOPTools_PavePool& NMTTools_PaveFiller::ChangePavePool()
 {
@@ -149,7 +149,7 @@
 }
 //=======================================================================
 // function: ChangePavePoolNew
-// purpose: 
+// purpose:
 //=======================================================================
   BOPTools_PavePool& NMTTools_PaveFiller::ChangePavePoolNew()
 {
@@ -157,7 +157,7 @@
 }
 //=======================================================================
 // function:  CommonBlockPool
-// purpose: 
+// purpose:
 //=======================================================================
   const NMTTools_CommonBlockPool& NMTTools_PaveFiller::CommonBlockPool() const
 {
@@ -165,7 +165,7 @@
 }
 //=======================================================================
 // function:  ChangeCommonBlockPool
-// purpose: 
+// purpose:
 //=======================================================================
   NMTTools_CommonBlockPool& NMTTools_PaveFiller::ChangeCommonBlockPool()
 {
@@ -173,7 +173,7 @@
 }
 //=======================================================================
 // function:  SplitShapesPool
-// purpose: 
+// purpose:
 //=======================================================================
   const BOPTools_SplitShapesPool& NMTTools_PaveFiller::SplitShapesPool() const
 {
@@ -181,7 +181,7 @@
 }
 //=======================================================================
 // function:  ChangeSplitShapesPool
-// purpose: 
+// purpose:
 //=======================================================================
   BOPTools_SplitShapesPool& NMTTools_PaveFiller::ChangeSplitShapesPool()
 {
@@ -189,7 +189,7 @@
 }
 //=======================================================================
 // function: Init
-// purpose: 
+// purpose:
 //=======================================================================
   void NMTTools_PaveFiller::Init()
 {
@@ -217,13 +217,13 @@
   // 4
   myIP=new NMTDS_InterfPool;
   //
-  // 5 
+  // 5
   myContext=new IntTools_Context;
 }
 
 //=======================================================================
 // function: Perform
-// purpose: 
+// purpose:
 //=======================================================================
   void NMTTools_PaveFiller::Perform()
 {
@@ -239,7 +239,7 @@
     //
     // 2.VE
     myPavePool.Resize (myNbEdges);
-    
+
     PrepareEdges();
 
     PerformVE();
@@ -273,7 +273,7 @@
     RefinePavePool();
     //
     myPavePoolNew.Destroy();
-    
+
     MakeSplitEdges();
 
     UpdateCommonBlocks();
@@ -285,7 +285,7 @@
     //
     MakePCurves();
     //
-    // 7.Postprocessing 
+    // 7.Postprocessing
     UpdatePaveBlocks();
     //
     NMTTools_DEProcessor aDEP(*this);
diff --git a/src/NMTTools_NEW/NMTTools_PaveFiller.hxx b/src/NMTTools_NEW/NMTTools_PaveFiller.hxx
index 34ce90f9c..765e5aba3 100644
--- a/src/NMTTools_NEW/NMTTools_PaveFiller.hxx
+++ b/src/NMTTools_NEW/NMTTools_PaveFiller.hxx
@@ -1,500 +1,500 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-
-// File:        NMTTools_PaveFiller.hxx
-// Created:     Fri Dec  5 14:58:54 2003
-// Author:      Peter KURNEV
-//              <pkv@irinox>
-//
-#ifndef _NMTTools_PaveFiller_HeaderFile
-#define _NMTTools_PaveFiller_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_Macro.hxx>
-#include <NMTDS_PShapesDataStructure.hxx>
-#include <Standard_Boolean.hxx>
-#include <Standard_Integer.hxx>
-#include <BOPTools_PavePool.hxx>
-#include <NMTTools_CommonBlockPool.hxx>
-#include <BOPTools_SplitShapesPool.hxx>
-#include <Handle_IntTools_Context.hxx>
-#include <BOPTools_SSIntersectionAttribute.hxx>
-#include <NMTTools_IndexedDataMapOfIndexedMapOfInteger.hxx>
-#include <TColStd_DataMapOfIntegerInteger.hxx>
-#include <NMTDS_PIterator.hxx>
-#include <TopoDS_Shape.hxx>
-#include <NMTDS_PInterfPool.hxx>
-#include <NMTTools_DataMapOfIntegerFaceInfo.hxx>
-#include <TopAbs_ShapeEnum.hxx>
-#include <NMTTools_CommonBlock.hxx>
-#include <Standard_Real.hxx>
-
-#include <TopoDS_Shape.hxx>
-#include <BOPTools_Pave.hxx>
-#include <IntTools_ShrunkRange.hxx>
-#include <BOPTools_PavePool.hxx>
-#include <NMTTools_CommonBlockPool.hxx>
-#include <BOPTools_SplitShapesPool.hxx>
-#include <BOPTools_PaveBlock.hxx>
-#include <TopoDS_Vertex.hxx>
-#include <NMTTools_ListOfCommonBlock.hxx>
-#include <BOPTools_IDMapOfPaveBlockIMapOfPaveBlock.hxx>
-#include <BOPTools_IDMapOfPaveBlockIMapOfInteger.hxx>
-#include <BooleanOperations_IndexedDataMapOfShapeInteger.hxx>
-#include <TColStd_ListOfInteger.hxx>
-#include <BOPTools_ListOfPaveBlock.hxx>
-#include <TopoDS_Face.hxx>
-#include <BOPTools_PaveSet.hxx>
-#include <BOPTools_Curve.hxx>
-#include <BOPTools_SSInterference.hxx>
-#include <gp_Pnt.hxx>
-#include <NMTTools_IndexedDataMapOfIndexedMapOfInteger.hxx>
-#include <TopTools_ListOfShape.hxx>
-#include <TopoDS_Edge.hxx>
-#include <TopTools_DataMapOfShapeShape.hxx>
-
-
-/*
-class TopoDS_Shape;
-class BOPTools_Pave;
-class IntTools_ShrunkRange;
-class BOPTools_PavePool;
-class NMTTools_CommonBlockPool;
-class BOPTools_SplitShapesPool;
-class BOPTools_PaveBlock;
-class TopoDS_Vertex;
-class NMTTools_ListOfCommonBlock;
-class BOPTools_IDMapOfPaveBlockIMapOfPaveBlock;
-class BOPTools_IDMapOfPaveBlockIMapOfInteger;
-class BooleanOperations_IndexedDataMapOfShapeInteger;
-class TColStd_ListOfInteger;
-class BOPTools_ListOfPaveBlock;
-class TopoDS_Face;
-class BOPTools_PaveSet;
-class BOPTools_Curve;
-class BOPTools_SSInterference;
-class gp_Pnt;
-class NMTTools_IndexedDataMapOfIndexedMapOfInteger;
-class TopTools_ListOfShape;
-class TopoDS_Edge;
-class TopTools_DataMapOfShapeShape;
-class TCoLSTD_MapOfInteger;
-*/
-
-
-//=======================================================================
-//function : NMTTools_PaveFiller
-//purpose  : 
-//=======================================================================
-class NMTTools_PaveFiller  {
- public:
-  Standard_EXPORT
-    NMTTools_PaveFiller();
-  
-  Standard_EXPORT
-  virtual ~NMTTools_PaveFiller();
-  
-  Standard_EXPORT
-    void SetCompositeShape(const TopoDS_Shape& aS) ;
-  
-  Standard_EXPORT
-    const TopoDS_Shape& CompositeShape() const;
-  
-  Standard_EXPORT
-    NMTDS_PShapesDataStructure DS() ;
-  
-  Standard_EXPORT
-    NMTDS_PIterator DSIt() ;
-  
-  Standard_EXPORT     
-    NMTDS_PInterfPool IP() ;
-  
-  Standard_EXPORT
-    virtual  void Perform() ;
-  
-  Standard_EXPORT
-    Standard_Boolean IsDone() const;
-  
-  Standard_EXPORT
-    const Handle_IntTools_Context& Context() const;
-  
-  Standard_EXPORT
-    const BOPTools_PavePool& PavePool() const;
-  
-  Standard_EXPORT
-    BOPTools_PavePool& ChangePavePool() ;
-  
-  Standard_EXPORT
-    const NMTTools_CommonBlockPool& CommonBlockPool() const;
-  
-  Standard_EXPORT
-    NMTTools_CommonBlockPool& ChangeCommonBlockPool() ;
-  
-  Standard_EXPORT
-    const BOPTools_SplitShapesPool& SplitShapesPool() const;
-  
-  Standard_EXPORT
-    BOPTools_SplitShapesPool& ChangeSplitShapesPool() ;
-  
-  Standard_EXPORT
-    Standard_Integer FindSDVertex(const Standard_Integer nV) const;
-  
-  Standard_EXPORT
-    Standard_Integer SplitsInFace(const Standard_Integer aBid,
-				  const Standard_Integer nF1,
-				  const Standard_Integer nF2,
-				  TColStd_ListOfInteger& aLs) ;
-  
-  Standard_EXPORT     
-    Standard_Integer SplitsInFace(const Standard_Integer nE1,
-				  const Standard_Integer nF2,
-				  TColStd_ListOfInteger& aLs) ;
-  
-  Standard_EXPORT
-    Standard_Integer SplitsOnEdge(const Standard_Integer nE1,
-				  const Standard_Integer nE2,
-				  TColStd_ListOfInteger& aLs) ;
-  
-  Standard_EXPORT
-    Standard_Integer SplitsOnFace(const Standard_Integer nE1,
-				  const Standard_Integer nF2,
-				  TColStd_ListOfInteger& aLs) ;
-  
-  Standard_EXPORT
-    Standard_Integer SplitsOnFace(const Standard_Integer aBid,
-				  const Standard_Integer nF1,
-				  const Standard_Integer nF2,
-				  TColStd_ListOfInteger& aLs) ;
-  
-  Standard_EXPORT
-    Standard_Integer SplitsInFace(const Standard_Integer aBid,
-				  const Standard_Integer nF1,
-				  const Standard_Integer nF2,
-				  BOPTools_ListOfPaveBlock& aLs) ;
-  
-  Standard_EXPORT
-    Standard_Integer SplitsInFace(const Standard_Integer nE1,
-				  const Standard_Integer nF2,
-				  BOPTools_ListOfPaveBlock& aLs) ;
-  
-  Standard_EXPORT
-    Standard_Integer SplitsOnEdge(const Standard_Integer nE1,
-				  const Standard_Integer nE2,
-				  BOPTools_ListOfPaveBlock& aLs) ;
-  
-  Standard_EXPORT
-    Standard_Integer SplitsOnFace(const Standard_Integer nE1,
-				  const Standard_Integer nF2,
-				  BOPTools_ListOfPaveBlock& aLs) ;
-  
-  Standard_EXPORT
-    Standard_Integer SplitsOnFace(const Standard_Integer aBid,
-				  const Standard_Integer nF1,
-				  const Standard_Integer nF2,
-				  BOPTools_ListOfPaveBlock& aLs) ;
-  
-  Standard_EXPORT
-    Standard_Integer SplitsFace(const Standard_Integer nF2,
-				BOPTools_ListOfPaveBlock& aLs) ;
-  
-  Standard_EXPORT
-    Standard_Integer SplitsFace(const Standard_Integer nF2,
-				TColStd_ListOfInteger& aLs) ;
-  
-  Standard_EXPORT
-    Standard_Integer CommonBlocksFace(const Standard_Integer nF,
-				      NMTTools_ListOfCommonBlock& aLCB) ;
-  
-  Standard_EXPORT
-    void PrepareFace(const Standard_Integer nF,
-		     TopoDS_Face& aF) ;
-  
-  Standard_EXPORT
-    const BOPTools_PaveBlock& RealPaveBlock(const BOPTools_PaveBlock& aPB) ;
-  
-  Standard_EXPORT
-    const BOPTools_PaveBlock& RealPaveBlock(const BOPTools_PaveBlock& aPB,
-					    TColStd_ListOfInteger& aLB,
-					    Standard_Integer& aIsCommonBlock) ;
-  
-  Standard_EXPORT
-    void RealSplitsFace(const Standard_Integer nF2,
-			BOPTools_ListOfPaveBlock& aLs) ;
-  
-  Standard_EXPORT
-    Standard_Boolean HasRealSplitsInOnFace(const Standard_Integer nF1,
-					   const Standard_Integer nF2) ;
-  
-  Standard_EXPORT
-    void RealSplitsInFace(const Standard_Integer aBid,
-			  const Standard_Integer nF1,
-			  const Standard_Integer nF2,
-			  BOPTools_ListOfPaveBlock& aLs) ;
-  
-  Standard_EXPORT
-    void RealSplitsInFace(const Standard_Integer nE1,
-			  const Standard_Integer nF2,
-			  BOPTools_ListOfPaveBlock& aLs) ;
-  
-  Standard_EXPORT
-    void RealSplitsInFace(const Standard_Integer nF1,
-			  BOPTools_ListOfPaveBlock& aLPB) ;
-  
-  Standard_EXPORT
-    void RealSplitsOnEdge(const Standard_Integer nE1,
-			  const Standard_Integer nE2,
-			  BOPTools_ListOfPaveBlock& aLs) ;
-  
-  Standard_EXPORT
-    void RealSplitsOnFace(const Standard_Integer nE1,
-			  const Standard_Integer nF2,
-			  BOPTools_ListOfPaveBlock& aLs) ;
-  
-  Standard_EXPORT
-    void RealSplitsOnFace(const Standard_Integer aBid,
-			  const Standard_Integer nF1,
-			  const Standard_Integer nF2,
-			  BOPTools_ListOfPaveBlock& aLs) ;
-  
-  Standard_EXPORT
-    void PrepareSetForFace(const Standard_Integer nF1,
-			   const Standard_Integer nF2,
-			   const BOPTools_ListOfPaveBlock& aLPB,
-			   BOPTools_PaveSet& aPSF) ;
-  
-  Standard_EXPORT
-    void PutPaveOnCurve(const BOPTools_PaveSet& aPSF,
-			const Standard_Real aTol,
-			BOPTools_Curve& aBC) ;
-  
-  Standard_EXPORT
-    void PutBoundPaveOnCurve(BOPTools_Curve& aBC,
-			     BOPTools_SSInterference& aFF) ;
-  
-  Standard_EXPORT
-    void PutBoundPaveOnCurve(const gp_Pnt& aP,
-			     const Standard_Real aT,
-			     BOPTools_Curve& aBC,
-			     BOPTools_SSInterference& aFF) ;
-  
-  Standard_EXPORT
-    Standard_Boolean FindPave(const gp_Pnt& aP,
-			      const Standard_Real aTpV,
-			      const BOPTools_PaveSet& aPS,
-			      BOPTools_Pave& aPV) ;
-  
-  Standard_EXPORT
-    Standard_Integer CheckIntermediatePoint(const BOPTools_PaveBlock& aPB,
-					    const BOPTools_PaveBlock& aPBR,
-					    const Standard_Real aTol) ;
-  
-  Standard_EXPORT
-    Standard_Boolean IsExistingPaveBlock(const BOPTools_PaveBlock& aPB,
-					 const BOPTools_ListOfPaveBlock& aLPB,
-					 const Standard_Real aTol) ;
-  
-  Standard_EXPORT
-    void MakePCurves() ;
-  
-  Standard_EXPORT
-    const NMTTools_IndexedDataMapOfIndexedMapOfInteger& AloneVertices() const;
-  
-  Standard_EXPORT
-    Standard_Boolean IsExistingPaveBlock(const BOPTools_PaveBlock& aPB,
-					 const TopTools_ListOfShape& aLPB,
-					 const Standard_Real aTol) ;
-  
-  Standard_EXPORT
-    Standard_Boolean CheckCoincidence(const BOPTools_PaveBlock& aPB,
-				      const BOPTools_ListOfPaveBlock& aLPB) ;
-  
-  Standard_EXPORT
-    Standard_Integer CheckIntermediatePoint(const BOPTools_PaveBlock& aPB,
-					    const TopoDS_Edge& aE,
-					    const Standard_Real aTol) ;
-  
-  Standard_EXPORT
-    void SharedEdges(const Standard_Integer nF1,
-		     const Standard_Integer nF2,
-		     TColStd_ListOfInteger& aLNE,
-		     TopTools_ListOfShape& aLSE) ;
-  
-  Standard_EXPORT
-    void FuseVertices(const TopoDS_Shape& aC,
-		      TopTools_DataMapOfShapeShape& aDMVV) const;
-  
-  Standard_EXPORT
-    void TreatPaveBlocks(NMTTools_ListOfCommonBlock& theLCB) ;
-  
-  Standard_EXPORT
-    BOPTools_PavePool& ChangePavePoolNew() ;
-  
-  Standard_EXPORT
-    Standard_Boolean CheckCoincidence(const BOPTools_PaveBlock& aPB1,
-				      const BOPTools_PaveBlock& aPB2) ;
-  
-  Standard_EXPORT
-    void PutClosingPaveOnCurve(BOPTools_Curve& aBC,
-			       BOPTools_SSInterference& aFF) ;
-
- protected:
-  Standard_EXPORT   
-    virtual  void Init() ;
-
-  Standard_EXPORT   
-    virtual  void Clear() ;
-  
-  Standard_EXPORT
-    virtual  void PerformVV() ;
-  
-  Standard_EXPORT   
-    virtual  void PerformVE() ;
-  
-  Standard_EXPORT  
-    virtual  void PerformVF() ;
-  
-  Standard_EXPORT
-    virtual  void PerformEE() ;
-  
-  Standard_EXPORT
-    virtual  void PerformEF() ;
-  
-  Standard_EXPORT
-    virtual  void PerformFF() ;
-  
-  Standard_EXPORT
-    void MakeSplitEdges() ;
-  
-  Standard_EXPORT
-    virtual  void PreparePaveBlocks(const TopAbs_ShapeEnum aType1,
-				    const TopAbs_ShapeEnum aType2) ;
-  
-  Standard_EXPORT     
-    void CorrectShrunkRanges(const Standard_Integer aSide,
-			     const BOPTools_Pave& aPave,
-			     IntTools_ShrunkRange& aSR) ;
-  
-  Standard_EXPORT
-    virtual  void PreparePaveBlocks(const Standard_Integer anE) ;
-  
-  Standard_EXPORT   
-    virtual  void PrepareEdges() ;
-  
-  Standard_EXPORT
-    Standard_Boolean IsSuccessorsComputed(const Standard_Integer iF1,
-					  const Standard_Integer iF2) const;
-  
-  Standard_EXPORT     
-    Standard_Boolean IsBlocksCoinside(const BOPTools_PaveBlock& aPB1,
-				      const BOPTools_PaveBlock& aPB2) const;
-  
-  Standard_EXPORT     
-    void RefinePavePool() ;
-  
-  Standard_EXPORT    
-    Standard_Integer CheckFacePaves(const TopoDS_Vertex& aV,
-				    const Standard_Integer nF) ;
-  
-  Standard_EXPORT     
-    void ReplaceCommonBlocks(const NMTTools_ListOfCommonBlock& aLCB) ;
-  
-  Standard_EXPORT
-    void RemoveCommonBlocks(const NMTTools_ListOfCommonBlock& aLCB) ;
-  
-  Standard_EXPORT
-    void SplitCommonBlocks(const NMTTools_ListOfCommonBlock& aLCB) ;
-  
-  Standard_EXPORT
-    void SplitCommonBlock(const NMTTools_CommonBlock& aCB,NMTTools_ListOfCommonBlock& aLCB) ;
-  
-  Standard_EXPORT
-    void EECommonBlocks(const BOPTools_IDMapOfPaveBlockIMapOfPaveBlock& aM) ;
-  
-  Standard_EXPORT
-    void EFCommonBlocks(const BOPTools_IDMapOfPaveBlockIMapOfInteger& aMapCB) ;
-  
-  Standard_EXPORT
-    void EENewVertices(const BooleanOperations_IndexedDataMapOfShapeInteger& aM) ;
-  
-  Standard_EXPORT
-    void EENewVertices(const TopoDS_Vertex& aV,
-		       const BooleanOperations_IndexedDataMapOfShapeInteger& aM) ;
-  
-  Standard_EXPORT     
-    void EFNewVertices(const BooleanOperations_IndexedDataMapOfShapeInteger& aM) ;
-  
-  Standard_EXPORT
-     void EFNewVertices(const TopoDS_Vertex& aV,
-			const BooleanOperations_IndexedDataMapOfShapeInteger& aM) ;
-  
-  Standard_EXPORT     
-    void UpdateCommonBlocks() ;
-  
-  Standard_EXPORT
-    void UpdateCommonBlocks(const Standard_Integer aI) ;
-  
-  Standard_EXPORT
-    void UpdatePaveBlocks() ;
-  
-  Standard_EXPORT
-    Standard_Integer SplitIndex(const BOPTools_PaveBlock& aPB) const;
-  
-  Standard_EXPORT
-    void MakeBlocks() ;
-  
-  Standard_EXPORT
-    void PerformVF1() ;
-  
-  Standard_EXPORT
-    void MakeAloneVertices() ;
-  
-  Standard_EXPORT
-    void FillFaceInfo() ;
-  
-  Standard_EXPORT
-    void CorrectTolR3D(const BOPTools_SSInterference& aFF,
-		       const TColStd_MapOfInteger& aMVStick,
-		       Standard_Real& aTolR3D) ;
-
-
-  NMTDS_PShapesDataStructure myDS;
-  Standard_Boolean myIsDone;
-  Standard_Integer myNbSources;
-  Standard_Integer myNbEdges;
-  BOPTools_PavePool myPavePool;
-  BOPTools_PavePool myPavePoolNew;
-  NMTTools_CommonBlockPool myCommonBlockPool;
-  BOPTools_SplitShapesPool mySplitShapesPool;
-  Handle_IntTools_Context myContext;
-  BOPTools_SSIntersectionAttribute mySectionAttribute;
-  NMTTools_IndexedDataMapOfIndexedMapOfInteger myAloneVertices;
-  TColStd_DataMapOfIntegerInteger myVSD;
-  NMTDS_PIterator myDSIt;
-  TopoDS_Shape myCompositeShape;
-  NMTDS_PInterfPool myIP;
-  NMTTools_DataMapOfIntegerFaceInfo myFaceInfo;
-
-
-  // private:
-
-};
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File:        NMTTools_PaveFiller.hxx
+// Created:     Fri Dec  5 14:58:54 2003
+// Author:      Peter KURNEV
+//              <pkv@irinox>
+//
+#ifndef _NMTTools_PaveFiller_HeaderFile
+#define _NMTTools_PaveFiller_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Macro.hxx>
+#include <NMTDS_PShapesDataStructure.hxx>
+#include <Standard_Boolean.hxx>
+#include <Standard_Integer.hxx>
+#include <BOPTools_PavePool.hxx>
+#include <NMTTools_CommonBlockPool.hxx>
+#include <BOPTools_SplitShapesPool.hxx>
+#include <Handle_IntTools_Context.hxx>
+#include <BOPTools_SSIntersectionAttribute.hxx>
+#include <NMTTools_IndexedDataMapOfIndexedMapOfInteger.hxx>
+#include <TColStd_DataMapOfIntegerInteger.hxx>
+#include <NMTDS_PIterator.hxx>
+#include <TopoDS_Shape.hxx>
+#include <NMTDS_PInterfPool.hxx>
+#include <NMTTools_DataMapOfIntegerFaceInfo.hxx>
+#include <TopAbs_ShapeEnum.hxx>
+#include <NMTTools_CommonBlock.hxx>
+#include <Standard_Real.hxx>
+
+#include <TopoDS_Shape.hxx>
+#include <BOPTools_Pave.hxx>
+#include <IntTools_ShrunkRange.hxx>
+#include <BOPTools_PavePool.hxx>
+#include <NMTTools_CommonBlockPool.hxx>
+#include <BOPTools_SplitShapesPool.hxx>
+#include <BOPTools_PaveBlock.hxx>
+#include <TopoDS_Vertex.hxx>
+#include <NMTTools_ListOfCommonBlock.hxx>
+#include <BOPTools_IDMapOfPaveBlockIMapOfPaveBlock.hxx>
+#include <BOPTools_IDMapOfPaveBlockIMapOfInteger.hxx>
+#include <BooleanOperations_IndexedDataMapOfShapeInteger.hxx>
+#include <TColStd_ListOfInteger.hxx>
+#include <BOPTools_ListOfPaveBlock.hxx>
+#include <TopoDS_Face.hxx>
+#include <BOPTools_PaveSet.hxx>
+#include <BOPTools_Curve.hxx>
+#include <BOPTools_SSInterference.hxx>
+#include <gp_Pnt.hxx>
+#include <NMTTools_IndexedDataMapOfIndexedMapOfInteger.hxx>
+#include <TopTools_ListOfShape.hxx>
+#include <TopoDS_Edge.hxx>
+#include <TopTools_DataMapOfShapeShape.hxx>
+
+
+/*
+class TopoDS_Shape;
+class BOPTools_Pave;
+class IntTools_ShrunkRange;
+class BOPTools_PavePool;
+class NMTTools_CommonBlockPool;
+class BOPTools_SplitShapesPool;
+class BOPTools_PaveBlock;
+class TopoDS_Vertex;
+class NMTTools_ListOfCommonBlock;
+class BOPTools_IDMapOfPaveBlockIMapOfPaveBlock;
+class BOPTools_IDMapOfPaveBlockIMapOfInteger;
+class BooleanOperations_IndexedDataMapOfShapeInteger;
+class TColStd_ListOfInteger;
+class BOPTools_ListOfPaveBlock;
+class TopoDS_Face;
+class BOPTools_PaveSet;
+class BOPTools_Curve;
+class BOPTools_SSInterference;
+class gp_Pnt;
+class NMTTools_IndexedDataMapOfIndexedMapOfInteger;
+class TopTools_ListOfShape;
+class TopoDS_Edge;
+class TopTools_DataMapOfShapeShape;
+class TCoLSTD_MapOfInteger;
+*/
+
+
+//=======================================================================
+//function : NMTTools_PaveFiller
+//purpose  :
+//=======================================================================
+class NMTTools_PaveFiller  {
+ public:
+  Standard_EXPORT
+    NMTTools_PaveFiller();
+
+  Standard_EXPORT
+  virtual ~NMTTools_PaveFiller();
+
+  Standard_EXPORT
+    void SetCompositeShape(const TopoDS_Shape& aS) ;
+
+  Standard_EXPORT
+    const TopoDS_Shape& CompositeShape() const;
+
+  Standard_EXPORT
+    NMTDS_PShapesDataStructure DS() ;
+
+  Standard_EXPORT
+    NMTDS_PIterator DSIt() ;
+
+  Standard_EXPORT
+    NMTDS_PInterfPool IP() ;
+
+  Standard_EXPORT
+    virtual  void Perform() ;
+
+  Standard_EXPORT
+    Standard_Boolean IsDone() const;
+
+  Standard_EXPORT
+    const Handle_IntTools_Context& Context() const;
+
+  Standard_EXPORT
+    const BOPTools_PavePool& PavePool() const;
+
+  Standard_EXPORT
+    BOPTools_PavePool& ChangePavePool() ;
+
+  Standard_EXPORT
+    const NMTTools_CommonBlockPool& CommonBlockPool() const;
+
+  Standard_EXPORT
+    NMTTools_CommonBlockPool& ChangeCommonBlockPool() ;
+
+  Standard_EXPORT
+    const BOPTools_SplitShapesPool& SplitShapesPool() const;
+
+  Standard_EXPORT
+    BOPTools_SplitShapesPool& ChangeSplitShapesPool() ;
+
+  Standard_EXPORT
+    Standard_Integer FindSDVertex(const Standard_Integer nV) const;
+
+  Standard_EXPORT
+    Standard_Integer SplitsInFace(const Standard_Integer aBid,
+				  const Standard_Integer nF1,
+				  const Standard_Integer nF2,
+				  TColStd_ListOfInteger& aLs) ;
+
+  Standard_EXPORT
+    Standard_Integer SplitsInFace(const Standard_Integer nE1,
+				  const Standard_Integer nF2,
+				  TColStd_ListOfInteger& aLs) ;
+
+  Standard_EXPORT
+    Standard_Integer SplitsOnEdge(const Standard_Integer nE1,
+				  const Standard_Integer nE2,
+				  TColStd_ListOfInteger& aLs) ;
+
+  Standard_EXPORT
+    Standard_Integer SplitsOnFace(const Standard_Integer nE1,
+				  const Standard_Integer nF2,
+				  TColStd_ListOfInteger& aLs) ;
+
+  Standard_EXPORT
+    Standard_Integer SplitsOnFace(const Standard_Integer aBid,
+				  const Standard_Integer nF1,
+				  const Standard_Integer nF2,
+				  TColStd_ListOfInteger& aLs) ;
+
+  Standard_EXPORT
+    Standard_Integer SplitsInFace(const Standard_Integer aBid,
+				  const Standard_Integer nF1,
+				  const Standard_Integer nF2,
+				  BOPTools_ListOfPaveBlock& aLs) ;
+
+  Standard_EXPORT
+    Standard_Integer SplitsInFace(const Standard_Integer nE1,
+				  const Standard_Integer nF2,
+				  BOPTools_ListOfPaveBlock& aLs) ;
+
+  Standard_EXPORT
+    Standard_Integer SplitsOnEdge(const Standard_Integer nE1,
+				  const Standard_Integer nE2,
+				  BOPTools_ListOfPaveBlock& aLs) ;
+
+  Standard_EXPORT
+    Standard_Integer SplitsOnFace(const Standard_Integer nE1,
+				  const Standard_Integer nF2,
+				  BOPTools_ListOfPaveBlock& aLs) ;
+
+  Standard_EXPORT
+    Standard_Integer SplitsOnFace(const Standard_Integer aBid,
+				  const Standard_Integer nF1,
+				  const Standard_Integer nF2,
+				  BOPTools_ListOfPaveBlock& aLs) ;
+
+  Standard_EXPORT
+    Standard_Integer SplitsFace(const Standard_Integer nF2,
+				BOPTools_ListOfPaveBlock& aLs) ;
+
+  Standard_EXPORT
+    Standard_Integer SplitsFace(const Standard_Integer nF2,
+				TColStd_ListOfInteger& aLs) ;
+
+  Standard_EXPORT
+    Standard_Integer CommonBlocksFace(const Standard_Integer nF,
+				      NMTTools_ListOfCommonBlock& aLCB) ;
+
+  Standard_EXPORT
+    void PrepareFace(const Standard_Integer nF,
+		     TopoDS_Face& aF) ;
+
+  Standard_EXPORT
+    const BOPTools_PaveBlock& RealPaveBlock(const BOPTools_PaveBlock& aPB) ;
+
+  Standard_EXPORT
+    const BOPTools_PaveBlock& RealPaveBlock(const BOPTools_PaveBlock& aPB,
+					    TColStd_ListOfInteger& aLB,
+					    Standard_Integer& aIsCommonBlock) ;
+
+  Standard_EXPORT
+    void RealSplitsFace(const Standard_Integer nF2,
+			BOPTools_ListOfPaveBlock& aLs) ;
+
+  Standard_EXPORT
+    Standard_Boolean HasRealSplitsInOnFace(const Standard_Integer nF1,
+					   const Standard_Integer nF2) ;
+
+  Standard_EXPORT
+    void RealSplitsInFace(const Standard_Integer aBid,
+			  const Standard_Integer nF1,
+			  const Standard_Integer nF2,
+			  BOPTools_ListOfPaveBlock& aLs) ;
+
+  Standard_EXPORT
+    void RealSplitsInFace(const Standard_Integer nE1,
+			  const Standard_Integer nF2,
+			  BOPTools_ListOfPaveBlock& aLs) ;
+
+  Standard_EXPORT
+    void RealSplitsInFace(const Standard_Integer nF1,
+			  BOPTools_ListOfPaveBlock& aLPB) ;
+
+  Standard_EXPORT
+    void RealSplitsOnEdge(const Standard_Integer nE1,
+			  const Standard_Integer nE2,
+			  BOPTools_ListOfPaveBlock& aLs) ;
+
+  Standard_EXPORT
+    void RealSplitsOnFace(const Standard_Integer nE1,
+			  const Standard_Integer nF2,
+			  BOPTools_ListOfPaveBlock& aLs) ;
+
+  Standard_EXPORT
+    void RealSplitsOnFace(const Standard_Integer aBid,
+			  const Standard_Integer nF1,
+			  const Standard_Integer nF2,
+			  BOPTools_ListOfPaveBlock& aLs) ;
+
+  Standard_EXPORT
+    void PrepareSetForFace(const Standard_Integer nF1,
+			   const Standard_Integer nF2,
+			   const BOPTools_ListOfPaveBlock& aLPB,
+			   BOPTools_PaveSet& aPSF) ;
+
+  Standard_EXPORT
+    void PutPaveOnCurve(const BOPTools_PaveSet& aPSF,
+			const Standard_Real aTol,
+			BOPTools_Curve& aBC) ;
+
+  Standard_EXPORT
+    void PutBoundPaveOnCurve(BOPTools_Curve& aBC,
+			     BOPTools_SSInterference& aFF) ;
+
+  Standard_EXPORT
+    void PutBoundPaveOnCurve(const gp_Pnt& aP,
+			     const Standard_Real aT,
+			     BOPTools_Curve& aBC,
+			     BOPTools_SSInterference& aFF) ;
+
+  Standard_EXPORT
+    Standard_Boolean FindPave(const gp_Pnt& aP,
+			      const Standard_Real aTpV,
+			      const BOPTools_PaveSet& aPS,
+			      BOPTools_Pave& aPV) ;
+
+  Standard_EXPORT
+    Standard_Integer CheckIntermediatePoint(const BOPTools_PaveBlock& aPB,
+					    const BOPTools_PaveBlock& aPBR,
+					    const Standard_Real aTol) ;
+
+  Standard_EXPORT
+    Standard_Boolean IsExistingPaveBlock(const BOPTools_PaveBlock& aPB,
+					 const BOPTools_ListOfPaveBlock& aLPB,
+					 const Standard_Real aTol) ;
+
+  Standard_EXPORT
+    void MakePCurves() ;
+
+  Standard_EXPORT
+    const NMTTools_IndexedDataMapOfIndexedMapOfInteger& AloneVertices() const;
+
+  Standard_EXPORT
+    Standard_Boolean IsExistingPaveBlock(const BOPTools_PaveBlock& aPB,
+					 const TopTools_ListOfShape& aLPB,
+					 const Standard_Real aTol) ;
+
+  Standard_EXPORT
+    Standard_Boolean CheckCoincidence(const BOPTools_PaveBlock& aPB,
+				      const BOPTools_ListOfPaveBlock& aLPB) ;
+
+  Standard_EXPORT
+    Standard_Integer CheckIntermediatePoint(const BOPTools_PaveBlock& aPB,
+					    const TopoDS_Edge& aE,
+					    const Standard_Real aTol) ;
+
+  Standard_EXPORT
+    void SharedEdges(const Standard_Integer nF1,
+		     const Standard_Integer nF2,
+		     TColStd_ListOfInteger& aLNE,
+		     TopTools_ListOfShape& aLSE) ;
+
+  Standard_EXPORT
+    void FuseVertices(const TopoDS_Shape& aC,
+		      TopTools_DataMapOfShapeShape& aDMVV) const;
+
+  Standard_EXPORT
+    void TreatPaveBlocks(NMTTools_ListOfCommonBlock& theLCB) ;
+
+  Standard_EXPORT
+    BOPTools_PavePool& ChangePavePoolNew() ;
+
+  Standard_EXPORT
+    Standard_Boolean CheckCoincidence(const BOPTools_PaveBlock& aPB1,
+				      const BOPTools_PaveBlock& aPB2) ;
+
+  Standard_EXPORT
+    void PutClosingPaveOnCurve(BOPTools_Curve& aBC,
+			       BOPTools_SSInterference& aFF) ;
+
+ protected:
+  Standard_EXPORT
+    virtual  void Init() ;
+
+  Standard_EXPORT
+    virtual  void Clear() ;
+
+  Standard_EXPORT
+    virtual  void PerformVV() ;
+
+  Standard_EXPORT
+    virtual  void PerformVE() ;
+
+  Standard_EXPORT
+    virtual  void PerformVF() ;
+
+  Standard_EXPORT
+    virtual  void PerformEE() ;
+
+  Standard_EXPORT
+    virtual  void PerformEF() ;
+
+  Standard_EXPORT
+    virtual  void PerformFF() ;
+
+  Standard_EXPORT
+    void MakeSplitEdges() ;
+
+  Standard_EXPORT
+    virtual  void PreparePaveBlocks(const TopAbs_ShapeEnum aType1,
+				    const TopAbs_ShapeEnum aType2) ;
+
+  Standard_EXPORT
+    void CorrectShrunkRanges(const Standard_Integer aSide,
+			     const BOPTools_Pave& aPave,
+			     IntTools_ShrunkRange& aSR) ;
+
+  Standard_EXPORT
+    virtual  void PreparePaveBlocks(const Standard_Integer anE) ;
+
+  Standard_EXPORT
+    virtual  void PrepareEdges() ;
+
+  Standard_EXPORT
+    Standard_Boolean IsSuccessorsComputed(const Standard_Integer iF1,
+					  const Standard_Integer iF2) const;
+
+  Standard_EXPORT
+    Standard_Boolean IsBlocksCoinside(const BOPTools_PaveBlock& aPB1,
+				      const BOPTools_PaveBlock& aPB2) const;
+
+  Standard_EXPORT
+    void RefinePavePool() ;
+
+  Standard_EXPORT
+    Standard_Integer CheckFacePaves(const TopoDS_Vertex& aV,
+				    const Standard_Integer nF) ;
+
+  Standard_EXPORT
+    void ReplaceCommonBlocks(const NMTTools_ListOfCommonBlock& aLCB) ;
+
+  Standard_EXPORT
+    void RemoveCommonBlocks(const NMTTools_ListOfCommonBlock& aLCB) ;
+
+  Standard_EXPORT
+    void SplitCommonBlocks(const NMTTools_ListOfCommonBlock& aLCB) ;
+
+  Standard_EXPORT
+    void SplitCommonBlock(const NMTTools_CommonBlock& aCB,NMTTools_ListOfCommonBlock& aLCB) ;
+
+  Standard_EXPORT
+    void EECommonBlocks(const BOPTools_IDMapOfPaveBlockIMapOfPaveBlock& aM) ;
+
+  Standard_EXPORT
+    void EFCommonBlocks(const BOPTools_IDMapOfPaveBlockIMapOfInteger& aMapCB) ;
+
+  Standard_EXPORT
+    void EENewVertices(const BooleanOperations_IndexedDataMapOfShapeInteger& aM) ;
+
+  Standard_EXPORT
+    void EENewVertices(const TopoDS_Vertex& aV,
+		       const BooleanOperations_IndexedDataMapOfShapeInteger& aM) ;
+
+  Standard_EXPORT
+    void EFNewVertices(const BooleanOperations_IndexedDataMapOfShapeInteger& aM) ;
+
+  Standard_EXPORT
+     void EFNewVertices(const TopoDS_Vertex& aV,
+			const BooleanOperations_IndexedDataMapOfShapeInteger& aM) ;
+
+  Standard_EXPORT
+    void UpdateCommonBlocks() ;
+
+  Standard_EXPORT
+    void UpdateCommonBlocks(const Standard_Integer aI) ;
+
+  Standard_EXPORT
+    void UpdatePaveBlocks() ;
+
+  Standard_EXPORT
+    Standard_Integer SplitIndex(const BOPTools_PaveBlock& aPB) const;
+
+  Standard_EXPORT
+    void MakeBlocks() ;
+
+  Standard_EXPORT
+    void PerformVF1() ;
+
+  Standard_EXPORT
+    void MakeAloneVertices() ;
+
+  Standard_EXPORT
+    void FillFaceInfo() ;
+
+  Standard_EXPORT
+    void CorrectTolR3D(const BOPTools_SSInterference& aFF,
+		       const TColStd_MapOfInteger& aMVStick,
+		       Standard_Real& aTolR3D) ;
+
+
+  NMTDS_PShapesDataStructure myDS;
+  Standard_Boolean myIsDone;
+  Standard_Integer myNbSources;
+  Standard_Integer myNbEdges;
+  BOPTools_PavePool myPavePool;
+  BOPTools_PavePool myPavePoolNew;
+  NMTTools_CommonBlockPool myCommonBlockPool;
+  BOPTools_SplitShapesPool mySplitShapesPool;
+  Handle_IntTools_Context myContext;
+  BOPTools_SSIntersectionAttribute mySectionAttribute;
+  NMTTools_IndexedDataMapOfIndexedMapOfInteger myAloneVertices;
+  TColStd_DataMapOfIntegerInteger myVSD;
+  NMTDS_PIterator myDSIt;
+  TopoDS_Shape myCompositeShape;
+  NMTDS_PInterfPool myIP;
+  NMTTools_DataMapOfIntegerFaceInfo myFaceInfo;
+
+
+  // private:
+
+};
+#endif
diff --git a/src/NMTTools_NEW/NMTTools_PaveFiller_0.cxx b/src/NMTTools_NEW/NMTTools_PaveFiller_0.cxx
index 7d7834334..832b0b0f0 100644
--- a/src/NMTTools_NEW/NMTTools_PaveFiller_0.cxx
+++ b/src/NMTTools_NEW/NMTTools_PaveFiller_0.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -36,7 +36,7 @@
 
 //=======================================================================
 // function:IsSuccesstorsComputed
-// purpose: 
+// purpose:
 //=======================================================================
   Standard_Boolean NMTTools_PaveFiller::IsSuccessorsComputed(const Standard_Integer aN1,
                                                              const Standard_Integer aN2)const
@@ -59,7 +59,7 @@
   aNbS=aMSuc.Extent();
   for (i=1; i<=aNbS; ++i) {
     nSuc=aMSuc(i);
-    bComputed=myIP->Contains(n1, nSuc); 
+    bComputed=myIP->Contains(n1, nSuc);
     if (bComputed) {
       break;
     }
@@ -69,13 +69,13 @@
 /*
 //=======================================================================
 // function:  ExpectedPoolLength
-// purpose: 
+// purpose:
 //=======================================================================
   Standard_Integer NMTTools_PaveFiller::ExpectedPoolLength()const
 {
   Standard_Integer aNbIIs;
   Standard_Real aCfPredict=.5;
-  // Modified  Thu Sep 14 14:35:18 2006 
+  // Modified  Thu Sep 14 14:35:18 2006
   // Contribution of Samtech www.samcef.com BEGIN
   //const BOPTools_ListOfCoupleOfInteger& aLC=myDSIt.ListOfCouple();
   //aNbIIs=aLC.Extent();
@@ -87,18 +87,18 @@
   }
   //
   aNbIIs=(Standard_Integer) (aCfPredict*(Standard_Real)aNbIIs);
-  
+
   return aNbIIs;
 }
 */
 /*
 //=======================================================================
 //function : SortTypes
-//purpose  : 
+//purpose  :
 //=======================================================================
   void NMTTools_PaveFiller::SortTypes(Standard_Integer& theWhat,
-                                      Standard_Integer& theWith)const 
-{ 
+                                      Standard_Integer& theWith)const
+{
   Standard_Integer aWhat, aWith;
   Standard_Boolean aReverseFlag;
   TopAbs_ShapeEnum aType1, aType2;
@@ -114,7 +114,7 @@
   if (aType1==TopAbs_EDGE && aType2==TopAbs_FACE) {
     aReverseFlag=Standard_False;
   }
-  if (aType1==TopAbs_VERTEX && 
+  if (aType1==TopAbs_VERTEX &&
       (aType2==TopAbs_FACE || aType2==TopAbs_EDGE)) {
     aReverseFlag=Standard_False;
   }
diff --git a/src/NMTTools_NEW/NMTTools_PaveFiller_1.cxx b/src/NMTTools_NEW/NMTTools_PaveFiller_1.cxx
index c0d015fc6..0f566f218 100644
--- a/src/NMTTools_NEW/NMTTools_PaveFiller_1.cxx
+++ b/src/NMTTools_NEW/NMTTools_PaveFiller_1.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -51,9 +51,9 @@
 
 //=======================================================================
 // function: PerformVV
-// purpose: 
+// purpose:
 //=======================================================================
-  void NMTTools_PaveFiller::PerformVV() 
+  void NMTTools_PaveFiller::PerformVV()
 {
   myIsDone=Standard_False;
   //
@@ -131,7 +131,7 @@
           //
           BOPTools_VVInterference aVV(n1, n2);
           aVV.SetNewShape(nVnew);
-          aVVs.Append(aVV);    
+          aVVs.Append(aVV);
         }
       }
     }
@@ -140,7 +140,7 @@
 }
 //=======================================================================
 // function: FindSDVertex
-// purpose: 
+// purpose:
 //=======================================================================
   Standard_Integer NMTTools_PaveFiller::FindSDVertex(const Standard_Integer nV)const
 {
@@ -155,9 +155,9 @@
 /*
 //=======================================================================
 // function: PerformNewVertices
-// purpose: 
+// purpose:
 //=======================================================================
-  void NMTTools_PaveFiller::PerformNewVertices() 
+  void NMTTools_PaveFiller::PerformNewVertices()
 {
 }
 */
diff --git a/src/NMTTools_NEW/NMTTools_PaveFiller_2.cxx b/src/NMTTools_NEW/NMTTools_PaveFiller_2.cxx
index fb40db6a3..be0cbe728 100644
--- a/src/NMTTools_NEW/NMTTools_PaveFiller_2.cxx
+++ b/src/NMTTools_NEW/NMTTools_PaveFiller_2.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File:        NMTTools_PaveFiller_2.cxx
 // Created:     Mon Dec  8 12:02:56 2003
diff --git a/src/NMTTools_NEW/NMTTools_PaveFiller_3.cxx b/src/NMTTools_NEW/NMTTools_PaveFiller_3.cxx
index 460f72442..e1061d1e3 100644
--- a/src/NMTTools_NEW/NMTTools_PaveFiller_3.cxx
+++ b/src/NMTTools_NEW/NMTTools_PaveFiller_3.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -49,9 +49,9 @@ static
 
 //=======================================================================
 // function: PerformVF
-// purpose: 
+// purpose:
 //=======================================================================
-  void NMTTools_PaveFiller::PerformVF() 
+  void NMTTools_PaveFiller::PerformVF()
 {
   myIsDone=Standard_False;
   //
@@ -63,7 +63,7 @@ static
   //
   BOPTools_CArray1OfVSInterference& aVSs=myIP->VSInterferences();
   //
-  // V/E Interferences 
+  // V/E Interferences
   myDSIt->Initialize(TopAbs_VERTEX, TopAbs_FACE);
   //
   // BlockLength correction
@@ -98,7 +98,7 @@ static
         //
       aF2=TopoDS::Face(myDS->Shape(aWith));
       //
-      // Modified  Thu Sep 14 14:35:18 2006 
+      // Modified  Thu Sep 14 14:35:18 2006
       // Contribution of Samtech www.samcef.com BEGIN
       if (Contains(aF2, aV1)) {
         continue;
@@ -129,11 +129,11 @@ static
   }
   myIsDone=Standard_True;
 }
-// Modified  Thu Sep 14 14:35:18 2006 
+// Modified  Thu Sep 14 14:35:18 2006
 // Contribution of Samtech www.samcef.com BEGIN
 //=======================================================================
 //function : Contains
-//purpose  : 
+//purpose  :
 //=======================================================================
 Standard_Boolean Contains(const TopoDS_Face& aF,
                           const TopoDS_Vertex& aV)
diff --git a/src/NMTTools_NEW/NMTTools_PaveFiller_4.cxx b/src/NMTTools_NEW/NMTTools_PaveFiller_4.cxx
index acfc6efb2..188676c70 100644
--- a/src/NMTTools_NEW/NMTTools_PaveFiller_4.cxx
+++ b/src/NMTTools_NEW/NMTTools_PaveFiller_4.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/NMTTools_NEW/NMTTools_PaveFiller_5.cxx b/src/NMTTools_NEW/NMTTools_PaveFiller_5.cxx
index d42afcabb..a00a435d6 100644
--- a/src/NMTTools_NEW/NMTTools_PaveFiller_5.cxx
+++ b/src/NMTTools_NEW/NMTTools_PaveFiller_5.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -96,9 +96,9 @@ static
 //
 //=======================================================================
 // function: PerformEF
-// purpose: 
+// purpose:
 //=======================================================================
-  void NMTTools_PaveFiller::PerformEF() 
+  void NMTTools_PaveFiller::PerformEF()
 {
   Standard_Boolean bJustAdd;
   Standard_Integer n1, n2, anIndexIn, nE, nF, aNbEFs, aBlockLength;
@@ -132,10 +132,10 @@ static
     //
     anIndexIn = 0;
     //
-    nE=n1; 
+    nE=n1;
     nF=n2;
     if (myDS->GetShapeType(n2)==TopAbs_EDGE) {
-      nE=n2; 
+      nE=n2;
       nF=n1;
     }
     //
@@ -161,8 +161,8 @@ static
     //
     aTolF=BRep_Tool::Tolerance(aF);
     aTolE=BRep_Tool::Tolerance(aE);
-    
-    const Bnd_Box& aBBF=myDS->GetBoundingBox(nF); 
+
+    const Bnd_Box& aBBF=myDS->GetBoundingBox(nF);
     //
     // Process each PaveBlock on edge nE
     BOPTools_ListOfPaveBlock& aLPB=mySplitShapesPool(myDS->RefEdge(nE));
@@ -181,7 +181,7 @@ static
       if (aBBF.IsOut (aBBE)) {
         continue;
       }
-      // 
+      //
       // EF
       IntTools_EdgeFace aEF;
       aEF.SetEdge (aE);
@@ -190,12 +190,12 @@ static
       aEF.SetTolF (aTolF);
       aEF.SetDiscretize (aDiscretize);
       aEF.SetDeflection (aDeflection);
-      // 
+      //
       aEF.SetContext(myContext);
-      // 
+      //
       IntTools_Range anewSR = aSR;
-      // 
-      // Correction of the Shrunk Range 
+      //
+      // Correction of the Shrunk Range
       BOPTools_Tools::CorrectRange(aE, aF, aSR, anewSR);
       aEF.SetRange (anewSR);
       //
@@ -220,7 +220,7 @@ static
             case TopAbs_VERTEX:  {
               Standard_Boolean bIsOnPave1, bIsOnPave2;
               Standard_Integer nVF;
-              Standard_Real aT, aTolToDecide; 
+              Standard_Real aT, aTolToDecide;
               TopoDS_Vertex aNewVertex;
               //
               const IntTools_Range& aR=aCPart.Range1();
@@ -231,8 +231,8 @@ static
               //
               //decide to add pave or not
               aTolToDecide=5.e-8;
-              bIsOnPave1=IsOnPave(anewSR.First(), aR, aTolToDecide); 
-              bIsOnPave2=IsOnPave(anewSR.Last() , aR, aTolToDecide); 
+              bIsOnPave1=IsOnPave(anewSR.First(), aR, aTolToDecide);
+              bIsOnPave2=IsOnPave(anewSR.Last() , aR, aTolToDecide);
               //
               if (!bIsOnPave1 && !bIsOnPave2) {
                 nVF=CheckFacePaves(aNewVertex, nF);
@@ -249,7 +249,7 @@ static
                   myIP->Add(nE, nF, Standard_True, NMTDS_TI_EF);
                   //
                 }// if (!nVF)
-              }// if (!bIsOnPave1 && !bIsOnPave2) 
+              }// if (!bIsOnPave1 && !bIsOnPave2)
               //
               //modified by NIZNHY-PKV Fri Apr 18 10:55:38 2008f
               else {
@@ -287,16 +287,16 @@ static
 
             default:
               break;
-          } // switch (aType) 
-        } // for (i=1; i<=aNbCPrts; i++) 
+          } // switch (aType)
+        } // for (i=1; i<=aNbCPrts; i++)
       } //if (aEF.IsDone())
-    } // for (; anIt.More(); anIt.Next()) 
-  }// for (; myDSIt.More(); myDSIt.Next()) 
+    } // for (; anIt.More(); anIt.Next())
+  }// for (; myDSIt.More(); myDSIt.Next())
   //
   // Treat New vertices
   EFNewVertices(aMapVI);
   //
-  // Add draft Common Blocks of EF type 
+  // Add draft Common Blocks of EF type
   EFCommonBlocks(aMapCB);
   //
   // Collect all CB we suspected to split by new vertices
@@ -333,7 +333,7 @@ static
 }
 //=======================================================================
 // function:EFCommonBlocks
-// purpose: 
+// purpose:
 //=======================================================================
   void NMTTools_PaveFiller::EFCommonBlocks
     (const BOPTools_IDMapOfPaveBlockIMapOfInteger& aMapCB)
@@ -372,10 +372,10 @@ static
 }
 //=======================================================================
 // function:EFNewVertices
-// purpose: 
+// purpose:
 //=======================================================================
-  void NMTTools_PaveFiller::EFNewVertices 
-    (const BooleanOperations_IndexedDataMapOfShapeInteger& aMapVI) 
+  void NMTTools_PaveFiller::EFNewVertices
+    (const BooleanOperations_IndexedDataMapOfShapeInteger& aMapVI)
 {
   Standard_Integer i, j, aNb, aNewShape, aFlag, iX, aNbVV, aNbSimple;
   Standard_Integer aWhat, aWith, nE, nF, nV, aNbIEF, aNbEdges, iTmp;
@@ -389,7 +389,7 @@ static
   TopTools_IndexedMapOfShape aMNVComplex, aMNVSimple;
   //
   aNb=aMapVI.Extent();
-  if (!aNb) { // no new vertices, no new problems 
+  if (!aNb) { // no new vertices, no new problems
     return;
   }
   //
@@ -409,7 +409,7 @@ static
     aBB.Add(aCompound, aV);
   }
   //
-  // 2. VV intersection between these vertices 
+  // 2. VV intersection between these vertices
   //       using the auxiliary Filler
   NMTTools_PaveFiller tPF;
   //
@@ -447,7 +447,7 @@ static
     EFNewVertices(aV, aMapVI);
   }
   //
-  // 3. Fill Maps : NewVertex-edges (aMNVE) 
+  // 3. Fill Maps : NewVertex-edges (aMNVE)
   //                NewVertex-interferences (aMNVIEE)
   aNb=aVVInterfs.Extent();
   for (i=1; i<=aNb; ++i) {
@@ -519,8 +519,8 @@ static
       BOPTools_ESInterference& aEF=aEFs(iX);
       aEF.SetNewShape(aNewShape);
     }
-    // 
-    // Update Paves on all edges 
+    //
+    // Update Paves on all edges
     const TColStd_IndexedMapOfInteger& aME=aMNVE(i);
     aNbEdges=aME.Extent();
     for (j=1; j<=aNbEdges; ++j) {
@@ -543,11 +543,11 @@ static
 }
 //=======================================================================
 // function:EFNewVertices
-// purpose: 
+// purpose:
 //=======================================================================
-  void NMTTools_PaveFiller::EFNewVertices 
+  void NMTTools_PaveFiller::EFNewVertices
     (const TopoDS_Vertex& aNewVertex,
-     const BooleanOperations_IndexedDataMapOfShapeInteger& aMapVI) 
+     const BooleanOperations_IndexedDataMapOfShapeInteger& aMapVI)
 {
   Standard_Integer i, aNewShape, nE, nF;
   Standard_Real aT;
@@ -585,9 +585,9 @@ static
 }
 //=======================================================================
 // function: CheckFacePaves
-// purpose: 
+// purpose:
 //=======================================================================
-  Standard_Integer NMTTools_PaveFiller::CheckFacePaves 
+  Standard_Integer NMTTools_PaveFiller::CheckFacePaves
     (const TopoDS_Vertex& aNewVertex,
      const Standard_Integer nF)
 {
@@ -595,7 +595,7 @@ static
   BOPTools_ListIteratorOfListOfPave anIt;
   TColStd_IndexedMapOfInteger aMVF;
   //
-  iRet=0; 
+  iRet=0;
   //
   BooleanOperations_OnceExplorer aExp(*myDS);
   aExp.Init(nF, TopAbs_EDGE);
@@ -625,7 +625,7 @@ static
 //
 //=======================================================================
 // function: VertexParameter
-// purpose: 
+// purpose:
 //=======================================================================
 void VertexParameter(const IntTools_CommonPrt& aCPart,
                      Standard_Real& aT)
@@ -639,7 +639,7 @@ void VertexParameter(const IntTools_CommonPrt& aCPart,
 }
 //=======================================================================
 // function: IsOnPave
-// purpose: 
+// purpose:
 //=======================================================================
 Standard_Boolean IsOnPave(const Standard_Real& aTR,
                           const IntTools_Range& aCPRange,
@@ -655,7 +655,7 @@ Standard_Boolean IsOnPave(const Standard_Real& aTR,
     return bIsOnPave;
   }
   //
-  dT1=Abs(aTR-aT1);  
+  dT1=Abs(aTR-aT1);
   dT2=Abs(aTR-aT2);
   bIsOnPave=(dT1<=aTolerance || dT2<=aTolerance);
   return bIsOnPave;
diff --git a/src/NMTTools_NEW/NMTTools_PaveFiller_6.cxx b/src/NMTTools_NEW/NMTTools_PaveFiller_6.cxx
index 96efa6914..3f897dedd 100644
--- a/src/NMTTools_NEW/NMTTools_PaveFiller_6.cxx
+++ b/src/NMTTools_NEW/NMTTools_PaveFiller_6.cxx
@@ -1,23 +1,23 @@
-//  Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License.
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
 //
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
 //
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //  File:        NMTTools_PaveFiller_6.cxx
 //  Created:     Fri Dec 19 10:27:31 2003
@@ -243,7 +243,7 @@ void NMTTools_PaveFiller::MakeBlocks()
   //
   BOPTools_CArray1OfSSInterference& aFFs=myIP->SSInterferences();
   //
-  
+
   //
   // 1. Make Section Edges from intersection curves
   //    between each pair of faces
@@ -1289,14 +1289,14 @@ void NMTTools_PaveFiller::PutPaveOnCurve(const BOPTools_PaveSet& aPaveSet,
 //
 //=======================================================================
 //function : FillFaceInfo
-//purpose  : 
+//purpose  :
 //=======================================================================
 void NMTTools_PaveFiller::FillFaceInfo()
 {
   Standard_Integer i, aNbS, aNbFFs, nF, aNbVFs, aNbEFs, j, n1, n2, nX, aNbF;
   TopAbs_ShapeEnum aType;
   TopoDS_Shape aS;
-  TColStd_ListIteratorOfListOfInteger aItF; 
+  TColStd_ListIteratorOfListOfInteger aItF;
   BOPTools_ListIteratorOfListOfPaveBlock anItPB;
   NMTTools_DataMapIteratorOfDataMapOfIntegerFaceInfo aItMFI;
   NMTTools_ListIteratorOfListOfCommonBlock aItCB;
@@ -1437,19 +1437,19 @@ void NMTTools_PaveFiller::FillFaceInfo()
 //=======================================================================
 //function : CorrectTolR3D
 //purpose  : Attempt to correct the value of tolerance aTolR3D for
-//           the intersection curve in order to 
+//           the intersection curve in order to
 //           compel it to pass through the sticks.
-//           Prerequisites: 
+//           Prerequisites:
 //             2. The are based on B-Spline surfaces;
 //             1. There is at least the one intersection curve;
 //             2. The faces have stick vertices to catch the curve;
 //             3. The intersection angle is rather small (0.7-7 deg)
-//              
+//
 //=======================================================================
 void NMTTools_PaveFiller::CorrectTolR3D(const BOPTools_SSInterference& aFF,
 					const TColStd_MapOfInteger& aMVStick,
 					Standard_Real& aTolR3D)
-     
+
 {
   Standard_Boolean bHasBounds;
   Standard_Integer i, nF[2], nV, aNbCurves;
@@ -1531,7 +1531,7 @@ void NMTTools_PaveFiller::CorrectTolR3D(const BOPTools_SSInterference& aFF,
     }
   }
   //
-  
+
   aTolR=aTolVmax/aA;
   if (aTolR<aTolTresh) {
     aTolR3D=aTolR;
@@ -1550,7 +1550,7 @@ void NMTTools_PaveFiller::PutClosingPaveOnCurve(BOPTools_Curve& aBC,
   Standard_Boolean bIsClosed, bHasBounds, bAdded;
   Standard_Integer nVC, j;
   Standard_Real aT[2], aTolR3D, aTC, dT, aTx;
-  gp_Pnt aP[2] ; 
+  gp_Pnt aP[2] ;
   BOPTools_Pave aPVx;
   BOPTools_ListIteratorOfListOfPave aItLP;
   //
@@ -1569,7 +1569,7 @@ void NMTTools_PaveFiller::PutClosingPaveOnCurve(BOPTools_Curve& aBC,
   if (!bHasBounds){
     return;
   }
-  // 
+  //
   bAdded=Standard_False;
   dT=Precision::PConfusion();
   aTolR3D=aFFi.TolR3D();
diff --git a/src/NMTTools_NEW/NMTTools_PaveFiller_7.cxx b/src/NMTTools_NEW/NMTTools_PaveFiller_7.cxx
index 8386a9fd6..a365d7a73 100644
--- a/src/NMTTools_NEW/NMTTools_PaveFiller_7.cxx
+++ b/src/NMTTools_NEW/NMTTools_PaveFiller_7.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File:        NMTTools_PaveFiller_7.cxx
 // Author:      Peter KURNEV
diff --git a/src/NMTTools_NEW/NMTTools_PaveFiller_8.cxx b/src/NMTTools_NEW/NMTTools_PaveFiller_8.cxx
index 48331d5d4..305f04ca1 100644
--- a/src/NMTTools_NEW/NMTTools_PaveFiller_8.cxx
+++ b/src/NMTTools_NEW/NMTTools_PaveFiller_8.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -48,7 +48,7 @@
 #include <NMTTools_CommonBlockAPI.hxx>
 
 
-// Modified  to add new method Thu Sep 14 14:35:18 2006 
+// Modified  to add new method Thu Sep 14 14:35:18 2006
 // Contribution of Samtech www.samcef.com BEGIN
 //=======================================================================
 // function:  SharedEdges
@@ -70,7 +70,7 @@
     nE1=aExp.Current();
     aM1.Add(nE1);
   }
-  
+
   aExp.Init(nF2, TopAbs_EDGE);
   for (; aExp.More(); aExp.Next()) {
     nE2=aExp.Current();
@@ -103,7 +103,7 @@
   if (aCBAPI.IsCommonBlock(aPB)) {
     NMTTools_CommonBlock& aCB=aCBAPI.CommonBlock(aPB);
     //
-    aIsCommonBlock=1;   
+    aIsCommonBlock=1;
     //
     const BOPTools_ListOfPaveBlock& aLPBx=aCB.PaveBlocks();
     aItPBx.Initialize(aLPBx);
@@ -690,13 +690,13 @@
   return 0; //Ok
 }
 //modified by NIZNHY-PKV Mon Oct 17 12:07:48 2011f
-static 
+static
   void SortPaveBlocks(BOPTools_ListOfPaveBlock &);
 static
-  void SortShell(const Standard_Integer, 
+  void SortShell(const Standard_Integer,
 		 BOPTools_PaveBlock *);
 static
-  Standard_Boolean Less(const BOPTools_PaveBlock &, 
+  Standard_Boolean Less(const BOPTools_PaveBlock &,
 			const BOPTools_PaveBlock &);
 
 //=======================================================================
@@ -707,7 +707,7 @@ static
                                              BOPTools_ListOfPaveBlock& aLPBIn)
 {
   Standard_Integer j, aNbCBP, nSpIn;
-  TColStd_MapOfInteger aMFence; 
+  TColStd_MapOfInteger aMFence;
   BOPTools_ListOfPaveBlock aLPB;
   BOPTools_ListIteratorOfListOfPaveBlock aItPB;
   NMTTools_ListIteratorOfListOfCommonBlock aItCB;
@@ -772,10 +772,10 @@ void SortPaveBlocks(BOPTools_ListOfPaveBlock &aLPBIn)
 }
 //=======================================================================
 //function : SortShell
-//purpose  : 
+//purpose  :
 //=======================================================================
-void SortShell(const Standard_Integer n, 
-	       BOPTools_PaveBlock *a) 
+void SortShell(const Standard_Integer n,
+	       BOPTools_PaveBlock *a)
 {
   Standard_Integer nd, i, j, l, d=1;
   BOPTools_PaveBlock x;
@@ -800,15 +800,15 @@ void SortShell(const Standard_Integer n,
 	j-=d;
 	if (j > -1) goto m30;
       }//if (a[l] < a[j]){
-    }//for (i=0; i<nd; ++i) 
+    }//for (i=0; i<nd; ++i)
   }//while (1)
 }
 
 //=======================================================================
 //function : Less
-//purpose  : 
+//purpose  :
 //=======================================================================
-Standard_Boolean Less(const BOPTools_PaveBlock &aPB1, 
+Standard_Boolean Less(const BOPTools_PaveBlock &aPB1,
 		      const BOPTools_PaveBlock &aPB2)
 {
   Standard_Boolean bRet;
diff --git a/src/NMTTools_NEW/NMTTools_PaveFiller_9.cxx b/src/NMTTools_NEW/NMTTools_PaveFiller_9.cxx
index f1f97e387..6781bc68a 100644
--- a/src/NMTTools_NEW/NMTTools_PaveFiller_9.cxx
+++ b/src/NMTTools_NEW/NMTTools_PaveFiller_9.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -56,9 +56,9 @@
 
 //=======================================================================
 // function: PrepareFace
-// purpose: 
+// purpose:
 //=======================================================================
-  void NMTTools_PaveFiller::PrepareFace(const Standard_Integer nF, 
+  void NMTTools_PaveFiller::PrepareFace(const Standard_Integer nF,
                                         TopoDS_Face& newFace)
 {
   Standard_Boolean bToReverse, bIsDegenerated;
diff --git a/src/NMTTools_NEW/NMTTools_Tools.cxx b/src/NMTTools_NEW/NMTTools_Tools.cxx
index 9b1f6ceae..7d06d68c1 100644
--- a/src/NMTTools_NEW/NMTTools_Tools.cxx
+++ b/src/NMTTools_NEW/NMTTools_Tools.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -74,7 +74,7 @@
 #include <TopTools_MapIteratorOfMapOfShape.hxx>
 #include <TopoDS_Iterator.hxx>
 
-static 
+static
   void ProcessBlock(const Standard_Integer iV,
                     const BOPTColStd_IndexedDataMapOfIntegerIndexedMapOfInteger& aMCV,
                     TColStd_IndexedMapOfInteger& aProcessed,
@@ -88,11 +88,11 @@ static
 //modified by NIZNHY-PKV Thu Nov 16 10:46:53 2006f SKL/PartC5
 //=======================================================================
 // function: UpdateEdge
-// purpose: 
+// purpose:
 //=======================================================================
   void  NMTTools_Tools::UpdateEdge(const TopoDS_Edge& aE,
                                    const Standard_Real aTolR)
-{ 
+{
   Standard_Real aTolE, aTolES, aTolV;
   TopoDS_Iterator aIt;
   BRep_Builder aBB;
@@ -112,12 +112,12 @@ static
 }
 //=======================================================================
 // function: MakePCurve
-// purpose: 
+// purpose:
 //=======================================================================
   void  NMTTools_Tools::MakePCurve(const TopoDS_Edge& aE,
                                     const TopoDS_Face& aF,
                                     const Handle(Geom2d_Curve)& aC2Dx1)
-                                    
+
 {
   Standard_Real aTolE, aT1, aT2, aOutFirst, aOutLast, aOutTol;
   Handle(Geom2d_Curve) aC2D, aC2DA;
@@ -139,10 +139,10 @@ static
   }
   //
   if (aC3DE->IsPeriodic()) {
-    BOPTools_Tools2D::AdjustPCurveOnFace(aFFWD, aT1, aT2,  aC2D, aC2DA); 
+    BOPTools_Tools2D::AdjustPCurveOnFace(aFFWD, aT1, aT2,  aC2D, aC2DA);
   }
   else {
-    BOPTools_Tools2D::AdjustPCurveOnFace(aFFWD, aC3DETrim, aC2D, aC2DA); 
+    BOPTools_Tools2D::AdjustPCurveOnFace(aFFWD, aC3DETrim, aC2D, aC2DA);
   }
   //
   aBB.UpdateEdge(aE, aC2DA, aFFWD, aTolE);
@@ -151,14 +151,14 @@ static
 /*
 //=======================================================================
 // function: MakePCurve
-// purpose: 
+// purpose:
 //=======================================================================
   void  NMTTools_Tools::MakePCurve(const TopoDS_Edge& aE,
                                    const TopoDS_Face& aF,
                                    const Handle(Geom2d_Curve)& aC2Dx,
                                    const Standard_Real aTolR2D)
 {
-  Standard_Integer k, aNbV;   
+  Standard_Integer k, aNbV;
   Standard_Real aTolEdge, aTolFact, aTolV, aTolVmax;
   Standard_Real aTFirst, aTLast, aOutFirst, aOutLast, aOutTol;
   TopoDS_Face aFFWD;
@@ -198,20 +198,20 @@ static
     BOPTools_Tools2D::CurveOnSurface(aE, aFFWD, aC2D, aOutFirst, aOutLast, aOutTol, Standard_True);
   }
   if (aC3DE->IsPeriodic()) {
-    BOPTools_Tools2D::AdjustPCurveOnFace(aFFWD, aTFirst, aTLast,  aC2D, aC2DA); 
+    BOPTools_Tools2D::AdjustPCurveOnFace(aFFWD, aTFirst, aTLast,  aC2D, aC2DA);
   }
   else {
-    BOPTools_Tools2D::AdjustPCurveOnFace(aFFWD, aC3DETrim, aC2D, aC2DA); 
+    BOPTools_Tools2D::AdjustPCurveOnFace(aFFWD, aC3DETrim, aC2D, aC2DA);
   }
   //
   aBB.UpdateEdge(aE, aC2DA, aFFWD, aTolFact);
   BRepLib::SameParameter(aE);
 }
 */
-//modified by NIZNHY-PKV Thu Nov 16 10:46:55 2006t 
+//modified by NIZNHY-PKV Thu Nov 16 10:46:55 2006t
 //=======================================================================
 // function: IsSplitInOnFace
-// purpose: 
+// purpose:
 //=======================================================================
   Standard_Boolean NMTTools_Tools::IsSplitInOnFace(const TopoDS_Edge& aE,
                                                    const TopoDS_Face& aF,
@@ -250,7 +250,7 @@ static
 }
 //=======================================================================
 // function: NMTTools_Tools::MakeNewVertex
-// purpose : 
+// purpose :
 //=======================================================================
   void NMTTools_Tools::MakeNewVertex(const TopTools_ListOfShape& aLVs,
                                      TopoDS_Vertex& aNewVertex)
@@ -293,7 +293,7 @@ static
 }
 //=======================================================================
 // function: FindChains
-// purpose : 
+// purpose :
 //=======================================================================
   void NMTTools_Tools::FindChains(const BOPTools_CArray1OfSSInterference& FFs,
                                   BOPTColStd_IndexedDataMapOfIntegerIndexedMapOfInteger& aMapChains)
@@ -341,7 +341,7 @@ static
 }
 //=======================================================================
 // function: FindChains
-// purpose : 
+// purpose :
 //=======================================================================
   void NMTTools_Tools::FindChains(const BOPTools_CArray1OfVVInterference& VVs,
                                   BOPTColStd_IndexedDataMapOfIntegerIndexedMapOfInteger& aMapChains)
@@ -383,7 +383,7 @@ static
 
 //=======================================================================
 // function: FindChains
-// purpose : 
+// purpose :
 //=======================================================================
   void NMTTools_Tools::FindChains(const BOPTColStd_IndexedDataMapOfIntegerIndexedMapOfInteger& aMCV,
                                   BOPTColStd_IndexedDataMapOfIntegerIndexedMapOfInteger& aMapChains)
@@ -413,7 +413,7 @@ static
 }
 //=======================================================================
 // function: ProcessBlock
-// purpose: 
+// purpose:
 //=======================================================================
 void ProcessBlock(const Standard_Integer iV,
                   const BOPTColStd_IndexedDataMapOfIntegerIndexedMapOfInteger& aMCV,
@@ -437,14 +437,14 @@ void ProcessBlock(const Standard_Integer iV,
 }
 //=======================================================================
 // function: AreFacesSameDomain
-// purpose : 
+// purpose :
 //=======================================================================
   Standard_Boolean NMTTools_Tools::AreFacesSameDomain(const TopoDS_Face& aF1x,
                                                       const TopoDS_Face& aF2y,
                                                       const Handle(IntTools_Context)& aCtx)
 {
   Standard_Boolean bFlag;
-  // Modified  Thu Sep 14 14:35:18 2006 
+  // Modified  Thu Sep 14 14:35:18 2006
   // Contribution of Samtech www.samcef.com BEGIN
   Standard_Integer aNbE1, aNbE2;
   Standard_Real aTolF1, aTolF2, aTol;
@@ -463,7 +463,7 @@ void ProcessBlock(const Standard_Integer iV,
   aF2=aF2y;
   aF2.Orientation(TopAbs_FORWARD);
   //
-  // Modified  Thu Sep 14 14:35:18 2006 
+  // Modified  Thu Sep 14 14:35:18 2006
   // Contribution of Samtech www.samcef.com BEGIN
   //
   // 1
@@ -516,12 +516,12 @@ void ProcessBlock(const Standard_Integer iV,
 }
 //=======================================================================
 // function: FindChains
-// purpose : 
+// purpose :
 //=======================================================================
   void NMTTools_Tools::FindChains(const NMTTools_ListOfCoupleOfShape& aLCS,
                                   NMTTools_IndexedDataMapOfShapeIndexedMapOfShape& aMapChains)
 {
-  NMTTools_ListIteratorOfListOfCoupleOfShape aItCS; 
+  NMTTools_ListIteratorOfListOfCoupleOfShape aItCS;
   NMTTools_IndexedDataMapOfShapeIndexedMapOfShape aMCV;
   //
   aItCS.Initialize(aLCS);
@@ -560,7 +560,7 @@ void ProcessBlock(const Standard_Integer iV,
 }
 //=======================================================================
 // function: FindChains
-// purpose : 
+// purpose :
 //=======================================================================
   void NMTTools_Tools::FindChains(const NMTTools_IndexedDataMapOfShapeIndexedMapOfShape& aMCV,
                                   NMTTools_IndexedDataMapOfShapeIndexedMapOfShape& aMapChains)
@@ -590,7 +590,7 @@ void ProcessBlock(const Standard_Integer iV,
 }
 //=======================================================================
 // function: ProcessBlock
-// purpose: 
+// purpose:
 //=======================================================================
 void ProcessBlock(const TopoDS_Shape& aF,
                   const NMTTools_IndexedDataMapOfShapeIndexedMapOfShape& aMCV,
diff --git a/src/NMTTools_NEW/NMTTools_Tools.hxx b/src/NMTTools_NEW/NMTTools_Tools.hxx
index f63a65281..6be0cc1a8 100644
--- a/src/NMTTools_NEW/NMTTools_Tools.hxx
+++ b/src/NMTTools_NEW/NMTTools_Tools.hxx
@@ -1,99 +1,99 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-
-// File:        NMTTools_Tools.hxx
-// Created:     Mon Dec  8 10:35:15 2003
-// Author:      Peter KURNEV
-//              <pkv@irinox>
-
-#ifndef _NMTTools_Tools_HeaderFile
-#define _NMTTools_Tools_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_Macro.hxx>
-#include <Standard_Boolean.hxx>
-#include <Handle_IntTools_Context.hxx>
-#include <Handle_Geom2d_Curve.hxx>
-#include <Standard_Real.hxx>
-#include <TopTools_ListOfShape.hxx>
-#include <TopoDS_Vertex.hxx>
-#include <BOPTools_CArray1OfVVInterference.hxx>
-#include <BOPTColStd_IndexedDataMapOfIntegerIndexedMapOfInteger.hxx>
-#include <BOPTools_CArray1OfSSInterference.hxx>
-#include <TopoDS_Edge.hxx>
-#include <TopoDS_Face.hxx>
-#include <IntTools_Context.hxx>
-#include <NMTTools_ListOfCoupleOfShape.hxx>
-#include <NMTTools_IndexedDataMapOfShapeIndexedMapOfShape.hxx>
-#include <Geom2d_Curve.hxx>
-
-//=======================================================================
-//function : NMTTools_Tools
-//purpose  : 
-//=======================================================================
-class NMTTools_Tools  {
- public:
-  Standard_EXPORT
-    static  void MakeNewVertex(const TopTools_ListOfShape& aLV,
-			       TopoDS_Vertex& aNewVertex) ;
-  
-  Standard_EXPORT
-    static  void FindChains(const BOPTools_CArray1OfVVInterference& aVVs,
-			    BOPTColStd_IndexedDataMapOfIntegerIndexedMapOfInteger& aMCX) ;
-  
-  Standard_EXPORT   
-    static  void FindChains(const BOPTools_CArray1OfSSInterference& aVVs,
-			    BOPTColStd_IndexedDataMapOfIntegerIndexedMapOfInteger& aMCX) ;
-  
-  Standard_EXPORT   
-    static  void FindChains(const BOPTColStd_IndexedDataMapOfIntegerIndexedMapOfInteger& aMCV,
-			    BOPTColStd_IndexedDataMapOfIntegerIndexedMapOfInteger& aMCX) ;
-  
-  Standard_EXPORT   
-    static  Standard_Boolean IsSplitInOnFace(const TopoDS_Edge& aE,
-					     const TopoDS_Face& aF,
-					     const Handle(IntTools_Context)& aCtx) ;
-  
-  Standard_EXPORT
-    static  Standard_Boolean AreFacesSameDomain(const TopoDS_Face& aF1,
-						const TopoDS_Face& aF2,
-						const Handle(IntTools_Context)& aCtx) ;
-  
-  Standard_EXPORT   
-    static  void FindChains(const NMTTools_ListOfCoupleOfShape& aLCS,
-			    NMTTools_IndexedDataMapOfShapeIndexedMapOfShape& aM) ;
-  
-  Standard_EXPORT   
-    static  void FindChains(const NMTTools_IndexedDataMapOfShapeIndexedMapOfShape& aM1,
-			    NMTTools_IndexedDataMapOfShapeIndexedMapOfShape& aM2) ;
-  
-  Standard_EXPORT
-    static  void MakePCurve(const TopoDS_Edge& aE,
-			    const TopoDS_Face& aF,
-			    const Handle(Geom2d_Curve)& aC2D) ;
-  
-  Standard_EXPORT   
-    static  void UpdateEdge(const TopoDS_Edge& aE,
-			    const Standard_Real aTol) ;
-
-};
-#endif
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File:        NMTTools_Tools.hxx
+// Created:     Mon Dec  8 10:35:15 2003
+// Author:      Peter KURNEV
+//              <pkv@irinox>
+
+#ifndef _NMTTools_Tools_HeaderFile
+#define _NMTTools_Tools_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Macro.hxx>
+#include <Standard_Boolean.hxx>
+#include <Handle_IntTools_Context.hxx>
+#include <Handle_Geom2d_Curve.hxx>
+#include <Standard_Real.hxx>
+#include <TopTools_ListOfShape.hxx>
+#include <TopoDS_Vertex.hxx>
+#include <BOPTools_CArray1OfVVInterference.hxx>
+#include <BOPTColStd_IndexedDataMapOfIntegerIndexedMapOfInteger.hxx>
+#include <BOPTools_CArray1OfSSInterference.hxx>
+#include <TopoDS_Edge.hxx>
+#include <TopoDS_Face.hxx>
+#include <IntTools_Context.hxx>
+#include <NMTTools_ListOfCoupleOfShape.hxx>
+#include <NMTTools_IndexedDataMapOfShapeIndexedMapOfShape.hxx>
+#include <Geom2d_Curve.hxx>
+
+//=======================================================================
+//function : NMTTools_Tools
+//purpose  :
+//=======================================================================
+class NMTTools_Tools  {
+ public:
+  Standard_EXPORT
+    static  void MakeNewVertex(const TopTools_ListOfShape& aLV,
+			       TopoDS_Vertex& aNewVertex) ;
+
+  Standard_EXPORT
+    static  void FindChains(const BOPTools_CArray1OfVVInterference& aVVs,
+			    BOPTColStd_IndexedDataMapOfIntegerIndexedMapOfInteger& aMCX) ;
+
+  Standard_EXPORT
+    static  void FindChains(const BOPTools_CArray1OfSSInterference& aVVs,
+			    BOPTColStd_IndexedDataMapOfIntegerIndexedMapOfInteger& aMCX) ;
+
+  Standard_EXPORT
+    static  void FindChains(const BOPTColStd_IndexedDataMapOfIntegerIndexedMapOfInteger& aMCV,
+			    BOPTColStd_IndexedDataMapOfIntegerIndexedMapOfInteger& aMCX) ;
+
+  Standard_EXPORT
+    static  Standard_Boolean IsSplitInOnFace(const TopoDS_Edge& aE,
+					     const TopoDS_Face& aF,
+					     const Handle(IntTools_Context)& aCtx) ;
+
+  Standard_EXPORT
+    static  Standard_Boolean AreFacesSameDomain(const TopoDS_Face& aF1,
+						const TopoDS_Face& aF2,
+						const Handle(IntTools_Context)& aCtx) ;
+
+  Standard_EXPORT
+    static  void FindChains(const NMTTools_ListOfCoupleOfShape& aLCS,
+			    NMTTools_IndexedDataMapOfShapeIndexedMapOfShape& aM) ;
+
+  Standard_EXPORT
+    static  void FindChains(const NMTTools_IndexedDataMapOfShapeIndexedMapOfShape& aM1,
+			    NMTTools_IndexedDataMapOfShapeIndexedMapOfShape& aM2) ;
+
+  Standard_EXPORT
+    static  void MakePCurve(const TopoDS_Edge& aE,
+			    const TopoDS_Face& aF,
+			    const Handle(Geom2d_Curve)& aC2D) ;
+
+  Standard_EXPORT
+    static  void UpdateEdge(const TopoDS_Edge& aE,
+			    const Standard_Real aTol) ;
+
+};
+#endif
diff --git a/src/OBJECT/GEOM_AISShape.cxx b/src/OBJECT/GEOM_AISShape.cxx
index 81a6dbe1c..dc79dd8aa 100644
--- a/src/OBJECT/GEOM_AISShape.cxx
+++ b/src/OBJECT/GEOM_AISShape.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 //  GEOM OBJECT : interactive object for Geometry entities visualization
 //  File   : GEOM_AISShape.cxx
diff --git a/src/OBJECT/GEOM_AISShape.hxx b/src/OBJECT/GEOM_AISShape.hxx
index 21e1c5a7e..f4fea03c1 100644
--- a/src/OBJECT/GEOM_AISShape.hxx
+++ b/src/OBJECT/GEOM_AISShape.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/OBJECT/GEOM_AISShape.ixx b/src/OBJECT/GEOM_AISShape.ixx
index c0945b517..5f504a5a5 100644
--- a/src/OBJECT/GEOM_AISShape.ixx
+++ b/src/OBJECT/GEOM_AISShape.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/OBJECT/GEOM_AISShape.jxx b/src/OBJECT/GEOM_AISShape.jxx
index 8e412d522..136116d22 100644
--- a/src/OBJECT/GEOM_AISShape.jxx
+++ b/src/OBJECT/GEOM_AISShape.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/OBJECT/GEOM_AISTrihedron.cxx b/src/OBJECT/GEOM_AISTrihedron.cxx
index 45f5d6751..6763d747b 100755
--- a/src/OBJECT/GEOM_AISTrihedron.cxx
+++ b/src/OBJECT/GEOM_AISTrihedron.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/OBJECT/GEOM_AISTrihedron.hxx b/src/OBJECT/GEOM_AISTrihedron.hxx
index ef39cfa88..b9eccc5cc 100755
--- a/src/OBJECT/GEOM_AISTrihedron.hxx
+++ b/src/OBJECT/GEOM_AISTrihedron.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/OBJECT/GEOM_AISVector.cxx b/src/OBJECT/GEOM_AISVector.cxx
index d8da5fae3..051b875cc 100644
--- a/src/OBJECT/GEOM_AISVector.cxx
+++ b/src/OBJECT/GEOM_AISVector.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/OBJECT/GEOM_AISVector.hxx b/src/OBJECT/GEOM_AISVector.hxx
index 6ff2c79a4..b53f9a85c 100644
--- a/src/OBJECT/GEOM_AISVector.hxx
+++ b/src/OBJECT/GEOM_AISVector.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/OBJECT/GEOM_Actor.cxx b/src/OBJECT/GEOM_Actor.cxx
index bc9c5c9f1..ff6142f45 100644
--- a/src/OBJECT/GEOM_Actor.cxx
+++ b/src/OBJECT/GEOM_Actor.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/OBJECT/GEOM_Actor.h b/src/OBJECT/GEOM_Actor.h
index c0c31fc5a..c80dec626 100644
--- a/src/OBJECT/GEOM_Actor.h
+++ b/src/OBJECT/GEOM_Actor.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/OBJECT/GEOM_Constants.h b/src/OBJECT/GEOM_Constants.h
index de4adb9c8..7827d65d2 100644
--- a/src/OBJECT/GEOM_Constants.h
+++ b/src/OBJECT/GEOM_Constants.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/OBJECT/GEOM_DeviceActor.cxx b/src/OBJECT/GEOM_DeviceActor.cxx
index 8d2a5e911..eee3f74f7 100755
--- a/src/OBJECT/GEOM_DeviceActor.cxx
+++ b/src/OBJECT/GEOM_DeviceActor.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/OBJECT/GEOM_DeviceActor.h b/src/OBJECT/GEOM_DeviceActor.h
index 721ee1b6f..5b96b4d65 100755
--- a/src/OBJECT/GEOM_DeviceActor.h
+++ b/src/OBJECT/GEOM_DeviceActor.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/OBJECT/GEOM_InteractiveObject.cxx b/src/OBJECT/GEOM_InteractiveObject.cxx
index 910783203..d108c1735 100644
--- a/src/OBJECT/GEOM_InteractiveObject.cxx
+++ b/src/OBJECT/GEOM_InteractiveObject.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/OBJECT/GEOM_InteractiveObject.hxx b/src/OBJECT/GEOM_InteractiveObject.hxx
index 85bfff155..7caddbfef 100644
--- a/src/OBJECT/GEOM_InteractiveObject.hxx
+++ b/src/OBJECT/GEOM_InteractiveObject.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/OBJECT/GEOM_InteractiveObject.ixx b/src/OBJECT/GEOM_InteractiveObject.ixx
index d8d65de8f..ff3ae4767 100644
--- a/src/OBJECT/GEOM_InteractiveObject.ixx
+++ b/src/OBJECT/GEOM_InteractiveObject.ixx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/OBJECT/GEOM_InteractiveObject.jxx b/src/OBJECT/GEOM_InteractiveObject.jxx
index aba2abc3e..9da2f88eb 100644
--- a/src/OBJECT/GEOM_InteractiveObject.jxx
+++ b/src/OBJECT/GEOM_InteractiveObject.jxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/OBJECT/GEOM_OBJECT_defs.hxx b/src/OBJECT/GEOM_OBJECT_defs.hxx
index 22678f181..cbd78b1a8 100755
--- a/src/OBJECT/GEOM_OBJECT_defs.hxx
+++ b/src/OBJECT/GEOM_OBJECT_defs.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/OBJECT/GEOM_OCCReader.cxx b/src/OBJECT/GEOM_OCCReader.cxx
index ff1e0f3a0..d9f1331a9 100644
--- a/src/OBJECT/GEOM_OCCReader.cxx
+++ b/src/OBJECT/GEOM_OCCReader.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 //  GEOM OBJECT : interactive object for Geometry entities visualization
 //  File   : GEOM_OCCReader.h
diff --git a/src/OBJECT/GEOM_OCCReader.h b/src/OBJECT/GEOM_OCCReader.h
index 3e60b35da..3be818b36 100644
--- a/src/OBJECT/GEOM_OCCReader.h
+++ b/src/OBJECT/GEOM_OCCReader.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/OBJECT/GEOM_PainterPolyDataMapper.cxx b/src/OBJECT/GEOM_PainterPolyDataMapper.cxx
index c86d93792..93022c136 100644
--- a/src/OBJECT/GEOM_PainterPolyDataMapper.cxx
+++ b/src/OBJECT/GEOM_PainterPolyDataMapper.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/OBJECT/GEOM_PainterPolyDataMapper.h b/src/OBJECT/GEOM_PainterPolyDataMapper.h
index 0c738f775..ecd880600 100644
--- a/src/OBJECT/GEOM_PainterPolyDataMapper.h
+++ b/src/OBJECT/GEOM_PainterPolyDataMapper.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/OBJECT/GEOM_SmartPtr.h b/src/OBJECT/GEOM_SmartPtr.h
index 12f981bc7..75d190cdc 100755
--- a/src/OBJECT/GEOM_SmartPtr.h
+++ b/src/OBJECT/GEOM_SmartPtr.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/OBJECT/GEOM_VTKTrihedron.cxx b/src/OBJECT/GEOM_VTKTrihedron.cxx
index 8995795f8..a57f359d1 100644
--- a/src/OBJECT/GEOM_VTKTrihedron.cxx
+++ b/src/OBJECT/GEOM_VTKTrihedron.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/OBJECT/GEOM_VTKTrihedron.hxx b/src/OBJECT/GEOM_VTKTrihedron.hxx
index 5d143b0b8..99a3ab60c 100644
--- a/src/OBJECT/GEOM_VTKTrihedron.hxx
+++ b/src/OBJECT/GEOM_VTKTrihedron.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/OBJECT/Handle_GEOM_AISShape.hxx b/src/OBJECT/Handle_GEOM_AISShape.hxx
index b72ca31d6..3fda3f6f3 100644
--- a/src/OBJECT/Handle_GEOM_AISShape.hxx
+++ b/src/OBJECT/Handle_GEOM_AISShape.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/OBJECT/Handle_GEOM_InteractiveObject.hxx b/src/OBJECT/Handle_GEOM_InteractiveObject.hxx
index 925de7a02..4e2a4c8ad 100644
--- a/src/OBJECT/Handle_GEOM_InteractiveObject.hxx
+++ b/src/OBJECT/Handle_GEOM_InteractiveObject.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/OBJECT/Makefile.am b/src/OBJECT/Makefile.am
index 3c73e9d7b..1c45ee511 100644
--- a/src/OBJECT/Makefile.am
+++ b/src/OBJECT/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/OBJECT/OBJECT.pro b/src/OBJECT/OBJECT.pro
index 55084e46d..dcd003782 100644
--- a/src/OBJECT/OBJECT.pro
+++ b/src/OBJECT/OBJECT.pro
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/OCC2VTK/GEOM_EdgeSource.cxx b/src/OCC2VTK/GEOM_EdgeSource.cxx
index abcd23fc7..d7d3a4174 100755
--- a/src/OCC2VTK/GEOM_EdgeSource.cxx
+++ b/src/OCC2VTK/GEOM_EdgeSource.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -15,6 +15,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include "GEOM_EdgeSource.h" 
  
diff --git a/src/OCC2VTK/GEOM_EdgeSource.h b/src/OCC2VTK/GEOM_EdgeSource.h
index 52cb8e0ae..282c4c906 100755
--- a/src/OCC2VTK/GEOM_EdgeSource.h
+++ b/src/OCC2VTK/GEOM_EdgeSource.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/OCC2VTK/GEOM_FaceSource.cxx b/src/OCC2VTK/GEOM_FaceSource.cxx
index 024fbff00..868232a63 100755
--- a/src/OCC2VTK/GEOM_FaceSource.cxx
+++ b/src/OCC2VTK/GEOM_FaceSource.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/OCC2VTK/GEOM_FaceSource.h b/src/OCC2VTK/GEOM_FaceSource.h
index 344bd9a81..557c0605d 100755
--- a/src/OCC2VTK/GEOM_FaceSource.h
+++ b/src/OCC2VTK/GEOM_FaceSource.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/OCC2VTK/GEOM_ShadingFace.cxx b/src/OCC2VTK/GEOM_ShadingFace.cxx
index 76b37678e..ad2ae5b18 100755
--- a/src/OCC2VTK/GEOM_ShadingFace.cxx
+++ b/src/OCC2VTK/GEOM_ShadingFace.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/OCC2VTK/GEOM_ShadingFace.h b/src/OCC2VTK/GEOM_ShadingFace.h
index 99a542d21..64ae2d0ba 100755
--- a/src/OCC2VTK/GEOM_ShadingFace.h
+++ b/src/OCC2VTK/GEOM_ShadingFace.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/OCC2VTK/GEOM_VertexSource.cxx b/src/OCC2VTK/GEOM_VertexSource.cxx
index 0ea34653e..daf61b192 100755
--- a/src/OCC2VTK/GEOM_VertexSource.cxx
+++ b/src/OCC2VTK/GEOM_VertexSource.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/OCC2VTK/GEOM_VertexSource.h b/src/OCC2VTK/GEOM_VertexSource.h
index 08b711dd3..9241b2d3a 100755
--- a/src/OCC2VTK/GEOM_VertexSource.h
+++ b/src/OCC2VTK/GEOM_VertexSource.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/OCC2VTK/GEOM_WireframeFace.cxx b/src/OCC2VTK/GEOM_WireframeFace.cxx
index 8b88b9db9..dc25aa622 100755
--- a/src/OCC2VTK/GEOM_WireframeFace.cxx
+++ b/src/OCC2VTK/GEOM_WireframeFace.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/OCC2VTK/GEOM_WireframeFace.h b/src/OCC2VTK/GEOM_WireframeFace.h
index 6dad0eaad..bd931a8ed 100755
--- a/src/OCC2VTK/GEOM_WireframeFace.h
+++ b/src/OCC2VTK/GEOM_WireframeFace.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/OCC2VTK/Makefile.am b/src/OCC2VTK/Makefile.am
index d1b5f7225..753961700 100644
--- a/src/OCC2VTK/Makefile.am
+++ b/src/OCC2VTK/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/OCC2VTK/OCC2VTK.h b/src/OCC2VTK/OCC2VTK.h
index e92d3aeba..2e36a8426 100755
--- a/src/OCC2VTK/OCC2VTK.h
+++ b/src/OCC2VTK/OCC2VTK.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/OCC2VTK/OCC2VTK_Tools.cxx b/src/OCC2VTK/OCC2VTK_Tools.cxx
index fc3392791..5d86fcc0f 100755
--- a/src/OCC2VTK/OCC2VTK_Tools.cxx
+++ b/src/OCC2VTK/OCC2VTK_Tools.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/OCC2VTK/OCC2VTK_Tools.h b/src/OCC2VTK/OCC2VTK_Tools.h
index 43cfb52aa..967359617 100755
--- a/src/OCC2VTK/OCC2VTK_Tools.h
+++ b/src/OCC2VTK/OCC2VTK_Tools.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/OperationGUI/Makefile.am b/src/OperationGUI/Makefile.am
index a833735b0..3dc6da126 100644
--- a/src/OperationGUI/Makefile.am
+++ b/src/OperationGUI/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/OperationGUI/OperationGUI.cxx b/src/OperationGUI/OperationGUI.cxx
index 7c8ed82de..7c9408444 100644
--- a/src/OperationGUI/OperationGUI.cxx
+++ b/src/OperationGUI/OperationGUI.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/OperationGUI/OperationGUI.h b/src/OperationGUI/OperationGUI.h
index a35882e24..6d1445105 100644
--- a/src/OperationGUI/OperationGUI.h
+++ b/src/OperationGUI/OperationGUI.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/OperationGUI/OperationGUI_ArchimedeDlg.cxx b/src/OperationGUI/OperationGUI_ArchimedeDlg.cxx
index 28cf1cf86..861ce92f6 100644
--- a/src/OperationGUI/OperationGUI_ArchimedeDlg.cxx
+++ b/src/OperationGUI/OperationGUI_ArchimedeDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/OperationGUI/OperationGUI_ArchimedeDlg.h b/src/OperationGUI/OperationGUI_ArchimedeDlg.h
index fd42030c2..82c27685f 100644
--- a/src/OperationGUI/OperationGUI_ArchimedeDlg.h
+++ b/src/OperationGUI/OperationGUI_ArchimedeDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/OperationGUI/OperationGUI_ChamferDlg.cxx b/src/OperationGUI/OperationGUI_ChamferDlg.cxx
index 1b62ce4b1..d20d286d5 100644
--- a/src/OperationGUI/OperationGUI_ChamferDlg.cxx
+++ b/src/OperationGUI/OperationGUI_ChamferDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // GEOM GEOMGUI : GUI for Geometry component
 // File   : OperationGUI_ChamferDlg.cxx
diff --git a/src/OperationGUI/OperationGUI_ChamferDlg.h b/src/OperationGUI/OperationGUI_ChamferDlg.h
index 6df1b7623..8c61ddd3d 100644
--- a/src/OperationGUI/OperationGUI_ChamferDlg.h
+++ b/src/OperationGUI/OperationGUI_ChamferDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/OperationGUI/OperationGUI_ClippingDlg.cxx b/src/OperationGUI/OperationGUI_ClippingDlg.cxx
index dc7a5cee1..9e93a9cdb 100644
--- a/src/OperationGUI/OperationGUI_ClippingDlg.cxx
+++ b/src/OperationGUI/OperationGUI_ClippingDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/OperationGUI/OperationGUI_ClippingDlg.h b/src/OperationGUI/OperationGUI_ClippingDlg.h
index adb9fa3aa..6b2f41edd 100644
--- a/src/OperationGUI/OperationGUI_ClippingDlg.h
+++ b/src/OperationGUI/OperationGUI_ClippingDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/OperationGUI/OperationGUI_ExtrudedFeatureDlg.cxx b/src/OperationGUI/OperationGUI_ExtrudedFeatureDlg.cxx
index c6ae8d783..e99ea1b93 100644
--- a/src/OperationGUI/OperationGUI_ExtrudedFeatureDlg.cxx
+++ b/src/OperationGUI/OperationGUI_ExtrudedFeatureDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/OperationGUI/OperationGUI_ExtrudedFeatureDlg.h b/src/OperationGUI/OperationGUI_ExtrudedFeatureDlg.h
index e1bdd3066..abf691708 100644
--- a/src/OperationGUI/OperationGUI_ExtrudedFeatureDlg.h
+++ b/src/OperationGUI/OperationGUI_ExtrudedFeatureDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/OperationGUI/OperationGUI_Fillet1d2dDlg.cxx b/src/OperationGUI/OperationGUI_Fillet1d2dDlg.cxx
index 04eb64733..16cc60845 100644
--- a/src/OperationGUI/OperationGUI_Fillet1d2dDlg.cxx
+++ b/src/OperationGUI/OperationGUI_Fillet1d2dDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -15,6 +15,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // GEOM GEOMGUI : GUI for Geometry component
 // File   : OperationGUI_Fillet1d2dDlg.cxx
diff --git a/src/OperationGUI/OperationGUI_Fillet1d2dDlg.h b/src/OperationGUI/OperationGUI_Fillet1d2dDlg.h
index 4e5709ab1..85fdf27f7 100644
--- a/src/OperationGUI/OperationGUI_Fillet1d2dDlg.h
+++ b/src/OperationGUI/OperationGUI_Fillet1d2dDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/OperationGUI/OperationGUI_FilletDlg.cxx b/src/OperationGUI/OperationGUI_FilletDlg.cxx
index 6479efc42..49a302a9c 100644
--- a/src/OperationGUI/OperationGUI_FilletDlg.cxx
+++ b/src/OperationGUI/OperationGUI_FilletDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/OperationGUI/OperationGUI_FilletDlg.h b/src/OperationGUI/OperationGUI_FilletDlg.h
index 054b1c562..e5bb66d29 100644
--- a/src/OperationGUI/OperationGUI_FilletDlg.h
+++ b/src/OperationGUI/OperationGUI_FilletDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/OperationGUI/OperationGUI_GetShapesOnShapeDlg.cxx b/src/OperationGUI/OperationGUI_GetShapesOnShapeDlg.cxx
index 20bb13117..a3f97c7da 100644
--- a/src/OperationGUI/OperationGUI_GetShapesOnShapeDlg.cxx
+++ b/src/OperationGUI/OperationGUI_GetShapesOnShapeDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/OperationGUI/OperationGUI_GetShapesOnShapeDlg.h b/src/OperationGUI/OperationGUI_GetShapesOnShapeDlg.h
index e6fbd3749..d68a86982 100644
--- a/src/OperationGUI/OperationGUI_GetShapesOnShapeDlg.h
+++ b/src/OperationGUI/OperationGUI_GetShapesOnShapeDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/OperationGUI/OperationGUI_GetSharedShapesDlg.cxx b/src/OperationGUI/OperationGUI_GetSharedShapesDlg.cxx
index c4a06b7d3..5872aaaa3 100644
--- a/src/OperationGUI/OperationGUI_GetSharedShapesDlg.cxx
+++ b/src/OperationGUI/OperationGUI_GetSharedShapesDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/OperationGUI/OperationGUI_GetSharedShapesDlg.h b/src/OperationGUI/OperationGUI_GetSharedShapesDlg.h
index 3382dd801..11a7eadc8 100644
--- a/src/OperationGUI/OperationGUI_GetSharedShapesDlg.h
+++ b/src/OperationGUI/OperationGUI_GetSharedShapesDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/OperationGUI/OperationGUI_MaterialDlg.cxx b/src/OperationGUI/OperationGUI_MaterialDlg.cxx
index ce13a8f4b..dfd5b1ae9 100644
--- a/src/OperationGUI/OperationGUI_MaterialDlg.cxx
+++ b/src/OperationGUI/OperationGUI_MaterialDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/OperationGUI/OperationGUI_MaterialDlg.h b/src/OperationGUI/OperationGUI_MaterialDlg.h
index 1286033a9..d40f50a28 100644
--- a/src/OperationGUI/OperationGUI_MaterialDlg.h
+++ b/src/OperationGUI/OperationGUI_MaterialDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/OperationGUI/OperationGUI_PartitionDlg.cxx b/src/OperationGUI/OperationGUI_PartitionDlg.cxx
index 68c545faa..5c940f1ea 100644
--- a/src/OperationGUI/OperationGUI_PartitionDlg.cxx
+++ b/src/OperationGUI/OperationGUI_PartitionDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // GEOM GEOMGUI : GUI for Geometry component
 // File   : OperationGUI_PartitionDlg.cxx
diff --git a/src/OperationGUI/OperationGUI_PartitionDlg.h b/src/OperationGUI/OperationGUI_PartitionDlg.h
index 3c857b5ca..7bd209796 100644
--- a/src/OperationGUI/OperationGUI_PartitionDlg.h
+++ b/src/OperationGUI/OperationGUI_PartitionDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/PrimitiveGUI/Makefile.am b/src/PrimitiveGUI/Makefile.am
index ffa1faab9..eac797a6a 100644
--- a/src/PrimitiveGUI/Makefile.am
+++ b/src/PrimitiveGUI/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/PrimitiveGUI/PrimitiveGUI.cxx b/src/PrimitiveGUI/PrimitiveGUI.cxx
index 2aa241979..4e74a168c 100644
--- a/src/PrimitiveGUI/PrimitiveGUI.cxx
+++ b/src/PrimitiveGUI/PrimitiveGUI.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/PrimitiveGUI/PrimitiveGUI.h b/src/PrimitiveGUI/PrimitiveGUI.h
index 5b6c54b86..66376de34 100644
--- a/src/PrimitiveGUI/PrimitiveGUI.h
+++ b/src/PrimitiveGUI/PrimitiveGUI.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/PrimitiveGUI/PrimitiveGUI.pro b/src/PrimitiveGUI/PrimitiveGUI.pro
index 883d77ac2..c117a29a6 100644
--- a/src/PrimitiveGUI/PrimitiveGUI.pro
+++ b/src/PrimitiveGUI/PrimitiveGUI.pro
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/PrimitiveGUI/PrimitiveGUI_BoxDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_BoxDlg.cxx
index 6bbc7b0f4..d06b646ab 100644
--- a/src/PrimitiveGUI/PrimitiveGUI_BoxDlg.cxx
+++ b/src/PrimitiveGUI/PrimitiveGUI_BoxDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/PrimitiveGUI/PrimitiveGUI_BoxDlg.h b/src/PrimitiveGUI/PrimitiveGUI_BoxDlg.h
index b02085093..da2ce10d6 100644
--- a/src/PrimitiveGUI/PrimitiveGUI_BoxDlg.h
+++ b/src/PrimitiveGUI/PrimitiveGUI_BoxDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/PrimitiveGUI/PrimitiveGUI_ConeDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_ConeDlg.cxx
index ba2c4f934..f64a9667d 100644
--- a/src/PrimitiveGUI/PrimitiveGUI_ConeDlg.cxx
+++ b/src/PrimitiveGUI/PrimitiveGUI_ConeDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/PrimitiveGUI/PrimitiveGUI_ConeDlg.h b/src/PrimitiveGUI/PrimitiveGUI_ConeDlg.h
index 85b2cc83f..0e59a1481 100644
--- a/src/PrimitiveGUI/PrimitiveGUI_ConeDlg.h
+++ b/src/PrimitiveGUI/PrimitiveGUI_ConeDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.cxx
index 42718d046..8b810679d 100644
--- a/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.cxx
+++ b/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.h b/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.h
index 35c59e121..d7035831b 100644
--- a/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.h
+++ b/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/PrimitiveGUI/PrimitiveGUI_DiskDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_DiskDlg.cxx
index 30e7d7cd7..f73861a4a 100755
--- a/src/PrimitiveGUI/PrimitiveGUI_DiskDlg.cxx
+++ b/src/PrimitiveGUI/PrimitiveGUI_DiskDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/PrimitiveGUI/PrimitiveGUI_DiskDlg.h b/src/PrimitiveGUI/PrimitiveGUI_DiskDlg.h
index 258c04bb5..ae22d2e36 100755
--- a/src/PrimitiveGUI/PrimitiveGUI_DiskDlg.h
+++ b/src/PrimitiveGUI/PrimitiveGUI_DiskDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/PrimitiveGUI/PrimitiveGUI_FaceDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_FaceDlg.cxx
index 1e1004b01..d73c69b08 100755
--- a/src/PrimitiveGUI/PrimitiveGUI_FaceDlg.cxx
+++ b/src/PrimitiveGUI/PrimitiveGUI_FaceDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/PrimitiveGUI/PrimitiveGUI_FaceDlg.h b/src/PrimitiveGUI/PrimitiveGUI_FaceDlg.h
index 450d0fad5..dc2dc600f 100755
--- a/src/PrimitiveGUI/PrimitiveGUI_FaceDlg.h
+++ b/src/PrimitiveGUI/PrimitiveGUI_FaceDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/PrimitiveGUI/PrimitiveGUI_SphereDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_SphereDlg.cxx
index ed0664120..0279654c9 100644
--- a/src/PrimitiveGUI/PrimitiveGUI_SphereDlg.cxx
+++ b/src/PrimitiveGUI/PrimitiveGUI_SphereDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/PrimitiveGUI/PrimitiveGUI_SphereDlg.h b/src/PrimitiveGUI/PrimitiveGUI_SphereDlg.h
index 363cf5c15..870828ad7 100644
--- a/src/PrimitiveGUI/PrimitiveGUI_SphereDlg.h
+++ b/src/PrimitiveGUI/PrimitiveGUI_SphereDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.cxx
index 4e9651d6f..632a99ae8 100644
--- a/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.cxx
+++ b/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.h b/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.h
index f6e2ffa21..96c3d6396 100644
--- a/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.h
+++ b/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/RepairGUI/Makefile.am b/src/RepairGUI/Makefile.am
index 924fd58aa..a4453ae5c 100644
--- a/src/RepairGUI/Makefile.am
+++ b/src/RepairGUI/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/RepairGUI/RepairGUI.cxx b/src/RepairGUI/RepairGUI.cxx
index 197c96e78..3c72cbac3 100644
--- a/src/RepairGUI/RepairGUI.cxx
+++ b/src/RepairGUI/RepairGUI.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/RepairGUI/RepairGUI.h b/src/RepairGUI/RepairGUI.h
index a5c5bdf6c..97ac66b0c 100644
--- a/src/RepairGUI/RepairGUI.h
+++ b/src/RepairGUI/RepairGUI.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/RepairGUI/RepairGUI_ChangeOrientationDlg.cxx b/src/RepairGUI/RepairGUI_ChangeOrientationDlg.cxx
index d7fe9d2f7..60173a643 100644
--- a/src/RepairGUI/RepairGUI_ChangeOrientationDlg.cxx
+++ b/src/RepairGUI/RepairGUI_ChangeOrientationDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/RepairGUI/RepairGUI_ChangeOrientationDlg.h b/src/RepairGUI/RepairGUI_ChangeOrientationDlg.h
index 29a5912e3..35b43d85d 100644
--- a/src/RepairGUI/RepairGUI_ChangeOrientationDlg.h
+++ b/src/RepairGUI/RepairGUI_ChangeOrientationDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/RepairGUI/RepairGUI_CloseContourDlg.cxx b/src/RepairGUI/RepairGUI_CloseContourDlg.cxx
index e9eab46cc..562c94cf6 100644
--- a/src/RepairGUI/RepairGUI_CloseContourDlg.cxx
+++ b/src/RepairGUI/RepairGUI_CloseContourDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/RepairGUI/RepairGUI_CloseContourDlg.h b/src/RepairGUI/RepairGUI_CloseContourDlg.h
index d001b9c8a..079ea5cb4 100644
--- a/src/RepairGUI/RepairGUI_CloseContourDlg.h
+++ b/src/RepairGUI/RepairGUI_CloseContourDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx b/src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx
index 61fd7ed5b..522f4e87b 100644
--- a/src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx
+++ b/src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/RepairGUI/RepairGUI_DivideEdgeDlg.h b/src/RepairGUI/RepairGUI_DivideEdgeDlg.h
index fb0541641..5b39121e3 100644
--- a/src/RepairGUI/RepairGUI_DivideEdgeDlg.h
+++ b/src/RepairGUI/RepairGUI_DivideEdgeDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/RepairGUI/RepairGUI_FreeBoundDlg.cxx b/src/RepairGUI/RepairGUI_FreeBoundDlg.cxx
index c408ab0fa..3ef492fcc 100644
--- a/src/RepairGUI/RepairGUI_FreeBoundDlg.cxx
+++ b/src/RepairGUI/RepairGUI_FreeBoundDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/RepairGUI/RepairGUI_FreeBoundDlg.h b/src/RepairGUI/RepairGUI_FreeBoundDlg.h
index 462f84389..af65e1602 100644
--- a/src/RepairGUI/RepairGUI_FreeBoundDlg.h
+++ b/src/RepairGUI/RepairGUI_FreeBoundDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/RepairGUI/RepairGUI_FreeFacesDlg.cxx b/src/RepairGUI/RepairGUI_FreeFacesDlg.cxx
index 845df5ee8..399182766 100644
--- a/src/RepairGUI/RepairGUI_FreeFacesDlg.cxx
+++ b/src/RepairGUI/RepairGUI_FreeFacesDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/RepairGUI/RepairGUI_FreeFacesDlg.h b/src/RepairGUI/RepairGUI_FreeFacesDlg.h
index e2f061bc8..2987c7c1f 100644
--- a/src/RepairGUI/RepairGUI_FreeFacesDlg.h
+++ b/src/RepairGUI/RepairGUI_FreeFacesDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/RepairGUI/RepairGUI_GlueDlg.cxx b/src/RepairGUI/RepairGUI_GlueDlg.cxx
index e84841a64..77a027681 100644
--- a/src/RepairGUI/RepairGUI_GlueDlg.cxx
+++ b/src/RepairGUI/RepairGUI_GlueDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/RepairGUI/RepairGUI_GlueDlg.h b/src/RepairGUI/RepairGUI_GlueDlg.h
index 863e398e9..99febef76 100644
--- a/src/RepairGUI/RepairGUI_GlueDlg.h
+++ b/src/RepairGUI/RepairGUI_GlueDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/RepairGUI/RepairGUI_LimitToleranceDlg.cxx b/src/RepairGUI/RepairGUI_LimitToleranceDlg.cxx
index 74a1a6cb6..c275fc64c 100644
--- a/src/RepairGUI/RepairGUI_LimitToleranceDlg.cxx
+++ b/src/RepairGUI/RepairGUI_LimitToleranceDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/RepairGUI/RepairGUI_LimitToleranceDlg.h b/src/RepairGUI/RepairGUI_LimitToleranceDlg.h
index 252dab9ca..7d5d8d549 100644
--- a/src/RepairGUI/RepairGUI_LimitToleranceDlg.h
+++ b/src/RepairGUI/RepairGUI_LimitToleranceDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/RepairGUI/RepairGUI_RemoveExtraEdgesDlg.cxx b/src/RepairGUI/RepairGUI_RemoveExtraEdgesDlg.cxx
index dec139b8d..3861e384a 100644
--- a/src/RepairGUI/RepairGUI_RemoveExtraEdgesDlg.cxx
+++ b/src/RepairGUI/RepairGUI_RemoveExtraEdgesDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/RepairGUI/RepairGUI_RemoveExtraEdgesDlg.h b/src/RepairGUI/RepairGUI_RemoveExtraEdgesDlg.h
index ede1de943..3e8d7ba81 100644
--- a/src/RepairGUI/RepairGUI_RemoveExtraEdgesDlg.h
+++ b/src/RepairGUI/RepairGUI_RemoveExtraEdgesDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/RepairGUI/RepairGUI_RemoveHolesDlg.cxx b/src/RepairGUI/RepairGUI_RemoveHolesDlg.cxx
index adbae952a..2fc819511 100644
--- a/src/RepairGUI/RepairGUI_RemoveHolesDlg.cxx
+++ b/src/RepairGUI/RepairGUI_RemoveHolesDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/RepairGUI/RepairGUI_RemoveHolesDlg.h b/src/RepairGUI/RepairGUI_RemoveHolesDlg.h
index 3bb1d905b..834ebf531 100644
--- a/src/RepairGUI/RepairGUI_RemoveHolesDlg.h
+++ b/src/RepairGUI/RepairGUI_RemoveHolesDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/RepairGUI/RepairGUI_RemoveIntWiresDlg.cxx b/src/RepairGUI/RepairGUI_RemoveIntWiresDlg.cxx
index 99193aaf9..44ffc7e1f 100644
--- a/src/RepairGUI/RepairGUI_RemoveIntWiresDlg.cxx
+++ b/src/RepairGUI/RepairGUI_RemoveIntWiresDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/RepairGUI/RepairGUI_RemoveIntWiresDlg.h b/src/RepairGUI/RepairGUI_RemoveIntWiresDlg.h
index af6f99260..2eab1b48d 100644
--- a/src/RepairGUI/RepairGUI_RemoveIntWiresDlg.h
+++ b/src/RepairGUI/RepairGUI_RemoveIntWiresDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/RepairGUI/RepairGUI_SewingDlg.cxx b/src/RepairGUI/RepairGUI_SewingDlg.cxx
index f9ba58a86..15648d3e1 100644
--- a/src/RepairGUI/RepairGUI_SewingDlg.cxx
+++ b/src/RepairGUI/RepairGUI_SewingDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/RepairGUI/RepairGUI_SewingDlg.h b/src/RepairGUI/RepairGUI_SewingDlg.h
index 1d76fdb95..fa8158057 100644
--- a/src/RepairGUI/RepairGUI_SewingDlg.h
+++ b/src/RepairGUI/RepairGUI_SewingDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx b/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx
index 17739eb7b..2f502b438 100755
--- a/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx
+++ b/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // GEOM GEOMGUI : GUI for Geometry component
 // File   : RepairGUI_ShapeProcessDlg.cxx
diff --git a/src/RepairGUI/RepairGUI_ShapeProcessDlg.h b/src/RepairGUI/RepairGUI_ShapeProcessDlg.h
index ded1923c9..4ca7e9a8d 100755
--- a/src/RepairGUI/RepairGUI_ShapeProcessDlg.h
+++ b/src/RepairGUI/RepairGUI_ShapeProcessDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/RepairGUI/RepairGUI_SuppressFacesDlg.cxx b/src/RepairGUI/RepairGUI_SuppressFacesDlg.cxx
index 77fa409bc..5af3c37d6 100644
--- a/src/RepairGUI/RepairGUI_SuppressFacesDlg.cxx
+++ b/src/RepairGUI/RepairGUI_SuppressFacesDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/RepairGUI/RepairGUI_SuppressFacesDlg.h b/src/RepairGUI/RepairGUI_SuppressFacesDlg.h
index 2738dbb49..837036dc8 100644
--- a/src/RepairGUI/RepairGUI_SuppressFacesDlg.h
+++ b/src/RepairGUI/RepairGUI_SuppressFacesDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/SKETCHER/Makefile.am b/src/SKETCHER/Makefile.am
index 470936a5a..503d0b9b5 100644
--- a/src/SKETCHER/Makefile.am
+++ b/src/SKETCHER/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/SKETCHER/SKETCHER.pro b/src/SKETCHER/SKETCHER.pro
index 52fbbccb7..294dd86df 100644
--- a/src/SKETCHER/SKETCHER.pro
+++ b/src/SKETCHER/SKETCHER.pro
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/SKETCHER/Sketcher_Profile.cxx b/src/SKETCHER/Sketcher_Profile.cxx
index ff396a44b..163829d20 100644
--- a/src/SKETCHER/Sketcher_Profile.cxx
+++ b/src/SKETCHER/Sketcher_Profile.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 //  GEOM SKETCHER : basic sketcher
 //  File   : Sketcher_Profile.cxx
diff --git a/src/SKETCHER/Sketcher_Profile.hxx b/src/SKETCHER/Sketcher_Profile.hxx
index 2a2585bac..f323a058e 100644
--- a/src/SKETCHER/Sketcher_Profile.hxx
+++ b/src/SKETCHER/Sketcher_Profile.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/STEPExport/Makefile.am b/src/STEPExport/Makefile.am
index 851d258f8..96bf0e2b5 100644
--- a/src/STEPExport/Makefile.am
+++ b/src/STEPExport/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/STEPExport/STEPExport.cxx b/src/STEPExport/STEPExport.cxx
index b36772eb8..4a0805c84 100644
--- a/src/STEPExport/STEPExport.cxx
+++ b/src/STEPExport/STEPExport.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/STEPExport/STEPExport.pro b/src/STEPExport/STEPExport.pro
index 5ccadf8a3..204a53c49 100644
--- a/src/STEPExport/STEPExport.pro
+++ b/src/STEPExport/STEPExport.pro
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/STEPImport/Makefile.am b/src/STEPImport/Makefile.am
index 7b8b8e0cc..c96d2fa5c 100644
--- a/src/STEPImport/Makefile.am
+++ b/src/STEPImport/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -15,6 +15,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
 
 #  File   : Makefile.in
 #  Author : Pavel TELKOV
diff --git a/src/STEPImport/STEPImport.cxx b/src/STEPImport/STEPImport.cxx
index 4bccba460..3b51c6e57 100644
--- a/src/STEPImport/STEPImport.cxx
+++ b/src/STEPImport/STEPImport.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 //  File:        STEPImport.cxx
 //  Created:     Wed May 19 14:41:10 2004
diff --git a/src/STEPImport/STEPImport.pro b/src/STEPImport/STEPImport.pro
index d132ae966..6f0c40d52 100644
--- a/src/STEPImport/STEPImport.pro
+++ b/src/STEPImport/STEPImport.pro
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/STLExport/Makefile.am b/src/STLExport/Makefile.am
index 9a11a6a77..d482d48fe 100644
--- a/src/STLExport/Makefile.am
+++ b/src/STLExport/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/STLExport/STLExport.cxx b/src/STLExport/STLExport.cxx
index d7135b94d..9d0fc1f1b 100644
--- a/src/STLExport/STLExport.cxx
+++ b/src/STLExport/STLExport.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/STLExport/STLExport.pro b/src/STLExport/STLExport.pro
index b1f9936b8..0957b15e6 100644
--- a/src/STLExport/STLExport.pro
+++ b/src/STLExport/STLExport.pro
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/ShHealOper/Makefile.am b/src/ShHealOper/Makefile.am
index 4f35d0e87..d2f1cd4ae 100644
--- a/src/ShHealOper/Makefile.am
+++ b/src/ShHealOper/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/ShHealOper/ShHealOper.pro b/src/ShHealOper/ShHealOper.pro
index ea93ca4c4..bf083a1dd 100644
--- a/src/ShHealOper/ShHealOper.pro
+++ b/src/ShHealOper/ShHealOper.pro
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/ShHealOper/ShHealOper_ChangeOrientation.cxx b/src/ShHealOper/ShHealOper_ChangeOrientation.cxx
index b81fccd57..4d2fba884 100644
--- a/src/ShHealOper/ShHealOper_ChangeOrientation.cxx
+++ b/src/ShHealOper/ShHealOper_ChangeOrientation.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File:      ShHealOper_ChangeOrientation.cxx
 // Created:   11.07.06 11:46:45
diff --git a/src/ShHealOper/ShHealOper_ChangeOrientation.hxx b/src/ShHealOper/ShHealOper_ChangeOrientation.hxx
index 18d928a30..bed7feb8f 100644
--- a/src/ShHealOper/ShHealOper_ChangeOrientation.hxx
+++ b/src/ShHealOper/ShHealOper_ChangeOrientation.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/ShHealOper/ShHealOper_CloseContour.cxx b/src/ShHealOper/ShHealOper_CloseContour.cxx
index cac90361f..64749f18c 100644
--- a/src/ShHealOper/ShHealOper_CloseContour.cxx
+++ b/src/ShHealOper/ShHealOper_CloseContour.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/ShHealOper/ShHealOper_CloseContour.hxx b/src/ShHealOper/ShHealOper_CloseContour.hxx
index 0c187f2a8..d2b149a29 100644
--- a/src/ShHealOper/ShHealOper_CloseContour.hxx
+++ b/src/ShHealOper/ShHealOper_CloseContour.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/ShHealOper/ShHealOper_EdgeDivide.cxx b/src/ShHealOper/ShHealOper_EdgeDivide.cxx
index 775d27147..e776429d0 100644
--- a/src/ShHealOper/ShHealOper_EdgeDivide.cxx
+++ b/src/ShHealOper/ShHealOper_EdgeDivide.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/ShHealOper/ShHealOper_EdgeDivide.hxx b/src/ShHealOper/ShHealOper_EdgeDivide.hxx
index 21444370e..9aa94e1ae 100644
--- a/src/ShHealOper/ShHealOper_EdgeDivide.hxx
+++ b/src/ShHealOper/ShHealOper_EdgeDivide.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/ShHealOper/ShHealOper_FillHoles.cxx b/src/ShHealOper/ShHealOper_FillHoles.cxx
index 2e55b642f..2aa0c38f4 100644
--- a/src/ShHealOper/ShHealOper_FillHoles.cxx
+++ b/src/ShHealOper/ShHealOper_FillHoles.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File:      ShHealOper_FillHoles.cxx
 // Created:   26.04.04 17:35:30
diff --git a/src/ShHealOper/ShHealOper_FillHoles.hxx b/src/ShHealOper/ShHealOper_FillHoles.hxx
index 74a299d6f..9504973c1 100644
--- a/src/ShHealOper/ShHealOper_FillHoles.hxx
+++ b/src/ShHealOper/ShHealOper_FillHoles.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/ShHealOper/ShHealOper_RemoveFace.cxx b/src/ShHealOper/ShHealOper_RemoveFace.cxx
index a0db08707..d11850acd 100644
--- a/src/ShHealOper/ShHealOper_RemoveFace.cxx
+++ b/src/ShHealOper/ShHealOper_RemoveFace.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/ShHealOper/ShHealOper_RemoveFace.hxx b/src/ShHealOper/ShHealOper_RemoveFace.hxx
index 0d5700bb5..be87f1ada 100644
--- a/src/ShHealOper/ShHealOper_RemoveFace.hxx
+++ b/src/ShHealOper/ShHealOper_RemoveFace.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/ShHealOper/ShHealOper_RemoveInternalWires.cxx b/src/ShHealOper/ShHealOper_RemoveInternalWires.cxx
index 400090442..7ec7adf9c 100644
--- a/src/ShHealOper/ShHealOper_RemoveInternalWires.cxx
+++ b/src/ShHealOper/ShHealOper_RemoveInternalWires.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/ShHealOper/ShHealOper_RemoveInternalWires.hxx b/src/ShHealOper/ShHealOper_RemoveInternalWires.hxx
index 9fa2303b4..1667fbd12 100644
--- a/src/ShHealOper/ShHealOper_RemoveInternalWires.hxx
+++ b/src/ShHealOper/ShHealOper_RemoveInternalWires.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/ShHealOper/ShHealOper_Sewing.cxx b/src/ShHealOper/ShHealOper_Sewing.cxx
index a5320584e..6974f5a6c 100644
--- a/src/ShHealOper/ShHealOper_Sewing.cxx
+++ b/src/ShHealOper/ShHealOper_Sewing.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/ShHealOper/ShHealOper_Sewing.hxx b/src/ShHealOper/ShHealOper_Sewing.hxx
index ff2b7223f..26640b5f9 100644
--- a/src/ShHealOper/ShHealOper_Sewing.hxx
+++ b/src/ShHealOper/ShHealOper_Sewing.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/ShHealOper/ShHealOper_ShapeProcess.cxx b/src/ShHealOper/ShHealOper_ShapeProcess.cxx
index 3657c1bf0..4adbe27ac 100644
--- a/src/ShHealOper/ShHealOper_ShapeProcess.cxx
+++ b/src/ShHealOper/ShHealOper_ShapeProcess.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/ShHealOper/ShHealOper_ShapeProcess.hxx b/src/ShHealOper/ShHealOper_ShapeProcess.hxx
index 95f3951ec..0f05f8407 100644
--- a/src/ShHealOper/ShHealOper_ShapeProcess.hxx
+++ b/src/ShHealOper/ShHealOper_ShapeProcess.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/ShHealOper/ShHealOper_SpiltCurve2d.hxx b/src/ShHealOper/ShHealOper_SpiltCurve2d.hxx
index b411d11f2..52fef06d7 100644
--- a/src/ShHealOper/ShHealOper_SpiltCurve2d.hxx
+++ b/src/ShHealOper/ShHealOper_SpiltCurve2d.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/ShHealOper/ShHealOper_SplitCurve2d.cxx b/src/ShHealOper/ShHealOper_SplitCurve2d.cxx
index 03ddaa3d9..e89520e22 100644
--- a/src/ShHealOper/ShHealOper_SplitCurve2d.cxx
+++ b/src/ShHealOper/ShHealOper_SplitCurve2d.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/ShHealOper/ShHealOper_SplitCurve2d.hxx b/src/ShHealOper/ShHealOper_SplitCurve2d.hxx
index a8dc97296..179ec0cac 100644
--- a/src/ShHealOper/ShHealOper_SplitCurve2d.hxx
+++ b/src/ShHealOper/ShHealOper_SplitCurve2d.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/ShHealOper/ShHealOper_SplitCurve3d.cxx b/src/ShHealOper/ShHealOper_SplitCurve3d.cxx
index b7357db68..16833bdeb 100644
--- a/src/ShHealOper/ShHealOper_SplitCurve3d.cxx
+++ b/src/ShHealOper/ShHealOper_SplitCurve3d.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/ShHealOper/ShHealOper_SplitCurve3d.hxx b/src/ShHealOper/ShHealOper_SplitCurve3d.hxx
index aa05aecd4..22fa4929d 100644
--- a/src/ShHealOper/ShHealOper_SplitCurve3d.hxx
+++ b/src/ShHealOper/ShHealOper_SplitCurve3d.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/ShHealOper/ShHealOper_Tool.cxx b/src/ShHealOper/ShHealOper_Tool.cxx
index 859ea2612..ed741cc6e 100644
--- a/src/ShHealOper/ShHealOper_Tool.cxx
+++ b/src/ShHealOper/ShHealOper_Tool.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/ShHealOper/ShHealOper_Tool.hxx b/src/ShHealOper/ShHealOper_Tool.hxx
index cefcc4203..f89da9a50 100644
--- a/src/ShHealOper/ShHealOper_Tool.hxx
+++ b/src/ShHealOper/ShHealOper_Tool.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/ShapeRecognition/Makefile.am b/src/ShapeRecognition/Makefile.am
index 214987055..4d7017204 100644
--- a/src/ShapeRecognition/Makefile.am
+++ b/src/ShapeRecognition/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/ShapeRecognition/ShapeRec_FeatureDetector.cxx b/src/ShapeRecognition/ShapeRec_FeatureDetector.cxx
index 48207cc77..71c919ef5 100644
--- a/src/ShapeRecognition/ShapeRec_FeatureDetector.cxx
+++ b/src/ShapeRecognition/ShapeRec_FeatureDetector.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File   : ShapeRec_FeatureDetector.cxx
 // Author : Renaud NEDELEC, Open CASCADE S.A.S.
diff --git a/src/ShapeRecognition/ShapeRec_FeatureDetector.hxx b/src/ShapeRecognition/ShapeRec_FeatureDetector.hxx
index a3ebeebb2..c4b050bde 100644
--- a/src/ShapeRecognition/ShapeRec_FeatureDetector.hxx
+++ b/src/ShapeRecognition/ShapeRec_FeatureDetector.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File   : ShapeRec_FeatureDetector.h
 // Author : Renaud NEDELEC, Open CASCADE S.A.S.
diff --git a/src/TransformationGUI/Makefile.am b/src/TransformationGUI/Makefile.am
index 6b476c9bc..c8f0c2980 100644
--- a/src/TransformationGUI/Makefile.am
+++ b/src/TransformationGUI/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/TransformationGUI/TransformationGUI.cxx b/src/TransformationGUI/TransformationGUI.cxx
index bdf39e64e..e18967620 100644
--- a/src/TransformationGUI/TransformationGUI.cxx
+++ b/src/TransformationGUI/TransformationGUI.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/TransformationGUI/TransformationGUI.h b/src/TransformationGUI/TransformationGUI.h
index 1dee7d542..fcb4240ee 100644
--- a/src/TransformationGUI/TransformationGUI.h
+++ b/src/TransformationGUI/TransformationGUI.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/TransformationGUI/TransformationGUI.pro b/src/TransformationGUI/TransformationGUI.pro
index 2e2bdc981..48ea109f2 100644
--- a/src/TransformationGUI/TransformationGUI.pro
+++ b/src/TransformationGUI/TransformationGUI.pro
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/TransformationGUI/TransformationGUI_MirrorDlg.cxx b/src/TransformationGUI/TransformationGUI_MirrorDlg.cxx
index e94b688f3..635935a05 100644
--- a/src/TransformationGUI/TransformationGUI_MirrorDlg.cxx
+++ b/src/TransformationGUI/TransformationGUI_MirrorDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/TransformationGUI/TransformationGUI_MirrorDlg.h b/src/TransformationGUI/TransformationGUI_MirrorDlg.h
index a5215a0ea..2a114d2c6 100644
--- a/src/TransformationGUI/TransformationGUI_MirrorDlg.h
+++ b/src/TransformationGUI/TransformationGUI_MirrorDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/TransformationGUI/TransformationGUI_MultiRotationDlg.cxx b/src/TransformationGUI/TransformationGUI_MultiRotationDlg.cxx
index 4d2a54f49..f450a2f8c 100644
--- a/src/TransformationGUI/TransformationGUI_MultiRotationDlg.cxx
+++ b/src/TransformationGUI/TransformationGUI_MultiRotationDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/TransformationGUI/TransformationGUI_MultiRotationDlg.h b/src/TransformationGUI/TransformationGUI_MultiRotationDlg.h
index b7482926e..fac7bd502 100644
--- a/src/TransformationGUI/TransformationGUI_MultiRotationDlg.h
+++ b/src/TransformationGUI/TransformationGUI_MultiRotationDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/TransformationGUI/TransformationGUI_MultiTranslationDlg.cxx b/src/TransformationGUI/TransformationGUI_MultiTranslationDlg.cxx
index 5684d0a94..352f88c2e 100644
--- a/src/TransformationGUI/TransformationGUI_MultiTranslationDlg.cxx
+++ b/src/TransformationGUI/TransformationGUI_MultiTranslationDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/TransformationGUI/TransformationGUI_MultiTranslationDlg.h b/src/TransformationGUI/TransformationGUI_MultiTranslationDlg.h
index c9f5cbc1d..6a7ce6e08 100644
--- a/src/TransformationGUI/TransformationGUI_MultiTranslationDlg.h
+++ b/src/TransformationGUI/TransformationGUI_MultiTranslationDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/TransformationGUI/TransformationGUI_OffsetDlg.cxx b/src/TransformationGUI/TransformationGUI_OffsetDlg.cxx
index 786d6a2c5..8ea9dec4a 100644
--- a/src/TransformationGUI/TransformationGUI_OffsetDlg.cxx
+++ b/src/TransformationGUI/TransformationGUI_OffsetDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/TransformationGUI/TransformationGUI_OffsetDlg.h b/src/TransformationGUI/TransformationGUI_OffsetDlg.h
index 0f9b6dac1..e0aac63b6 100644
--- a/src/TransformationGUI/TransformationGUI_OffsetDlg.h
+++ b/src/TransformationGUI/TransformationGUI_OffsetDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/TransformationGUI/TransformationGUI_PositionDlg.cxx b/src/TransformationGUI/TransformationGUI_PositionDlg.cxx
index 8ccca18e2..f31214417 100644
--- a/src/TransformationGUI/TransformationGUI_PositionDlg.cxx
+++ b/src/TransformationGUI/TransformationGUI_PositionDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/TransformationGUI/TransformationGUI_PositionDlg.h b/src/TransformationGUI/TransformationGUI_PositionDlg.h
index 6b980153c..1cfa81705 100644
--- a/src/TransformationGUI/TransformationGUI_PositionDlg.h
+++ b/src/TransformationGUI/TransformationGUI_PositionDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/TransformationGUI/TransformationGUI_ProjectionDlg.cxx b/src/TransformationGUI/TransformationGUI_ProjectionDlg.cxx
index bfb230dff..2bd662178 100644
--- a/src/TransformationGUI/TransformationGUI_ProjectionDlg.cxx
+++ b/src/TransformationGUI/TransformationGUI_ProjectionDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/TransformationGUI/TransformationGUI_ProjectionDlg.h b/src/TransformationGUI/TransformationGUI_ProjectionDlg.h
index f1fba92d8..43541b48a 100644
--- a/src/TransformationGUI/TransformationGUI_ProjectionDlg.h
+++ b/src/TransformationGUI/TransformationGUI_ProjectionDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/TransformationGUI/TransformationGUI_RotationDlg.cxx b/src/TransformationGUI/TransformationGUI_RotationDlg.cxx
index 4dd135d4c..945ca796b 100644
--- a/src/TransformationGUI/TransformationGUI_RotationDlg.cxx
+++ b/src/TransformationGUI/TransformationGUI_RotationDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // GEOM GEOMGUI : GUI for Geometry component
 // File   : TransformationGUI_RotationDlg.cxx
diff --git a/src/TransformationGUI/TransformationGUI_RotationDlg.h b/src/TransformationGUI/TransformationGUI_RotationDlg.h
index 13e3237a2..1232e0d6a 100644
--- a/src/TransformationGUI/TransformationGUI_RotationDlg.h
+++ b/src/TransformationGUI/TransformationGUI_RotationDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/TransformationGUI/TransformationGUI_ScaleDlg.cxx b/src/TransformationGUI/TransformationGUI_ScaleDlg.cxx
index 90df363ca..ff31ede29 100644
--- a/src/TransformationGUI/TransformationGUI_ScaleDlg.cxx
+++ b/src/TransformationGUI/TransformationGUI_ScaleDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/TransformationGUI/TransformationGUI_ScaleDlg.h b/src/TransformationGUI/TransformationGUI_ScaleDlg.h
index 76f2a85e5..4f4e104aa 100644
--- a/src/TransformationGUI/TransformationGUI_ScaleDlg.h
+++ b/src/TransformationGUI/TransformationGUI_ScaleDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/TransformationGUI/TransformationGUI_TranslationDlg.cxx b/src/TransformationGUI/TransformationGUI_TranslationDlg.cxx
index 945a643ab..d14cc37cf 100644
--- a/src/TransformationGUI/TransformationGUI_TranslationDlg.cxx
+++ b/src/TransformationGUI/TransformationGUI_TranslationDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/TransformationGUI/TransformationGUI_TranslationDlg.h b/src/TransformationGUI/TransformationGUI_TranslationDlg.h
index 6959b5d6e..2bf0a91af 100644
--- a/src/TransformationGUI/TransformationGUI_TranslationDlg.h
+++ b/src/TransformationGUI/TransformationGUI_TranslationDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/VTKExport/Makefile.am b/src/VTKExport/Makefile.am
index 357315e63..a3485f69e 100644
--- a/src/VTKExport/Makefile.am
+++ b/src/VTKExport/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/VTKExport/VTKExport.cxx b/src/VTKExport/VTKExport.cxx
index 4b2f27b5c..d7ab92002 100644
--- a/src/VTKExport/VTKExport.cxx
+++ b/src/VTKExport/VTKExport.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/src/VTKExport/VTKExport.pro b/src/VTKExport/VTKExport.pro
index e11bb9310..79bd2acfb 100644
--- a/src/VTKExport/VTKExport.pro
+++ b/src/VTKExport/VTKExport.pro
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/src.pro b/src/src.pro
index 2aa844412..50597ae79 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public