X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fbinding%2Finputoutput.cpp;h=4aa0c0eabd13aac1a99105340d2a7a28fec49af7;hp=956b12b32ff4d04de89c7e26f84352b689520930;hb=2601ce965fc455d23f5a964b84ddd74eb93705c4;hpb=5d2aa2c724cd7b6693c7956d4f1c7f0f856dcc27

diff --git a/pv/binding/inputoutput.cpp b/pv/binding/inputoutput.cpp
index 956b12b3..4aa0c0ea 100644
--- a/pv/binding/inputoutput.cpp
+++ b/pv/binding/inputoutput.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 <http://www.gnu.org/licenses/>.
  */
 
 #include <cassert>
@@ -36,7 +35,6 @@
 
 using boost::none;
 
-using std::make_pair;
 using std::map;
 using std::pair;
 using std::shared_ptr;
@@ -61,17 +59,17 @@ namespace binding {
 InputOutput::InputOutput(
 	const map<string, shared_ptr<Option>> &options)
 {
-	for (pair<string, shared_ptr<Option>> o : options)
-	{
+	for (pair<string, shared_ptr<Option>> o : options) {
 		const shared_ptr<Option> &opt = o.second;
 		assert(opt);
 
 		const QString name = QString::fromStdString(opt->name());
+		const QString desc = QString::fromStdString(opt->description());
 		const VariantBase def_val = opt->default_value();
 		const vector<VariantBase> values = opt->values();
 
 		options_[opt->id()] = def_val;
- 
+
 		const Property::Getter get = [&, opt]() {
 			return options_[opt->id()]; };
 		const Property::Setter set = [&, opt](VariantBase value) {
@@ -80,20 +78,20 @@ InputOutput::InputOutput(
 		shared_ptr<Property> prop;
 
 		if (!opt->values().empty())
-			prop = bind_enum(name, values, get, set);
+			prop = bind_enum(name, desc, values, get, set);
 		else if (def_val.is_of_type(VariantType("b")))
-			prop = shared_ptr<Property>(new Bool(name, get, set));
+			prop = shared_ptr<Property>(new Bool(name, desc, get, set));
 		else if (def_val.is_of_type(VariantType("d")))
-			prop = shared_ptr<Property>(new Double(name, 2, "",
-				nullptr, nullptr, get, set));
+			prop = shared_ptr<Property>(new Double(name, desc, 2, "",
+				none, none, get, set));
 		else if (def_val.is_of_type(VariantType("i")) ||
 			def_val.is_of_type(VariantType("t")) ||
 			def_val.is_of_type(VariantType("u")))
 			prop = shared_ptr<Property>(
-				new Int(name, "", none, get, set));
+				new Int(name, desc, "", none, get, set));
 		else if (def_val.is_of_type(VariantType("s")))
 			prop = shared_ptr<Property>(
-				new String(name, get, set));
+				new String(name, desc, get, set));
 		else
 			continue;
 
@@ -107,13 +105,13 @@ const map<string, VariantBase>& InputOutput::options() const
 }
 
 shared_ptr<Property> InputOutput::bind_enum(
-	const QString &name, const vector<VariantBase> &values,
+	const QString &name, const QString &desc, const vector<VariantBase> &values,
 	Property::Getter getter, Property::Setter setter)
 {
 	vector< pair<VariantBase, QString> > enum_vals;
 	for (VariantBase var : values)
-		enum_vals.push_back(make_pair(var, print_gvariant(var)));
-	return shared_ptr<Property>(new Enum(name, enum_vals, getter, setter));
+		enum_vals.emplace_back(var, print_gvariant(var));
+	return shared_ptr<Property>(new Enum(name, desc, enum_vals, getter, setter));
 }
 
 } // namespace binding