projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Session: Clean up header a little
[pulseview.git]
/
pv
/
prop
/
double.cpp
diff --git
a/pv/prop/double.cpp
b/pv/prop/double.cpp
index d8a7a2920c5b1f0644ea5d8f33606aebf7286b7a..e1539a127d63dccd9830673a21d66bd07e343f69 100644
(file)
--- a/
pv/prop/double.cpp
+++ b/
pv/prop/double.cpp
@@
-14,15
+14,14
@@
* 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/>.
*/
*/
-#include <
assert.h
>
+#include <
cassert
>
#include <QDoubleSpinBox>
#include <QDoubleSpinBox>
-#include "double.h"
+#include "double.h
pp
"
using boost::optional;
using std::pair;
using boost::optional;
using std::pair;
@@
-31,22
+30,19
@@
namespace pv {
namespace prop {
Double::Double(QString name,
namespace prop {
Double::Double(QString name,
+ QString desc,
int decimals,
QString suffix,
optional< pair<double, double> > range,
optional<double> step,
Getter getter,
Setter setter) :
int decimals,
QString suffix,
optional< pair<double, double> > range,
optional<double> step,
Getter getter,
Setter setter) :
- Property(name, getter, setter),
+ Property(name,
desc,
getter, setter),
decimals_(decimals),
suffix_(suffix),
range_(range),
step_(step),
decimals_(decimals),
suffix_(suffix),
range_(range),
step_(step),
- spin_box_(NULL)
-{
-}
-
-Double::~Double()
+ spin_box_(nullptr)
{
}
{
}
@@
-56,11
+52,11
@@
QWidget* Double::get_widget(QWidget *parent, bool auto_commit)
return spin_box_;
if (!getter_)
return spin_box_;
if (!getter_)
- return
NULL
;
+ return
nullptr
;
Glib::VariantBase variant = getter_();
if (!variant.gobj())
Glib::VariantBase variant = getter_();
if (!variant.gobj())
- return
NULL
;
+ return
nullptr
;
double value = Glib::VariantBase::cast_dynamic<Glib::Variant<double>>(
variant).get();
double value = Glib::VariantBase::cast_dynamic<Glib::Variant<double>>(
variant).get();
@@
-97,5
+93,5
@@
void Double::on_value_changed(double)
commit();
}
commit();
}
-}
//
prop
-}
//
pv
+}
// namespace
prop
+}
// namespace
pv