From 11cec1d47b5ecd099d03c88348c2ba2e232a01eb Mon Sep 17 00:00:00 2001
From: john30 <ebusd@johnm.de>
Date: Thu, 18 Dec 2014 21:00:10 +0100
Subject: [PATCH] renamed _types to _templates

---
 src/ebusd/baseloop.cpp             | 4 ++--
 src/lib/ebus/test/test_message.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/ebusd/baseloop.cpp b/src/ebusd/baseloop.cpp
index 115ac122..2de262db 100644
--- a/src/ebusd/baseloop.cpp
+++ b/src/ebusd/baseloop.cpp
@@ -110,7 +110,7 @@ result_t BaseLoop::loadMessages()
 	L.log(bas, trace, "path to ebus configuration files: %s", path.c_str());
 	m_messages->clear();
 	m_templates->clear();
-	result_t result = m_templates->readFromFile(path+"/_types.csv");
+	result_t result = m_templates->readFromFile(path+"/_templates.csv");
 	if (result == RESULT_OK)
 		L.log(bas, trace, "read templates");
 	else
@@ -152,7 +152,7 @@ result_t BaseLoop::readConfigFiles(const string path, const string extension)
 			string fn = d->d_name;
 
 			if (fn.find(extension, (fn.length() - extension.length())) != string::npos
-				&& fn != "_types" + extension) {
+				&& fn != "_templates" + extension) {
 				const string p = path + "/" + d->d_name;
 				result_t result = m_messages->readFromFile(p, m_templates);
 				if (result != RESULT_OK)
diff --git a/src/lib/ebus/test/test_message.cpp b/src/lib/ebus/test/test_message.cpp
index eac50086..eefd996b 100644
--- a/src/lib/ebus/test/test_message.cpp
+++ b/src/lib/ebus/test/test_message.cpp
@@ -57,7 +57,7 @@ int main()
 		//{"","no;25","10feb505042700190023","",""},
 	};
 	DataFieldTemplates* templates = new DataFieldTemplates();
-	result_t result = templates->readFromFile("_types.csv");
+	result_t result = templates->readFromFile("_templates.csv");
 	if (result == RESULT_OK)
 		cout << "read templates OK" << endl;
 	else