[glom/glom-1-14] Change some uses of long to more appropriate types

[David King <davidk src gnome org>]

commit 5e0ab0e924cbb610f394f0d3fce5aabe9b53bee0
Author: David King <davidk openismus com>
Date:   Mon Oct 11 15:19:39 2010 +0200

    Change some uses of long to more appropriate types
    
    * glom/libglom/python_embed/py_glom_record.[cc|h]:
    * glom/libglom/python_embed/py_glom_related.[cc|h]:
    * glom/libglom/python_embed/py_glom_relatedrecord.[cc|h]:
    * glom/libglom/utils.cc:
    * glom/utility_widgets/db_addel/glom_db_treemodel.cc:
    * glom/utils_ui.cc: Use other types than long where appropriate.

 ChangeLog                                          |   11 +++++++++++
 glom/libglom/python_embed/py_glom_record.cc        |    2 +-
 glom/libglom/python_embed/py_glom_record.h         |    8 ++++----
 glom/libglom/python_embed/py_glom_related.cc       |    2 +-
 glom/libglom/python_embed/py_glom_related.h        |    2 +-
 glom/libglom/python_embed/py_glom_relatedrecord.cc |    2 +-
 glom/libglom/python_embed/py_glom_relatedrecord.h  |    7 ++++---
 glom/libglom/utils.cc                              |    2 +-
 .../utility_widgets/db_adddel/glom_db_treemodel.cc |    3 ++-
 glom/utils_ui.cc                                   |    4 ++--
 10 files changed, 28 insertions(+), 15 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 92c9c7a..9e48abb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2010-10-11  David King  <davidk openismus com>
 
+	Change some uses of long to more appropriate types
+
+	* glom/libglom/python_embed/py_glom_record.[cc|h]:
+	* glom/libglom/python_embed/py_glom_related.[cc|h]:
+	* glom/libglom/python_embed/py_glom_relatedrecord.[cc|h]:
+	* glom/libglom/utils.cc:
+	* glom/utility_widgets/db_addel/glom_db_treemodel.cc:
+	* glom/utils_ui.cc: Use other types than long where appropriate.
+
+2010-10-11  David King  <davidk openismus com>
+
 	Use array notation where appropriate
 
 	* glom/dialog_connection.[cc|h]:
diff --git a/glom/libglom/python_embed/py_glom_record.cc b/glom/libglom/python_embed/py_glom_record.cc
index 6c7885f..f884c36 100644
--- a/glom/libglom/python_embed/py_glom_record.cc
+++ b/glom/libglom/python_embed/py_glom_record.cc
@@ -102,7 +102,7 @@ boost::python::object PyGlomRecord::get_related()
   return m_related;
 }
 
-long PyGlomRecord::len() const
+PyGlomRecord::type_map_field_values::size_type PyGlomRecord::len() const
 {
   return m_map_field_values.size();
 }
diff --git a/glom/libglom/python_embed/py_glom_record.h b/glom/libglom/python_embed/py_glom_record.h
index 2ace962..4e3ddde 100644
--- a/glom/libglom/python_embed/py_glom_record.h
+++ b/glom/libglom/python_embed/py_glom_record.h
@@ -52,14 +52,14 @@ public:
 
   boost::python::object get_related();
 
+  //Available, for instance, in python via record["name_first"]
+  typedef std::map<Glib::ustring, Gnome::Gda::Value> type_map_field_values;
+
   //[] notation:
-  long len() const;
+  type_map_field_values::size_type len() const;
   boost::python::object getitem(const boost::python::object& item);
   void setitem(const boost::python::object& /* key */, const boost::python::object& /* value */);
 
-  //Available, for instance, in python via record["name_first"]
-  typedef std::map<Glib::ustring, Gnome::Gda::Value> type_map_field_values;
-
   void set_fields(const PyGlomRecord::type_map_field_values& field_values,
     Document* document,
     const Glib::ustring& table_name,
diff --git a/glom/libglom/python_embed/py_glom_related.cc b/glom/libglom/python_embed/py_glom_related.cc
index d25a49a..7a12aef 100644
--- a/glom/libglom/python_embed/py_glom_related.cc
+++ b/glom/libglom/python_embed/py_glom_related.cc
@@ -39,7 +39,7 @@ PyGlomRelated::~PyGlomRelated()
 }
 
 
-long PyGlomRelated::len() const
+PyGlomRelated::type_map_relationships::size_type PyGlomRelated::len() const
 {
   return m_map_relationships.size();
 }
diff --git a/glom/libglom/python_embed/py_glom_related.h b/glom/libglom/python_embed/py_glom_related.h
index b2b024c..3c8e86f 100644
--- a/glom/libglom/python_embed/py_glom_related.h
+++ b/glom/libglom/python_embed/py_glom_related.h
@@ -41,7 +41,7 @@ public:
 
 
   //[] notation:
-  long len() const;
+  type_map_relationships::size_type len() const;
   boost::python::object getitem(const boost::python::object& item);
 
   friend class PyGlomRecord;
diff --git a/glom/libglom/python_embed/py_glom_relatedrecord.cc b/glom/libglom/python_embed/py_glom_relatedrecord.cc
index 48d2bca..555064b 100644
--- a/glom/libglom/python_embed/py_glom_relatedrecord.cc
+++ b/glom/libglom/python_embed/py_glom_relatedrecord.cc
@@ -46,7 +46,7 @@ static void RelatedRecord_HandlePythonError()
     PyErr_Print();
 }
 
-long PyGlomRelatedRecord::len() const
+PyGlomRelatedRecord::type_map_field_values::size_type PyGlomRelatedRecord::len() const
 {
   return m_map_field_values.size();
 }
diff --git a/glom/libglom/python_embed/py_glom_relatedrecord.h b/glom/libglom/python_embed/py_glom_relatedrecord.h
index 918794f..6b36ef1 100644
--- a/glom/libglom/python_embed/py_glom_relatedrecord.h
+++ b/glom/libglom/python_embed/py_glom_relatedrecord.h
@@ -45,8 +45,11 @@ public:
   boost::python::object min(const std::string& field_name) const;
   boost::python::object max(const std::string& field_name) const;
 
+  //Available, for instance, in python via record["name_first"]
+  typedef std::map<Glib::ustring, Gnome::Gda::Value> type_map_field_values;
+
   //[] notation:
-  long len() const;
+  type_map_field_values::size_type len() const;
   boost::python::object getitem(const boost::python::object& item);
 
 private:
@@ -60,8 +63,6 @@ private:
   sharedptr<const Relationship> m_relationship;
   Glib::ustring m_from_key_value_sqlized;
 
-  //Available, for instance, in python via record["name_first"]
-  typedef std::map<Glib::ustring, Gnome::Gda::Value> type_map_field_values;
   mutable type_map_field_values m_map_field_values; //A cache.
 };
 
diff --git a/glom/libglom/utils.cc b/glom/libglom/utils.cc
index 059d6df..4bc6020 100644
--- a/glom/libglom/utils.cc
+++ b/glom/libglom/utils.cc
@@ -566,7 +566,7 @@ Glib::ustring Utils::create_local_image_uri(const Gnome::Gda::Value& value)
 
   if(value.get_value_type() == GDA_TYPE_BINARY)
   {
-    glong size = 0;
+    std::streamsize size = 0;
     gconstpointer pData = value.get_binary(size);
     if(size && pData)
     {
diff --git a/glom/utility_widgets/db_adddel/glom_db_treemodel.cc b/glom/utility_widgets/db_adddel/glom_db_treemodel.cc
index 62cbb82..54850b6 100644
--- a/glom/utility_widgets/db_adddel/glom_db_treemodel.cc
+++ b/glom/utility_widgets/db_adddel/glom_db_treemodel.cc
@@ -980,7 +980,8 @@ void DbTreeModel::get_record_counts(gulong& total, gulong& found) const
           std::auto_ptr<Glib::Error> value_error;
           Gnome::Gda::Value value = datamodel->get_value_at(0, 0, value_error);
 #endif
-          total = (gulong)value.get_int64(); //I discovered that it's a int64 by trying it.
+	  // This will probably fail on Windows, where a long is only 32 bits wide.
+          total = static_cast<gulong>(value.get_int64()); //I discovered that it's a int64 by trying it.
         }
       }
     }
diff --git a/glom/utils_ui.cc b/glom/utils_ui.cc
index 6b165e3..712aa4a 100644
--- a/glom/utils_ui.cc
+++ b/glom/utils_ui.cc
@@ -282,14 +282,14 @@ Glib::RefPtr<Gdk::Pixbuf> Utils::get_pixbuf_for_gda_value(const Gnome::Gda::Valu
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
         try
         {
-          refPixbufLoader->write(puiData, (glong)buffer_binary_length);
+          refPixbufLoader->write(puiData, static_cast<gsize>(buffer_binary_length));
           result = refPixbufLoader->get_pixbuf();
 
           refPixbufLoader->close(); //This throws if write() threw, so it must be inside the try block.
         }
 #else
         std::auto_ptr<Glib::Error> error;
-        refPixbufLoader->write(puiData, (glong)buffer_binary_length, error);
+        refPixbufLoader->write(puiData, static_cast<gsize>(buffer_binary_length), error);
         if(!error.get())
         {
           result = refPixbufLoader->get_pixbuf();