From a5605c40beb6f09994263770f0b388b54746aea5 Mon Sep 17 00:00:00 2001 From: Roland Jax Date: Wed, 19 Nov 2014 19:44:04 +0100 Subject: [PATCH] namespace 'libebus' removed. --- src/ebusctl/ebusctl.cpp | 2 -- src/ebusd/baseloop.h | 3 --- src/ebusd/ebusd.cpp | 2 -- src/ebusd/ebusloop.h | 3 --- src/lib/ebus/buscommand.cpp | 6 ------ src/lib/ebus/buscommand.h | 11 ++--------- src/lib/ebus/command.cpp | 7 ------- src/lib/ebus/command.h | 7 ------- src/lib/ebus/commands.cpp | 7 ------- src/lib/ebus/commands.h | 8 +------- src/lib/ebus/configfile.cpp | 7 ------- src/lib/ebus/configfile.h | 7 +------ src/lib/ebus/data.cpp | 6 ------ src/lib/ebus/data.h | 7 ------- src/lib/ebus/decode.cpp | 7 ------- src/lib/ebus/decode.h | 7 ------- src/lib/ebus/dump.cpp | 7 ------- src/lib/ebus/dump.h | 6 ------ src/lib/ebus/encode.cpp | 7 ------- src/lib/ebus/encode.h | 7 ------- src/lib/ebus/port.cpp | 10 ---------- src/lib/ebus/port.h | 6 ------ src/lib/ebus/result.cpp | 7 +------ src/lib/ebus/result.h | 9 +-------- src/lib/ebus/symbol.cpp | 4 ---- src/lib/ebus/symbol.h | 7 ------- src/lib/ebus/test/test_commands.cpp | 2 -- src/lib/ebus/test/test_configfile.cpp | 3 --- src/lib/ebus/test/test_data.cpp | 10 ++++------ src/lib/ebus/test/test_decode.cpp | 4 ---- src/lib/ebus/test/test_encode.cpp | 4 ---- src/lib/ebus/test/test_port.cpp | 2 -- src/lib/ebus/test/test_symbol.cpp | 2 -- 33 files changed, 10 insertions(+), 184 deletions(-) diff --git a/src/ebusctl/ebusctl.cpp b/src/ebusctl/ebusctl.cpp index 0bf1596c..930e6ede 100644 --- a/src/ebusctl/ebusctl.cpp +++ b/src/ebusctl/ebusctl.cpp @@ -30,8 +30,6 @@ #include #include -using namespace libebus; - Appl& A = Appl::Instance(true); void define_args() diff --git a/src/ebusd/baseloop.h b/src/ebusd/baseloop.h index ec18540b..7ef032c9 100644 --- a/src/ebusd/baseloop.h +++ b/src/ebusd/baseloop.h @@ -24,9 +24,6 @@ #include "network.h" #include "ebusloop.h" -using namespace libebus; - - class BaseLoop { diff --git a/src/ebusd/ebusd.cpp b/src/ebusd/ebusd.cpp index b991cd7d..eb98fe9c 100644 --- a/src/ebusd/ebusd.cpp +++ b/src/ebusd/ebusd.cpp @@ -28,8 +28,6 @@ #include #include -using namespace libebus; - Appl& A = Appl::Instance(); Daemon& D = Daemon::Instance(); Logger& L = Logger::Instance(); diff --git a/src/ebusd/ebusloop.h b/src/ebusd/ebusloop.h index da42cb49..dc2a17fa 100644 --- a/src/ebusd/ebusloop.h +++ b/src/ebusd/ebusloop.h @@ -30,9 +30,6 @@ /** the maximum time [us] allowed for retrieving a byte from an addressed slave */ #define RECV_TIMEOUT 10000 -using namespace libebus; - - class EBusLoop : public Thread { diff --git a/src/lib/ebus/buscommand.cpp b/src/lib/ebus/buscommand.cpp index 61dcd702..9b25dca8 100644 --- a/src/lib/ebus/buscommand.cpp +++ b/src/lib/ebus/buscommand.cpp @@ -19,9 +19,6 @@ #include "buscommand.h" -namespace libebus -{ - BusCommand::BusCommand(const std::string commandStr, const bool poll, const bool scan) : m_poll(poll), m_scan(scan), m_command(commandStr), m_result(), m_resultCode(RESULT_OK) { @@ -64,6 +61,3 @@ const std::string BusCommand::getMessageStr() return result; } - -} //namespace - diff --git a/src/lib/ebus/buscommand.h b/src/lib/ebus/buscommand.h index 8116d00c..4da99666 100644 --- a/src/lib/ebus/buscommand.h +++ b/src/lib/ebus/buscommand.h @@ -23,11 +23,6 @@ #include "symbol.h" #include "result.h" - -namespace libebus -{ - - enum CommandType { invalid, broadcast, masterMaster, masterSlave }; class BusCommand @@ -45,7 +40,7 @@ public: SymbolString getResult() const { return m_result; } bool isErrorResult() const { return m_resultCode < 0; } - const char* getResultCodeCStr() const { return libebus::getResultCodeCStr(m_resultCode); } + const char* getResultCodeCStr() const { return getResultCode(m_resultCode); } void setResult(const SymbolString result, const int resultCode) { m_result = result; m_resultCode = resultCode; } @@ -66,7 +61,5 @@ private: pthread_cond_t m_cond; }; - -} //namespace - #endif // LIBEBUS_BUSCOMMAND_H_ + diff --git a/src/lib/ebus/command.cpp b/src/lib/ebus/command.cpp index 8c475d34..795a3740 100644 --- a/src/lib/ebus/command.cpp +++ b/src/lib/ebus/command.cpp @@ -27,10 +27,6 @@ #include #include -namespace libebus -{ - - std::string Command::calcData() { // encode - only first entry will be encoded @@ -340,6 +336,3 @@ void Command::encode(const std::string& data, const std::string& type, delete help; } - -} //namespace - diff --git a/src/lib/ebus/command.h b/src/lib/ebus/command.h index 91bebf53..2c725ce4 100644 --- a/src/lib/ebus/command.h +++ b/src/lib/ebus/command.h @@ -23,10 +23,6 @@ #include #include -namespace libebus -{ - - typedef std::vector cmd_t; typedef cmd_t::const_iterator cmdCI_t; @@ -63,7 +59,4 @@ private: }; - -} //namespace - #endif // LIBEBUS_COMMAND_H_ diff --git a/src/lib/ebus/commands.cpp b/src/lib/ebus/commands.cpp index 6fdb34d0..dc921734 100644 --- a/src/lib/ebus/commands.cpp +++ b/src/lib/ebus/commands.cpp @@ -25,10 +25,6 @@ #include #include -namespace libebus -{ - - Commands::~Commands() { for (mapCI_t iter = m_pollDB.begin(); iter != m_pollDB.end(); ++iter) @@ -260,6 +256,3 @@ void Commands::printCommand(const cmd_t& command) const std::cout << *i << ';'; } - -} //namespace - diff --git a/src/lib/ebus/commands.h b/src/lib/ebus/commands.h index cf97ae39..dc111dc9 100644 --- a/src/lib/ebus/commands.h +++ b/src/lib/ebus/commands.h @@ -25,10 +25,6 @@ #include #include -namespace libebus -{ - - typedef std::vector cmdDB_t; typedef cmdDB_t::const_iterator cmdDBCI_t; @@ -79,7 +75,5 @@ private: }; - -} //namespace - #endif // LIBEBUS_COMMANDS_H_ + diff --git a/src/lib/ebus/configfile.cpp b/src/lib/ebus/configfile.cpp index 0520580c..f630bac5 100644 --- a/src/lib/ebus/configfile.cpp +++ b/src/lib/ebus/configfile.cpp @@ -22,10 +22,6 @@ #include #include -namespace libebus -{ - - void ConfigFileCSV::parse(std::istream& is, Commands& commands) { std::string line; @@ -132,6 +128,3 @@ void ConfigCommands::addFiles(const std::string path, const std::string extensio closedir(dir); }; - -} //namespace - diff --git a/src/lib/ebus/configfile.h b/src/lib/ebus/configfile.h index 9be9a622..d800c096 100644 --- a/src/lib/ebus/configfile.h +++ b/src/lib/ebus/configfile.h @@ -24,9 +24,6 @@ #include #include -namespace libebus -{ - /** available file endings / types. */ enum FileType { CSV, XML }; @@ -147,7 +144,5 @@ private: }; - -} //namespace - #endif // LIBEBUS_CONFIGFILE_H_ + diff --git a/src/lib/ebus/data.cpp b/src/lib/ebus/data.cpp index ac409c23..6127b003 100644 --- a/src/lib/ebus/data.cpp +++ b/src/lib/ebus/data.cpp @@ -27,9 +27,6 @@ #include #include -namespace libebus -{ - /** the known data field types. */ static const dataType_t dataTypes[] = { {"STR", 16, bt_str, ADJ, ' ', 1, 16, 0}, // >= 1 byte character string filled up with space @@ -658,6 +655,3 @@ result_t ValueListDataField::writeSymbols(std::istringstream& input, SymbolStrin return RESULT_ERR_INVALID_ARG; // value assignment not found } - -} //namespace - diff --git a/src/lib/ebus/data.h b/src/lib/ebus/data.h index e0e8dabe..4291997c 100644 --- a/src/lib/ebus/data.h +++ b/src/lib/ebus/data.h @@ -26,10 +26,6 @@ #include #include -namespace libebus -{ - - /** the message part in which a data field is stored. */ enum PartType { pt_masterData, // stored in master data @@ -315,7 +311,4 @@ protected: }; - -} //namespace - #endif // LIBEBUS_DATA_H_ diff --git a/src/lib/ebus/decode.cpp b/src/lib/ebus/decode.cpp index e8fd7a9f..49ca9e22 100644 --- a/src/lib/ebus/decode.cpp +++ b/src/lib/ebus/decode.cpp @@ -26,10 +26,6 @@ #include #include -namespace libebus -{ - - Decode::Decode(const std::string& data, const std::string& factor) : m_data(data) { @@ -347,6 +343,3 @@ std::string DecodeTTM::decode() return result.str(); } - -} //namespace - diff --git a/src/lib/ebus/decode.h b/src/lib/ebus/decode.h index d37cefe3..da1d087f 100644 --- a/src/lib/ebus/decode.h +++ b/src/lib/ebus/decode.h @@ -22,10 +22,6 @@ #include -namespace libebus -{ - - class Decode { @@ -285,7 +281,4 @@ public: }; - -} //namespace - #endif // LIBEBUS_DECODE_H_ diff --git a/src/lib/ebus/dump.cpp b/src/lib/ebus/dump.cpp index 44104f0e..258eb13f 100644 --- a/src/lib/ebus/dump.cpp +++ b/src/lib/ebus/dump.cpp @@ -21,9 +21,6 @@ #include #include -namespace libebus -{ - int Dump::write(const char* byte) { int ret = 0; @@ -47,7 +44,3 @@ int Dump::write(const char* byte) return ret; } - - -} //namespace - diff --git a/src/lib/ebus/dump.h b/src/lib/ebus/dump.h index e64c6356..af459dcf 100644 --- a/src/lib/ebus/dump.h +++ b/src/lib/ebus/dump.h @@ -22,9 +22,6 @@ #include -namespace libebus -{ - /** * @brief Class for writing raw bytes to binary file. */ @@ -68,7 +65,4 @@ private: }; - -} //namespace - #endif // LIBEBUS_DUMP_H_ diff --git a/src/lib/ebus/encode.cpp b/src/lib/ebus/encode.cpp index 76d55015..37d14eb5 100644 --- a/src/lib/ebus/encode.cpp +++ b/src/lib/ebus/encode.cpp @@ -26,10 +26,6 @@ #include #include -namespace libebus -{ - - Encode::Encode(const std::string& data, const std::string& factor) : m_data(data) { @@ -364,6 +360,3 @@ std::string EncodeTTM::encode() return result.str(); } - -} //namespace - diff --git a/src/lib/ebus/encode.h b/src/lib/ebus/encode.h index 7730054b..7d87d45d 100644 --- a/src/lib/ebus/encode.h +++ b/src/lib/ebus/encode.h @@ -22,10 +22,6 @@ #include -namespace libebus -{ - - class Encode { @@ -285,7 +281,4 @@ public: }; - -} //namespace - #endif // LIBEBUS_ENCODE_H_ diff --git a/src/lib/ebus/port.cpp b/src/lib/ebus/port.cpp index 132ee039..cf941aa8 100644 --- a/src/lib/ebus/port.cpp +++ b/src/lib/ebus/port.cpp @@ -26,11 +26,6 @@ #include #include - -namespace libebus -{ - - bool Device::isOpen() { if (isValid() == false) @@ -257,8 +252,3 @@ void Port::setType(const DeviceType type) }; }; - -} //namespace - - - diff --git a/src/lib/ebus/port.h b/src/lib/ebus/port.h index edcf1889..213bf5a4 100644 --- a/src/lib/ebus/port.h +++ b/src/lib/ebus/port.h @@ -25,9 +25,6 @@ #include #include -namespace libebus -{ - /** available device types. */ enum DeviceType { SERIAL, NETWORK }; @@ -267,7 +264,4 @@ private: }; - -} //namespace - #endif // LIBEBUS_PORT_H_ diff --git a/src/lib/ebus/result.cpp b/src/lib/ebus/result.cpp index 9fa53faf..eeb2787e 100644 --- a/src/lib/ebus/result.cpp +++ b/src/lib/ebus/result.cpp @@ -19,10 +19,7 @@ #include "result.h" -namespace libebus -{ - -const char* getResultCodeCStr(result_t resultCode) { +const char* getResultCode(result_t resultCode) { switch (resultCode) { case RESULT_ERR_SEND: return "ERR_SEND: send error"; case RESULT_ERR_EXTRA_DATA: return "ERR_EXTRA_DATA: received bytes > sent bytes"; @@ -43,5 +40,3 @@ const char* getResultCodeCStr(result_t resultCode) { } } - -} //namespace diff --git a/src/lib/ebus/result.h b/src/lib/ebus/result.h index 0298e62f..df1af2d2 100644 --- a/src/lib/ebus/result.h +++ b/src/lib/ebus/result.h @@ -20,10 +20,6 @@ #ifndef LIBEBUS_RESULT_H_ #define LIBEBUS_RESULT_H_ -namespace libebus -{ - - static const int RESULT_OK = 0; static const int RESULT_BUS_ACQUIRED = 1; // bus successfully acquired @@ -54,9 +50,6 @@ typedef int result_t; * @param resultCode the result code (see RESULT_ constants). * @return the string corresponding to the result code. */ -const char* getResultCodeCStr(result_t resultCode); - - -} //namespace +const char* getResultCode(result_t resultCode); #endif // LIBEBUS_RESULT_H_ diff --git a/src/lib/ebus/symbol.cpp b/src/lib/ebus/symbol.cpp index 05d09ab1..c98027f6 100644 --- a/src/lib/ebus/symbol.cpp +++ b/src/lib/ebus/symbol.cpp @@ -22,9 +22,6 @@ #include #include -namespace libebus -{ - /** * @brief CRC8 lookup table for the polynom 0x9b = x^8 + x^7 + x^4 + x^3 + x^1 + 1. */ @@ -190,4 +187,3 @@ bool isMaster(unsigned char addr) { && ((addrLo == 0x0) || (addrLo == 0x1) || (addrLo == 0x3) || (addrLo == 0x7) || (addrLo == 0xF)); } -} //namespace diff --git a/src/lib/ebus/symbol.h b/src/lib/ebus/symbol.h index a340b930..98b74d3d 100644 --- a/src/lib/ebus/symbol.h +++ b/src/lib/ebus/symbol.h @@ -25,10 +25,6 @@ #include #include -namespace libebus -{ - - static const unsigned char ESC = 0xA9; // escape symbol, either followed by 0x00 for the value 0xA9, or 0x01 for the value 0xAA static const unsigned char SYN = 0xAA; // synchronization symbol static const unsigned char ACK = 0x00; // positive acknowledge @@ -139,7 +135,4 @@ private: */ bool isMaster(unsigned char addr); - -} //namespace - #endif // LIBEBUS_SYMBOL_H_ diff --git a/src/lib/ebus/test/test_commands.cpp b/src/lib/ebus/test/test_commands.cpp index e51ed79b..befbd46a 100644 --- a/src/lib/ebus/test/test_commands.cpp +++ b/src/lib/ebus/test/test_commands.cpp @@ -25,8 +25,6 @@ #include #include -using namespace libebus; - // will be part of cfg csv class void readCSV(std::istream& is, Commands& commands){ std::string line; diff --git a/src/lib/ebus/test/test_configfile.cpp b/src/lib/ebus/test/test_configfile.cpp index ce46f3d5..beac4fb5 100644 --- a/src/lib/ebus/test/test_configfile.cpp +++ b/src/lib/ebus/test/test_configfile.cpp @@ -24,9 +24,6 @@ #include #include -using namespace libebus; - - int main() { std::string dir("test"); diff --git a/src/lib/ebus/test/test_data.cpp b/src/lib/ebus/test/test_data.cpp index c2ff3e70..7d268b00 100644 --- a/src/lib/ebus/test/test_data.cpp +++ b/src/lib/ebus/test/test_data.cpp @@ -21,8 +21,6 @@ #include #include -using namespace libebus; - int main () { std::string checks[][4] = { @@ -72,7 +70,7 @@ int main () result_t result = DataField::create(mstr[1], false, it, entries.end(), predefined, fields, nextPos); if (result != RESULT_OK) { - std::cout << "create \"" << checks[i][0] << "\" failed: " << getResultCodeCStr(result) << std::endl; + std::cout << "create \"" << checks[i][0] << "\" failed: " << getResultCode(result) << std::endl; continue; } if (fields.empty() == true) { @@ -86,7 +84,7 @@ int main () std::ostringstream output; result = field->read(mstr, sstr, output); if (result != RESULT_OK) { - std::cout << "read \"" << checks[i][0] << "\" failed: " << getResultCodeCStr(result) << std::endl; + std::cout << "read \"" << checks[i][0] << "\" failed: " << getResultCode(result) << std::endl; } else { std::string gotStr = output.str(); @@ -101,12 +99,12 @@ int main () SymbolString writeSstr = SymbolString(sstr.getDataStr().substr(0, 2), false); if (result != RESULT_OK) { - std::cout << "create \"" << checks[i][0] << "\" failed: " << getResultCodeCStr(result) << std::endl; + std::cout << "create \"" << checks[i][0] << "\" failed: " << getResultCode(result) << std::endl; return 1; } result = field->write(gotStr, writeMstr, writeSstr); if (result != RESULT_OK) { - std::cout << "write \"" << checks[i][0] << "\" failed: " << getResultCodeCStr(result) << std::endl; + std::cout << "write \"" << checks[i][0] << "\" failed: " << getResultCode(result) << std::endl; } else { if (mstr == writeMstr && sstr == writeSstr) diff --git a/src/lib/ebus/test/test_decode.cpp b/src/lib/ebus/test/test_decode.cpp index 3da4e9ef..d9df8858 100644 --- a/src/lib/ebus/test/test_decode.cpp +++ b/src/lib/ebus/test/test_decode.cpp @@ -21,10 +21,6 @@ #include #include - -using namespace libebus; - - int main() { Decode* help_dec = NULL; diff --git a/src/lib/ebus/test/test_encode.cpp b/src/lib/ebus/test/test_encode.cpp index f7a65fd4..5cc97abe 100644 --- a/src/lib/ebus/test/test_encode.cpp +++ b/src/lib/ebus/test/test_encode.cpp @@ -21,10 +21,6 @@ #include #include - -using namespace libebus; - - int main() { Encode* help_enc = NULL; diff --git a/src/lib/ebus/test/test_port.cpp b/src/lib/ebus/test/test_port.cpp index 9bdc12cb..2aae9808 100644 --- a/src/lib/ebus/test/test_port.cpp +++ b/src/lib/ebus/test/test_port.cpp @@ -21,8 +21,6 @@ #include #include -using namespace libebus; - int main () { std::string dev("/dev/ttyUSB20"); diff --git a/src/lib/ebus/test/test_symbol.cpp b/src/lib/ebus/test/test_symbol.cpp index b68ef9df..0ca984a7 100644 --- a/src/lib/ebus/test/test_symbol.cpp +++ b/src/lib/ebus/test/test_symbol.cpp @@ -21,8 +21,6 @@ #include #include -using namespace libebus; - int main () { SymbolString sstr = SymbolString("10feb5050427a915aa");