Changes in src/periodentafel.cpp [a67d19:717e0c]

File:

• src/periodentafel.cpp (modified) (7 diffs)

src/periodentafel.cpp

@@ -9 +9 @@
 #include <iomanip>
 #include <fstream>
-#include <cstring>
 
 #include "element.hpp"
@@ -49 +48 @@
   pointer->sort = &pointer->Z;
   if (pointer->Z < 1 && pointer->Z >= MAX_ELEMENTS)
-    DoLog(0) && (Log() << Verbose(0) << "Invalid Z number!\n");
+    Log() << Verbose(0) << "Invalid Z number!\n";
   return add(pointer, end);
 };
@@ -104 +103 @@
   int Z;
   do {
-    DoLog(0) && (Log() << Verbose(0) << "Atomic number Z: ");
+    Log() << Verbose(0) << "Atomic number Z: ";
     cin >> Z;
     walker = this->FindElement(Z);  // give type
@@ -118 +117 @@
   element *walker = NULL;
   int Z = -1;
-  DoLog(0) && (Log() << Verbose(0) << "Atomic number: " << Z << endl);
+  Log() << Verbose(0) << "Atomic number: " << Z << endl;
   cin >> Z;
   walker = FindElement(Z);
   if (walker == NULL) {
-    DoLog(0) && (Log() << Verbose(0) << "Element not found in database, please enter." << endl);
+    Log() << Verbose(0) << "Element not found in database, please enter." << endl;
     walker = new element;
     walker->Z = Z;
-    DoLog(0) && (Log() << Verbose(0) << "Mass: " << endl);
+    Log() << Verbose(0) << "Mass: " << endl;
     cin >> walker->mass;
-    DoLog(0) && (Log() << Verbose(0) << "Name [max 64 chars]: " << endl);
+    Log() << Verbose(0) << "Name [max 64 chars]: " << endl;
     cin >> walker->name;
-    DoLog(0) && (Log() << Verbose(0) << "Short form [max 3 chars]: " << endl);
+    Log() << Verbose(0) << "Short form [max 3 chars]: " << endl;
     cin >> walker->symbol;
     periodentafel::AddElement(walker);
@@ -198 +197 @@
     infile.getline(header1, MAXSTRINGSIZE);
     infile.getline(header2, MAXSTRINGSIZE); // skip first two header lines
-    DoLog(0) && (Log() << Verbose(0) <<  "Parsed elements:");
+    Log() << Verbose(0) <<  "Parsed elements:";
     while (!infile.eof()) {
       element *neues = new element;
@@ -220 +219 @@
       //infile >> ws;
       infile >> ws;
-      DoLog(0) && (Log() << Verbose(0) << " " << neues->symbol);
+      Log() << Verbose(0) << " " << neues->symbol;
       //neues->Output((ofstream *)&cout);
       if ((neues->Z > 0) && (neues->Z < MAX_ELEMENTS))
         periodentafel::AddElement(neues);
       else {
-        DoLog(0) && (Log() << Verbose(0) << "Could not parse element: ");
+        Log() << Verbose(0) << "Could not parse element: ";
         neues->Output((ofstream *)&cout);
         delete(neues);
       }
     }
-    DoLog(0) && (Log() << Verbose(0) << endl);
+    Log() << Verbose(0) << endl;
     infile.close();
     infile.clear();
@@ -314 +313 @@
 
   if (!otherstatus)
-    DoeLog(2) && (eLog()<< Verbose(2) << "Something went wrong while parsing the other databases!" << endl);
+    eLog() << Verbose(2) << "Something went wrong while parsing the other databases!" << endl;
 
   return status;