From 1d2acb98ebdcc77a2c9587c0130beb3f3b5237ab Mon Sep 17 00:00:00 2001
From: Thomas Fischer <thomas.fischer@ufz.de>
Date: Mon, 12 Aug 2019 06:16:03 +0200
Subject: [PATCH] [A/FileIO/Gocad] Rename functions according to style guide.
---
Applications/FileIO/GocadIO/GocadAsciiReader.cpp | 2 +-
Applications/FileIO/GocadIO/GocadEnums.cpp | 4 ++--
Applications/FileIO/GocadIO/GocadEnums.h | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Applications/FileIO/GocadIO/GocadAsciiReader.cpp b/Applications/FileIO/GocadIO/GocadAsciiReader.cpp
index ffe8a288317..55c79d20c78 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 efb9baa1c98..0856662ca18 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 f4048489357..af3e63cac2c 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
--
GitLab