X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fbinding%2Fdevice.hpp;h=cd835f2993a4c246ed49b3e6a047eafd95f44eb1;hp=7dfe02465322b4c5a8c718724bf302922e52783d;hb=6f925ba9d6faf1077b73c5a5808259576081716a;hpb=ef2986c0f3e0ce3346a28d86348d8cc1746e9b66

diff --git a/pv/binding/device.hpp b/pv/binding/device.hpp
index 7dfe024..cd835f2 100644
--- a/pv/binding/device.hpp
+++ b/pv/binding/device.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_DEVICE_HPP
@@ -32,6 +31,11 @@
 
 #include <libsigrokcxx/libsigrokcxx.hpp>
 
+using std::function;
+using std::pair;
+using std::set;
+using std::shared_ptr;
+
 namespace pv {
 
 namespace binding {
@@ -41,7 +45,7 @@ class Device : public QObject, public Binding
 	Q_OBJECT
 
 public:
-	Device(std::shared_ptr<sigrok::Configurable> configurable);
+	Device(shared_ptr<sigrok::Configurable> configurable);
 
 Q_SIGNALS:
 	void config_changed();
@@ -50,19 +54,21 @@ private:
 	void bind_bool(const QString &name,
 		prop::Property::Getter getter, prop::Property::Setter setter);
 	void bind_enum(const QString &name,
-		const sigrok::ConfigKey *key, std::set<sigrok::Capability> capabilities,
+		const sigrok::ConfigKey *key,
+		set<const sigrok::Capability *> capabilities,
 		prop::Property::Getter getter, prop::Property::Setter setter,
-		std::function<QString (Glib::VariantBase)> printer = print_gvariant);
+		function<QString (Glib::VariantBase)> printer = print_gvariant);
 	void bind_int(const QString &name, QString suffix,
-		boost::optional< std::pair<int64_t, int64_t> > range,
+		boost::optional< pair<int64_t, int64_t> > range,
 		prop::Property::Getter getter, prop::Property::Setter setter);
 
 	static QString print_timebase(Glib::VariantBase gvar);
 	static QString print_vdiv(Glib::VariantBase gvar);
 	static QString print_voltage_threshold(Glib::VariantBase gvar);
+	static QString print_probe_factor(Glib::VariantBase gvar);
 
 protected:
-	std::shared_ptr<sigrok::Configurable> configurable_;
+	shared_ptr<sigrok::Configurable> configurable_;
 };
 
 } // binding