Revert "Apply fixes by clang-tidy"

This reverts commit ba23d698bc.

src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc

@@ -37,7 +37,6 @@
 #include "gnss_sdr_flags.h"
 #include <boost/math/distributions/exponential.hpp>
 #include <glog/logging.h>
-#include <utility>
 
 
 using google::LogMessage;
@@ -45,9 +44,9 @@ using google::LogMessage;
 
 GalileoE1PcpsAmbiguousAcquisition::GalileoE1PcpsAmbiguousAcquisition(
     ConfigurationInterface* configuration,
-    std::string role,
+    const std::string& role,
     unsigned int in_streams,
-    unsigned int out_streams) : role_(std::move(role)),
+    unsigned int out_streams) : role_(role),
                                 in_streams_(in_streams),
                                 out_streams_(out_streams)
 {
@@ -89,7 +88,7 @@ GalileoE1PcpsAmbiguousAcquisition::GalileoE1PcpsAmbiguousAcquisition(
     acq_parameters_.dump_filename = dump_filename_;
 
     acq_parameters_.use_automatic_resampler = configuration_->property("GNSS-SDR.use_acquisition_resampler", false);
-    if (acq_parameters_.use_automatic_resampler == true and item_type_ != "gr_complex")
+    if (acq_parameters_.use_automatic_resampler == true and item_type_.compare("gr_complex") != 0)
         {
             LOG(WARNING) << "Galileo E1 acqisition disabled the automatic resampler feature because its item_type is not set to gr_complex";
             acq_parameters_.use_automatic_resampler = false;

src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h

@@ -32,8 +32,8 @@
 #ifndef GNSS_SDR_GALILEO_E1_PCPS_AMBIGUOUS_ACQUISITION_H_
 #define GNSS_SDR_GALILEO_E1_PCPS_AMBIGUOUS_ACQUISITION_H_
 
-#include "acq_conf.h"
 #include "acquisition_interface.h"
+#include "acq_conf.h"
 #include "complex_byte_to_float_x2.h"
 #include "gnss_synchro.h"
 #include "pcps_acquisition.h"
@@ -52,7 +52,7 @@ class GalileoE1PcpsAmbiguousAcquisition : public AcquisitionInterface
 {
 public:
     GalileoE1PcpsAmbiguousAcquisition(ConfigurationInterface* configuration,
-        std::string role,
+        const std::string& role,
         unsigned int in_streams,
         unsigned int out_streams);
 

src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.cc

@@ -86,7 +86,7 @@ GalileoE5aPcpsAcquisition::GalileoE5aPcpsAcquisition(ConfigurationInterface* con
 
 
     acq_parameters_.use_automatic_resampler = configuration_->property("GNSS-SDR.use_acquisition_resampler", false);
-    if (acq_parameters_.use_automatic_resampler == true and item_type_ != "gr_complex")
+    if (acq_parameters_.use_automatic_resampler == true and item_type_.compare("gr_complex") != 0)
         {
             LOG(WARNING) << "Galileo E5a acquisition disabled the automatic resampler feature because its item_type is not set to gr_complex";
             acq_parameters_.use_automatic_resampler = false;

src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.cc

@@ -41,7 +41,6 @@
 #include "gps_sdr_signal_processing.h"
 #include <boost/math/distributions/exponential.hpp>
 #include <glog/logging.h>
-#include <utility>
 
 
 using google::LogMessage;
@@ -49,9 +48,9 @@ using google::LogMessage;
 
 GpsL1CaPcpsAcquisition::GpsL1CaPcpsAcquisition(
     ConfigurationInterface* configuration,
-    std::string role,
+    const std::string& role,
     unsigned int in_streams,
-    unsigned int out_streams) : role_(std::move(role)),
+    unsigned int out_streams) : role_(role),
                                 in_streams_(in_streams),
                                 out_streams_(out_streams)
 {
@@ -88,7 +87,7 @@ GpsL1CaPcpsAcquisition::GpsL1CaPcpsAcquisition(
     acq_parameters_.doppler_step2 = configuration_->property(role + ".second_doppler_step", 125.0);
     acq_parameters_.make_2_steps = configuration_->property(role + ".make_two_steps", false);
     acq_parameters_.use_automatic_resampler = configuration_->property("GNSS-SDR.use_acquisition_resampler", false);
-    if (acq_parameters_.use_automatic_resampler == true and item_type_ != "gr_complex")
+    if (acq_parameters_.use_automatic_resampler == true and item_type_.compare("gr_complex") != 0)
         {
             LOG(WARNING) << "GPS L1 CA acquisition disabled the automatic resampler feature because its item_type is not set to gr_complex";
             acq_parameters_.use_automatic_resampler = false;

src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.h

@@ -36,8 +36,8 @@
 #ifndef GNSS_SDR_GPS_L1_CA_PCPS_ACQUISITION_H_
 #define GNSS_SDR_GPS_L1_CA_PCPS_ACQUISITION_H_
 
-#include "acq_conf.h"
 #include "acquisition_interface.h"
+#include "acq_conf.h"
 #include "complex_byte_to_float_x2.h"
 #include "gnss_synchro.h"
 #include "pcps_acquisition.h"
@@ -56,7 +56,7 @@ class GpsL1CaPcpsAcquisition : public AcquisitionInterface
 {
 public:
     GpsL1CaPcpsAcquisition(ConfigurationInterface* configuration,
-        std::string role,
+        const std::string& role,
         unsigned int in_streams,
         unsigned int out_streams);
 

src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.cc

@@ -39,7 +39,6 @@
 #include "gps_l2c_signal.h"
 #include <boost/math/distributions/exponential.hpp>
 #include <glog/logging.h>
-#include <utility>
 
 
 using google::LogMessage;
@@ -47,9 +46,9 @@ using google::LogMessage;
 
 GpsL2MPcpsAcquisition::GpsL2MPcpsAcquisition(
     ConfigurationInterface* configuration,
-    std::string role,
+    const std::string& role,
     unsigned int in_streams,
-    unsigned int out_streams) : role_(std::move(role)),
+    unsigned int out_streams) : role_(role),
                                 in_streams_(in_streams),
                                 out_streams_(out_streams)
 {
@@ -92,7 +91,7 @@ GpsL2MPcpsAcquisition::GpsL2MPcpsAcquisition(
     acq_parameters_.make_2_steps = configuration_->property(role + ".make_two_steps", false);
     acq_parameters_.blocking_on_standby = configuration_->property(role + ".blocking_on_standby", false);
     acq_parameters_.use_automatic_resampler = configuration_->property("GNSS-SDR.use_acquisition_resampler", false);
-    if (acq_parameters_.use_automatic_resampler == true and item_type_ != "gr_complex")
+    if (acq_parameters_.use_automatic_resampler == true and item_type_.compare("gr_complex") != 0)
         {
             LOG(WARNING) << "GPS L2CM acquisition disabled the automatic resampler feature because its item_type is not set to gr_complex";
             acq_parameters_.use_automatic_resampler = false;

src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.h

@@ -53,7 +53,7 @@ class GpsL2MPcpsAcquisition : public AcquisitionInterface
 {
 public:
     GpsL2MPcpsAcquisition(ConfigurationInterface* configuration,
-        std::string role,
+        const std::string& role,
         unsigned int in_streams,
         unsigned int out_streams);
 

src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.cc

@@ -39,7 +39,6 @@
 #include "gps_l5_signal.h"
 #include <boost/math/distributions/exponential.hpp>
 #include <glog/logging.h>
-#include <utility>
 
 
 using google::LogMessage;
@@ -47,9 +46,9 @@ using google::LogMessage;
 
 GpsL5iPcpsAcquisition::GpsL5iPcpsAcquisition(
     ConfigurationInterface* configuration,
-    std::string role,
+    const std::string& role,
     unsigned int in_streams,
-    unsigned int out_streams) : role_(std::move(role)),
+    unsigned int out_streams) : role_(role),
                                 in_streams_(in_streams),
                                 out_streams_(out_streams)
 {
@@ -99,7 +98,7 @@ GpsL5iPcpsAcquisition::GpsL5iPcpsAcquisition(
     acq_parameters_.make_2_steps = configuration_->property(role + ".make_two_steps", false);
     acq_parameters_.blocking_on_standby = configuration_->property(role + ".blocking_on_standby", false);
     acq_parameters_.use_automatic_resampler = configuration_->property("GNSS-SDR.use_acquisition_resampler", false);
-    if (acq_parameters_.use_automatic_resampler == true and item_type_ != "gr_complex")
+    if (acq_parameters_.use_automatic_resampler == true and item_type_.compare("gr_complex") != 0)
         {
             LOG(WARNING) << "GPS L5 acquisition disabled the automatic resampler feature because its item_type is not set to gr_complex";
             acq_parameters_.use_automatic_resampler = false;

src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.h

@@ -53,7 +53,7 @@ class GpsL5iPcpsAcquisition : public AcquisitionInterface
 {
 public:
     GpsL5iPcpsAcquisition(ConfigurationInterface* configuration,
-        std::string role,
+        const std::string& role,
         unsigned int in_streams,
         unsigned int out_streams);
 

src/algorithms/channel/adapters/channel.cc

@@ -146,7 +146,7 @@ void Channel::disconnect(gr::top_block_sptr top_block)
 gr::basic_block_sptr Channel::get_left_block()
 {
     LOG(ERROR) << "Deprecated call to get_left_block() in channel interface";
-    return nullptr;
+    return NULL;
 }
 
 gr::basic_block_sptr Channel::get_left_block_trk()

src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_c_aid_tracking.cc

@@ -42,15 +42,14 @@
 #include "configuration_interface.h"
 #include "gnss_sdr_flags.h"
 #include <glog/logging.h>
-#include <utility>
 
 
 using google::LogMessage;
 
 
 GlonassL1CaDllPllCAidTracking::GlonassL1CaDllPllCAidTracking(
-    ConfigurationInterface* configuration, std::string role,
+    ConfigurationInterface* configuration, const std::string& role,
-    unsigned int in_streams, unsigned int out_streams) : role_(std::move(role)), in_streams_(in_streams), out_streams_(out_streams)
+    unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams)
 {
     DLOG(INFO) << "role " << role;
     //################# CONFIGURATION PARAMETERS ########################

src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_c_aid_tracking.h

@@ -54,7 +54,7 @@ class GlonassL1CaDllPllCAidTracking : public TrackingInterface
 {
 public:
     GlonassL1CaDllPllCAidTracking(ConfigurationInterface* configuration,
-        std::string role,
+        const std::string& role,
         unsigned int in_streams,
         unsigned int out_streams);
 

src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_c_aid_tracking.cc

@@ -40,15 +40,14 @@
 #include "configuration_interface.h"
 #include "gnss_sdr_flags.h"
 #include <glog/logging.h>
-#include <utility>
 
 
 using google::LogMessage;
 
 
 GlonassL2CaDllPllCAidTracking::GlonassL2CaDllPllCAidTracking(
-    ConfigurationInterface* configuration, std::string role,
+    ConfigurationInterface* configuration, const std::string& role,
-    unsigned int in_streams, unsigned int out_streams) : role_(std::move(role)), in_streams_(in_streams), out_streams_(out_streams)
+    unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams)
 {
     DLOG(INFO) << "role " << role;
     //################# CONFIGURATION PARAMETERS ########################

src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_c_aid_tracking.h

@@ -52,7 +52,7 @@ class GlonassL2CaDllPllCAidTracking : public TrackingInterface
 {
 public:
     GlonassL2CaDllPllCAidTracking(ConfigurationInterface* configuration,
-        std::string role,
+        const std::string& role,
         unsigned int in_streams,
         unsigned int out_streams);
 

src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking.cc

@@ -41,15 +41,14 @@
 #include "configuration_interface.h"
 #include "gnss_sdr_flags.h"
 #include <glog/logging.h>
-#include <utility>
 
 
 using google::LogMessage;
 
 
 GpsL1CaDllPllCAidTracking::GpsL1CaDllPllCAidTracking(
-    ConfigurationInterface* configuration, std::string role,
+    ConfigurationInterface* configuration, const std::string& role,
-    unsigned int in_streams, unsigned int out_streams) : role_(std::move(role)), in_streams_(in_streams), out_streams_(out_streams)
+    unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams)
 {
     DLOG(INFO) << "role " << role;
     //################# CONFIGURATION PARAMETERS ########################

src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking.h

@@ -53,7 +53,7 @@ class GpsL1CaDllPllCAidTracking : public TrackingInterface
 {
 public:
     GpsL1CaDllPllCAidTracking(ConfigurationInterface* configuration,
-        std::string role,
+        const std::string& role,
         unsigned int in_streams,
         unsigned int out_streams);
 

src/core/receiver/gnss_flowgraph.h

@@ -55,6 +55,7 @@
 #include <queue>
 #include <string>
 #include <vector>
+#include <map>
 
 #if ENABLE_FPGA
 #include "gnss_sdr_fpga_sample_counter.h"

src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc

@@ -233,14 +233,14 @@ void GpsL1CaPcpsAcquisitionTest::plot_grid()
 }
 
 
-TEST_F(GpsL1CaPcpsAcquisitionTest /*unused*/, Instantiate /*unused*/)
+TEST_F(GpsL1CaPcpsAcquisitionTest, Instantiate)
 {
     init();
     boost::shared_ptr<GpsL1CaPcpsAcquisition> acquisition = boost::make_shared<GpsL1CaPcpsAcquisition>(config.get(), "Acquisition_1C", 1, 0);
 }
 
 
-TEST_F(GpsL1CaPcpsAcquisitionTest /*unused*/, ConnectAndRun /*unused*/)
+TEST_F(GpsL1CaPcpsAcquisitionTest, ConnectAndRun)
 {
     int fs_in = 4000000;
     int nsamples = 4000;
@@ -273,7 +273,7 @@ TEST_F(GpsL1CaPcpsAcquisitionTest /*unused*/, ConnectAndRun /*unused*/)
 }
 
 
-TEST_F(GpsL1CaPcpsAcquisitionTest /*unused*/, ValidationOfResults /*unused*/)
+TEST_F(GpsL1CaPcpsAcquisitionTest, ValidationOfResults)
 {
     std::chrono::time_point<std::chrono::system_clock> start, end;
     std::chrono::duration<double> elapsed_seconds(0.0);