From 703338443db476e19fc42f57e5d9f76ff7ec1751 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Sun, 24 Apr 2011 19:33:23 -0700 Subject: qtgui: added GR_QTGUI_API declaration to qtgui library classes and functions --- gr-qtgui/lib/ConstellationDisplayPlot.h | 1 + gr-qtgui/lib/Makefile.am | 4 +++- gr-qtgui/lib/gr_qtgui_api.h | 33 +++++++++++++++++++++++++++++++++ gr-qtgui/lib/qtgui_sink_c.h | 7 ++++--- gr-qtgui/lib/qtgui_sink_f.h | 7 ++++--- gr-qtgui/lib/qtgui_time_sink_c.h | 7 ++++--- gr-qtgui/lib/qtgui_time_sink_f.h | 7 ++++--- gr-qtgui/lib/qtgui_util.h | 6 +++--- 8 files changed, 56 insertions(+), 16 deletions(-) create mode 100644 gr-qtgui/lib/gr_qtgui_api.h (limited to 'gr-qtgui') diff --git a/gr-qtgui/lib/ConstellationDisplayPlot.h b/gr-qtgui/lib/ConstellationDisplayPlot.h index e57149403..3a85f3bc3 100644 --- a/gr-qtgui/lib/ConstellationDisplayPlot.h +++ b/gr-qtgui/lib/ConstellationDisplayPlot.h @@ -23,6 +23,7 @@ #ifndef CONSTELLATION_DISPLAY_PLOT_HPP #define CONSTELLATION_DISPLAY_PLOT_HPP +#include #include #include #include diff --git a/gr-qtgui/lib/Makefile.am b/gr-qtgui/lib/Makefile.am index 72b4b1450..95b636d89 100644 --- a/gr-qtgui/lib/Makefile.am +++ b/gr-qtgui/lib/Makefile.am @@ -24,7 +24,8 @@ include $(top_srcdir)/Makefile.common EXTRA_DIST += spectrumdisplayform.ui AM_CPPFLAGS = -I. $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \ - $(QT_INCLUDES) $(BOOST_CPPFLAGS) $(WITH_INCLUDES) + $(QT_INCLUDES) $(BOOST_CPPFLAGS) $(WITH_INCLUDES) \ + -Dlibgnuradio_qtgui_EXPORTS # Only include these files in the build if qtgui passes configure checks # This is mostly to help make distcheck pass @@ -75,6 +76,7 @@ grinclude_HEADERS = \ timedisplayform.h \ SpectrumGUIClass.h \ spectrumUpdateEvents.h \ + gr_qtgui_api.h \ qtgui_sink_c.h \ qtgui_sink_f.h \ qtgui_time_sink_c.h \ diff --git a/gr-qtgui/lib/gr_qtgui_api.h b/gr-qtgui/lib/gr_qtgui_api.h new file mode 100644 index 000000000..65033a093 --- /dev/null +++ b/gr-qtgui/lib/gr_qtgui_api.h @@ -0,0 +1,33 @@ +/* + * Copyright 2010 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * GNU Radio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3, or (at your option) + * any later version. + * + * GNU Radio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with GNU Radio; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, + * Boston, MA 02110-1301, USA. + */ + +#ifndef INCLUDED_GR_QTGUI_API_H +#define INCLUDED_GR_QTGUI_API_H + +#include + +#ifdef libgnuradio_qtgui_EXPORTS +# define GR_QTGUI_API __GR_ATTR_EXPORT +#else +# define GR_QTGUI_API __GR_ATTR_IMPORT +#endif + +#endif /* INCLUDED_GR_QTGUI_API_H */ diff --git a/gr-qtgui/lib/qtgui_sink_c.h b/gr-qtgui/lib/qtgui_sink_c.h index fb0cb6c5f..b0946885c 100644 --- a/gr-qtgui/lib/qtgui_sink_c.h +++ b/gr-qtgui/lib/qtgui_sink_c.h @@ -24,6 +24,7 @@ #define INCLUDED_QTGUI_SINK_C_H #include +#include #include #include #include @@ -33,17 +34,17 @@ class qtgui_sink_c; typedef boost::shared_ptr qtgui_sink_c_sptr; -qtgui_sink_c_sptr qtgui_make_sink_c (int fftsize, int wintype, +GR_QTGUI_API qtgui_sink_c_sptr qtgui_make_sink_c (int fftsize, int wintype, double fc=0, double bandwidth=1.0, const std::string &name="Spectrum Display", bool plotfreq=true, bool plotwaterfall=true, bool plottime=true, bool plotconst=true, QWidget *parent=NULL); -class qtgui_sink_c : public gr_block +class GR_QTGUI_API qtgui_sink_c : public gr_block { private: - friend qtgui_sink_c_sptr qtgui_make_sink_c (int fftsize, int wintype, + friend GR_QTGUI_API qtgui_sink_c_sptr qtgui_make_sink_c (int fftsize, int wintype, double fc, double bw, const std::string &name, bool plotfreq, bool plotwaterfall, diff --git a/gr-qtgui/lib/qtgui_sink_f.h b/gr-qtgui/lib/qtgui_sink_f.h index 518aa3846..30db05eea 100644 --- a/gr-qtgui/lib/qtgui_sink_f.h +++ b/gr-qtgui/lib/qtgui_sink_f.h @@ -24,6 +24,7 @@ #define INCLUDED_QTGUI_SINK_F_H #include +#include #include #include #include @@ -34,17 +35,17 @@ class qtgui_sink_f; typedef boost::shared_ptr qtgui_sink_f_sptr; -qtgui_sink_f_sptr qtgui_make_sink_f (int fftsize, int wintype, +GR_QTGUI_API qtgui_sink_f_sptr qtgui_make_sink_f (int fftsize, int wintype, double fc=0, double bw=1.0, const std::string &name="Spectrum Display", bool plotfreq=true, bool plotwaterfall=true, bool plottime=true, bool plotconst=true, QWidget *parent=NULL); -class qtgui_sink_f : public gr_block +class GR_QTGUI_API qtgui_sink_f : public gr_block { private: - friend qtgui_sink_f_sptr qtgui_make_sink_f (int fftsize, int wintype, + friend GR_QTGUI_API qtgui_sink_f_sptr qtgui_make_sink_f (int fftsize, int wintype, double fc, double bw, const std::string &name, bool plotfreq, bool plotwaterfall, diff --git a/gr-qtgui/lib/qtgui_time_sink_c.h b/gr-qtgui/lib/qtgui_time_sink_c.h index fd1637232..aa46ab3a7 100644 --- a/gr-qtgui/lib/qtgui_time_sink_c.h +++ b/gr-qtgui/lib/qtgui_time_sink_c.h @@ -24,6 +24,7 @@ #define INCLUDED_QTGUI_TIME_SINK_C_H #include +#include #include #include #include @@ -33,15 +34,15 @@ class qtgui_time_sink_c; typedef boost::shared_ptr qtgui_time_sink_c_sptr; -qtgui_time_sink_c_sptr qtgui_make_time_sink_c(int size, double bw, +GR_QTGUI_API qtgui_time_sink_c_sptr qtgui_make_time_sink_c(int size, double bw, const std::string &name, int nconnectons=1, QWidget *parent=NULL); -class qtgui_time_sink_c : public gr_block +class GR_QTGUI_API qtgui_time_sink_c : public gr_block { private: - friend qtgui_time_sink_c_sptr qtgui_make_time_sink_c(int size, double bw, + friend GR_QTGUI_API qtgui_time_sink_c_sptr qtgui_make_time_sink_c(int size, double bw, const std::string &name, int nconnections, QWidget *parent); diff --git a/gr-qtgui/lib/qtgui_time_sink_f.h b/gr-qtgui/lib/qtgui_time_sink_f.h index d77a94ef1..29fca79ee 100644 --- a/gr-qtgui/lib/qtgui_time_sink_f.h +++ b/gr-qtgui/lib/qtgui_time_sink_f.h @@ -24,6 +24,7 @@ #define INCLUDED_QTGUI_TIME_SINK_F_H #include +#include #include #include #include @@ -33,15 +34,15 @@ class qtgui_time_sink_f; typedef boost::shared_ptr qtgui_time_sink_f_sptr; -qtgui_time_sink_f_sptr qtgui_make_time_sink_f(int size, double bw, +GR_QTGUI_API qtgui_time_sink_f_sptr qtgui_make_time_sink_f(int size, double bw, const std::string &name, int nconnectons=1, QWidget *parent=NULL); -class qtgui_time_sink_f : public gr_block +class GR_QTGUI_API qtgui_time_sink_f : public gr_block { private: - friend qtgui_time_sink_f_sptr qtgui_make_time_sink_f(int size, double bw, + friend GR_QTGUI_API qtgui_time_sink_f_sptr qtgui_make_time_sink_f(int size, double bw, const std::string &name, int nconnections, QWidget *parent); diff --git a/gr-qtgui/lib/qtgui_util.h b/gr-qtgui/lib/qtgui_util.h index a519c66a2..5b129c7b5 100644 --- a/gr-qtgui/lib/qtgui_util.h +++ b/gr-qtgui/lib/qtgui_util.h @@ -24,12 +24,12 @@ #define INCLUDED_QTGUI_UTIL_H #include - +#include #include #include -class QwtDblClickPlotPicker: public QwtPlotPicker +class GR_QTGUI_API QwtDblClickPlotPicker: public QwtPlotPicker { public: QwtDblClickPlotPicker(QwtPlotCanvas *); @@ -38,7 +38,7 @@ public: virtual QwtPickerMachine * stateMachine(int) const; }; -class QwtPickerDblClickPointMachine: public QwtPickerMachine +class GR_QTGUI_API QwtPickerDblClickPointMachine: public QwtPickerMachine { public: QwtPickerDblClickPointMachine(); -- cgit