Replaced using namespace with using class directives

[pulseview.git] / pv / prop / binding / deviceoptions.cpp

diff --git a/pv/prop/binding/deviceoptions.cpp b/pv/prop/binding/deviceoptions.cpp
index 3fe63940cc2efe6508313647893af740353f9faf..35541fbf8b8cca292560608c1ac9822c77fc385f 100644 (file)
--- a/pv/prop/binding/deviceoptions.cpp
+++ b/pv/prop/binding/deviceoptions.cpp
@@ -32,8 +32,14 @@
 #include <pv/prop/enum.h>
 #include <pv/prop/int.h>
 
-using namespace boost;
-using namespace std;
+using boost::bind;
+using boost::function;
+using boost::optional;
+using boost::shared_ptr;
+using std::make_pair;
+using std::pair;
+using std::string;
+using std::vector;
 
 namespace pv {
 namespace prop {
@@ -66,12 +72,13 @@ DeviceOptions::DeviceOptions(struct sr_dev_inst *sdi) :
                if (sr_config_list(_sdi->driver, _sdi, NULL, key, &gvar_list) != SR_OK)
                        gvar_list = NULL;
 
-               const QString name(info->name);
+               const QString name = QString::fromUtf8(info->name);
 
                switch(key)
                {
                case SR_CONF_SAMPLERATE:
-                       bind_samplerate(name, gvar_list);
+                       // Sample rate values are not bound because they are shown
+                       // in the SamplingBar
                        break;
 
                case SR_CONF_CAPTURE_RATIO:
@@ -168,97 +175,29 @@ QString DeviceOptions::print_gvariant(GVariant *const gvar)
        QString s;
 
        if (g_variant_is_of_type(gvar, G_VARIANT_TYPE("s")))
-               s = QString(g_variant_get_string(gvar, NULL));
+               s = QString::fromUtf8(g_variant_get_string(gvar, NULL));
        else
        {
                gchar *const text = g_variant_print(gvar, FALSE);
-               s = QString(text);
+               s = QString::fromUtf8(text);
                g_free(text);
        }
 
        return s;
 }
 
-void DeviceOptions::bind_samplerate(const QString &name,
-       GVariant *const gvar_list)
-{
-       GVariant *gvar_list_samplerates;
-
-       assert(gvar_list);
-
-       if ((gvar_list_samplerates = g_variant_lookup_value(gvar_list,
-                       "samplerate-steps", G_VARIANT_TYPE("at"))))
-       {
-               gsize num_elements;
-               const uint64_t *const elements =
-                       (const uint64_t *)g_variant_get_fixed_array(
-                               gvar_list_samplerates, &num_elements, sizeof(uint64_t));
-
-               assert(num_elements == 3);
-
-               _properties.push_back(shared_ptr<Property>(
-                       new Double(name, 0, QObject::tr("Hz"),
-                               make_pair((double)elements[0], (double)elements[1]),
-                                               (double)elements[2],
-                               bind(samplerate_double_getter, _sdi),
-                               bind(samplerate_double_setter, _sdi, _1))));
-
-               g_variant_unref(gvar_list_samplerates);
-       }
-       else if ((gvar_list_samplerates = g_variant_lookup_value(gvar_list,
-                       "samplerates", G_VARIANT_TYPE("at"))))
-       {
-               bind_enum(name, SR_CONF_SAMPLERATE,
-                       gvar_list_samplerates, print_samplerate);
-               g_variant_unref(gvar_list_samplerates);
-       }
-}
-
-QString DeviceOptions::print_samplerate(GVariant *const gvar)
-{
-       char *const s = sr_samplerate_string(
-               g_variant_get_uint64(gvar));
-       const QString qstring(s);
-       g_free(s);
-       return qstring;
-}
-
-GVariant* DeviceOptions::samplerate_double_getter(
-       const struct sr_dev_inst *sdi)
-{
-       GVariant *const gvar = config_getter(sdi, SR_CONF_SAMPLERATE);
-
-       if(!gvar)
-               return NULL;
-
-       GVariant *const gvar_double = g_variant_new_double(
-               g_variant_get_uint64(gvar));
-
-       g_variant_unref(gvar);
-
-       return gvar_double;
-}
-
-void DeviceOptions::samplerate_double_setter(
-       struct sr_dev_inst *sdi, GVariant *value)
-{
-       GVariant *const gvar = g_variant_new_uint64(
-               g_variant_get_double(value));
-       config_setter(sdi, SR_CONF_SAMPLERATE, gvar);
-}
-
 QString DeviceOptions::print_timebase(GVariant *const gvar)
 {
        uint64_t p, q;
        g_variant_get(gvar, "(tt)", &p, &q);
-       return QString(sr_period_string(p * q));
+       return QString::fromUtf8(sr_period_string(p * q));
 }
 
 QString DeviceOptions::print_vdiv(GVariant *const gvar)
 {
        uint64_t p, q;
        g_variant_get(gvar, "(tt)", &p, &q);
-       return QString(sr_voltage_string(p, q));
+       return QString::fromUtf8(sr_voltage_string(p, q));
 }
 
 QString DeviceOptions::print_voltage_threshold(GVariant *const gvar)
@@ -267,7 +206,7 @@ QString DeviceOptions::print_voltage_threshold(GVariant *const gvar)
        char buf[64];
        g_variant_get(gvar, "(dd)", &lo, &hi);
        snprintf(buf, sizeof(buf), "L<%.1fV H>%.1fV", lo, hi);
-       return QString(buf);
+       return QString::fromUtf8(buf);
 }
 
 } // binding