X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fbinding%2Fbinding.hpp;h=e672ff176f24a5301026e519057b47b0db0b263f;hb=7671200bd71de8cdd922b41b025ea18de6422345;hp=ae0afb7dfe70eff19ed1c47c99f4b3d490187bae;hpb=61703a0124c7ace84caf415f7d491a3ad6f42599;p=pulseview.git
diff --git a/pv/binding/binding.hpp b/pv/binding/binding.hpp
index ae0afb7..e672ff1 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 .
*/
-#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
+// Suppress warnings due to use of deprecated std::auto_ptr<> by glibmm.
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
#include
+G_GNUC_END_IGNORE_DEPRECATIONS
-#include
#include
+#include
#include
+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 >& properties();
+ const vector< shared_ptr >& properties();
void commit();
@@ -55,10 +61,10 @@ public:
static QString print_gvariant(Glib::VariantBase gvar);
protected:
- std::vector< std::shared_ptr > properties_;
+ vector< shared_ptr > properties_;
};
-} // binding
-} // pv
+} // namespace binding
+} // namespace pv
-#endif // PULSEVIEW_PV_BINDING_BINDING_H
+#endif // PULSEVIEW_PV_BINDING_BINDING_HPP