Remove unnecessary config.h includes

[alexxy/gromacs.git] / src / programs / view / xdlg.cpp

diff --git a/src/programs/view/xdlg.cpp b/src/programs/view/xdlg.cpp
index 0e3b76dec3095374a44b63e4cfffdd1e4b55e33e..86feef1e6957901abee87c74e518baffce50bf5f 100644 (file)
--- a/src/programs/view/xdlg.cpp
+++ b/src/programs/view/xdlg.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, by the GROMACS development team, led by
+ * Copyright (c) 2013,2014, 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.
@@ -34,21 +34,19 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "gmxpre.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "string2.h"
-#include "macros.h"
-#include "smalloc.h"
+#include "gromacs/utility/cstringutil.h"
+#include "gromacs/legacyheaders/macros.h"
+#include "gromacs/utility/smalloc.h"
 #include "Xstuff.h"
 #include "xutil.h"
 #include "xdlg.h"
 #include "xmb.h"
-#include "gmx_fatal.h"
+#include "gromacs/utility/fatalerror.h"
 /*****************************
  *
  * Helpful routines
@@ -421,7 +419,7 @@ void HelpNow(t_dlg *dlg, t_dlgitem *dlgitem)
             if (bCont)
             {
                 srenew(lines, ++nlines);
-                lines[nlines-1] = strdup(buf);
+                lines[nlines-1] = gmx_strdup(buf);
             }
         }
     }
@@ -776,7 +774,7 @@ t_dlg *CreateDlg(t_x11 *x11, Window Parent, const char *title,
     dlg->data = data;
     if (title)
     {
-        dlg->title = strdup(title);
+        dlg->title = gmx_strdup(title);
     }
     else
     {