[glibmm] Gio::FileMonitor: Change FileMonitorEvent to FileMonitor::Event.

[Murray Cumming <murrayc src gnome org>]

commit a2de68272625f4d7265c3aedcec5209ad948dfdb
Author: Murray Cumming <murrayc murrayc com>
Date:   Tue Apr 18 12:24:49 2017 +0200

    Gio::FileMonitor: Change FileMonitorEvent to FileMonitor::Event.

 gio/src/filemonitor.ccg |    2 ++
 gio/src/filemonitor.hg  |    5 +++--
 tools/m4/convert_gio.m4 |    4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/gio/src/filemonitor.ccg b/gio/src/filemonitor.ccg
index 3161de1..5bcc977 100644
--- a/gio/src/filemonitor.ccg
+++ b/gio/src/filemonitor.ccg
@@ -21,6 +21,8 @@
 #include <giomm/file.h>
 #include <gio/gio.h>
 
+using Event = Gio::FileMonitor::Event;
+
 namespace Gio
 {
 
diff --git a/gio/src/filemonitor.hg b/gio/src/filemonitor.hg
index d5663d4..6348ee9 100644
--- a/gio/src/filemonitor.hg
+++ b/gio/src/filemonitor.hg
@@ -27,7 +27,6 @@ _PINCLUDE(gio/gio.h)
 namespace Gio
 {
 
-_WRAP_ENUM(FileMonitorEvent, GFileMonitorEvent, NO_GTYPE)
 
 class File;
 
@@ -47,6 +46,8 @@ protected:
 
 public:
 
+  _WRAP_ENUM(Event, GFileMonitorEvent, NO_GTYPE)
+
   _WRAP_METHOD(bool cancel(), g_file_monitor_cancel)
   _WRAP_METHOD(bool is_cancelled() const, g_file_monitor_is_cancelled)
   _WRAP_METHOD(void set_rate_limit(int limit_msecs), g_file_monitor_set_rate_limit)
@@ -55,7 +56,7 @@ public:
   _IGNORE(g_file_monitor_emit_event)
 
 #m4 _CONVERSION(`GFile*',`const Glib::RefPtr<File>&',`Glib::wrap($3, true)')
-  _WRAP_SIGNAL(void changed(const Glib::RefPtr<File>& file, const Glib::RefPtr<File>& other_file, 
FileMonitorEvent event_type), "changed")
+  _WRAP_SIGNAL(void changed(const Glib::RefPtr<File>& file, const Glib::RefPtr<File>& other_file, Event 
event_type), "changed")
 
   //_WRAP_VFUNC(bool cancel(), cancel);
 
diff --git a/tools/m4/convert_gio.m4 b/tools/m4/convert_gio.m4
index 4a532a9..2d6fafb 100644
--- a/tools/m4/convert_gio.m4
+++ b/tools/m4/convert_gio.m4
@@ -52,8 +52,8 @@ _CONV_GIO_ENUM(FileAttributeStatus)
 _CONV_GIO_ENUM(FileAttributeType)
 _CONV_GIO_ENUM(FileCopyFlags)
 _CONV_GIO_ENUM(FileCreateFlags)
-_CONV_GIO_ENUM(FileMonitorEvent)
-_CONV_GIO_ENUM(FileMonitorFlags)
+_CONV_GIO_INCLASS_ENUM(FileMonitor,Event)
+_CONV_GIO_INCLASS_ENUM(FileMonitor,Flags)
 _CONV_GIO_ENUM(FileQueryInfoFlags)
 _CONV_GIO_ENUM(FileType)
 _CONV_GIO_ENUM(MountMountFlags)