X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fprop%2Fdouble.hpp;h=863648d834b89dc6713578933184e735fd79045f;hp=89b74cca00119850ee66b569183e16633296b7a6;hb=870ea3dbf35b182e120c5d84ab89bf9cb7691232;hpb=2acdb232d6bb452cfdfaea3ef5218fb4da592329

diff --git a/pv/prop/double.hpp b/pv/prop/double.hpp
index 89b74cca..863648d8 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 <http://www.gnu.org/licenses/>.
  */
 
-#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 <utility>
 
@@ -27,6 +26,8 @@
 
 #include "property.hpp"
 
+using std::pair;
+
 class QDoubleSpinBox;
 
 namespace pv {
@@ -38,12 +39,12 @@ class Double : public Property
 
 public:
 	Double(QString name, int decimals, QString suffix,
-		boost::optional< std::pair<double, double> > range,
+		boost::optional< pair<double, double> > range,
 		boost::optional<double> 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<double, double> > range_;
+	const boost::optional< pair<double, double> > range_;
 	const boost::optional<double> step_;
 
 	QDoubleSpinBox *spin_box_;
 };
 
-} // prop
-} // pv
+}  // namespace prop
+}  // namespace pv
 
-#endif // PULSEVIEW_PV_PROP_DOUBLE_H
+#endif // PULSEVIEW_PV_PROP_DOUBLE_HPP