X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fprop%2Fproperty.hpp;h=7e547dec5a43444a9a5751b39ea9178b1a12a29a;hb=870ea3dbf35b182e120c5d84ab89bf9cb7691232;hp=dd6d25bad37460d4e1fe9bac6992366a42933907;hpb=2acdb232d6bb452cfdfaea3ef5218fb4da592329;p=pulseview.git

diff --git a/pv/prop/property.hpp b/pv/prop/property.hpp
index dd6d25b..7e547de 100644
--- a/pv/prop/property.hpp
+++ b/pv/prop/property.hpp
@@ -14,19 +14,24 @@
  * 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_PROP_PROPERTY_H
-#define PULSEVIEW_PV_PROP_PROPERTY_H
+#ifndef PULSEVIEW_PV_PROP_PROPERTY_HPP
+#define PULSEVIEW_PV_PROP_PROPERTY_HPP
 
-#include <glibmm-2.4/glibmm.h>
+#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 <functional>
 #include <QString>
 #include <QWidget>
 
+using std::function;
+
 class QWidget;
 
 namespace pv {
@@ -37,8 +42,8 @@ class Property : public QObject
 	Q_OBJECT;
 
 public:
-	typedef std::function<Glib::VariantBase ()> Getter;
-	typedef std::function<void (Glib::VariantBase)> Setter;
+	typedef function<Glib::VariantBase ()> Getter;
+	typedef function<void (Glib::VariantBase)> Setter;
 
 protected:
 	Property(QString name, Getter getter, Setter setter);
@@ -60,7 +65,7 @@ private:
 	QString name_;
 };
 
-} // prop
-} // pv
+}  // namespace prop
+}  // namespace pv
 
-#endif // PULSEVIEW_PV_PROP_PROPERTY_H
+#endif // PULSEVIEW_PV_PROP_PROPERTY_HPP