Moved copyrite.* to fileio from gmxlib and legacyheaders.

Part of #1415

Change-Id: Id6cfb84cc683f88731fac7d80053aadc9b828806

diff --git a/src/gromacs/commandline/cmdlinemodulemanager-impl.h b/src/gromacs/commandline/cmdlinemodulemanager-impl.h
index 9238674e26bc4d03b9b22f8fab8ae364d080b325..e3ac13c196ced3205cac45a71f8d4d44228035ea 100644 (file)
--- a/src/gromacs/commandline/cmdlinemodulemanager-impl.h
+++ b/src/gromacs/commandline/cmdlinemodulemanager-impl.h
@@ -49,7 +49,7 @@
 
 #include "gromacs/commandline/cmdlinemodule.h"
 #include "gromacs/commandline/cmdlinemodulemanager.h"
-#include "gromacs/legacyheaders/copyrite.h"
+#include "gromacs/fileio/copyrite.h"
 #include "gromacs/options/options.h"
 #include "gromacs/utility/classhelpers.h"
 #include "gromacs/utility/gmxassert.h"

diff --git a/src/gromacs/commandline/cmdlinemodulemanager.cpp b/src/gromacs/commandline/cmdlinemodulemanager.cpp
index 1aa2e757bea5d556412006d890177ad88d8b3e4a..b4ffc2554f86011f22bc03415f995c6cc5be0efd 100644 (file)
--- a/src/gromacs/commandline/cmdlinemodulemanager.cpp
+++ b/src/gromacs/commandline/cmdlinemodulemanager.cpp
@@ -53,7 +53,7 @@
 #include "gromacs/commandline/cmdlinemodule.h"
 #include "gromacs/commandline/cmdlineparser.h"
 #include "gromacs/commandline/cmdlineprogramcontext.h"
-#include "gromacs/legacyheaders/copyrite.h"
+#include "gromacs/fileio/copyrite.h"
 #include "gromacs/math/utilities.h"
 #include "gromacs/options/basicoptions.h"
 #include "gromacs/options/options.h"

diff --git a/src/gromacs/gmxlib/copyrite.cpp b/src/gromacs/fileio/copyrite.cpp
similarity index 99%
rename from src/gromacs/gmxlib/copyrite.cpp
rename to src/gromacs/fileio/copyrite.cpp
index 8909d2190e03446d0b651deb45834a56a5125fc3..9a3939474cd5780adeb1b7fe78d53b340bd64378 100644 (file)
--- a/src/gromacs/gmxlib/copyrite.cpp
+++ b/src/gromacs/fileio/copyrite.cpp
@@ -36,7 +36,7 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/legacyheaders/copyrite.h"
+#include "copyrite.h"
 
 #include "config.h"
 

diff --git a/src/gromacs/legacyheaders/copyrite.h b/src/gromacs/fileio/copyrite.h
similarity index 98%
rename from src/gromacs/legacyheaders/copyrite.h
rename to src/gromacs/fileio/copyrite.h
index a5fcdf5c94975baf0a4696940c4a1147972e9478..8f2420f58447934954bda194507df6e869011714 100644 (file)
--- a/src/gromacs/legacyheaders/copyrite.h
+++ b/src/gromacs/fileio/copyrite.h
@@ -34,8 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
-#ifndef _copyrite_h
-#define _copyrite_h
+#ifndef GMX_FILEIO_COPYRITE_H
+#define GMX_FILEIO_COPYRITE_H
 
 #include <cstdio>
 
@@ -62,7 +62,7 @@ namespace gmx
 
 class IProgramContext;
 
-/*! \brief
+/*! \libinternal\brief
  * Settings for printBinaryInformation().
  *
  * This class is used to specify what printBinaryInformation() prints.

diff --git a/src/gromacs/fileio/groio.cpp b/src/gromacs/fileio/groio.cpp
index 1e0f73e2b649584be8ec789028df6187b6c05640..f350f1a981bca2fe0a01ea5e59730e5d998063a5 100644 (file)
--- a/src/gromacs/fileio/groio.cpp
+++ b/src/gromacs/fileio/groio.cpp
@@ -43,9 +43,9 @@
 
 #include <algorithm>
 
+#include "gromacs/fileio/copyrite.h"
 #include "gromacs/fileio/gmxfio.h"
 #include "gromacs/fileio/trx.h"
-#include "gromacs/legacyheaders/copyrite.h"
 #include "gromacs/topology/atoms.h"
 #include "gromacs/topology/mtop_util.h"
 #include "gromacs/topology/symtab.h"

diff --git a/src/gromacs/fileio/matio.cpp b/src/gromacs/fileio/matio.cpp
index 964bd942c4762626285fa9db1e9a03e8be5a4acc..de4a0087281499419f8e8ba3a9abb16781d9bc7c 100644 (file)
--- a/src/gromacs/fileio/matio.cpp
+++ b/src/gromacs/fileio/matio.cpp
@@ -45,8 +45,8 @@
 
 #include <algorithm>
 
+#include "gromacs/fileio/copyrite.h"
 #include "gromacs/fileio/gmxfio.h"
-#include "gromacs/legacyheaders/copyrite.h"
 #include "gromacs/math/utilities.h"
 #include "gromacs/utility/cstringutil.h"
 #include "gromacs/utility/exceptions.h"

diff --git a/src/gromacs/fileio/pdbio.cpp b/src/gromacs/fileio/pdbio.cpp
index 07529f7636b26b9586712de9b84ecf8f95949c31..1224f422e3976b8afbb760659502d76744b7e355 100644 (file)
--- a/src/gromacs/fileio/pdbio.cpp
+++ b/src/gromacs/fileio/pdbio.cpp
@@ -43,8 +43,8 @@
 #include <cstdlib>
 #include <cstring>
 
+#include "gromacs/fileio/copyrite.h"
 #include "gromacs/fileio/gmxfio.h"
-#include "gromacs/legacyheaders/copyrite.h"
 #include "gromacs/legacyheaders/types/ifunc.h"
 #include "gromacs/math/units.h"
 #include "gromacs/math/vec.h"

diff --git a/src/gromacs/fileio/xvgr.cpp b/src/gromacs/fileio/xvgr.cpp
index 8133ae2f8a81a960921a29a770fd6ef13aaa40ed..c576291cb4eb89727d727f61501546bae4215ee8 100644 (file)
--- a/src/gromacs/fileio/xvgr.cpp
+++ b/src/gromacs/fileio/xvgr.cpp
@@ -41,9 +41,9 @@
 #include <cctype>
 #include <cstring>
 
+#include "gromacs/fileio/copyrite.h"
 #include "gromacs/fileio/gmxfio.h"
 #include "gromacs/fileio/oenv.h"
-#include "gromacs/legacyheaders/copyrite.h"
 #include "gromacs/math/vec.h"
 #include "gromacs/utility/cstringutil.h"
 #include "gromacs/utility/exceptions.h"

diff --git a/src/gromacs/gmxana/gmx_anadock.cpp b/src/gromacs/gmxana/gmx_anadock.cpp
index 52de0d62350a443485835e8cd0005b284b8efeb5..3121a5d4754424e5f76f5215d47dbdb43c86e66a 100644 (file)
--- a/src/gromacs/gmxana/gmx_anadock.cpp
+++ b/src/gromacs/gmxana/gmx_anadock.cpp
@@ -42,9 +42,9 @@
 
 #include "gromacs/commandline/pargs.h"
 #include "gromacs/fileio/confio.h"
+#include "gromacs/fileio/copyrite.h"
 #include "gromacs/fileio/xvgr.h"
 #include "gromacs/gmxana/gmx_ana.h"
-#include "gromacs/legacyheaders/copyrite.h"
 #include "gromacs/math/vec.h"
 #include "gromacs/statistics/statistics.h"
 #include "gromacs/topology/topology.h"

diff --git a/src/gromacs/gmxana/gmx_analyze.cpp b/src/gromacs/gmxana/gmx_analyze.cpp
index 2df9583a6f9a55401f1eeb15ee70cd820925701a..81a339872bdd146aded9e21750bd519a05bf0c0f 100644 (file)
--- a/src/gromacs/gmxana/gmx_analyze.cpp
+++ b/src/gromacs/gmxana/gmx_analyze.cpp
@@ -45,11 +45,11 @@
 #include "gromacs/correlationfunctions/autocorr.h"
 #include "gromacs/correlationfunctions/expfit.h"
 #include "gromacs/correlationfunctions/integrate.h"
+#include "gromacs/fileio/copyrite.h"
 #include "gromacs/fileio/xvgr.h"
 #include "gromacs/gmxana/gmx_ana.h"
 #include "gromacs/gmxana/gstat.h"
 #include "gromacs/gmxlib/readinp.h"
-#include "gromacs/legacyheaders/copyrite.h"
 #include "gromacs/legacyheaders/txtdump.h"
 #include "gromacs/linearalgebra/matrix.h"
 #include "gromacs/math/vec.h"

diff --git a/src/gromacs/gmxana/gmx_angle.cpp b/src/gromacs/gmxana/gmx_angle.cpp
index 2dd415b8d4a087353d5d0e641283201cb6d075df..92341c94fa048f34260fcbf0905c0d06e1c0b1fa 100644 (file)
--- a/src/gromacs/gmxana/gmx_angle.cpp
+++ b/src/gromacs/gmxana/gmx_angle.cpp
@@ -44,11 +44,11 @@
 #include "gromacs/commandline/pargs.h"
 #include "gromacs/commandline/viewit.h"
 #include "gromacs/correlationfunctions/autocorr.h"
+#include "gromacs/fileio/copyrite.h"
 #include "gromacs/fileio/trrio.h"
 #include "gromacs/fileio/xvgr.h"
 #include "gromacs/gmxana/gmx_ana.h"
 #include "gromacs/gmxana/gstat.h"
-#include "gromacs/legacyheaders/copyrite.h"
 #include "gromacs/math/units.h"
 #include "gromacs/math/vec.h"
 #include "gromacs/topology/index.h"

diff --git a/src/gromacs/gmxana/gmx_densorder.cpp b/src/gromacs/gmxana/gmx_densorder.cpp
index c0bb34f9b4209315b2a2c849b78832a2c82cc6a3..6e569dad3a18b250319acbc4b9ea156e0fc06aa1 100644 (file)
--- a/src/gromacs/gmxana/gmx_densorder.cpp
+++ b/src/gromacs/gmxana/gmx_densorder.cpp
@@ -41,6 +41,7 @@
 #include "gromacs/commandline/pargs.h"
 #include "gromacs/correlationfunctions/autocorr.h"
 #include "gromacs/correlationfunctions/expfit.h"
+#include "gromacs/fileio/copyrite.h"
 #include "gromacs/fileio/matio.h"
 #include "gromacs/fileio/tpxio.h"
 #include "gromacs/fileio/trxio.h"
@@ -50,7 +51,6 @@
 #include "gromacs/gmxana/gmx_ana.h"
 #include "gromacs/gmxana/gstat.h"
 #include "gromacs/gmxana/powerspect.h"
-#include "gromacs/legacyheaders/copyrite.h"
 #include "gromacs/math/units.h"
 #include "gromacs/math/vec.h"
 #include "gromacs/pbcutil/pbc.h"

diff --git a/src/gromacs/gmxana/gmx_dielectric.cpp b/src/gromacs/gmxana/gmx_dielectric.cpp
index 95fe54f1e39dc8c996a6233348656c166866f8a4..4537d266e3cd1af6a9335b408c8b7e36a2f8b568 100644 (file)
--- a/src/gromacs/gmxana/gmx_dielectric.cpp
+++ b/src/gromacs/gmxana/gmx_dielectric.cpp
@@ -47,10 +47,10 @@
 #include "gromacs/correlationfunctions/expfit.h"
 #include "gromacs/correlationfunctions/integrate.h"
 #include "gromacs/fft/fft.h"
+#include "gromacs/fileio/copyrite.h"
 #include "gromacs/fileio/xvgr.h"
 #include "gromacs/gmxana/gmx_ana.h"
 #include "gromacs/gmxana/gstat.h"
-#include "gromacs/legacyheaders/copyrite.h"
 #include "gromacs/math/gmxcomplex.h"
 #include "gromacs/math/utilities.h"
 #include "gromacs/utility/arraysize.h"

diff --git a/src/gromacs/gmxana/gmx_dipoles.cpp b/src/gromacs/gmxana/gmx_dipoles.cpp
index a96cb4be770c0ea987705ae2faeac6e1eb917ce9..3766e0a2f7d09683a95c553cd27dbc21d1584c9b 100644 (file)
--- a/src/gromacs/gmxana/gmx_dipoles.cpp
+++ b/src/gromacs/gmxana/gmx_dipoles.cpp
@@ -45,12 +45,12 @@
 #include "gromacs/commandline/viewit.h"
 #include "gromacs/correlationfunctions/autocorr.h"
 #include "gromacs/fileio/confio.h"
+#include "gromacs/fileio/copyrite.h"
 #include "gromacs/fileio/enxio.h"
 #include "gromacs/fileio/matio.h"
 #include "gromacs/fileio/trxio.h"
 #include "gromacs/fileio/xvgr.h"
 #include "gromacs/gmxana/gmx_ana.h"
-#include "gromacs/legacyheaders/copyrite.h"
 #include "gromacs/legacyheaders/names.h"
 #include "gromacs/legacyheaders/txtdump.h"
 #include "gromacs/linearalgebra/nrjac.h"

diff --git a/src/gromacs/gmxana/gmx_dos.cpp b/src/gromacs/gmxana/gmx_dos.cpp
index d6a0cff4389fddaaf5e6dad3517893af764ba43b..9dd47dfef844eb35d44da9ff8c284780e86b6c14 100644 (file)
--- a/src/gromacs/gmxana/gmx_dos.cpp
+++ b/src/gromacs/gmxana/gmx_dos.cpp
@@ -45,12 +45,12 @@
 #include "gromacs/correlationfunctions/integrate.h"
 #include "gromacs/fft/fft.h"
 #include "gromacs/fileio/confio.h"
+#include "gromacs/fileio/copyrite.h"
 #include "gromacs/fileio/gmxfio.h"
 #include "gromacs/fileio/trx.h"
 #include "gromacs/fileio/trxio.h"
 #include "gromacs/fileio/xvgr.h"
 #include "gromacs/gmxana/gmx_ana.h"
-#include "gromacs/legacyheaders/copyrite.h"
 #include "gromacs/legacyheaders/txtdump.h"
 #include "gromacs/math/units.h"
 #include "gromacs/math/utilities.h"

diff --git a/src/gromacs/gmxana/gmx_dyecoupl.cpp b/src/gromacs/gmxana/gmx_dyecoupl.cpp
index d641e05a33b190fa55f229ef877cef9b6c2beee7..4e0ddc60440e434a883dda3dd851598650d34866 100644 (file)
--- a/src/gromacs/gmxana/gmx_dyecoupl.cpp
+++ b/src/gromacs/gmxana/gmx_dyecoupl.cpp
@@ -35,12 +35,12 @@
 #include "gmxpre.h"
 
 #include "gromacs/commandline/pargs.h"
+#include "gromacs/fileio/copyrite.h"
 #include "gromacs/fileio/filenm.h"
 #include "gromacs/fileio/trx.h"
 #include "gromacs/fileio/trxio.h"
 #include "gromacs/fileio/xvgr.h"
 #include "gromacs/gmxana/gmx_ana.h"
-#include "gromacs/legacyheaders/copyrite.h"
 #include "gromacs/math/vec.h"
 #include "gromacs/pbcutil/pbc.h"
 #include "gromacs/topology/index.h"

diff --git a/src/gromacs/gmxana/gmx_energy.cpp b/src/gromacs/gmxana/gmx_energy.cpp
index 18076fa9382ad3e2a1b15a57bdf6588f389aadbe..db1a5be12ca25b68d959907a50e6e9e4233b082b 100644 (file)
--- a/src/gromacs/gmxana/gmx_energy.cpp
+++ b/src/gromacs/gmxana/gmx_energy.cpp
@@ -45,6 +45,7 @@
 #include "gromacs/commandline/pargs.h"
 #include "gromacs/commandline/viewit.h"
 #include "gromacs/correlationfunctions/autocorr.h"
+#include "gromacs/fileio/copyrite.h"
 #include "gromacs/fileio/enxio.h"
 #include "gromacs/fileio/gmxfio.h"
 #include "gromacs/fileio/tpxio.h"
@@ -52,7 +53,6 @@
 #include "gromacs/fileio/xvgr.h"
 #include "gromacs/gmxana/gmx_ana.h"
 #include "gromacs/gmxana/gstat.h"
-#include "gromacs/legacyheaders/copyrite.h"
 #include "gromacs/legacyheaders/names.h"
 #include "gromacs/legacyheaders/types/ifunc.h"
 #include "gromacs/math/units.h"

diff --git a/src/gromacs/gmxana/gmx_hbond.cpp b/src/gromacs/gmxana/gmx_hbond.cpp
index 52311402feba5f6526ae6e562b3c9e2004eb761d..5ca14c13505ad2b55d37c7f3fa899fedaf09c4bf 100644 (file)
--- a/src/gromacs/gmxana/gmx_hbond.cpp
+++ b/src/gromacs/gmxana/gmx_hbond.cpp
@@ -50,13 +50,13 @@
 #include "gromacs/correlationfunctions/crosscorr.h"
 #include "gromacs/correlationfunctions/expfit.h"
 #include "gromacs/correlationfunctions/integrate.h"
+#include "gromacs/fileio/copyrite.h"
 #include "gromacs/fileio/matio.h"
 #include "gromacs/fileio/tpxio.h"
 #include "gromacs/fileio/trxio.h"
 #include "gromacs/fileio/xvgr.h"
 #include "gromacs/gmxana/gmx_ana.h"
 #include "gromacs/gmxana/gstat.h"
-#include "gromacs/legacyheaders/copyrite.h"
 #include "gromacs/legacyheaders/txtdump.h"
 #include "gromacs/legacyheaders/types/ifunc.h"
 #include "gromacs/math/units.h"

diff --git a/src/gromacs/gmxana/gmx_nmeig.cpp b/src/gromacs/gmxana/gmx_nmeig.cpp
index 397279d70de68334c26b72513a97bdfd35231052..5d601fdd35caf3bbe664a5813d62052f39b20747 100644 (file)
--- a/src/gromacs/gmxana/gmx_nmeig.cpp
+++ b/src/gromacs/gmxana/gmx_nmeig.cpp
@@ -40,12 +40,12 @@
 #include <cstring>
 
 #include "gromacs/commandline/pargs.h"
+#include "gromacs/fileio/copyrite.h"
 #include "gromacs/fileio/mtxio.h"
 #include "gromacs/fileio/xvgr.h"
 #include "gromacs/gmxana/eigio.h"
 #include "gromacs/gmxana/gmx_ana.h"
 #include "gromacs/gmxana/gstat.h"
-#include "gromacs/legacyheaders/copyrite.h"
 #include "gromacs/legacyheaders/txtdump.h"
 #include "gromacs/legacyheaders/types/ifunc.h"
 #include "gromacs/linearalgebra/eigensolver.h"

diff --git a/src/gromacs/gmxana/gmx_pme_error.cpp b/src/gromacs/gmxana/gmx_pme_error.cpp
index 6670eda2ccac52cc1a71efe47a5b4f295eeb1b86..1fb08234a7c75c5842895e5e4197d487cc3abe44 100644 (file)
--- a/src/gromacs/gmxana/gmx_pme_error.cpp
+++ b/src/gromacs/gmxana/gmx_pme_error.cpp
@@ -42,12 +42,12 @@
 
 #include "gromacs/commandline/pargs.h"
 #include "gromacs/fileio/checkpoint.h"
+#include "gromacs/fileio/copyrite.h"
 #include "gromacs/fileio/tpxio.h"
 #include "gromacs/gmxana/gmx_ana.h"
 #include "gromacs/gmxlib/calcgrid.h"
 #include "gromacs/gmxlib/main.h"
 #include "gromacs/gmxlib/readinp.h"
-#include "gromacs/legacyheaders/copyrite.h"
 #include "gromacs/legacyheaders/network.h"
 #include "gromacs/legacyheaders/types/commrec.h"
 #include "gromacs/math/calculate-ewald-splitting-coefficient.h"

diff --git a/src/gromacs/gmxana/gmx_rms.cpp b/src/gromacs/gmxana/gmx_rms.cpp
index 603ccae674ffb25d030aa32799b177b9cc371a58..9fcead046336557d0c52276a9b2046b399401cf5 100644 (file)
--- a/src/gromacs/gmxana/gmx_rms.cpp
+++ b/src/gromacs/gmxana/gmx_rms.cpp
@@ -44,13 +44,13 @@
 #include "gromacs/commandline/pargs.h"
 #include "gromacs/commandline/viewit.h"
 #include "gromacs/fileio/confio.h"
+#include "gromacs/fileio/copyrite.h"
 #include "gromacs/fileio/matio.h"
 #include "gromacs/fileio/trxio.h"
 #include "gromacs/fileio/xvgr.h"
 #include "gromacs/gmxana/cmat.h"
 #include "gromacs/gmxana/gmx_ana.h"
 #include "gromacs/gmxana/princ.h"
-#include "gromacs/legacyheaders/copyrite.h"
 #include "gromacs/legacyheaders/types/ifunc.h"
 #include "gromacs/math/do_fit.h"
 #include "gromacs/math/vec.h"

diff --git a/src/gromacs/gmxana/gmx_sans.cpp b/src/gromacs/gmxana/gmx_sans.cpp
index 73e7cf13cd59c129a2d9c320784357bbfbb465eb..6ffec91667f3a31e24d7de2d392e83eeaad22deb 100644 (file)
--- a/src/gromacs/gmxana/gmx_sans.cpp
+++ b/src/gromacs/gmxana/gmx_sans.cpp
@@ -39,12 +39,12 @@
 
 #include "gromacs/commandline/pargs.h"
 #include "gromacs/fileio/confio.h"
+#include "gromacs/fileio/copyrite.h"
 #include "gromacs/fileio/trxio.h"
 #include "gromacs/fileio/xvgr.h"
 #include "gromacs/gmxana/gmx_ana.h"
 #include "gromacs/gmxana/gstat.h"
 #include "gromacs/gmxana/nsfactor.h"
-#include "gromacs/legacyheaders/copyrite.h"
 #include "gromacs/math/vec.h"
 #include "gromacs/pbcutil/rmpbc.h"
 #include "gromacs/topology/index.h"

diff --git a/src/gromacs/gmxana/gmx_saxs.cpp b/src/gromacs/gmxana/gmx_saxs.cpp
index aa7285f2a2b90b7882a0ea859b8c9e274eb33246..74b07dd8df791e04449e23f4447e74f7a89b5c65 100644 (file)
--- a/src/gromacs/gmxana/gmx_saxs.cpp
+++ b/src/gromacs/gmxana/gmx_saxs.cpp
@@ -40,9 +40,9 @@
 #include <cmath>
 
 #include "gromacs/commandline/pargs.h"
+#include "gromacs/fileio/copyrite.h"
 #include "gromacs/gmxana/gmx_ana.h"
 #include "gromacs/gmxana/sfactor.h"
-#include "gromacs/legacyheaders/copyrite.h"
 #include "gromacs/utility/arraysize.h"
 #include "gromacs/utility/smalloc.h"
 

diff --git a/src/gromacs/gmxana/gmx_trjconv.cpp b/src/gromacs/gmxana/gmx_trjconv.cpp
index 58963e93c48dee8b09e737114fe2054524b4828b..2aa1c6640fb42079f388827459d2e3a6fa752d1f 100644 (file)
--- a/src/gromacs/gmxana/gmx_trjconv.cpp
+++ b/src/gromacs/gmxana/gmx_trjconv.cpp
@@ -45,6 +45,7 @@
 #include "gromacs/commandline/pargs.h"
 #include "gromacs/commandline/viewit.h"
 #include "gromacs/fileio/confio.h"
+#include "gromacs/fileio/copyrite.h"
 #include "gromacs/fileio/g96io.h"
 #include "gromacs/fileio/gmxfio.h"
 #include "gromacs/fileio/groio.h"
@@ -57,7 +58,6 @@
 #include "gromacs/fileio/xtcio.h"
 #include "gromacs/fileio/xvgr.h"
 #include "gromacs/gmxana/gmx_ana.h"
-#include "gromacs/legacyheaders/copyrite.h"
 #include "gromacs/legacyheaders/names.h"
 #include "gromacs/math/do_fit.h"
 #include "gromacs/math/vec.h"

diff --git a/src/gromacs/gmxana/gmx_wham.cpp b/src/gromacs/gmxana/gmx_wham.cpp
index 4fa87fca5d99931f68884647a383163f33b09bb7..b715d9c98ac19fd7737c2014a5fcf1d9a6a0d1f8 100644 (file)
--- a/src/gromacs/gmxana/gmx_wham.cpp
+++ b/src/gromacs/gmxana/gmx_wham.cpp
@@ -54,10 +54,10 @@
 #include <sstream>
 
 #include "gromacs/commandline/pargs.h"
+#include "gromacs/fileio/copyrite.h"
 #include "gromacs/fileio/tpxio.h"
 #include "gromacs/fileio/xvgr.h"
 #include "gromacs/gmxana/gmx_ana.h"
-#include "gromacs/legacyheaders/copyrite.h"
 #include "gromacs/legacyheaders/names.h"
 #include "gromacs/math/units.h"
 #include "gromacs/math/vec.h"

diff --git a/src/gromacs/gmxana/pp2shift.cpp b/src/gromacs/gmxana/pp2shift.cpp
index 067d75977f61896c833d5a39674aedaf7ed655e7..dc6cbdcbbbc879562c501d63693425e8376d3304 100644 (file)
--- a/src/gromacs/gmxana/pp2shift.cpp
+++ b/src/gromacs/gmxana/pp2shift.cpp
@@ -41,9 +41,9 @@
 
 #include <algorithm>
 
+#include "gromacs/fileio/copyrite.h"
 #include "gromacs/fileio/matio.h"
 #include "gromacs/gmxana/gstat.h"
-#include "gromacs/legacyheaders/copyrite.h"
 #include "gromacs/math/units.h"
 #include "gromacs/utility/fatalerror.h"
 #include "gromacs/utility/futil.h"

diff --git a/src/gromacs/gmxlib/disre.cpp b/src/gromacs/gmxlib/disre.cpp
index 3743215c22b6fd746f57267b68168e3b613ae0f5..fb075a7dc5ade450fc6393611f3ed69f207031ad 100644 (file)
--- a/src/gromacs/gmxlib/disre.cpp
+++ b/src/gromacs/gmxlib/disre.cpp
@@ -47,8 +47,8 @@
 
 #include <algorithm>
 
+#include "gromacs/fileio/copyrite.h"
 #include "gromacs/gmxlib/main.h"
-#include "gromacs/legacyheaders/copyrite.h"
 #include "gromacs/legacyheaders/network.h"
 #include "gromacs/legacyheaders/types/commrec.h"
 #include "gromacs/legacyheaders/types/fcdata.h"

diff --git a/src/gromacs/gmxlib/main.cpp b/src/gromacs/gmxlib/main.cpp
index 41bea0bbd95b104c7b5b000415eef771e4354233..1208de8dc76c7ea1815ac97e27d24d217c0e6de5 100644 (file)
--- a/src/gromacs/gmxlib/main.cpp
+++ b/src/gromacs/gmxlib/main.cpp
@@ -44,9 +44,9 @@
 #include <cstdlib>
 #include <cstring>
 
+#include "gromacs/fileio/copyrite.h"
 #include "gromacs/fileio/filenm.h"
 #include "gromacs/fileio/gmxfio.h"
-#include "gromacs/legacyheaders/copyrite.h"
 #include "gromacs/legacyheaders/network.h"
 #include "gromacs/legacyheaders/types/commrec.h"
 #include "gromacs/utility/cstringutil.h"

diff --git a/src/gromacs/gmxlib/network.cpp b/src/gromacs/gmxlib/network.cpp
index 04dd31cae68f041c54091b33f2d15d53eaad9fd9..b51556fa0afb3830a6254b5474e2acac56430813 100644 (file)
--- a/src/gromacs/gmxlib/network.cpp
+++ b/src/gromacs/gmxlib/network.cpp
@@ -45,7 +45,7 @@
 #include <cstdlib>
 #include <cstring>
 
-#include "gromacs/legacyheaders/copyrite.h"
+#include "gromacs/fileio/copyrite.h"
 #include "gromacs/legacyheaders/types/commrec.h"
 #include "gromacs/utility/basenetwork.h"
 #include "gromacs/utility/cstringutil.h"

diff --git a/src/gromacs/gmxlib/orires.cpp b/src/gromacs/gmxlib/orires.cpp
index cb3136df42d31a100bbe63204c9b32c4424ac9c1..a249021710966de953aa9f7b0ebfe6fe9753bda8 100644 (file)
--- a/src/gromacs/gmxlib/orires.cpp
+++ b/src/gromacs/gmxlib/orires.cpp
@@ -40,8 +40,8 @@
 
 #include <cmath>
 
+#include "gromacs/fileio/copyrite.h"
 #include "gromacs/gmxlib/main.h"
-#include "gromacs/legacyheaders/copyrite.h"
 #include "gromacs/legacyheaders/network.h"
 #include "gromacs/legacyheaders/types/commrec.h"
 #include "gromacs/legacyheaders/types/fcdata.h"

diff --git a/src/gromacs/gmxlib/readinp.cpp b/src/gromacs/gmxlib/readinp.cpp
index 98ec652f23a893cc755d2694ba6fdb395f08d6b5..7e89f8f9a6bb4d2741c2d5fa736355c0a09f473b 100644 (file)
--- a/src/gromacs/gmxlib/readinp.cpp
+++ b/src/gromacs/gmxlib/readinp.cpp
@@ -44,9 +44,9 @@
 
 #include <algorithm>
 
+#include "gromacs/fileio/copyrite.h"
 #include "gromacs/fileio/gmxfio.h"
 #include "gromacs/gmxlib/warninp.h"
-#include "gromacs/legacyheaders/copyrite.h"
 #include "gromacs/legacyheaders/names.h"
 #include "gromacs/utility/cstringutil.h"
 #include "gromacs/utility/exceptions.h"

diff --git a/src/gromacs/gmxpreprocess/pdb2gmx.cpp b/src/gromacs/gmxpreprocess/pdb2gmx.cpp
index 8b168e928dba94de43ec985e09a24cd682984487..dfee31e6d5526bdbb8c3af501c83cf560bb5da13 100644 (file)
--- a/src/gromacs/gmxpreprocess/pdb2gmx.cpp
+++ b/src/gromacs/gmxpreprocess/pdb2gmx.cpp
@@ -45,6 +45,7 @@
 
 #include "gromacs/commandline/pargs.h"
 #include "gromacs/fileio/confio.h"
+#include "gromacs/fileio/copyrite.h"
 #include "gromacs/fileio/gmxfio.h"
 #include "gromacs/fileio/pdbio.h"
 #include "gromacs/fileio/strdb.h"
@@ -61,7 +62,6 @@
 #include "gromacs/gmxpreprocess/ter_db.h"
 #include "gromacs/gmxpreprocess/toputil.h"
 #include "gromacs/gmxpreprocess/xlate.h"
-#include "gromacs/legacyheaders/copyrite.h"
 #include "gromacs/math/vec.h"
 #include "gromacs/topology/atomprop.h"
 #include "gromacs/topology/block.h"

diff --git a/src/gromacs/gmxpreprocess/pdb2top.cpp b/src/gromacs/gmxpreprocess/pdb2top.cpp
index 7347a5621607b0fe1cfc37a11d50152917bdf5bb..2ad12deca84601a859271a0bbda56b0d60d7c1e7 100644 (file)
--- a/src/gromacs/gmxpreprocess/pdb2top.cpp
+++ b/src/gromacs/gmxpreprocess/pdb2top.cpp
@@ -48,6 +48,7 @@
 #include <string>
 #include <vector>
 
+#include "gromacs/fileio/copyrite.h"
 #include "gromacs/fileio/filenm.h"
 #include "gromacs/fileio/pdbio.h"
 #include "gromacs/fileio/strdb.h"
@@ -63,7 +64,6 @@
 #include "gromacs/gmxpreprocess/topdirs.h"
 #include "gromacs/gmxpreprocess/topio.h"
 #include "gromacs/gmxpreprocess/toputil.h"
-#include "gromacs/legacyheaders/copyrite.h"
 #include "gromacs/math/vec.h"
 #include "gromacs/topology/residuetypes.h"
 #include "gromacs/topology/symtab.h"

diff --git a/src/gromacs/gmxpreprocess/x2top.cpp b/src/gromacs/gmxpreprocess/x2top.cpp
index d246711f8c736ec22e81950253ce88741d2af413..b6cfcb343bf03b591eafdd37679ba6b729be9530 100644 (file)
--- a/src/gromacs/gmxpreprocess/x2top.cpp
+++ b/src/gromacs/gmxpreprocess/x2top.cpp
@@ -42,6 +42,7 @@
 
 #include "gromacs/commandline/pargs.h"
 #include "gromacs/fileio/confio.h"
+#include "gromacs/fileio/copyrite.h"
 #include "gromacs/fileio/gmxfio.h"
 #include "gromacs/gmxlib/readinp.h"
 #include "gromacs/gmxpreprocess/gen_ad.h"
@@ -51,7 +52,6 @@
 #include "gromacs/gmxpreprocess/notset.h"
 #include "gromacs/gmxpreprocess/pdb2top.h"
 #include "gromacs/gmxpreprocess/toppush.h"
-#include "gromacs/legacyheaders/copyrite.h"
 #include "gromacs/legacyheaders/names.h"
 #include "gromacs/legacyheaders/txtdump.h"
 #include "gromacs/listed-forces/bonded.h"

diff --git a/src/gromacs/mdlib/clincs.cpp b/src/gromacs/mdlib/clincs.cpp
index 089050f853cfaa32b05a70baa849ec5903f5de89..25415e1066df5e1856b8c5187c20243fb11a3df6 100644 (file)
--- a/src/gromacs/mdlib/clincs.cpp
+++ b/src/gromacs/mdlib/clincs.cpp
@@ -47,8 +47,8 @@
 #include <algorithm>
 
 #include "gromacs/domdec/domdec.h"
+#include "gromacs/fileio/copyrite.h"
 #include "gromacs/gmxlib/gmx_omp_nthreads.h"
-#include "gromacs/legacyheaders/copyrite.h"
 #include "gromacs/legacyheaders/nrnb.h"
 #include "gromacs/legacyheaders/types/commrec.h"
 #include "gromacs/math/units.h"

diff --git a/src/gromacs/mdlib/constr.cpp b/src/gromacs/mdlib/constr.cpp
index e240a9fce49bc9654a3b4223abb690dd6b3f250b..9194b1002eef92277fe4ac91162279d92332ecb5 100644 (file)
--- a/src/gromacs/mdlib/constr.cpp
+++ b/src/gromacs/mdlib/constr.cpp
@@ -48,11 +48,11 @@
 #include "gromacs/domdec/domdec.h"
 #include "gromacs/essentialdynamics/edsam.h"
 #include "gromacs/fileio/confio.h"
+#include "gromacs/fileio/copyrite.h"
 #include "gromacs/fileio/gmxfio.h"
 #include "gromacs/fileio/pdbio.h"
 #include "gromacs/gmxlib/gmx_omp_nthreads.h"
 #include "gromacs/gmxlib/splitter.h"
-#include "gromacs/legacyheaders/copyrite.h"
 #include "gromacs/legacyheaders/names.h"
 #include "gromacs/legacyheaders/nrnb.h"
 #include "gromacs/legacyheaders/txtdump.h"

diff --git a/src/gromacs/mdlib/forcerec.cpp b/src/gromacs/mdlib/forcerec.cpp
index bfede9e3d62f225c2331056ddb14b52344fa5f7d..d37ed42e2874b2387b2be428f20fd26f6188dd5c 100644 (file)
--- a/src/gromacs/mdlib/forcerec.cpp
+++ b/src/gromacs/mdlib/forcerec.cpp
@@ -50,11 +50,11 @@
 
 #include "gromacs/domdec/domdec.h"
 #include "gromacs/ewald/ewald.h"
+#include "gromacs/fileio/copyrite.h"
 #include "gromacs/fileio/trx.h"
 #include "gromacs/gmxlib/gmx_omp_nthreads.h"
 #include "gromacs/gmxlib/md_logging.h"
 #include "gromacs/gmxlib/gpu_utils/gpu_utils.h"
-#include "gromacs/legacyheaders/copyrite.h"
 #include "gromacs/legacyheaders/gmx_detect_hardware.h"
 #include "gromacs/legacyheaders/names.h"
 #include "gromacs/legacyheaders/network.h"

diff --git a/src/gromacs/mdlib/mdoutf.cpp b/src/gromacs/mdlib/mdoutf.cpp
index 730628a5580e871f21210d922ca9171831f16748..19ef8f4660c9da39460bf8f327eccb9e353a490d 100644 (file)
--- a/src/gromacs/mdlib/mdoutf.cpp
+++ b/src/gromacs/mdlib/mdoutf.cpp
@@ -38,12 +38,12 @@
 
 #include "gromacs/domdec/domdec.h"
 #include "gromacs/fileio/checkpoint.h"
+#include "gromacs/fileio/copyrite.h"
 #include "gromacs/fileio/gmxfio.h"
 #include "gromacs/fileio/tngio.h"
 #include "gromacs/fileio/trrio.h"
 #include "gromacs/fileio/xtcio.h"
 #include "gromacs/fileio/xvgr.h"
-#include "gromacs/legacyheaders/copyrite.h"
 #include "gromacs/legacyheaders/types/commrec.h"
 #include "gromacs/math/vec.h"
 #include "gromacs/mdlib/mdrun.h"

diff --git a/src/gromacs/mdlib/rf_util.cpp b/src/gromacs/mdlib/rf_util.cpp
index 21b21d17fb10fbc629f01895d9481cdf64f8ab24..47e71d65343cfb5ec4fcfdb4922847e688d4073a 100644 (file)
--- a/src/gromacs/mdlib/rf_util.cpp
+++ b/src/gromacs/mdlib/rf_util.cpp
@@ -38,7 +38,7 @@
 
 #include <cmath>
 
-#include "gromacs/legacyheaders/copyrite.h"
+#include "gromacs/fileio/copyrite.h"
 #include "gromacs/legacyheaders/names.h"
 #include "gromacs/legacyheaders/types/mdatom.h"
 #include "gromacs/math/units.h"

diff --git a/src/gromacs/mdlib/sim_util.cpp b/src/gromacs/mdlib/sim_util.cpp
index cfd421da48245cd2a4d0537a66d0ebfa72c5b53d..e6375445ce7f6f8a1687905db8e3a534f1a49af4 100644 (file)
--- a/src/gromacs/mdlib/sim_util.cpp
+++ b/src/gromacs/mdlib/sim_util.cpp
@@ -50,6 +50,7 @@
 #include "gromacs/domdec/domdec.h"
 #include "gromacs/essentialdynamics/edsam.h"
 #include "gromacs/ewald/pme.h"
+#include "gromacs/fileio/copyrite.h"
 #include "gromacs/gmxlib/chargegroup.h"
 #include "gromacs/gmxlib/disre.h"
 #include "gromacs/gmxlib/gmx_omp_nthreads.h"
@@ -57,7 +58,6 @@
 #include "gromacs/gmxlib/nonbonded/nb_free_energy.h"
 #include "gromacs/gmxlib/nonbonded/nb_kernel.h"
 #include "gromacs/imd/imd.h"
-#include "gromacs/legacyheaders/copyrite.h"
 #include "gromacs/legacyheaders/genborn.h"
 #include "gromacs/legacyheaders/names.h"
 #include "gromacs/legacyheaders/network.h"

diff --git a/src/gromacs/pulling/pull.cpp b/src/gromacs/pulling/pull.cpp
index 868954db1151f25e8dd46130af991c7d96c4ea49..f07f364109ada4d8bae543f2c8d519da5ea292ca 100644 (file)
--- a/src/gromacs/pulling/pull.cpp
+++ b/src/gromacs/pulling/pull.cpp
@@ -48,10 +48,10 @@
 
 #include <algorithm>
 
+#include "gromacs/fileio/copyrite.h"
 #include "gromacs/fileio/filenm.h"
 #include "gromacs/fileio/gmxfio.h"
 #include "gromacs/fileio/xvgr.h"
-#include "gromacs/legacyheaders/copyrite.h"
 #include "gromacs/legacyheaders/gmx_ga2la.h"
 #include "gromacs/legacyheaders/names.h"
 #include "gromacs/legacyheaders/network.h"

diff --git a/src/gromacs/pulling/pull_rotation.cpp b/src/gromacs/pulling/pull_rotation.cpp
index e5b91ed85b1a46581f71ded34be5a896c1cba045..826103594d3a42b34dddcb6fcf0c096a0e065ce2 100644 (file)
--- a/src/gromacs/pulling/pull_rotation.cpp
+++ b/src/gromacs/pulling/pull_rotation.cpp
@@ -47,9 +47,9 @@
 #include <algorithm>
 
 #include "gromacs/domdec/domdec.h"
+#include "gromacs/fileio/copyrite.h"
 #include "gromacs/fileio/gmxfio.h"
 #include "gromacs/fileio/xvgr.h"
-#include "gromacs/legacyheaders/copyrite.h"
 #include "gromacs/legacyheaders/gmx_ga2la.h"
 #include "gromacs/legacyheaders/names.h"
 #include "gromacs/legacyheaders/network.h"

diff --git a/src/gromacs/swap/swapcoords.cpp b/src/gromacs/swap/swapcoords.cpp
index 8c95acc3349618ab4ada2aabdf78314a12826ce8..65db38ac02a7f3e86aaf01b3d226511751ea35ac 100644 (file)
--- a/src/gromacs/swap/swapcoords.cpp
+++ b/src/gromacs/swap/swapcoords.cpp
@@ -49,9 +49,9 @@
 #include <time.h>
 
 #include "gromacs/fileio/confio.h"
+#include "gromacs/fileio/copyrite.h"
 #include "gromacs/fileio/gmxfio.h"
 #include "gromacs/fileio/xvgr.h"
-#include "gromacs/legacyheaders/copyrite.h"
 #include "gromacs/legacyheaders/names.h"
 #include "gromacs/legacyheaders/network.h"
 #include "gromacs/legacyheaders/types/inputrec.h"

diff --git a/src/gromacs/topology/atomprop.cpp b/src/gromacs/topology/atomprop.cpp
index 4cecf9e88473910d8e0fd7b66d07e5085971cbd5..be7c5f60fae9332af2f2180d69d8f10f70a4ce8f 100644 (file)
--- a/src/gromacs/topology/atomprop.cpp
+++ b/src/gromacs/topology/atomprop.cpp
@@ -44,8 +44,8 @@
 
 #include <cmath>
 
+#include "gromacs/fileio/copyrite.h"
 #include "gromacs/fileio/strdb.h"
-#include "gromacs/legacyheaders/copyrite.h"
 #include "gromacs/math/utilities.h"
 #include "gromacs/topology/residuetypes.h"
 #include "gromacs/utility/cstringutil.h"

diff --git a/src/gromacs/trajectoryanalysis/modules/freevolume.cpp b/src/gromacs/trajectoryanalysis/modules/freevolume.cpp
index e47c8037252a51c8b0e0a0f3f21cfcaa3248a3d4..e151593c4495b927004942b35a10135eebd02f0c 100644 (file)
--- a/src/gromacs/trajectoryanalysis/modules/freevolume.cpp
+++ b/src/gromacs/trajectoryanalysis/modules/freevolume.cpp
@@ -48,8 +48,8 @@
 #include "gromacs/analysisdata/analysisdata.h"
 #include "gromacs/analysisdata/modules/average.h"
 #include "gromacs/analysisdata/modules/plot.h"
+#include "gromacs/fileio/copyrite.h"
 #include "gromacs/fileio/trx.h"
-#include "gromacs/legacyheaders/copyrite.h"
 #include "gromacs/math/vec.h"
 #include "gromacs/options/basicoptions.h"
 #include "gromacs/options/filenameoption.h"

diff --git a/src/gromacs/trajectoryanalysis/modules/sasa.cpp b/src/gromacs/trajectoryanalysis/modules/sasa.cpp
index 6c6fabe40d912a803e69d304f7f9173a5f3d2281..a60a96ccc8cc5372c72d431e72461d10ee48b092 100644 (file)
--- a/src/gromacs/trajectoryanalysis/modules/sasa.cpp
+++ b/src/gromacs/trajectoryanalysis/modules/sasa.cpp
@@ -53,9 +53,9 @@
 #include "gromacs/analysisdata/modules/average.h"
 #include "gromacs/analysisdata/modules/plot.h"
 #include "gromacs/fileio/confio.h"
+#include "gromacs/fileio/copyrite.h"
 #include "gromacs/fileio/pdbio.h"
 #include "gromacs/fileio/trx.h"
-#include "gromacs/legacyheaders/copyrite.h"
 #include "gromacs/math/units.h"
 #include "gromacs/math/vec.h"
 #include "gromacs/options/basicoptions.h"

diff --git a/src/programs/mdrun/repl_ex.cpp b/src/programs/mdrun/repl_ex.cpp
index 6d4f8b570d59cd82d2f54298973ebd8b667f4d46..62c8cd458ba964242d12fb197bc4a13b503a7b71 100644 (file)
--- a/src/programs/mdrun/repl_ex.cpp
+++ b/src/programs/mdrun/repl_ex.cpp
@@ -44,8 +44,8 @@
 #include <math.h>
 
 #include "gromacs/domdec/domdec.h"
+#include "gromacs/fileio/copyrite.h"
 #include "gromacs/gmxlib/main.h"
-#include "gromacs/legacyheaders/copyrite.h"
 #include "gromacs/legacyheaders/names.h"
 #include "gromacs/legacyheaders/network.h"
 #include "gromacs/legacyheaders/types/commrec.h"

diff --git a/src/programs/mdrun/runner.cpp b/src/programs/mdrun/runner.cpp
index 72f68c3657b0688ce2c8613cf30d40f957091c9b..6d6b7d40699231f3c9610d5c78ed031fcfd7b313 100644 (file)
--- a/src/programs/mdrun/runner.cpp
+++ b/src/programs/mdrun/runner.cpp
@@ -58,6 +58,7 @@
 #include "gromacs/essentialdynamics/edsam.h"
 #include "gromacs/ewald/pme.h"
 #include "gromacs/fileio/checkpoint.h"
+#include "gromacs/fileio/copyrite.h"
 #include "gromacs/fileio/oenv.h"
 #include "gromacs/fileio/tpxio.h"
 #include "gromacs/fileio/trx.h"
@@ -69,7 +70,6 @@
 #include "gromacs/gmxlib/sighandler.h"
 #include "gromacs/gmxlib/thread_affinity.h"
 #include "gromacs/gmxlib/gpu_utils/gpu_utils.h"
-#include "gromacs/legacyheaders/copyrite.h"
 #include "gromacs/legacyheaders/gmx_detect_hardware.h"
 #include "gromacs/legacyheaders/names.h"
 #include "gromacs/legacyheaders/network.h"

diff --git a/src/programs/view/manager.cpp b/src/programs/view/manager.cpp
index 8d0e66d34b60c9cb754562b66ffb50dd32ff1854..85a64b2b1923ff5311391cc94e0ace27c5e12b93 100644 (file)
--- a/src/programs/view/manager.cpp
+++ b/src/programs/view/manager.cpp
@@ -49,8 +49,8 @@
 #include <unistd.h> // for usleep()
 #endif
 
+#include "gromacs/fileio/copyrite.h"
 #include "gromacs/fileio/tpxio.h"
-#include "gromacs/legacyheaders/copyrite.h"
 #include "gromacs/legacyheaders/names.h"
 #include "gromacs/legacyheaders/types/ifunc.h"
 #include "gromacs/math/utilities.h"

diff --git a/src/programs/view/view.cpp b/src/programs/view/view.cpp
index 0857ed9cf3e53c2d9d0895c8f8edf2a690c508fc..10c9a8886e0116b369a81f9d92e26a869aadb947 100644 (file)
--- a/src/programs/view/view.cpp
+++ b/src/programs/view/view.cpp
@@ -42,10 +42,10 @@
 
 #include "gromacs/commandline/pargs.h"
 #include "gromacs/fileio/confio.h"
+#include "gromacs/fileio/copyrite.h"
 #include "gromacs/fileio/oenv.h"
 #include "gromacs/fileio/tpxio.h"
 #include "gromacs/fileio/trx.h"
-#include "gromacs/legacyheaders/copyrite.h"
 #include "gromacs/utility/arraysize.h"
 #include "gromacs/utility/fatalerror.h"
 #include "gromacs/utility/smalloc.h"