[glibmm] Gio::Settings: Change SettingsBindFlags to Settings::BindFlags.

[Murray Cumming <murrayc src gnome org>]

commit b0726d262565f7a0152da1c10f06a9b093db9128
Author: Murray Cumming <murrayc murrayc com>
Date:   Tue Apr 18 18:24:17 2017 +0200

    Gio::Settings: Change SettingsBindFlags to Settings::BindFlags.

 gio/src/settings.ccg    |    2 +-
 gio/src/settings.hg     |    9 +++++----
 tools/m4/convert_gio.m4 |    2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/gio/src/settings.ccg b/gio/src/settings.ccg
index d1fca86..183dcf8 100644
--- a/gio/src/settings.ccg
+++ b/gio/src/settings.ccg
@@ -55,7 +55,7 @@ Settings::get_default_value(const Glib::ustring& key, Glib::VariantBase& value)
 }
 void
 Settings::bind(
-  const Glib::ustring& key, const Glib::PropertyProxy_Base& property_proxy, SettingsBindFlags flags)
+  const Glib::ustring& key, const Glib::PropertyProxy_Base& property_proxy, BindFlags flags)
 {
   bind(key, property_proxy.get_object(), property_proxy.get_name(), flags);
 }
diff --git a/gio/src/settings.hg b/gio/src/settings.hg
index e47088b..a55a694 100644
--- a/gio/src/settings.hg
+++ b/gio/src/settings.hg
@@ -28,8 +28,6 @@ namespace Gio
 {
 class SettingsSchema;
 
-  _WRAP_ENUM(SettingsBindFlags, GSettingsBindFlags)
-
 /** A high-level API for application settings
  *
  * The Settings class provides a convenient API for storing and retrieving
@@ -41,6 +39,9 @@ class Settings : public Glib::Object
 {
   _CLASS_GOBJECT(Settings, GSettings, G_SETTINGS, Glib::Object, GObject)
 
+public:
+  _WRAP_ENUM(BindFlags, GSettingsBindFlags)
+
 protected:
   _WRAP_CTOR(Settings(const Glib::ustring& schema_id), g_settings_new)
   _WRAP_CTOR(Settings(const Glib::ustring& schema_id, const Glib::ustring& path), g_settings_new_with_path)
@@ -181,8 +182,8 @@ public:
   _IGNORE(g_settings_range_check)
 
 #m4 _CONVERSION(`Glib::ObjectBase*',`gpointer',(gpointer)$3->gobj())
-  _WRAP_METHOD(void bind(const Glib::ustring& key, Glib::ObjectBase* object, const Glib::ustring& property, 
SettingsBindFlags flags = SettingsBindFlags::DEFAULT), g_settings_bind)
-  void bind(const Glib::ustring& key, const Glib::PropertyProxy_Base& property_proxy, SettingsBindFlags 
flags = SettingsBindFlags::DEFAULT);
+  _WRAP_METHOD(void bind(const Glib::ustring& key, Glib::ObjectBase* object, const Glib::ustring& property, 
BindFlags flags = BindFlags::DEFAULT), g_settings_bind)
+  void bind(const Glib::ustring& key, const Glib::PropertyProxy_Base& property_proxy, BindFlags flags = 
BindFlags::DEFAULT);
   // TODO: implement bind_with_mapping
   _WRAP_METHOD(void bind_writable(const Glib::ustring& key, Glib::ObjectBase* object, const Glib::ustring& 
property, bool inverted=false), g_settings_bind_writable)
   void bind_writable(const Glib::ustring& key, const Glib::PropertyProxy_Base& property_proxy, bool 
inverted=false);
diff --git a/tools/m4/convert_gio.m4 b/tools/m4/convert_gio.m4
index 88a7f29..1224cc3 100644
--- a/tools/m4/convert_gio.m4
+++ b/tools/m4/convert_gio.m4
@@ -65,7 +65,7 @@ _CONV_GIO_ENUM(PasswordSave)
 _CONV_GIO_INCLASS_ENUM(Resolver,RecordType)
 _CONV_GIO_ENUM(ResourceFlags)
 _CONV_GIO_ENUM(ResourceLookupFlags)
-_CONV_GIO_ENUM(SettingsBindFlags)
+_CONV_GIO_INCLASS_ENUM(Settings,BindFlags)
 _CONV_GIO_ENUM(SocketClientEvent)
 _CONV_GIO_ENUM(SocketFamily)
 _CONV_GIO_INCLASS_ENUM(Socket,MsgFlags)