clang-format

This was much worse than I thought. I had run clang-format at some point, but apparently I subsequently made some non-compliant changes in pretty much every file I touched.
2024-06-18 11:09:56 +00:00 · 2021-02-15 15:34:48 -07:00 · 2021-02-15 15:34:48 -07:00 · 6e04a42c8a
commit 6e04a42c8a
parent 3bf2deb2ae
34 changed files with 58 additions and 83 deletions
--- a/src/algorithms/signal_source/adapters/ad9361_fpga_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/ad9361_fpga_signal_source.cc
@ -47,7 +47,7 @@ using namespace std::string_literals;
 Ad9361FpgaSignalSource::Ad9361FpgaSignalSource(const ConfigurationInterface *configuration,
    const std::string &role, unsigned int in_stream, unsigned int out_stream,
    Concurrent_Queue<pmt::pmt_t> *queue __attribute__((unused)))
-  : SignalSourceBase(configuration, role, "Ad9361_Fpga_Signal_Source"s), in_stream_(in_stream), out_stream_(out_stream)
+    : SignalSourceBase(configuration, role, "Ad9361_Fpga_Signal_Source"s), in_stream_(in_stream), out_stream_(out_stream)
 {
    const std::string default_gain_mode("slow_attack");
    const double default_tx_attenuation_db = -10.0;
--- a/src/algorithms/signal_source/adapters/ad9361_fpga_signal_source.h
+++ b/src/algorithms/signal_source/adapters/ad9361_fpga_signal_source.h
@ -18,12 +18,11 @@
 #ifndef GNSS_SDR_AD9361_FPGA_SIGNAL_SOURCE_H
 #define GNSS_SDR_AD9361_FPGA_SIGNAL_SOURCE_H

-#include "signal_source_base.h"
-
 #include "concurrent_queue.h"
 #include "fpga_dynamic_bit_selection.h"
 #include "fpga_switch.h"
 #include "gnss_block_interface.h"
+#include "signal_source_base.h"
 #include <pmt/pmt.h>
 #include <cstdint>
 #include <memory>
--- a/src/algorithms/signal_source/adapters/custom_udp_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/custom_udp_signal_source.cc
@ -26,8 +26,7 @@ using namespace std::string_literals;
 CustomUDPSignalSource::CustomUDPSignalSource(const ConfigurationInterface* configuration,
    const std::string& role, unsigned int in_stream, unsigned int out_stream,
    Concurrent_Queue<pmt::pmt_t>* queue __attribute__((unused)))
-  : SignalSourceBase(configuration, role, "Custom_UDP_Signal_Source"s)
-  , in_stream_(in_stream), out_stream_(out_stream)
+    : SignalSourceBase(configuration, role, "Custom_UDP_Signal_Source"s), in_stream_(in_stream), out_stream_(out_stream)
 {
    // DUMP PARAMETERS
    const std::string default_dump_file("./data/signal_source.dat");
--- a/src/algorithms/signal_source/adapters/custom_udp_signal_source.h
+++ b/src/algorithms/signal_source/adapters/custom_udp_signal_source.h
@ -18,10 +18,9 @@
 #ifndef GNSS_SDR_CUSTOM_UDP_SIGNAL_SOURCE_H
 #define GNSS_SDR_CUSTOM_UDP_SIGNAL_SOURCE_H

-#include "signal_source_base.h"
-
 #include "concurrent_queue.h"
 #include "gr_complex_ip_packet_source.h"
+#include "signal_source_base.h"
 #include <gnuradio/blocks/file_sink.h>
 #include <gnuradio/blocks/null_sink.h>
 #include <pmt/pmt.h>
--- a/src/algorithms/signal_source/adapters/file_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/file_signal_source.cc
@ -24,7 +24,7 @@ using namespace std::string_literals;
 FileSignalSource::FileSignalSource(ConfigurationInterface const* configuration,
    std::string const& role, unsigned int in_streams, unsigned int out_streams,
    Concurrent_Queue<pmt::pmt_t>* queue)
-  : FileSourceBase(configuration, role, "File_Signal_Source"s, queue, "short"s)
+    : FileSourceBase(configuration, role, "File_Signal_Source"s, queue, "short"s)
 {
    if (in_streams > 0)
        {
@ -35,5 +35,3 @@ FileSignalSource::FileSignalSource(ConfigurationInterface const* configuration,
            LOG(ERROR) << "This implementation only supports one output stream";
        }
 }
-
-
--- a/src/algorithms/signal_source/adapters/file_source_base.cc
+++ b/src/algorithms/signal_source/adapters/file_source_base.cc
@ -175,31 +175,35 @@ uint64_t FileSourceBase::samples() const


 FileSourceBase::FileSourceBase(ConfigurationInterface const* configuration, std::string role, std::string impl,
-                               Concurrent_Queue<pmt::pmt_t>* queue,
-                               std::string default_item_type)
-    : SignalSourceBase(configuration, role, impl)
-    , filename_(configuration->property(role + ".filename"s, "../data/example_capture.dat"s))
-    , file_source_()
+    Concurrent_Queue<pmt::pmt_t>* queue,
+    std::string default_item_type)
+    : SignalSourceBase(configuration, role, impl), filename_(configuration->property(role + ".filename"s, "../data/example_capture.dat"s)), file_source_()

-    , item_type_(configuration->property(role + ".item_type"s, default_item_type))
-    , item_size_(0)  // invalid
-    , is_complex_(false)
+      ,
+      item_type_(configuration->property(role + ".item_type"s, default_item_type)),
+      item_size_(0)  // invalid
+      ,
+      is_complex_(false)

-    , header_size_(configuration->property(role + ".header_size"s, 0UL))
-    , seconds_to_skip_(configuration->property(role + ".seconds_to_skip", 0.0))
-    , repeat_(configuration->property(role + ".repeat"s, false))
+      ,
+      header_size_(configuration->property(role + ".header_size"s, 0UL)),
+      seconds_to_skip_(configuration->property(role + ".seconds_to_skip", 0.0)),
+      repeat_(configuration->property(role + ".repeat"s, false))

-    , samples_(configuration->property(role + ".samples"s, 0UL))
-    , sampling_frequency_(configuration->property(role + ".sampling_frequency"s, 0UL))
-    , valve_()
-    , queue_(queue)
+      ,
+      samples_(configuration->property(role + ".samples"s, 0UL)),
+      sampling_frequency_(configuration->property(role + ".sampling_frequency"s, 0UL)),
+      valve_(),
+      queue_(queue)

-    , enable_throttle_control_(configuration->property(role + ".enable_throttle_control"s, false))
-    , throttle_()
+      ,
+      enable_throttle_control_(configuration->property(role + ".enable_throttle_control"s, false)),
+      throttle_()

-    , dump_(configuration->property(role + ".dump"s, false))
-    , dump_filename_(configuration->property(role + ".dump_filename"s, "../data/my_capture.dat"s))
-    , sink_()
+      ,
+      dump_(configuration->property(role + ".dump"s, false)),
+      dump_filename_(configuration->property(role + ".dump_filename"s, "../data/my_capture.dat"s)),
+      sink_()
 {
    // override value with commandline flag, if present
    if (FLAGS_signal_source != "-")
--- a/src/algorithms/signal_source/adapters/flexiband_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/flexiband_signal_source.cc
@ -31,7 +31,7 @@ FlexibandSignalSource::FlexibandSignalSource(const ConfigurationInterface* confi
    unsigned int in_stream,
    unsigned int out_stream,
    Concurrent_Queue<pmt::pmt_t>* queue __attribute__((unused)))
-  : SignalSourceBase(configuration, role, "Flexiband_Signal_Source"s), in_stream_(in_stream), out_stream_(out_stream)
+    : SignalSourceBase(configuration, role, "Flexiband_Signal_Source"s), in_stream_(in_stream), out_stream_(out_stream)
 {
    const std::string default_item_type("byte");
    item_type_ = configuration->property(role + ".item_type", default_item_type);
--- a/src/algorithms/signal_source/adapters/flexiband_signal_source.h
+++ b/src/algorithms/signal_source/adapters/flexiband_signal_source.h
@ -20,9 +20,8 @@
 #ifndef GNSS_SDR_FLEXIBAND_SIGNAL_SOURCE_H
 #define GNSS_SDR_FLEXIBAND_SIGNAL_SOURCE_H

-#include "signal_source_base.h"
-
 #include "concurrent_queue.h"
+#include "signal_source_base.h"
 #include <gnuradio/blocks/char_to_float.h>
 #include <gnuradio/blocks/file_sink.h>
 #include <gnuradio/blocks/float_to_complex.h>
--- a/src/algorithms/signal_source/adapters/fmcomms2_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/fmcomms2_signal_source.cc
@ -34,7 +34,7 @@ using namespace std::string_literals;
 Fmcomms2SignalSource::Fmcomms2SignalSource(const ConfigurationInterface *configuration,
    const std::string &role, unsigned int in_stream, unsigned int out_stream,
    Concurrent_Queue<pmt::pmt_t> *queue)
-  : SignalSourceBase(configuration, role, "Fmcomms2_Signal_Source"s), in_stream_(in_stream), out_stream_(out_stream)
+    : SignalSourceBase(configuration, role, "Fmcomms2_Signal_Source"s), in_stream_(in_stream), out_stream_(out_stream)
 {
    const std::string default_item_type("gr_complex");
    const std::string default_dump_file("./data/signal_source.dat");
--- a/src/algorithms/signal_source/adapters/fmcomms2_signal_source.h
+++ b/src/algorithms/signal_source/adapters/fmcomms2_signal_source.h
@ -21,7 +21,6 @@
 #define GNSS_SDR_FMCOMMS2_SIGNAL_SOURCE_H

 #include "signal_source_base.h"
-
 #include <gnuradio/blocks/file_sink.h>
 #if GRIIO_INCLUDE_HAS_GNURADIO
 #include <gnuradio/iio/fmcomms2_source.h>
--- a/src/algorithms/signal_source/adapters/gen_signal_source.h
+++ b/src/algorithms/signal_source/adapters/gen_signal_source.h
@ -20,10 +20,9 @@
 #define GNSS_SDR_GEN_SIGNAL_SOURCE_H


-#include "signal_source_interface.h"
-
 #include "concurrent_queue.h"
 #include "gnss_block_interface.h"
+#include "signal_source_interface.h"
 #include <pmt/pmt.h>
 #include <memory>
 #include <string>
@ -56,7 +55,7 @@ public:
    inline std::string implementation() override { return "Signal Source"; }
    inline size_t item_size() override { return 0; }
    inline size_t getRfChannels() const final { return 0; }
-    
+
    inline std::shared_ptr<GNSSBlockInterface> signal_generator() const { return signal_generator_; }

 private:
--- a/src/algorithms/signal_source/adapters/gn3s_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/gn3s_signal_source.cc
@ -28,7 +28,7 @@ Gn3sSignalSource::Gn3sSignalSource(const ConfigurationInterface* configuration,
    unsigned int in_stream,
    unsigned int out_stream,
    Concurrent_Queue<pmt::pmt_t>* queue)
-  : SignalSourceBase(configuration, role, "Gn3s_Signal_Source"s), in_stream_(in_stream), out_stream_(out_stream)
+    : SignalSourceBase(configuration, role, "Gn3s_Signal_Source"s), in_stream_(in_stream), out_stream_(out_stream)
 {
    const std::string default_item_type("short");
    const std::string default_dump_file("./data/gn3s_source.dat");
--- a/src/algorithms/signal_source/adapters/gn3s_signal_source.h
+++ b/src/algorithms/signal_source/adapters/gn3s_signal_source.h
@ -18,9 +18,8 @@
 #ifndef GNSS_SDR_GN3S_SIGNAL_SOURCE_H
 #define GNSS_SDR_GN3S_SIGNAL_SOURCE_H

-#include "signal_source_base.h"
-
 #include "concurrent_queue.h"
+#include "signal_source_base.h"
 #include <gnuradio/blocks/file_sink.h>
 #include <gnuradio/hier_block2.h>
 #include <pmt/pmt.h>
--- a/src/algorithms/signal_source/adapters/labsat_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/labsat_signal_source.cc
@ -23,8 +23,7 @@ using namespace std::string_literals;

 LabsatSignalSource::LabsatSignalSource(const ConfigurationInterface* configuration,
    const std::string& role, unsigned int in_stream, unsigned int out_stream, Concurrent_Queue<pmt::pmt_t>* queue)
-  : SignalSourceBase(configuration, role, "Labsat_Signal_Source"s)
-  , in_stream_(in_stream), out_stream_(out_stream)
+    : SignalSourceBase(configuration, role, "Labsat_Signal_Source"s), in_stream_(in_stream), out_stream_(out_stream)
 {
    const std::string default_item_type("gr_complex");
    const std::string default_dump_file("./labsat_output.dat");
--- a/src/algorithms/signal_source/adapters/labsat_signal_source.h
+++ b/src/algorithms/signal_source/adapters/labsat_signal_source.h
@ -18,10 +18,9 @@
 #ifndef GNSS_SDR_LABSAT_SIGNAL_SOURCE_H
 #define GNSS_SDR_LABSAT_SIGNAL_SOURCE_H

-#include "signal_source_base.h"
-
 #include "concurrent_queue.h"
 #include "gnss_block_interface.h"
+#include "signal_source_base.h"
 #include <gnuradio/blocks/file_sink.h>
 #include <gnuradio/blocks/throttle.h>
 #include <gnuradio/hier_block2.h>
--- a/src/algorithms/signal_source/adapters/multichannel_file_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/multichannel_file_signal_source.cc
@ -32,8 +32,7 @@ using namespace std::string_literals;
 MultichannelFileSignalSource::MultichannelFileSignalSource(const ConfigurationInterface* configuration,
    const std::string& role, unsigned int in_streams, unsigned int out_streams,
    Concurrent_Queue<pmt::pmt_t>* queue)
-  : SignalSourceBase(configuration, role, "Multichannel_File_Signal_Source"s)
-, in_streams_(in_streams), out_streams_(out_streams)
+    : SignalSourceBase(configuration, role, "Multichannel_File_Signal_Source"s), in_streams_(in_streams), out_streams_(out_streams)
 {
    const std::string default_filename("./example_capture.dat"s);
    const std::string default_item_type("short"s);
--- a/src/algorithms/signal_source/adapters/multichannel_file_signal_source.h
+++ b/src/algorithms/signal_source/adapters/multichannel_file_signal_source.h
@ -21,10 +21,9 @@
 #ifndef GNSS_SDR_MULTICHANNEL_FILE_SIGNAL_SOURCE_H
 #define GNSS_SDR_MULTICHANNEL_FILE_SIGNAL_SOURCE_H

-#include "signal_source_base.h"
-
 #include "concurrent_queue.h"
 #include "gnss_block_interface.h"
+#include "signal_source_base.h"
 #include <gnuradio/blocks/file_sink.h>
 #include <gnuradio/blocks/file_source.h>
 #include <gnuradio/blocks/throttle.h>
--- a/src/algorithms/signal_source/adapters/nsr_file_signal_source.h
+++ b/src/algorithms/signal_source/adapters/nsr_file_signal_source.h
@ -22,7 +22,6 @@
 #define GNSS_SDR_NSR_FILE_SIGNAL_SOURCE_H

 #include "file_source_base.h"
-
 #include "unpack_byte_2bit_samples.h"

 /** \addtogroup Signal_Source
--- a/src/algorithms/signal_source/adapters/osmosdr_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/osmosdr_signal_source.cc
@ -31,7 +31,7 @@ using namespace std::string_literals;
 OsmosdrSignalSource::OsmosdrSignalSource(const ConfigurationInterface* configuration,
    const std::string& role, unsigned int in_stream, unsigned int out_stream,
    Concurrent_Queue<pmt::pmt_t>* queue)
-  : SignalSourceBase(configuration, role, "Osmosdr_Signal_Source"s), in_stream_(in_stream), out_stream_(out_stream)
+    : SignalSourceBase(configuration, role, "Osmosdr_Signal_Source"s), in_stream_(in_stream), out_stream_(out_stream)
 {
    // DUMP PARAMETERS
    const std::string empty;
--- a/src/algorithms/signal_source/adapters/osmosdr_signal_source.h
+++ b/src/algorithms/signal_source/adapters/osmosdr_signal_source.h
@ -19,9 +19,8 @@
 #ifndef GNSS_SDR_OSMOSDR_SIGNAL_SOURCE_H
 #define GNSS_SDR_OSMOSDR_SIGNAL_SOURCE_H

-#include "signal_source_base.h"
-
 #include "concurrent_queue.h"
+#include "signal_source_base.h"
 #include <gnuradio/blocks/file_sink.h>
 #include <pmt/pmt.h>
 #include <cstdint>
--- a/src/algorithms/signal_source/adapters/plutosdr_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/plutosdr_signal_source.cc
@ -30,7 +30,7 @@ using namespace std::string_literals;
 PlutosdrSignalSource::PlutosdrSignalSource(const ConfigurationInterface* configuration,
    const std::string& role, unsigned int in_stream, unsigned int out_stream,
    Concurrent_Queue<pmt::pmt_t>* queue)
-  : SignalSourceBase(configuration, role, "Plutosdr_Signal_Source"s), in_stream_(in_stream), out_stream_(out_stream)
+    : SignalSourceBase(configuration, role, "Plutosdr_Signal_Source"s), in_stream_(in_stream), out_stream_(out_stream)
 {
    const std::string default_item_type("gr_complex");
    const std::string default_dump_file("./data/signal_source.dat");
--- a/src/algorithms/signal_source/adapters/plutosdr_signal_source.h
+++ b/src/algorithms/signal_source/adapters/plutosdr_signal_source.h
@ -20,7 +20,6 @@
 #define GNSS_SDR_PLUTOSDR_SIGNAL_SOURCE_H

 #include "signal_source_base.h"
-
 #include <gnuradio/blocks/file_sink.h>
 #if GRIIO_INCLUDE_HAS_GNURADIO
 #include <gnuradio/iio/pluto_source.h>
--- a/src/algorithms/signal_source/adapters/raw_array_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/raw_array_signal_source.cc
@ -27,7 +27,7 @@ using namespace std::string_literals;

 RawArraySignalSource::RawArraySignalSource(const ConfigurationInterface* configuration,
    std::string role, unsigned int in_stream, unsigned int out_stream, Concurrent_Queue<pmt::pmt_t>* queue)
-: SignalSourceBase(configuration, role, "Raw_Array_Signal_Source"s), in_stream_(in_stream), out_stream_(out_stream)
+    : SignalSourceBase(configuration, role, "Raw_Array_Signal_Source"s), in_stream_(in_stream), out_stream_(out_stream)
 {
    const std::string default_item_type("gr_complex");
    const std::string default_dump_file("./data/raw_array_source.dat");
--- a/src/algorithms/signal_source/adapters/raw_array_signal_source.h
+++ b/src/algorithms/signal_source/adapters/raw_array_signal_source.h
@ -18,9 +18,8 @@
 #ifndef GNSS_SDR_RAW_ARRAY_SIGNAL_SOURCE_H
 #define GNSS_SDR_RAW_ARRAY_SIGNAL_SOURCE_H

-#include "signal_source_base.h"
-
 #include "concurrent_queue.h"
+#include "signal_source_base.h"
 #include <gnuradio/blocks/file_sink.h>
 #include <gnuradio/hier_block2.h>
 #include <pmt/pmt.h>
--- a/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.cc
@ -32,8 +32,7 @@ RtlTcpSignalSource::RtlTcpSignalSource(const ConfigurationInterface* configurati
    unsigned int in_stream,
    unsigned int out_stream,
    Concurrent_Queue<pmt::pmt_t>* queue)
-  : SignalSourceBase(configuration, role, "RtlTcp_Signal_Source"s)
-  , in_stream_(in_stream), out_stream_(out_stream)
+    : SignalSourceBase(configuration, role, "RtlTcp_Signal_Source"s), in_stream_(in_stream), out_stream_(out_stream)
 {
    // DUMP PARAMETERS
    const std::string default_dump_file("./data/signal_source.dat");
--- a/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.h
+++ b/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.h
@ -18,10 +18,9 @@
 #ifndef GNSS_SDR_RTL_TCP_SIGNAL_SOURCE_H
 #define GNSS_SDR_RTL_TCP_SIGNAL_SOURCE_H

-#include "signal_source_base.h"
-
 #include "concurrent_queue.h"
 #include "rtl_tcp_signal_source_c.h"
+#include "signal_source_base.h"
 #include <gnuradio/blocks/deinterleave.h>
 #include <gnuradio/blocks/file_sink.h>
 #include <gnuradio/blocks/float_to_complex.h>
--- a/src/algorithms/signal_source/adapters/signal_source_base.cc
+++ b/src/algorithms/signal_source/adapters/signal_source_base.cc
@ -19,7 +19,6 @@
 */

 #include "signal_source_base.h"
-
 #include "configuration_interface.h"

 using namespace std::string_literals;
@ -36,14 +35,10 @@ std::string SignalSourceBase::implementation()

 size_t SignalSourceBase::getRfChannels() const
 {
-  return rfChannels_;
+    return rfChannels_;
 }

 SignalSourceBase::SignalSourceBase(ConfigurationInterface const* configuration, std::string role, std::string impl)
-    : SignalSourceInterface()
-    , role_(role)
-    , implementation_(impl)
-    , rfChannels_(configuration->property(role + ".RF_channels"s, 1u))
+    : SignalSourceInterface(), role_(role), implementation_(impl), rfChannels_(configuration->property(role + ".RF_channels"s, 1u))
 {
 }
-
--- a/src/algorithms/signal_source/adapters/signal_source_base.h
+++ b/src/algorithms/signal_source/adapters/signal_source_base.h
@ -19,7 +19,6 @@
 #define GNSS_SDR_SIGNAL_SOURCE_BASE_H

 #include "signal_source_interface.h"
-
 #include <cstddef>
 #include <string>

--- a/src/algorithms/signal_source/adapters/spir_file_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/spir_file_signal_source.cc
@ -24,7 +24,7 @@ using namespace std::string_literals;
 SpirFileSignalSource::SpirFileSignalSource(const ConfigurationInterface* configuration,
    const std::string& role, unsigned int in_streams, unsigned int out_streams,
    Concurrent_Queue<pmt::pmt_t>* queue)
-  : FileSourceBase(configuration, role, "Spir_File_Signal_Source"s, queue, "int"s)
+    : FileSourceBase(configuration, role, "Spir_File_Signal_Source"s, queue, "int"s)
 {
    if (in_streams > 0)
        {
--- a/src/algorithms/signal_source/adapters/spir_gss6450_file_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/spir_gss6450_file_signal_source.cc
@ -29,8 +29,7 @@ using namespace std::string_literals;

 SpirGSS6450FileSignalSource::SpirGSS6450FileSignalSource(const ConfigurationInterface* configuration,
    const std::string& role, uint32_t in_streams, uint32_t out_streams, Concurrent_Queue<pmt::pmt_t>* queue)
-  : SignalSourceBase(configuration, role, "Spir_GSS6450_File_Signal_Source"s)
-  , in_streams_(in_streams), out_streams_(out_streams)
+    : SignalSourceBase(configuration, role, "Spir_GSS6450_File_Signal_Source"s), in_streams_(in_streams), out_streams_(out_streams)
 {
    const std::string default_filename("../data/my_capture.dat");
    const std::string default_dump_filename("../data/my_capture_dump.dat");
--- a/src/algorithms/signal_source/adapters/spir_gss6450_file_signal_source.h
+++ b/src/algorithms/signal_source/adapters/spir_gss6450_file_signal_source.h
@ -21,10 +21,9 @@
 #ifndef GNSS_SDR_SPIR_GSS6450_FILE_SIGNAL_SOURCE_H
 #define GNSS_SDR_SPIR_GSS6450_FILE_SIGNAL_SOURCE_H

-#include "signal_source_base.h"
-
 #include "concurrent_queue.h"
 #include "gnss_sdr_valve.h"
+#include "signal_source_base.h"
 #include "unpack_spir_gss6450_samples.h"
 #include <gnuradio/blocks/deinterleave.h>
 #include <gnuradio/blocks/endian_swap.h>
--- a/src/algorithms/signal_source/adapters/two_bit_packed_file_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/two_bit_packed_file_signal_source.cc
@ -29,11 +29,10 @@ TwoBitPackedFileSignalSource::TwoBitPackedFileSignalSource(
    unsigned int in_streams,
    unsigned int out_streams,
    Concurrent_Queue<pmt::pmt_t>* queue)
-  : FileSourceBase(configuration, role, "Two_Bit_Packed_File_Signal_Source"s, queue, "byte"s)
-  , sample_type_(configuration->property(role + ".sample_type", "real"s))  // options: "real", "iq", "qi"
-  , big_endian_items_(configuration->property(role + ".big_endian_items", true))
-  , big_endian_bytes_(configuration->property(role + ".big_endian_bytes", false))
-  , reverse_interleaving_(false)
+    : FileSourceBase(configuration, role, "Two_Bit_Packed_File_Signal_Source"s, queue, "byte"s), sample_type_(configuration->property(role + ".sample_type", "real"s)),  // options: "real", "iq", "qi"
+      big_endian_items_(configuration->property(role + ".big_endian_items", true)),
+      big_endian_bytes_(configuration->property(role + ".big_endian_bytes", false)),
+      reverse_interleaving_(false)
 {
    if (in_streams > 0)
        {
--- a/src/algorithms/signal_source/adapters/uhd_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/uhd_signal_source.cc
@ -31,7 +31,7 @@ using namespace std::string_literals;
 UhdSignalSource::UhdSignalSource(const ConfigurationInterface* configuration,
    const std::string& role, unsigned int in_stream, unsigned int out_stream,
    Concurrent_Queue<pmt::pmt_t>* queue)
-  : SignalSourceBase(configuration, role, "UHD_Signal_Source"s), in_stream_(in_stream), out_stream_(out_stream)
+    : SignalSourceBase(configuration, role, "UHD_Signal_Source"s), in_stream_(in_stream), out_stream_(out_stream)
 {
    // DUMP PARAMETERS
    const std::string empty;
--- a/src/algorithms/signal_source/adapters/uhd_signal_source.h
+++ b/src/algorithms/signal_source/adapters/uhd_signal_source.h
@ -17,9 +17,8 @@
 #ifndef GNSS_SDR_UHD_SIGNAL_SOURCE_H
 #define GNSS_SDR_UHD_SIGNAL_SOURCE_H

-#include "signal_source_base.h"
-
 #include "concurrent_queue.h"
+#include "signal_source_base.h"
 #include <gnuradio/blocks/file_sink.h>
 #include <gnuradio/hier_block2.h>
 #include <gnuradio/uhd/usrp_source.h>