Merge from V6_3_BR 06/06/2011

[modules/smesh.git] / src / SMESHGUI / SMESHGUI_MeshUtils.cxx

diff --git a/src/SMESHGUI/SMESHGUI_MeshUtils.cxx b/src/SMESHGUI/SMESHGUI_MeshUtils.cxx
index 7d48093e2b86701e4d8f4b300570f5e5f0636f15..8b8a3bd253d45d8ed83e7a384eef0fcdcc171719 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_MeshUtils.cxx
+++ b/src/SMESHGUI/SMESHGUI_MeshUtils.cxx
@@ -1,23 +1,23 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
+// 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
+// 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
 //
 
 // SMESH SMESHGUI : GUI for SMESH component
@@ -94,32 +94,32 @@ namespace SMESH
       _PTR(SObject) p = theParent;
       if ( !p ) p = aStudy->FindComponent( "SMESH" );
       if ( p ) {
-       _PTR(ChildIterator) iter = aStudy->NewChildIterator( p );
-       int idx = 0;
-       while( true ) {
-         bool found = false;
-         for ( ; iter->More(); iter->Next() ) {
-           _PTR(SObject) so = iter->Value();
-           if ( !so ) continue; // skip bad objects
-           _PTR(SObject) ref;
-           if ( so->ReferencedObject( ref ) ) continue; // skip references
-           QString n = so->GetName().c_str();
-           if ( !n.isEmpty() && n == name ) {
-             QStringList names = name.split("_", QString::KeepEmptyParts);
-             if ( names.count() > 0 ) {
-               bool ok;
-               names.last().toInt( &ok );
-               if ( ok )
-                 names.removeLast();
-             }
-             names.append( QString::number( ++idx ) );
-             name = names.join( "_" );
-             found = true;
-             break;
-           }
-         }
-         if ( !found ) break;
-       }
+        _PTR(ChildIterator) iter = aStudy->NewChildIterator( p );
+        int idx = 0;
+        while( true ) {
+          bool found = false;
+          for ( ; iter->More(); iter->Next() ) {
+            _PTR(SObject) so = iter->Value();
+            if ( !so ) continue; // skip bad objects
+            _PTR(SObject) ref;
+            if ( so->ReferencedObject( ref ) ) continue; // skip references
+            QString n = so->GetName().c_str();
+            if ( !n.isEmpty() && n == name ) {
+              QStringList names = name.split("_", QString::KeepEmptyParts);
+              if ( names.count() > 0 ) {
+                bool ok;
+                names.last().toInt( &ok );
+                if ( ok )
+                  names.removeLast();
+              }
+              names.append( QString::number( ++idx ) );
+              name = names.join( "_" );
+              found = true;
+              break;
+            }
+          }
+          if ( !found ) break;
+        }
       }
     }
     return name;