X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fbinding%2Fdecoder.cpp;h=f2e2e1d579f46eabe7b67104de3a103a6647055a;hb=93cc1067d3b87a5f5dda6a5ee7dcf83d179c9b6b;hp=7d29e2fdad1b940b963251e190dfa589d77f6591;hpb=2ad82c2e40b6865481733913a2c32735602f63c4;p=pulseview.git
diff --git a/pv/binding/decoder.cpp b/pv/binding/decoder.cpp
index 7d29e2f..f2e2e1d 100644
--- a/pv/binding/decoder.cpp
+++ b/pv/binding/decoder.cpp
@@ -14,8 +14,7 @@
* 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 .
*/
#include
@@ -24,8 +23,8 @@
#include
-#include
#include
+#include
#include
#include
#include
@@ -73,16 +72,16 @@ Decoder::Decoder(
shared_ptr prop;
if (opt->values)
- prop = bind_enum(name, opt, get, set);
+ prop = bind_enum(name, "", opt, get, set);
else if (g_variant_is_of_type(opt->def, G_VARIANT_TYPE("d")))
- prop = shared_ptr(new Double(name, 2, "",
+ prop = shared_ptr(new Double(name, "", 2, "",
none, none, get, set));
else if (g_variant_is_of_type(opt->def, G_VARIANT_TYPE("x")))
prop = shared_ptr(
- new Int(name, "", none, get, set));
+ new Int(name, "", "", none, get, set));
else if (g_variant_is_of_type(opt->def, G_VARIANT_TYPE("s")))
prop = shared_ptr(
- new String(name, get, set));
+ new String(name, "", get, set));
else
continue;
@@ -91,7 +90,8 @@ Decoder::Decoder(
}
shared_ptr Decoder::bind_enum(
- const QString &name, const srd_decoder_option *option,
+ const QString &name, const QString &desc,
+ const srd_decoder_option *option,
Property::Getter getter, Property::Setter setter)
{
vector< pair > values;
@@ -100,7 +100,7 @@ shared_ptr Decoder::bind_enum(
values.push_back(make_pair(var, print_gvariant(var)));
}
- return shared_ptr(new Enum(name, values, getter, setter));
+ return shared_ptr(new Enum(name, desc, values, getter, setter));
}
Glib::VariantBase Decoder::getter(const char *id)
@@ -129,10 +129,7 @@ Glib::VariantBase Decoder::getter(const char *id)
}
}
- if (val)
- return Glib::VariantBase(val, true);
- else
- return Glib::VariantBase();
+ return (val) ? Glib::VariantBase(val, true) : Glib::VariantBase();
}
void Decoder::setter(const char *id, Glib::VariantBase value)
@@ -144,5 +141,5 @@ void Decoder::setter(const char *id, Glib::VariantBase value)
decoder_stack_->begin_decode();
}
-} // binding
-} // pv
+} // namespace binding
+} // namespace pv