From: apo <apo@opencascade.com>
Date: Thu, 2 Nov 2006 06:14:57 +0000 (+0000)
Subject: To separate CORBA and C++ methods in an explicit way
X-Git-Tag: WP1_2_3_06-10-2006~22
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=ca355598d8ab497469dbda9715978ee205f4d5be;p=modules%2Fvisu.git

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 7d4cc211..8d6a77c6 100644
--- 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 10b770d8..bf62f461 100644
--- 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