Tidy: modernize-use-nullptr

[alexxy/gromacs.git] / src / gromacs / gmxpreprocess / convparm.cpp

diff --git a/src/gromacs/gmxpreprocess/convparm.cpp b/src/gromacs/gmxpreprocess/convparm.cpp
index d2660bc772e4f7e2b45b18c577aa8e742ada6f01..0a2f123d115652568d67ea7e3c861ea1041f52a0 100644 (file)
--- a/src/gromacs/gmxpreprocess/convparm.cpp
+++ b/src/gromacs/gmxpreprocess/convparm.cpp
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 1991-2000, University of Groningen, The Netherlands.
  * Copyright (c) 2001-2004, The GROMACS development team.
- * Copyright (c) 2013,2014,2015,2016, by the GROMACS development team, led by
+ * Copyright (c) 2013,2014,2015,2016,2017, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -586,13 +586,13 @@ void convert_params(int atnr, t_params nbtypes[],
     ffp           = &mtop->ffparams;
     ffp->ntypes   = 0;
     ffp->atnr     = atnr;
-    ffp->functype = NULL;
-    ffp->iparams  = NULL;
+    ffp->functype = nullptr;
+    ffp->iparams  = nullptr;
     ffp->reppow   = reppow;
 
-    enter_function(&(nbtypes[F_LJ]),  (t_functype)F_LJ,    comb, reppow, ffp, NULL,
+    enter_function(&(nbtypes[F_LJ]),  (t_functype)F_LJ,    comb, reppow, ffp, nullptr,
                    &maxtypes, TRUE, TRUE);
-    enter_function(&(nbtypes[F_BHAM]), (t_functype)F_BHAM,  comb, reppow, ffp, NULL,
+    enter_function(&(nbtypes[F_BHAM]), (t_functype)F_BHAM,  comb, reppow, ffp, nullptr,
                    &maxtypes, TRUE, TRUE);
 
     for (mt = 0; mt < mtop->nmoltype; mt++)
@@ -601,7 +601,7 @@ void convert_params(int atnr, t_params nbtypes[],
         for (i = 0; (i < F_NRE); i++)
         {
             molt->ilist[i].nr     = 0;
-            molt->ilist[i].iatoms = NULL;
+            molt->ilist[i].iatoms = nullptr;
 
             plist = mi[mt].plist;
 
@@ -618,7 +618,7 @@ void convert_params(int atnr, t_params nbtypes[],
     }
 
     mtop->bIntermolecularInteractions = FALSE;
-    if (intermolecular_interactions != NULL)
+    if (intermolecular_interactions != nullptr)
     {
         /* Process the intermolecular interaction list */
         snew(mtop->intermolecular_ilist, F_NRE);
@@ -626,7 +626,7 @@ void convert_params(int atnr, t_params nbtypes[],
         for (i = 0; (i < F_NRE); i++)
         {
             mtop->intermolecular_ilist[i].nr     = 0;
-            mtop->intermolecular_ilist[i].iatoms = NULL;
+            mtop->intermolecular_ilist[i].iatoms = nullptr;
 
             plist = intermolecular_interactions->plist;