Don't use std:: in the code directly (where possible).

[pulseview.git] / pv / prop / int.hpp

diff --git a/pv/prop/int.hpp b/pv/prop/int.hpp
index a1c529fd2e6856f5e097c3e6465a5ed9e9614ac6..e94f6cbf7e549039b3c8f4ed435247f29000e861 100644 (file)
--- a/pv/prop/int.hpp
+++ b/pv/prop/int.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_INT_H
-#define PULSEVIEW_PV_PROP_INT_H
+#ifndef PULSEVIEW_PV_PROP_INT_HPP
+#define PULSEVIEW_PV_PROP_INT_HPP
 
 #include <utility>
 
@@ -27,6 +26,8 @@
 
 #include "property.hpp"
 
+using std::pair;
+
 class QSpinBox;
 
 namespace pv {
@@ -38,10 +39,10 @@ class Int : public Property
 
 public:
        Int(QString name, QString suffix,
-               boost::optional< std::pair<int64_t, int64_t> > range,
+               boost::optional< pair<int64_t, int64_t> > range,
                Getter getter, Setter setter);
 
-       virtual ~Int();
+       virtual ~Int() = default;
 
        QWidget* get_widget(QWidget *parent, bool auto_commit);
 
@@ -52,7 +53,7 @@ private Q_SLOTS:
 
 private:
        const QString suffix_;
-       const boost::optional< std::pair<int64_t, int64_t> > range_;
+       const boost::optional< pair<int64_t, int64_t> > range_;
 
        Glib::VariantBase value_;
        QSpinBox *spin_box_;
@@ -61,4 +62,4 @@ private:
 } // prop
 } // pv
 
-#endif // PULSEVIEW_PV_PROP_INT_H
+#endif // PULSEVIEW_PV_PROP_INT_HPP