Sort all includes in src/gromacs

[alexxy/gromacs.git] / src / gromacs / topology / residuetypes.cpp

diff --git a/src/gromacs/topology/residuetypes.cpp b/src/gromacs/topology/residuetypes.cpp
index 461405b82f4028e44fae24d3a5e0e782cbf24672..6745c96d378d69f9799c85fb6b94a2a6d0320414 100644 (file)
--- a/src/gromacs/topology/residuetypes.cpp
+++ b/src/gromacs/topology/residuetypes.cpp
@@ -32,7 +32,9 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
-#include "gromacs/topology/residuetypes.h"
+#include "gmxpre.h"
+
+#include "residuetypes.h"
 
 #include <cassert>
 #include <cstdio>
@@ -45,7 +47,7 @@
 
 const char gmx_residuetype_undefined[] = "Other";
 
-struct gmx_residuetype
+struct gmx_residuetype_t
 {
     int      n;
     char **  resname;
@@ -53,12 +55,12 @@ struct gmx_residuetype
 };
 
 int
-gmx_residuetype_init(gmx_residuetype_t *prt)
+gmx_residuetype_init(gmx_residuetype_t **prt)
 {
     FILE                 *  db;
     char                    line[STRLEN];
     char                    resname[STRLEN], restype[STRLEN], dum[STRLEN];
-    struct gmx_residuetype *rt;
+    gmx_residuetype_t      *rt;
 
     snew(rt, 1);
     *prt = rt;
@@ -89,7 +91,7 @@ gmx_residuetype_init(gmx_residuetype_t *prt)
 }
 
 int
-gmx_residuetype_destroy(gmx_residuetype_t rt)
+gmx_residuetype_destroy(gmx_residuetype_t *rt)
 {
     int i;
 
@@ -109,7 +111,7 @@ gmx_residuetype_destroy(gmx_residuetype_t rt)
  * p_restype is set to a pointer to the type name, or 'Other' if we did not find it.
  */
 int
-gmx_residuetype_get_type(gmx_residuetype_t rt, const char * resname, const char ** p_restype)
+gmx_residuetype_get_type(gmx_residuetype_t *rt, const char * resname, const char ** p_restype)
 {
     int    i, rc;
 
@@ -125,7 +127,7 @@ gmx_residuetype_get_type(gmx_residuetype_t rt, const char * resname, const char
 }
 
 int
-gmx_residuetype_add(gmx_residuetype_t rt, const char *newresname, const char *newrestype)
+gmx_residuetype_add(gmx_residuetype_t *rt, const char *newresname, const char *newrestype)
 {
     int           found;
     const char *  p_oldtype;
@@ -151,7 +153,7 @@ gmx_residuetype_add(gmx_residuetype_t rt, const char *newresname, const char *ne
 }
 
 int
-gmx_residuetype_get_alltypes(gmx_residuetype_t    rt,
+gmx_residuetype_get_alltypes(gmx_residuetype_t   *rt,
                              const char ***       p_typenames,
                              int *                ntypes)
 {
@@ -183,7 +185,7 @@ gmx_residuetype_get_alltypes(gmx_residuetype_t    rt,
 }
 
 gmx_bool
-gmx_residuetype_is_protein(gmx_residuetype_t rt, const char *resnm)
+gmx_residuetype_is_protein(gmx_residuetype_t *rt, const char *resnm)
 {
     gmx_bool    rc;
     const char *p_type;
@@ -201,7 +203,7 @@ gmx_residuetype_is_protein(gmx_residuetype_t rt, const char *resnm)
 }
 
 gmx_bool
-gmx_residuetype_is_dna(gmx_residuetype_t rt, const char *resnm)
+gmx_residuetype_is_dna(gmx_residuetype_t *rt, const char *resnm)
 {
     gmx_bool    rc;
     const char *p_type;
@@ -219,7 +221,7 @@ gmx_residuetype_is_dna(gmx_residuetype_t rt, const char *resnm)
 }
 
 gmx_bool
-gmx_residuetype_is_rna(gmx_residuetype_t rt, const char *resnm)
+gmx_residuetype_is_rna(gmx_residuetype_t *rt, const char *resnm)
 {
     gmx_bool    rc;
     const char *p_type;
@@ -238,7 +240,7 @@ gmx_residuetype_is_rna(gmx_residuetype_t rt, const char *resnm)
 
 /* Return the size of the arrays */
 int
-gmx_residuetype_get_size(gmx_residuetype_t rt)
+gmx_residuetype_get_size(gmx_residuetype_t *rt)
 {
     return rt->n;
 }
@@ -248,7 +250,7 @@ gmx_residuetype_get_size(gmx_residuetype_t rt)
  * otherwise -1.
  */
 int
-gmx_residuetype_get_index(gmx_residuetype_t rt, const char *resnm)
+gmx_residuetype_get_index(gmx_residuetype_t *rt, const char *resnm)
 {
     int i, rc;
 
@@ -264,7 +266,7 @@ gmx_residuetype_get_index(gmx_residuetype_t rt, const char *resnm)
 /* Return the name of the residuetype with the given index, or
  * NULL if not found. */
 const char *
-gmx_residuetype_get_name(gmx_residuetype_t rt, int index)
+gmx_residuetype_get_name(gmx_residuetype_t *rt, int index)
 {
     if (index >= 0 && index < rt->n)
     {