From a8b536b36744a5b14ea69ec8f1473297e98b9479 Mon Sep 17 00:00:00 2001
From: Josh Schindehette <jschindehette@geontech.com>
Date: Fri, 9 Oct 2020 16:13:39 -0400
Subject: [PATCH] Fixed issues for cpplint, clang-format, and REUSE-compliance

---
 conf/gnss-sdr_GPS_L1_monitor.conf                           | 5 +++++
 conf/gnss-sdr_GPS_L1_udp_with_monitor.conf                  | 5 +++++
 .../acquisition/gnuradio_blocks/pcps_acquisition.h          | 2 +-
 src/algorithms/channel/adapters/channel.h                   | 6 +++---
 src/core/monitor/gnss_synchro_monitor.h                     | 2 +-
 src/core/receiver/gnss_flowgraph.cc                         | 1 -
 6 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/conf/gnss-sdr_GPS_L1_monitor.conf b/conf/gnss-sdr_GPS_L1_monitor.conf
index 7d5012568..b9d30927e 100644
--- a/conf/gnss-sdr_GPS_L1_monitor.conf
+++ b/conf/gnss-sdr_GPS_L1_monitor.conf
@@ -1,3 +1,8 @@
+; This is a GNSS-SDR configuration file
+; The configuration API is described at https://gnss-sdr.org/docs/sp-blocks/
+; SPDX-License-Identifier: GPL-3.0-or-later
+; SPDX-FileCopyrightText: (C) 2010-2020  (see AUTHORS file for a list of contributors)
+
 [GNSS-SDR]
 
 ;######### GLOBAL OPTIONS ##################
diff --git a/conf/gnss-sdr_GPS_L1_udp_with_monitor.conf b/conf/gnss-sdr_GPS_L1_udp_with_monitor.conf
index 870be171e..228d30dbb 100644
--- a/conf/gnss-sdr_GPS_L1_udp_with_monitor.conf
+++ b/conf/gnss-sdr_GPS_L1_udp_with_monitor.conf
@@ -1,3 +1,8 @@
+; This is a GNSS-SDR configuration file
+; The configuration API is described at https://gnss-sdr.org/docs/sp-blocks/
+; SPDX-License-Identifier: GPL-3.0-or-later
+; SPDX-FileCopyrightText: (C) 2010-2020  (see AUTHORS file for a list of contributors)
+
 [GNSS-SDR]
 
 ;######### GLOBAL OPTIONS ##################
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.h
index 0de84c106..c56adc6db 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.h
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.h
@@ -59,9 +59,9 @@
 #include <complex>
 #include <cstdint>
 #include <memory>
+#include <queue>
 #include <string>
 #include <utility>
-#include <queue>
 
 #if HAS_STD_SPAN
 #include <span>
diff --git a/src/algorithms/channel/adapters/channel.h b/src/algorithms/channel/adapters/channel.h
index 1519856a8..05822c830 100644
--- a/src/algorithms/channel/adapters/channel.h
+++ b/src/algorithms/channel/adapters/channel.h
@@ -68,11 +68,11 @@ public:
     void connect(gr::top_block_sptr top_block) override;  //!< Connects the tracking block to the top_block and to the telemetry
     void disconnect(gr::top_block_sptr top_block) override;
     gr::basic_block_sptr get_left_block() override;
-    gr::basic_block_sptr get_left_block_trk() override;  //!< Gets the GNU Radio tracking block input pointer
+    gr::basic_block_sptr get_left_block_trk() override;   //!< Gets the GNU Radio tracking block input pointer
     gr::basic_block_sptr get_right_block_trk() override;  //!< Gets the GNU Radio tracking block output pointer
-    gr::basic_block_sptr get_left_block_acq() override;  //!< Gets the GNU Radio acquisition block input pointer
+    gr::basic_block_sptr get_left_block_acq() override;   //!< Gets the GNU Radio acquisition block input pointer
     gr::basic_block_sptr get_right_block_acq() override;  //!< Gets the GNU Radio acquisition block output pointer
-    gr::basic_block_sptr get_right_block() override;     //!< Gets the GNU Radio channel block output pointer
+    gr::basic_block_sptr get_right_block() override;      //!< Gets the GNU Radio channel block output pointer
 
     inline std::string role() override { return role_; }
     inline std::string implementation() override { return std::string("Channel"); }  //!< Returns "Channel"
diff --git a/src/core/monitor/gnss_synchro_monitor.h b/src/core/monitor/gnss_synchro_monitor.h
index 52adb996f..4c117e542 100644
--- a/src/core/monitor/gnss_synchro_monitor.h
+++ b/src/core/monitor/gnss_synchro_monitor.h
@@ -24,8 +24,8 @@
 #define GNSS_SDR_GNSS_SYNCHRO_MONITOR_H
 
 #include "gnss_synchro_udp_sink.h"
-#include <gnuradio/runtime_types.h>  // for gr_vector_void_star
 #include <gnuradio/block.h>
+#include <gnuradio/runtime_types.h>  // for gr_vector_void_star
 #include <memory>
 #include <string>
 #include <vector>
diff --git a/src/core/receiver/gnss_flowgraph.cc b/src/core/receiver/gnss_flowgraph.cc
index 6c5a5266f..ac4876dd1 100644
--- a/src/core/receiver/gnss_flowgraph.cc
+++ b/src/core/receiver/gnss_flowgraph.cc
@@ -1706,7 +1706,6 @@ void GNSSFlowgraph::init()
                 configuration_->property("TrackingMonitor.udp_port", 1236),
                 udp_addr_vec, enable_protobuf);
         }
-
 }