projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SignalBase: Don't assume all channel settings are restorable
[pulseview.git]
/
pv
/
binding
/
binding.hpp
diff --git
a/pv/binding/binding.hpp
b/pv/binding/binding.hpp
index bd858bbf27626ee225f362e919d400fb13ab2404..e672ff176f24a5301026e519057b47b0db0b263f 100644
(file)
--- 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
* 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_HPP
#define PULSEVIEW_PV_BINDING_BINDING_HPP
*/
#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>
#include <glibmm.h>
+G_GNUC_END_IGNORE_DEPRECATIONS
-#include <vector>
#include <memory>
#include <memory>
+#include <vector>
#include <QString>
#include <QString>
+using std::shared_ptr;
+using std::vector;
+
class QFormLayout;
class QWidget;
class QFormLayout;
class QWidget;
@@
-42,7
+48,7
@@
namespace binding {
class Binding
{
public:
class Binding
{
public:
- const
std::vector< std::
shared_ptr<prop::Property> >& properties();
+ const
vector<
shared_ptr<prop::Property> >& properties();
void commit();
void commit();
@@
-55,10
+61,10
@@
public:
static QString print_gvariant(Glib::VariantBase gvar);
protected:
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_HPP
#endif // PULSEVIEW_PV_BINDING_BINDING_HPP