diff --git a/Applications/FileIO/GocadIO/GocadAsciiReader.cpp b/Applications/FileIO/GocadIO/GocadAsciiReader.cpp index ffe8a288317f91488f8f6f14cdf5d5943828367b..55c79d20c786bf8060a2c630e7a0f7959aa3841b 100644 --- a/Applications/FileIO/GocadIO/GocadAsciiReader.cpp +++ b/Applications/FileIO/GocadIO/GocadAsciiReader.cpp @@ -627,7 +627,7 @@ bool readFile(std::string const& file_name, if (!skipToEND(in)) { ERR("Parsing of type %s is not implemented. Skipping section.", - DataType2Str(type).c_str()); + dataType2String(type).c_str()); return false; } continue; diff --git a/Applications/FileIO/GocadIO/GocadEnums.cpp b/Applications/FileIO/GocadIO/GocadEnums.cpp index efb9baa1c98fa1e1659d85f873453a3fd1812025..0856662ca18905e4248e3a6e7b80ae73b2ff100d 100644 --- a/Applications/FileIO/GocadIO/GocadEnums.cpp +++ b/Applications/FileIO/GocadIO/GocadEnums.cpp @@ -14,7 +14,7 @@ namespace FileIO namespace Gocad { -std::string DataType2Str(DataType const t) +std::string dataType2String(DataType const t) { if (t == DataType::UNDEFINED) { @@ -39,7 +39,7 @@ std::string DataType2Str(DataType const t) return "[all types]"; } -std::string DataType2ShortStr(DataType const t) +std::string dataType2ShortString(DataType const t) { if (t == DataType::UNDEFINED) { diff --git a/Applications/FileIO/GocadIO/GocadEnums.h b/Applications/FileIO/GocadIO/GocadEnums.h index f40484893577251bcc9c91526e5f5219be11bcf5..af3e63cac2ccc90cc283fda7b079694305db651f 100644 --- a/Applications/FileIO/GocadIO/GocadEnums.h +++ b/Applications/FileIO/GocadIO/GocadEnums.h @@ -27,10 +27,10 @@ enum class DataType }; /// Given a Gocad DataType this returns the appropriate string. -std::string DataType2Str(DataType const t); +std::string dataType2String(DataType const t); /// Given a Gocad DataType this returns the appropriate short form. -std::string DataType2ShortStr(DataType const t); +std::string dataType2ShortString(DataType const t); } // namespace GocadIO