X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fbinding%2Fdevice.hpp;h=81c505986c85ac27662dfa7443b13ff5bcceff5f;hp=2a4c51634ed2ae734bc5b81a245054552822cde6;hb=efdec55aec1a137460fa362a381ed1904182bfed;hpb=3cc9ad7b867853315473df611612c562d562ed8a

diff --git a/pv/binding/device.hpp b/pv/binding/device.hpp
index 2a4c516..81c5059 100644
--- a/pv/binding/device.hpp
+++ b/pv/binding/device.hpp
@@ -14,12 +14,11 @@
  * 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_H
-#define PULSEVIEW_PV_BINDING_DEVICE_H
+#ifndef PULSEVIEW_PV_BINDING_DEVICE_HPP
+#define PULSEVIEW_PV_BINDING_DEVICE_HPP
 
 #include <boost/optional.hpp>
 
@@ -30,9 +29,7 @@
 
 #include <pv/prop/property.hpp>
 
-namespace sigrok {
-	class Configurable;
-}
+#include <libsigrokcxx/libsigrokcxx.hpp>
 
 namespace pv {
 
@@ -51,7 +48,9 @@ Q_SIGNALS:
 private:
 	void bind_bool(const QString &name,
 		prop::Property::Getter getter, prop::Property::Setter setter);
-	void bind_enum(const QString &name, Glib::VariantContainerBase gvar_list,
+	void bind_enum(const QString &name,
+		const sigrok::ConfigKey *key,
+		std::set<const sigrok::Capability *> capabilities,
 		prop::Property::Getter getter, prop::Property::Setter setter,
 		std::function<QString (Glib::VariantBase)> printer = print_gvariant);
 	void bind_int(const QString &name, QString suffix,
@@ -61,6 +60,7 @@ private:
 	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_;
@@ -69,4 +69,4 @@ protected:
 } // binding
 } // pv
 
-#endif // PULSEVIEW_PV_BINDING_DEVICE_H
+#endif // PULSEVIEW_PV_BINDING_DEVICE_HPP