Get rid of Qt classes in the data model.

diff --git a/src/HYDROData/HYDROData_VisualState.cxx b/src/HYDROData/HYDROData_VisualState.cxx
index 6c081bcfc7301fcb322f8a4c72830dde9d7dc9c2..0b83aa09644ebaf8df92f6c77a1011c3d3ff5a8b 100644 (file)
--- a/src/HYDROData/HYDROData_VisualState.cxx
+++ b/src/HYDROData/HYDROData_VisualState.cxx
@@ -15,20 +15,20 @@ HYDROData_VisualState::~HYDROData_VisualState()
 {
 }
 
-void HYDROData_VisualState::SetState( const QString& theState )
+void HYDROData_VisualState::SetState( const std::string& theState )
 {
   TCollection_AsciiString aString;
   Handle(TDataStd_AsciiString) aState;
   if( !myLab.FindAttribute( TDataStd_AsciiString::GetID(), aState ) )
     aState = TDataStd_AsciiString::Set( myLab, aString );
-  aString.AssignCat( theState.toLatin1().constData() );
+  aString.AssignCat( theState.c_str() );
   aState->Set( aString );
 }
 
-QString HYDROData_VisualState::GetState() const
+std::string HYDROData_VisualState::GetState() const
 {
   Handle(TDataStd_AsciiString) aState;
   if( !myLab.FindAttribute( TDataStd_AsciiString::GetID(), aState ) )
-    return QString();
-  return QString( aState->Get().ToCString() );
+    return std::string();
+  return std::string( aState->Get().ToCString() );
 }

diff --git a/src/HYDROData/HYDROData_VisualState.h b/src/HYDROData/HYDROData_VisualState.h
index 72b8f2c783b2168a131e5bee6ea30d1e3107dd1f..a675eb32b792dc93026044431e02ac6af06423b6 100644 (file)
--- a/src/HYDROData/HYDROData_VisualState.h
+++ b/src/HYDROData/HYDROData_VisualState.h
@@ -4,8 +4,6 @@
 
 #include <HYDROData_Entity.h>
 
-#include <QString>
-
 DEFINE_STANDARD_HANDLE(HYDROData_VisualState, HYDROData_Entity)
 
 /**\class HYDROData_VisualState
@@ -37,12 +35,12 @@ public:
    * Stores the encoded visual state
    * \param theState new state
    */
-  HYDRODATA_EXPORT void SetState( const QString& theState );
+  HYDRODATA_EXPORT void SetState( const std::string& theState );
 
   /**
    * Returns the encoded visual state
    */
-  HYDRODATA_EXPORT QString GetState() const;
+  HYDRODATA_EXPORT std::string GetState() const;
 
 protected:
 

diff --git a/src/HYDROGUI/HYDROGUI_VisualStateOp.cxx b/src/HYDROGUI/HYDROGUI_VisualStateOp.cxx
index 58c97b42c62b6d4570ed077aca5d5ebcd21ed151..d9e11499cde63eaade50ebd404af738ec4ff7435 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_VisualStateOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_VisualStateOp.cxx
@@ -169,7 +169,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 +185,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" );