summaryrefslogtreecommitdiff
path: root/gr-qtgui/include
diff options
context:
space:
mode:
Diffstat (limited to 'gr-qtgui/include')
-rw-r--r--gr-qtgui/include/.gitignore2
-rw-r--r--gr-qtgui/include/Makefile.am33
-rw-r--r--gr-qtgui/include/qtgui_sink_c.h18
-rw-r--r--gr-qtgui/include/qtgui_sink_f.h14
-rw-r--r--gr-qtgui/include/qtgui_time_sink_c.h10
-rw-r--r--gr-qtgui/include/qtgui_time_sink_f.h10
-rw-r--r--gr-qtgui/include/qtgui_util.h4
7 files changed, 28 insertions, 63 deletions
diff --git a/gr-qtgui/include/.gitignore b/gr-qtgui/include/.gitignore
deleted file mode 100644
index b336cc7ce..000000000
--- a/gr-qtgui/include/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/Makefile
-/Makefile.in
diff --git a/gr-qtgui/include/Makefile.am b/gr-qtgui/include/Makefile.am
deleted file mode 100644
index 59a030854..000000000
--- a/gr-qtgui/include/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# Copyright 2011 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.
-#
-
-include $(top_srcdir)/Makefile.common
-
-# These headers get installed in ${prefix}/include/gnuradio
-grinclude_HEADERS = \
- gr_qtgui_api.h \
- qtgui_time_sink_c.h \
- qtgui_time_sink_f.h \
- qtgui_sink_c.h \
- qtgui_sink_f.h \
- qtgui_util.h
-
-libgnuradio_digital_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS)
diff --git a/gr-qtgui/include/qtgui_sink_c.h b/gr-qtgui/include/qtgui_sink_c.h
index 024ea360b..68fff368a 100644
--- a/gr-qtgui/include/qtgui_sink_c.h
+++ b/gr-qtgui/include/qtgui_sink_c.h
@@ -1,19 +1,19 @@
/* -*- c++ -*- */
/*
* Copyright 2008,2009,2011 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,
@@ -50,7 +50,7 @@ GR_QTGUI_API qtgui_sink_c_sptr qtgui_make_sink_c (int fftsize, int wintype,
* plots it. The default action is to plot the signal as a PSD (FFT),
* spectrogram (waterfall), time domain I&Q, and constellation (I
* vs. Q) plots. The plots may be turned off by setting the
- * appropriate boolean value in the constructor to False.
+ * appropriate boolean value in the constructor to False.
*/
class GR_QTGUI_API qtgui_sink_c : public gr_block
@@ -63,7 +63,7 @@ private:
bool plottime, bool plotconst,
QWidget *parent);
qtgui_sink_c (int fftsize, int wintype,
- double fc, double bw,
+ double fc, double bw,
const std::string &name,
bool plotfreq, bool plotwaterfall,
bool plottime, bool plotconst,
@@ -81,7 +81,7 @@ private:
std::string d_name;
gruel::high_res_timer_type d_last_update;
bool d_update_active;
-
+
bool d_shift;
gri_fft_complex *d_fft;
@@ -89,7 +89,7 @@ private:
gr_complex *d_residbuf;
bool d_plotfreq, d_plotwaterfall, d_plottime, d_plotconst;
-
+
gruel::high_res_timer_type d_update_time;
QWidget *d_parent;
@@ -99,7 +99,7 @@ private:
void buildwindow();
void fftresize();
void fft(const gr_complex *data_in, int size);
-
+
public:
~qtgui_sink_c();
void exec_();
diff --git a/gr-qtgui/include/qtgui_sink_f.h b/gr-qtgui/include/qtgui_sink_f.h
index 2d79b5eef..709f02a2f 100644
--- a/gr-qtgui/include/qtgui_sink_f.h
+++ b/gr-qtgui/include/qtgui_sink_f.h
@@ -1,19 +1,19 @@
/* -*- c++ -*- */
/*
* Copyright 2008,2009,2011 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,
@@ -78,7 +78,7 @@ private:
double d_center_freq;
double d_bandwidth;
std::string d_name;
-
+
bool d_shift;
gri_fft_complex *d_fft;
@@ -90,13 +90,13 @@ private:
double d_update_time;
QWidget *d_parent;
- SpectrumGUIClass *d_main_gui;
+ SpectrumGUIClass *d_main_gui;
void windowreset();
void buildwindow();
void fftresize();
void fft(const float *data_in, int size);
-
+
public:
~qtgui_sink_f();
void exec_();
diff --git a/gr-qtgui/include/qtgui_time_sink_c.h b/gr-qtgui/include/qtgui_time_sink_c.h
index ec7cc490b..561d796cf 100644
--- a/gr-qtgui/include/qtgui_time_sink_c.h
+++ b/gr-qtgui/include/qtgui_time_sink_c.h
@@ -1,19 +1,19 @@
/* -*- c++ -*- */
/*
* Copyright 2011 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,
@@ -61,7 +61,7 @@ private:
const std::string &name,
int nconnections,
QWidget *parent=NULL);
-
+
void initialize();
int d_size;
diff --git a/gr-qtgui/include/qtgui_time_sink_f.h b/gr-qtgui/include/qtgui_time_sink_f.h
index ff17f8a1b..993e0556c 100644
--- a/gr-qtgui/include/qtgui_time_sink_f.h
+++ b/gr-qtgui/include/qtgui_time_sink_f.h
@@ -1,19 +1,19 @@
/* -*- c++ -*- */
/*
* Copyright 2011 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,
@@ -59,7 +59,7 @@ private:
const std::string &name,
int nconnections,
QWidget *parent=NULL);
-
+
void initialize();
int d_size;
diff --git a/gr-qtgui/include/qtgui_util.h b/gr-qtgui/include/qtgui_util.h
index 7b3692e75..2deaddb94 100644
--- a/gr-qtgui/include/qtgui_util.h
+++ b/gr-qtgui/include/qtgui_util.h
@@ -43,12 +43,12 @@ class GR_QTGUI_API QwtPickerDblClickPointMachine: public QwtPickerMachine
public:
QwtPickerDblClickPointMachine();
~QwtPickerDblClickPointMachine();
-
+
#if QWT_VERSION < 0x060000
virtual CommandList transition( const QwtEventPattern &eventPattern,
const QEvent *e);
#else
- virtual QList<QwtPickerMachine::Command>
+ virtual QList<QwtPickerMachine::Command>
transition( const QwtEventPattern &eventPattern,
const QEvent *e);
#endif