Sort includes outside src/gromacs

Change-Id: I7efefc3835d1a5974886ef680a9fb0ddce11ee3e

diff --git a/src/programs/gmx.cpp b/src/programs/gmx.cpp
index 74c409b32bee16dc43c08fdd7125d8fac2d0a6a0..3381f6bc8e7129c755bf7831b11049e1683b0146 100644 (file)
--- a/src/programs/gmx.cpp
+++ b/src/programs/gmx.cpp
@@ -39,8 +39,8 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/commandline/cmdlinemodulemanager.h"
 #include "gromacs/commandline/cmdlineinit.h"
+#include "gromacs/commandline/cmdlinemodulemanager.h"
 #include "gromacs/selection/selhelp.h"
 #include "gromacs/trajectoryanalysis/modules.h"
 #include "gromacs/utility/exceptions.h"

diff --git a/src/programs/legacymodules.cpp b/src/programs/legacymodules.cpp
index 52eaafb075d8bfaf93d352c91d3fdf2ce597b4e1..720122cba70ab45d8a5adc810d0a9b18a2d087df 100644 (file)
--- a/src/programs/legacymodules.cpp
+++ b/src/programs/legacymodules.cpp
@@ -45,7 +45,6 @@
 
 #include "gromacs/commandline/cmdlinemodule.h"
 #include "gromacs/commandline/cmdlinemodulemanager.h"
-
 #include "gromacs/gmxana/gmx_ana.h"
 #include "gromacs/gmxpreprocess/genconf.h"
 #include "gromacs/gmxpreprocess/grompp.h"

diff --git a/src/programs/mdrun/md.cpp b/src/programs/mdrun/md.cpp
index d738e7521f5bc6f68672abb296df1a5cd8971444..9864f8789f9385d2e536ed33f5988bacff85186e 100644 (file)
--- a/src/programs/mdrun/md.cpp
+++ b/src/programs/mdrun/md.cpp
@@ -40,62 +40,62 @@
 
 #include <stdlib.h>
 
-#include "gromacs/legacyheaders/typedefs.h"
-#include "gromacs/math/vec.h"
-#include "gromacs/legacyheaders/vcm.h"
-#include "gromacs/legacyheaders/mdebin.h"
-#include "gromacs/legacyheaders/nrnb.h"
+#include "gromacs/fileio/confio.h"
+#include "gromacs/fileio/mdoutf.h"
+#include "gromacs/fileio/trajectory_writing.h"
+#include "gromacs/fileio/trnio.h"
+#include "gromacs/fileio/trxio.h"
+#include "gromacs/fileio/xtcio.h"
+#include "gromacs/gmxpreprocess/compute_io.h"
+#include "gromacs/imd/imd.h"
+#include "gromacs/legacyheaders/bonded-threading.h"
 #include "gromacs/legacyheaders/calcmu.h"
-#include "gromacs/legacyheaders/vsite.h"
-#include "gromacs/legacyheaders/update.h"
-#include "gromacs/legacyheaders/ns.h"
-#include "gromacs/legacyheaders/mdrun.h"
-#include "gromacs/legacyheaders/md_support.h"
+#include "gromacs/legacyheaders/checkpoint.h"
+#include "gromacs/legacyheaders/constr.h"
+#include "gromacs/legacyheaders/coulomb.h"
+#include "gromacs/legacyheaders/disre.h"
+#include "gromacs/legacyheaders/domdec.h"
+#include "gromacs/legacyheaders/domdec_network.h"
+#include "gromacs/legacyheaders/force.h"
 #include "gromacs/legacyheaders/md_logging.h"
-#include "gromacs/legacyheaders/network.h"
+#include "gromacs/legacyheaders/md_support.h"
+#include "gromacs/legacyheaders/mdatoms.h"
+#include "gromacs/legacyheaders/mdebin.h"
+#include "gromacs/legacyheaders/mdrun.h"
 #include "gromacs/legacyheaders/names.h"
-#include "gromacs/legacyheaders/force.h"
-#include "gromacs/legacyheaders/disre.h"
+#include "gromacs/legacyheaders/network.h"
+#include "gromacs/legacyheaders/nrnb.h"
+#include "gromacs/legacyheaders/ns.h"
 #include "gromacs/legacyheaders/orires.h"
 #include "gromacs/legacyheaders/pme.h"
-#include "gromacs/legacyheaders/mdatoms.h"
-#include "repl_ex.h"
-#include "deform.h"
 #include "gromacs/legacyheaders/qmmm.h"
-#include "gromacs/legacyheaders/domdec.h"
-#include "gromacs/legacyheaders/domdec_network.h"
-#include "gromacs/legacyheaders/coulomb.h"
-#include "gromacs/legacyheaders/constr.h"
 #include "gromacs/legacyheaders/shellfc.h"
-#include "gromacs/gmxpreprocess/compute_io.h"
-#include "gromacs/legacyheaders/checkpoint.h"
-#include "gromacs/topology/mtop_util.h"
 #include "gromacs/legacyheaders/sighandler.h"
 #include "gromacs/legacyheaders/txtdump.h"
-#include "gromacs/utility/cstringutil.h"
-#include "pme_loadbal.h"
-#include "gromacs/legacyheaders/bonded-threading.h"
-#include "membed.h"
-#include "gromacs/legacyheaders/types/nlistheuristics.h"
+#include "gromacs/legacyheaders/typedefs.h"
+#include "gromacs/legacyheaders/update.h"
+#include "gromacs/legacyheaders/vcm.h"
+#include "gromacs/legacyheaders/vsite.h"
 #include "gromacs/legacyheaders/types/iteratedconstraints.h"
+#include "gromacs/legacyheaders/types/nlistheuristics.h"
+#include "gromacs/math/vec.h"
 #include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_data_mgmt.h"
-
-#include "gromacs/fileio/confio.h"
-#include "gromacs/fileio/mdoutf.h"
-#include "gromacs/fileio/trajectory_writing.h"
-#include "gromacs/fileio/trnio.h"
-#include "gromacs/fileio/trxio.h"
-#include "gromacs/fileio/xtcio.h"
-#include "gromacs/imd/imd.h"
 #include "gromacs/pbcutil/mshift.h"
 #include "gromacs/pbcutil/pbc.h"
 #include "gromacs/pulling/pull.h"
 #include "gromacs/swap/swapcoords.h"
 #include "gromacs/timing/wallcycle.h"
 #include "gromacs/timing/walltime_accounting.h"
+#include "gromacs/topology/mtop_util.h"
+#include "gromacs/utility/cstringutil.h"
 #include "gromacs/utility/gmxmpi.h"
 #include "gromacs/utility/smalloc.h"
 
+#include "deform.h"
+#include "membed.h"
+#include "pme_loadbal.h"
+#include "repl_ex.h"
+
 #ifdef GMX_FAHCORE
 #include "corewrap.h"
 #endif

diff --git a/src/programs/mdrun/mdrun.cpp b/src/programs/mdrun/mdrun.cpp
index 901cccfdcd073ff19874e4688346985471a8154c..b3df7ca4a826700b949550dada55fa7f3a213f51 100644 (file)
--- a/src/programs/mdrun/mdrun.cpp
+++ b/src/programs/mdrun/mdrun.cpp
@@ -36,13 +36,13 @@
  */
 #include "gmxpre.h"
 
-#include "mdrun_main.h"
-
 #include "config.h"
 
 #include <stdio.h>
 #include <string.h>
 
+#include "gromacs/commandline/pargs.h"
+#include "gromacs/fileio/filenm.h"
 #include "gromacs/legacyheaders/checkpoint.h"
 #include "gromacs/legacyheaders/copyrite.h"
 #include "gromacs/legacyheaders/macros.h"
@@ -52,11 +52,10 @@
 #include "gromacs/legacyheaders/readinp.h"
 #include "gromacs/legacyheaders/typedefs.h"
 #include "gromacs/legacyheaders/types/commrec.h"
-
-#include "gromacs/commandline/pargs.h"
-#include "gromacs/fileio/filenm.h"
 #include "gromacs/utility/fatalerror.h"
 
+#include "mdrun_main.h"
+
 static bool is_multisim_option_set(int argc, const char *const argv[])
 {
     for (int i = 0; i < argc; ++i)

diff --git a/src/programs/mdrun/membed.c b/src/programs/mdrun/membed.c
index af701ac48f30412ec7a247b1ff9e03658ab6c2a8..cef61ffb3d38ae580263b7bee1bc5acf814be74b 100644 (file)
--- a/src/programs/mdrun/membed.c
+++ b/src/programs/mdrun/membed.c
@@ -34,24 +34,26 @@
  */
 #include "gmxpre.h"
 
+#include "membed.h"
+
 #include <signal.h>
 #include <stdlib.h>
+
+#include "gromacs/essentialdynamics/edsam.h"
+#include "gromacs/fileio/tpxio.h"
+#include "gromacs/gmxpreprocess/readir.h"
+#include "gromacs/legacyheaders/macros.h"
+#include "gromacs/legacyheaders/names.h"
+#include "gromacs/legacyheaders/readinp.h"
 #include "gromacs/legacyheaders/typedefs.h"
 #include "gromacs/legacyheaders/types/commrec.h"
-#include "gromacs/utility/smalloc.h"
 #include "gromacs/math/vec.h"
-#include "gromacs/legacyheaders/macros.h"
-#include "gromacs/utility/futil.h"
-#include "gromacs/essentialdynamics/edsam.h"
+#include "gromacs/pbcutil/pbc.h"
 #include "gromacs/topology/index.h"
-#include "gromacs/legacyheaders/names.h"
 #include "gromacs/topology/mtop_util.h"
-#include "gromacs/fileio/tpxio.h"
 #include "gromacs/utility/cstringutil.h"
-#include "membed.h"
-#include "gromacs/pbcutil/pbc.h"
-#include "gromacs/legacyheaders/readinp.h"
-#include "gromacs/gmxpreprocess/readir.h"
+#include "gromacs/utility/futil.h"
+#include "gromacs/utility/smalloc.h"
 
 /* information about scaling center */
 typedef struct {

diff --git a/src/programs/mdrun/membed.h b/src/programs/mdrun/membed.h
index 06ae251257c2af60e9a51fcc933fd32487783d4a..7face206df382496bc3f44d17d67517bce64d9e1 100644 (file)
--- a/src/programs/mdrun/membed.h
+++ b/src/programs/mdrun/membed.h
@@ -36,9 +36,9 @@
 #ifndef _gmx_membed_h
 #define _gmx_membed_h
 
+#include "gromacs/fileio/filenm.h"
 #include "gromacs/legacyheaders/typedefs.h"
 #include "gromacs/legacyheaders/types/membedt.h"
-#include "gromacs/fileio/filenm.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/src/programs/mdrun/pme_loadbal.c b/src/programs/mdrun/pme_loadbal.c
index 17702f02a84340f23a571e7a4f11213c7f0ebc61..5ba76e63e0edab5bba4a85a415fce497367b0386 100644 (file)
--- a/src/programs/mdrun/pme_loadbal.c
+++ b/src/programs/mdrun/pme_loadbal.c
@@ -34,21 +34,21 @@
  */
 #include "gmxpre.h"
 
+#include "pme_loadbal.h"
+
 #include "config.h"
 
-#include "gromacs/legacyheaders/types/commrec.h"
-#include "gromacs/legacyheaders/network.h"
 #include "gromacs/legacyheaders/calcgrid.h"
-#include "gromacs/legacyheaders/pme.h"
 #include "gromacs/legacyheaders/domdec.h"
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_data_mgmt.h"
 #include "gromacs/legacyheaders/force.h"
 #include "gromacs/legacyheaders/macros.h"
 #include "gromacs/legacyheaders/md_logging.h"
-#include "pme_loadbal.h"
-
-#include "gromacs/math/vec.h"
+#include "gromacs/legacyheaders/network.h"
+#include "gromacs/legacyheaders/pme.h"
 #include "gromacs/legacyheaders/sim_util.h"
+#include "gromacs/legacyheaders/types/commrec.h"
+#include "gromacs/math/vec.h"
+#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_data_mgmt.h"
 #include "gromacs/pbcutil/pbc.h"
 #include "gromacs/utility/cstringutil.h"
 #include "gromacs/utility/smalloc.h"

diff --git a/src/programs/mdrun/repl_ex.cpp b/src/programs/mdrun/repl_ex.cpp
index 726886cfeb6a3879c678675384a25abc944acf62..ac5e34c785a8310f35711dc9bd4b37dc760fc4e9 100644 (file)
--- a/src/programs/mdrun/repl_ex.cpp
+++ b/src/programs/mdrun/repl_ex.cpp
@@ -43,16 +43,15 @@
 
 #include <math.h>
 
-#include "gromacs/legacyheaders/network.h"
-#include "gromacs/random/random.h"
-#include "gromacs/utility/smalloc.h"
-#include "gromacs/math/units.h"
 #include "gromacs/legacyheaders/copyrite.h"
-#include "gromacs/math/vec.h"
-#include "gromacs/legacyheaders/names.h"
 #include "gromacs/legacyheaders/domdec.h"
 #include "gromacs/legacyheaders/main.h"
+#include "gromacs/legacyheaders/names.h"
+#include "gromacs/legacyheaders/network.h"
+#include "gromacs/math/units.h"
+#include "gromacs/math/vec.h"
 #include "gromacs/random/random.h"
+#include "gromacs/utility/smalloc.h"
 
 #define PROBABILITYCUTOFF 100
 /* we don't bother evaluating if events are more rare than exp(-100) = 3.7x10^-44 */

diff --git a/src/programs/mdrun/runner.cpp b/src/programs/mdrun/runner.cpp
index 864b2b729e6e2a2d462e0638b6d36a35ed75120e..c9b47b7e5441641de1cff7a382a6729e62183aaa 100644 (file)
--- a/src/programs/mdrun/runner.cpp
+++ b/src/programs/mdrun/runner.cpp
@@ -39,61 +39,61 @@
 
 #include "config.h"
 
-#include <algorithm>
-
 #include <assert.h>
 #include <signal.h>
 #include <stdlib.h>
 #include <string.h>
+
+#include <algorithm>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 
-#include "gromacs/legacyheaders/typedefs.h"
-#include "gromacs/legacyheaders/oenv.h"
+#include "gromacs/essentialdynamics/edsam.h"
+#include "gromacs/fileio/tpxio.h"
+#include "gromacs/gmxpreprocess/calc_verletbuf.h"
+#include "gromacs/legacyheaders/checkpoint.h"
+#include "gromacs/legacyheaders/constr.h"
+#include "gromacs/legacyheaders/coulomb.h"
+#include "gromacs/legacyheaders/disre.h"
+#include "gromacs/legacyheaders/domdec.h"
 #include "gromacs/legacyheaders/force.h"
-#include "gromacs/legacyheaders/mdrun.h"
+#include "gromacs/legacyheaders/gmx_detect_hardware.h"
+#include "gromacs/legacyheaders/gmx_omp_nthreads.h"
+#include "gromacs/legacyheaders/gmx_thread_affinity.h"
+#include "gromacs/legacyheaders/inputrec.h"
+#include "gromacs/legacyheaders/main.h"
 #include "gromacs/legacyheaders/md_logging.h"
 #include "gromacs/legacyheaders/md_support.h"
-#include "gromacs/legacyheaders/network.h"
+#include "gromacs/legacyheaders/mdatoms.h"
+#include "gromacs/legacyheaders/mdrun.h"
+#include "gromacs/legacyheaders/mvdata.h"
 #include "gromacs/legacyheaders/names.h"
-#include "gromacs/legacyheaders/disre.h"
+#include "gromacs/legacyheaders/network.h"
+#include "gromacs/legacyheaders/oenv.h"
 #include "gromacs/legacyheaders/orires.h"
 #include "gromacs/legacyheaders/pme.h"
-#include "gromacs/legacyheaders/mdatoms.h"
-#include "repl_ex.h"
-#include "deform.h"
 #include "gromacs/legacyheaders/qmmm.h"
-#include "gromacs/legacyheaders/domdec.h"
-#include "gromacs/legacyheaders/coulomb.h"
-#include "gromacs/legacyheaders/constr.h"
-#include "gromacs/legacyheaders/mvdata.h"
-#include "gromacs/legacyheaders/checkpoint.h"
-#include "gromacs/topology/mtop_util.h"
 #include "gromacs/legacyheaders/sighandler.h"
 #include "gromacs/legacyheaders/txtdump.h"
-#include "gromacs/legacyheaders/gmx_detect_hardware.h"
-#include "gromacs/legacyheaders/gmx_omp_nthreads.h"
-#include "gromacs/gmxpreprocess/calc_verletbuf.h"
-#include "membed.h"
-#include "gromacs/legacyheaders/gmx_thread_affinity.h"
-#include "gromacs/legacyheaders/inputrec.h"
-#include "gromacs/legacyheaders/main.h"
-
-#include "gromacs/essentialdynamics/edsam.h"
-#include "gromacs/fileio/tpxio.h"
+#include "gromacs/legacyheaders/typedefs.h"
 #include "gromacs/math/vec.h"
-#include "gromacs/mdlib/nbnxn_search.h"
 #include "gromacs/mdlib/nbnxn_consts.h"
+#include "gromacs/mdlib/nbnxn_search.h"
 #include "gromacs/pbcutil/pbc.h"
 #include "gromacs/pulling/pull.h"
 #include "gromacs/pulling/pull_rotation.h"
 #include "gromacs/swap/swapcoords.h"
 #include "gromacs/timing/wallcycle.h"
+#include "gromacs/topology/mtop_util.h"
 #include "gromacs/utility/gmxassert.h"
 #include "gromacs/utility/gmxmpi.h"
 #include "gromacs/utility/smalloc.h"
 
+#include "deform.h"
+#include "membed.h"
+#include "repl_ex.h"
+
 #ifdef GMX_FAHCORE
 #include "corewrap.h"
 #endif

diff --git a/src/programs/mdrun/tests/compressed_x_output.cpp b/src/programs/mdrun/tests/compressed_x_output.cpp
index 98862f5f41bd6f51b9ce99704aa6ea35cfea795e..26a65475bff6c336ddcc705cc84f27aa77019832 100644 (file)
--- a/src/programs/mdrun/tests/compressed_x_output.cpp
+++ b/src/programs/mdrun/tests/compressed_x_output.cpp
@@ -42,13 +42,17 @@
  */
 #include "gmxpre.h"
 
-#include "moduletest.h"
-#include <gtest/gtest.h>
 #include <string>
+
+#include <gtest/gtest.h>
+
 #include "gromacs/options/filenameoption.h"
 #include "gromacs/tools/check.h"
+
 #include "testutils/cmdlinetest.h"
 
+#include "moduletest.h"
+
 namespace
 {
 

diff --git a/src/programs/mdrun/tests/moduletest.cpp b/src/programs/mdrun/tests/moduletest.cpp
index f8d999682db6f1a22c6fe98856fe60483e01c701..b9cb26f3549fc99a00f073e3091b3810c0867655 100644 (file)
--- a/src/programs/mdrun/tests/moduletest.cpp
+++ b/src/programs/mdrun/tests/moduletest.cpp
@@ -51,12 +51,11 @@
 #include "gromacs/utility/basedefinitions.h"
 #include "gromacs/utility/basenetwork.h"
 #include "gromacs/utility/file.h"
-
 #include "programs/mdrun/mdrun_main.h"
 
+#include "testutils/cmdlinetest.h"
 #include "testutils/integrationtests.h"
 #include "testutils/testoptions.h"
-#include "testutils/cmdlinetest.h"
 
 namespace gmx
 {

diff --git a/src/programs/mdrun/tests/moduletest.h b/src/programs/mdrun/tests/moduletest.h
index 1b50fb67142288d592a2a538f42c5ab90d6fb15f..3e9a7d0b2f142fa376871f2d70b67b6dbbbadf2e 100644 (file)
--- a/src/programs/mdrun/tests/moduletest.h
+++ b/src/programs/mdrun/tests/moduletest.h
@@ -41,10 +41,10 @@
 #ifndef GMX_MDRUN_TESTS_MODULETEST_H
 #define GMX_MDRUN_TESTS_MODULETEST_H
 
-#include "testutils/integrationtests.h"
-
 #include <gtest/gtest.h>
+
 #include "testutils/cmdlinetest.h"
+#include "testutils/integrationtests.h"
 
 namespace gmx
 {

diff --git a/src/programs/mdrun/tests/replicaexchange.cpp b/src/programs/mdrun/tests/replicaexchange.cpp
index ea8a7b20c64e4b2f7ac1f6a8768c702b8f2797ea..e28f5f30164f31f1ec0333fddce9c00d90eafffc 100644 (file)
--- a/src/programs/mdrun/tests/replicaexchange.cpp
+++ b/src/programs/mdrun/tests/replicaexchange.cpp
@@ -42,7 +42,7 @@
  */
 #include "gmxpre.h"
 
-#include "moduletest.h"
+#include "config.h"
 
 #include <math.h>
 
@@ -54,12 +54,11 @@
 #include "gromacs/utility/path.h"
 #include "gromacs/utility/real.h"
 #include "gromacs/utility/stringutil.h"
-
 #include "programs/mdrun/mdrun_main.h"
 
 #include "testutils/cmdlinetest.h"
 
-#include "config.h"
+#include "moduletest.h"
 
 namespace
 {

diff --git a/src/programs/mdrun/tests/rerun.cpp b/src/programs/mdrun/tests/rerun.cpp
index 54b4e5951e3605cc809e40534b6611e0b6e58dd7..a8e2b87bc64e6d6a3878295ad0e9521cc01d5b2c 100644 (file)
--- a/src/programs/mdrun/tests/rerun.cpp
+++ b/src/programs/mdrun/tests/rerun.cpp
@@ -42,12 +42,15 @@
  */
 #include "gmxpre.h"
 
+#include "config.h"
+
 #include <gtest/gtest.h>
-#include "moduletest.h"
+
 #include "gromacs/options/filenameoption.h"
+
 #include "testutils/cmdlinetest.h"
 
-#include "config.h"
+#include "moduletest.h"
 
 namespace
 {

diff --git a/src/programs/mdrun/tests/trajectory_writing.cpp b/src/programs/mdrun/tests/trajectory_writing.cpp
index 6b45499e20e22969fbc27015e91de3d10b0354a5..6ab2425320375cf6848d451d54436d2a3dc741ec 100644 (file)
--- a/src/programs/mdrun/tests/trajectory_writing.cpp
+++ b/src/programs/mdrun/tests/trajectory_writing.cpp
@@ -42,12 +42,14 @@
  */
 #include "gmxpre.h"
 
+#include "config.h"
+
 #include <gtest/gtest.h>
-#include "moduletest.h"
+
 #include "gromacs/options/filenameoption.h"
 #include "gromacs/utility/stringutil.h"
 
-#include "config.h"
+#include "moduletest.h"
 
 namespace
 {

diff --git a/src/programs/mdrun_main.cpp b/src/programs/mdrun_main.cpp
index 9c67328b3e8aabb7029350f5f64c1f3e13cb0b93..e6b694d123dd4bd0cffbee8e4c300fb01d77cb81 100644 (file)
--- a/src/programs/mdrun_main.cpp
+++ b/src/programs/mdrun_main.cpp
@@ -34,10 +34,10 @@
  */
 #include "gmxpre.h"
 
-#include "mdrun/mdrun_main.h"
-
 #include "gromacs/commandline/cmdlinemodulemanager.h"
 
+#include "mdrun/mdrun_main.h"
+
 int main(int argc, char *argv[])
 {
     return gmx::CommandLineModuleManager::runAsMainCMain(argc, argv, &gmx_mdrun);

diff --git a/src/programs/view/Xstuff.h b/src/programs/view/Xstuff.h
index 1c587077e1599e266af3b40ae77fa5a37d03c01a..f5439d8d942c81c7e9bb71f68a098b1b49f98b51 100644 (file)
--- a/src/programs/view/Xstuff.h
+++ b/src/programs/view/Xstuff.h
@@ -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.
@@ -47,10 +47,10 @@
 #endif
 
 #include <X11/Xlib.h>
+#include <X11/Xresource.h>
 #include <X11/Xutil.h>
-#include <X11/keysym.h>
 #include <X11/cursorfont.h>
-#include <X11/Xresource.h>
+#include <X11/keysym.h>
 
 #ifdef _acc_
 typedef unsigned char bmchar;

diff --git a/src/programs/view/buttons.cpp b/src/programs/view/buttons.cpp
index 680471fdeadcc66bd0bb922798f292b19d2fd621..e5157ffe424cfefdeb159617893821b62654af7e 100644 (file)
--- a/src/programs/view/buttons.cpp
+++ b/src/programs/view/buttons.cpp
@@ -36,6 +36,8 @@
  */
 #include "gmxpre.h"
 
+#include "buttons.h"
+
 #include <stdlib.h>
 #include <string.h>
 
@@ -45,14 +47,12 @@
 #include "gromacs/utility/cstringutil.h"
 #include "gromacs/utility/smalloc.h"
 
-#include "x11.h"
-#include "xutil.h"
-#include "buttons.h"
-
-#include "stop_ani.bm"
-#include "play.bm"
 #include "ff.bm"
+#include "play.bm"
 #include "rewind.bm"
+#include "stop_ani.bm"
+#include "x11.h"
+#include "xutil.h"
 
 static void move_bbox(t_x11 *x11, t_butbox *bbox)
 {

diff --git a/src/programs/view/dialogs.cpp b/src/programs/view/dialogs.cpp
index f05937af48ec61439d5083638c4e39b192938ef4..c55659785374923adff2e4f32de818db0a879541 100644 (file)
--- a/src/programs/view/dialogs.cpp
+++ b/src/programs/view/dialogs.cpp
@@ -43,20 +43,21 @@
 #include <unistd.h> // for fork()
 #endif
 
-#include "gromacs/legacyheaders/macros.h"
-#include "x11.h"
-#include "xdlghi.h"
-#include "xmb.h"
 #include "dialogs.h"
-#include "gromacs/legacyheaders/names.h"
-#include "nmol.h"
-#include "manager.h"
 
+#include "gromacs/legacyheaders/macros.h"
+#include "gromacs/legacyheaders/names.h"
 #include "gromacs/utility/cstringutil.h"
 #include "gromacs/utility/fatalerror.h"
 #include "gromacs/utility/futil.h"
 #include "gromacs/utility/smalloc.h"
 
+#include "manager.h"
+#include "nmol.h"
+#include "x11.h"
+#include "xdlghi.h"
+#include "xmb.h"
+
 #define MBFLAGS /* MB_APPLMODAL | */ MB_DONTSHOW
 
 void write_gmx(t_x11 *x11, t_gmx *gmx, int mess)

diff --git a/src/programs/view/dialogs.h b/src/programs/view/dialogs.h
index 0f306a134c34032d4fcde4412a50c3c30e0f647e..3e69058142152857ac179bb68f84a4f6c9859e65 100644 (file)
--- a/src/programs/view/dialogs.h
+++ b/src/programs/view/dialogs.h
@@ -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.
@@ -38,10 +38,10 @@
 #ifndef _dialogs_h
 #define _dialogs_h
 
-#include "xdlg.h"
-#include "pulldown.h"
-#include "manager.h"
 #include "logo.h"
+#include "manager.h"
+#include "pulldown.h"
+#include "xdlg.h"
 
 typedef struct {
     bool      bMapped;

diff --git a/src/programs/view/fgrid.cpp b/src/programs/view/fgrid.cpp
index a087852e53fc8d0fba7184782b38b627a8fb27d7..12491724250834930f6b8b0031d8f26f91165d85 100644 (file)
--- a/src/programs/view/fgrid.cpp
+++ b/src/programs/view/fgrid.cpp
@@ -36,13 +36,13 @@
  */
 #include "gmxpre.h"
 
+#include "fgrid.h"
+
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "fgrid.h"
-
 #include "gromacs/utility/cstringutil.h"
 #include "gromacs/utility/futil.h"
 #include "gromacs/utility/smalloc.h"

diff --git a/src/programs/view/filter.cpp b/src/programs/view/filter.cpp
index 590e5c8bdbcbd473adcb5a0fe7e2b935041189da..c05e98b498d24a2ca913fe82c4e130a1ece54130 100644 (file)
--- a/src/programs/view/filter.cpp
+++ b/src/programs/view/filter.cpp
@@ -40,13 +40,14 @@
 
 #include <algorithm>
 
-#include "gromacs/utility/futil.h"
-#include "gromacs/utility/smalloc.h"
 #include "gromacs/legacyheaders/macros.h"
 #include "gromacs/topology/index.h"
-#include "xdlghi.h"
-#include "dialogs.h"
 #include "gromacs/utility/fatalerror.h"
+#include "gromacs/utility/futil.h"
+#include "gromacs/utility/smalloc.h"
+
+#include "dialogs.h"
+#include "xdlghi.h"
 
 t_filter *init_filter(t_atoms *atoms, const char *fn, int natom_trx)
 {

diff --git a/src/programs/view/logo.cpp b/src/programs/view/logo.cpp
index fdab4e52333c5dbd3393f9f076ff3665a529b72f..ee182e2e235eff32d4c960064fd7523a17ca3fc5 100644 (file)
--- a/src/programs/view/logo.cpp
+++ b/src/programs/view/logo.cpp
@@ -36,17 +36,18 @@
  */
 #include "gmxpre.h"
 
+#include "logo.h"
+
 #include <stdlib.h>
 
-#include "gromacs/legacyheaders/macros.h"
-#include "xutil.h"
-#include "Xstuff.h"
 #include "gromacs/legacyheaders/copyrite.h"
-#include "logo.h"
-
+#include "gromacs/legacyheaders/macros.h"
 #include "gromacs/utility/real.h"
 #include "gromacs/utility/smalloc.h"
 
+#include "Xstuff.h"
+#include "xutil.h"
+
 typedef struct {
     int            x, y, rad;
     unsigned long *col;

diff --git a/src/programs/view/manager.cpp b/src/programs/view/manager.cpp
index b7f89c2c67214a14b9844914afb33a9912a5ebdf..c77acc18466db37b02142cd41eb7e291b0e0f9de 100644 (file)
--- a/src/programs/view/manager.cpp
+++ b/src/programs/view/manager.cpp
@@ -46,12 +46,13 @@
 #include <unistd.h> // for usleep()
 #endif
 
-#include "gromacs/legacyheaders/typedefs.h"
-#include "gromacs/legacyheaders/macros.h"
-#include "gromacs/legacyheaders/names.h"
-#include "gromacs/legacyheaders/copyrite.h"
+#include "manager.h"
 
 #include "gromacs/fileio/tpxio.h"
+#include "gromacs/legacyheaders/copyrite.h"
+#include "gromacs/legacyheaders/macros.h"
+#include "gromacs/legacyheaders/names.h"
+#include "gromacs/legacyheaders/typedefs.h"
 #include "gromacs/math/utilities.h"
 #include "gromacs/math/vec.h"
 #include "gromacs/pbcutil/pbc.h"
@@ -61,7 +62,6 @@
 #include "gromacs/utility/smalloc.h"
 
 #include "3dview.h"
-#include "manager.h"
 #include "nmol.h"
 
 static void add_object(t_manager *man, eObject eO, atom_id ai, atom_id aj)

diff --git a/src/programs/view/manager.h b/src/programs/view/manager.h
index 966d133b74a8e4ac5bc7160350caeccab54a5ca3..1f48651beb59c018195d245213444f4b854b2b39 100644 (file)
--- a/src/programs/view/manager.h
+++ b/src/programs/view/manager.h
@@ -40,8 +40,8 @@
 
 #include <stdio.h>
 
-#include "gromacs/legacyheaders/typedefs.h"
 #include "gromacs/fileio/trxio.h"
+#include "gromacs/legacyheaders/typedefs.h"
 #include "gromacs/pbcutil/rmpbc.h"
 
 #include "3dview.h"

diff --git a/src/programs/view/molps.cpp b/src/programs/view/molps.cpp
index 03c0d21513663480739aabb5d5dc0605fe60e02f..977d3ae0b43537adf84fcca1a35cbe522320b193 100644 (file)
--- a/src/programs/view/molps.cpp
+++ b/src/programs/view/molps.cpp
@@ -40,9 +40,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "gromacs/legacyheaders/macros.h"
-
 #include "gromacs/fileio/writeps.h"
+#include "gromacs/legacyheaders/macros.h"
 #include "gromacs/utility/smalloc.h"
 
 #include "3dview.h"

diff --git a/src/programs/view/nleg.cpp b/src/programs/view/nleg.cpp
index 0783bb6c849f30665c4d11628d0b5bd5b4d08a3c..3c1669d40bf86084b06941cf14b0d84490c8d143 100644 (file)
--- a/src/programs/view/nleg.cpp
+++ b/src/programs/view/nleg.cpp
@@ -36,16 +36,17 @@
  */
 #include "gmxpre.h"
 
+#include "nleg.h"
+
 #include <string.h>
 
 #include <algorithm>
 
-#include "gromacs/legacyheaders/types/rgb.h"
 #include "gromacs/legacyheaders/macros.h"
+#include "gromacs/legacyheaders/types/rgb.h"
 #include "gromacs/utility/smalloc.h"
 
 #include "buttons.h"
-#include "nleg.h"
 
 typedef struct {
     const char    *tp;

diff --git a/src/programs/view/nmol.cpp b/src/programs/view/nmol.cpp
index 26fc5bd5fced5b291037db75851631e743b611ec..cca9b5fbdda791904a6a4eb5e4653a8fe45f0db7 100644 (file)
--- a/src/programs/view/nmol.cpp
+++ b/src/programs/view/nmol.cpp
@@ -36,22 +36,22 @@
  */
 #include "gmxpre.h"
 
+#include "nmol.h"
+
 #include <math.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "gromacs/legacyheaders/macros.h"
 #include "gromacs/legacyheaders/txtdump.h"
-#include "gromacs/pbcutil/pbc.h"
-
 #include "gromacs/math/vec.h"
+#include "gromacs/pbcutil/pbc.h"
 #include "gromacs/utility/fatalerror.h"
 #include "gromacs/utility/smalloc.h"
 
 #include "3dview.h"
 #include "buttons.h"
 #include "manager.h"
-#include "nmol.h"
 #include "xutil.h"
 
 #define MSIZE 4

diff --git a/src/programs/view/nmol.h b/src/programs/view/nmol.h
index e1802ae5a0b29ee5f2431e111244c7220ed4eb59..65cfed300294a6762434241d4dcf165a98e30da0 100644 (file)
--- a/src/programs/view/nmol.h
+++ b/src/programs/view/nmol.h
@@ -38,7 +38,7 @@
 #ifndef _nmol_h
 #define _nmol_h
 
-#include "programs/view/manager.h"
+#include "manager.h"
 #include "x11.h"
 #include "xutil.h"
 

diff --git a/src/programs/view/popup.cpp b/src/programs/view/popup.cpp
index 4af8526f2c6db638d68c9522b13e7dc575136436..5c8114129fd361fa62e72b919562a3ab5995acb4 100644 (file)
--- a/src/programs/view/popup.cpp
+++ b/src/programs/view/popup.cpp
@@ -36,6 +36,8 @@
  */
 #include "gmxpre.h"
 
+#include "popup.h"
+
 #include <math.h>
 #include <string.h>
 
@@ -46,7 +48,6 @@
 
 #include "x11.h"
 #include "xutil.h"
-#include "popup.h"
 
 bool ChildCallBack(t_x11 *x11, XEvent *event, Window w, void *data)
 {

diff --git a/src/programs/view/pulldown.cpp b/src/programs/view/pulldown.cpp
index d010cfdcdcfdb3d3d3749aabef9bedb1df325ed3..5dd48058764902987c995e31b833c16db5b15b76 100644 (file)
--- a/src/programs/view/pulldown.cpp
+++ b/src/programs/view/pulldown.cpp
@@ -36,16 +36,17 @@
  */
 #include "gmxpre.h"
 
+#include "pulldown.h"
+
 #include <string.h>
 
 #include <algorithm>
 
-#include "gromacs/utility/smalloc.h"
 #include "gromacs/legacyheaders/macros.h"
+#include "gromacs/utility/smalloc.h"
 
-#include "x11.h"
 #include "popup.h"
-#include "pulldown.h"
+#include "x11.h"
 
 static bool PDCallBack(t_x11 *x11, XEvent *event, Window w, void *data)
 {

diff --git a/src/programs/view/view.cpp b/src/programs/view/view.cpp
index 891cb1fd819c854d369f8ee699a2ed2a8d90d96d..567b522564a2568129b439c9cabc51db3f843aa1 100644 (file)
--- a/src/programs/view/view.cpp
+++ b/src/programs/view/view.cpp
@@ -41,25 +41,25 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "gromacs/legacyheaders/macros.h"
-#include "gromacs/utility/smalloc.h"
-#include "gromacs/utility/fatalerror.h"
-#include "gromacs/legacyheaders/typedefs.h"
 #include "gromacs/commandline/pargs.h"
-#include "gromacs/legacyheaders/copyrite.h"
 #include "gromacs/fileio/confio.h"
 #include "gromacs/fileio/tpxio.h"
+#include "gromacs/legacyheaders/copyrite.h"
+#include "gromacs/legacyheaders/macros.h"
+#include "gromacs/legacyheaders/typedefs.h"
+#include "gromacs/utility/fatalerror.h"
+#include "gromacs/utility/smalloc.h"
 
 #ifdef GMX_X11
 
 #include "gromacs/fileio/writeps.h"
 
 #include "Xstuff.h"
-#include "gromacs.bm"
-#include "xutil.h"
 #include "dialogs.h"
+#include "gromacs.bm"
 #include "molps.h"
 #include "nmol.h"
+#include "xutil.h"
 
 static void dump_it(t_manager *man)
 {

diff --git a/src/programs/view/x11.cpp b/src/programs/view/x11.cpp
index add052b006ffdafe1b7cd51ef89c60cde7e2b45a..cf3eb241bb91228781dfc702c55b1782397a612c 100644 (file)
--- a/src/programs/view/x11.cpp
+++ b/src/programs/view/x11.cpp
@@ -36,14 +36,16 @@
  */
 #include "gmxpre.h"
 
+#include "x11.h"
+
 #include <stdlib.h>
 #include <string.h>
 
 #include "gromacs/legacyheaders/typedefs.h"
 #include "gromacs/utility/cstringutil.h"
 #include "gromacs/utility/smalloc.h"
+
 #include "Xstuff.h"
-#include "x11.h"
 
 /* These colours will be mapped to black on a monochrome screen */
 unsigned long BLACK, BLUE, GREEN, CYAN, RED, BROWN, GREY, DARKGREY;

diff --git a/src/programs/view/x11.h b/src/programs/view/x11.h
index 3cc18e91152dc9a701acaccadb9cd45b4f166be4..6267b356e4dce310610789b989da25bad9b5f572 100644 (file)
--- a/src/programs/view/x11.h
+++ b/src/programs/view/x11.h
@@ -39,7 +39,9 @@
 #define _x11_h
 
 #include <stdio.h>
+
 #include "gromacs/legacyheaders/typedefs.h"
+
 #include "Xstuff.h"
 
 /* These colours will be mapped to black on a monochrome screen */

diff --git a/src/programs/view/xdlg.cpp b/src/programs/view/xdlg.cpp
index 86feef1e6957901abee87c74e518baffce50bf5f..4c3d4375ac2cfa1a33d05f8bc9e5013f1815e65b 100644 (file)
--- a/src/programs/view/xdlg.cpp
+++ b/src/programs/view/xdlg.cpp
@@ -36,17 +36,20 @@
  */
 #include "gmxpre.h"
 
+#include "xdlg.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "gromacs/utility/cstringutil.h"
+
 #include "gromacs/legacyheaders/macros.h"
+#include "gromacs/utility/cstringutil.h"
+#include "gromacs/utility/fatalerror.h"
 #include "gromacs/utility/smalloc.h"
+
 #include "Xstuff.h"
-#include "xutil.h"
-#include "xdlg.h"
 #include "xmb.h"
-#include "gromacs/utility/fatalerror.h"
+#include "xutil.h"
 /*****************************
  *
  * Helpful routines

diff --git a/src/programs/view/xdlghi.cpp b/src/programs/view/xdlghi.cpp
index aaf393ae5ecc998dbd348f6593583e1de6f83463..7d79e3b8ccc50d6451731e2cff51675620a2c4ef 100644 (file)
--- a/src/programs/view/xdlghi.cpp
+++ b/src/programs/view/xdlghi.cpp
@@ -36,20 +36,21 @@
  */
 #include "gmxpre.h"
 
+#include "xdlghi.h"
+
 #include <stdlib.h>
 #include <string.h>
 
 #include <algorithm>
 
 #include "gromacs/legacyheaders/macros.h"
-#include "xutil.h"
-#include "xdlghi.h"
-#include "fgrid.h"
-
 #include "gromacs/utility/cstringutil.h"
 #include "gromacs/utility/fatalerror.h"
 #include "gromacs/utility/smalloc.h"
 
+#include "fgrid.h"
+#include "xutil.h"
+
 t_dlgitem **CreateRadioButtonGroup(t_x11 *x11, char *szTitle,
                                    t_id GroupID, int nrb, t_id rb[],
                                    int nSelect,

diff --git a/src/programs/view/xdlghi.h b/src/programs/view/xdlghi.h
index 91e10e1485e0b49148a4bb1a2c521d69093fdb2c..d97764842a40aaf0e51d5c7142af879aebb20b5a 100644 (file)
--- a/src/programs/view/xdlghi.h
+++ b/src/programs/view/xdlghi.h
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 1991-2000, University of Groningen, The Netherlands.
  * Copyright (c) 2001-2013, 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.
@@ -39,6 +39,7 @@
 #define _xdlghi_h
 
 #include <stdarg.h>
+
 #include "Xstuff.h"
 #include "x11.h"
 #include "xdlg.h"

diff --git a/src/programs/view/xdlgitem.cpp b/src/programs/view/xdlgitem.cpp
index 4890f8fa383ec31cb78f5de4a16c5b9ca7db2d46..2660ea31fb7c7b1ccb05c206f569128e4311e989 100644 (file)
--- a/src/programs/view/xdlgitem.cpp
+++ b/src/programs/view/xdlgitem.cpp
@@ -36,6 +36,8 @@
  */
 #include "gmxpre.h"
 
+#include "xdlgitem.h"
+
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -44,13 +46,12 @@
 #include <algorithm>
 
 #include "gromacs/legacyheaders/macros.h"
-#include "Xstuff.h"
-#include "xdlgitem.h"
-
 #include "gromacs/utility/cstringutil.h"
 #include "gromacs/utility/fatalerror.h"
 #include "gromacs/utility/smalloc.h"
 
+#include "Xstuff.h"
+
 #define BUFSIZE 16
 
 static t_dlgitem *newitem(void)

diff --git a/src/programs/view/xdlgitem.h b/src/programs/view/xdlgitem.h
index e270b72e2c0df5c32f01c0d288b150a4de7c2f9a..8bf04120d0f14d79e973b3a5424b1fdd6d41e23c 100644 (file)
--- a/src/programs/view/xdlgitem.h
+++ b/src/programs/view/xdlgitem.h
@@ -39,8 +39,8 @@
 #define _xdlgitem_h
 
 #include "Xstuff.h"
-#include "xutil.h"
 #include "x11.h"
+#include "xutil.h"
 
 typedef enum {
     edlgBN, edlgRB, edlgGB, edlgCB, edlgPM, edlgST, edlgET, edlgNR

diff --git a/src/programs/view/xmb.cpp b/src/programs/view/xmb.cpp
index 6072f6d3d0debc4a3159134f9b40bdc0e7c188f8..4999c431cde0c5cde0e49ff59519ea427c26ed25 100644 (file)
--- a/src/programs/view/xmb.cpp
+++ b/src/programs/view/xmb.cpp
@@ -36,22 +36,24 @@
  */
 #include "gmxpre.h"
 
+#include "xmb.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "gromacs/legacyheaders/typedefs.h"
 #include "gromacs/legacyheaders/macros.h"
-#include "Xstuff.h"
-#include "x11.h"
-#include "xutil.h"
-#include "xdlg.h"
-#include "xmb.h"
+#include "gromacs/legacyheaders/typedefs.h"
 #include "gromacs/utility/fatalerror.h"
+
+#include "Xstuff.h"
+#include "alert.bm"
 #include "gromacs.bm"
-#include "stop.bm"
 #include "info.bm"
-#include "alert.bm"
+#include "stop.bm"
+#include "x11.h"
+#include "xdlg.h"
+#include "xutil.h"
 
 #define ID_BOX     -3
 #define ID_ICON    -2

diff --git a/src/programs/view/xmb.h b/src/programs/view/xmb.h
index 69234ce924736f5bddc363dda2b5b8ad398e38f6..ccb5fa28df16cb938f08bab9d0724f7bc7bf1b64 100644 (file)
--- a/src/programs/view/xmb.h
+++ b/src/programs/view/xmb.h
@@ -38,10 +38,10 @@
 #ifndef _xmb_h
 #define _xmb_h
 
-#include "programs/view/manager.h"
-#include "programs/view/x11.h"
-#include "programs/view/xdlg.h"
-#include "programs/view/xmb.h"
+#include "manager.h"
+#include "x11.h"
+#include "xdlg.h"
+#include "xmb.h"
 
 #define MB_OK              1
 #define MB_CANCEL          (1<<1)

diff --git a/src/programs/view/xutil.cpp b/src/programs/view/xutil.cpp
index 39b4074ec755512d27a0f976bff98c85412bdb80..8d11f70bf097a329285c1b88e8ed4db209880c9f 100644 (file)
--- a/src/programs/view/xutil.cpp
+++ b/src/programs/view/xutil.cpp
@@ -36,13 +36,16 @@
  */
 #include "gmxpre.h"
 
+#include "xutil.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+
+#include "gromacs/legacyheaders/typedefs.h"
 #include "gromacs/utility/cstringutil.h"
 #include "gromacs/utility/smalloc.h"
-#include "gromacs/legacyheaders/typedefs.h"
-#include "xutil.h"
+
 #include "Xstuff.h"
 
 int CheckWin(Window win, const char *file, int line)

diff --git a/src/testutils/cmdlinetest.cpp b/src/testutils/cmdlinetest.cpp
index 205324a3f0829780bff7d24663986f476d35ea2a..5192ee7853a65e73500bd562c7a916f6cd08da22 100644 (file)
--- a/src/testutils/cmdlinetest.cpp
+++ b/src/testutils/cmdlinetest.cpp
@@ -45,9 +45,9 @@
 
 #include <cstdlib>
 #include <cstring>
-#include <sstream>
 
 #include <new>
+#include <sstream>
 #include <vector>
 
 #include "gromacs/commandline/cmdlineprogramcontext.h"

diff --git a/src/testutils/integrationtests.cpp b/src/testutils/integrationtests.cpp
index 5ea00c67d79dad5e19ee9e266d4ef481f38b6a87..394f5a01ab22d1243d304720b4a9a10e85d1351e 100644 (file)
--- a/src/testutils/integrationtests.cpp
+++ b/src/testutils/integrationtests.cpp
@@ -43,16 +43,18 @@
 
 #include "integrationtests.h"
 
-#include "testutils/testoptions.h"
-#include "gromacs/utility/stringutil.h"
-#include "gromacs/utility/exceptions.h"
-#include "gromacs/options/options.h"
+#include "config.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+
 #include "gromacs/options/basicoptions.h"
+#include "gromacs/options/options.h"
+#include "gromacs/utility/exceptions.h"
 #include "gromacs/utility/file.h"
-#include <stdlib.h>
-#include <stdio.h>
+#include "gromacs/utility/stringutil.h"
 
-#include "config.h"
+#include "testutils/testoptions.h"
 
 namespace gmx
 {

diff --git a/src/testutils/mpi-printer.cpp b/src/testutils/mpi-printer.cpp
index 3f2309647fd8cb310cd2e39b9934f60140404115..abb25cc0f7dd3110c0a654ce81612316243e87da 100644 (file)
--- a/src/testutils/mpi-printer.cpp
+++ b/src/testutils/mpi-printer.cpp
@@ -37,6 +37,7 @@
 #include "mpi-printer.h"
 
 #include "config.h"
+
 #include "gromacs/utility/gmxmpi.h"
 
 #ifdef GMX_LIB_MPI

diff --git a/src/testutils/stringtest.cpp b/src/testutils/stringtest.cpp
index 81a556bb6ad4a35242144b9bd7640afc61b9e336..93b8bf9c757d4be8d4c02090f95a7b096f9d38ad 100644 (file)
--- a/src/testutils/stringtest.cpp
+++ b/src/testutils/stringtest.cpp
@@ -41,7 +41,7 @@
  */
 #include "gmxpre.h"
 
-#include "testutils/stringtest.h"
+#include "stringtest.h"
 
 #include "gromacs/options/basicoptions.h"
 #include "gromacs/options/options.h"

diff --git a/src/testutils/stringtest.h b/src/testutils/stringtest.h
index 9d2744f8ff615abbffbecc59b51c8784126dd248..502f207bf6b32620f68d8ba2ce1ba641f89dd75b 100644 (file)
--- a/src/testutils/stringtest.h
+++ b/src/testutils/stringtest.h
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2012,2013, by the GROMACS development team, led by
+ * Copyright (c) 2012,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.
@@ -48,7 +48,7 @@
 #include <boost/scoped_ptr.hpp>
 #include <gtest/gtest.h>
 
-#include "refdata.h"
+#include "testutils/refdata.h"
 
 namespace gmx
 {

diff --git a/src/testutils/testasserts.cpp b/src/testutils/testasserts.cpp
index 5025018b7674c8cdc1c0c003fe10c5627943c4c3..f14bbe1c5af81eb4bc4494ac5b44ee1e6350faf6 100644 (file)
--- a/src/testutils/testasserts.cpp
+++ b/src/testutils/testasserts.cpp
@@ -41,7 +41,7 @@
  */
 #include "gmxpre.h"
 
-#include "testutils/testasserts.h"
+#include "testasserts.h"
 
 #include <cmath>
 

diff --git a/src/testutils/testfilemanager.cpp b/src/testutils/testfilemanager.cpp
index f28d8c0b386f7c6f2f78bb0278b701752418c2a1..0a2eb0f9e38b05839fad9df8d928b4092ce314a2 100644 (file)
--- a/src/testutils/testfilemanager.cpp
+++ b/src/testutils/testfilemanager.cpp
@@ -51,8 +51,8 @@
 
 #include <gtest/gtest.h>
 
-#include "gromacs/options/options.h"
 #include "gromacs/options/basicoptions.h"
+#include "gromacs/options/options.h"
 #include "gromacs/utility/gmxassert.h"
 #include "gromacs/utility/path.h"
 

diff --git a/src/testutils/testoptions.cpp b/src/testutils/testoptions.cpp
index ba5b848fbd8a60b6aeaab55e10b7cfe11ad2bec3..a46d8875c37797a55813eb2eefff52aad683f464 100644 (file)
--- a/src/testutils/testoptions.cpp
+++ b/src/testutils/testoptions.cpp
@@ -64,9 +64,9 @@
 #include "gromacs/utility/file.h"
 #include "gromacs/utility/programcontext.h"
 
-#include "refdata.h"
-#include "testfilemanager.h"
-#include "mpi-printer.h"
+#include "testutils/mpi-printer.h"
+#include "testutils/refdata.h"
+#include "testutils/testfilemanager.h"
 
 namespace gmx
 {

diff --git a/src/testutils/testoptions.h b/src/testutils/testoptions.h
index 8603491c12c7187a9434dd1e1ccf64dbe3c542a1..b835190b4528471c7bc97b42b083fc6c25206419 100644 (file)
--- a/src/testutils/testoptions.h
+++ b/src/testutils/testoptions.h
@@ -118,6 +118,7 @@ void registerTestOptions(const char *name, TestOptionsProvider *provider);
  * \code
    #include "gromacs/options/basicoptions.h"
    #include "gromacs/options/options.h"
+
    #include "testutils/testoptions.h"
 
    namespace gmx

diff --git a/src/testutils/tests/refdata_tests.cpp b/src/testutils/tests/refdata_tests.cpp
index 349ac57f1e8092b81001ff1b4c16de690d41e117..61c948359bd2832e0adba5447ced50374adff564 100644 (file)
--- a/src/testutils/tests/refdata_tests.cpp
+++ b/src/testutils/tests/refdata_tests.cpp
@@ -45,8 +45,8 @@
 
 #include <vector>
 
-#include <gtest/gtest.h>
 #include <gtest/gtest-spi.h>
+#include <gtest/gtest.h>
 
 namespace
 {