From 7fb617a45bd53b3f4f28b131869276efacced706 Mon Sep 17 00:00:00 2001 From: Jonas Zeunert Date: Tue, 11 Dec 2018 14:46:32 +0100 Subject: [PATCH] code smells --- FlippR-Driver/src/output/OutputDriverFactory.cpp | 10 +++++----- FlippR-Driver/src/output/items/DriverBoardItem.h | 2 +- FlippR-Driver/src/output/items/SoundItem.h | 2 +- FlippR-Driver/src/utility/InputSocketHandler.cpp | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/FlippR-Driver/src/output/OutputDriverFactory.cpp b/FlippR-Driver/src/output/OutputDriverFactory.cpp index 3bf5daf..ea4220f 100644 --- a/FlippR-Driver/src/output/OutputDriverFactory.cpp +++ b/FlippR-Driver/src/output/OutputDriverFactory.cpp @@ -146,7 +146,7 @@ std::chrono::milliseconds get_deactivation_time(nlohmann::json &json) { try { - uint deactivation_time = json.at("deactivation_time_milliseconds").get(); + auto deactivation_time = json.at("deactivation_time_milliseconds").get(); return std::chrono::milliseconds(deactivation_time); } catch(json::type_error &e) @@ -160,7 +160,7 @@ std::shared_ptr create_solenoid(nlohmann::json &solenoid_json, try { std::string name = solenoid_json.at("name"); - uint8_t address = solenoid_json.at("address").get(); + auto address = solenoid_json.at("address").get(); return std::make_shared(output_gpio_interface, address, name, deactivation_time); } catch(json::type_error &e) @@ -174,7 +174,7 @@ std::shared_ptr create_lamp(nlohmann::json &lamp_json, std::shared_ try { std::string name = lamp_json.at("name"); - uint8_t address = lamp_json.at("address").get(); + auto address = lamp_json.at("address").get(); return std::make_shared(output_gpio_interface, address, name); } catch(json::type_error &e) @@ -187,9 +187,9 @@ std::shared_ptr create_sound(nlohmann::json &sound_json, std::shar { try { - uint id = sound_json.at("id").get(); + auto id = sound_json.at("id").get(); std::string name = sound_json.at("name"); - uint8_t address = sound_json.at("address").get(); + auto address = sound_json.at("address").get(); return std::make_shared(output_gpio_interface, address, name, deactivation_time, id); } catch(json::type_error &e) diff --git a/FlippR-Driver/src/output/items/DriverBoardItem.h b/FlippR-Driver/src/output/items/DriverBoardItem.h index de96783..58f43c2 100644 --- a/FlippR-Driver/src/output/items/DriverBoardItem.h +++ b/FlippR-Driver/src/output/items/DriverBoardItem.h @@ -20,7 +20,7 @@ class DriverBoardItem : public Item { public: DriverBoardItem(std::shared_ptr output_gpio_interface, uint8_t address, std::string name) : - Item(output_gpio_interface, address, name) {} + Item(std::move(output_gpio_interface), address, std::move(name)) {} ~DriverBoardItem() override = default; diff --git a/FlippR-Driver/src/output/items/SoundItem.h b/FlippR-Driver/src/output/items/SoundItem.h index 48c1a21..8ea6061 100644 --- a/FlippR-Driver/src/output/items/SoundItem.h +++ b/FlippR-Driver/src/output/items/SoundItem.h @@ -18,7 +18,7 @@ class SoundItem : public Item { public: SoundItem(std::shared_ptr output_gpio_interface, uint8_t address, std::string name) : - Item(output_gpio_interface, address, name) {} + Item(std::move(output_gpio_interface), address, std::move(name)) {} ~SoundItem() override = default; }; diff --git a/FlippR-Driver/src/utility/InputSocketHandler.cpp b/FlippR-Driver/src/utility/InputSocketHandler.cpp index 623418f..bb47b1b 100644 --- a/FlippR-Driver/src/utility/InputSocketHandler.cpp +++ b/FlippR-Driver/src/utility/InputSocketHandler.cpp @@ -12,7 +12,7 @@ namespace utility { using namespace nlohmann; -InputSocketHandler::InputSocketHandler(boost::asio::io_service &service, std::string socket_file) : SocketHandler(service, socket_file) {} +InputSocketHandler::InputSocketHandler(boost::asio::io_service &service, std::string socket_file) : SocketHandler(service, std::move(socket_file)) {} void InputSocketHandler::handle(flippR_driver::input::Event &event) {