X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_MeshUtils.cxx;h=72bbcaa1f11fb7e6192f59765bc619dab12e4b9d;hp=b6036d4de0a2527fa93899410bdef242b9a61bbe;hb=6d32f944a0a115b6419184c50b57bf7c4eef5786;hpb=251eb76e54c7de6f6918e24796468f6dd51df7a1 diff --git a/src/SMESHGUI/SMESHGUI_MeshUtils.cxx b/src/SMESHGUI/SMESHGUI_MeshUtils.cxx index b6036d4de..72bbcaa1f 100644 --- a/src/SMESHGUI/SMESHGUI_MeshUtils.cxx +++ b/src/SMESHGUI/SMESHGUI_MeshUtils.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2019 CEA/DEN, EDF R&D, OPEN CASCADE // // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -6,7 +6,7 @@ // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public // License as published by the Free Software Foundation; either -// version 2.1 of the License. +// version 2.1 of the License, or (at your option) any later version. // // This library is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -64,9 +64,9 @@ namespace SMESH { QString baseName = thePostfix.isEmpty() ? theBaseName : theBaseName + "_" + thePostfix; - if ( _PTR(Study) aStudy = GetActiveStudyDocument() ) { + if ( _PTR(Study) aStudy = getStudy() ) { QString name = baseName; - while ( !aStudy->FindObjectByName( name.toLatin1().data(), "SMESH" ).empty() ) { + while ( !aStudy->FindObjectByName( name.toUtf8().data(), "SMESH" ).empty() ) { int nb = 0; QStringList names = name.split("_", QString::KeepEmptyParts); if ( names.count() > 0 ) { @@ -90,7 +90,7 @@ namespace SMESH QString baseName = thePostfix.isEmpty() ? theBaseName : theBaseName + "_" + thePostfix; QString name = baseName; - if ( _PTR(Study) aStudy = GetActiveStudyDocument() ) { + if ( _PTR(Study) aStudy = getStudy() ) { _PTR(SObject) p = theParent; if ( !p ) p = aStudy->FindComponent( "SMESH" ); if ( p ) {