From 1c8127076573a338f2f66aa4fbb56588b62a1182 Mon Sep 17 00:00:00 2001 From: "Jon A. Cruz" Date: Sun, 8 Jan 2012 01:00:38 -0800 Subject: Warning and uninitialized variable cleanup. (bzr r10860) --- src/dialogs/export.cpp | 43 ++++++++++++++++++------------------------- src/dialogs/text-edit.cpp | 27 ++++++++++++--------------- 2 files changed, 30 insertions(+), 40 deletions(-) (limited to 'src/dialogs') diff --git a/src/dialogs/export.cpp b/src/dialogs/export.cpp index 51c16bf3b..31e978f86 100644 --- a/src/dialogs/export.cpp +++ b/src/dialogs/export.cpp @@ -1642,26 +1642,23 @@ sp_export_area_y_value_changed (GtkAdjustment *adj, GtkObject *base) } // end of sp_export_area_y_value_changed() /// Called when x1-x0 or area width is changed -static void -sp_export_area_width_value_changed (GtkAdjustment */*adj*/, GtkObject *base) +static void sp_export_area_width_value_changed(GtkAdjustment */*adj*/, GtkObject *base) { - float x0, x1, xdpi, width, bmwidth; - - if (g_object_get_data (G_OBJECT(base), "update")) + if (g_object_get_data (G_OBJECT(base), "update")) { return; + } - if (sp_unit_selector_update_test ((SPUnitSelector *)g_object_get_data - (G_OBJECT(base), "units"))) { + if (sp_unit_selector_update_test(reinterpret_cast(g_object_get_data(G_OBJECT(base), "units")))) { return; } g_object_set_data ( G_OBJECT (base), "update", GUINT_TO_POINTER (TRUE)); - x0 = sp_export_value_get_px (base, "x0"); - x1 = sp_export_value_get_px (base, "x1"); - xdpi = sp_export_value_get (base, "xdpi"); - width = sp_export_value_get_px (base, "width"); - bmwidth = floor (width * xdpi / DPI_BASE + 0.5); + float x0 = sp_export_value_get_px(base, "x0"); + float x1 = sp_export_value_get_px(base, "x1"); + float xdpi = sp_export_value_get(base, "xdpi"); + float width = sp_export_value_get_px(base, "width"); + float bmwidth = floor(width * xdpi / DPI_BASE + 0.5); if (bmwidth < SP_EXPORT_MIN_SIZE) { @@ -1679,27 +1676,23 @@ sp_export_area_width_value_changed (GtkAdjustment */*adj*/, GtkObject *base) } // end of sp_export_area_width_value_changed() /// Called when y1-y0 or area height is changed. -static void -sp_export_area_height_value_changed (GtkAdjustment */*adj*/, GtkObject *base) +static void sp_export_area_height_value_changed(GtkAdjustment */*adj*/, GtkObject *base) { - - float y0, y1, ydpi, height, bmheight; - - if (g_object_get_data (G_OBJECT(base), "update")) + if (g_object_get_data(G_OBJECT(base), "update")) { return; + } - if (sp_unit_selector_update_test ((SPUnitSelector *)g_object_get_data - (G_OBJECT(base), "units"))) { + if (sp_unit_selector_update_test(reinterpret_cast(g_object_get_data(G_OBJECT(base), "units")))) { return; } g_object_set_data (G_OBJECT (base), "update", GUINT_TO_POINTER (TRUE)); - y0 = sp_export_value_get_px (base, "y0"); - y1 = sp_export_value_get_px (base, "y1"); - ydpi = sp_export_value_get (base, "ydpi"); - height = sp_export_value_get_px (base, "height"); - bmheight = floor (height * ydpi / DPI_BASE + 0.5); + float y0 = sp_export_value_get_px (base, "y0"); + float y1 = sp_export_value_get_px (base, "y1"); + float ydpi = sp_export_value_get (base, "ydpi"); + float height = sp_export_value_get_px (base, "height"); + float bmheight = floor (height * ydpi / DPI_BASE + 0.5); if (bmheight < SP_EXPORT_MIN_SIZE) { bmheight = SP_EXPORT_MIN_SIZE; diff --git a/src/dialogs/text-edit.cpp b/src/dialogs/text-edit.cpp index ae34fe4b1..307ab1fd1 100644 --- a/src/dialogs/text-edit.cpp +++ b/src/dialogs/text-edit.cpp @@ -732,7 +732,6 @@ sp_text_edit_dialog_read_selection ( GtkWidget *dlg, * interested in. */ gchar *phrase = g_strdup(_("AaBbCcIiPpQq12369$\342\202\254\302\242?.;/()")); - Inkscape::XML::Node *repr; if (text) { guint items = sp_ted_get_selected_text_count (); @@ -760,8 +759,7 @@ sp_text_edit_dialog_read_selection ( GtkWidget *dlg, gtk_text_buffer_set_text (tb, "", 0); } } // end of if (docontent) - repr = text->getRepr(); - + text->getRepr(); // was being called but result ignored. Check this. } else { gtk_widget_set_sensitive (textw, FALSE); gtk_widget_set_sensitive (apply, FALSE); @@ -847,23 +845,22 @@ sp_text_edit_dialog_read_selection ( GtkWidget *dlg, static void sp_text_edit_dialog_text_changed (GtkTextBuffer *tb, GtkWidget *dlg) { - GtkWidget *textw, *preview, *apply, *def, *fontsel; - GtkTextIter start, end; - gchar *str; - - if (g_object_get_data (G_OBJECT (dlg), "blocked")) + if (g_object_get_data (G_OBJECT (dlg), "blocked")) { return; + } - SPItem *text = sp_ted_get_selected_text_item (); + SPItem *text = sp_ted_get_selected_text_item(); - textw = (GtkWidget*)g_object_get_data (G_OBJECT (dlg), "textw"); - preview = (GtkWidget*)g_object_get_data (G_OBJECT (dlg), "preview"); - apply = (GtkWidget*)g_object_get_data (G_OBJECT (dlg), "apply"); - def = (GtkWidget*)g_object_get_data (G_OBJECT (dlg), "default"); - fontsel = (GtkWidget*)g_object_get_data (G_OBJECT (dlg), "fontsel"); + //GtkWidget *textw = reinterpret_cast(g_object_get_data(G_OBJECT (dlg), "textw")); + GtkWidget *preview = reinterpret_cast(g_object_get_data(G_OBJECT (dlg), "preview")); + GtkWidget *apply = reinterpret_cast(g_object_get_data(G_OBJECT (dlg), "apply")); + GtkWidget *def = reinterpret_cast(g_object_get_data(G_OBJECT (dlg), "default")); + GtkWidget *fontsel = reinterpret_cast(g_object_get_data(G_OBJECT (dlg), "fontsel")); + GtkTextIter start; + GtkTextIter end; gtk_text_buffer_get_bounds (tb, &start, &end); - str = gtk_text_buffer_get_text (tb, &start, &end, TRUE); + gchar *str = gtk_text_buffer_get_text(tb, &start, &end, TRUE); font_instance *font = sp_font_selector_get_font(SP_FONT_SELECTOR(fontsel)); if (font) { -- cgit v1.2.3