X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fprop%2Fdouble.hpp;h=4e18e9563ff0adc9c05dc076fb5b57e8cf952409;hp=89b74cca00119850ee66b569183e16633296b7a6;hb=9a267f8dec48c9a28472c1a3bb146c624819e98b;hpb=2acdb232d6bb452cfdfaea3ef5218fb4da592329 diff --git a/pv/prop/double.hpp b/pv/prop/double.hpp index 89b74cc..4e18e95 100644 --- a/pv/prop/double.hpp +++ b/pv/prop/double.hpp @@ -14,12 +14,11 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * along with this program; if not, see . */ -#ifndef PULSEVIEW_PV_PROP_DOUBLE_H -#define PULSEVIEW_PV_PROP_DOUBLE_H +#ifndef PULSEVIEW_PV_PROP_DOUBLE_HPP +#define PULSEVIEW_PV_PROP_DOUBLE_HPP #include @@ -27,6 +26,8 @@ #include "property.hpp" +using std::pair; + class QDoubleSpinBox; namespace pv { @@ -37,13 +38,13 @@ class Double : public Property Q_OBJECT public: - Double(QString name, int decimals, QString suffix, - boost::optional< std::pair > range, + Double(QString name, QString desc, int decimals, QString suffix, + boost::optional< pair > range, boost::optional step, Getter getter, Setter setter); - virtual ~Double(); + virtual ~Double() = default; QWidget* get_widget(QWidget *parent, bool auto_commit); @@ -55,13 +56,13 @@ private Q_SLOTS: private: const int decimals_; const QString suffix_; - const boost::optional< std::pair > range_; + const boost::optional< pair > range_; const boost::optional step_; QDoubleSpinBox *spin_box_; }; -} // prop -} // pv +} // namespace prop +} // namespace pv -#endif // PULSEVIEW_PV_PROP_DOUBLE_H +#endif // PULSEVIEW_PV_PROP_DOUBLE_HPP