Write public interface first, then private members in class definitions

src/algorithms/signal_source/gnuradio_blocks/gr_complex_ip_packet_source.h

@@ -45,42 +45,6 @@
 
 class Gr_Complex_Ip_Packet_Source : virtual public gr::sync_block
 {
-private:
-    boost::mutex d_mutex;
-    pcap_t *descr;  //ethernet pcap device descriptor
-
-    char *fifo_buff;
-
-    int fifo_read_ptr;
-    int fifo_write_ptr;
-    int fifo_items;
-    int d_sock_raw;
-    int d_udp_port;
-    struct sockaddr_in si_me;
-    std::string d_src_device;
-    std::string d_origin_address;
-    int d_udp_payload_size;
-    bool d_fifo_full;
-
-    int d_n_baseband_channels;
-    int d_wire_sample_type;
-    int d_bytes_per_sample;
-    size_t d_item_size;
-    bool d_IQ_swap;
-
-    boost::thread *d_pcap_thread;
-    /*!
-	 * \brief
-	 * Opens the ethernet device using libpcap raw capture mode
-	 * If any of these fail, the fuction retuns the error and exits.
-	 */
-    bool open();
-
-    void demux_samples(gr_vector_void_star output_items, int num_samples_readed);
-    void my_pcap_loop_thread(pcap_t *pcap_handle);
-    void pcap_callback(u_char *args, const struct pcap_pkthdr *pkthdr, const u_char *packet);
-    static void static_pcap_callback(u_char *args, const struct pcap_pkthdr *pkthdr, const u_char *packet);
-
 public:
     typedef boost::shared_ptr<Gr_Complex_Ip_Packet_Source> sptr;
     static sptr make(std::string src_device,
@@ -101,15 +65,46 @@ public:
         bool IQ_swap_);
     ~Gr_Complex_Ip_Packet_Source();
 
+    // Called by gnuradio to enable drivers, etc for i/o devices.
+    bool start();
+
+    // Called by gnuradio to disable drivers, etc for i/o devices.
+    bool stop();
+
     // Where all the action really happens
     int work(int noutput_items,
         gr_vector_const_void_star &input_items,
         gr_vector_void_star &output_items);
 
-    // Called by gnuradio to enable drivers, etc for i/o devices.
-    bool start();
-    // Called by gnuradio to disable drivers, etc for i/o devices.
-    bool stop();
+private:
+    boost::mutex d_mutex;
+    pcap_t *descr;  //ethernet pcap device descriptor
+    char *fifo_buff;
+    int fifo_read_ptr;
+    int fifo_write_ptr;
+    int fifo_items;
+    int d_sock_raw;
+    int d_udp_port;
+    struct sockaddr_in si_me;
+    std::string d_src_device;
+    std::string d_origin_address;
+    int d_udp_payload_size;
+    bool d_fifo_full;
+    int d_n_baseband_channels;
+    int d_wire_sample_type;
+    int d_bytes_per_sample;
+    size_t d_item_size;
+    bool d_IQ_swap;
+    boost::thread *d_pcap_thread;
+    void demux_samples(gr_vector_void_star output_items, int num_samples_readed);
+    void my_pcap_loop_thread(pcap_t *pcap_handle);
+    void pcap_callback(u_char *args, const struct pcap_pkthdr *pkthdr, const u_char *packet);
+    static void static_pcap_callback(u_char *args, const struct pcap_pkthdr *pkthdr, const u_char *packet);
+    /*
+     * Opens the ethernet device using libpcap raw capture mode
+     * If any of these fail, the fuction retuns the error and exits.
+     */
+    bool open();
 };
 
 #endif /* GNSS_SDR_GR_COMPLEX_IP_PACKET_SOURCE_H */

src/algorithms/signal_source/gnuradio_blocks/labsat23_source.h

@@ -42,16 +42,34 @@ class labsat23_source;
 
 using labsat23_source_sptr = boost::shared_ptr<labsat23_source>;
 
-labsat23_source_sptr labsat23_make_source_sptr(const char *signal_file_basename, int channel_selector, gr::msg_queue::sptr queue);
+labsat23_source_sptr labsat23_make_source_sptr(
+    const char *signal_file_basename,
+    int channel_selector,
+    gr::msg_queue::sptr queue);
 
 /*!
  * \brief This class implements conversion between Labsat2 and 3 format byte packet samples to gr_complex
  */
 class labsat23_source : public gr::block
 {
+public:
+    ~labsat23_source();
+
+    int general_work(int noutput_items,
+        gr_vector_int &ninput_items,
+        gr_vector_const_void_star &input_items,
+        gr_vector_void_star &output_items);
+
 private:
-    friend labsat23_source_sptr labsat23_make_source_sptr(const char *signal_file_basename, int channel_selector, gr::msg_queue::sptr queue);
-    labsat23_source(const char *signal_file_basename, int channel_selector, gr::msg_queue::sptr queue);
+    friend labsat23_source_sptr labsat23_make_source_sptr(
+        const char *signal_file_basename,
+        int channel_selector,
+        gr::msg_queue::sptr queue);
+
+    labsat23_source(const char *signal_file_basename,
+        int channel_selector,
+        gr::msg_queue::sptr queue);
+
     std::string generate_filename();
     void decode_samples_one_channel(int16_t input_short, gr_complex *out, int type);
     int getBit(uint8_t byte, int position);
@@ -65,13 +83,6 @@ private:
     uint8_t d_ref_clock;
     uint8_t d_bits_per_sample;
     gr::msg_queue::sptr d_queue;
-
-public:
-    ~labsat23_source();
-    int general_work(int noutput_items,
-        gr_vector_int &ninput_items,
-        gr_vector_const_void_star &input_items,
-        gr_vector_void_star &output_items);
 };
 
 #endif

src/algorithms/signal_source/gnuradio_blocks/unpack_2bit_samples.h

@@ -75,7 +75,8 @@ class unpack_2bit_samples;
 
 using unpack_2bit_samples_sptr = boost::shared_ptr<unpack_2bit_samples>;
 
-unpack_2bit_samples_sptr make_unpack_2bit_samples(bool big_endian_bytes,
+unpack_2bit_samples_sptr make_unpack_2bit_samples(
+    bool big_endian_bytes,
     size_t item_size,
     bool big_endian_items,
     bool reverse_interleaving = false);
@@ -87,12 +88,25 @@ unpack_2bit_samples_sptr make_unpack_2bit_samples(bool big_endian_bytes,
  */
 class unpack_2bit_samples : public gr::sync_interpolator
 {
-private:
-    friend unpack_2bit_samples_sptr
-    make_unpack_2bit_samples_sptr(bool big_endian_bytes,
+public:
+    ~unpack_2bit_samples();
+
+    unpack_2bit_samples(bool big_endian_bytes,
         size_t item_size,
         bool big_endian_items,
         bool reverse_interleaving);
+
+    int work(int noutput_items,
+        gr_vector_const_void_star &input_items,
+        gr_vector_void_star &output_items);
+
+private:
+    friend unpack_2bit_samples_sptr make_unpack_2bit_samples_sptr(
+        bool big_endian_bytes,
+        size_t item_size,
+        bool big_endian_items,
+        bool reverse_interleaving);
+
     bool big_endian_bytes_;
     size_t item_size_;
     bool big_endian_items_;
@@ -100,18 +114,6 @@ private:
     bool swap_endian_bytes_;
     bool reverse_interleaving_;
     std::vector<int8_t> work_buffer_;
-
-public:
-    unpack_2bit_samples(bool big_endian_bytes,
-        size_t item_size,
-        bool big_endian_items,
-        bool reverse_interleaving);
-
-    ~unpack_2bit_samples();
-
-    int work(int noutput_items,
-        gr_vector_const_void_star &input_items,
-        gr_vector_void_star &output_items);
 };
 
 #endif

src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_cpx_samples.h

@@ -49,15 +49,15 @@ unpack_byte_2bit_cpx_samples_sptr make_unpack_byte_2bit_cpx_samples();
  */
 class unpack_byte_2bit_cpx_samples : public gr::sync_interpolator
 {
-private:
-    friend unpack_byte_2bit_cpx_samples_sptr make_unpack_byte_2bit_cpx_samples_sptr();
-
 public:
     unpack_byte_2bit_cpx_samples();
     ~unpack_byte_2bit_cpx_samples();
     int work(int noutput_items,
         gr_vector_const_void_star &input_items,
         gr_vector_void_star &output_items);
+
+private:
+    friend unpack_byte_2bit_cpx_samples_sptr make_unpack_byte_2bit_cpx_samples_sptr();
 };
 
 #endif

src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_samples.h

@@ -45,16 +45,15 @@ unpack_byte_2bit_samples_sptr make_unpack_byte_2bit_samples();
  */
 class unpack_byte_2bit_samples : public gr::sync_interpolator
 {
-private:
-    friend unpack_byte_2bit_samples_sptr
-    make_unpack_byte_2bit_samples_sptr();
-
 public:
     unpack_byte_2bit_samples();
     ~unpack_byte_2bit_samples();
     int work(int noutput_items,
         gr_vector_const_void_star &input_items,
         gr_vector_void_star &output_items);
+
+private:
+    friend unpack_byte_2bit_samples_sptr make_unpack_byte_2bit_samples_sptr();
 };
 
 #endif

src/algorithms/signal_source/gnuradio_blocks/unpack_byte_4bit_samples.h

@@ -47,15 +47,15 @@ unpack_byte_4bit_samples_sptr make_unpack_byte_4bit_samples();
  */
 class unpack_byte_4bit_samples : public gr::sync_interpolator
 {
-private:
-    friend unpack_byte_4bit_samples_sptr make_unpack_byte_4bit_samples_sptr();
-
 public:
     unpack_byte_4bit_samples();
     ~unpack_byte_4bit_samples();
     int work(int noutput_items,
         gr_vector_const_void_star &input_items,
         gr_vector_void_star &output_items);
+
+private:
+    friend unpack_byte_4bit_samples_sptr make_unpack_byte_4bit_samples_sptr();
 };
 
 #endif

src/algorithms/signal_source/gnuradio_blocks/unpack_intspir_1bit_samples.h

@@ -45,16 +45,15 @@ unpack_intspir_1bit_samples_sptr make_unpack_intspir_1bit_samples();
  */
 class unpack_intspir_1bit_samples : public gr::sync_interpolator
 {
-private:
-    friend unpack_intspir_1bit_samples_sptr
-    make_unpack_intspir_1bit_samples_sptr();
-
 public:
     unpack_intspir_1bit_samples();
     ~unpack_intspir_1bit_samples();
     int work(int noutput_items,
         gr_vector_const_void_star &input_items,
         gr_vector_void_star &output_items);
+
+private:
+    friend unpack_intspir_1bit_samples_sptr make_unpack_intspir_1bit_samples_sptr();
 };
 
 #endif

src/algorithms/signal_source/libs/gnss_sdr_valve.h

@@ -41,11 +41,13 @@
 #include <cstddef>                // for size_t
 #include <cstdint>
 
-boost::shared_ptr<gr::block> gnss_sdr_make_valve(size_t sizeof_stream_item,
+boost::shared_ptr<gr::block> gnss_sdr_make_valve(
+    size_t sizeof_stream_item,
     uint64_t nitems,
     gr::msg_queue::sptr queue);
 
-boost::shared_ptr<gr::block> gnss_sdr_make_valve(size_t sizeof_stream_item,
+boost::shared_ptr<gr::block> gnss_sdr_make_valve(
+    size_t sizeof_stream_item,
     uint64_t nitems,
     gr::msg_queue::sptr queue,
     bool stop_flowgraph);
@@ -56,29 +58,34 @@ boost::shared_ptr<gr::block> gnss_sdr_make_valve(size_t sizeof_stream_item,
  */
 class Gnss_Sdr_Valve : public gr::sync_block
 {
-    friend boost::shared_ptr<gr::block> gnss_sdr_make_valve(size_t sizeof_stream_item,
+public:
+    void open_valve();
+
+    int work(int noutput_items,
+        gr_vector_const_void_star &input_items,
+        gr_vector_void_star &output_items);
+
+private:
+    friend boost::shared_ptr<gr::block> gnss_sdr_make_valve(
+        size_t sizeof_stream_item,
         uint64_t nitems,
         gr::msg_queue::sptr queue);
-    friend boost::shared_ptr<gr::block> gnss_sdr_make_valve(size_t sizeof_stream_item,
+
+    friend boost::shared_ptr<gr::block> gnss_sdr_make_valve(
+        size_t sizeof_stream_item,
         uint64_t nitems,
         gr::msg_queue::sptr queue,
         bool stop_flowgraph);
 
+    Gnss_Sdr_Valve(size_t sizeof_stream_item,
+        uint64_t nitems,
+        gr::msg_queue::sptr queue, bool stop_flowgraph);
+
     uint64_t d_nitems;
     uint64_t d_ncopied_items;
     gr::msg_queue::sptr d_queue;
     bool d_stop_flowgraph;
     bool d_open_valve;
-
-public:
-    Gnss_Sdr_Valve(size_t sizeof_stream_item,
-        uint64_t nitems,
-        gr::msg_queue::sptr queue, bool stop_flowgraph);
-    void open_valve();
-
-    int work(int noutput_items,
-        gr_vector_const_void_star &input_items,
-        gr_vector_void_star &output_items);
 };
 
 #endif /*GNSS_SDR_GNSS_SDR_VALVE_H_*/

src/algorithms/signal_source/libs/rtl_tcp_dongle_info.h

@@ -41,11 +41,6 @@
  */
 class Rtl_Tcp_Dongle_Info
 {
-private:
-    char magic_[4]{};
-    uint32_t tuner_type_;
-    uint32_t tuner_gain_count_;
-
 public:
     enum
     {
@@ -77,6 +72,11 @@ public:
     {
         return tuner_gain_count_;
     }
+
+private:
+    char magic_[4]{};
+    uint32_t tuner_type_;
+    uint32_t tuner_gain_count_;
 };