[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 07/24: gr-qtgui: Use dummy void* return val
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 07/24: gr-qtgui: Use dummy void* return value for pywidget if !ENABLE_PYTHON |
|
Date: |
Tue, 18 Mar 2014 17:51:40 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
trondeau pushed a commit to branch master
in repository gnuradio.
commit 6a78af5919133fdc339b09bb1622e876365a4d19
Author: Sylvain Munaut <address@hidden>
Date: Fri Mar 14 23:17:58 2014 +0100
gr-qtgui: Use dummy void* return value for pywidget if !ENABLE_PYTHON
This has two benefits:
- If ENABLE_PYTHON is disabled during build, the method will still be
there and just return NULL
- During build of external projects / apps that don't necessarely want
to have python included in the build, the exposed vtable is the same
as the one from GR (whether or not python was enabled during GR build)
Without this, using those block from outside without the exact same option
as during GR build would result in crash.
Signed-off-by: Sylvain Munaut <address@hidden>
---
gr-qtgui/include/gnuradio/qtgui/const_sink_c.h | 2 ++
gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h | 2 ++
gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h | 2 ++
gr-qtgui/include/gnuradio/qtgui/histogram_sink_f.h | 2 ++
gr-qtgui/include/gnuradio/qtgui/sink_c.h | 2 ++
gr-qtgui/include/gnuradio/qtgui/sink_f.h | 2 ++
gr-qtgui/include/gnuradio/qtgui/time_raster_sink_b.h | 2 ++
gr-qtgui/include/gnuradio/qtgui/time_raster_sink_f.h | 2 ++
gr-qtgui/include/gnuradio/qtgui/time_sink_c.h | 2 ++
gr-qtgui/include/gnuradio/qtgui/time_sink_f.h | 2 ++
gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h | 2 ++
gr-qtgui/include/gnuradio/qtgui/waterfall_sink_f.h | 2 ++
gr-qtgui/lib/const_sink_c_impl.cc | 6 ++++++
gr-qtgui/lib/const_sink_c_impl.h | 2 ++
gr-qtgui/lib/freq_sink_c_impl.cc | 6 ++++++
gr-qtgui/lib/freq_sink_c_impl.h | 2 ++
gr-qtgui/lib/freq_sink_f_impl.cc | 6 ++++++
gr-qtgui/lib/freq_sink_f_impl.h | 2 ++
gr-qtgui/lib/histogram_sink_f_impl.cc | 6 ++++++
gr-qtgui/lib/histogram_sink_f_impl.h | 2 ++
gr-qtgui/lib/sink_c_impl.cc | 6 ++++++
gr-qtgui/lib/sink_c_impl.h | 2 ++
gr-qtgui/lib/sink_f_impl.cc | 6 ++++++
gr-qtgui/lib/sink_f_impl.h | 2 ++
gr-qtgui/lib/time_raster_sink_b_impl.cc | 6 ++++++
gr-qtgui/lib/time_raster_sink_b_impl.h | 2 ++
gr-qtgui/lib/time_raster_sink_f_impl.cc | 6 ++++++
gr-qtgui/lib/time_raster_sink_f_impl.h | 2 ++
gr-qtgui/lib/time_sink_c_impl.cc | 6 ++++++
gr-qtgui/lib/time_sink_c_impl.h | 2 ++
gr-qtgui/lib/time_sink_f_impl.cc | 6 ++++++
gr-qtgui/lib/time_sink_f_impl.h | 2 ++
gr-qtgui/lib/waterfall_sink_c_impl.cc | 6 ++++++
gr-qtgui/lib/waterfall_sink_c_impl.h | 2 ++
gr-qtgui/lib/waterfall_sink_f_impl.cc | 6 ++++++
gr-qtgui/lib/waterfall_sink_f_impl.h | 2 ++
36 files changed, 120 insertions(+)
diff --git a/gr-qtgui/include/gnuradio/qtgui/const_sink_c.h
b/gr-qtgui/include/gnuradio/qtgui/const_sink_c.h
index 6b305f6..7a2296a 100644
--- a/gr-qtgui/include/gnuradio/qtgui/const_sink_c.h
+++ b/gr-qtgui/include/gnuradio/qtgui/const_sink_c.h
@@ -67,6 +67,8 @@ namespace gr {
#ifdef ENABLE_PYTHON
virtual PyObject* pyqwidget() = 0;
+#else
+ virtual void* pyqwidget() = 0;
#endif
virtual void set_y_axis(double min, double max) = 0;
diff --git a/gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h
b/gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h
index d0a4a3d..41d4bc1 100644
--- a/gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h
+++ b/gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h
@@ -74,6 +74,8 @@ namespace gr {
#ifdef ENABLE_PYTHON
virtual PyObject* pyqwidget() = 0;
+#else
+ virtual void* pyqwidget() = 0;
#endif
virtual void set_fft_size(const int fftsize) = 0;
diff --git a/gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h
b/gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h
index 25a4c80..dcdfd8e 100644
--- a/gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h
+++ b/gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h
@@ -74,6 +74,8 @@ namespace gr {
#ifdef ENABLE_PYTHON
virtual PyObject* pyqwidget() = 0;
+#else
+ virtual void* pyqwidget() = 0;
#endif
virtual void set_fft_size(const int fftsize) = 0;
diff --git a/gr-qtgui/include/gnuradio/qtgui/histogram_sink_f.h
b/gr-qtgui/include/gnuradio/qtgui/histogram_sink_f.h
index 07ad124..eeea39b 100644
--- a/gr-qtgui/include/gnuradio/qtgui/histogram_sink_f.h
+++ b/gr-qtgui/include/gnuradio/qtgui/histogram_sink_f.h
@@ -88,6 +88,8 @@ namespace gr {
#ifdef ENABLE_PYTHON
virtual PyObject* pyqwidget() = 0;
+#else
+ virtual void* pyqwidget() = 0;
#endif
public:
diff --git a/gr-qtgui/include/gnuradio/qtgui/sink_c.h
b/gr-qtgui/include/gnuradio/qtgui/sink_c.h
index d1c35eb..5a451b3 100644
--- a/gr-qtgui/include/gnuradio/qtgui/sink_c.h
+++ b/gr-qtgui/include/gnuradio/qtgui/sink_c.h
@@ -80,6 +80,8 @@ namespace gr {
#ifdef ENABLE_PYTHON
virtual PyObject* pyqwidget() = 0;
+#else
+ virtual void* pyqwidget() = 0;
#endif
virtual void set_fft_size(const int fftsize) = 0;
diff --git a/gr-qtgui/include/gnuradio/qtgui/sink_f.h
b/gr-qtgui/include/gnuradio/qtgui/sink_f.h
index 7d56a7a..e0d58a5 100644
--- a/gr-qtgui/include/gnuradio/qtgui/sink_f.h
+++ b/gr-qtgui/include/gnuradio/qtgui/sink_f.h
@@ -80,6 +80,8 @@ namespace gr {
#ifdef ENABLE_PYTHON
virtual PyObject* pyqwidget() = 0;
+#else
+ virtual void* pyqwidget() = 0;
#endif
virtual void set_fft_size(const int fftsize) = 0;
diff --git a/gr-qtgui/include/gnuradio/qtgui/time_raster_sink_b.h
b/gr-qtgui/include/gnuradio/qtgui/time_raster_sink_b.h
index 5304dd4..6ffe21b 100644
--- a/gr-qtgui/include/gnuradio/qtgui/time_raster_sink_b.h
+++ b/gr-qtgui/include/gnuradio/qtgui/time_raster_sink_b.h
@@ -79,6 +79,8 @@ namespace gr {
#ifdef ENABLE_PYTHON
virtual PyObject* pyqwidget() = 0;
+#else
+ virtual void* pyqwidget() = 0;
#endif
virtual void set_update_time(double t) = 0;
diff --git a/gr-qtgui/include/gnuradio/qtgui/time_raster_sink_f.h
b/gr-qtgui/include/gnuradio/qtgui/time_raster_sink_f.h
index 2c13265..4e7ddfe 100644
--- a/gr-qtgui/include/gnuradio/qtgui/time_raster_sink_f.h
+++ b/gr-qtgui/include/gnuradio/qtgui/time_raster_sink_f.h
@@ -76,6 +76,8 @@ namespace gr {
#ifdef ENABLE_PYTHON
virtual PyObject* pyqwidget() = 0;
+#else
+ virtual void* pyqwidget() = 0;
#endif
virtual void set_update_time(double t) = 0;
diff --git a/gr-qtgui/include/gnuradio/qtgui/time_sink_c.h
b/gr-qtgui/include/gnuradio/qtgui/time_sink_c.h
index f02226c..aa2e19b 100644
--- a/gr-qtgui/include/gnuradio/qtgui/time_sink_c.h
+++ b/gr-qtgui/include/gnuradio/qtgui/time_sink_c.h
@@ -72,6 +72,8 @@ namespace gr {
#ifdef ENABLE_PYTHON
virtual PyObject* pyqwidget() = 0;
+#else
+ virtual void* pyqwidget() = 0;
#endif
virtual void set_y_axis(double min, double max) = 0;
diff --git a/gr-qtgui/include/gnuradio/qtgui/time_sink_f.h
b/gr-qtgui/include/gnuradio/qtgui/time_sink_f.h
index 64e347b..c82c22b 100644
--- a/gr-qtgui/include/gnuradio/qtgui/time_sink_f.h
+++ b/gr-qtgui/include/gnuradio/qtgui/time_sink_f.h
@@ -70,6 +70,8 @@ namespace gr {
#ifdef ENABLE_PYTHON
virtual PyObject* pyqwidget() = 0;
+#else
+ virtual void* pyqwidget() = 0;
#endif
virtual void set_y_axis(double min, double max) = 0;
diff --git a/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h
b/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h
index e1e27a4..180e2b8 100644
--- a/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h
+++ b/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h
@@ -81,6 +81,8 @@ namespace gr {
#ifdef ENABLE_PYTHON
virtual PyObject* pyqwidget() = 0;
+#else
+ virtual void* pyqwidget() = 0;
#endif
virtual void clear_data() = 0;
diff --git a/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_f.h
b/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_f.h
index 006f592..3f278f2 100644
--- a/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_f.h
+++ b/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_f.h
@@ -80,6 +80,8 @@ namespace gr {
#ifdef ENABLE_PYTHON
virtual PyObject* pyqwidget() = 0;
+#else
+ virtual void* pyqwidget() = 0;
#endif
virtual void clear_data() = 0;
diff --git a/gr-qtgui/lib/const_sink_c_impl.cc
b/gr-qtgui/lib/const_sink_c_impl.cc
index bc4b411..fb0cdad 100644
--- a/gr-qtgui/lib/const_sink_c_impl.cc
+++ b/gr-qtgui/lib/const_sink_c_impl.cc
@@ -148,6 +148,12 @@ namespace gr {
PyObject *retarg = Py_BuildValue("N", w);
return retarg;
}
+#else
+ void *
+ const_sink_c_impl::pyqwidget()
+ {
+ return NULL;
+ }
#endif
void
diff --git a/gr-qtgui/lib/const_sink_c_impl.h b/gr-qtgui/lib/const_sink_c_impl.h
index e2faa72..3b1de22 100644
--- a/gr-qtgui/lib/const_sink_c_impl.h
+++ b/gr-qtgui/lib/const_sink_c_impl.h
@@ -70,6 +70,8 @@ namespace gr {
#ifdef ENABLE_PYTHON
PyObject* pyqwidget();
+#else
+ void* pyqwidget();
#endif
void set_y_axis(double min, double max);
diff --git a/gr-qtgui/lib/freq_sink_c_impl.cc b/gr-qtgui/lib/freq_sink_c_impl.cc
index 0f37fe8..ff40ff3 100644
--- a/gr-qtgui/lib/freq_sink_c_impl.cc
+++ b/gr-qtgui/lib/freq_sink_c_impl.cc
@@ -174,6 +174,12 @@ namespace gr {
PyObject *retarg = Py_BuildValue("N", w);
return retarg;
}
+#else
+ void *
+ freq_sink_c_impl::pyqwidget()
+ {
+ return NULL;
+ }
#endif
void
diff --git a/gr-qtgui/lib/freq_sink_c_impl.h b/gr-qtgui/lib/freq_sink_c_impl.h
index f068e65..15b5137 100644
--- a/gr-qtgui/lib/freq_sink_c_impl.h
+++ b/gr-qtgui/lib/freq_sink_c_impl.h
@@ -87,6 +87,8 @@ namespace gr {
#ifdef ENABLE_PYTHON
PyObject* pyqwidget();
+#else
+ void* pyqwidget();
#endif
void set_fft_size(const int fftsize);
diff --git a/gr-qtgui/lib/freq_sink_f_impl.cc b/gr-qtgui/lib/freq_sink_f_impl.cc
index b77e523..4f5ba5a 100644
--- a/gr-qtgui/lib/freq_sink_f_impl.cc
+++ b/gr-qtgui/lib/freq_sink_f_impl.cc
@@ -174,6 +174,12 @@ namespace gr {
PyObject *retarg = Py_BuildValue("N", w);
return retarg;
}
+#else
+ void *
+ freq_sink_f_impl::pyqwidget()
+ {
+ return NULL;
+ }
#endif
void
diff --git a/gr-qtgui/lib/freq_sink_f_impl.h b/gr-qtgui/lib/freq_sink_f_impl.h
index c7e9fe8..68cb8c6 100644
--- a/gr-qtgui/lib/freq_sink_f_impl.h
+++ b/gr-qtgui/lib/freq_sink_f_impl.h
@@ -87,6 +87,8 @@ namespace gr {
#ifdef ENABLE_PYTHON
PyObject* pyqwidget();
+#else
+ void* pyqwidget();
#endif
void set_fft_size(const int fftsize);
diff --git a/gr-qtgui/lib/histogram_sink_f_impl.cc
b/gr-qtgui/lib/histogram_sink_f_impl.cc
index 4b3aa29..dc3e63c 100644
--- a/gr-qtgui/lib/histogram_sink_f_impl.cc
+++ b/gr-qtgui/lib/histogram_sink_f_impl.cc
@@ -150,6 +150,12 @@ namespace gr {
PyObject *retarg = Py_BuildValue("N", w);
return retarg;
}
+#else
+ void *
+ histogram_sink_f_impl::pyqwidget()
+ {
+ return NULL;
+ }
#endif
void
diff --git a/gr-qtgui/lib/histogram_sink_f_impl.h
b/gr-qtgui/lib/histogram_sink_f_impl.h
index e255889..58d43e4 100644
--- a/gr-qtgui/lib/histogram_sink_f_impl.h
+++ b/gr-qtgui/lib/histogram_sink_f_impl.h
@@ -72,6 +72,8 @@ namespace gr {
#ifdef ENABLE_PYTHON
PyObject* pyqwidget();
+#else
+ void* pyqwidget();
#endif
void set_y_axis(double min, double max);
diff --git a/gr-qtgui/lib/sink_c_impl.cc b/gr-qtgui/lib/sink_c_impl.cc
index 12720bd..992512a 100644
--- a/gr-qtgui/lib/sink_c_impl.cc
+++ b/gr-qtgui/lib/sink_c_impl.cc
@@ -180,6 +180,12 @@ namespace gr {
PyObject *retarg = Py_BuildValue("N", w);
return retarg;
}
+#else
+ void *
+ sink_c_impl::pyqwidget()
+ {
+ return NULL;
+ }
#endif
void
diff --git a/gr-qtgui/lib/sink_c_impl.h b/gr-qtgui/lib/sink_c_impl.h
index 56c90f3..18508d3 100644
--- a/gr-qtgui/lib/sink_c_impl.h
+++ b/gr-qtgui/lib/sink_c_impl.h
@@ -85,6 +85,8 @@ namespace gr {
#ifdef ENABLE_PYTHON
PyObject* pyqwidget();
+#else
+ void* pyqwidget();
#endif
void set_fft_size(const int fftsize);
diff --git a/gr-qtgui/lib/sink_f_impl.cc b/gr-qtgui/lib/sink_f_impl.cc
index a3567ae..0a0e119 100644
--- a/gr-qtgui/lib/sink_f_impl.cc
+++ b/gr-qtgui/lib/sink_f_impl.cc
@@ -172,6 +172,12 @@ namespace gr {
PyObject *retarg = Py_BuildValue("N", w);
return retarg;
}
+#else
+ void *
+ sink_f_impl::pyqwidget()
+ {
+ return NULL;
+ }
#endif
void
diff --git a/gr-qtgui/lib/sink_f_impl.h b/gr-qtgui/lib/sink_f_impl.h
index 801a200..68331cc 100644
--- a/gr-qtgui/lib/sink_f_impl.h
+++ b/gr-qtgui/lib/sink_f_impl.h
@@ -83,6 +83,8 @@ namespace gr {
#ifdef ENABLE_PYTHON
PyObject* pyqwidget();
+#else
+ void* pyqwidget();
#endif
void set_fft_size(const int fftsize);
diff --git a/gr-qtgui/lib/time_raster_sink_b_impl.cc
b/gr-qtgui/lib/time_raster_sink_b_impl.cc
index 5e5a9f5..a1189f4 100644
--- a/gr-qtgui/lib/time_raster_sink_b_impl.cc
+++ b/gr-qtgui/lib/time_raster_sink_b_impl.cc
@@ -169,6 +169,12 @@ namespace gr {
PyObject *retarg = Py_BuildValue("N", w);
return retarg;
}
+#else
+ void *
+ time_raster_sink_b_impl::pyqwidget()
+ {
+ return NULL;
+ }
#endif
void
diff --git a/gr-qtgui/lib/time_raster_sink_b_impl.h
b/gr-qtgui/lib/time_raster_sink_b_impl.h
index 6800568..bd568e9 100644
--- a/gr-qtgui/lib/time_raster_sink_b_impl.h
+++ b/gr-qtgui/lib/time_raster_sink_b_impl.h
@@ -78,6 +78,8 @@ namespace gr {
#ifdef ENABLE_PYTHON
PyObject* pyqwidget();
+#else
+ void* pyqwidget();
#endif
void set_update_time(double t);
diff --git a/gr-qtgui/lib/time_raster_sink_f_impl.cc
b/gr-qtgui/lib/time_raster_sink_f_impl.cc
index a68a503..c8b865d 100644
--- a/gr-qtgui/lib/time_raster_sink_f_impl.cc
+++ b/gr-qtgui/lib/time_raster_sink_f_impl.cc
@@ -167,6 +167,12 @@ namespace gr {
PyObject *retarg = Py_BuildValue("N", w);
return retarg;
}
+#else
+ void *
+ time_raster_sink_f_impl::pyqwidget()
+ {
+ return NULL;
+ }
#endif
void
diff --git a/gr-qtgui/lib/time_raster_sink_f_impl.h
b/gr-qtgui/lib/time_raster_sink_f_impl.h
index f7caf75..1e0dcf8 100644
--- a/gr-qtgui/lib/time_raster_sink_f_impl.h
+++ b/gr-qtgui/lib/time_raster_sink_f_impl.h
@@ -77,6 +77,8 @@ namespace gr {
#ifdef ENABLE_PYTHON
PyObject* pyqwidget();
+#else
+ void* pyqwidget();
#endif
void set_update_time(double t);
diff --git a/gr-qtgui/lib/time_sink_c_impl.cc b/gr-qtgui/lib/time_sink_c_impl.cc
index 0f723f8..e86ffca 100644
--- a/gr-qtgui/lib/time_sink_c_impl.cc
+++ b/gr-qtgui/lib/time_sink_c_impl.cc
@@ -153,6 +153,12 @@ namespace gr {
PyObject *retarg = Py_BuildValue("N", w);
return retarg;
}
+#else
+ void *
+ time_sink_c_impl::pyqwidget()
+ {
+ return NULL;
+ }
#endif
void
diff --git a/gr-qtgui/lib/time_sink_c_impl.h b/gr-qtgui/lib/time_sink_c_impl.h
index 03dcbe2..6a75789 100644
--- a/gr-qtgui/lib/time_sink_c_impl.h
+++ b/gr-qtgui/lib/time_sink_c_impl.h
@@ -88,6 +88,8 @@ namespace gr {
#ifdef ENABLE_PYTHON
PyObject* pyqwidget();
+#else
+ void* pyqwidget();
#endif
void set_y_axis(double min, double max);
diff --git a/gr-qtgui/lib/time_sink_f_impl.cc b/gr-qtgui/lib/time_sink_f_impl.cc
index f547185..e571654 100644
--- a/gr-qtgui/lib/time_sink_f_impl.cc
+++ b/gr-qtgui/lib/time_sink_f_impl.cc
@@ -155,6 +155,12 @@ namespace gr {
PyObject *retarg = Py_BuildValue("N", w);
return retarg;
}
+#else
+ void *
+ time_sink_f_impl::pyqwidget()
+ {
+ return NULL;
+ }
#endif
void
diff --git a/gr-qtgui/lib/time_sink_f_impl.h b/gr-qtgui/lib/time_sink_f_impl.h
index bbad48d..7505642 100644
--- a/gr-qtgui/lib/time_sink_f_impl.h
+++ b/gr-qtgui/lib/time_sink_f_impl.h
@@ -88,6 +88,8 @@ namespace gr {
#ifdef ENABLE_PYTHON
PyObject* pyqwidget();
+#else
+ void* pyqwidget();
#endif
void set_y_axis(double min, double max);
diff --git a/gr-qtgui/lib/waterfall_sink_c_impl.cc
b/gr-qtgui/lib/waterfall_sink_c_impl.cc
index ded93d1..2c436db 100644
--- a/gr-qtgui/lib/waterfall_sink_c_impl.cc
+++ b/gr-qtgui/lib/waterfall_sink_c_impl.cc
@@ -173,6 +173,12 @@ namespace gr {
PyObject *retarg = Py_BuildValue("N", w);
return retarg;
}
+#else
+ void *
+ waterfall_sink_c_impl::pyqwidget()
+ {
+ return NULL;
+ }
#endif
void
diff --git a/gr-qtgui/lib/waterfall_sink_c_impl.h
b/gr-qtgui/lib/waterfall_sink_c_impl.h
index 95781c5..aad4a4d 100644
--- a/gr-qtgui/lib/waterfall_sink_c_impl.h
+++ b/gr-qtgui/lib/waterfall_sink_c_impl.h
@@ -85,6 +85,8 @@ namespace gr {
#ifdef ENABLE_PYTHON
PyObject* pyqwidget();
+#else
+ void* pyqwidget();
#endif
void clear_data();
diff --git a/gr-qtgui/lib/waterfall_sink_f_impl.cc
b/gr-qtgui/lib/waterfall_sink_f_impl.cc
index bb6c3e0..fc6d9fa 100644
--- a/gr-qtgui/lib/waterfall_sink_f_impl.cc
+++ b/gr-qtgui/lib/waterfall_sink_f_impl.cc
@@ -172,6 +172,12 @@ namespace gr {
PyObject *retarg = Py_BuildValue("N", w);
return retarg;
}
+#else
+ void *
+ waterfall_sink_f_impl::pyqwidget()
+ {
+ return NULL;
+ }
#endif
void
diff --git a/gr-qtgui/lib/waterfall_sink_f_impl.h
b/gr-qtgui/lib/waterfall_sink_f_impl.h
index 97c6aa2..172f873 100644
--- a/gr-qtgui/lib/waterfall_sink_f_impl.h
+++ b/gr-qtgui/lib/waterfall_sink_f_impl.h
@@ -85,6 +85,8 @@ namespace gr {
#ifdef ENABLE_PYTHON
PyObject* pyqwidget();
+#else
+ void* pyqwidget();
#endif
void clear_data();
- [Commit-gnuradio] [gnuradio] branch master updated (69dcaa7 -> d351818), git, 2014/03/18
- [Commit-gnuradio] [gnuradio] 17/24: Merge remote-tracking branch 'smunaut/qtgui_fixes', git, 2014/03/18
- [Commit-gnuradio] [gnuradio] 05/24: grc: fix some PyGTK backwards compatibilty issues, git, 2014/03/18
- [Commit-gnuradio] [gnuradio] 07/24: gr-qtgui: Use dummy void* return value for pywidget if !ENABLE_PYTHON,
git <=
- [Commit-gnuradio] [gnuradio] 11/24: grc: show dummy blocks when opening grc blocks, git, 2014/03/18
- [Commit-gnuradio] [gnuradio] 15/24: grc: tabbed probs: fix initial error box height, git, 2014/03/18
- [Commit-gnuradio] [gnuradio] 14/24: grc: tabbed props: no more double entries, git, 2014/03/18
- [Commit-gnuradio] [gnuradio] 06/24: qtgui: Adding a Number sink with options to set autoscale, layout style, colors, averaging., git, 2014/03/18
- [Commit-gnuradio] [gnuradio] 04/24: Simplify some more., git, 2014/03/18
- [Commit-gnuradio] [gnuradio] 03/24: Move correlate_access_code_tag_bb to non-deprecated GRC category and deprecate the older correlate_access_code_bb., git, 2014/03/18
- [Commit-gnuradio] [gnuradio] 20/24: Merge remote-tracking branch 'skoslowski/grc_show_missing_blocks', git, 2014/03/18
- [Commit-gnuradio] [gnuradio] 09/24: grc: tabbed PropsDialog, git, 2014/03/18
- [Commit-gnuradio] [gnuradio] 19/24: Merge remote-tracking branch 'gnuradio-wg-grc/grc_pygtk_backw_compat_fixes', git, 2014/03/18
- [Commit-gnuradio] [gnuradio] 12/24: grc: special colors for missing blocks, git, 2014/03/18