AnalogSignal: Make threshold neutral area darker

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

diff --git a/pv/prop/int.cpp b/pv/prop/int.cpp
index 812b751608f3c561dd4ad8d45af4dc1e79008869..2930a3ea1e8c96b5d0091e6c2b640050ecb5d09f 100644 (file)
--- a/pv/prop/int.cpp
+++ b/pv/prop/int.cpp
@@ -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/>.
  */
 
-#include <stdint.h>
-#include <assert.h>
+#include <cassert>
+#include <cstdint>
 
 #include <QSpinBox>
 
@@ -34,21 +33,18 @@ namespace pv {
 namespace prop {
 
 Int::Int(QString name,
+       QString desc,
        QString suffix,
        optional< pair<int64_t, int64_t> > range,
        Getter getter,
        Setter setter) :
-       Property(name, getter, setter),
+       Property(name, desc, getter, setter),
        suffix_(suffix),
        range_(range),
        spin_box_(nullptr)
 {
 }
 
-Int::~Int()
-{
-}
-
 QWidget* Int::get_widget(QWidget *parent, bool auto_commit)
 {
        int64_t int_val = 0, range_min = 0;
@@ -72,48 +68,33 @@ QWidget* Int::get_widget(QWidget *parent, bool auto_commit)
        const GVariantType *const type = g_variant_get_type(value);
        assert(type);
 
-       if (g_variant_type_equal(type, G_VARIANT_TYPE_BYTE))
-       {
+       if (g_variant_type_equal(type, G_VARIANT_TYPE_BYTE)) {
                int_val = g_variant_get_byte(value);
                range_min = 0, range_max = UINT8_MAX;
-       }
-       else if (g_variant_type_equal(type, G_VARIANT_TYPE_INT16))
-       {
+       } else if (g_variant_type_equal(type, G_VARIANT_TYPE_INT16)) {
                int_val = g_variant_get_int16(value);
                range_min = INT16_MIN, range_max = INT16_MAX;
-       }
-       else if (g_variant_type_equal(type, G_VARIANT_TYPE_UINT16))
-       {
+       } else if (g_variant_type_equal(type, G_VARIANT_TYPE_UINT16)) {
                int_val = g_variant_get_uint16(value);
                range_min = 0, range_max = UINT16_MAX;
-       }
-       else if (g_variant_type_equal(type, G_VARIANT_TYPE_INT32))
-       {
+       } else if (g_variant_type_equal(type, G_VARIANT_TYPE_INT32)) {
                int_val = g_variant_get_int32(value);
                range_min = INT32_MIN, range_max = INT32_MAX;
-       }
-       else if (g_variant_type_equal(type, G_VARIANT_TYPE_UINT32))
-       {
+       } else if (g_variant_type_equal(type, G_VARIANT_TYPE_UINT32)) {
                int_val = g_variant_get_uint32(value);
                range_min = 0, range_max = UINT32_MAX;
-       }
-       else if (g_variant_type_equal(type, G_VARIANT_TYPE_INT64))
-       {
+       } else if (g_variant_type_equal(type, G_VARIANT_TYPE_INT64)) {
                int_val = g_variant_get_int64(value);
                range_min = INT64_MIN, range_max = INT64_MAX;
-       }
-       else if (g_variant_type_equal(type, G_VARIANT_TYPE_UINT64))
-       {
+       } else if (g_variant_type_equal(type, G_VARIANT_TYPE_UINT64)) {
                int_val = g_variant_get_uint64(value);
                range_min = 0, range_max = UINT64_MAX;
-       }
-       else
-       {
+       } else {
                // Unexpected value type.
-               assert(0);
+               assert(false);
        }
 
-       // @todo Sigrok supports 64-bit quantities, but Qt does not have a
+       // @todo sigrok supports 64-bit quantities, but Qt does not have a
        // standard widget to allow the values to be modified over the full
        // 64-bit range on 32-bit machines. To solve the issue we need a
        // custom widget.
@@ -160,10 +141,9 @@ void Int::commit()
                new_value = g_variant_new_int64(spin_box_->value());
        else if (g_variant_type_equal(type, G_VARIANT_TYPE_UINT64))
                new_value = g_variant_new_uint64(spin_box_->value());
-       else
-       {
+       else {
                // Unexpected value type.
-               assert(0);
+               assert(false);
        }
 
        assert(new_value);
@@ -178,5 +158,5 @@ void Int::on_value_changed(int)
        commit();
 }
 
-} // prop
-} // pv
+}  // namespace prop
+}  // namespace pv