[CEA 13302] Policy for c++ files ? using namespaces in c++ header files. boost_ptr...

diff --git a/src/TreeData/DataModel.cxx b/src/TreeData/DataModel.cxx
index 872c31581c3b3a3dabc78285a2b07a0a985edfce..1b0c746e7b4c994d5444f34b5cd3a763cbde43f7 100644 (file)
--- a/src/TreeData/DataModel.cxx
+++ b/src/TreeData/DataModel.cxx
@@ -33,7 +33,7 @@ bool DataModel::addDataObject(DataObject * dataObject) {
   _mapDataObjects[dataObject->getNameId()] = dataObject;
   return true;
 }
-bool DataModel::removeDataObject(string nameId) {
+bool DataModel::removeDataObject(std::string nameId) {
   _mapDataObjects.erase(nameId);
   return true;
 }
@@ -42,16 +42,16 @@ bool DataModel::removeDataObject(DataObject * dataObject) {
   return removeDataObject(dataObject->getNameId());
 }
 
-DataObject * DataModel::getDataObject(string id) {
+DataObject * DataModel::getDataObject(std::string id) {
   return _mapDataObjects[id];
 }
 
 
 
-map<string, DataObject *>::iterator DataModel::begin() {
+std::map<std::string, DataObject *>::iterator DataModel::begin() {
   return _mapDataObjects.begin();
 }
 
-map<string, DataObject *>::iterator DataModel::end() {
+std::map<std::string, DataObject *>::iterator DataModel::end() {
   return _mapDataObjects.end();
 }

diff --git a/src/TreeData/DataModel.hxx b/src/TreeData/DataModel.hxx
index 677d1f978f2189ea67aaf85cd5338a5d9cd28982..911370a2ebb6a5d535711b6becc1015808fd08cb 100644 (file)
--- a/src/TreeData/DataModel.hxx
+++ b/src/TreeData/DataModel.hxx
@@ -47,16 +47,16 @@ public:
   /*! Function to add data object to the model */
   bool addDataObject(DataObject * dataObject);
   /*! Functions to remove data object from the model */
-  bool removeDataObject(string nameId);
+  bool removeDataObject(std::string nameId);
   bool removeDataObject(DataObject * dataObject);
   /*! Function to retrieve a data object in the model */
-  DataObject * getDataObject(string nameId);
+  DataObject * getDataObject(std::string nameId);
 
-  map<string, DataObject *>::iterator begin();
-  map<string, DataObject *>::iterator end();
+  std::map<std::string, DataObject *>::iterator begin();
+  std::map<std::string, DataObject *>::iterator end();
 
 private:
-  map<string, DataObject *> _mapDataObjects;
+  std::map<std::string, DataObject *> _mapDataObjects;
   
 
 };

diff --git a/src/TreeData/DataObject.cxx b/src/TreeData/DataObject.cxx
index c7b10da8bee210e6c9ee00f72d209196bd1ad5fe..4867da2567f09fc7feba3400388160d86c811ec9 100644 (file)
--- a/src/TreeData/DataObject.cxx
+++ b/src/TreeData/DataObject.cxx
@@ -24,8 +24,8 @@
 
 // Static assignement
 int DataObject::_lastId=0;
-const string DataObject::_BASENAME = string("object_");
-const string DataObject::pathsep = string("/");
+const std::string DataObject::_BASENAME = std::string("object_");
+const std::string DataObject::pathsep = std::string("/");
 
 DataObject::DataObject() {
   _nameId = _BASENAME+ToString(_lastId);
@@ -39,33 +39,33 @@ DataObject::~DataObject() {
   _properties.clear();
 }
 
-void DataObject::setLabel(string label) {
+void DataObject::setLabel(std::string label) {
   _label = label;
 }
-string DataObject::getLabel() {
+std::string DataObject::getLabel() {
   return _label;
 }
 
-string DataObject::getPathName() {
-  string pathName;
+std::string DataObject::getPathName() {
+  std::string pathName;
   pathName = this->getPath() + pathsep + this->getLabel();
   return pathName;
 }
 
 
-string DataObject::getNameId() {
+std::string DataObject::getNameId() {
   return _nameId;
 }
 
-void DataObject::setProperty(string key, string value) {
+void DataObject::setProperty(std::string key, std::string value) {
   _properties[key] = value;
 }
-string DataObject::getProperty(string key) {
+std::string DataObject::getProperty(std::string key) {
   return _properties[key];
 }
 
-string DataObject::toString() {
-  string serialize="\n";
+std::string DataObject::toString() {
+  std::string serialize="\n";
   serialize+="nameId = "+getNameId()+"\n";
   serialize+="label  = "+getLabel()+"\n";
   serialize+="path   = "+getPath();

diff --git a/src/TreeData/DataObject.hxx b/src/TreeData/DataObject.hxx
index 57f4356c92a434467198c0462d09e3cd0310dc43..fd4b440eaac47ec729ff30e6ccfd950db5ab2cde 100644 (file)
--- a/src/TreeData/DataObject.hxx
+++ b/src/TreeData/DataObject.hxx
@@ -26,7 +26,6 @@
 
 #include <map>
 #include <string>
-using namespace std;
 
 class TREEDATA_EXPORT DataObject {
 
@@ -34,35 +33,35 @@ public:
   DataObject();
   ~DataObject();
 
-  void setLabel(string label);
-  string getLabel();
-  void setProperty(string key, string value);
-  string getProperty(string key);
+  void setLabel(std::string label);
+  std::string getLabel();
+  void setProperty(std::string key, std::string value);
+  std::string getProperty(std::string key);
 
   /*!
    * This function specifies the localization of the object in the
    * hierarchical organization that can be defined by the DataModel it
    * belongs to.
    */
-  virtual string getPath() = 0;
-  string getPathName();
-  string getNameId();
+  virtual std::string getPath() = 0;
+  std::string getPathName();
+  std::string getNameId();
 
-  static const string pathsep;
+  static const std::string pathsep;
 
   /*! This function can be used for debug */
-  string toString();
+  std::string toString();
 
 private:
   /*! The name this object can be displayed with */
-  string _label;
+  std::string _label;
   /*! The identifier of this object. An identifier is invariant all the session long */
-  string _nameId;
+  std::string _nameId;
   /*! The dictionnary of properties that characterize this object */
-  map<string, string> _properties;
+  std::map<std::string, std::string> _properties;
 
   static int _lastId;
-  static const string _BASENAME;
+  static const std::string _BASENAME;
 };
 
 #endif // DATAOBJECT_H

diff --git a/src/TreeData/Test/MyDataModel.cxx b/src/TreeData/Test/MyDataModel.cxx
index 224358e064e7aa26eed51c85adc38040b2c88b80..0fce394f66b81fb3d7b1e139c8cd4cc4cadce287 100644 (file)
--- a/src/TreeData/Test/MyDataModel.cxx
+++ b/src/TreeData/Test/MyDataModel.cxx
@@ -25,9 +25,9 @@
 // =================================================================
 //
 
-const string MyDataObject::PROPERTY_KEY_TYPE    = "type";
-const string MyDataObject::PROPERTY_KEY_CIRCUIT ="circuit";
-const string MyDataObject::PROPERTY_KEY_REPFONC ="rf";
+const std::string MyDataObject::PROPERTY_KEY_TYPE    = "type";
+const std::string MyDataObject::PROPERTY_KEY_CIRCUIT ="circuit";
+const std::string MyDataObject::PROPERTY_KEY_REPFONC ="rf";
 
 MyDataObject::MyDataObject() : DataObject() {
   this->setProperty(PROPERTY_KEY_TYPE, "Tuyauterie");
@@ -38,15 +38,15 @@ MyDataObject::MyDataObject() : DataObject() {
 /*! This function specified the localization of the object in the
  * hierarchical organization
  */
-string MyDataObject::getPath() {
+std::string MyDataObject::getPath() {
   // We choose here a convention for organizing the path for this
   // class of object.
   /*
-  string path = getProperty(PROPERTY_KEY_CIRCUIT) + pathsep
+  std::string path = getProperty(PROPERTY_KEY_CIRCUIT) + pathsep
     + getProperty(PROPERTY_KEY_REPFONC) + pathsep
     + getProperty(PROPERTY_KEY_TYPE);
   */
-  string path = getProperty(PROPERTY_KEY_TYPE) + pathsep
+  std::string path = getProperty(PROPERTY_KEY_TYPE) + pathsep
     + getProperty(PROPERTY_KEY_CIRCUIT) + pathsep
     + getProperty(PROPERTY_KEY_REPFONC);
     

diff --git a/src/TreeData/Test/MyDataModel.hxx b/src/TreeData/Test/MyDataModel.hxx
index 44ee7c79a28165a3f19ff19b57af375287298805..7a35dd75a7da59f9869ef3163ca096ec1031e480 100644 (file)
--- a/src/TreeData/Test/MyDataModel.hxx
+++ b/src/TreeData/Test/MyDataModel.hxx
@@ -31,10 +31,10 @@
 class MyDataObject: public DataObject {
 public:
   MyDataObject();
-  virtual string getPath();
-  static const string PROPERTY_KEY_TYPE;
-  static const string PROPERTY_KEY_CIRCUIT;
-  static const string PROPERTY_KEY_REPFONC;
+  virtual std::string getPath();
+  static const std::string PROPERTY_KEY_TYPE;
+  static const std::string PROPERTY_KEY_CIRCUIT;
+  static const std::string PROPERTY_KEY_REPFONC;
 };
 
 

diff --git a/src/TreeData/Test/tester.cxx b/src/TreeData/Test/tester.cxx
index ca6b6ea643f07f81b7423593d97333681d7315ec..ff54e6a5e253dbc5ee46b6a7cdb85e77e7a0d7a6 100644 (file)
--- a/src/TreeData/Test/tester.cxx
+++ b/src/TreeData/Test/tester.cxx
@@ -48,7 +48,7 @@ void TEST_DataModel() {
   MyDataModel * dataModel = new MyDataModel();
 
   int refIter = 53;
-  string refNameId;
+  std::string refNameId;
 
   DataObject * dataObject;
   for (int i=0; i<100; i++) {