To separate CORBA and C++ methods in an explicit way

diff --git a/src/VISU_I/VISU_ScalarMapOnDeformedShape_i.cc b/src/VISU_I/VISU_ScalarMapOnDeformedShape_i.cc
index 7d4cc2119091aae85f0a994bf91b3c9a91474136..8d6a77c65b17198f11aeb5fdbbd85046d59f41af 100644 (file)
--- a/src/VISU_I/VISU_ScalarMapOnDeformedShape_i.cc
+++ b/src/VISU_I/VISU_ScalarMapOnDeformedShape_i.cc
@@ -152,7 +152,7 @@ VISU::ScalarMapOnDeformedShape_i
   SetScalarMeshName(theMeshName);
   int anEntity = theEntity;
   SetScalarEntity(VISU::TEntity(anEntity));
-  SetScalarField(myScalarMeshName.c_str(),myScalarFieldName.c_str(),myScalarIteration,myScalarEntity);
+  SetCScalarField(myScalarMeshName,myScalarFieldName,myScalarIteration,myScalarEntity);
   return aRes;
 }
 
@@ -168,10 +168,10 @@ VISU::ScalarMapOnDeformedShape_i
   SetScalarMeshName(VISU::Storable::FindValue(theMap,"myScalarMeshName"));
   SetScalarIteration(VISU::Storable::FindValue(theMap,"myScalarIteration").toInt());
   SetScalarEntity(VISU::TEntity(VISU::Storable::FindValue(theMap,"myScalarEntity").toInt()));
-  SetScalarField(GetScalarMeshName().c_str(),
-                GetScalarFieldName().c_str(),
-                GetScalarIteration(),
-                GetScalarEntity());
+  SetCScalarField(GetScalarMeshName(),
+                 GetScalarFieldName(),
+                 GetScalarIteration(),
+                 GetScalarEntity());
   
   SetScale(VISU::Storable::FindValue(theMap,"myFactor").toDouble());
   myIsColored = VISU::Storable::FindValue(theMap,"myIsColored").toInt();
@@ -225,10 +225,10 @@ VISU::ScalarMapOnDeformedShape_i
   if(const ScalarMapOnDeformedShape_i* aPrs3d = dynamic_cast<const ScalarMapOnDeformedShape_i*>(theOrigin)){
     ScalarMapOnDeformedShape_i* anOrigin = const_cast<ScalarMapOnDeformedShape_i*>(aPrs3d);
     
-    this->SetScalarField(anOrigin->GetScalarMeshName().c_str(),
-                        anOrigin->GetScalarFieldName().c_str(),
-                        theScalarIter,
-                        anOrigin->GetScalarEntity());
+    this->SetCScalarField(anOrigin->GetScalarMeshName(),
+                         anOrigin->GetScalarFieldName(),
+                         theScalarIter,
+                         anOrigin->GetScalarEntity());
     Update();
   }
 }
@@ -387,10 +387,10 @@ VISU::ScalarMapOnDeformedShape_i
 //---------------------------------------------------------------
 void
 VISU::ScalarMapOnDeformedShape_i
-::SetScalarField(const std::string& theMeshName,
-                const std::string& theFieldName,
-                int   theIteration,
-                VISU::TEntity  theEntity)
+::SetCScalarField(const std::string& theMeshName,
+                 const std::string& theFieldName,
+                 int   theIteration,
+                 VISU::TEntity  theEntity)
 {
   VISU::Result_i::TInput* anInput = GetCResult()->GetInput();
   SetField(anInput->GetField(theMeshName,theEntity,theFieldName));
@@ -417,7 +417,7 @@ VISU::ScalarMapOnDeformedShape_i
                 CORBA::Long  theIteration,
                 VISU::Entity  theEntity)
 {
-  this->SetScalarField(theMeshName,theFieldName,(int)theIteration,VISU::TEntity(theEntity));
+  this->SetCScalarField(theMeshName,theFieldName,(int)theIteration,VISU::TEntity(theEntity));
 }
 
 

diff --git a/src/VISU_I/VISU_ScalarMapOnDeformedShape_i.hh b/src/VISU_I/VISU_ScalarMapOnDeformedShape_i.hh
index 10b770d8f1622ec0caa380d7429d80d8baaf6943..bf62f4616eb9bd5f863b29469fa688fe5ae10584 100644 (file)
--- a/src/VISU_I/VISU_ScalarMapOnDeformedShape_i.hh
+++ b/src/VISU_I/VISU_ScalarMapOnDeformedShape_i.hh
@@ -183,10 +183,10 @@ namespace VISU
 
     virtual
     void
-    SetScalarField(const std::string& theMeshName,
-                  const std::string& theFieldName,
-                  int   theIteration,
-                  VISU::TEntity  theEntity);
+    SetCScalarField(const std::string& theMeshName,
+                   const std::string& theFieldName,
+                   int   theIteration,
+                   VISU::TEntity  theEntity);
     
     virtual 
     void