X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fbinding%2Fbinding.hpp;h=e672ff176f24a5301026e519057b47b0db0b263f;hp=bd858bbf27626ee225f362e919d400fb13ab2404;hb=aca9aa834c742ba70f49d1ac3eb2d1e02e759416;hpb=7a01bd3654ed046216308fa64edfd79be7cd525f diff --git a/pv/binding/binding.hpp b/pv/binding/binding.hpp index bd858bbf..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 . */ #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_HPP