[libgdamm] DataModel: Move enums into class.

[Murray Cumming <murrayc src gnome org>]

commit 15451414a8751f188497e7fc8352306ea2580cfd
Author: Murray Cumming <murrayc murrayc com>
Date:   Wed Apr 26 22:47:37 2017 +0200

    DataModel: Move enums into class.

 libgda/src/datamodel.ccg     |    6 ++++--
 libgda/src/datamodel.hg      |   16 ++++++++--------
 tools/m4/convert_libgdamm.m4 |    6 +++---
 3 files changed, 15 insertions(+), 13 deletions(-)
---
diff --git a/libgda/src/datamodel.ccg b/libgda/src/datamodel.ccg
index 146f768..218e61e 100644
--- a/libgda/src/datamodel.ccg
+++ b/libgda/src/datamodel.ccg
@@ -28,6 +28,8 @@
 #include <libgda/gda-enum-types.h>
 
 
+using AccessFlags = Gnome::Gda::DataModel::AccessFlags;
+
 namespace Gnome
 {
 
@@ -35,7 +37,7 @@ namespace Gda
 {
 
 
-bool DataModel::export_to_file(DataModelIOFormat format, const std::string& file, const std::vector<int>& 
cols, const std::vector<int>& rows, const Glib::RefPtr<Set>& options)
+bool DataModel::export_to_file(IOFormat format, const std::string& file, const std::vector<int>& cols, const 
std::vector<int>& rows, const Glib::RefPtr<Set>& options)
 {
   GError* gerror = 0;
   bool retvalue = gda_data_model_export_to_file(gobj(), static_cast<GdaDataModelIOFormat>(format), 
file.c_str(), cols.data(), cols.size(), rows.data(), rows.size(), options->gobj(), &gerror);
@@ -46,7 +48,7 @@ bool DataModel::export_to_file(DataModelIOFormat format, const std::string& file
   return retvalue;
 }
 
-Glib::ustring DataModel::export_to_string(DataModelIOFormat format, const std::vector<int>& cols, const 
std::vector<int>& rows, const Glib::RefPtr<Set>& options)
+Glib::ustring DataModel::export_to_string(IOFormat format, const std::vector<int>& cols, const 
std::vector<int>& rows, const Glib::RefPtr<Set>& options)
 {
   gchar* retvalue = gda_data_model_export_to_string(gobj(), static_cast<GdaDataModelIOFormat>(format), 
cols.data(), cols.size(), rows.data(), rows.size(), options->gobj());
   Glib::ustring cppretvalue(retvalue);
diff --git a/libgda/src/datamodel.hg b/libgda/src/datamodel.hg
index 099188d..2e5b093 100644
--- a/libgda/src/datamodel.hg
+++ b/libgda/src/datamodel.hg
@@ -42,10 +42,6 @@ class ServerProvider;
  */
 _WRAP_GERROR(DataModelError, GdaDataModelError, GDA_DATA_MODEL_ERROR, NO_GTYPE)
 
-_WRAP_ENUM(DataModelAccessFlags, GdaDataModelAccessFlags, NO_GTYPE)
-_WRAP_ENUM(DataModelHint, GdaDataModelHint, NO_GTYPE)
-_WRAP_ENUM(DataModelIOFormat, GdaDataModelIOFormat, NO_GTYPE)
-
 typedef GdaValueAttribute ValueAttribute;
 
 /** @defgroup DataModels Data Models
@@ -86,6 +82,10 @@ public:
   // This does not belong into this class
   _IGNORE(gda_data_model_create_iter, gda_data_model_array_copy_model)
 
+  _WRAP_ENUM(AccessFlags, GdaDataModelAccessFlags, NO_GTYPE)
+  _WRAP_ENUM(Hint, GdaDataModelHint, NO_GTYPE)
+  _WRAP_ENUM(IOFormat, GdaDataModelIOFormat, NO_GTYPE)
+
   _WRAP_METHOD(void freeze(), gda_data_model_freeze)
   _WRAP_METHOD(void thaw(), gda_data_model_thaw)
 
@@ -116,7 +116,7 @@ public:
   #m4 _CONVERSION(`const std::vector<Value>&',`GList*',`Glib::ListHandler<Value, 
ValueTraits>::vector_to_list($3).data()')
   _WRAP_METHOD(bool set_values(int row, const std::vector<Value>& values), gda_data_model_set_values, 
errthrow)
 
-  _WRAP_METHOD(DataModelAccessFlags get_access_flags() const, gda_data_model_get_access_flags)
+  _WRAP_METHOD(AccessFlags get_access_flags() const, gda_data_model_get_access_flags)
 
   #m4 _CONVERSION(`const std::vector<Value>&',`const GList*',`Glib::ListHandler<Value, 
ValueTraits>::vector_to_list($3).data()')
   _WRAP_METHOD(int append_values(const std::vector<Value>& values), gda_data_model_append_values, errthrow)
@@ -130,7 +130,7 @@ public:
   #m4 _CONVERSION(`const ValueVector&', `GSList*', `Glib::SListHandler<Value, 
ValueTraits>::vector_to_slist($3).data()')
   _WRAP_METHOD(int get_row_from_values(const ValueVector& values, const std::vector<int>& cols_index), 
gda_data_model_get_row_from_values)
 
-  _WRAP_METHOD(void send_hint(DataModelHint hint, const Value& hint_value), gda_data_model_send_hint)
+  _WRAP_METHOD(void send_hint(Hint hint, const Value& hint_value), gda_data_model_send_hint)
 
 
   /** Exports data contained in @a model to the a string; the format is specified using the @a format 
argument.
@@ -146,7 +146,7 @@ public:
    * @param options List of options for the export.
    * @result The string.
    */
-  Glib::ustring export_to_string(DataModelIOFormat format, const std::vector<int>& cols, const 
std::vector<int>& rows, const Glib::RefPtr<Set>& options);
+  Glib::ustring export_to_string(IOFormat format, const std::vector<int>& cols, const std::vector<int>& 
rows, const Glib::RefPtr<Set>& options);
   _IGNORE(gda_data_model_export_to_string)
 
   /** Exports data contained in @a model to the @a file; the format is specified using the @a format 
argument.
@@ -163,7 +163,7 @@ public:
    * @param options List of options for the export.
    * @result true if no error occurred.
    */
-  bool export_to_file(DataModelIOFormat format, const std::string& file, const std::vector<int>& cols, const 
std::vector<int>& rows, const Glib::RefPtr<Set>& options);
+  bool export_to_file(IOFormat format, const std::string& file, const std::vector<int>& cols, const 
std::vector<int>& rows, const Glib::RefPtr<Set>& options);
 
   //TODO: Avoid use of C GHashTable?
   _WRAP_METHOD(bool import_from_model(const Glib::RefPtr<DataModel>& from,  bool overwrite, GHashTable 
*cols_trans), gda_data_model_import_from_model, errthrow)
diff --git a/tools/m4/convert_libgdamm.m4 b/tools/m4/convert_libgdamm.m4
index e49033b..740cb9a 100644
--- a/tools/m4/convert_libgdamm.m4
+++ b/tools/m4/convert_libgdamm.m4
@@ -113,9 +113,9 @@ _CONV_ENUM(Gda,ConnectionFeature)
 _CONV_ENUM(Gda,ConnectionSchema)
 _CONV_ENUM(Gda,ClientEvent)
 _CONV_ENUM(Gda,ClientSpecsType)
-_CONV_ENUM(Gda,DataModelAccessFlags)
-_CONV_ENUM(Gda,DataModelHint)
-_CONV_ENUM(Gda,DataModelIOFormat)
+_CONV_GNOME_GDA_INCLASS_ENUM(DataModel,AccessFlags)
+_CONV_GNOME_GDA_INCLASS_ENUM(DataModel,Hint)
+_CONV_GNOME_GDA_INCLASS_ENUM(DataModel,IOFormat)
 _CONV_ENUM(Gda,DataModelQueryOptions)
 _CONV_ENUM(Gda,ConnectionOptions)
 _CONV_ENUM(Gda,ValueType)