Changes in src/bond.cpp [1513a74:b8d4a3]

File:

• src/bond.cpp (modified) (6 diffs)

src/bond.cpp

@@ -15 +15 @@
 /** Empty Constructor for class bond.
  */
-bond::bond() : leftatom(NULL), rightatom(NULL), previous(NULL), next(NULL), HydrogenBond(0), BondDegree(0), nr(-1), Cyclic(false), Type(Undetermined), Used(white)
+bond::bond()
+  : leftatom(NULL), rightatom(NULL), previous(NULL), next(NULL), HydrogenBond(0),
+    BondDegree(0), nr(-1), Cyclic(false), Type(Undetermined), Used(white)
 {
 };
@@ -25 +27 @@
  * \param number increasing index
  */
-bond::bond(atom *left, atom *right, const int degree, const int number) : leftatom(left), rightatom(right), previous(NULL), next(NULL), HydrogenBond(0), BondDegree(degree), nr(number), Cyclic(false), Type(Undetermined), Used(white)
+bond::bond(atom *left, atom *right, const int degree, const int number)
+  : leftatom(left), rightatom(right), previous(NULL), next(NULL), HydrogenBond(0),
+    BondDegree(degree), nr(number), Cyclic(false), Type(Undetermined), Used(white)
 {
   if ((left != NULL) && (right != NULL)) {
@@ -63 +67 @@
   if(rightatom == Atom) 
     return leftatom;
-  DoeLog(1) && (eLog()<< Verbose(1) << "Bond " << *this << " does not contain atom " << *Atom << "!" << endl);
+  eLog() << Verbose(1) << "Bond " << *this << " does not contain atom " << *Atom << "!" << endl;
   return NULL;
 };
@@ -99 +103 @@
 bool bond::MarkUsed(const enum Shading color) {
   if (Used == black) {
-    DoeLog(1) && (eLog()<< Verbose(1) << "Bond " << this << " was already marked black!." << endl);
+    eLog() << Verbose(1) << "Bond " << this << " was already marked black!." << endl;
     return false;
   } else {
@@ -119 +123 @@
 double bond::GetDistance() const
 {
-  return (leftatom->node->distance(*rightatom->node));
+  return (leftatom->node->Distance(rightatom->node));
 };
 
@@ -127 +131 @@
 double bond::GetDistanceSquared() const
 {
-  return (leftatom->node->DistanceSquared(*rightatom->node));
+  return (leftatom->node->DistanceSquared(rightatom->node));
 };