X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fbinding%2Fdevice.hpp;h=4c4d6f44dcf5ab8d3d678d7f78229b0e9b9ee5c4;hb=870ea3dbf35b182e120c5d84ab89bf9cb7691232;hp=9d879ee58186680a01301e59c1f6e406e8d627cf;hpb=49c62417b6b306607048b07f86b73f127e3084a3;p=pulseview.git

diff --git a/pv/binding/device.hpp b/pv/binding/device.hpp
index 9d879ee..4c4d6f4 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();
@@ -51,11 +55,11 @@ private:
 		prop::Property::Getter getter, prop::Property::Setter setter);
 	void bind_enum(const QString &name,
 		const sigrok::ConfigKey *key,
-		std::set<const sigrok::Capability *> capabilities,
+		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);
@@ -64,10 +68,10 @@ private:
 	static QString print_probe_factor(Glib::VariantBase gvar);
 
 protected:
-	std::shared_ptr<sigrok::Configurable> configurable_;
+	shared_ptr<sigrok::Configurable> configurable_;
 };
 
-} // binding
-} // pv
+}  // namespace binding
+}  // namespace pv
 
 #endif // PULSEVIEW_PV_BINDING_DEVICE_HPP