Additional commit for '[CEA 13302] Policy for c++ files ? using namespaces in c+...

diff --git a/src/MEDCalc/gui/WorkspaceController.cxx b/src/MEDCalc/gui/WorkspaceController.cxx
index 97235c63a3b8835eb735044ade2eb46aee44912e..6ad3394b3ea54aa07599d2f5fe78df3265ece657 100644 (file)
--- a/src/MEDCalc/gui/WorkspaceController.cxx
+++ b/src/MEDCalc/gui/WorkspaceController.cxx
@@ -288,7 +288,7 @@ void WorkspaceController::processMedEvent(const MEDCALC::MedEvent* event) {
   }
   else if ( event->type == MEDCALC::EVENT_REMOVE_FROM_WORKSPACE ) {
     STDLOG("remove field");
-    std::map<string, DataObject*>::iterator itr = dataModel->begin();
+    std::map<std::string, DataObject*>::iterator itr = dataModel->begin();
     for ( ; itr != dataModel->end(); ++itr) {
       XmedDataObject* obj = dynamic_cast<XmedDataObject*>(itr->second);
       if (obj->getFieldHandler()->id == event->dataId) {
@@ -301,7 +301,7 @@ void WorkspaceController::processMedEvent(const MEDCALC::MedEvent* event) {
   }
   else if ( event->type == MEDCALC::EVENT_CLEAN_WORKSPACE ) {
     STDLOG("clean workspace");
-    std::map<string, DataObject*>::iterator itr = dataModel->begin();
+    std::map<std::string, DataObject*>::iterator itr = dataModel->begin();
     for ( ; itr != dataModel->end(); ++itr) {
       XmedDataObject* obj = dynamic_cast<XmedDataObject*>(itr->second);
       std::string itemNameId = obj->getNameId();

diff --git a/src/MEDCalc/gui/XmedDataModel.cxx b/src/MEDCalc/gui/XmedDataModel.cxx
index b35a4d29a37b90eacd4d7e73fe2101643fcf31d5..8cec784123b83e535745506ab3ec8280165f31d3 100644 (file)
--- a/src/MEDCalc/gui/XmedDataModel.cxx
+++ b/src/MEDCalc/gui/XmedDataModel.cxx
@@ -33,16 +33,16 @@ XmedDataObject::XmedDataObject() : DataObject(), _presId(-1) {
 /*! This function specified the localization of the object in the
  * hierarchical organization
  */
-string XmedDataObject::getPath() {
-  string path =
-    string(_fieldHandler.meshname) + pathsep +
+std::string XmedDataObject::getPath() {
+  std::string path =
+    std::string(_fieldHandler.meshname) + pathsep +
     _getTypedFieldLabel();
   return path;
 }
 
 void XmedDataObject::setFieldHandler(MEDCALC::FieldHandler fieldHandler) {
   _fieldHandler = fieldHandler;
-  this->setLabel(string("it = ")+ToString(_fieldHandler.iteration));
+  this->setLabel(std::string("it = ")+ToString(_fieldHandler.iteration));
 }
 MEDCALC::FieldHandler * XmedDataObject::getFieldHandler() {
   return &_fieldHandler;
@@ -59,7 +59,7 @@ int XmedDataObject::getPresentationId() const { return _presId; }
  * This function implements the convention for displaying a fieldname
  * characterized by its spatial discretisation type.
  */
-string XmedDataObject::_getTypedFieldLabel() {
+std::string XmedDataObject::_getTypedFieldLabel() {
   // A field name could identify several MEDCoupling fields, that
   // differ by their spatial discretization on the mesh (values on
   // cells, values on nodes, ...). This spatial discretization is
@@ -71,10 +71,10 @@ string XmedDataObject::_getTypedFieldLabel() {
   // 3 = ON_GAUSS_NE
   if ( _fieldHandler.type < 0 ||
        _fieldHandler.type >= NB_TYPE_OF_FIELDS ) {
-    return string("UNKNOWN");
+    return std::string("UNKNOWN");
   }
-  string label(_fieldHandler.fieldname);
-  label +=" ("+string(mapTypeOfFieldLabel[_fieldHandler.type])+")";
+  std::string label(_fieldHandler.fieldname);
+  label +=" ("+std::string(mapTypeOfFieldLabel[_fieldHandler.type])+")";
   return label;
 }
 

diff --git a/src/MEDCalc/gui/XmedDataModel.hxx b/src/MEDCalc/gui/XmedDataModel.hxx
index 6630b95d4c5b8e5b6d330a489a94ef0b8a151c87..71c08431aa2e9e238d4f9dc69d03ca1caa4300f9 100644 (file)
--- a/src/MEDCalc/gui/XmedDataModel.hxx
+++ b/src/MEDCalc/gui/XmedDataModel.hxx
@@ -35,7 +35,7 @@
 class MEDCALCGUI_EXPORT XmedDataObject: public DataObject {
 public:
   XmedDataObject();
-  virtual string getPath();
+  virtual std::string getPath();
 
   void setFieldHandler(MEDCALC::FieldHandler fieldHandler);
   MEDCALC::FieldHandler * getFieldHandler();
@@ -46,7 +46,7 @@ public:
 private:
   MEDCALC::FieldHandler _fieldHandler;
   int _presId;
-  string _getTypedFieldLabel();
+  std::string _getTypedFieldLabel();
 };
 
 //