From d038fdbce6ea8f38b7998b298dc6daf8cf0d9d05 Mon Sep 17 00:00:00 2001 From: Manish Singh Date: Mon, 14 Oct 2002 22:50:48 +0000 Subject: Get rid of unnecessary casts for g_object_{ref,unref} Mon Oct 14 15:39:41 2002 Manish Singh * pango/pango-context.c pango/pango-layout.c pango/pangoft2.c pango/pangowin32-fontmap.c pango/pangowin32.c pango/pangox-fontmap.c pango/pangox.c pango/pangoxft-font.c pango/pangoxft-fontmap.c pango/testfonts.c pango/opentype/pango-ot-ruleset.c: Get rid of unnecessary casts for g_object_{ref,unref} --- pango/opentype/pango-ot-ruleset.c | 4 ++-- pango/pango-context.c | 6 +++--- pango/pango-layout.c | 10 +++++----- pango/pangoft2-fontmap.c | 2 +- pango/pangoft2.c | 8 ++++---- pango/pangowin32-fontmap.c | 10 +++++----- pango/pangowin32.c | 8 ++++---- pango/pangox-fontmap.c | 10 +++++----- pango/pangox.c | 4 ++-- pango/pangoxft-font.c | 6 +++--- pango/pangoxft-fontmap.c | 2 +- pango/testfonts.c | 6 +++--- 12 files changed, 38 insertions(+), 38 deletions(-) (limited to 'pango') diff --git a/pango/opentype/pango-ot-ruleset.c b/pango/opentype/pango-ot-ruleset.c index 02839298..1fdf734c 100644 --- a/pango/opentype/pango-ot-ruleset.c +++ b/pango/opentype/pango-ot-ruleset.c @@ -90,7 +90,7 @@ pango_ot_ruleset_finalize (GObject *object) PangoOTRuleset *ruleset = PANGO_OT_RULESET (object); g_array_free (ruleset->rules, TRUE); - g_object_unref (G_OBJECT (ruleset->info)); + g_object_unref (ruleset->info); } /** @@ -107,7 +107,7 @@ pango_ot_ruleset_new (PangoOTInfo *info) ruleset = g_object_new (PANGO_TYPE_OT_RULESET, NULL); - ruleset->info = g_object_ref (G_OBJECT (info)); + ruleset->info = g_object_ref (info); return ruleset; } diff --git a/pango/pango-context.c b/pango/pango-context.c index da41b435..b2970034 100644 --- a/pango/pango-context.c +++ b/pango/pango-context.c @@ -121,7 +121,7 @@ pango_context_finalize (GObject *object) context = PANGO_CONTEXT (object); if (context->font_map) - g_object_unref (G_OBJECT(context->font_map)); + g_object_unref (context->font_map); pango_font_description_free (context->font_desc); @@ -161,10 +161,10 @@ pango_context_set_font_map (PangoContext *context, g_return_if_fail (!font_map || PANGO_IS_FONT_MAP (font_map)); if (context->font_map) - g_object_unref (G_OBJECT (context->font_map)); + g_object_unref (context->font_map); if (font_map) - g_object_ref (G_OBJECT (font_map)); + g_object_ref (font_map); context->font_map = font_map; } diff --git a/pango/pango-layout.c b/pango/pango-layout.c index 7b2d73ef..d49e5f64 100644 --- a/pango/pango-layout.c +++ b/pango/pango-layout.c @@ -232,7 +232,7 @@ pango_layout_finalize (GObject *object) pango_layout_clear_lines (layout); if (layout->context) - g_object_unref (G_OBJECT (layout->context)); + g_object_unref (layout->context); if (layout->attrs) pango_attr_list_unref (layout->attrs); @@ -268,7 +268,7 @@ pango_layout_new (PangoContext *context) layout = PANGO_LAYOUT (g_type_create_instance (pango_layout_get_type ())); layout->context = context; - g_object_ref (G_OBJECT (context)); + g_object_ref (context); return layout; } @@ -3457,7 +3457,7 @@ pango_layout_line_get_empty_extents (PangoLayoutLine *line, logical_rect->y = - pango_font_metrics_get_ascent (metrics); logical_rect->height = - logical_rect->y + pango_font_metrics_get_descent (metrics); - g_object_unref (G_OBJECT (font)); + g_object_unref (font); pango_font_metrics_unref (metrics); } else @@ -4003,7 +4003,7 @@ pango_layout_get_iter (PangoLayout *layout) iter = g_new (PangoLayoutIter, 1); iter->layout = layout; - g_object_ref (G_OBJECT (iter->layout)); + g_object_ref (iter->layout); pango_layout_check_lines (layout); @@ -4045,7 +4045,7 @@ pango_layout_iter_free (PangoLayoutIter *iter) g_slist_foreach (iter->line_extents, (GFunc) g_free, NULL); g_slist_free (iter->line_extents); pango_layout_line_unref (iter->line); - g_object_unref (G_OBJECT (iter->layout)); + g_object_unref (iter->layout); g_free (iter); } diff --git a/pango/pangoft2-fontmap.c b/pango/pangoft2-fontmap.c index 23e7a812..0c7d2c6d 100644 --- a/pango/pangoft2-fontmap.c +++ b/pango/pangoft2-fontmap.c @@ -272,7 +272,7 @@ pango_ft2_shutdown_display (void) { pango_fc_font_map_cache_clear (pango_ft2_global_fontmap); - g_object_unref (G_OBJECT (pango_ft2_global_fontmap)); + g_object_unref (pango_ft2_global_fontmap); pango_ft2_global_fontmap = NULL; } diff --git a/pango/pangoft2.c b/pango/pangoft2.c index 0851840c..b84232ae 100644 --- a/pango/pangoft2.c +++ b/pango/pangoft2.c @@ -107,7 +107,7 @@ _pango_ft2_font_new (PangoFontMap *fontmap, ft2font->fontmap = fontmap; ft2font->font_pattern = pattern; - g_object_ref (G_OBJECT (fontmap)); + g_object_ref (fontmap); ft2font->description = _pango_ft2_font_desc_from_pattern (pattern, TRUE); ft2font->face = NULL; @@ -670,8 +670,8 @@ pango_ft2_font_get_metrics (PangoFont *font, info->metrics->approximate_digit_width = extents.width / 10; - g_object_unref (G_OBJECT (layout)); - g_object_unref (G_OBJECT (context)); + g_object_unref (layout); + g_object_unref (context); } return pango_font_metrics_ref (info->metrics); @@ -729,7 +729,7 @@ pango_ft2_font_finalize (GObject *object) pango_font_description_free (ft2font->description); FcPatternDestroy (ft2font->font_pattern); - g_object_unref (G_OBJECT (ft2font->fontmap)); + g_object_unref (ft2font->fontmap); g_slist_foreach (ft2font->metrics_by_lang, (GFunc)free_metrics_info, NULL); g_slist_free (ft2font->metrics_by_lang); diff --git a/pango/pangowin32-fontmap.c b/pango/pangowin32-fontmap.c index f919717a..e4b7604d 100644 --- a/pango/pangowin32-fontmap.c +++ b/pango/pangowin32-fontmap.c @@ -271,7 +271,7 @@ pango_win32_shutdown_display (void) if (fontmap) { pango_win32_fontmap_cache_clear (fontmap); - g_object_unref (G_OBJECT (fontmap)); + g_object_unref (fontmap); fontmap = NULL; } @@ -471,7 +471,7 @@ pango_win32_font_map_load_font (PangoFontMap *fontmap, PING (("size matches")); result = (PangoFont *)win32font; - g_object_ref (G_OBJECT (result)); + g_object_ref (result); if (win32font->in_cache) pango_win32_fontmap_cache_remove (fontmap, win32font); @@ -1010,10 +1010,10 @@ pango_win32_fontmap_cache_add (PangoFontMap *fontmap, if (win32fontmap->freed_fonts->length == MAX_FREED_FONTS) { PangoWin32Font *old_font = g_queue_pop_tail (win32fontmap->freed_fonts); - g_object_unref (G_OBJECT (old_font)); + g_object_unref (old_font); } - g_object_ref (G_OBJECT (win32font)); + g_object_ref (win32font); g_queue_push_head (win32fontmap->freed_fonts, win32font); win32font->in_cache = TRUE; } @@ -1036,7 +1036,7 @@ pango_win32_fontmap_cache_remove (PangoFontMap *fontmap, win32fontmap->freed_fonts->length--; win32font->in_cache = FALSE; - g_object_unref (G_OBJECT (win32font)); + g_object_unref (win32font); } static void diff --git a/pango/pangowin32.c b/pango/pangowin32.c index 71bfbed8..0f98db1f 100644 --- a/pango/pangowin32.c +++ b/pango/pangowin32.c @@ -218,7 +218,7 @@ pango_win32_font_new (PangoFontMap *fontmap, result = (PangoWin32Font *)g_object_new (PANGO_TYPE_WIN32_FONT, NULL); result->fontmap = fontmap; - g_object_ref (G_OBJECT (fontmap)); + g_object_ref (fontmap); result->size = size; pango_win32_make_matching_logfont (fontmap, lfp, size, @@ -453,8 +453,8 @@ pango_win32_font_get_metrics (PangoFont *font, metrics->approximate_digit_width = extents.width / 10.0; pango_font_description_free (font_desc); - g_object_unref (G_OBJECT (layout)); - g_object_unref (G_OBJECT (context)); + g_object_unref (layout); + g_object_unref (context); } return metrics; @@ -514,7 +514,7 @@ pango_win32_font_finalize (GObject *object) g_hash_table_destroy (win32font->glyph_info); - g_object_unref (G_OBJECT (win32font->fontmap)); + g_object_unref (win32font->fontmap); G_OBJECT_CLASS (parent_class)->finalize (object); } diff --git a/pango/pangox-fontmap.c b/pango/pangox-fontmap.c index 9ff8ee93..805c1f27 100644 --- a/pango/pangox-fontmap.c +++ b/pango/pangox-fontmap.c @@ -348,7 +348,7 @@ pango_x_shutdown_display (Display *display) { fontmaps = g_list_delete_link (fontmaps, tmp_list); pango_x_fontmap_cache_clear (xfontmap); - g_object_unref (G_OBJECT (xfontmap)); + g_object_unref (xfontmap); return; } @@ -482,7 +482,7 @@ pango_x_font_map_load_font (PangoFontMap *fontmap, { result = (PangoFont *)xfont; - g_object_ref (G_OBJECT (result)); + g_object_ref (result); if (xfont->in_cache) pango_x_fontmap_cache_remove (fontmap, xfont); @@ -1366,10 +1366,10 @@ pango_x_fontmap_cache_add (PangoFontMap *fontmap, if (xfontmap->freed_fonts->length == MAX_FREED_FONTS) { PangoXFont *old_font = g_queue_pop_tail (xfontmap->freed_fonts); - g_object_unref (G_OBJECT (old_font)); + g_object_unref (old_font); } - g_object_ref (G_OBJECT (xfont)); + g_object_ref (xfont); g_queue_push_head (xfontmap->freed_fonts, xfont); xfont->in_cache = TRUE; } @@ -1392,7 +1392,7 @@ pango_x_fontmap_cache_remove (PangoFontMap *fontmap, xfontmap->freed_fonts->length--; xfont->in_cache = FALSE; - g_object_unref (G_OBJECT (xfont)); + g_object_unref (xfont); } static void diff --git a/pango/pangox.c b/pango/pangox.c index 72627e6c..d45f9780 100644 --- a/pango/pangox.c +++ b/pango/pangox.c @@ -417,7 +417,7 @@ pango_x_font_new (PangoFontMap *fontmap, const char *spec, int size) result = (PangoXFont *)g_type_create_instance (PANGO_TYPE_X_FONT); result->fontmap = fontmap; - g_object_ref (G_OBJECT (fontmap)); + g_object_ref (fontmap); result->display = pango_x_fontmap_get_display (fontmap); result->fonts = g_strsplit(spec, ",", -1); @@ -1323,7 +1323,7 @@ pango_x_font_finalize (GObject *object) if (xfont->xface) pango_x_face_remove (xfont->xface, (PangoFont *)xfont); - g_object_unref (G_OBJECT (xfont->fontmap)); + g_object_unref (xfont->fontmap); g_strfreev (xfont->fonts); diff --git a/pango/pangoxft-font.c b/pango/pangoxft-font.c index 690469f2..47eb2ec9 100644 --- a/pango/pangoxft-font.c +++ b/pango/pangoxft-font.c @@ -138,7 +138,7 @@ _pango_xft_font_new (PangoFontMap *fontmap, xfont->fontmap = fontmap; xfont->font_pattern = pattern; - g_object_ref (G_OBJECT (fontmap)); + g_object_ref (fontmap); xfont->description = _pango_xft_font_desc_from_pattern (pattern, TRUE); xfont->xft_font = NULL; @@ -480,8 +480,8 @@ pango_xft_font_get_metrics (PangoFont *font, info->metrics->approximate_digit_width = extents.width / 10; - g_object_unref (G_OBJECT (layout)); - g_object_unref (G_OBJECT (context)); + g_object_unref (layout); + g_object_unref (context); } } diff --git a/pango/pangoxft-fontmap.c b/pango/pangoxft-fontmap.c index 16d480b5..b61c2edf 100644 --- a/pango/pangoxft-fontmap.c +++ b/pango/pangoxft-fontmap.c @@ -252,7 +252,7 @@ pango_xft_shutdown_display (Display *display, xftfontmap->display = NULL; xftfontmap->closed = TRUE; - g_object_unref (G_OBJECT (fontmap)); + g_object_unref (fontmap); } } diff --git a/pango/testfonts.c b/pango/testfonts.c index d49e986f..94f81d6d 100644 --- a/pango/testfonts.c +++ b/pango/testfonts.c @@ -125,7 +125,7 @@ int main (int argc, char **argv) pango_coverage_unref (coverage); pango_font_description_free (desc); - g_object_unref (G_OBJECT (font)); + g_object_unref (font); } pango_font_map_list_families (fontmap, &families, &nb); @@ -208,7 +208,7 @@ int main (int argc, char **argv) item = pango_item_new (); item->analysis.shape_engine = pango_font_find_shaper (font, lang, s[0]); - item->analysis.font = g_object_ref (G_OBJECT (font)); + item->analysis.font = g_object_ref (font); pango_shape ( s, sizeof(s), &(item->analysis), glyphs); if (hdc) @@ -237,7 +237,7 @@ int main (int argc, char **argv) pango_item_free (item); pango_coverage_unref (coverage); - g_object_unref (G_OBJECT (font)); + g_object_unref (font); } pango_font_description_free (desc); } -- cgit v1.2.1