Rename format.h to more generic stringutil.h.

There were already some string helper functions not directly related to
formatting, and this header is a natural place to add more of such
things.

Change-Id: I46f7bd46393d27e49d46589b8d7b5c2362bcdc8c

diff --git a/src/gromacs/analysisdata/modules/plot.cpp b/src/gromacs/analysisdata/modules/plot.cpp
index 0e1938251345476f791036670892922d1ca7b19e..a64852c89f6f63919d2d2c4cbcab78da2f94dc5f 100644 (file)
--- a/src/gromacs/analysisdata/modules/plot.cpp
+++ b/src/gromacs/analysisdata/modules/plot.cpp
@@ -60,8 +60,8 @@
 #include "gromacs/options/timeunitmanager.h"
 #include "gromacs/selection/selectioncollection.h"
 #include "gromacs/utility/exceptions.h"
-#include "gromacs/utility/format.h"
 #include "gromacs/utility/gmxassert.h"
+#include "gromacs/utility/stringutil.h"
 
 static const char *const g_plotFormats[] = {
     "none", "xmgrace", "xmgr", NULL

diff --git a/src/gromacs/commandline/cmdlinehelpwriter.cpp b/src/gromacs/commandline/cmdlinehelpwriter.cpp
index 0960910ce0b6ff32f7d47da0d38706057aba18f8..494e02072fae3806e52d500da6ddfc75fac3de5f 100644 (file)
--- a/src/gromacs/commandline/cmdlinehelpwriter.cpp
+++ b/src/gromacs/commandline/cmdlinehelpwriter.cpp
@@ -48,7 +48,7 @@
 #include "gromacs/selection/selectionfileoptioninfo.h"
 #include "gromacs/selection/selectionoptioninfo.h"
 #include "gromacs/utility/file.h"
-#include "gromacs/utility/format.h"
+#include "gromacs/utility/stringutil.h"
 
 namespace gmx
 {

diff --git a/src/gromacs/commandline/cmdlinemodulemanager.cpp b/src/gromacs/commandline/cmdlinemodulemanager.cpp
index e7962b4782399b8e1525d0d0392741700b1a8659..6391619595406cd5d77be642d9197ceee253c5d1 100644 (file)
--- a/src/gromacs/commandline/cmdlinemodulemanager.cpp
+++ b/src/gromacs/commandline/cmdlinemodulemanager.cpp
@@ -48,10 +48,10 @@
 #include "gromacs/onlinehelp/helpmanager.h"
 #include "gromacs/onlinehelp/helptopic.h"
 #include "gromacs/utility/file.h"
-#include "gromacs/utility/format.h"
 #include "gromacs/utility/exceptions.h"
 #include "gromacs/utility/gmxassert.h"
 #include "gromacs/utility/programinfo.h"
+#include "gromacs/utility/stringutil.h"
 
 namespace gmx
 {

diff --git a/src/gromacs/gmxlib/wman.cpp b/src/gromacs/gmxlib/wman.cpp
index f14bc99c54c8ed05073ceaec037696e45a9d39d0..e9cdec25085aab67213b4fa4ad0c39ead444eafd 100644 (file)
--- a/src/gromacs/gmxlib/wman.cpp
+++ b/src/gromacs/gmxlib/wman.cpp
@@ -41,7 +41,7 @@
 
 #include <string>
 
-#include "gromacs/utility/format.h"
+#include "gromacs/utility/stringutil.h"
 
 #include "gmx_fatal.h"
 #include "string2.h"

diff --git a/src/gromacs/onlinehelp/helpformat.cpp b/src/gromacs/onlinehelp/helpformat.cpp
index 257171dd13c4b5ed9e957efa65895e4fd3ed8620..a746eeece8f8df51ada045ddec24550c846f28d9 100644 (file)
--- a/src/gromacs/onlinehelp/helpformat.cpp
+++ b/src/gromacs/onlinehelp/helpformat.cpp
@@ -47,9 +47,9 @@
 #include "gromacs/legacyheaders/wman.h"
 
 #include "gromacs/utility/file.h"
-#include "gromacs/utility/format.h"
 #include "gromacs/utility/gmxassert.h"
 #include "gromacs/utility/programinfo.h"
+#include "gromacs/utility/stringutil.h"
 
 namespace gmx
 {

diff --git a/src/gromacs/onlinehelp/helpmanager.cpp b/src/gromacs/onlinehelp/helpmanager.cpp
index 48918c5d60ad82eb7529bc6ee8d1edcaeb7fcab2..224ba2f65c067093fc25f85ff9605b9c603f7db7 100644 (file)
--- a/src/gromacs/onlinehelp/helpmanager.cpp
+++ b/src/gromacs/onlinehelp/helpmanager.cpp
@@ -44,7 +44,7 @@
 
 #include "gromacs/onlinehelp/helptopicinterface.h"
 #include "gromacs/utility/exceptions.h"
-#include "gromacs/utility/format.h"
+#include "gromacs/utility/stringutil.h"
 
 namespace gmx
 {

diff --git a/src/gromacs/onlinehelp/helptopic.cpp b/src/gromacs/onlinehelp/helptopic.cpp
index 05e67002241f615451e5190c1ca495a904d358fb..3625b19b88632913ea26206e0606af88a36fa8f6 100644 (file)
--- a/src/gromacs/onlinehelp/helptopic.cpp
+++ b/src/gromacs/onlinehelp/helptopic.cpp
@@ -43,8 +43,8 @@
 #include "gromacs/onlinehelp/helpformat.h"
 #include "gromacs/utility/exceptions.h"
 #include "gromacs/utility/file.h"
-#include "gromacs/utility/format.h"
 #include "gromacs/utility/gmxassert.h"
+#include "gromacs/utility/stringutil.h"
 
 namespace gmx
 {

diff --git a/src/gromacs/onlinehelp/helptopic.h b/src/gromacs/onlinehelp/helptopic.h
index 8815595ff66c5afa4bb9ae9818520978be9bc591..c2802da823d84c12a91f3c0935749b9d14f9f35e 100644 (file)
--- a/src/gromacs/onlinehelp/helptopic.h
+++ b/src/gromacs/onlinehelp/helptopic.h
@@ -40,7 +40,7 @@
 #ifndef GMX_ONLINEHELP_HELPTOPIC_H
 #define GMX_ONLINEHELP_HELPTOPIC_H
 
-#include "../utility/format.h"
+#include "../utility/stringutil.h"
 #include "../utility/uniqueptr.h"
 
 #include "helptopicinterface.h"

diff --git a/src/gromacs/options/basicoptions.cpp b/src/gromacs/options/basicoptions.cpp
index 38e47b89ec30d119e0596f976952e42ca1e41205..11cf80582ded66d0b2e140550b33e53d23959f3a 100644 (file)
--- a/src/gromacs/options/basicoptions.cpp
+++ b/src/gromacs/options/basicoptions.cpp
@@ -46,7 +46,7 @@
 
 #include "gromacs/options/basicoptioninfo.h"
 #include "gromacs/utility/exceptions.h"
-#include "gromacs/utility/format.h"
+#include "gromacs/utility/stringutil.h"
 
 #include "basicoptionstorage.h"
 

diff --git a/src/gromacs/options/options.cpp b/src/gromacs/options/options.cpp
index b355a16e607c5188f84bfd55696b82ce43733e30..c1d7047790141e735e71b9ebcf7c0035c7506262 100644 (file)
--- a/src/gromacs/options/options.cpp
+++ b/src/gromacs/options/options.cpp
@@ -40,9 +40,9 @@
 #include "gromacs/options/abstractoption.h"
 #include "gromacs/options/abstractoptionstorage.h"
 #include "gromacs/utility/exceptions.h"
-#include "gromacs/utility/format.h"
 #include "gromacs/utility/gmxassert.h"
 #include "gromacs/utility/messagestringcollector.h"
+#include "gromacs/utility/stringutil.h"
 
 #include "options-impl.h"
 

diff --git a/src/gromacs/selection/compiler.cpp b/src/gromacs/selection/compiler.cpp
index 40145eda346e8c0fec747b7742828052ec43db1a..8131dee6977c69bedd55d8c9efa1526a25bc89f7 100644 (file)
--- a/src/gromacs/selection/compiler.cpp
+++ b/src/gromacs/selection/compiler.cpp
@@ -282,7 +282,7 @@
 #include "gromacs/selection/selection.h"
 #include "gromacs/selection/selmethod.h"
 #include "gromacs/utility/exceptions.h"
-#include "gromacs/utility/format.h"
+#include "gromacs/utility/stringutil.h"
 
 #include "evaluate.h"
 #include "keywords.h"

diff --git a/src/gromacs/selection/params.cpp b/src/gromacs/selection/params.cpp
index f3dd0d784430951399f63b6f5bdb0ee07db69fe8..84f2b112cb2bbec474d48211096e458fbcc6f098 100644 (file)
--- a/src/gromacs/selection/params.cpp
+++ b/src/gromacs/selection/params.cpp
@@ -49,9 +49,9 @@
 #include "gromacs/selection/selmethod.h"
 #include "gromacs/selection/selparam.h"
 #include "gromacs/utility/errorcodes.h"
-#include "gromacs/utility/format.h"
 #include "gromacs/utility/gmxassert.h"
 #include "gromacs/utility/messagestringcollector.h"
+#include "gromacs/utility/stringutil.h"
 
 #include "parsetree.h"
 #include "position.h"

diff --git a/src/gromacs/selection/selectionoptionmanager.cpp b/src/gromacs/selection/selectionoptionmanager.cpp
index 5281dd4216df77936992c6e17f9f05b2c46dcf90..6463dfe5b1a4ada99c308574bddc3a44eb44a479 100644 (file)
--- a/src/gromacs/selection/selectionoptionmanager.cpp
+++ b/src/gromacs/selection/selectionoptionmanager.cpp
@@ -42,7 +42,7 @@
 #include "gromacs/selection/selection.h"
 #include "gromacs/selection/selectioncollection.h"
 #include "gromacs/utility/exceptions.h"
-#include "gromacs/utility/format.h"
+#include "gromacs/utility/stringutil.h"
 
 #include "selectionoptionstorage.h"
 

diff --git a/src/gromacs/selection/selhelp.cpp b/src/gromacs/selection/selhelp.cpp
index 9cfe96e0b9a2e184bef92a9fe4e68153eceeca82..c0cc9be7186f491e3033be1d6f24f11e8a61afc0 100644 (file)
--- a/src/gromacs/selection/selhelp.cpp
+++ b/src/gromacs/selection/selhelp.cpp
@@ -43,7 +43,7 @@
 
 #include "gromacs/onlinehelp/helptopic.h"
 #include "gromacs/utility/file.h"
-#include "gromacs/utility/format.h"
+#include "gromacs/utility/stringutil.h"
 
 #include "selhelp.h"
 #include "selmethod.h"

diff --git a/src/gromacs/selection/sm_permute.cpp b/src/gromacs/selection/sm_permute.cpp
index 2964a2f21fd2cc57ecd4f2b5623a50abb5c4a878..117ce126892d4e5e3b184888024de7c9d7b0a9f2 100644 (file)
--- a/src/gromacs/selection/sm_permute.cpp
+++ b/src/gromacs/selection/sm_permute.cpp
@@ -46,7 +46,7 @@
 #include "gromacs/selection/position.h"
 #include "gromacs/selection/selmethod.h"
 #include "gromacs/utility/exceptions.h"
-#include "gromacs/utility/format.h"
+#include "gromacs/utility/stringutil.h"
 
 /*! \internal \brief
  * Data structure for the \p permute selection modifier.

diff --git a/src/gromacs/selection/tests/selectioncollection.cpp b/src/gromacs/selection/tests/selectioncollection.cpp
index 3b7c896f1d754441d6473f4dd78ac066ba191a7c..749c81577e9638fd96b0afe80fb8a16126d3ab56 100644 (file)
--- a/src/gromacs/selection/tests/selectioncollection.cpp
+++ b/src/gromacs/selection/tests/selectioncollection.cpp
@@ -48,7 +48,7 @@
 #include "gromacs/selection/selection.h"
 #include "gromacs/utility/exceptions.h"
 #include "gromacs/utility/flags.h"
-#include "gromacs/utility/format.h"
+#include "gromacs/utility/stringutil.h"
 
 #include "testutils/datapath.h"
 #include "testutils/refdata.h"

diff --git a/src/gromacs/trajectoryanalysis.h b/src/gromacs/trajectoryanalysis.h
index 368a991e2d6d4669c9bb5810a62ddf18aa2f6a6a..8f443f1291c3eba6d8c6c4257e218f086212f708 100644 (file)
--- a/src/gromacs/trajectoryanalysis.h
+++ b/src/gromacs/trajectoryanalysis.h
@@ -83,6 +83,6 @@
 #include "trajectoryanalysis/analysissettings.h"
 #include "trajectoryanalysis/cmdlinerunner.h"
 #include "utility/exceptions.h"
-#include "utility/format.h"
+#include "utility/stringutil.h"
 
 #endif

diff --git a/src/gromacs/trajectoryanalysis/modules/angle.cpp b/src/gromacs/trajectoryanalysis/modules/angle.cpp
index 6269f5fa69a9711bc177d5177aaf5a1c9db207da..33bd170a21afb5117a0d9c62fb221dc4fce5ab99 100644 (file)
--- a/src/gromacs/trajectoryanalysis/modules/angle.cpp
+++ b/src/gromacs/trajectoryanalysis/modules/angle.cpp
@@ -54,8 +54,8 @@
 #include "gromacs/selection/selectionoptioninfo.h"
 #include "gromacs/trajectoryanalysis/analysissettings.h"
 #include "gromacs/utility/exceptions.h"
-#include "gromacs/utility/format.h"
 #include "gromacs/utility/gmxassert.h"
+#include "gromacs/utility/stringutil.h"
 
 namespace gmx
 {

diff --git a/src/gromacs/trajectoryanalysis/modules/distance.cpp b/src/gromacs/trajectoryanalysis/modules/distance.cpp
index f375fbc70513d6337a504bc05cebc4757740cc87..02edf7e8f2ade52f3768f1a15568085bec9d10ff 100644 (file)
--- a/src/gromacs/trajectoryanalysis/modules/distance.cpp
+++ b/src/gromacs/trajectoryanalysis/modules/distance.cpp
@@ -53,7 +53,7 @@
 #include "gromacs/selection/selectionoption.h"
 #include "gromacs/trajectoryanalysis/analysissettings.h"
 #include "gromacs/utility/exceptions.h"
-#include "gromacs/utility/format.h"
+#include "gromacs/utility/stringutil.h"
 
 namespace gmx
 {

diff --git a/src/gromacs/trajectoryanalysis/modules/select.cpp b/src/gromacs/trajectoryanalysis/modules/select.cpp
index 91747d97597206e75ae6a34820f5939cb5256ae7..26de3079c9c566c2de36611c463eb24da083c05b 100644 (file)
--- a/src/gromacs/trajectoryanalysis/modules/select.cpp
+++ b/src/gromacs/trajectoryanalysis/modules/select.cpp
@@ -59,7 +59,7 @@
 #include "gromacs/selection/selectionoption.h"
 #include "gromacs/trajectoryanalysis/analysissettings.h"
 #include "gromacs/utility/exceptions.h"
-#include "gromacs/utility/format.h"
+#include "gromacs/utility/stringutil.h"
 
 namespace gmx
 {

diff --git a/src/gromacs/trajectoryanalysis/runnercommon.cpp b/src/gromacs/trajectoryanalysis/runnercommon.cpp
index d91ae3f0398174d35001d0c537e96e207fbe2ee5..a9ba7560ec41330a268d3c4cc3b9fd5669f9cac9 100644 (file)
--- a/src/gromacs/trajectoryanalysis/runnercommon.cpp
+++ b/src/gromacs/trajectoryanalysis/runnercommon.cpp
@@ -57,8 +57,8 @@
 #include "gromacs/trajectoryanalysis/analysissettings.h"
 #include "gromacs/trajectoryanalysis/runnercommon.h"
 #include "gromacs/utility/exceptions.h"
-#include "gromacs/utility/format.h"
 #include "gromacs/utility/gmxassert.h"
+#include "gromacs/utility/stringutil.h"
 
 #include "analysissettings-impl.h"
 

diff --git a/src/gromacs/trajectoryanalysis/tests/test_selection.cpp b/src/gromacs/trajectoryanalysis/tests/test_selection.cpp
index 97e942ff487c3af00c5dec3da320a692d349d283..5abfff10b7ed8bed5eb5ae39ffd514333983c678 100644 (file)
--- a/src/gromacs/trajectoryanalysis/tests/test_selection.cpp
+++ b/src/gromacs/trajectoryanalysis/tests/test_selection.cpp
@@ -45,7 +45,7 @@
 #include <gromacs/trajectoryanalysis/analysissettings.h>
 #include <gromacs/trajectoryanalysis/cmdlinerunner.h>
 #include <gromacs/utility/exceptions.h>
-#include <gromacs/utility/format.h>
+#include <gromacs/utility/stringutil.h>
 
 namespace gmx
 {

diff --git a/src/gromacs/utility/CMakeLists.txt b/src/gromacs/utility/CMakeLists.txt
index 8dcbde67289773f2f01854d1d1edd93143e3cd53..b770d13d0764c199f6f177c3274a2b4f25b768f3 100644 (file)
--- a/src/gromacs/utility/CMakeLists.txt
+++ b/src/gromacs/utility/CMakeLists.txt
@@ -13,9 +13,9 @@ set(UTILITY_PUBLIC_HEADERS
     exceptions.h
     file.h
     flags.h
-    format.h
     gmx_header_config.h
     gmxassert.h
+    stringutil.h
     uniqueptr.h)
 install(FILES ${UTILITY_PUBLIC_HEADERS}
         DESTINATION ${INCL_INSTALL_DIR}/gromacs/utility

diff --git a/src/gromacs/utility/errorformat.cpp b/src/gromacs/utility/errorformat.cpp
index a9cbfaf74264fe13f72ad1c4946f2d4d6faeffa2..871f26607b06b4a9f1cf99699b622e9b5f5c938f 100644 (file)
--- a/src/gromacs/utility/errorformat.cpp
+++ b/src/gromacs/utility/errorformat.cpp
@@ -41,8 +41,8 @@
 
 #include "gromacs/legacyheaders/copyrite.h"
 
-#include "gromacs/utility/format.h"
 #include "gromacs/utility/programinfo.h"
+#include "gromacs/utility/stringutil.h"
 
 namespace gmx
 {

diff --git a/src/gromacs/utility/file.cpp b/src/gromacs/utility/file.cpp
index e3afd62cd77cd59a3d0c5f3a5d3f303433540004..fd12ca404de9263f15badf71788fd6d1938653b9 100644 (file)
--- a/src/gromacs/utility/file.cpp
+++ b/src/gromacs/utility/file.cpp
@@ -47,7 +47,7 @@
 
 #include "gromacs/utility/exceptions.h"
 #include "gromacs/utility/gmxassert.h"
-#include "gromacs/utility/format.h"
+#include "gromacs/utility/stringutil.h"
 
 namespace gmx
 {

diff --git a/src/gromacs/utility/gmxassert.cpp b/src/gromacs/utility/gmxassert.cpp
index 6a2c2dc36c582ba1e0b6ce555082629e9058351b..7eb1d426725abe93bb7a9ea4466d6865dc436d70 100644 (file)
--- a/src/gromacs/utility/gmxassert.cpp
+++ b/src/gromacs/utility/gmxassert.cpp
@@ -42,7 +42,7 @@
 
 #include <string>
 
-#include "gromacs/utility/format.h"
+#include "gromacs/utility/stringutil.h"
 
 #include "errorformat.h"
 

diff --git a/src/gromacs/utility/format.cpp b/src/gromacs/utility/stringutil.cpp
similarity index 98%
rename from src/gromacs/utility/format.cpp
rename to src/gromacs/utility/stringutil.cpp
index 93fd3c36e258d3bb5aa762182fe4b8c201cfd0e1..f1bc0445a2e244d3fc1c9f01b423632c6086c2be 100644 (file)
--- a/src/gromacs/utility/format.cpp
+++ b/src/gromacs/utility/stringutil.cpp
@@ -30,12 +30,12 @@
  */
 /*! \internal \file
  * \brief
- * Implements functions in format.h.
+ * Implements functions and classes in stringutil.h.
  *
  * \author Teemu Murtola <teemu.murtola@cbr.su.se>
  * \ingroup module_utility
  */
-#include "gromacs/utility/format.h"
+#include "stringutil.h"
 
 #include <cctype>
 #include <cstdio>

diff --git a/src/gromacs/utility/format.h b/src/gromacs/utility/stringutil.h
similarity index 98%
rename from src/gromacs/utility/format.h
rename to src/gromacs/utility/stringutil.h
index c0a194ed50a7dcedf751f03c9340cf2c7a26ca1d..4980f25da48ae8d9cf95a744969e9995ac906a5d 100644 (file)
--- a/src/gromacs/utility/format.h
+++ b/src/gromacs/utility/stringutil.h
@@ -30,14 +30,14 @@
  */
 /*! \file
  * \brief
- * Declares common string formatting routines.
+ * Declares common string utility and formatting routines.
  *
  * \author Teemu Murtola <teemu.murtola@cbr.su.se>
  * \inpublicapi
  * \ingroup module_utility
  */
-#ifndef GMX_UTILITY_FORMAT_H
-#define GMX_UTILITY_FORMAT_H
+#ifndef GMX_UTILITY_STRINGUTIL_H
+#define GMX_UTILITY_STRINGUTIL_H
 
 #include <string>
 #include <vector>

diff --git a/src/gromacs/utility/tests/CMakeLists.txt b/src/gromacs/utility/tests/CMakeLists.txt
index 7afb3d5925bd279c3f53069529d54a149fafa859..cd6130ff0dbe339b9a92868eda5815a0d056f57a 100644 (file)
--- a/src/gromacs/utility/tests/CMakeLists.txt
+++ b/src/gromacs/utility/tests/CMakeLists.txt
@@ -1,2 +1,2 @@
 gmx_add_unit_test(UtilityUnitTests utility-test
-                  format.cpp)
+                  stringutil.cpp)

diff --git a/src/gromacs/utility/tests/format.cpp b/src/gromacs/utility/tests/stringutil.cpp
similarity index 98%
rename from src/gromacs/utility/tests/format.cpp
rename to src/gromacs/utility/tests/stringutil.cpp
index 1fb49d0a9cc148c37a600e43bbc336514f83532e..6bd52998c4115203866a1d05c0f522f5b4801c0b 100644 (file)
--- a/src/gromacs/utility/tests/format.cpp
+++ b/src/gromacs/utility/tests/stringutil.cpp
@@ -30,7 +30,7 @@
  */
 /*! \internal \file
  * \brief
- * Tests for string formatting functions and classes.
+ * Tests for string utility functions and classes.
  *
  * For development, the tests can be run with a '-stdout' command-line option
  * to print out the help to stdout instead of using the XML reference
@@ -44,7 +44,7 @@
 
 #include <gtest/gtest.h>
 
-#include "gromacs/utility/format.h"
+#include "gromacs/utility/stringutil.h"
 
 #include "testutils/refdata.h"
 #include "testutils/stringtest.h"

diff --git a/src/testutils/datatest.cpp b/src/testutils/datatest.cpp
index 09739d3fb28ef7a940acfeb1d00404f836a17d4b..39d1f7cca02cb2aa246b1c9799d1fdda081fe3b7 100644 (file)
--- a/src/testutils/datatest.cpp
+++ b/src/testutils/datatest.cpp
@@ -42,8 +42,8 @@
 
 #include "gromacs/analysisdata/analysisdata.h"
 #include "gromacs/analysisdata/paralleloptions.h"
-#include "gromacs/utility/format.h"
 #include "gromacs/utility/gmxassert.h"
+#include "gromacs/utility/stringutil.h"
 
 #include "testutils/mock_datamodule.h"
 #include "testutils/refdata.h"

diff --git a/src/testutils/mock_datamodule.cpp b/src/testutils/mock_datamodule.cpp
index 2a146d9f4d55ed1c79837072e10246b8224548e8..d01695e586b7f290bbab55ba12150cd91521db70 100644 (file)
--- a/src/testutils/mock_datamodule.cpp
+++ b/src/testutils/mock_datamodule.cpp
@@ -42,8 +42,8 @@
 
 #include "gromacs/analysisdata/analysisdata.h"
 #include "gromacs/analysisdata/dataframe.h"
-#include "gromacs/utility/format.h"
 #include "gromacs/utility/gmxassert.h"
+#include "gromacs/utility/stringutil.h"
 
 #include "testutils/datatest.h"
 #include "testutils/refdata.h"

diff --git a/src/testutils/refdata.cpp b/src/testutils/refdata.cpp
index 45df34aeaa5e552b3881a9cf4d9cdace25dd3897..aca0d24ffcbb962c3612f32618dd54e5de536900 100644 (file)
--- a/src/testutils/refdata.cpp
+++ b/src/testutils/refdata.cpp
@@ -51,7 +51,7 @@
 #include "gromacs/utility/exceptions.h"
 #include "gromacs/utility/gmxassert.h"
 #include "gromacs/utility/path.h"
-#include "gromacs/utility/format.h"
+#include "gromacs/utility/stringutil.h"
 #include "testutils/datapath.h"
 #include "testutils/testexceptions.h"