Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Problems found due to execution of MESH-075 GUI scenario
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_Utils.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_Utils.cxx
b/src/SMESHGUI/SMESHGUI_Utils.cxx
index 26f3619842b38644508ccee37c59714ebd94002b..d539ac8a076aa8ef61c8ad14c94e343fb03f25e3 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_Utils.cxx
+++ b/
src/SMESHGUI/SMESHGUI_Utils.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
3
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
4
CEA/DEN, EDF R&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
@@
-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
// This library is free software; you can redistribute it and/or
// modify it 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
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-215,10
+215,10
@@
namespace SMESH
SalomeApp_Application* app = dynamic_cast<SalomeApp_Application*>
(SUIT_Session::session()->activeApplication());
if ( app ) {
SalomeApp_Application* app = dynamic_cast<SalomeApp_Application*>
(SUIT_Session::session()->activeApplication());
if ( app ) {
-
QString IOR
= app->orb()->object_to_string( theObject );
+
CORBA::String_var ior
= app->orb()->object_to_string( theObject );
SalomeApp_Study* study = dynamic_cast<SalomeApp_Study*>( app->activeStudy() );
SalomeApp_Study* study = dynamic_cast<SalomeApp_Study*>( app->activeStudy() );
- if ( study &&
!IOR.isEmpty()
)
- res = study->studyDS()->FindObjectIOR(
IOR.toLatin1().constData
() );
+ if ( study &&
strlen( ior ) > 0
)
+ res = study->studyDS()->FindObjectIOR(
ior.in
() );
}
return res;
}
}
return res;
}