Changeset 0f9eb0

Timestamp:

Apr 23, 2021, 8:51:43 PM (5 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

Candidate_v1.7.0, stable

Children:

d951a5

Parents:

49874c

git-author:

Frederik Heber <frederik.heber@…> (11/27/20 20:25:21)

git-committer:

Frederik Heber <frederik.heber@…> (04/23/21 20:51:43)

Message:

Modified fstream checks to good() or eof().

• not using != or == NULL.

Location:

src

Files:

• Element/periodentafel.cpp (modified) (2 diffs)
• Filling/Inserter/RandomInserter.cpp (modified) (1 diff)
• Fragmentation/Graph.cpp (modified) (2 diffs)
• Fragmentation/MatrixContainer.cpp (modified) (2 diffs)
• UIElements/Views/Qt4/QtToolBar_QtFavoriteActions.cpp (modified) (1 diff)

src/Element/periodentafel.cpp

@@ -695 +695 @@
   strncat(filename, STANDARDELEMENTSDB, MAXSTRINGSIZE-strlen(filename));
   f.open(filename);
-  if (f != NULL) {
+  if (f.good()) {
     f << header1 << endl;
     f << header2 << endl;
@@ -703 +703 @@
     f.close();
     return true;
-  } else
-    return result;
+  }
+  return result;
 };
 

src/Filling/Inserter/RandomInserter.cpp

@@ -221 +221 @@
     std::vector<Vector> RandomAtomTranslations(atoms.size(), zeroVec);
     std::generate_n(RandomAtomTranslations.begin(), atoms.size(),
-        boost::bind(&RandomInserter::getRandomVector, boost::cref(this), MaxAtomComponent, -MaxAtomComponent));
+        boost::bind(&RandomInserter::getRandomVector, this, MaxAtomComponent, -MaxAtomComponent));
 
     // apply!

src/Fragmentation/Graph.cpp

@@ -182 +182 @@
   sprintf(filename, "%s/%s%s", path, FRAGMENTPREFIX, TEFACTORSFILE);
   InputFile.open(filename);
-  if (InputFile != NULL) {
+  if (InputFile.good()) {
     // 3. add found TEFactors to each keyset
     NumberOfFragments = 0;
@@ -225 +225 @@
   output.open(line.c_str(), ios::out);
   LOG(1, "INFO: Saving TEFactors of the total graph ... ");
-  if(output != NULL) {
+  if(output.good()) {
     for(Graph::const_iterator runner = begin(); runner != end(); runner++)
       output << (*runner).second.second << endl;

src/Fragmentation/MatrixContainer.cpp

@@ -492 +492 @@
     delete[](FragmentNumber);
     output.open(line.str().c_str(), ios::out);
-    if (output == NULL) {
+    if (!output.good()) {
       ELOG(0, "MatrixContainer::WriteTotalFragments: Unable to open output energy file " << line.str() << "!");
       performCriticalExit();
@@ -522 +522 @@
   line << name << prefix << suffix;
   output.open(line.str().c_str(), ios::out);
-  if (output == NULL) {
+  if (output.eof()) {
     ELOG(0, "MatrixContainer::WriteLastMatrix: Unable to open output matrix file " << line.str() << "!");
     performCriticalExit();

src/UIElements/Views/Qt4/QtToolBar_QtFavoriteActions.cpp

@@ -62 +62 @@
   LastActionCalled(
       ActionQueue::getPointer(),
-      boost::bind(&QtToolBar::QtFavoriteActions::updateQueuedAction, boost::cref(this)),
+      boost::bind(&QtToolBar::QtFavoriteActions::updateQueuedAction, this),
       "QtFavoriteActions_QueuedAction",
       std::string(""),