Changeset 1b2aa1 for molecuilder/src/moleculelist.cpp

Timestamp:

Jul 23, 2009, 12:14:13 PM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

f39735

Parents:

a41b50

Message:

Fix indentation from tab to two spaces.

The trouble was caused at the merge e08f45e4539ffcc30e039dec5606cf06b45ab6be. Seemingly, I thought eclipse had pulled some shit which i didn't

File:

• molecuilder/src/moleculelist.cpp (modified) (4 diffs)

molecuilder/src/moleculelist.cpp

@@ -527 +527 @@
 
   // open file for the force factors
-  *out << Verbose(1) << "Saving force factors ... ";
+  *out << Verbose(1) << "Saving  force factors ... ";
   line << path << "/" << FRAGMENTPREFIX << FORCESFILE;
   ForcesFile.open(line.str().c_str(), ios::out);
@@ -695 +695 @@
 MoleculeLeafClass::MoleculeLeafClass(MoleculeLeafClass *PreviousLeaf = NULL)
 {
-  //    if (Up != NULL)
-  //            if (Up->DownLeaf == NULL) // are we the first down leaf for the upper leaf?
-  //                    Up->DownLeaf = this;
-  //    UpLeaf = Up;
-  //    DownLeaf = NULL;
+  //  if (Up != NULL)
+  //    if (Up->DownLeaf == NULL) // are we the first down leaf for the upper leaf?
+  //      Up->DownLeaf = this;
+  //  UpLeaf = Up;
+  //  DownLeaf = NULL;
   Leaf = NULL;
   previous = PreviousLeaf;
@@ -715 +715 @@
 MoleculeLeafClass::~MoleculeLeafClass()
 {
-  //    if (DownLeaf != NULL) {// drop leaves further down
-  //            MoleculeLeafClass *Walker = DownLeaf;
-  //            MoleculeLeafClass *Next;
-  //            do {
-  //                    Next = Walker->NextLeaf;
-  //                    delete(Walker);
-  //                    Walker = Next;
-  //            } while (Walker != NULL);
-  //            // Last Walker sets DownLeaf automatically to NULL
-  //    }
+  //  if (DownLeaf != NULL) {// drop leaves further down
+  //    MoleculeLeafClass *Walker = DownLeaf;
+  //    MoleculeLeafClass *Next;
+  //    do {
+  //      Next = Walker->NextLeaf;
+  //      delete(Walker);
+  //      Walker = Next;
+  //    } while (Walker != NULL);
+  //    // Last Walker sets DownLeaf automatically to NULL
+  //  }
   // remove the leaf itself
   if (Leaf != NULL) {
@@ -733 +733 @@
   if (previous != NULL)
     previous->next = next;
-  //    } else { // we are first in list (connects to UpLeaf->DownLeaf)
-  //            if ((NextLeaf != NULL) && (NextLeaf->UpLeaf == NULL))
-  //                    NextLeaf->UpLeaf = UpLeaf;      // either null as we are top level or the upleaf of the first node
-  //            if (UpLeaf != NULL)
-  //                    UpLeaf->DownLeaf = NextLeaf;    // either null as we are only leaf or NextLeaf if we are just the first
-  //    }
-  //    UpLeaf = NULL;
+  //  } else { // we are first in list (connects to UpLeaf->DownLeaf)
+  //    if ((NextLeaf != NULL) && (NextLeaf->UpLeaf == NULL))
+  //      NextLeaf->UpLeaf = UpLeaf;  // either null as we are top level or the upleaf of the first node
+  //    if (UpLeaf != NULL)
+  //      UpLeaf->DownLeaf = NextLeaf;  // either null as we are only leaf or NextLeaf if we are just the first
+  //  }
+  //  UpLeaf = NULL;
   if (next != NULL) // are we last in list
     next->previous = previous;