[dia] [warningectomy] signed/unsigned mismatch

[Hans Breuer <hans src gnome org>]

commit 626f3fc8e2c91d8dac56eb9f3a5b300173460390
Author: Hans Breuer <hans breuer org>
Date:   Sun May 20 20:49:30 2012 +0200

    [warningectomy] signed/unsigned mismatch

 lib/group.c        |    6 +++---
 lib/neworth_conn.c |    2 +-
 lib/orth_conn.c    |    2 +-
 lib/prop_sdarray.c |    2 +-
 lib/propdesc.c     |    2 +-
 lib/propdialogs.c  |    2 +-
 lib/proplist.c     |   12 ++++++------
 lib/propobject.c   |    2 +-
 8 files changed, 15 insertions(+), 15 deletions(-)
---
diff --git a/lib/group.c b/lib/group.c
index 4cd10bd..1ce6c7f 100644
--- a/lib/group.c
+++ b/lib/group.c
@@ -669,7 +669,7 @@ group_get_props(Group *group, GPtrArray *props)
 {
   GList *tmp;
   GPtrArray *props_list, *props_self;
-  int i;
+  guint i;
 
   /* Need to split the passed in properties to self props
    * and the ones really passed to the list of owned objects.
@@ -704,7 +704,7 @@ group_set_props(Group *group, GPtrArray *props)
 {
   GList *tmp;
   GPtrArray *props_list, *props_self;
-  int i;
+  guint i;
 
   /* Need to split the passed in properties to self props
    * and the ones really passed to the list of owned objects.
@@ -744,7 +744,7 @@ group_apply_properties_list(Group *group, GPtrArray *props)
   ObjectChange *objchange;
   GroupPropChange *change = NULL;
   GPtrArray *props_list, *props_self;
-  int i;
+  guint i;
 
   change = g_new0(GroupPropChange, 1);
 
diff --git a/lib/neworth_conn.c b/lib/neworth_conn.c
index 28ea125..2ccce5c 100644
--- a/lib/neworth_conn.c
+++ b/lib/neworth_conn.c
@@ -264,7 +264,7 @@ neworthconn_update_midpoints(NewOrthConn *orth)
 
 
 static void
-adjust_handle_count_to(NewOrthConn *orth, guint count) {
+adjust_handle_count_to(NewOrthConn *orth, gint count) {
   /* This will shrink or expand orth->handles as necessary (so that 
      orth->numhandles matches orth->numpoints-1, most probably), by adding or
      removing minor handles and keeping the endpoint handles at the 
diff --git a/lib/orth_conn.c b/lib/orth_conn.c
index 64cb3dc..dc95863 100644
--- a/lib/orth_conn.c
+++ b/lib/orth_conn.c
@@ -260,7 +260,7 @@ orthconn_distance_from(OrthConn *orth, Point *point, real line_width)
 
 
 static void
-adjust_handle_count_to(OrthConn *orth, guint count) {
+adjust_handle_count_to(OrthConn *orth, gint count) {
   /* This will shrink or expand orth->handles as necessary (so that 
      orth->numhandles matches orth->numpoints-1, most probably), by adding or
      removing minor handles and keeping the endpoint handles at the 
diff --git a/lib/prop_sdarray.c b/lib/prop_sdarray.c
index 9189c6f..5b13362 100644
--- a/lib/prop_sdarray.c
+++ b/lib/prop_sdarray.c
@@ -111,7 +111,7 @@ arrayprop_load(ArrayProperty *prop, AttributeNode attr, DataNode data)
 static void 
 arrayprop_save(ArrayProperty *prop, AttributeNode attr) 
 {
-  int i;
+  guint i;
   const PropDescCommonArrayExtra *extra = prop->common.descr->extra_data;
   
   for (i = 0; i < prop->records->len; i++) {
diff --git a/lib/propdesc.c b/lib/propdesc.c
index 5e9376e..b6f529b 100644
--- a/lib/propdesc.c
+++ b/lib/propdesc.c
@@ -139,7 +139,7 @@ prop_desc_lists_union(GList *plists)
     int i;
 
     for (i = 0; plist[i].name != NULL; i++) {
-      int j;
+      guint j;
 
       if (plist[i].flags & PROP_FLAG_DONT_MERGE)
         continue; /* exclude anything that can't be merged */
diff --git a/lib/propdialogs.c b/lib/propdialogs.c
index 7deaf81..130e209 100644
--- a/lib/propdialogs.c
+++ b/lib/propdialogs.c
@@ -290,7 +290,7 @@ prop_dialog_add_properties(PropDialog *dialog, GPtrArray *props)
     GtkWidget *vbox = prop_dialog_container_pop(dialog);
     GtkWidget *swin = prop_dialog_container_pop(dialog);
     GdkScreen *screen = gtk_widget_get_screen(swin);
-    guint sheight = screen ? (2 * gdk_screen_get_height(screen)) / 3 : 400;
+    gint sheight = screen ? (2 * gdk_screen_get_height(screen)) / 3 : 400;
 
     gtk_widget_size_request (vbox, &requisition);
     /* I'd say default size calculation for scrollable is quite broken */
diff --git a/lib/proplist.c b/lib/proplist.c
index 2cbf7f8..6882e6a 100644
--- a/lib/proplist.c
+++ b/lib/proplist.c
@@ -96,7 +96,7 @@ prop_list_from_descs(const PropDescription *plist,
 void
 prop_list_free(GPtrArray *plist)
 {
-  int i;
+  guint i;
   if (!plist) return;
 
   for (i = 0; i < plist->len; i++) {
@@ -110,7 +110,7 @@ prop_list_free(GPtrArray *plist)
 GPtrArray *
 prop_list_copy(GPtrArray *src)
 {
-  int i;
+  guint i;
   GPtrArray *dest;
   
   dest = g_ptr_array_new();
@@ -128,7 +128,7 @@ prop_list_copy(GPtrArray *src)
 GPtrArray *
 prop_list_copy_empty(GPtrArray *plist)
 {
-  int i;
+  guint i;
   GPtrArray *dest;
   
   dest = g_ptr_array_new();
@@ -145,7 +145,7 @@ prop_list_copy_empty(GPtrArray *plist)
 gboolean 
 prop_list_load(GPtrArray *props, DataNode data_node, GError **err)
 {
-  int i;
+  guint i;
   gboolean ret = TRUE;
 
   for (i = 0; i < props->len; i++) {
@@ -174,7 +174,7 @@ prop_list_load(GPtrArray *props, DataNode data_node, GError **err)
 void 
 prop_list_save(GPtrArray *props, DataNode data)
 {
-  int i;
+  guint i;
   for (i = 0; i < props->len; i++) {
     Property *prop = g_ptr_array_index(props,i);
     AttributeNode attr = new_attribute(data,prop->descr->name);
@@ -185,7 +185,7 @@ prop_list_save(GPtrArray *props, DataNode data)
 Property *
 find_prop_by_name(const GPtrArray *props, const gchar *name) 
 {
-  int i;
+  guint i;
   GQuark prop_quark = g_quark_from_string(name);
 
   for (i = 0; i < props->len; i++) {
diff --git a/lib/propobject.c b/lib/propobject.c
index 026b35a..01be39a 100644
--- a/lib/propobject.c
+++ b/lib/propobject.c
@@ -206,7 +206,7 @@ object_apply_props_from_dialog(DiaObject *obj, WIDGET *dialog_widget)
   ObjectChange *change;
   PropDialog *dialog = prop_dialog_from_widget(dialog_widget);
   GPtrArray *props = g_ptr_array_new ();
-  int i;
+  guint i;
 
   prop_get_data_from_widgets(dialog);
   /* only stuff which is actually changed */