diff options
| -rw-r--r-- | gr-channels/lib/cfo_model_impl.h | 6 | ||||
| -rw-r--r-- | gr-channels/lib/channel_model2_impl.h | 8 | ||||
| -rw-r--r-- | gr-channels/lib/channel_model_impl.h | 8 | ||||
| -rw-r--r-- | gr-channels/lib/dynamic_channel_model_impl.h | 8 | ||||
| -rw-r--r-- | gr-channels/lib/sro_model_impl.h | 2 | ||||
| -rw-r--r-- | gr-qtgui/examples/c++/display_qt.h | 2 |
6 files changed, 17 insertions, 17 deletions
diff --git a/gr-channels/lib/cfo_model_impl.h b/gr-channels/lib/cfo_model_impl.h index a8774c91bb..1f26cf3fec 100644 --- a/gr-channels/lib/cfo_model_impl.h +++ b/gr-channels/lib/cfo_model_impl.h @@ -24,10 +24,10 @@ #define INCLUDED_CHANNELS_CFO_MODEL_IMPL_H #include <gnuradio/top_block.h> -#include <gnuradio/blocks/integrate_ff.h> +#include <gnuradio/blocks/integrate.h> #include <gnuradio/blocks/vco_c.h> -#include <gnuradio/blocks/multiply_cc.h> -#include <gnuradio/analog/fastnoise_source_f.h> +#include <gnuradio/blocks/multiply.h> +#include <gnuradio/analog/fastnoise_source.h> #include <gnuradio/channels/cfo_model.h> #include <sincostable.h> diff --git a/gr-channels/lib/channel_model2_impl.h b/gr-channels/lib/channel_model2_impl.h index 730880526e..9de837a6c1 100644 --- a/gr-channels/lib/channel_model2_impl.h +++ b/gr-channels/lib/channel_model2_impl.h @@ -25,10 +25,10 @@ #include <gnuradio/channels/channel_model2.h> #include <gnuradio/top_block.h> -#include <gnuradio/blocks/add_cc.h> -#include <gnuradio/blocks/multiply_cc.h> -#include <gnuradio/analog/sig_source_c.h> -#include <gnuradio/analog/fastnoise_source_c.h> +#include <gnuradio/blocks/add_blk.h> +#include <gnuradio/blocks/multiply.h> +#include <gnuradio/analog/sig_source.h> +#include <gnuradio/analog/fastnoise_source.h> #include <gnuradio/filter/mmse_resampler_cc.h> #include <gnuradio/filter/fir_filter_blk.h> #include <gnuradio/blocks/vco_c.h> diff --git a/gr-channels/lib/channel_model_impl.h b/gr-channels/lib/channel_model_impl.h index aae77457b2..fd0d0f175b 100644 --- a/gr-channels/lib/channel_model_impl.h +++ b/gr-channels/lib/channel_model_impl.h @@ -24,10 +24,10 @@ #define INCLUDED_CHANNELS_CHANNEL_MODEL_IMPL_H #include <gnuradio/top_block.h> -#include <gnuradio/blocks/add_cc.h> -#include <gnuradio/blocks/multiply_cc.h> -#include <gnuradio/analog/sig_source_c.h> -#include <gnuradio/analog/fastnoise_source_c.h> +#include <gnuradio/blocks/add_blk.h> +#include <gnuradio/blocks/multiply.h> +#include <gnuradio/analog/sig_source.h> +#include <gnuradio/analog/fastnoise_source.h> #include <gnuradio/channels/channel_model.h> #include <gnuradio/filter/mmse_resampler_cc.h> #include <gnuradio/filter/fir_filter_blk.h> diff --git a/gr-channels/lib/dynamic_channel_model_impl.h b/gr-channels/lib/dynamic_channel_model_impl.h index 52696425b1..7b3b8c5809 100644 --- a/gr-channels/lib/dynamic_channel_model_impl.h +++ b/gr-channels/lib/dynamic_channel_model_impl.h @@ -24,10 +24,10 @@ #define INCLUDED_CHANNELS_CHANNEL_MODEL_IMPL_H #include <gnuradio/top_block.h> -#include <gnuradio/blocks/add_cc.h> -#include <gnuradio/blocks/multiply_cc.h> -#include <gnuradio/analog/sig_source_c.h> -#include <gnuradio/analog/fastnoise_source_c.h> +#include <gnuradio/blocks/add_blk.h> +#include <gnuradio/blocks/multiply.h> +#include <gnuradio/analog/sig_source.h> +#include <gnuradio/analog/fastnoise_source.h> #include <gnuradio/channels/dynamic_channel_model.h> #include <gnuradio/channels/selective_fading_model.h> #include <gnuradio/channels/sro_model.h> diff --git a/gr-channels/lib/sro_model_impl.h b/gr-channels/lib/sro_model_impl.h index b0b8809469..3bbd12f5e5 100644 --- a/gr-channels/lib/sro_model_impl.h +++ b/gr-channels/lib/sro_model_impl.h @@ -25,7 +25,7 @@ #include <gnuradio/filter/mmse_interpolator_cc.h> #include <gnuradio/filter/mmse_fir_interpolator_cc.h> -#include <gnuradio/analog/fastnoise_source_f.h> +#include <gnuradio/analog/fastnoise_source.h> #include <gnuradio/channels/sro_model.h> namespace gr { diff --git a/gr-qtgui/examples/c++/display_qt.h b/gr-qtgui/examples/c++/display_qt.h index c6dc7c827c..5df8b88f57 100644 --- a/gr-qtgui/examples/c++/display_qt.h +++ b/gr-qtgui/examples/c++/display_qt.h @@ -24,7 +24,7 @@ #include <gnuradio/top_block.h> #include <gnuradio/analog/sig_source.h> #include <gnuradio/analog/noise_source.h> -#include <gnuradio/blocks/add_ff.h> +#include <gnuradio/blocks/add_blk.h> #include <gnuradio/blocks/throttle.h> #include <gnuradio/qtgui/time_sink_f.h> #include <gnuradio/qtgui/freq_sink_f.h> |