projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
GlobalSettings: Announce settings changes to allow logging
[pulseview.git]
/
pv
/
prop
/
int.hpp
diff --git
a/pv/prop/int.hpp
b/pv/prop/int.hpp
index baf7dd7e1a8007fc7f7aafca7f5eaf4e2ab8df89..709e02e635eda56ee1f195cd4b9f76733c32b560 100644
(file)
--- a/
pv/prop/int.hpp
+++ b/
pv/prop/int.hpp
@@
-14,8
+14,7
@@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* 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_HPP
*/
#ifndef PULSEVIEW_PV_PROP_INT_HPP
@@
-27,6
+26,8
@@
#include "property.hpp"
#include "property.hpp"
+using std::pair;
+
class QSpinBox;
namespace pv {
class QSpinBox;
namespace pv {
@@
-37,8
+38,8
@@
class Int : public Property
Q_OBJECT;
public:
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() = default;
Getter getter, Setter setter);
virtual ~Int() = default;
@@
-52,13
+53,13
@@
private Q_SLOTS:
private:
const QString suffix_;
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_;
};
Glib::VariantBase value_;
QSpinBox *spin_box_;
};
-}
//
prop
-}
//
pv
+}
// namespace
prop
+}
// namespace
pv
#endif // PULSEVIEW_PV_PROP_INT_HPP
#endif // PULSEVIEW_PV_PROP_INT_HPP