X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=blobdiff_plain;f=src%2Fgromacs%2Fgmxana%2Fgmx_wheel.cpp;fp=src%2Fgromacs%2Fgmxana%2Fgmx_wheel.c;h=1c0bbad601231083e30c85db862500db12f4a68e;hb=84ef6402a10d308f2e6fa9c53a5717103224f637;hp=552c8d62db42b2e1c3a1cf5df47092af4cf70e7e;hpb=3a5934fccd489925ab5e80aeb4bf703040137071;p=alexxy%2Fgromacs.git

diff --git a/src/gromacs/gmxana/gmx_wheel.c b/src/gromacs/gmxana/gmx_wheel.cpp
similarity index 93%
rename from src/gromacs/gmxana/gmx_wheel.c
rename to src/gromacs/gmxana/gmx_wheel.cpp
index 552c8d62db..1c0bbad601 100644
--- a/src/gromacs/gmxana/gmx_wheel.c
+++ b/src/gromacs/gmxana/gmx_wheel.cpp
@@ -36,10 +36,12 @@
  */
 #include "gmxpre.h"
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+
+#include <algorithm>
 
 #include "gromacs/commandline/pargs.h"
 #include "gromacs/fileio/strdb.h"
@@ -94,7 +96,7 @@ void wheel(const char *fn, int nres, char *resnm[], int r0, real rot0, char *tit
     for (i = 0; (i < nres); i++)
     {
         snew(rnms[i], 256);
-        sl   = strlen(resnm[i]);
+        sl   = std::strlen(resnm[i]);
         sign = resnm[i][sl-1];
         if ((sign == '+') || (sign == '-'))
         {
@@ -103,12 +105,12 @@ void wheel(const char *fn, int nres, char *resnm[], int r0, real rot0, char *tit
         sprintf(rnms[i], "%s-%d", resnm[i], i+r0);
         if ((sign == '+') || (sign == '-'))
         {
-            sl            = strlen(rnms[i]);
+            sl            = std::strlen(rnms[i]);
             rnms[i][sl]   = sign;
             rnms[i][sl+1] = '\0';
         }
 
-        slen = max(slen, (int)strlen(rnms[i]));
+        slen = std::max(slen, static_cast<int>(std::strlen(rnms[i])));
     }
     ring  = (2+slen)*fontwidth;
     outer = inner+ring;
@@ -168,10 +170,10 @@ void wheel2(const char *fn, int nres, char *resnm[], real rot0, char *title)
     slen  = 0;
     for (i = 0; (i < nres); i++)
     {
-        slen = max(slen, (int)strlen(resnm[i]));
+        slen = std::max(slen, static_cast<int>(strlen(resnm[i])));
     }
     fprintf(stderr, "slen = %d\n", slen);
-    ring  = (slen)*fontwidth;
+    ring  = slen*fontwidth;
     outer = inner+ring;
     box   = (1+(nres / (2*angle)))*outer;
 
@@ -252,22 +254,22 @@ int gmx_wheel(int argc, char *argv[])
 
     for (i = 1; (i < argc); i++)
     {
-        if (strcmp(argv[i], "-r0") == 0)
+        if (std::strcmp(argv[i], "-r0") == 0)
         {
-            r0 = strtol(argv[++i], NULL, 10);
+            r0 = std::strtol(argv[++i], NULL, 10);
             fprintf(stderr, "First residue is %d\n", r0);
         }
-        else if (strcmp(argv[i], "-rot0") == 0)
+        else if (std::strcmp(argv[i], "-rot0") == 0)
         {
             rot0 = strtod(argv[++i], NULL);
             fprintf(stderr, "Initial rotation is %g\n", rot0);
         }
-        else if (strcmp(argv[i], "-T") == 0)
+        else if (std::strcmp(argv[i], "-T") == 0)
         {
             title = gmx_strdup(argv[++i]);
             fprintf(stderr, "Title will be '%s'\n", title);
         }
-        else if (strcmp(argv[i], "-nn") == 0)
+        else if (std::strcmp(argv[i], "-nn") == 0)
         {
             bNum = FALSE;
             fprintf(stderr, "No residue numbers\n");