[dia] More warning cleanup

From: Zander <zbrown src gnome org>
To: commits-list gnome org
Cc:
Subject: [dia] More warning cleanup
Date: Mon, 13 May 2019 21:29:10 +0000 (UTC)
commit 9566e0b188c826a9de04765215a458501f6b1c8e
Author: Zander Brown <zbrown gnome org>
Date:   Sun May 12 23:15:18 2019 +0100

    More warning cleanup

 lib/dialinechooser.c       |   5 +-
 objects/UML/class_dialog.c | 214 ++++++++++++++++++++++-----------------------
 2 files changed, 109 insertions(+), 110 deletions(-)
---
diff --git a/lib/dialinechooser.c b/lib/dialinechooser.c
index 659c796f..5ccb2796 100644
--- a/lib/dialinechooser.c
+++ b/lib/dialinechooser.c
@@ -112,9 +112,7 @@ dia_line_preview_expose(GtkWidget *widget, GdkEventExpose *event)
   gint x, y;
   GdkWindow *win;
   double dash_list[6];
-  int line_width = 2;
   GtkStyle *style;
-  GdkColor bg;
   GdkColor fg;
   cairo_t *ctx;
 
@@ -126,10 +124,11 @@ dia_line_preview_expose(GtkWidget *widget, GdkEventExpose *event)
 
     win = gtk_widget_get_window (widget);
     style = gtk_widget_get_style (widget);
-    bg = style->base[gtk_widget_get_state(widget)];
     fg = style->text[gtk_widget_get_state(widget)];
 
     ctx = gdk_cairo_create (win);
+    gdk_cairo_set_source_color (ctx, &fg);
+    cairo_set_line_width (ctx, 2);
     cairo_set_line_cap (ctx, CAIRO_LINE_CAP_BUTT);
     cairo_set_line_join (ctx, CAIRO_LINE_JOIN_MITER);
 
diff --git a/objects/UML/class_dialog.c b/objects/UML/class_dialog.c
index dd4d9bc2..65eb3614 100644
--- a/objects/UML/class_dialog.c
+++ b/objects/UML/class_dialog.c
@@ -47,7 +47,7 @@
 #include "class_dialog.h"
 
 /* hide this functionality before rewrite;) */
-void 
+void
 umlclass_dialog_free (UMLClassDialog *dialog)
 {
   g_list_free(dialog->deleted_connections);
@@ -77,7 +77,7 @@ struct _UMLClassState {
   DiaFont *classname_font;
   DiaFont *abstract_classname_font;
   DiaFont *comment_font;
-  
+
   char *name;
   char *stereotype;
   char *comment;
@@ -93,7 +93,7 @@ struct _UMLClassState {
   int wrap_after_char;
   int comment_line_length;
   int comment_tagging;
-  
+
   real line_width;
   Color line_color;
   Color fill_color;
@@ -115,7 +115,7 @@ typedef struct _UMLClassChange UMLClassChange;
 
 struct _UMLClassChange {
   ObjectChange obj_change;
-  
+
   UMLClass *obj;
 
   GList *added_cp;
@@ -123,7 +123,7 @@ struct _UMLClassChange {
   GList *disconnected;
 
   int applied;
-  
+
   UMLClassState *saved_state;
 };
 
@@ -141,11 +141,11 @@ _umlclass_store_disconnects(UMLClassDialog *prop_dialog,
   DiaObject *connected_obj;
   GList *list;
   int i;
-  
+
   list = cp->connected;
   while (list != NULL) {
     connected_obj = (DiaObject *)list->data;
-    
+
     for (i=0;i<connected_obj->num_handles;i++) {
       if (connected_obj->handles[i]->connected_to == cp) {
        dis = g_new0(Disconnect, 1);
@@ -181,13 +181,13 @@ class_read_from_dialog(UMLClass *umlclass, UMLClassDialog *prop_dialog)
 
   if (umlclass->stereotype != NULL)
     g_free(umlclass->stereotype);
-  
+
   s = gtk_entry_get_text(prop_dialog->stereotype);
   if (s && s[0])
     umlclass->stereotype = g_strdup (s);
   else
     umlclass->stereotype = NULL;
-  
+
   if (umlclass->comment != NULL)
     g_free (umlclass->comment);
 
@@ -196,7 +196,7 @@ class_read_from_dialog(UMLClass *umlclass, UMLClassDialog *prop_dialog)
     umlclass->comment = g_strdup (s);
   else
     umlclass->comment = NULL;
-  
+
   umlclass->abstract = prop_dialog->abstract_class->active;
   umlclass->visible_attributes = prop_dialog->attr_vis->active;
   umlclass->visible_operations = prop_dialog->op_vis->active;
@@ -284,7 +284,7 @@ create_font_props_row (GtkTable   *table,
                        GtkSpinButton   **heightsel)
 {
   GtkWidget *label;
-  GObject *adj;
+  GtkAdjustment *adj;
 
   label = gtk_label_new (kind);
   gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
@@ -293,13 +293,13 @@ create_font_props_row (GtkTable   *table,
   dia_font_selector_set_font (DIAFONTSELECTOR (*fontsel), font);
   gtk_table_attach_defaults (GTK_TABLE (table), GTK_WIDGET(*fontsel), 1, 2, row, row+1);
 
-  adj = gtk_adjustment_new (height, 0.1, 10.0, 0.1, 1.0, 0);
-  *heightsel = GTK_SPIN_BUTTON (gtk_spin_button_new (GTK_ADJUSTMENT(adj), 1.0, 2));
+  adj = GTK_ADJUSTMENT (gtk_adjustment_new (height, 0.1, 10.0, 0.1, 1.0, 0));
+  *heightsel = GTK_SPIN_BUTTON (gtk_spin_button_new (adj, 1.0, 2));
   gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (*heightsel), TRUE);
   gtk_table_attach_defaults (table, GTK_WIDGET (*heightsel), 2, 3, row, row+1);
 }
 
-static void 
+static void
 class_create_page(GtkNotebook *notebook,  UMLClass *umlclass)
 {
   UMLClassDialog *prop_dialog;
@@ -312,16 +312,16 @@ class_create_page(GtkNotebook *notebook,  UMLClass *umlclass)
   GtkWidget *scrolledwindow;
   GtkWidget *checkbox;
   GtkWidget *table;
-  GObject *adj;
+  GtkAdjustment *adj;
 
   prop_dialog = umlclass->properties_dialog;
 
   /* Class page: */
   page_label = gtk_label_new_with_mnemonic (_("_Class"));
-  
+
   vbox = gtk_vbox_new(FALSE, 5);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 10);
-  
+
   table = gtk_table_new (3, 2, FALSE);
   gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0);
 
@@ -350,7 +350,7 @@ class_create_page(GtkNotebook *notebook,  UMLClass *umlclass)
   entry = gtk_text_view_new ();
   prop_dialog->comment = GTK_TEXT_VIEW(entry);
   gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (entry), GTK_WRAP_WORD);
- 
+
   gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
   gtk_table_attach (GTK_TABLE (table), label, 0,1,2,3, GTK_FILL,0, 0,0);
   gtk_container_add (GTK_CONTAINER (scrolledwindow), entry);
@@ -370,59 +370,59 @@ class_create_page(GtkNotebook *notebook,  UMLClass *umlclass)
   gtk_box_pack_start (GTK_BOX (hbox), checkbox, TRUE, TRUE, 0);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0);
 
-  hbox = gtk_hbox_new(FALSE, 5);
-  checkbox = gtk_check_button_new_with_label(_("Operations visible"));
-  prop_dialog->op_vis = GTK_TOGGLE_BUTTON( checkbox );
+  hbox = gtk_hbox_new (FALSE, 5);
+  checkbox = gtk_check_button_new_with_label (_("Operations visible"));
+  prop_dialog->op_vis = GTK_TOGGLE_BUTTON (checkbox);
   gtk_box_pack_start (GTK_BOX (hbox), checkbox, TRUE, TRUE, 0);
-  checkbox = gtk_check_button_new_with_label(_("Suppress operations"));
-  prop_dialog->op_supp = GTK_TOGGLE_BUTTON( checkbox );
+  checkbox = gtk_check_button_new_with_label (_("Suppress operations"));
+  prop_dialog->op_supp = GTK_TOGGLE_BUTTON (checkbox);
   gtk_box_pack_start (GTK_BOX (hbox), checkbox, TRUE, TRUE, 0);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0);
 
-  hbox  = gtk_hbox_new(TRUE, 5);
-  hbox2 = gtk_hbox_new(FALSE, 5);
-  checkbox = gtk_check_button_new_with_label(_("Wrap Operations"));
-  prop_dialog->op_wrap = GTK_TOGGLE_BUTTON( checkbox );
+  hbox  = gtk_hbox_new (TRUE, 5);
+  hbox2 = gtk_hbox_new (FALSE, 5);
+  checkbox = gtk_check_button_new_with_label (_("Wrap Operations"));
+  prop_dialog->op_wrap = GTK_TOGGLE_BUTTON (checkbox );
   gtk_box_pack_start (GTK_BOX (hbox), checkbox, TRUE, TRUE, 0);
-  adj = gtk_adjustment_new( umlclass->wrap_after_char, 0.0, 200.0, 1.0, 5.0, 0);
-  prop_dialog->wrap_after_char = GTK_SPIN_BUTTON(gtk_spin_button_new( GTK_ADJUSTMENT( adj), 0.1, 0));
-  gtk_spin_button_set_numeric( GTK_SPIN_BUTTON( prop_dialog->wrap_after_char), TRUE);
-  gtk_spin_button_set_snap_to_ticks( GTK_SPIN_BUTTON( prop_dialog->wrap_after_char), TRUE);
-  prop_dialog->max_length_label = GTK_LABEL( gtk_label_new( _("Wrap after this length: ")));
-  gtk_box_pack_start (GTK_BOX (hbox2), GTK_WIDGET( prop_dialog->max_length_label), FALSE, TRUE, 0);
-  gtk_box_pack_start (GTK_BOX (hbox2), GTK_WIDGET( prop_dialog->wrap_after_char), TRUE, TRUE, 0);
-  gtk_box_pack_start (GTK_BOX (hbox), GTK_WIDGET( hbox2), TRUE, TRUE, 0);
+  adj = GTK_ADJUSTMENT (gtk_adjustment_new (umlclass->wrap_after_char, 0.0, 200.0, 1.0, 5.0, 0));
+  prop_dialog->wrap_after_char = GTK_SPIN_BUTTON (gtk_spin_button_new (adj, 0.1, 0));
+  gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (prop_dialog->wrap_after_char), TRUE);
+  gtk_spin_button_set_snap_to_ticks (GTK_SPIN_BUTTON (prop_dialog->wrap_after_char), TRUE);
+  prop_dialog->max_length_label = GTK_LABEL (gtk_label_new( _("Wrap after this length: ")));
+  gtk_box_pack_start (GTK_BOX (hbox2), GTK_WIDGET (prop_dialog->max_length_label), FALSE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (hbox2), GTK_WIDGET (prop_dialog->wrap_after_char), TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (hbox), GTK_WIDGET (hbox2), TRUE, TRUE, 0);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0);
 
-  hbox = gtk_hbox_new(TRUE, 5);
-  hbox2 = gtk_hbox_new(FALSE, 5);
-  checkbox = gtk_check_button_new_with_label(_("Comments visible"));
-  prop_dialog->comments_vis = GTK_TOGGLE_BUTTON( checkbox );
+  hbox = gtk_hbox_new (TRUE, 5);
+  hbox2 = gtk_hbox_new (FALSE, 5);
+  checkbox = gtk_check_button_new_with_label (_("Comments visible"));
+  prop_dialog->comments_vis = GTK_TOGGLE_BUTTON ( checkbox );
   gtk_box_pack_start (GTK_BOX (hbox), checkbox, TRUE, TRUE, 0);
-  adj = gtk_adjustment_new( umlclass->comment_line_length, 17.0, 200.0, 1.0, 5.0, 0);
-  prop_dialog->comment_line_length = GTK_SPIN_BUTTON(gtk_spin_button_new( GTK_ADJUSTMENT( adj), 0.1, 0));
-  gtk_spin_button_set_numeric( GTK_SPIN_BUTTON( prop_dialog->comment_line_length), TRUE);
-  gtk_spin_button_set_snap_to_ticks( GTK_SPIN_BUTTON( prop_dialog->comment_line_length), TRUE);
-  prop_dialog->Comment_length_label = GTK_LABEL( gtk_label_new( _("Wrap comment after this length: ")));
-  gtk_box_pack_start (GTK_BOX (hbox2), GTK_WIDGET( prop_dialog->Comment_length_label), FALSE, TRUE, 0);
-  gtk_box_pack_start (GTK_BOX (hbox2), GTK_WIDGET( prop_dialog->comment_line_length), TRUE, TRUE, 0);
-  gtk_box_pack_start (GTK_BOX (hbox),  GTK_WIDGET( hbox2), TRUE, TRUE, 0);
+  adj = GTK_ADJUSTMENT (gtk_adjustment_new (umlclass->comment_line_length, 17.0, 200.0, 1.0, 5.0, 0));
+  prop_dialog->comment_line_length = GTK_SPIN_BUTTON (gtk_spin_button_new(adj, 0.1, 0));
+  gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (prop_dialog->comment_line_length), TRUE);
+  gtk_spin_button_set_snap_to_ticks (GTK_SPIN_BUTTON (prop_dialog->comment_line_length), TRUE);
+  prop_dialog->Comment_length_label = GTK_LABEL (gtk_label_new ( _("Wrap comment after this length: ")));
+  gtk_box_pack_start (GTK_BOX (hbox2), GTK_WIDGET (prop_dialog->Comment_length_label), FALSE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (hbox2), GTK_WIDGET (prop_dialog->comment_line_length), TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (hbox),  GTK_WIDGET (hbox2), TRUE, TRUE, 0);
   gtk_box_pack_start (GTK_BOX (vbox),  hbox, FALSE, TRUE, 0);
 
-  hbox = gtk_hbox_new(FALSE, 5);
-  checkbox = gtk_check_button_new_with_label(_("Show documentation tag"));
-  prop_dialog->comment_tagging = GTK_TOGGLE_BUTTON( checkbox );
+  hbox = gtk_hbox_new (FALSE, 5);
+  checkbox = gtk_check_button_new_with_label (_("Show documentation tag"));
+  prop_dialog->comment_tagging = GTK_TOGGLE_BUTTON (checkbox);
   gtk_box_pack_start (GTK_BOX (hbox), checkbox, TRUE, TRUE, 0);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0);
 
   gtk_widget_show_all (vbox);
   gtk_widget_show (page_label);
-  gtk_notebook_append_page(notebook, vbox, page_label);
-  
+  gtk_notebook_append_page (notebook, vbox, page_label);
+
 }
 
 
-static void 
+static void
 style_create_page(GtkNotebook *notebook,  UMLClass *umlclass)
 {
   UMLClassDialog *prop_dialog;
@@ -434,16 +434,16 @@ style_create_page(GtkNotebook *notebook,  UMLClass *umlclass)
   GtkWidget *fill_color;
   GtkWidget *line_color;
   GtkWidget *table;
-  GObject *adj;
+  GtkAdjustment *adj;
 
   prop_dialog = umlclass->properties_dialog;
 
   /** Fonts and Colors selection **/
   page_label = gtk_label_new_with_mnemonic (_("_Style"));
-  
+
   vbox = gtk_vbox_new(FALSE, 5);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 10);
-  
+
   table = gtk_table_new (5, 6, TRUE);
   gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, TRUE, 0);
   gtk_table_set_homogeneous (GTK_TABLE (table), FALSE);
@@ -456,7 +456,7 @@ style_create_page(GtkNotebook *notebook,  UMLClass *umlclass)
   gtk_table_attach_defaults (GTK_TABLE (table), label, 1, 2, 0, 1);
   label = gtk_label_new (_("Size"));
   gtk_table_attach_defaults (GTK_TABLE (table), label, 2, 3, 0, 1);
-  
+
   /* property rows */
   create_font_props_row (GTK_TABLE (table), _("Normal"), 1,
                          umlclass->normal_font,
@@ -495,22 +495,22 @@ style_create_page(GtkNotebook *notebook,  UMLClass *umlclass)
   gtk_box_pack_start (GTK_BOX (vbox),
                      table, FALSE, TRUE, 0);
   /* should probably be refactored too. */
-  label = gtk_label_new(_("Line Width"));
-  gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
+  label = gtk_label_new (_("Line Width"));
+  gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
   gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, GTK_EXPAND | GTK_FILL, 0, 0, 2);
-  adj = gtk_adjustment_new(umlclass->line_width, 0.0, G_MAXFLOAT, 0.1, 1.0, 0);
-  line_width = gtk_spin_button_new (GTK_ADJUSTMENT(adj), 1.0, 2);
+  adj = GTK_ADJUSTMENT (gtk_adjustment_new (umlclass->line_width, 0.0, G_MAXFLOAT, 0.1, 1.0, 0));
+  line_width = gtk_spin_button_new (adj, 1.0, 2);
   gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (line_width), TRUE);
-  prop_dialog->line_width = GTK_SPIN_BUTTON(line_width);
+  prop_dialog->line_width = GTK_SPIN_BUTTON (line_width);
   gtk_table_attach (GTK_TABLE (table), line_width, 1, 2, 0, 1, GTK_EXPAND | GTK_FILL, 0, 3, 2);
 
-  label = gtk_label_new(_("Text Color"));
-  gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
+  label = gtk_label_new (_("Text Color"));
+  gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
   gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, GTK_EXPAND | GTK_FILL, 0, 0, 2);
-  text_color = dia_color_selector_new();
+  text_color = dia_color_selector_new ();
   dia_color_selector_set_use_alpha (text_color, TRUE);
-  dia_color_selector_set_color(text_color, &umlclass->text_color);
-  prop_dialog->text_color = (DiaColorSelector *)text_color;
+  dia_color_selector_set_color (text_color, &umlclass->text_color);
+  prop_dialog->text_color = (DiaColorSelector *) text_color;
   gtk_table_attach (GTK_TABLE (table), text_color, 1, 2, 1, 2, GTK_EXPAND | GTK_FILL, 0, 3, 2);
 
   label = gtk_label_new(_("Foreground Color"));
@@ -521,7 +521,7 @@ style_create_page(GtkNotebook *notebook,  UMLClass *umlclass)
   dia_color_selector_set_color(line_color, &umlclass->line_color);
   prop_dialog->line_color = (DiaColorSelector *)line_color;
   gtk_table_attach (GTK_TABLE (table), line_color, 1, 2, 2, 3, GTK_EXPAND | GTK_FILL, 0, 3, 2);
-  
+
   label = gtk_label_new(_("Background Color"));
   gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
   gtk_table_attach (GTK_TABLE (table), label, 0, 1, 3, 4, GTK_EXPAND | GTK_FILL, 0, 0, 2);
@@ -533,7 +533,7 @@ style_create_page(GtkNotebook *notebook,  UMLClass *umlclass)
   gtk_widget_show_all (vbox);
   gtk_widget_show (page_label);
   gtk_notebook_append_page(notebook, vbox, page_label);
-  
+
 }
 
 /******************************************************
@@ -591,7 +591,7 @@ umlclass_apply_props_from_dialog(UMLClass *umlclass, GtkWidget *widget)
   int num_attrib, num_ops;
   GList *added, *deleted, *disconnected;
   UMLClassState *old_state = NULL;
-  
+
 #ifdef DEBUG
   umlclass_sanity_check(umlclass, "Apply from dialog start");
 #endif
@@ -599,7 +599,7 @@ umlclass_apply_props_from_dialog(UMLClass *umlclass, GtkWidget *widget)
   prop_dialog = umlclass->properties_dialog;
 
   old_state = umlclass_get_state(umlclass);
-  
+
   /* Allocate enought connection points for attributes and operations. */
   /* (two per op/attr) */
   if ( (prop_dialog->attr_vis->active) && (!prop_dialog->attr_supp->active))
@@ -621,7 +621,7 @@ umlclass_apply_props_from_dialog(UMLClass *umlclass, GtkWidget *widget)
   obj->connections =
     g_realloc(obj->connections,
              obj->num_connections*sizeof(ConnectionPoint *));
-  
+
   /* Read from dialog and put in object: */
   class_read_from_dialog(umlclass, prop_dialog);
   _attributes_read_from_dialog(umlclass, prop_dialog, UMLCLASS_CONNECTIONPOINTS);
@@ -643,16 +643,16 @@ umlclass_apply_props_from_dialog(UMLClass *umlclass, GtkWidget *widget)
 
     _umlclass_store_disconnects(prop_dialog, connection);
     object_remove_connections_to(connection);
-    
+
     list = g_list_next(list);
   }
-  
+
   deleted = prop_dialog->deleted_connections;
   prop_dialog->deleted_connections = NULL;
-  
+
   added = prop_dialog->added_connections;
   prop_dialog->added_connections = NULL;
-    
+
   disconnected = prop_dialog->disconnected_connections;
   prop_dialog->disconnected_connections = NULL;
 
@@ -703,19 +703,19 @@ umlclass_get_properties(UMLClass *umlclass, gboolean is_default)
     prop_dialog->deleted_connections = NULL;
     prop_dialog->added_connections = NULL;
     prop_dialog->disconnected_connections = NULL;
-    
+
     notebook = gtk_notebook_new ();
     gtk_notebook_set_tab_pos (GTK_NOTEBOOK (notebook), GTK_POS_TOP);
     gtk_box_pack_start (GTK_BOX (vbox),        notebook, TRUE, TRUE, 0);
     gtk_container_set_border_width (GTK_CONTAINER (notebook), 10);
 
     g_object_set_data(G_OBJECT(notebook), "user_data", (gpointer) umlclass);
-    
+
     g_signal_connect (G_OBJECT (notebook), "switch_page",
                      G_CALLBACK(switch_page_callback), umlclass);
     g_signal_connect (G_OBJECT (umlclass->properties_dialog->dialog), "destroy",
                      G_CALLBACK(destroy_properties_dialog), umlclass);
-    
+
     create_dialog_pages(GTK_NOTEBOOK( notebook ), umlclass);
 
     gtk_widget_show (notebook);
@@ -741,7 +741,7 @@ umlclass_free_state(UMLClassState *state)
   g_object_unref (state->classname_font);
   g_object_unref (state->abstract_classname_font);
   g_object_unref (state->comment_font);
-  
+
   g_free(state->name);
   g_free(state->stereotype);
   g_free(state->comment);
@@ -787,7 +787,7 @@ umlclass_get_state(UMLClass *umlclass)
   state->classname_font = g_object_ref (umlclass->classname_font);
   state->abstract_classname_font = g_object_ref (umlclass->abstract_classname_font);
   state->comment_font = g_object_ref (umlclass->comment_font);
-  
+
   state->name = g_strdup(umlclass->name);
   state->stereotype = g_strdup(umlclass->stereotype);
   state->comment = g_strdup(umlclass->comment);
@@ -807,13 +807,13 @@ umlclass_get_state(UMLClass *umlclass)
   state->line_color = umlclass->line_color;
   state->fill_color = umlclass->fill_color;
   state->text_color = umlclass->text_color;
-  
+
   state->attributes = NULL;
   list = umlclass->attributes;
   while (list != NULL) {
     UMLAttribute *attr = (UMLAttribute *)list->data;
     UMLAttribute *attr_copy;
-      
+
     attr_copy = uml_attribute_copy(attr);
     /* Looks wrong, but needed fro proper restore */
     attr_copy->left_connection = attr->left_connection;
@@ -823,13 +823,13 @@ umlclass_get_state(UMLClass *umlclass)
     list = g_list_next(list);
   }
 
-  
+
   state->operations = NULL;
   list = umlclass->operations;
   while (list != NULL) {
     UMLOperation *op = (UMLOperation *)list->data;
     UMLOperation *op_copy;
-      
+
     op_copy = uml_operation_copy(op);
     op_copy->left_connection = op->left_connection;
     op_copy->right_connection = op->right_connection;
@@ -839,16 +839,16 @@ umlclass_get_state(UMLClass *umlclass)
 
 
   state->template = umlclass->template;
-  
+
   state->formal_params = NULL;
   list = umlclass->formal_params;
   while (list != NULL) {
     UMLFormalParameter *param = (UMLFormalParameter *)list->data;
     UMLFormalParameter *param_copy;
-    
+
     param_copy = uml_formalparameter_copy(param);
     state->formal_params = g_list_append(state->formal_params, param_copy);
-    
+
     list = g_list_next(list);
   }
 
@@ -865,7 +865,7 @@ umlclass_update_connectionpoints(UMLClass *umlclass)
   UMLClassDialog *prop_dialog;
 
   prop_dialog = umlclass->properties_dialog;
-  
+
   /* Allocate enought connection points for attributes and operations. */
   /* (two per op/attr) */
   if ( (umlclass->visible_attributes) && (!umlclass->suppress_attributes))
@@ -876,7 +876,7 @@ umlclass_update_connectionpoints(UMLClass *umlclass)
     num_ops = g_list_length(umlclass->operations);
   else
     num_ops = 0;
-  
+
   obj = &umlclass->element.object;
 #ifdef UML_MAINPOINT
   obj->num_connections = UMLCLASS_CONNECTIONPOINTS + num_attrib*2 + num_ops*2 + 1;
@@ -888,11 +888,11 @@ umlclass_update_connectionpoints(UMLClass *umlclass)
              obj->num_connections*sizeof(ConnectionPoint *));
 
   connection_index = UMLCLASS_CONNECTIONPOINTS;
-  
+
   list = umlclass->attributes;
   while (list != NULL) {
     UMLAttribute *attr = (UMLAttribute *) list->data;
-    
+
     if ( (umlclass->visible_attributes) &&
         (!umlclass->suppress_attributes)) {
       obj->connections[connection_index] = attr->left_connection;
@@ -900,17 +900,17 @@ umlclass_update_connectionpoints(UMLClass *umlclass)
       obj->connections[connection_index] = attr->right_connection;
       connection_index++;
     }
-    
+
     list = g_list_next(list);
   }
-  
+
   if (prop_dialog)
     gtk_list_clear_items (GTK_LIST (prop_dialog->attributes_list), 0, -1);
 
   list = umlclass->operations;
   while (list != NULL) {
     UMLOperation *op = (UMLOperation *) list->data;
-    
+
     if ( (umlclass->visible_operations) &&
         (!umlclass->suppress_operations)) {
       obj->connections[connection_index] = op->left_connection;
@@ -918,7 +918,7 @@ umlclass_update_connectionpoints(UMLClass *umlclass)
       obj->connections[connection_index] = op->right_connection;
       connection_index++;
     }
-    
+
     list = g_list_next(list);
   }
   if (prop_dialog)
@@ -927,7 +927,7 @@ umlclass_update_connectionpoints(UMLClass *umlclass)
 #ifdef UML_MAINPOINT
   obj->connections[connection_index++] = &umlclass->connections[UMLCLASS_CONNECTIONPOINTS];
 #endif
-  
+
 }
 
 static void
@@ -953,7 +953,7 @@ umlclass_set_state(UMLClass *umlclass, UMLClassState *state)
   umlclass->abstract_classname_font = state->abstract_classname_font;
   g_object_unref (umlclass->comment_font);
   umlclass->comment_font = state->comment_font;
-  
+
   umlclass->name = state->name;
   umlclass->stereotype = state->stereotype;
   umlclass->comment = state->comment;
@@ -992,7 +992,7 @@ umlclass_change_apply(UMLClassChange *change, DiaObject *obj)
 {
   UMLClassState *old_state;
   GList *list;
-  
+
   old_state = umlclass_get_state(change->obj);
 
   umlclass_set_state(change->obj, change->saved_state);
@@ -1015,11 +1015,11 @@ umlclass_change_revert(UMLClassChange *change, DiaObject *obj)
 {
   UMLClassState *old_state;
   GList *list;
-  
+
   old_state = umlclass_get_state(change->obj);
 
   umlclass_set_state(change->obj, change->saved_state);
-  
+
   list = change->disconnected;
   while (list) {
     Disconnect *dis = (Disconnect *)list->data;
@@ -1028,7 +1028,7 @@ umlclass_change_revert(UMLClassChange *change, DiaObject *obj)
 
     list = g_list_next(list);
   }
-  
+
   change->saved_state = old_state;
   change->applied = 0;
 }
@@ -1042,7 +1042,7 @@ umlclass_change_free(UMLClassChange *change)
   g_free(change->saved_state);
 
   /* Doesn't this mean only one of add, delete can be done in each apply? */
-  if (change->applied) 
+  if (change->applied)
     free_list = change->deleted_cp;
   else
     free_list = change->added_cp;
@@ -1050,16 +1050,16 @@ umlclass_change_free(UMLClassChange *change)
   list = free_list;
   while (list != NULL) {
     ConnectionPoint *connection = (ConnectionPoint *) list->data;
-    
+
     g_assert(connection->connected == NULL); /* Paranoid */
     object_remove_connections_to(connection); /* Shouldn't be needed */
     g_free(connection);
-      
+
     list = g_list_next(list);
   }
 
   g_list_free(free_list);
-  
+
 }
 
 static ObjectChange *
@@ -1069,7 +1069,7 @@ new_umlclass_change(UMLClass *obj, UMLClassState *saved_state,
   UMLClassChange *change;
 
   change = g_new0(UMLClassChange, 1);
-  
+
   change->obj_change.apply =
     (ObjectChangeApplyFunc) umlclass_change_apply;
   change->obj_change.revert =
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]