X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=inline;f=pv%2Fprop%2Fproperty.hpp;h=765cbb50d8bb7e629a6ee1164507ccd9cd9b1ae3;hb=aca9aa834c742ba70f49d1ac3eb2d1e02e759416;hp=dd6d25bad37460d4e1fe9bac6992366a42933907;hpb=2acdb232d6bb452cfdfaea3ef5218fb4da592329;p=pulseview.git
diff --git a/pv/prop/property.hpp b/pv/prop/property.hpp
index dd6d25b..765cbb5 100644
--- a/pv/prop/property.hpp
+++ b/pv/prop/property.hpp
@@ -14,19 +14,25 @@
* 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_PROP_PROPERTY_H
-#define PULSEVIEW_PV_PROP_PROPERTY_H
+#ifndef PULSEVIEW_PV_PROP_PROPERTY_HPP
+#define PULSEVIEW_PV_PROP_PROPERTY_HPP
-#include
+#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
+using std::function;
+
class QWidget;
namespace pv {
@@ -37,8 +43,8 @@ class Property : public QObject
Q_OBJECT;
public:
- typedef std::function Getter;
- typedef std::function Setter;
+ typedef function Getter;
+ typedef function Setter;
protected:
Property(QString name, Getter getter, Setter setter);
@@ -60,7 +66,7 @@ private:
QString name_;
};
-} // prop
-} // pv
+} // namespace prop
+} // namespace pv
-#endif // PULSEVIEW_PV_PROP_PROPERTY_H
+#endif // PULSEVIEW_PV_PROP_PROPERTY_HPP