fixed some more warnings; mostly in doxygen or order of variable initialization.

5 files changed, 8 insertions, 7 deletions

diff --git a/gnuradio-core/src/lib/filter/gr_adaptive_fir_ccc.cc b/gnuradio-core/src/lib/filter/gr_adaptive_fir_ccc.cc
index 884caf29c..3fed74641 100644
--- a/gnuradio-core/src/lib/filter/gr_adaptive_fir_ccc.cc
+++ b/gnuradio-core/src/lib/filter/gr_adaptive_fir_ccc.cc
@@ -33,7 +33,7 @@ gr_adaptive_fir_ccc::gr_adaptive_fir_ccc(const char *name, int decimation,
 		       gr_make_io_signature (1, 1, sizeof(gr_complex)),
 		       gr_make_io_signature (1, 1, sizeof(gr_complex)),
 		       decimation),
-    d_taps(taps), d_updated(false)
+    d_updated(false), d_taps(taps)
 {
   set_history(d_taps.size());
 }
diff --git a/gnuradio-core/src/lib/filter/gr_pfb_clock_sync_ccf.h b/gnuradio-core/src/lib/filter/gr_pfb_clock_sync_ccf.h
index d4357e3d8..b66efd33f 100644
--- a/gnuradio-core/src/lib/filter/gr_pfb_clock_sync_ccf.h
+++ b/gnuradio-core/src/lib/filter/gr_pfb_clock_sync_ccf.h
@@ -123,6 +123,7 @@ class gr_pfb_clock_sync_ccf : public gr_block
    * \param init_phase (float) The initial phase to look at, or which filter to start 
    *                           with (default = 0).
    * \param max_rate_deviation (float) Distance from 0 d_rate can get (default = 1.5).
+   * \parma osps (int) The number of output samples per symbol (default=1).
    *
    */
   friend gr_pfb_clock_sync_ccf_sptr gr_make_pfb_clock_sync_ccf (double sps, float gain,
diff --git a/gr-digital/lib/digital_constellation_receiver_cb.cc b/gr-digital/lib/digital_constellation_receiver_cb.cc
index 56385f11e..573c4e855 100644
--- a/gr-digital/lib/digital_constellation_receiver_cb.cc
+++ b/gr-digital/lib/digital_constellation_receiver_cb.cc
@@ -56,8 +56,8 @@ digital_constellation_receiver_cb::digital_constellation_receiver_cb (digital_co
   : gr_block ("constellation_receiver_cb",
 	      gr_make_io_signature (1, 1, sizeof (gr_complex)),
 	      gr_make_io_signaturev (1, 4, iosig)),
-    d_constellation(constellation), 
     d_alpha(alpha), d_beta(beta), d_freq(0), d_max_freq(fmax), d_min_freq(fmin), d_phase(0),
+    d_constellation(constellation), 
     d_current_const_point(0)
 {
   if (d_constellation->dimensionality() != 1)
diff --git a/gr-qtgui/swig/Makefile.swig.gen b/gr-qtgui/swig/Makefile.swig.gen
index 3659601c3..e343db374 100644
--- a/gr-qtgui/swig/Makefile.swig.gen
+++ b/gr-qtgui/swig/Makefile.swig.gen
@@ -105,7 +105,7 @@ _qtgui_swig_la_CXXFLAGS =			\
 	$(qtgui_swig_la_swig_cxxflags)
 
 python/qtgui_swig.cc: qtgui_swig.py
-qtgui_swig.py: qtgui_swig.i
+qtgui_swig.py: qtgui_swig.i 
 
 # Include the python dependencies for this file
 -include python/qtgui_swig.d
diff --git a/gr-trellis/src/lib/fsm.h b/gr-trellis/src/lib/fsm.h
index 8bae91754..134bbf26e 100644
--- a/gr-trellis/src/lib/fsm.h
+++ b/gr-trellis/src/lib/fsm.h
@@ -106,7 +106,7 @@ public:
    * \brief Creates an FSMS describing ISI.
    *
    * \param mod_size    modulation size
-   * \param ch_lenth    channel length
+   * \param ch_length   channel length
    *
    */
   fsm(int mod_size, int ch_length);
@@ -125,14 +125,14 @@ public:
   /*!
    * \brief Creates an FSMS describing the joint trellis of two FSMs.
    *
-   * \param fsm1  first FSMS
-   * \param fsm2  second FSMS
+   * \param FSM1  first FSMS
+   * \param FSM2  second FSMS
    */
   fsm(const fsm &FSM1, const fsm &FSM2);
   /*!
    * \brief Creates an FSMS representing n stages through the originial FSM (AKA radix-n FSM).
    *
-   * \param original FSMS
+   * \param FSM      Original FSMs
    * \param n        Number of stages.
    */
   fsm(const fsm &FSM, int n);