GNOME.org
 

[libgdamm] Adapt to enums as class enums.

commit b1774e75100392140407fa37969e2a600e8ed53d
Author: Murray Cumming <murrayc murrayc com>
Date:   Wed Apr 26 16:47:03 2017 +0200

    Adapt to enums as class enums.
    
    As generated by the latest gmmproc.

 examples/simple/main.cc     |    2 +-
 examples/sqlbuilder/main.cc |   14 +++++++-------
 libgda/src/connection.hg    |   24 ++++++++++++------------
 libgda/src/metastruct.hg    |    2 +-
 libgda/src/sqlstatement.hg  |    2 +-
 5 files changed, 22 insertions(+), 22 deletions(-)
---
diff --git a/examples/simple/main.cc b/examples/simple/main.cc
index 449dfa6..9a1cceb 100644
--- a/examples/simple/main.cc
+++ b/examples/simple/main.cc
@@ -179,7 +179,7 @@ int main (int, char**)
   try
   {
     cnc = Gda::Connection::open_from_string ("SQLite", "DB_DIR=.;DB_NAME=example_db", "",
-                                                                           Gda::CONNECTION_OPTIONS_NONE);
+                                                                           Gda::ConnectionOptions::NONE);
   }
   catch(const Glib::Error& err)
   {
diff --git a/examples/sqlbuilder/main.cc b/examples/sqlbuilder/main.cc
index ac08003..2966b4c 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::SQL_STATEMENT_INSERT);
+    Gnome::Gda::SqlBuilder::create(Gnome::Gda::SqlStatementType::INSERT);
 
   ins_builder->set_table("customer");
   ins_builder->add_field_value_id(ins_builder->add_id("e"),
@@ -22,19 +22,19 @@ int main()
 
   // UPDATE products set ref='A0E''FESP' WHERE id = 14
   Glib::RefPtr<Gnome::Gda::SqlBuilder> up_builder =
-    Gnome::Gda::SqlBuilder::create(Gnome::Gda::SQL_STATEMENT_UPDATE);
+    Gnome::Gda::SqlBuilder::create(Gnome::Gda::SqlStatementType::UPDATE);
 
   up_builder->set_table("customer");
   up_builder->add_field_value("ref", "A0E'FESP");
   guint id = up_builder->add_id("id");
   guint value = up_builder->add_expr(Gnome::Gda::Value(14));
-  guint cond = up_builder->add_cond(Gnome::Gda::SQL_OPERATOR_TYPE_EQ, id, value);
+  guint cond = up_builder->add_cond(Gnome::Gda::SqlOperatorType::EQ, id, value);
   up_builder->set_where(cond);
 
   render_as_sql(up_builder);
 
   // reuse the same GdaSqlBuilder object to change the WHERE condition to: WHERE id = ##theid::int
-  up_builder->set_where(up_builder->add_cond(Gnome::Gda::SQL_OPERATOR_TYPE_EQ,
+  up_builder->set_where(up_builder->add_cond(Gnome::Gda::SqlOperatorType::EQ,
                                          id,
                                          up_builder->add_param ("theid", G_TYPE_INT, false),
                                          0));
@@ -46,12 +46,12 @@ 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::SQL_STATEMENT_SELECT);
+    Gnome::Gda::SqlBuilder::create(Gnome::Gda::SqlStatementType::SELECT);
 
   // SELECT is an sql keyword
   guint target_c = sel_builder->select_add_target("select", "c");
   guint target_orders = sel_builder->select_add_target("orders");
-  guint join = sel_builder->select_join_targets(target_c, target_orders, Gnome::Gda::SQL_SELECT_JOIN_INNER);
+  guint join = sel_builder->select_join_targets(target_c, target_orders, 
Gnome::Gda::SqlSelectJoinType::INNER);
   sel_builder->select_add_target("c.date"); //Not sure about this. It was add add_field().
   sel_builder->add_field_value_id(sel_builder->add_id("name"),
                          sel_builder->add_id("person"));
@@ -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::SQL_STATEMENT_SELECT);
+    Gnome::Gda::SqlBuilder::create(Gnome::Gda::SqlStatementType::SELECT);
 
   func_builder->select_add_target("mytable");
 
diff --git a/libgda/src/connection.hg b/libgda/src/connection.hg
index 624a834..00d0de6 100644
--- a/libgda/src/connection.hg
+++ b/libgda/src/connection.hg
@@ -70,14 +70,14 @@ protected:
 public:
   _WRAP_CREATE()
 
-  _WRAP_METHOD(static Glib::RefPtr<Connection> create_from_string(const Glib::ustring& provider_name, const 
Glib::ustring& cnc_string, const Glib::ustring& auth_string = Glib::ustring(), ConnectionOptions options = 
CONNECTION_OPTIONS_NONE), gda_connection_new_from_string, errthrow)
+  _WRAP_METHOD(static Glib::RefPtr<Connection> create_from_string(const Glib::ustring& provider_name, const 
Glib::ustring& cnc_string, const Glib::ustring& auth_string = Glib::ustring(), ConnectionOptions options = 
ConnectionOptions::NONE), gda_connection_new_from_string, errthrow)
 
   /* This throws an error which we don't want to do in a constructor */
   _WRAP_METHOD_DOCS_ONLY(gda_connection_open_from_string)
   static Glib::RefPtr<Connection> open_from_string(const Glib::ustring& provider_name,
                                                     const Glib::ustring& cnc_string,
                                                     const Glib::ustring& auth_string = Glib::ustring(),
-                                                    ConnectionOptions options = CONNECTION_OPTIONS_NONE);
+                                                    ConnectionOptions options = ConnectionOptions::NONE);
 
   _WRAP_METHOD(bool open(), gda_connection_open, errthrow)
 
@@ -108,10 +108,10 @@ public:
   Glib::RefPtr<Glib::Object> statement_execute(const Glib::RefPtr<const Statement>& stmt, const 
Glib::RefPtr<const Set>& params, StatementModelUsage model_usage, Glib::RefPtr<const Set>& last_insert_row);
 
 //TODO: Documentation:
-  Glib::RefPtr<Glib::Object> statement_execute(const Glib::RefPtr<const Statement>& stmt, 
StatementModelUsage model_usage = STATEMENT_MODEL_RANDOM_ACCESS);
+  Glib::RefPtr<Glib::Object> statement_execute(const Glib::RefPtr<const Statement>& stmt, 
StatementModelUsage model_usage = StatementModelUsage::RANDOM_ACCESS);
 
 
-  Glib::RefPtr<Glib::Object> statement_execute(const Glib::ustring& sql, StatementModelUsage model_usage = 
STATEMENT_MODEL_RANDOM_ACCESS);
+  Glib::RefPtr<Glib::Object> statement_execute(const Glib::ustring& sql, StatementModelUsage model_usage = 
StatementModelUsage::RANDOM_ACCESS);
 
   //_WRAP_METHOD(Glib::RefPtr<DataModel> statement_execute_select(const Glib::RefPtr<const Statement>& stmt, 
const Glib::RefPtr<const Set>& params), gda_connection_statement_execute_select, errthrow)
   _IGNORE(gda_connection_statement_execute_select) //We instead create a version that can take an optional 
usage parameter too.
@@ -122,23 +122,23 @@ public:
 
 //This custom-written method has more optional methods than gda_connection_execute_select_command().
 //TODO: Documentation:
-  Glib::RefPtr<DataModel> statement_execute_select(const Glib::RefPtr<const Statement>& stmt, 
StatementModelUsage model_usage = STATEMENT_MODEL_RANDOM_ACCESS);
-  Glib::RefPtr<DataModel> statement_execute_select(const Glib::ustring& sql, StatementModelUsage model_usage 
= STATEMENT_MODEL_RANDOM_ACCESS);
+  Glib::RefPtr<DataModel> statement_execute_select(const Glib::RefPtr<const Statement>& stmt, 
StatementModelUsage model_usage = StatementModelUsage::RANDOM_ACCESS);
+  Glib::RefPtr<DataModel> statement_execute_select(const Glib::ustring& sql, StatementModelUsage model_usage 
= StatementModelUsage::RANDOM_ACCESS);
 
 //This custom-written method has more optional methods than gda_connection_execute_select_command().
 //TODO: Documentation:
-  Glib::RefPtr<DataModel> statement_execute_select(const Glib::RefPtr<const Statement>& stmt, const 
Glib::RefPtr<const Set>& params, StatementModelUsage model_usage = STATEMENT_MODEL_RANDOM_ACCESS);
-  Glib::RefPtr<DataModel> statement_execute_select(const Glib::ustring& sql, const Glib::RefPtr<const Set>& 
params, StatementModelUsage model_usage = STATEMENT_MODEL_RANDOM_ACCESS);
+  Glib::RefPtr<DataModel> statement_execute_select(const Glib::RefPtr<const Statement>& stmt, const 
Glib::RefPtr<const Set>& params, StatementModelUsage model_usage = StatementModelUsage::RANDOM_ACCESS);
+  Glib::RefPtr<DataModel> statement_execute_select(const Glib::ustring& sql, const Glib::RefPtr<const Set>& 
params, StatementModelUsage model_usage = StatementModelUsage::RANDOM_ACCESS);
   _IGNORE(gda_connection_execute_select_command)
 
 
 //TODO: Documentation:
 //Note that we add the prefix _builder() because overloading on different RefPtr<> types seems to be 
ambiguous.
-  Glib::RefPtr<DataModel> statement_execute_select_builder(const Glib::RefPtr<const SqlBuilder>& stmt, 
StatementModelUsage model_usage = STATEMENT_MODEL_RANDOM_ACCESS);
+  Glib::RefPtr<DataModel> statement_execute_select_builder(const Glib::RefPtr<const SqlBuilder>& stmt, 
StatementModelUsage model_usage = StatementModelUsage::RANDOM_ACCESS);
 
 //TODO: Documentation:
 //Note that we add the prefix _builder() because overloading on different RefPtr<> types seems to be 
ambiguous.
-  Glib::RefPtr<DataModel> statement_execute_select_builder(const Glib::RefPtr<const SqlBuilder>& stmt, const 
Glib::RefPtr<const Set>& params, StatementModelUsage model_usage = STATEMENT_MODEL_RANDOM_ACCESS);
+  Glib::RefPtr<DataModel> statement_execute_select_builder(const Glib::RefPtr<const SqlBuilder>& stmt, const 
Glib::RefPtr<const Set>& params, StatementModelUsage model_usage = StatementModelUsage::RANDOM_ACCESS);
 
 
   _WRAP_METHOD_DOCS_ONLY(gda_connection_statement_execute_non_select)
@@ -319,7 +319,7 @@ public:
    * @param flags SQL rendering flags, as StatementSqlFlag OR'ed values
    * @throws ConnectionError
    */
-  Glib::ustring statement_to_sql(const Glib::RefPtr<const Statement>& stmt, const Glib::RefPtr<const Set>& 
params, StatementSqlFlag flags = STATEMENT_SQL_PARAMS_AS_VALUES) const;
+  Glib::ustring statement_to_sql(const Glib::RefPtr<const Statement>& stmt, const Glib::RefPtr<const Set>& 
params, StatementSqlFlag flags = StatementSqlFlag::PARAMS_AS_VALUES) const;
   
   /** Renders a Statement as a SQL statement string, adapted to the SQL dialect used by the connection.
    *
@@ -327,7 +327,7 @@ public:
    * @param flags SQL rendering flags, as StatementSqlFlag OR'ed values
    * @throws ConnectionError
    */
-  Glib::ustring statement_to_sql(const Glib::RefPtr<const Statement>& stmt, StatementSqlFlag flags = 
STATEMENT_SQL_PARAMS_AS_VALUES) const;
+  Glib::ustring statement_to_sql(const Glib::RefPtr<const Statement>& stmt, StatementSqlFlag flags = 
StatementSqlFlag::PARAMS_AS_VALUES) const;
 
 
   _IGNORE(gda_connection_internal_reset_transaction_status)
diff --git a/libgda/src/metastruct.hg b/libgda/src/metastruct.hg
index cbc82d8..adaf502 100644
--- a/libgda/src/metastruct.hg
+++ b/libgda/src/metastruct.hg
@@ -71,7 +71,7 @@ protected:
   _WRAP_CTOR(MetaStruct(const Glib::RefPtr<MetaStore>& meta_store, MetaStructFeature features), 
gda_meta_struct_new)
 
 public:
-  _WRAP_CREATE(const Glib::RefPtr<MetaStore>& store, MetaStructFeature features = META_STRUCT_FEATURE_ALL)
+  _WRAP_CREATE(const Glib::RefPtr<MetaStore>& store, MetaStructFeature features = MetaStructFeature::ALL)
   
   //TODO: Wrap GdaMetaDbObject?
   _WRAP_METHOD(GdaMetaDbObject* complement(MetaDbObjectType type, const Value& catalog, const Value& schema, 
const Value& name), gda_meta_struct_complement, errthrow)
diff --git a/libgda/src/sqlstatement.hg b/libgda/src/sqlstatement.hg
index 2281f86..66962bb 100644
--- a/libgda/src/sqlstatement.hg
+++ b/libgda/src/sqlstatement.hg
@@ -43,7 +43,7 @@ class SqlStatement
 
 public:
 
-  explicit SqlStatement(SqlStatementType type = SQL_STATEMENT_SELECT);
+  explicit SqlStatement(SqlStatementType type = SqlStatementType::SELECT);
   _IGNORE(gda_sql_statement_new)
 
   bool empty() const;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]