From 6d1bc0a87809729252a3e706b6ff24c9df35c57f Mon Sep 17 00:00:00 2001 From: Teemu Murtola Date: Sun, 7 Sep 2014 20:48:36 +0300 Subject: [PATCH] Sort includes outside src/gromacs Change-Id: I7efefc3835d1a5974886ef680a9fb0ddce11ee3e --- src/programs/gmx.cpp | 2 +- src/programs/legacymodules.cpp | 1 - src/programs/mdrun/md.cpp | 72 +++++++++---------- src/programs/mdrun/mdrun.cpp | 9 ++- src/programs/mdrun/membed.c | 22 +++--- src/programs/mdrun/membed.h | 2 +- src/programs/mdrun/pme_loadbal.c | 14 ++-- src/programs/mdrun/repl_ex.cpp | 11 ++- src/programs/mdrun/runner.cpp | 54 +++++++------- .../mdrun/tests/compressed_x_output.cpp | 8 ++- src/programs/mdrun/tests/moduletest.cpp | 3 +- src/programs/mdrun/tests/moduletest.h | 4 +- src/programs/mdrun/tests/replicaexchange.cpp | 5 +- src/programs/mdrun/tests/rerun.cpp | 7 +- .../mdrun/tests/trajectory_writing.cpp | 6 +- src/programs/mdrun_main.cpp | 4 +- src/programs/view/Xstuff.h | 6 +- src/programs/view/buttons.cpp | 12 ++-- src/programs/view/dialogs.cpp | 15 ++-- src/programs/view/dialogs.h | 8 +-- src/programs/view/fgrid.cpp | 4 +- src/programs/view/filter.cpp | 9 +-- src/programs/view/logo.cpp | 11 +-- src/programs/view/manager.cpp | 10 +-- src/programs/view/manager.h | 2 +- src/programs/view/molps.cpp | 3 +- src/programs/view/nleg.cpp | 5 +- src/programs/view/nmol.cpp | 6 +- src/programs/view/nmol.h | 2 +- src/programs/view/popup.cpp | 3 +- src/programs/view/pulldown.cpp | 7 +- src/programs/view/view.cpp | 14 ++-- src/programs/view/x11.cpp | 4 +- src/programs/view/x11.h | 2 + src/programs/view/xdlg.cpp | 11 +-- src/programs/view/xdlghi.cpp | 9 +-- src/programs/view/xdlghi.h | 3 +- src/programs/view/xdlgitem.cpp | 7 +- src/programs/view/xdlgitem.h | 2 +- src/programs/view/xmb.cpp | 18 ++--- src/programs/view/xmb.h | 8 +-- src/programs/view/xutil.cpp | 7 +- src/testutils/cmdlinetest.cpp | 2 +- src/testutils/integrationtests.cpp | 16 +++-- src/testutils/mpi-printer.cpp | 1 + src/testutils/stringtest.cpp | 2 +- src/testutils/stringtest.h | 4 +- src/testutils/testasserts.cpp | 2 +- src/testutils/testfilemanager.cpp | 2 +- src/testutils/testoptions.cpp | 6 +- src/testutils/testoptions.h | 1 + src/testutils/tests/refdata_tests.cpp | 2 +- 52 files changed, 240 insertions(+), 210 deletions(-) diff --git a/src/programs/gmx.cpp b/src/programs/gmx.cpp index 74c409b32b..3381f6bc8e 100644 --- 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 52eaafb075..720122cba7 100644 --- 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 d738e7521f..9864f8789f 100644 --- a/src/programs/mdrun/md.cpp +++ b/src/programs/mdrun/md.cpp @@ -40,62 +40,62 @@ #include -#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 901cccfdcd..b3df7ca4a8 100644 --- 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 #include +#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 af701ac48f..cef61ffb3d 100644 --- a/src/programs/mdrun/membed.c +++ b/src/programs/mdrun/membed.c @@ -34,24 +34,26 @@ */ #include "gmxpre.h" +#include "membed.h" + #include #include + +#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 06ae251257..7face206df 100644 --- 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 17702f02a8..5ba76e63e0 100644 --- 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 726886cfeb..ac5e34c785 100644 --- a/src/programs/mdrun/repl_ex.cpp +++ b/src/programs/mdrun/repl_ex.cpp @@ -43,16 +43,15 @@ #include -#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 864b2b729e..c9b47b7e54 100644 --- a/src/programs/mdrun/runner.cpp +++ b/src/programs/mdrun/runner.cpp @@ -39,61 +39,61 @@ #include "config.h" -#include - #include #include #include #include + +#include #ifdef HAVE_UNISTD_H #include #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 98862f5f41..26a65475bf 100644 --- 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 #include + +#include + #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 f8d999682d..b9cb26f354 100644 --- 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 1b50fb6714..3e9a7d0b2f 100644 --- 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 + #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 ea8a7b20c6..e28f5f3016 100644 --- 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 @@ -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 54b4e5951e..a8e2b87bc6 100644 --- 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 -#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 6b45499e20..6ab2425320 100644 --- 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 -#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 9c67328b3e..e6b694d123 100644 --- 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 1c587077e1..f5439d8d94 100644 --- 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 +#include #include -#include #include -#include +#include #ifdef _acc_ typedef unsigned char bmchar; diff --git a/src/programs/view/buttons.cpp b/src/programs/view/buttons.cpp index 680471fdea..e5157ffe42 100644 --- a/src/programs/view/buttons.cpp +++ b/src/programs/view/buttons.cpp @@ -36,6 +36,8 @@ */ #include "gmxpre.h" +#include "buttons.h" + #include #include @@ -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 f05937af48..c556597853 100644 --- a/src/programs/view/dialogs.cpp +++ b/src/programs/view/dialogs.cpp @@ -43,20 +43,21 @@ #include // 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 0f306a134c..3e69058142 100644 --- 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 a087852e53..1249172425 100644 --- a/src/programs/view/fgrid.cpp +++ b/src/programs/view/fgrid.cpp @@ -36,13 +36,13 @@ */ #include "gmxpre.h" +#include "fgrid.h" + #include #include #include #include -#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 590e5c8bdb..c05e98b498 100644 --- a/src/programs/view/filter.cpp +++ b/src/programs/view/filter.cpp @@ -40,13 +40,14 @@ #include -#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 fdab4e5233..ee182e2e23 100644 --- a/src/programs/view/logo.cpp +++ b/src/programs/view/logo.cpp @@ -36,17 +36,18 @@ */ #include "gmxpre.h" +#include "logo.h" + #include -#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 b7f89c2c67..c77acc1846 100644 --- a/src/programs/view/manager.cpp +++ b/src/programs/view/manager.cpp @@ -46,12 +46,13 @@ #include // 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 966d133b74..1f48651beb 100644 --- a/src/programs/view/manager.h +++ b/src/programs/view/manager.h @@ -40,8 +40,8 @@ #include -#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 03c0d21513..977d3ae0b4 100644 --- a/src/programs/view/molps.cpp +++ b/src/programs/view/molps.cpp @@ -40,9 +40,8 @@ #include #include -#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 0783bb6c84..3c1669d40b 100644 --- a/src/programs/view/nleg.cpp +++ b/src/programs/view/nleg.cpp @@ -36,16 +36,17 @@ */ #include "gmxpre.h" +#include "nleg.h" + #include #include -#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 26fc5bd5fc..cca9b5fbdd 100644 --- a/src/programs/view/nmol.cpp +++ b/src/programs/view/nmol.cpp @@ -36,22 +36,22 @@ */ #include "gmxpre.h" +#include "nmol.h" + #include #include #include #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 e1802ae5a0..65cfed3002 100644 --- 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 4af8526f2c..5c8114129f 100644 --- a/src/programs/view/popup.cpp +++ b/src/programs/view/popup.cpp @@ -36,6 +36,8 @@ */ #include "gmxpre.h" +#include "popup.h" + #include #include @@ -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 d010cfdcdc..5dd4805876 100644 --- a/src/programs/view/pulldown.cpp +++ b/src/programs/view/pulldown.cpp @@ -36,16 +36,17 @@ */ #include "gmxpre.h" +#include "pulldown.h" + #include #include -#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 891cb1fd81..567b522564 100644 --- a/src/programs/view/view.cpp +++ b/src/programs/view/view.cpp @@ -41,25 +41,25 @@ #include #include -#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 add052b006..cf3eb241bb 100644 --- a/src/programs/view/x11.cpp +++ b/src/programs/view/x11.cpp @@ -36,14 +36,16 @@ */ #include "gmxpre.h" +#include "x11.h" + #include #include #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 3cc18e9115..6267b356e4 100644 --- a/src/programs/view/x11.h +++ b/src/programs/view/x11.h @@ -39,7 +39,9 @@ #define _x11_h #include + #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 86feef1e69..4c3d4375ac 100644 --- a/src/programs/view/xdlg.cpp +++ b/src/programs/view/xdlg.cpp @@ -36,17 +36,20 @@ */ #include "gmxpre.h" +#include "xdlg.h" + #include #include #include -#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 aaf393ae5e..7d79e3b8cc 100644 --- a/src/programs/view/xdlghi.cpp +++ b/src/programs/view/xdlghi.cpp @@ -36,20 +36,21 @@ */ #include "gmxpre.h" +#include "xdlghi.h" + #include #include #include #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 91e10e1485..d97764842a 100644 --- 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 + #include "Xstuff.h" #include "x11.h" #include "xdlg.h" diff --git a/src/programs/view/xdlgitem.cpp b/src/programs/view/xdlgitem.cpp index 4890f8fa38..2660ea31fb 100644 --- a/src/programs/view/xdlgitem.cpp +++ b/src/programs/view/xdlgitem.cpp @@ -36,6 +36,8 @@ */ #include "gmxpre.h" +#include "xdlgitem.h" + #include #include #include @@ -44,13 +46,12 @@ #include #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 e270b72e2c..8bf04120d0 100644 --- 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 6072f6d3d0..4999c431cd 100644 --- a/src/programs/view/xmb.cpp +++ b/src/programs/view/xmb.cpp @@ -36,22 +36,24 @@ */ #include "gmxpre.h" +#include "xmb.h" + #include #include #include -#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 69234ce924..ccb5fa28df 100644 --- 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 39b4074ec7..8d11f70bf0 100644 --- a/src/programs/view/xutil.cpp +++ b/src/programs/view/xutil.cpp @@ -36,13 +36,16 @@ */ #include "gmxpre.h" +#include "xutil.h" + #include #include #include + +#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 205324a3f0..5192ee7853 100644 --- a/src/testutils/cmdlinetest.cpp +++ b/src/testutils/cmdlinetest.cpp @@ -45,9 +45,9 @@ #include #include -#include #include +#include #include #include "gromacs/commandline/cmdlineprogramcontext.h" diff --git a/src/testutils/integrationtests.cpp b/src/testutils/integrationtests.cpp index 5ea00c67d7..394f5a01ab 100644 --- 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 +#include + #include "gromacs/options/basicoptions.h" +#include "gromacs/options/options.h" +#include "gromacs/utility/exceptions.h" #include "gromacs/utility/file.h" -#include -#include +#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 3f2309647f..abb25cc0f7 100644 --- 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 81a556bb6a..93b8bf9c75 100644 --- 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 9d2744f8ff..502f207bf6 100644 --- 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 #include -#include "refdata.h" +#include "testutils/refdata.h" namespace gmx { diff --git a/src/testutils/testasserts.cpp b/src/testutils/testasserts.cpp index 5025018b76..f14bbe1c5a 100644 --- 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 diff --git a/src/testutils/testfilemanager.cpp b/src/testutils/testfilemanager.cpp index f28d8c0b38..0a2eb0f9e3 100644 --- a/src/testutils/testfilemanager.cpp +++ b/src/testutils/testfilemanager.cpp @@ -51,8 +51,8 @@ #include -#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 ba5b848fbd..a46d8875c3 100644 --- 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 8603491c12..b835190b45 100644 --- 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 349ac57f1e..61c948359b 100644 --- a/src/testutils/tests/refdata_tests.cpp +++ b/src/testutils/tests/refdata_tests.cpp @@ -45,8 +45,8 @@ #include -#include #include +#include namespace { -- 2.22.0