X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fbinding%2Finputoutput.hpp;h=acfb61cb6b401ceaaa4b839088cb0b36803b6387;hp=628b1c4fb92b002f31b043750cc0d4595c9f2162;hb=489953884c0d7692fa20748314751e114ae54cf2;hpb=0c9136370d062b08e47657e12f77518197d89339

diff --git a/pv/binding/inputoutput.hpp b/pv/binding/inputoutput.hpp
index 628b1c4f..acfb61cb 100644
--- a/pv/binding/inputoutput.hpp
+++ b/pv/binding/inputoutput.hpp
@@ -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/>.
  */
 
 #ifndef PULSEVIEW_PV_BINDING_INPUTOUTPUT_HPP
@@ -29,6 +28,11 @@
 
 #include <pv/prop/property.hpp>
 
+using std::map;
+using std::shared_ptr;
+using std::string;
+using std::vector;
+
 namespace sigrok {
 class Option;
 }
@@ -46,36 +50,35 @@ public:
 	 * Constructs a new @c InputOutput binding.
 	 * @param options the map of options to use as a template.
 	 */
-	InputOutput(
-		const std::map<std::string, std::shared_ptr<sigrok::Option>>
-			&options);
+	InputOutput(const map<string, shared_ptr<sigrok::Option>> &options);
 
 	/**
 	 * Gets the map of selected options.
 	 * @return the options.
 	 */
-	const std::map<std::string, Glib::VariantBase>& options() const;
+	const map<string, Glib::VariantBase>& options() const;
 
 private:
 	/**
 	 * A helper function to bind an option list to and enum property.
 	 * @param name the name of the property.
+	 * @param name the description of the property.
 	 * @param values the list of values.
 	 * @param getter the getter that will read the values out of the map.
 	 * @param setter the setter that will set the values into the map.
 	 */
-	std::shared_ptr<prop::Property> bind_enum(const QString &name,
-		const std::vector<Glib::VariantBase> &values,
+	shared_ptr<prop::Property> bind_enum(const QString &name,
+		const QString &desc, const vector<Glib::VariantBase> &values,
 		prop::Property::Getter getter, prop::Property::Setter setter);
 
 private:
 	/**
 	 * The current map of options.
 	 */
-	std::map<std::string, Glib::VariantBase> options_;
+	map<string, Glib::VariantBase> options_;
 };
 
-} // binding
-} // pv
+}  // namespace binding
+}  // namespace pv
 
 #endif // PULSEVIEW_PV_BINDING_INPUTOUTPUT_H