Tidying up includes: own .h, C libraries, C++ libraries, other libraries' .h, project's .h. Some old time.h and stdlib.h have been replaced by ctime and cstdlib

git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@477 64b25241-fba3-4117-9849-534c7e92360d

src/algorithms/PVT/gnuradio_blocks/galileo_e1_pvt_cc.cc

@@ -5,7 +5,7 @@
  *
  * -------------------------------------------------------------------------
  *
- * Copyright (C) 2010-2013  (see AUTHORS file for a list of contributors)
+ * Copyright (C) 2010-2014  (see AUTHORS file for a list of contributors)
  *
  * GNSS-SDR is a software defined Global Navigation
  *          Satellite Systems receiver
@@ -29,18 +29,18 @@
  */
 
 #include "galileo_e1_pvt_cc.h"
-#include <iostream>
-#include <sstream>
-#include <vector>
-#include <map>
 #include <algorithm>
 #include <bitset>
+#include <iostream>
+#include <map>
+#include <sstream>
+#include <vector>
+#include <boost/date_time/posix_time/posix_time.hpp>
 #include <gnuradio/gr_complex.h>
 #include <gnuradio/io_signature.h>
 #include <glog/log_severity.h>
 #include <glog/logging.h>
 #include "control_message_factory.h"
-#include "boost/date_time/posix_time/posix_time.hpp"
 #include "gnss_synchro.h"
 #include "concurrent_map.h"
 

src/algorithms/PVT/gnuradio_blocks/gps_l1_ca_pvt_cc.cc

@@ -4,7 +4,7 @@
  * \author Javier Arribas, 2011. jarribas(at)cttc.es
  * -------------------------------------------------------------------------
  *
- * Copyright (C) 2010-2012  (see AUTHORS file for a list of contributors)
+ * Copyright (C) 2010-2014  (see AUTHORS file for a list of contributors)
  *
  * GNSS-SDR is a software defined Global Navigation
  *          Satellite Systems receiver
@@ -28,18 +28,18 @@
  */
 
 #include "gps_l1_ca_pvt_cc.h"
-#include <iostream>
-#include <sstream>
-#include <vector>
-#include <map>
 #include <algorithm>
 #include <bitset>
+#include <iostream>
+#include <map>
+#include <sstream>
+#include <vector>
+#include <boost/date_time/posix_time/posix_time.hpp>
 #include <gnuradio/gr_complex.h>
 #include <gnuradio/io_signature.h>
 #include <glog/log_severity.h>
 #include <glog/logging.h>
 #include "control_message_factory.h"
-#include "boost/date_time/posix_time/posix_time.hpp"
 #include "gnss_synchro.h"
 #include "concurrent_map.h"
 #include "sbas_telemetry_data.h"

src/algorithms/PVT/libs/galileo_e1_ls_pvt.cc

@@ -6,7 +6,7 @@
  *
  * -------------------------------------------------------------------------
  *
- * Copyright (C) 2010-2013  (see AUTHORS file for a list of contributors)
+ * Copyright (C) 2010-2014  (see AUTHORS file for a list of contributors)
  *
  * GNSS-SDR is a software defined Global Navigation
  *          Satellite Systems receiver
@@ -29,13 +29,11 @@
  * -------------------------------------------------------------------------
  */
 
-#include <armadillo>
 #include "galileo_e1_ls_pvt.h"
-#include "Galileo_E1.h"
 #include <glog/log_severity.h>
 #include <glog/logging.h>
-#include "boost/date_time/posix_time/posix_time.hpp"
+#include "Galileo_E1.h"
-#include "gnss_synchro.h"
+
 
 using google::LogMessage;
 

src/algorithms/PVT/libs/galileo_e1_ls_pvt.h

@@ -32,20 +32,18 @@
 #ifndef GNSS_SDR_GALILEO_E1_LS_PVT_H_
 #define GNSS_SDR_GALILEO_E1_LS_PVT_H_
 
-#include <sys/time.h>
-#include <time.h>
 #include <algorithm>
 #include <cmath>
+#include <cstdlib>
+#include <cstdio>
 #include <deque>
 #include <fstream>
 #include <iostream>
 #include <map>
-#include <stdlib.h>
-#include <stdio.h>
 #include <sstream>
 #include <string>
-#include "armadillo"
+#include <armadillo>
-#include "boost/date_time/posix_time/posix_time.hpp"
+#include <boost/date_time/posix_time/posix_time.hpp>
 #include "GPS_L1_CA.h"
 #include "galileo_navigation_message.h"
 #include "gnss_synchro.h"

src/algorithms/PVT/libs/gps_l1_ca_ls_pvt.cc

@@ -5,7 +5,7 @@
  * \author Javier Arribas, 2011. jarribas(at)cttc.es
  * -------------------------------------------------------------------------
  *
- * Copyright (C) 2010-2012  (see AUTHORS file for a list of contributors)
+ * Copyright (C) 2010-2014  (see AUTHORS file for a list of contributors)
  *
  * GNSS-SDR is a software defined Global Navigation
  *          Satellite Systems receiver
@@ -28,13 +28,9 @@
  * -------------------------------------------------------------------------
  */
 
-#include <armadillo>
 #include "gps_l1_ca_ls_pvt.h"
-#include "GPS_L1_CA.h"
 #include <glog/log_severity.h>
 #include <glog/logging.h>
-#include "boost/date_time/posix_time/posix_time.hpp"
-#include "gnss_synchro.h"
 
 using google::LogMessage;
 

src/algorithms/PVT/libs/gps_l1_ca_ls_pvt.h

@@ -31,24 +31,22 @@
 #ifndef GNSS_SDR_GPS_L1_CA_LS_PVT_H_
 #define GNSS_SDR_GPS_L1_CA_LS_PVT_H_
 
-#include <sys/time.h>
-#include <time.h>
 #include <algorithm>
 #include <cmath>
+#include <cstdlib>
+#include <cstdio>
 #include <deque>
 #include <fstream>
 #include <iostream>
 #include <map>
-#include <stdlib.h>
-#include <stdio.h>
 #include <sstream>
 #include <string>
-#include "gps_navigation_message.h"
+#include <armadillo>
-#include "GPS_L1_CA.h"
+#include <boost/date_time/posix_time/posix_time.hpp>
-#include "armadillo"
-#include "boost/date_time/posix_time/posix_time.hpp"
 #include "gnss_synchro.h"
+#include "GPS_L1_CA.h"
 #include "gps_ephemeris.h"
+#include "gps_navigation_message.h"
 #include "gps_utc_model.h"
 #include "sbas_telemetry_data.h"
 #include "sbas_ionospheric_correction.h"

src/algorithms/PVT/libs/kml_printer.cc

@@ -6,7 +6,7 @@
  *
  * -------------------------------------------------------------------------
  *
- * Copyright (C) 2010-2012  (see AUTHORS file for a list of contributors)
+ * Copyright (C) 2010-2014  (see AUTHORS file for a list of contributors)
  *
  * GNSS-SDR is a software defined Global Navigation
  *          Satellite Systems receiver
@@ -30,9 +30,10 @@
  */
 
 #include "kml_printer.h"
+#include <ctime>
 #include <glog/log_severity.h>
 #include <glog/logging.h>
-#include <time.h>
+
 
 bool Kml_Printer::set_headers(std::string filename)
 {

src/algorithms/PVT/libs/nmea_printer.cc

@@ -10,7 +10,7 @@
  *
  * -------------------------------------------------------------------------
  *
- * Copyright (C) 2010-2012  (see AUTHORS file for a list of contributors)
+ * Copyright (C) 2010-2014  (see AUTHORS file for a list of contributors)
  *
  * GNSS-SDR is a software defined Global Navigation
  *          Satellite Systems receiver
@@ -33,14 +33,15 @@
  * -------------------------------------------------------------------------
  */
 
+#include "nmea_printer.h"
+#include <fcntl.h>
+#include <termios.h>
+#include <boost/date_time/posix_time/posix_time.hpp>
 #include <glog/log_severity.h>
 #include <glog/logging.h>
 #include <gflags/gflags.h>
-#include "boost/date_time/posix_time/posix_time.hpp"
-#include <fcntl.h>
-#include <termios.h>
 #include "GPS_L1_CA.h"
-#include "nmea_printer.h"
+
 
 using google::LogMessage;
 

src/algorithms/PVT/libs/rinex_printer.cc

@@ -29,19 +29,16 @@
  */
 
 #include "rinex_printer.h"
-#include <stdlib.h>  // for getenv()
 #include <algorithm> // for min and max
-#include <cmath> // for floor
+#include <cmath>     // for floor
-#include <fstream>
+#include <cstdlib>   // for getenv()
-#include <iostream>
-#include <string>
 #include <ostream>
 #include <utility>
 #include <vector>
-#include "boost/date_time/time_zone_base.hpp"
+#include <boost/date_time/time_zone_base.hpp>
-#include "boost/date_time/gregorian/gregorian.hpp"
+#include <boost/date_time/gregorian/gregorian.hpp>
-#include "boost/date_time/local_time/local_time.hpp"
+#include <boost/date_time/local_time/local_time.hpp>
-#include "boost/date_time/posix_time/posix_time.hpp"
+#include <boost/date_time/posix_time/posix_time.hpp>
 #include <glog/log_severity.h>
 #include <glog/logging.h>
 #include <gflags/gflags.h>
@@ -50,9 +47,6 @@
 #include "gps_ephemeris.h"
 #include "gps_iono.h"
 #include "gps_utc_model.h"
-#include "GPS_L1_CA.h"
-
-
 
 
 using google::LogMessage;

src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.cc

@@ -6,7 +6,7 @@
  *
  * -------------------------------------------------------------------------
  *
- * Copyright (C) 2010-2012  (see AUTHORS file for a list of contributors)
+ * Copyright (C) 2010-2014  (see AUTHORS file for a list of contributors)
  *
  * GNSS-SDR is a software defined Global Navigation
  *          Satellite Systems receiver
@@ -30,15 +30,15 @@
  */
 
 #include "galileo_e1_pcps_8ms_ambiguous_acquisition.h"
-#include "galileo_e1_signal_processing.h"
-#include "Galileo_E1.h"
-#include "configuration_interface.h"
 #include <iostream>
 #include <string>
 #include <boost/lexical_cast.hpp>
+#include <boost/math/distributions/exponential.hpp>
 #include <glog/log_severity.h>
 #include <glog/logging.h>
-#include <boost/math/distributions/exponential.hpp>
+#include "galileo_e1_signal_processing.h"
+#include "Galileo_E1.h"
+#include "configuration_interface.h"
 
 using google::LogMessage;
 

src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc

@@ -6,7 +6,7 @@
  *
  * -------------------------------------------------------------------------
  *
- * Copyright (C) 2010-2012  (see AUTHORS file for a list of contributors)
+ * Copyright (C) 2010-2014  (see AUTHORS file for a list of contributors)
  *
  * GNSS-SDR is a software defined Global Navigation
  *          Satellite Systems receiver
@@ -30,15 +30,14 @@
  */
 
 #include "galileo_e1_pcps_ambiguous_acquisition.h"
+#include <iostream>
+#include <boost/lexical_cast.hpp>
+#include <boost/math/distributions/exponential.hpp>
+#include <glog/log_severity.h>
+#include <glog/logging.h>
 #include "galileo_e1_signal_processing.h"
 #include "Galileo_E1.h"
 #include "configuration_interface.h"
-#include <iostream>
-#include <string>
-#include <boost/lexical_cast.hpp>
-#include <glog/log_severity.h>
-#include <glog/logging.h>
-#include <boost/math/distributions/exponential.hpp>
 
 using google::LogMessage;
 

src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.cc

@@ -6,7 +6,7 @@
  *
  * -------------------------------------------------------------------------
  *
- * Copyright (C) 2010-2011  (see AUTHORS file for a list of contributors)
+ * Copyright (C) 2010-2014  (see AUTHORS file for a list of contributors)
  *
  * GNSS-SDR is a software defined Global Navigation
  *          Satellite Systems receiver
@@ -30,17 +30,15 @@
  */
 
 #include "galileo_e1_pcps_cccwsr_ambiguous_acquisition.h"
+#include <iostream>
+#include <boost/lexical_cast.hpp>
+#include <boost/math/distributions/exponential.hpp>
+#include <glog/log_severity.h>
+#include <glog/logging.h>
+#include <volk/volk.h>
 #include "galileo_e1_signal_processing.h"
 #include "Galileo_E1.h"
 #include "configuration_interface.h"
-#include <iostream>
-#include <string>
-#include <boost/lexical_cast.hpp>
-#include <glog/log_severity.h>
-#include <glog/logging.h>
-#include <boost/math/distributions/exponential.hpp>
-#include <volk/volk.h>
-
 
 using google::LogMessage;
 

src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.cc

@@ -6,7 +6,7 @@
  *
  * -------------------------------------------------------------------------
  *
- * Copyright (C) 2010-2011  (see AUTHORS file for a list of contributors)
+ * Copyright (C) 2010-2014  (see AUTHORS file for a list of contributors)
  *
  * GNSS-SDR is a software defined Global Navigation
  *          Satellite Systems receiver
@@ -30,15 +30,14 @@
  */
 
 #include "galileo_e1_pcps_tong_ambiguous_acquisition.h"
+#include <iostream>
+#include <boost/lexical_cast.hpp>
+#include <boost/math/distributions/exponential.hpp>
+#include <glog/log_severity.h>
+#include <glog/logging.h>
 #include "galileo_e1_signal_processing.h"
 #include "Galileo_E1.h"
 #include "configuration_interface.h"
-#include <iostream>
-#include <string>
-#include <boost/lexical_cast.hpp>
-#include <glog/log_severity.h>
-#include <glog/logging.h>
-#include <boost/math/distributions/exponential.hpp>
 
 using google::LogMessage;
 

src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.cc

@@ -10,7 +10,7 @@
  *
  * -------------------------------------------------------------------------
  *
- * Copyright (C) 2010-2012  (see AUTHORS file for a list of contributors)
+ * Copyright (C) 2010-2014  (see AUTHORS file for a list of contributors)
  *
  * GNSS-SDR is a software defined Global Navigation
  *          Satellite Systems receiver
@@ -34,15 +34,16 @@
  */
 
 #include "gps_l1_ca_pcps_acquisition.h"
+#include <iostream>
+#include <stdexcept>
+#include <boost/math/distributions/exponential.hpp>
+#include <glog/log_severity.h>
+#include <glog/logging.h>
+#include <gnuradio/msg_queue.h>
 #include "gps_sdr_signal_processing.h"
 #include "GPS_L1_CA.h"
 #include "configuration_interface.h"
-#include <iostream>
+
-#include <glog/log_severity.h>
-#include <glog/logging.h>
-#include <stdexcept>
-#include <boost/math/distributions/exponential.hpp>
-#include <gnuradio/msg_queue.h>
 
 using google::LogMessage;
 

src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.cc

@@ -9,7 +9,7 @@
  *
  * -------------------------------------------------------------------------
  *
- * Copyright (C) 2010-2012  (see AUTHORS file for a list of contributors)
+ * Copyright (C) 2010-2014  (see AUTHORS file for a list of contributors)
  *
  * GNSS-SDR is a software defined Global Navigation
  *          Satellite Systems receiver
@@ -33,13 +33,13 @@
  */
 
 #include "gps_l1_ca_pcps_acquisition_fine_doppler.h"
+#include <iostream>
+#include <glog/log_severity.h>
+#include <glog/logging.h>
+#include <gnuradio/io_signature.h>
 #include "gps_sdr_signal_processing.h"
 #include "GPS_L1_CA.h"
 #include "configuration_interface.h"
-#include <iostream>
-#include <gnuradio/io_signature.h>
-#include <glog/log_severity.h>
-#include <glog/logging.h>
 
 using google::LogMessage;
 

src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.cc

@@ -9,7 +9,7 @@
  *
  * -------------------------------------------------------------------------
  *
- * Copyright (C) 2010-2012  (see AUTHORS file for a list of contributors)
+ * Copyright (C) 2010-2014  (see AUTHORS file for a list of contributors)
  *
  * GNSS-SDR is a software defined Global Navigation
  *          Satellite Systems receiver
@@ -33,12 +33,12 @@
  */
 
 #include "gps_l1_ca_pcps_assisted_acquisition.h"
-#include "gps_sdr_signal_processing.h"
-#include "GPS_L1_CA.h"
-#include "configuration_interface.h"
 #include <iostream>
 #include <glog/log_severity.h>
 #include <glog/logging.h>
+#include "gps_sdr_signal_processing.h"
+#include "GPS_L1_CA.h"
+#include "configuration_interface.h"
 
 using google::LogMessage;
 

src/algorithms/acquisition/adapters/gps_l1_ca_pcps_multithread_acquisition.cc

@@ -6,7 +6,7 @@
  *
  * -------------------------------------------------------------------------
  *
- * Copyright (C) 2010-2012  (see AUTHORS file for a list of contributors)
+ * Copyright (C) 2010-2014  (see AUTHORS file for a list of contributors)
  *
  * GNSS-SDR is a software defined Global Navigation
  *          Satellite Systems receiver
@@ -30,15 +30,16 @@
  */
 
 #include "gps_l1_ca_pcps_multithread_acquisition.h"
+#include <iostream>
+#include <stdexcept>
+#include <boost/math/distributions/exponential.hpp>
+#include <glog/log_severity.h>
+#include <glog/logging.h>
+#include <gnuradio/msg_queue.h>
 #include "gps_sdr_signal_processing.h"
 #include "GPS_L1_CA.h"
 #include "configuration_interface.h"
-#include <iostream>
+
-#include <glog/log_severity.h>
-#include <glog/logging.h>
-#include <stdexcept>
-#include <boost/math/distributions/exponential.hpp>
-#include <gnuradio/msg_queue.h>
 
 using google::LogMessage;
 

src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.cc

@@ -6,7 +6,7 @@
  *
  * -------------------------------------------------------------------------
  *
- * Copyright (C) 2010-2012  (see AUTHORS file for a list of contributors)
+ * Copyright (C) 2010-2014  (see AUTHORS file for a list of contributors)
  *
  * GNSS-SDR is a software defined Global Navigation
  *          Satellite Systems receiver
@@ -30,15 +30,15 @@
  */
 
 #include "gps_l1_ca_pcps_opencl_acquisition.h"
+#include <iostream>
+#include <stdexcept>
+#include <boost/math/distributions/exponential.hpp>
+#include <glog/log_severity.h>
+#include <glog/logging.h>
+#include <gnuradio/msg_queue.h>
 #include "gps_sdr_signal_processing.h"
 #include "GPS_L1_CA.h"
 #include "configuration_interface.h"
-#include <iostream>
-#include <glog/log_severity.h>
-#include <glog/logging.h>
-#include <stdexcept>
-#include <boost/math/distributions/exponential.hpp>
-#include <gnuradio/msg_queue.h>
 
 using google::LogMessage;
 

src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.cc

@@ -6,7 +6,7 @@
  *
  * -------------------------------------------------------------------------
  *
- * Copyright (C) 2010-2012  (see AUTHORS file for a list of contributors)
+ * Copyright (C) 2010-2014  (see AUTHORS file for a list of contributors)
  *
  * GNSS-SDR is a software defined Global Navigation
  *          Satellite Systems receiver
@@ -30,15 +30,16 @@
  */
 
 #include "gps_l1_ca_pcps_tong_acquisition.h"
+#include <iostream>
+#include <stdexcept>
+#include <boost/math/distributions/exponential.hpp>
+#include <glog/log_severity.h>
+#include <glog/logging.h>
+#include <gnuradio/msg_queue.h>
 #include "gps_sdr_signal_processing.h"
 #include "GPS_L1_CA.h"
 #include "configuration_interface.h"
-#include <iostream>
+
-#include <glog/log_severity.h>
-#include <glog/logging.h>
-#include <stdexcept>
-#include <boost/math/distributions/exponential.hpp>
-#include <gnuradio/msg_queue.h>
 
 using google::LogMessage;
 

src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc

@@ -6,7 +6,7 @@
  *
  * -------------------------------------------------------------------------
  *
- * Copyright (C) 2010-2012  (see AUTHORS file for a list of contributors)
+ * Copyright (C) 2010-2014  (see AUTHORS file for a list of contributors)
  *
  * GNSS-SDR is a software defined Global Navigation
  *          Satellite Systems receiver
@@ -30,13 +30,13 @@
  */
 
 #include "galileo_pcps_8ms_acquisition_cc.h"
-#include "gnss_signal_processing.h"
-#include "control_message_factory.h"
-#include <gnuradio/io_signature.h>
 #include <sstream>
 #include <glog/log_severity.h>
 #include <glog/logging.h>
+#include <gnuradio/io_signature.h>
 #include <volk/volk.h>
+#include "gnss_signal_processing.h"
+#include "control_message_factory.h"
 
 using google::LogMessage;
 

src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.cc

@@ -7,7 +7,7 @@
  *
  * -------------------------------------------------------------------------
  *
- * Copyright (C) 2010-2012  (see AUTHORS file for a list of contributors)
+ * Copyright (C) 2010-2014  (see AUTHORS file for a list of contributors)
  *
  * GNSS-SDR is a software defined Global Navigation
  *          Satellite Systems receiver
@@ -31,17 +31,17 @@
  */
 
 #include "pcps_acquisition_fine_doppler_cc.h"
-#include "gnss_signal_processing.h"
+#include <algorithm>    // std::rotate
-#include "gps_sdr_signal_processing.h"
-#include "control_message_factory.h"
-#include <gnuradio/io_signature.h>
 #include <sstream>
 #include <glog/log_severity.h>
 #include <glog/logging.h>
+#include <gnuradio/io_signature.h>
 #include <volk/volk.h>
 #include "nco_lib.h"
 #include "concurrent_map.h"
-#include <algorithm>    // std::rotate
+#include "gnss_signal_processing.h"
+#include "gps_sdr_signal_processing.h"
+#include "control_message_factory.h"
 
 
 using google::LogMessage;

src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc

@@ -7,7 +7,7 @@
  *
  * -------------------------------------------------------------------------
  *
- * Copyright (C) 2010-2012  (see AUTHORS file for a list of contributors)
+ * Copyright (C) 2010-2014  (see AUTHORS file for a list of contributors)
  *
  * GNSS-SDR is a software defined Global Navigation
  *          Satellite Systems receiver
@@ -31,16 +31,16 @@
  */
 
 #include "pcps_assisted_acquisition_cc.h"
-#include "gnss_signal_processing.h"
-#include "control_message_factory.h"
-#include "gps_acq_assist.h"
-#include <gnuradio/io_signature.h>
 #include <sstream>
 #include <glog/log_severity.h>
 #include <glog/logging.h>
+#include <gnuradio/io_signature.h>
 #include <volk/volk.h>
 #include "nco_lib.h"
 #include "concurrent_map.h"
+#include "gnss_signal_processing.h"
+#include "control_message_factory.h"
+#include "gps_acq_assist.h"
 
 extern concurrent_map<Gps_Acq_Assist> global_gps_acq_assist_map;
 

src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc

@@ -11,7 +11,7 @@
  *
  * -------------------------------------------------------------------------
  *
- * Copyright (C) 2010-2012  (see AUTHORS file for a list of contributors)
+ * Copyright (C) 2010-2014  (see AUTHORS file for a list of contributors)
  *
  * GNSS-SDR is a software defined Global Navigation
  *          Satellite Systems receiver
@@ -35,14 +35,14 @@
  */
 
 #include "pcps_cccwsr_acquisition_cc.h"
-#include "gnss_signal_processing.h"
-#include "control_message_factory.h"
-#include <gnuradio/io_signature.h>
 #include <sstream>
 #include <glog/log_severity.h>
 #include <glog/logging.h>
+#include <gnuradio/io_signature.h>
 #include <volk/volk.h>
-//#include <gperftools/profiler.h>  // ToDo: detect presence of gperftools
+#include "gnss_signal_processing.h"
+#include "control_message_factory.h"
+
 
 using google::LogMessage;
 

src/algorithms/acquisition/gnuradio_blocks/pcps_multithread_acquisition_cc.cc

@@ -9,7 +9,7 @@
  *
  * -------------------------------------------------------------------------
  *
- * Copyright (C) 2010-2012  (see AUTHORS file for a list of contributors)
+ * Copyright (C) 2010-2014  (see AUTHORS file for a list of contributors)
  *
  * GNSS-SDR is a software defined Global Navigation
  *          Satellite Systems receiver
@@ -33,13 +33,13 @@
  */
 
 #include "pcps_multithread_acquisition_cc.h"
-#include "gnss_signal_processing.h"
-#include "control_message_factory.h"
-#include <gnuradio/io_signature.h>
 #include <sstream>
 #include <glog/log_severity.h>
 #include <glog/logging.h>
+#include <gnuradio/io_signature.h>
 #include <volk/volk.h>
+#include "gnss_signal_processing.h"
+#include "control_message_factory.h"
 
 using google::LogMessage;
 

src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc

@@ -25,7 +25,7 @@
  *
  * -------------------------------------------------------------------------
  *
- * Copyright (C) 2010-2012  (see AUTHORS file for a list of contributors)
+ * Copyright (C) 2010-2014  (see AUTHORS file for a list of contributors)
  *
  * GNSS-SDR is a software defined Global Navigation
  *          Satellite Systems receiver
@@ -49,13 +49,13 @@
  */
 
 #include "pcps_tong_acquisition_cc.h"
-#include "gnss_signal_processing.h"
-#include "control_message_factory.h"
-#include <gnuradio/io_signature.h>
 #include <sstream>
 #include <glog/log_severity.h>
 #include <glog/logging.h>
+#include <gnuradio/io_signature.h>
 #include <volk/volk.h>
+#include "control_message_factory.h"
+#include "gnss_signal_processing.h"
 
 using google::LogMessage;
 
@@ -149,11 +149,11 @@ void pcps_tong_acquisition_cc::set_local_code(std::complex<float> * code)
     //Conjugate the local code
     if (is_unaligned())
         {
-            volk_32fc_conjugate_32fc_u(d_fft_codes,d_fft_if->get_outbuf(),d_fft_size);
+            volk_32fc_conjugate_32fc_u(d_fft_codes, d_fft_if->get_outbuf(), d_fft_size);
         }
     else
         {
-            volk_32fc_conjugate_32fc_a(d_fft_codes,d_fft_if->get_outbuf(),d_fft_size);
+            volk_32fc_conjugate_32fc_a(d_fft_codes, d_fft_if->get_outbuf(), d_fft_size);
         }
 }
 
@@ -177,7 +177,7 @@ void pcps_tong_acquisition_cc::init()
     // Create the carrier Doppler wipeoff signals and allocate data grid.
     d_grid_doppler_wipeoffs = new gr_complex*[d_num_doppler_bins];
     d_grid_data = new float*[d_num_doppler_bins];
-    for (unsigned int doppler_index=0;doppler_index<d_num_doppler_bins;doppler_index++)
+    for (unsigned int doppler_index = 0; doppler_index < d_num_doppler_bins; doppler_index++)
         {
             if (posix_memalign((void**)&(d_grid_doppler_wipeoffs[doppler_index]), 16,
                                d_fft_size * sizeof(gr_complex)) == 0){};
@@ -201,7 +201,6 @@ int pcps_tong_acquisition_cc::general_work(int noutput_items,
         gr_vector_int &ninput_items, gr_vector_const_void_star &input_items,
         gr_vector_void_star &output_items)
 {
-
     int acquisition_message = -1; //0=STOP_CHANNEL 1=ACQ_SUCCEES 2=ACQ_FAIL
 
     switch (d_state)
@@ -220,7 +219,7 @@ int pcps_tong_acquisition_cc::general_work(int noutput_items,
                     d_input_power = 0.0;
                     d_test_statistics = 0.0;
 
-                    for (unsigned int doppler_index=0;doppler_index<d_num_doppler_bins;doppler_index++)
+                    for (unsigned int doppler_index = 0; doppler_index < d_num_doppler_bins; doppler_index++)
                         {
                             for (unsigned int i = 0; i < d_fft_size; i++)
                                 {
@@ -264,11 +263,11 @@ int pcps_tong_acquisition_cc::general_work(int noutput_items,
             d_input_power /= (float)d_fft_size;
 
             // 2- Doppler frequency search loop
-            for (unsigned int doppler_index=0;doppler_index<d_num_doppler_bins;doppler_index++)
+            for (unsigned int doppler_index = 0; doppler_index < d_num_doppler_bins; doppler_index++)
                 {
                     // doppler search steps
 
-                    doppler=-(int)d_doppler_max+d_doppler_step*doppler_index;
+                    doppler = -(int)d_doppler_max + d_doppler_step*doppler_index;
 
                     volk_32fc_x2_multiply_32fc_a(d_fft_if->get_inbuf(), in,
                                 d_grid_doppler_wipeoffs[doppler_index], d_fft_size);

src/algorithms/data_type_adapter/adapters/ishort_to_complex.cc

@@ -5,7 +5,7 @@
  *
  * -------------------------------------------------------------------------
  *
- * Copyright (C) 2010-2012  (see AUTHORS file for a list of contributors)
+ * Copyright (C) 2010-2014  (see AUTHORS file for a list of contributors)
  *
  * GNSS-SDR is a software defined Global Navigation
  *          Satellite Systems receiver
@@ -29,9 +29,9 @@
  */
 
 #include "ishort_to_complex.h"
-#include "configuration_interface.h"
 #include <glog/log_severity.h>
 #include <glog/logging.h>
+#include "configuration_interface.h"
 
 using google::LogMessage;
 

src/algorithms/input_filter/adapters/fir_filter.cc

@@ -5,7 +5,7 @@
  *
  * -------------------------------------------------------------------------
  *
- * Copyright (C) 2010-2012  (see AUTHORS file for a list of contributors)
+ * Copyright (C) 2010-2014  (see AUTHORS file for a list of contributors)
  *
  * GNSS-SDR is a software defined Global Navigation
  *          Satellite Systems receiver
@@ -29,12 +29,11 @@
  */
 
 #include "fir_filter.h"
-#include "configuration_interface.h"
-#include <string>
 #include <boost/lexical_cast.hpp>
 #include <gnuradio/filter/pm_remez.h>
 #include <glog/log_severity.h>
 #include <glog/logging.h>
+#include "configuration_interface.h"
 
 using google::LogMessage;
 

src/algorithms/input_filter/adapters/freq_xlating_fir_filter.cc

@@ -5,7 +5,7 @@
  *
  * -------------------------------------------------------------------------
  *
- * Copyright (C) 2010-2012  (see AUTHORS file for a list of contributors)
+ * Copyright (C) 2010-2014  (see AUTHORS file for a list of contributors)
  *
  * GNSS-SDR is a software defined Global Navigation
  *          Satellite Systems receiver
@@ -29,13 +29,12 @@
  */
 
 #include "freq_xlating_fir_filter.h"
-#include "configuration_interface.h"
-#include <string>
 #include <boost/lexical_cast.hpp>
 #include <gnuradio/blocks/file_sink.h>
 #include <gnuradio/filter/pm_remez.h>
 #include <glog/log_severity.h>
 #include <glog/logging.h>
+#include "configuration_interface.h"
 
 using google::LogMessage;
 

src/algorithms/resampler/adapters/direct_resampler_conditioner.cc

@@ -6,7 +6,7 @@
  *
  * -------------------------------------------------------------------------
  *
- * Copyright (C) 2010-2011  (see AUTHORS file for a list of contributors)
+ * Copyright (C) 2010-2014  (see AUTHORS file for a list of contributors)
  *
  * GNSS-SDR is a software defined Global Navigation
  *          Satellite Systems receiver
@@ -30,12 +30,13 @@
  */
 
 #include "direct_resampler_conditioner.h"
+#include <glog/log_severity.h>
+#include <glog/logging.h>
 #include <gnuradio/blocks/file_sink.h>
 #include "direct_resampler_conditioner_cc.h"
 //#include "direct_resampler_conditioner_ss.h"
 #include "configuration_interface.h"
-#include <glog/log_severity.h>
+
-#include <glog/logging.h>
 
 using google::LogMessage;
 

src/algorithms/signal_source/adapters/file_signal_source.cc

@@ -7,7 +7,7 @@
  *
  * -------------------------------------------------------------------------
  *
- * Copyright (C) 2010-2013  (see AUTHORS file for a list of contributors)
+ * Copyright (C) 2010-2014  (see AUTHORS file for a list of contributors)
  *
  * GNSS-SDR is a software defined Global Navigation
  *          Satellite Systems receiver
@@ -31,9 +31,6 @@
  */
 
 #include "file_signal_source.h"
-#include "gnss_sdr_valve.h"
-#include "configuration_interface.h"
-#include <string>
 #include <iostream>
 #include <fstream>
 #include <iomanip>
@@ -41,7 +38,8 @@
 #include <gflags/gflags.h>
 #include <glog/log_severity.h>
 #include <glog/logging.h>
-//#include <gnuradio/io_signature.h>
+#include "gnss_sdr_valve.h"
+#include "configuration_interface.h"
 
 using google::LogMessage;
 

src/algorithms/signal_source/adapters/nsr_file_signal_source.cc

@@ -7,7 +7,7 @@
  *
  * -------------------------------------------------------------------------
  *
- * Copyright (C) 2010-2013  (see AUTHORS file for a list of contributors)
+ * Copyright (C) 2010-2014  (see AUTHORS file for a list of contributors)
  *
  * GNSS-SDR is a software defined Global Navigation
  *          Satellite Systems receiver
@@ -31,16 +31,16 @@
  */
 
 #include "nsr_file_signal_source.h"
-#include "gnss_sdr_valve.h"
+#include <exception>
-#include "configuration_interface.h"
-#include <string>
-#include <iostream>
 #include <fstream>
 #include <iomanip>
-#include <exception>
+#include <iostream>
 #include <gflags/gflags.h>
 #include <glog/log_severity.h>
 #include <glog/logging.h>
+#include "gnss_sdr_valve.h"
+#include "configuration_interface.h"
+
 
 using google::LogMessage;
 

src/algorithms/signal_source/adapters/uhd_signal_source.cc

@@ -5,7 +5,7 @@
  *
  * -------------------------------------------------------------------------
  *
- * Copyright (C) 2010-2012  (see AUTHORS file for a list of contributors)
+ * Copyright (C) 2010-2014  (see AUTHORS file for a list of contributors)
  *
  * GNSS-SDR is a software defined Global Navigation
  *          Satellite Systems receiver
@@ -29,18 +29,13 @@
  */
 
 #include "uhd_signal_source.h"
-//#include <uhd/usrp/multi_usrp.hpp>
+#include <iostream>
-//#include <gnuradio/gr_uhd_usrp_source.h>
-#include <gnuradio/uhd/usrp_source.h>
 #include <uhd/types/device_addr.hpp>
 #include <uhd/exception.hpp>
-//#include <gnuradio/gr_file_sink.h>
-//#include <gnuradio/blocks/file_sink.h>
-#include "configuration_interface.h"
-#include "gnss_sdr_valve.h"
 #include <glog/log_severity.h>
 #include <glog/logging.h>
-#include <iostream>
+#include "configuration_interface.h"
+#include "gnss_sdr_valve.h"
 #include "GPS_L1_CA.h"
 
 using google::LogMessage;

src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_samples.h

@@ -5,7 +5,7 @@
  * \author Javier Arribas jarribas (at) cttc.es
  * -------------------------------------------------------------------------
  *
- * Copyright (C) 2010-2012  (see AUTHORS file for a list of contributors)
+ * Copyright (C) 2010-2014  (see AUTHORS file for a list of contributors)
  *
  * GNSS-SDR is a software defined Global Navigation
  *          Satellite Systems receiver
@@ -28,8 +28,8 @@
  * -------------------------------------------------------------------------
  */
 
-#ifndef GNSS_SDR_unpack_byte_2bit_samples_H
+#ifndef GNSS_SDR_UNPACK_BYTE_2BIT_SAMPLES_H
-#define 	 GNSS_SDR_unpack_byte_2bit_samples_H
+#define GNSS_SDR_UNPACK_BYTE_2BIT_SAMPLES_H
 
 #include <gnuradio/sync_interpolator.h>
 
@@ -51,8 +51,8 @@ private:
 public:
     unpack_byte_2bit_samples();
     ~unpack_byte_2bit_samples();
-    int work (int noutput_items,gr_vector_const_void_star &input_items,
+    int work (int noutput_items, gr_vector_const_void_star &input_items,
-    		gr_vector_void_star &output_items);
+              gr_vector_void_star &output_items);
 };
 
 #endif

src/core/system_parameters/galileo_ephemeris.h

@@ -6,7 +6,7 @@
  *
  * -------------------------------------------------------------------------
  *
- * Copyright (C) 2010-2013  (see AUTHORS file for a list of contributors)
+ * Copyright (C) 2010-2014  (see AUTHORS file for a list of contributors)
  *
  * GNSS-SDR is a software defined Global Navigation
  *          Satellite Systems receiver
@@ -35,7 +35,7 @@
 
 #include <iostream>
 #include <map>
-#include "boost/assign.hpp"
+#include <boost/assign.hpp>
 #include <boost/serialization/nvp.hpp>
 #include "Galileo_E1.h"