Merge branch 'master' of git://github.com/yuhu-/ebusd

Conflicts:
	src/lib/ebus/data.cpp
	src/lib/ebus/data.h
	src/lib/ebus/test/test_data.cpp

src/lib/ebus/test/test_commands.cpp

@@ -25,8 +25,6 @@
 #include <sstream>
 #include <vector>
 
-using namespace libebus;
-
 // will be part of cfg csv class
 void readCSV(std::istream& is, Commands& commands){
 	std::string line;

src/lib/ebus/test/test_configfile.cpp

@@ -24,9 +24,6 @@
 #include <sstream>
 #include <vector>
 
-using namespace libebus;
-
-
 int main() {
 
 	std::string dir("test");

src/lib/ebus/test/test_data.cpp

@@ -21,8 +21,6 @@
 #include <iostream>
 #include <iomanip>
 
-using namespace libebus;
-
 void verify(bool expectFailMatch, std::string type, std::string input,
 		bool match, std::string expectStr, std::string gotStr)
 {
@@ -217,7 +215,7 @@ int main()
 
 		if (result != RESULT_OK) {
 			std::cout << "\"" << check[0] << "\": create error: "
-			          << getResultCodeCStr(result) << std::endl;
+			          << getResultCode(result) << std::endl;
 			continue;
 		}
 		if (fields == NULL) {
@@ -256,7 +254,7 @@ int main()
 						  << check[2] << "< OK" << std::endl;
 		else if (result != RESULT_OK) {
 			std::cout << "  read " << fields->getName() << " >" << check[2] << "< error: "
-					  << getResultCodeCStr(result) << std::endl;
+					  << getResultCode(result) << std::endl;
 		}
 		else {
 			bool match = strcasecmp(output.str().c_str(), expectStr.c_str()) == 0;
@@ -276,7 +274,7 @@ int main()
 			}
 			else if (result != RESULT_OK) {
 				std::cout << "  write " << fields->getName() << " >"
-						  << expectStr << "< error: " << getResultCodeCStr(result) << std::endl;
+						  << expectStr << "< error: " << getResultCode(result) << std::endl;
 			}
 			else {
 				bool match = mstr == writeMstr && sstr == writeSstr;

src/lib/ebus/test/test_decode.cpp

@@ -21,10 +21,6 @@
 #include <iostream>
 #include <iomanip>
 
-
-using namespace libebus;
-
-
 int main()
 {
 	Decode* help_dec = NULL;

src/lib/ebus/test/test_encode.cpp

@@ -21,10 +21,6 @@
 #include <iostream>
 #include <iomanip>
 
-
-using namespace libebus;
-
-
 int main()
 {
 	Encode* help_enc = NULL;

src/lib/ebus/test/test_port.cpp

@@ -21,8 +21,6 @@
 #include <iostream>
 #include <iomanip>
 
-using namespace libebus;
-
 int main ()
 {
 	std::string dev("/dev/ttyUSB20");

src/lib/ebus/test/test_symbol.cpp

@@ -21,8 +21,6 @@
 #include <iostream>
 #include <iomanip>
 
-using namespace libebus;
-
 int main ()
 {
 	SymbolString sstr = SymbolString("10feb5050427a915aa");