[glom/glom-1-16] Adapt to libgdamm API changes.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glom/glom-1-16] Adapt to libgdamm API changes.
- Date: Mon, 14 Mar 2011 08:53:56 +0000 (UTC)
commit 4a8d1b8847b82007c1728c5d9c9b83eb5f95e861
Author: Murray Cumming <murrayc murrayc com>
Date: Sun Jan 30 15:23:36 2011 +0100
Adapt to libgdamm API changes.
* glom/libglom/connectionpool.cc:
* glom/libglom/db_utils.cc: libgdamm now uses std::vector instead of
*Handle, like gtkmm.
ChangeLog | 8 ++++++++
glom/libglom/connectionpool.cc | 2 +-
glom/libglom/db_utils.cc | 4 ++--
3 files changed, 11 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 185bf01..fce6964 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-01-30 Murray Cumming <murrayc murrayc com>
+
+ Adapt to libgdamm API changes.
+
+ * glom/libglom/connectionpool.cc:
+ * glom/libglom/db_utils.cc: libgdamm now uses std::vector instead of
+ *Handle, like gtkmm.
+
2011-03-14 Murray Cumming <murrayc murrayc com>
Fix the build.
diff --git a/glom/libglom/connectionpool.cc b/glom/libglom/connectionpool.cc
index e364283..a3ce2e8 100644
--- a/glom/libglom/connectionpool.cc
+++ b/glom/libglom/connectionpool.cc
@@ -569,7 +569,7 @@ bool ConnectionPool::handle_error_cerr_only()
{
Glib::RefPtr<Gnome::Gda::Connection> gda_connection = sharedconnection->get_gda_connection();
- typedef std::list< Glib::RefPtr<Gnome::Gda::ConnectionEvent> > type_list_errors;
+ typedef std::vector< Glib::RefPtr<Gnome::Gda::ConnectionEvent> > type_list_errors;
type_list_errors list_errors = gda_connection->get_events();
if(!list_errors.empty())
diff --git a/glom/libglom/db_utils.cc b/glom/libglom/db_utils.cc
index 621d291..a2afd6c 100644
--- a/glom/libglom/db_utils.cc
+++ b/glom/libglom/db_utils.cc
@@ -892,7 +892,7 @@ type_vec_fields get_fields_for_table_from_database(const Glib::ustring& table_na
holder_table_name->set_value(quoted_table_name, error);
#endif
- std::list< Glib::RefPtr<Gnome::Gda::Holder> > holder_list;
+ std::vector< Glib::RefPtr<Gnome::Gda::Holder> > holder_list;
holder_list.push_back(holder_table_name);
Glib::RefPtr<Gnome::Gda::DataModel> data_model_fields;
@@ -1477,7 +1477,7 @@ static void recalculate_next_auto_increment_value(const Glib::ustring& table_nam
//Get the max key value in the database:
Glib::RefPtr<Gnome::Gda::SqlBuilder> builder = Gnome::Gda::SqlBuilder::create(Gnome::Gda::SQL_STATEMENT_SELECT);
- std::list<guint> args;
+ std::vector<guint> args;
args.push_back(builder->add_field_id(field_name, table_name));
builder->add_field_value_id(builder->add_function("MAX", args));
builder->select_add_target(table_name);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]