Changes in src/element.cpp [e345e3:2a76b0]

File:

• src/element.cpp (modified) (3 diffs)

src/element.cpp

@@ -23 +23 @@
   VanDerWaalsRadius(0),
         Z(-1),
-        previous(NULL),
-        next(NULL),
-        sort(NULL),
         Valence(0),
         NoValenceOrbitals(0)
@@ -31 +28 @@
 };
 
+element::element(const element &src) :
+  mass(src.mass),
+  CovalentRadius(src.CovalentRadius),
+  VanDerWaalsRadius(src.VanDerWaalsRadius),
+  Z(src.Z),
+  Valence(src.Valence),
+  NoValenceOrbitals(src.NoValenceOrbitals),
+  name(src.name),
+  symbol(src.symbol)
+{
+  strncpy(period,src.period,strfield_length+1);
+  strncpy(group,src.group,strfield_length+1);
+  strncpy(block,src.block,strfield_length+1);
+}
+
 /** Destructor of class element.
  */
 element::~element() {};
+
+element &element::operator=(const element &src){
+  if(this!=&src){
+    mass=src.mass;
+    CovalentRadius=src.CovalentRadius;
+    VanDerWaalsRadius=src.VanDerWaalsRadius;
+    Z=src.Z;
+    Valence=src.Valence;
+    NoValenceOrbitals=src.NoValenceOrbitals;
+    name=src.name;
+    symbol=src.symbol;
+    strncpy(period,src.period,strfield_length+1);
+    strncpy(group,src.group,strfield_length+1);
+    strncpy(block,src.block,strfield_length+1);
+  }
+  return *this;
+}
 
 /** Prints element data to \a *out.
@@ -66 +95 @@
 }
 
-string element::getSymbol() const{
-  return string(symbol);
+string &element::getSymbol(){
+  return symbol;
 }
 
-std::string element::getName() const{
-  return string(name);
+const string &element::getSymbol() const{
+  return symbol;
+}
+
+std::string &element::getName(){
+  return name;
+}
+
+const std::string &element::getName() const{
+  return name;
 }