X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fbinding%2Fbinding.hpp;h=e672ff176f24a5301026e519057b47b0db0b263f;hp=ae0afb7dfe70eff19ed1c47c99f4b3d490187bae;hb=aca9aa834c742ba70f49d1ac3eb2d1e02e759416;hpb=61703a0124c7ace84caf415f7d491a3ad6f42599

diff --git a/pv/binding/binding.hpp b/pv/binding/binding.hpp
index ae0afb7d..e672ff17 100644
--- a/pv/binding/binding.hpp
+++ b/pv/binding/binding.hpp
@@ -14,20 +14,26 @@
  * 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_BINDING_H
-#define PULSEVIEW_PV_BINDING_BINDING_H
+#ifndef PULSEVIEW_PV_BINDING_BINDING_HPP
+#define PULSEVIEW_PV_BINDING_BINDING_HPP
 
+#include <glib.h>
+// Suppress warnings due to use of deprecated std::auto_ptr<> by glibmm.
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 #include <glibmm.h>
+G_GNUC_END_IGNORE_DEPRECATIONS
 
-#include <vector>
 #include <memory>
+#include <vector>
 
 #include <QString>
 
+using std::shared_ptr;
+using std::vector;
+
 class QFormLayout;
 class QWidget;
 
@@ -42,7 +48,7 @@ namespace binding {
 class Binding
 {
 public:
-	const std::vector< std::shared_ptr<prop::Property> >& properties();
+	const vector< shared_ptr<prop::Property> >& properties();
 
 	void commit();
 
@@ -55,10 +61,10 @@ public:
 	static QString print_gvariant(Glib::VariantBase gvar);
 
 protected:
-	std::vector< std::shared_ptr<prop::Property> > properties_;
+	vector< shared_ptr<prop::Property> > properties_;
 };
 
-} // binding
-} // pv
+}  // namespace binding
+}  // namespace pv
 
-#endif // PULSEVIEW_PV_BINDING_BINDING_H
+#endif // PULSEVIEW_PV_BINDING_BINDING_HPP