[libgdamm] MetaStruct: Change MetaStructFeature to Feature.

[Murray Cumming <murrayc src gnome org>]

commit 4acf05d77686d4455f40c0620ce680bf83bbacff
Author: Murray Cumming <murrayc murrayc com>
Date:   Wed Apr 26 22:28:13 2017 +0200

    MetaStruct: Change MetaStructFeature to Feature.

 libgda/src/metastruct.hg     |   10 ++++++----
 tools/m4/convert_libgdamm.m4 |    2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/libgda/src/metastruct.hg b/libgda/src/metastruct.hg
index adaf502..29f7a22 100644
--- a/libgda/src/metastruct.hg
+++ b/libgda/src/metastruct.hg
@@ -37,7 +37,6 @@ namespace Gda
  */
 _WRAP_GERROR(MetaStructError, GdaMetaStructError, GDA_META_STRUCT_ERROR, NO_GTYPE)
 
-_WRAP_ENUM(MetaStructFeature, GdaMetaStructFeature, NO_GTYPE)
 _WRAP_ENUM(MetaDbObjectType, GdaMetaDbObjectType, NO_GTYPE)
 _WRAP_ENUM(MetaSortType, GdaMetaSortType, NO_GTYPE)
 _WRAP_ENUM(MetaGraphInfo, GdaMetaGraphInfo, NO_GTYPE) 
@@ -67,12 +66,15 @@ class MetaStore;
 class MetaStruct : public Glib::Object
 {
   _CLASS_GOBJECT(MetaStruct, GdaMetaStruct, GDA_META_STRUCT, Glib::Object, GObject)
+public:
+  _WRAP_ENUM(Feature, GdaMetaStructFeature, NO_GTYPE)
+
 protected:
-  _WRAP_CTOR(MetaStruct(const Glib::RefPtr<MetaStore>& meta_store, MetaStructFeature features), 
gda_meta_struct_new)
+  _WRAP_CTOR(MetaStruct(const Glib::RefPtr<MetaStore>& meta_store, Feature features), gda_meta_struct_new)
 
 public:
-  _WRAP_CREATE(const Glib::RefPtr<MetaStore>& store, MetaStructFeature features = MetaStructFeature::ALL)
-  
+  _WRAP_CREATE(const Glib::RefPtr<MetaStore>& store, Feature features = Feature::ALL)
+
   //TODO: Wrap GdaMetaDbObject?
   _WRAP_METHOD(GdaMetaDbObject* complement(MetaDbObjectType type, const Value& catalog, const Value& schema, 
const Value& name), gda_meta_struct_complement, errthrow)
   _WRAP_METHOD(bool complement_schema(const Value& catalog, const Value& schema), 
gda_meta_struct_complement_schema, errthrow)
diff --git a/tools/m4/convert_libgdamm.m4 b/tools/m4/convert_libgdamm.m4
index 503f5b7..34d4b1b 100644
--- a/tools/m4/convert_libgdamm.m4
+++ b/tools/m4/convert_libgdamm.m4
@@ -133,7 +133,7 @@ _CONV_ENUM(Gda,StatementModelUsage)
 _CONV_GNOME_GDA_INCLASS_ENUM(SqlStatement,Type)
 _CONV_ENUM(Gda,StatementSqlFlag)
 _CONV_ENUM(Gda,SqlParserMode)
-_CONV_ENUM(Gda,MetaStructFeature)
+_CONV_GNOME_GDA_INCLASS_ENUM(MetaStruct,Feature)
 _CONV_ENUM(Gda,MetaDbObjectType)
 _CONV_ENUM(Gda,MetaSortType)
 _CONV_ENUM(Gda,MetaGraphInfo)