X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fprop%2Fint.hpp;h=709e02e635eda56ee1f195cd4b9f76733c32b560;hp=a1c529fd2e6856f5e097c3e6465a5ed9e9614ac6;hb=9a267f8dec48c9a28472c1a3bb146c624819e98b;hpb=2acdb232d6bb452cfdfaea3ef5218fb4da592329

diff --git a/pv/prop/int.hpp b/pv/prop/int.hpp
index a1c529f..709e02e 100644
--- 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 {
@@ -37,11 +38,11 @@ class Int : public Property
 	Q_OBJECT;
 
 public:
-	Int(QString name, QString suffix,
-		boost::optional< std::pair<int64_t, int64_t> > range,
+	Int(QString name, QString desc, QString suffix,
+		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,13 +53,13 @@ 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_;
 };
 
-} // prop
-} // pv
+}  // namespace prop
+}  // namespace pv
 
-#endif // PULSEVIEW_PV_PROP_INT_H
+#endif // PULSEVIEW_PV_PROP_INT_HPP