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

[modules/med.git] / src / MEDCalc / gui / XmedDataModel.hxx

diff --git a/src/MEDCalc/gui/XmedDataModel.hxx b/src/MEDCalc/gui/XmedDataModel.hxx
index 166f4b73ec176b9a7d8c23ea6c73220ee219fe90..71c08431aa2e9e238d4f9dc69d03ca1caa4300f9 100644 (file)
--- a/src/MEDCalc/gui/XmedDataModel.hxx
+++ b/src/MEDCalc/gui/XmedDataModel.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2019  CEA/DEN, 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
@@ -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();
 };
 
 //