From f03a8cae0499f9614c7c2936eb1015503f362f0f Mon Sep 17 00:00:00 2001
From: Bernhard Amann <bernhard@icsi.berkeley.edu>
Date: Thu, 13 Dec 2012 11:59:59 -0800
Subject: [PATCH] harmonize function naming

---
 src/input/readers/Ascii.cc        | 2 +-
 src/threading/AsciiInputOutput.cc | 6 +++---
 src/threading/AsciiInputOutput.h  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/input/readers/Ascii.cc b/src/input/readers/Ascii.cc
index 557de05675..950a3d5c9b 100644
--- a/src/input/readers/Ascii.cc
+++ b/src/input/readers/Ascii.cc
@@ -325,7 +325,7 @@ bool Ascii::DoUpdate()
 				return false;
 				}
 
-			Value* val = io->EntryToVal(stringfields[(*fit).position], (*fit).name, (*fit).type, (*fit).subtype);
+			Value* val = io->StringToVal(stringfields[(*fit).position], (*fit).name, (*fit).type, (*fit).subtype);
 			if ( val == 0 )
 				{
 				Error(Fmt("Could not convert line '%s' to Val. Ignoring line.", line.c_str()));
diff --git a/src/threading/AsciiInputOutput.cc b/src/threading/AsciiInputOutput.cc
index 0f2198a229..560a6dfc38 100644
--- a/src/threading/AsciiInputOutput.cc
+++ b/src/threading/AsciiInputOutput.cc
@@ -179,7 +179,7 @@ bool AsciiInputOutput::ValToODesc(ODesc* desc, threading::Value* val, const thre
 	}
 
 
-threading::Value* AsciiInputOutput::EntryToVal(string s, string name, TypeTag type, TypeTag subtype) const
+threading::Value* AsciiInputOutput::StringToVal(string s, string name, TypeTag type, TypeTag subtype) const
 	{
 	if ( s.compare(unset_field) == 0 )  // field is not set...
 		return new threading::Value(type, false);
@@ -320,7 +320,7 @@ threading::Value* AsciiInputOutput::EntryToVal(string s, string name, TypeTag ty
 				break;
 				}
 
-			threading::Value* newval = EntryToVal(element, name, subtype);
+			threading::Value* newval = StringToVal(element, name, subtype);
 			if ( newval == 0 )
 				{
 				thread->Error("Error while reading set");
@@ -337,7 +337,7 @@ threading::Value* AsciiInputOutput::EntryToVal(string s, string name, TypeTag ty
 		// to push an empty val on top of it.
 		if ( s.empty() || *s.rbegin() == set_separator[0] )
 			{
-			lvals[pos] = EntryToVal("", name, subtype);
+			lvals[pos] = StringToVal("", name, subtype);
 			if ( lvals[pos] == 0 )
 				{
 				thread->Error("Error while trying to add empty set element");
diff --git a/src/threading/AsciiInputOutput.h b/src/threading/AsciiInputOutput.h
index b988bb9e63..9f36175a5a 100644
--- a/src/threading/AsciiInputOutput.h
+++ b/src/threading/AsciiInputOutput.h
@@ -30,7 +30,7 @@ class AsciiInputOutput {
 		bool ValToODesc(ODesc* desc, threading::Value* val, const threading::Field* field) const;
 
 		// convert the ascii representation of a field into a Value
-		threading::Value* EntryToVal(string s, string name, TypeTag type, TypeTag subtype = TYPE_ERROR) const;
+		threading::Value* StringToVal(string s, string name, TypeTag type, TypeTag subtype = TYPE_ERROR) const;
 
 		/** Helper method to render an IP address as a string.
 		  *