From 2c2fdc792348c8a961cf92c024c1beff0406fa06 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Sun, 21 Apr 2024 02:01:07 +0100 Subject: [PATCH] Tidy a header file --- include/ola/e133/E133StatusHelper.h | 26 +++++++++++--------------- libs/acn/E133StatusHelper.cpp | 5 ++++- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/include/ola/e133/E133StatusHelper.h b/include/ola/e133/E133StatusHelper.h index 9d82ddc32..c48a0fde3 100644 --- a/include/ola/e133/E133StatusHelper.h +++ b/include/ola/e133/E133StatusHelper.h @@ -30,24 +30,20 @@ namespace ola { namespace e133 { -using std::string; -using ola::acn::RPTStatusVector; -using ola::e133::E133StatusCode; -using ola::e133::E133ConnectStatusCode; -using ola::rdm::RDMStatusCode; +bool IntToStatusCode(uint16_t input, ola::e133::E133StatusCode *status_code); +std::string StatusCodeToString(ola::e133::E133StatusCode status_code); -bool IntToStatusCode(uint16_t input, E133StatusCode *status_code); -string StatusCodeToString(E133StatusCode status_code); - -bool IntToConnectStatusCode(uint16_t input, - E133ConnectStatusCode *connect_status_code); -string ConnectStatusCodeToString(E133ConnectStatusCode connect_status_code); +bool IntToConnectStatusCode( + uint16_t input, + ola::e133::E133ConnectStatusCode *connect_status_code); +std::string ConnectStatusCodeToString( + E133ConnectStatusCode connect_status_code); bool IntToRPTStatusCode(uint16_t input, - RPTStatusVector *rpt_status_code); -string RPTStatusCodeToString(RPTStatusVector rpt_status_code); -bool RPTStatusCodeToRDMStatusCode(RPTStatusVector rpt_status_code, - RDMStatusCode *rdm_status_code); + ala::acn::RPTStatusVector *rpt_status_code); +std::string RPTStatusCodeToString(ola::acn::RPTStatusVector rpt_status_code); +bool RPTStatusCodeToRDMStatusCode(ola::acn::RPTStatusVector rpt_status_code, + ola::rdm::RDMStatusCode *rdm_status_code); } // namespace e133 } // namespace ola #endif // INCLUDE_OLA_E133_E133STATUSHELPER_H_ diff --git a/libs/acn/E133StatusHelper.cpp b/libs/acn/E133StatusHelper.cpp index 97a8bdf0d..534525521 100644 --- a/libs/acn/E133StatusHelper.cpp +++ b/libs/acn/E133StatusHelper.cpp @@ -26,8 +26,11 @@ namespace ola { namespace e133 { -using ola::rdm::RDMStatusCode; using std::string; +using ola::acn::RPTStatusVector; +using ola::e133::E133StatusCode; +using ola::e133::E133ConnectStatusCode; +using ola::rdm::RDMStatusCode; /** * Verify that the int is a valid E1.33 Status Code.