X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_VisualStateOp.cxx;h=ea61932778d854da71352aae2eb593d12d408dce;hb=a53349567d67f4df0ef737798a25c24d9dc8f08e;hp=58c97b42c62b6d4570ed077aca5d5ebcd21ed151;hpb=89d5a8fa1a630d86a352d32ffd7689c2660e52d2;p=modules%2Fhydro.git diff --git a/src/HYDROGUI/HYDROGUI_VisualStateOp.cxx b/src/HYDROGUI/HYDROGUI_VisualStateOp.cxx index 58c97b42..ea619327 100644 --- a/src/HYDROGUI/HYDROGUI_VisualStateOp.cxx +++ b/src/HYDROGUI/HYDROGUI_VisualStateOp.cxx @@ -1,12 +1,8 @@ -// Copyright (C) 2007-2013 CEA/DEN, EDF R&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) 2014-2015 EDF-R&D // This library is free software; you can redistribute it and/or // modify it 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 @@ -169,7 +165,7 @@ bool HYDROGUI_VisualStateOp::saveVisualState() //printf( "--- SetState -----------\n" ); //printf( "%s\n", qPrintable( aState ) ); //printf( "------------------------\n" ); - aVisualState->SetState( aState ); + aVisualState->SetState( aState.toStdString() ); module()->update( UF_Model ); @@ -185,7 +181,7 @@ bool HYDROGUI_VisualStateOp::loadVisualState() if( aVisualState.IsNull() ) return false; - QString aState = aVisualState->GetState(); + QString aState = QString::fromStdString( aVisualState->GetState() ); //printf( "--- GetState -----------\n" ); //printf( "%s\n", qPrintable( aState ) ); //printf( "------------------------\n" );