From 1293d8b69e320e506c85f2442d5d517c024c8bf1 Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Sat, 5 May 2018 19:32:20 -0400 Subject: [PATCH] Corrects various indentation errors. --- .../Implementation/MultiConfigurable.cpp | 2 +- .../MultiConfigurationTarget.cpp | 2 +- .../Implementation/MultiJoystickMachine.cpp | 2 +- .../Implementation/MultiKeyboardMachine.cpp | 20 +++++++++---------- .../Dynamic/MultiMachine/MultiMachine.cpp | 10 +++++----- Analyser/Static/AmstradCPC/StaticAnalyser.cpp | 4 ++-- Analyser/Static/StaticAnalyser.cpp | 6 +++--- Storage/Tape/Formats/CAS.hpp | 6 +++--- 8 files changed, 26 insertions(+), 26 deletions(-) diff --git a/Analyser/Dynamic/MultiMachine/Implementation/MultiConfigurable.cpp b/Analyser/Dynamic/MultiMachine/Implementation/MultiConfigurable.cpp index ad56d34ff..9907c7027 100644 --- a/Analyser/Dynamic/MultiMachine/Implementation/MultiConfigurable.cpp +++ b/Analyser/Dynamic/MultiMachine/Implementation/MultiConfigurable.cpp @@ -16,7 +16,7 @@ MultiConfigurable::MultiConfigurable(const std::vectorconfigurable_device(); if(device) devices_.push_back(device); - } + } } std::vector> MultiConfigurable::get_options() { diff --git a/Analyser/Dynamic/MultiMachine/Implementation/MultiConfigurationTarget.cpp b/Analyser/Dynamic/MultiMachine/Implementation/MultiConfigurationTarget.cpp index e8d3e09bf..3208d4258 100644 --- a/Analyser/Dynamic/MultiMachine/Implementation/MultiConfigurationTarget.cpp +++ b/Analyser/Dynamic/MultiMachine/Implementation/MultiConfigurationTarget.cpp @@ -14,7 +14,7 @@ MultiConfigurationTarget::MultiConfigurationTarget(const std::vectorconfiguration_target(); if(configuration_target) targets_.push_back(configuration_target); - } + } } void MultiConfigurationTarget::configure_as_target(const Analyser::Static::Target *target) { diff --git a/Analyser/Dynamic/MultiMachine/Implementation/MultiJoystickMachine.cpp b/Analyser/Dynamic/MultiMachine/Implementation/MultiJoystickMachine.cpp index 851a30d04..5e8a64f24 100644 --- a/Analyser/Dynamic/MultiMachine/Implementation/MultiJoystickMachine.cpp +++ b/Analyser/Dynamic/MultiMachine/Implementation/MultiJoystickMachine.cpp @@ -66,7 +66,7 @@ MultiJoystickMachine::MultiJoystickMachine(const std::vectorget_joysticks().size()); } - } + } for(std::size_t index = 0; index < total_joysticks; ++index) { joysticks_.emplace_back(new MultiJoystick(joystick_machines, index)); diff --git a/Analyser/Dynamic/MultiMachine/Implementation/MultiKeyboardMachine.cpp b/Analyser/Dynamic/MultiMachine/Implementation/MultiKeyboardMachine.cpp index 743091270..df4208c25 100644 --- a/Analyser/Dynamic/MultiMachine/Implementation/MultiKeyboardMachine.cpp +++ b/Analyser/Dynamic/MultiMachine/Implementation/MultiKeyboardMachine.cpp @@ -14,30 +14,30 @@ MultiKeyboardMachine::MultiKeyboardMachine(const std::vectorkeyboard_machine(); if(keyboard_machine) machines_.push_back(keyboard_machine); - } + } } void MultiKeyboardMachine::clear_all_keys() { for(const auto &machine: machines_) { machine->clear_all_keys(); - } + } } void MultiKeyboardMachine::set_key_state(uint16_t key, bool is_pressed) { - for(const auto &machine: machines_) { - machine->set_key_state(key, is_pressed); - } + for(const auto &machine: machines_) { + machine->set_key_state(key, is_pressed); + } } void MultiKeyboardMachine::type_string(const std::string &string) { - for(const auto &machine: machines_) { - machine->type_string(string); - } + for(const auto &machine: machines_) { + machine->type_string(string); + } } void MultiKeyboardMachine::keyboard_did_change_key(Inputs::Keyboard *keyboard, Inputs::Keyboard::Key key, bool is_pressed) { - for(const auto &machine: machines_) { + for(const auto &machine: machines_) { uint16_t mapped_key = machine->get_keyboard_mapper()->mapped_key_for_key(key); if(mapped_key != KeyNotMapped) machine->set_key_state(mapped_key, is_pressed); - } + } } diff --git a/Analyser/Dynamic/MultiMachine/MultiMachine.cpp b/Analyser/Dynamic/MultiMachine/MultiMachine.cpp index aac856216..9e33047dd 100644 --- a/Analyser/Dynamic/MultiMachine/MultiMachine.cpp +++ b/Analyser/Dynamic/MultiMachine/MultiMachine.cpp @@ -82,11 +82,11 @@ void MultiMachine::multi_crt_did_run_machines() { DynamicMachine *front = machines_.front().get(); std::stable_sort(machines_.begin(), machines_.end(), - [] (const std::unique_ptr &lhs, const std::unique_ptr &rhs){ - CRTMachine::Machine *lhs_crt = lhs->crt_machine(); - CRTMachine::Machine *rhs_crt = rhs->crt_machine(); - return lhs_crt->get_confidence() > rhs_crt->get_confidence(); - }); + [] (const std::unique_ptr &lhs, const std::unique_ptr &rhs){ + CRTMachine::Machine *lhs_crt = lhs->crt_machine(); + CRTMachine::Machine *rhs_crt = rhs->crt_machine(); + return lhs_crt->get_confidence() > rhs_crt->get_confidence(); + }); if(machines_.front().get() != front) { crt_machine_.did_change_machine_order(); diff --git a/Analyser/Static/AmstradCPC/StaticAnalyser.cpp b/Analyser/Static/AmstradCPC/StaticAnalyser.cpp index f302ab3ee..ecec0446b 100644 --- a/Analyser/Static/AmstradCPC/StaticAnalyser.cpp +++ b/Analyser/Static/AmstradCPC/StaticAnalyser.cpp @@ -35,8 +35,8 @@ static bool is_implied_extension(const std::string &extension) { static void right_trim(std::string &string) { string.erase(std::find_if(string.rbegin(), string.rend(), [](int ch) { - return !std::isspace(ch); - }).base(), string.end()); + return !std::isspace(ch); + }).base(), string.end()); } static std::string RunCommandFor(const Storage::Disk::CPM::File &file) { diff --git a/Analyser/Static/StaticAnalyser.cpp b/Analyser/Static/StaticAnalyser.cpp index ba70d38b7..d41ba1575 100644 --- a/Analyser/Static/StaticAnalyser.cpp +++ b/Analyser/Static/StaticAnalyser.cpp @@ -185,9 +185,9 @@ TargetList Analyser::Static::GetTargets(const std::string &file_name) { // Sort by initial confidence. Use a stable sort in case any of the machine-specific analysers // picked their insertion order carefully. std::stable_sort(targets.begin(), targets.end(), - [] (const std::unique_ptr &a, const std::unique_ptr &b) { - return a->confidence > b->confidence; - }); + [] (const std::unique_ptr &a, const std::unique_ptr &b) { + return a->confidence > b->confidence; + }); return targets; } diff --git a/Storage/Tape/Formats/CAS.hpp b/Storage/Tape/Formats/CAS.hpp index 94d9bd676..d22f9d395 100644 --- a/Storage/Tape/Formats/CAS.hpp +++ b/Storage/Tape/Formats/CAS.hpp @@ -46,11 +46,11 @@ class CAS: public Tape { void get_next(Storage::FileHolder &file, uint8_t (&buffer)[10], std::size_t quantity); // Storage for the array of data blobs to transcribe into audio; - // each chunk is preceded by a header which may be long, and is optionally - // also preceded by a gap. + // each chunk is preceded by a header which may be long, and is optionally + // also preceded by a gap. struct Chunk { bool has_gap; - bool long_header; + bool long_header; std::vector data; }; std::vector chunks_;