6 files changed, 29 insertions, 29 deletions
diff --git a/gr-wxgui/lib/histo_sink_f_impl.cc b/gr-wxgui/lib/histo_sink_f_impl.cc
index 9b168de547..f10540fa36 100644
--- a/gr-wxgui/lib/histo_sink_f_impl.cc
+++ b/gr-wxgui/lib/histo_sink_f_impl.cc
@@ -25,7 +25,7 @@
 #endif
 
 #include "histo_sink_f_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
 #include <boost/math/special_functions/round.hpp>
 
 namespace gr {
@@ -50,16 +50,16 @@ namespace gr {
     }
 
     histo_sink_f::sptr
-    histo_sink_f::make(gr_msg_queue_sptr msgq)
+    histo_sink_f::make(msg_queue::sptr msgq)
     {
       return gnuradio::get_initial_sptr
         (new histo_sink_f_impl(msgq));
     }
 
-    histo_sink_f_impl::histo_sink_f_impl(gr_msg_queue_sptr msgq)
-      : gr_sync_block("histo_sink_f",
-                      gr_make_io_signature(1, 1, sizeof(float)),
-                      gr_make_io_signature(0, 0, 0)),
+    histo_sink_f_impl::histo_sink_f_impl(msg_queue::sptr msgq)
+      : sync_block("histo_sink_f",
+                      io_signature::make(1, 1, sizeof(float)),
+                      io_signature::make(0, 0, 0)),
         d_msgq(msgq), d_num_bins(11), d_frame_size(1000),
         d_sample_count(0), d_bins(NULL), d_samps(NULL)
     {
@@ -123,7 +123,7 @@ namespace gr {
         d_bins[index]++;
       }
       /* Build a message to hold the output records */
-      gr_message_sptr msg = gr_make_message(0, minimum, maximum, d_num_bins*sizeof(float));
+      message::sptr msg = message::make(0, minimum, maximum, d_num_bins*sizeof(float));
       float *out = (float *)msg->msg(); // get pointer to raw message buffer
       /* normalize the bins and put into message */
       for(unsigned int i = 0; i < d_num_bins; i++) {
diff --git a/gr-wxgui/lib/histo_sink_f_impl.h b/gr-wxgui/lib/histo_sink_f_impl.h
index 98b0fe6706..6c16a8a465 100644
--- a/gr-wxgui/lib/histo_sink_f_impl.h
+++ b/gr-wxgui/lib/histo_sink_f_impl.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_GR_HISTO_SINK_F_IMPL_H
 #define INCLUDED_GR_HISTO_SINK_F_IMPL_H
 
-#include <wxgui/histo_sink_f.h>
+#include <gnuradio/wxgui/histo_sink_f.h>
 
 namespace gr {
   namespace wxgui {
@@ -31,7 +31,7 @@ namespace gr {
     class histo_sink_f_impl : public histo_sink_f
     {
     private:
-      gr_msg_queue_sptr d_msgq;
+      msg_queue::sptr d_msgq;
       unsigned int d_num_bins;
       unsigned int d_frame_size;
       unsigned int d_sample_count;
@@ -43,7 +43,7 @@ namespace gr {
       void clear(void);
 
     public:
-      histo_sink_f_impl(gr_msg_queue_sptr msgq);
+      histo_sink_f_impl(msg_queue::sptr msgq);
       ~histo_sink_f_impl(void);
 
       int work(int noutput_items,
diff --git a/gr-wxgui/lib/oscope_guts.cc b/gr-wxgui/lib/oscope_guts.cc
index 3d1f085a6f..d406932dae 100644
--- a/gr-wxgui/lib/oscope_guts.cc
+++ b/gr-wxgui/lib/oscope_guts.cc
@@ -24,7 +24,7 @@
 #include <config.h>
 #endif
 
-#include <wxgui/oscope_guts.h>
+#include <gnuradio/wxgui/oscope_guts.h>
 #include <stdexcept>
 #include <stdio.h>
 #include <algorithm>
@@ -68,7 +68,7 @@ namespace gr {
       return wrap_bi(buffer_index - 1, mx);
     }
 
-    oscope_guts::oscope_guts(double sample_rate, gr_msg_queue_sptr msgq)
+    oscope_guts::oscope_guts(double sample_rate, msg_queue::sptr msgq)
       : d_nchannels(1),
     d_msgq(msgq),
     d_trigger_mode(TRIG_MODE_AUTO),
@@ -251,8 +251,8 @@ namespace gr {
       if(d_msgq->full_p())
         return;
       // Build a message to hold the output records
-      gr_message_sptr msg =
-        gr_make_message(0,                           // msg type
+      message::sptr msg =
+        message::make(0,                           // msg type
                         d_nchannels,                 // arg1 for other side
                         mx,                          // arg2 for other side
                         ((d_nchannels * mx) + 1) * sizeof(float)); // sizeof payload
diff --git a/gr-wxgui/lib/oscope_sink_f_impl.cc b/gr-wxgui/lib/oscope_sink_f_impl.cc
index 5e578cb8e3..9993040ffd 100644
--- a/gr-wxgui/lib/oscope_sink_f_impl.cc
+++ b/gr-wxgui/lib/oscope_sink_f_impl.cc
@@ -25,23 +25,23 @@
 #endif
 
 #include "oscope_sink_f_impl.h"
-#include <wxgui/oscope_sink_x.h>
-#include <wxgui/oscope_guts.h>
-#include <gr_io_signature.h>
+#include <gnuradio/wxgui/oscope_sink_x.h>
+#include <gnuradio/wxgui/oscope_guts.h>
+#include <gnuradio/io_signature.h>
 
 namespace gr {
   namespace wxgui {
 
     oscope_sink_f::sptr
-    oscope_sink_f::make(double sampling_rate, gr_msg_queue_sptr msgq)
+    oscope_sink_f::make(double sampling_rate, msg_queue::sptr msgq)
     {
       return gnuradio::get_initial_sptr
         (new oscope_sink_f_impl(sampling_rate, msgq));
     }
 
-    oscope_sink_f_impl::oscope_sink_f_impl(double sampling_rate, gr_msg_queue_sptr msgq)
+    oscope_sink_f_impl::oscope_sink_f_impl(double sampling_rate, msg_queue::sptr msgq)
       : oscope_sink_x("oscope_sink_f",
-                      gr_make_io_signature(1, oscope_guts::MAX_CHANNELS,
+                      io_signature::make(1, oscope_guts::MAX_CHANNELS,
                                            sizeof(float)),
                       sampling_rate),
         d_msgq(msgq)
diff --git a/gr-wxgui/lib/oscope_sink_f_impl.h b/gr-wxgui/lib/oscope_sink_f_impl.h
index 6ad28a885f..81688f53a5 100644
--- a/gr-wxgui/lib/oscope_sink_f_impl.h
+++ b/gr-wxgui/lib/oscope_sink_f_impl.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_GR_OSCOPE_SINK_F_IMPL_H
 #define INCLUDED_GR_OSCOPE_SINK_F_IMPL_H
 
-#include <wxgui/oscope_sink_f.h>
+#include <gnuradio/wxgui/oscope_sink_f.h>
 
 namespace gr {
   namespace wxgui {
@@ -31,10 +31,10 @@ namespace gr {
     class oscope_sink_f_impl : public oscope_sink_f
     {
     private:
-      gr_msg_queue_sptr d_msgq;
+      msg_queue::sptr d_msgq;
 
     public:
-      oscope_sink_f_impl(double sampling_rate, gr_msg_queue_sptr msgq);
+      oscope_sink_f_impl(double sampling_rate, msg_queue::sptr msgq);
       ~oscope_sink_f_impl();
 
       bool check_topology(int ninputs, int noutputs);
diff --git a/gr-wxgui/lib/oscope_sink_x.cc b/gr-wxgui/lib/oscope_sink_x.cc
index 417442979c..c97495fe53 100644
--- a/gr-wxgui/lib/oscope_sink_x.cc
+++ b/gr-wxgui/lib/oscope_sink_x.cc
@@ -24,18 +24,18 @@
 #include "config.h"
 #endif
 
-#include <wxgui/oscope_sink_x.h>
-#include <wxgui/oscope_guts.h>
-#include <gr_io_signature.h>
+#include <gnuradio/wxgui/oscope_sink_x.h>
+#include <gnuradio/wxgui/oscope_guts.h>
+#include <gnuradio/io_signature.h>
 
 namespace gr {
   namespace wxgui {
     
     oscope_sink_x::oscope_sink_x(const std::string name,
-                                 gr_io_signature_sptr input_sig,
+                                 gr::io_signature::sptr input_sig,
                                  double sampling_rate)
-      : gr_sync_block(name, input_sig,
-                      gr_make_io_signature(0, 0, 0)),
+      : sync_block(name, input_sig,
+                      io_signature::make(0, 0, 0)),
         d_sampling_rate(sampling_rate), d_guts(0)
     {
     }