[libgdamm] SqlStatement: Change SqlStatementType to SqlStatement::Type.

[Murray Cumming <murrayc src gnome org>]

commit 6b6f40617a903e6484e49a316814292f4b618f96
Author: Murray Cumming <murrayc murrayc com>
Date:   Wed Apr 26 22:00:37 2017 +0200

    SqlStatement: Change SqlStatementType to SqlStatement::Type.

 examples/sqlbuilder/main.cc  |    8 ++++----
 libgda/src/sqlbuilder.ccg    |    2 +-
 libgda/src/sqlbuilder.hg     |    4 ++--
 libgda/src/sqlstatement.ccg  |    4 +++-
 libgda/src/sqlstatement.hg   |   12 ++++++------
 libgda/src/statement.hg      |    2 +-
 tools/m4/convert_libgdamm.m4 |    2 +-
 7 files changed, 18 insertions(+), 16 deletions(-)
---
diff --git a/examples/sqlbuilder/main.cc b/examples/sqlbuilder/main.cc
index 2966b4c..e6f5488 100644
--- a/examples/sqlbuilder/main.cc
+++ b/examples/sqlbuilder/main.cc
@@ -10,7 +10,7 @@ int main()
 
   // INSERT INTO customers (e, f, g) VALUES (##p1::string, 15, 'joe')
   Glib::RefPtr<Gnome::Gda::SqlBuilder> ins_builder =
-    Gnome::Gda::SqlBuilder::create(Gnome::Gda::SqlStatementType::INSERT);
+    Gnome::Gda::SqlBuilder::create(Gnome::Gda::SqlStatement::Type::INSERT);
 
   ins_builder->set_table("customer");
   ins_builder->add_field_value_id(ins_builder->add_id("e"),
@@ -22,7 +22,7 @@ int main()
 
   // UPDATE products set ref='A0E''FESP' WHERE id = 14
   Glib::RefPtr<Gnome::Gda::SqlBuilder> up_builder =
-    Gnome::Gda::SqlBuilder::create(Gnome::Gda::SqlStatementType::UPDATE);
+    Gnome::Gda::SqlBuilder::create(Gnome::Gda::SqlStatement::Type::UPDATE);
 
   up_builder->set_table("customer");
   up_builder->add_field_value("ref", "A0E'FESP");
@@ -46,7 +46,7 @@ int main()
    * SELECT c."date", name, date AS person FROM "select" as c, orders
    */
   Glib::RefPtr<Gnome::Gda::SqlBuilder> sel_builder =
-    Gnome::Gda::SqlBuilder::create(Gnome::Gda::SqlStatementType::SELECT);
+    Gnome::Gda::SqlBuilder::create(Gnome::Gda::SqlStatement::Type::SELECT);
 
   // SELECT is an sql keyword
   guint target_c = sel_builder->select_add_target("select", "c");
@@ -63,7 +63,7 @@ int main()
 
   // SELECT myfunc (a, 5, 'Joe') FROM mytable
   Glib::RefPtr<Gnome::Gda::SqlBuilder> func_builder =
-    Gnome::Gda::SqlBuilder::create(Gnome::Gda::SqlStatementType::SELECT);
+    Gnome::Gda::SqlBuilder::create(Gnome::Gda::SqlStatement::Type::SELECT);
 
   func_builder->select_add_target("mytable");
 
diff --git a/libgda/src/sqlbuilder.ccg b/libgda/src/sqlbuilder.ccg
index cdfdb9c..3d2c26e 100644
--- a/libgda/src/sqlbuilder.ccg
+++ b/libgda/src/sqlbuilder.ccg
@@ -42,7 +42,7 @@ static const char* string_or_null(const Glib::ustring& str)
 //For the return types of gmmproc-generated code:
 typedef SqlBuilder::Id Id;
 
-SqlBuilder::SqlBuilder(SqlStatementType type)
+SqlBuilder::SqlBuilder(SqlStatement::Type type)
   : _CONSTRUCT("stmt-type", type)
 {
 
diff --git a/libgda/src/sqlbuilder.hg b/libgda/src/sqlbuilder.hg
index 4a89137..3a5a202 100644
--- a/libgda/src/sqlbuilder.hg
+++ b/libgda/src/sqlbuilder.hg
@@ -73,9 +73,9 @@ class SqlBuilder : public Glib::Object
 {
   _CLASS_GOBJECT(SqlBuilder, GdaSqlBuilder, GDA_SQL_BUILDER, Glib::Object, GObject)
 protected:
-  SqlBuilder(SqlStatementType type);
+  SqlBuilder(SqlStatement::Type type);
 public:
-  _WRAP_CREATE(SqlStatementType type)
+  _WRAP_CREATE(SqlStatement::Type type)
 
 #m4 _CONVERSION(`const Glib::ustring& ', `const gchar*', `string_or_null($3)')
 
diff --git a/libgda/src/sqlstatement.ccg b/libgda/src/sqlstatement.ccg
index 241129e..86b8f93 100644
--- a/libgda/src/sqlstatement.ccg
+++ b/libgda/src/sqlstatement.ccg
@@ -23,13 +23,15 @@
 #include <libgda/sql-parser/gda-statement-struct.h>
 #include <sql-parser/gda-sql-parser-enum-types.h>
 
+using Type = Gnome::Gda::SqlStatement::Type;
+
 namespace Gnome
 {
 
 namespace Gda
 {
 
-SqlStatement::SqlStatement(SqlStatementType type)
+SqlStatement::SqlStatement(Type type)
 : gobject_(gda_sql_statement_new((GdaSqlStatementType)type))
 {
 }
diff --git a/libgda/src/sqlstatement.hg b/libgda/src/sqlstatement.hg
index 66962bb..1a825f4 100644
--- a/libgda/src/sqlstatement.hg
+++ b/libgda/src/sqlstatement.hg
@@ -29,8 +29,6 @@ namespace Gnome
 namespace Gda
 {
 
-_WRAP_ENUM(SqlStatementType, GdaSqlStatementType)
-
 class Connection;
 
 /** Every SQL statement can be decomposed in the SqlStatement tree structure.
@@ -43,22 +41,24 @@ class SqlStatement
 
 public:
 
-  explicit SqlStatement(SqlStatementType type = SqlStatementType::SELECT);
+  _WRAP_ENUM(Type, GdaSqlStatementType)
+
+  explicit SqlStatement(Type type = Type::SELECT);
   _IGNORE(gda_sql_statement_new)
 
   bool empty() const;
 
   _WRAP_METHOD(Glib::ustring serialize() const, gda_sql_statement_serialize)
 
-  //_WRAP_METHOD(static Glib::ustring type_to_string(SqlStatementType type), 
gda_sql_statement_type_to_string)
-  _WRAP_METHOD(static SqlStatementType string_to_type(const Glib::ustring& type), 
gda_sql_statement_string_to_type)
+  //_WRAP_METHOD(static Glib::ustring type_to_string(Type type), gda_sql_statement_type_to_string)
+  _WRAP_METHOD(static Type string_to_type(const Glib::ustring& type), gda_sql_statement_string_to_type)
 
   _WRAP_METHOD(bool check_structure() const, gda_sql_statement_check_structure, errthrow)
   _WRAP_METHOD(bool check_validity(const Glib::RefPtr<Connection>& cnc), gda_sql_statement_check_validity, 
errthrow)
   _WRAP_METHOD(void check_clean(), gda_sql_statement_check_clean)
   _WRAP_METHOD(bool normalize(const Glib::RefPtr<Connection>& cnc), gda_sql_statement_normalize, errthrow)
 
-  //_WRAP_METHOD(static GdaSqlStatementContentsInfo* get_contents_infos(SqlStatementType type), 
gda_sql_statement_get_contents_infos)
+  //_WRAP_METHOD(static GdaSqlStatementContentsInfo* get_contents_infos(Type type), 
gda_sql_statement_get_contents_infos)
 
 
 };
diff --git a/libgda/src/statement.hg b/libgda/src/statement.hg
index 3ff26aa..2539235 100644
--- a/libgda/src/statement.hg
+++ b/libgda/src/statement.hg
@@ -92,7 +92,7 @@ public:
   Glib::ustring to_sql(const Glib::RefPtr<Connection>& cnc, const Glib::RefPtr<const Set>& params,
                                 StatementSqlFlag flags, const HolderVector& params_used) const;
 
-  _WRAP_METHOD(SqlStatementType get_statement_type() const, gda_statement_get_statement_type)
+  _WRAP_METHOD(SqlStatement::Type get_statement_type() const, gda_statement_get_statement_type)
   _WRAP_METHOD(bool is_useless() const, gda_statement_is_useless)
   _WRAP_METHOD(bool check_structure() const, gda_statement_check_structure, errthrow)
   _WRAP_METHOD(bool check_validity(const Glib::RefPtr<Connection>& cnc) const, gda_statement_check_validity, 
errthrow)
diff --git a/tools/m4/convert_libgdamm.m4 b/tools/m4/convert_libgdamm.m4
index 92b76c0..e37ae85 100644
--- a/tools/m4/convert_libgdamm.m4
+++ b/tools/m4/convert_libgdamm.m4
@@ -130,7 +130,7 @@ _CONV_ENUM(Gda,ServerOperationNodeType)
 _CONV_ENUM(Gda,ServerOperationNodeStatus)
 _CONV_ENUM(Gda,ValueAttribute)
 _CONV_ENUM(Gda,StatementModelUsage)
-_CONV_ENUM(Gda,SqlStatementType)
+_CONV_GNOME_GDA_INCLASS_ENUM(SqlStatement,Type)
 _CONV_ENUM(Gda,StatementSqlFlag)
 _CONV_ENUM(Gda,SqlParserMode)
 _CONV_ENUM(Gda,MetaStructFeature)