[gtk+/gtk-2-90] Remove unnecessary casting
- From: Cody Russell <bratsche src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gtk+/gtk-2-90] Remove unnecessary casting
- Date: Thu, 22 Oct 2009 20:03:18 +0000 (UTC)
commit 9912394803ae3e41222cf52a17582379e115b269
Author: Cody Russell <bratsche gnome org>
Date: Thu Oct 22 15:03:05 2009 -0500
Remove unnecessary casting
gtk/gtkaboutdialog.c | 106 +++++++++++++++++++------------------------------
1 files changed, 41 insertions(+), 65 deletions(-)
---
diff --git a/gtk/gtkaboutdialog.c b/gtk/gtkaboutdialog.c
index 40bbb30..94ff496 100644
--- a/gtk/gtkaboutdialog.c
+++ b/gtk/gtkaboutdialog.c
@@ -647,7 +647,7 @@ static void
gtk_about_dialog_finalize (GObject *object)
{
GtkAboutDialog *about = GTK_ABOUT_DIALOG (object);
- GtkAboutDialogPrivate *priv = (GtkAboutDialogPrivate *)about->priv;
+ GtkAboutDialogPrivate *priv = about->priv;
g_free (priv->name);
g_free (priv->version);
@@ -678,7 +678,7 @@ gtk_about_dialog_set_property (GObject *object,
GParamSpec *pspec)
{
GtkAboutDialog *about = GTK_ABOUT_DIALOG (object);
- GtkAboutDialogPrivate *priv = (GtkAboutDialogPrivate *)about->priv;
+ GtkAboutDialogPrivate *priv = about->priv;
switch (prop_id)
{
@@ -737,7 +737,7 @@ gtk_about_dialog_get_property (GObject *object,
GParamSpec *pspec)
{
GtkAboutDialog *about = GTK_ABOUT_DIALOG (object);
- GtkAboutDialogPrivate *priv = (GtkAboutDialogPrivate *)about->priv;
+ GtkAboutDialogPrivate *priv = about->priv;
switch (prop_id)
{
@@ -803,7 +803,7 @@ gtk_about_dialog_get_property (GObject *object,
static void
update_website (GtkAboutDialog *about)
{
- GtkAboutDialogPrivate *priv = (GtkAboutDialogPrivate *)about->priv;
+ GtkAboutDialogPrivate *priv = about->priv;
if (priv->website_url && (!activate_url_hook_set || activate_url_hook != NULL))
{
@@ -856,7 +856,7 @@ gtk_about_dialog_get_program_name (GtkAboutDialog *about)
g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL);
- priv = (GtkAboutDialogPrivate *)about->priv;
+ priv = about->priv;
return priv->name;
}
@@ -867,7 +867,7 @@ update_name_version (GtkAboutDialog *about)
GtkAboutDialogPrivate *priv;
gchar *title_string, *name_string;
- priv = (GtkAboutDialogPrivate *)about->priv;
+ priv = about->priv;
title_string = g_strdup_printf (_("About %s"), priv->name);
gtk_window_set_title (GTK_WINDOW (about), title_string);
@@ -904,7 +904,7 @@ gtk_about_dialog_set_program_name (GtkAboutDialog *about,
g_return_if_fail (GTK_IS_ABOUT_DIALOG (about));
- priv = (GtkAboutDialogPrivate *)about->priv;
+ priv = about->priv;
tmp = priv->name;
priv->name = g_strdup (name ? name : g_get_application_name ());
g_free (tmp);
@@ -929,13 +929,9 @@ gtk_about_dialog_set_program_name (GtkAboutDialog *about,
G_CONST_RETURN gchar *
gtk_about_dialog_get_version (GtkAboutDialog *about)
{
- GtkAboutDialogPrivate *priv;
-
g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL);
- priv = (GtkAboutDialogPrivate *)about->priv;
-
- return priv->version;
+ return about->priv->version;
}
/**
@@ -956,8 +952,8 @@ gtk_about_dialog_set_version (GtkAboutDialog *about,
g_return_if_fail (GTK_IS_ABOUT_DIALOG (about));
- priv = (GtkAboutDialogPrivate *)about->priv;
-
+ priv = about->priv;
+
tmp = priv->version;
priv->version = g_strdup (version);
g_free (tmp);
@@ -981,13 +977,9 @@ gtk_about_dialog_set_version (GtkAboutDialog *about,
G_CONST_RETURN gchar *
gtk_about_dialog_get_copyright (GtkAboutDialog *about)
{
- GtkAboutDialogPrivate *priv;
-
g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL);
- priv = (GtkAboutDialogPrivate *)about->priv;
-
- return priv->copyright;
+ return about->priv->copyright;
}
/**
@@ -1009,8 +1001,8 @@ gtk_about_dialog_set_copyright (GtkAboutDialog *about,
g_return_if_fail (GTK_IS_ABOUT_DIALOG (about));
- priv = (GtkAboutDialogPrivate *)about->priv;
-
+ priv = about->priv;
+
tmp = priv->copyright;
priv->copyright = g_strdup (copyright);
g_free (tmp);
@@ -1044,13 +1036,9 @@ gtk_about_dialog_set_copyright (GtkAboutDialog *about,
G_CONST_RETURN gchar *
gtk_about_dialog_get_comments (GtkAboutDialog *about)
{
- GtkAboutDialogPrivate *priv;
-
g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL);
- priv = (GtkAboutDialogPrivate *)about->priv;
-
- return priv->comments;
+ return about->priv->comments;
}
/**
@@ -1073,7 +1061,7 @@ gtk_about_dialog_set_comments (GtkAboutDialog *about,
g_return_if_fail (GTK_IS_ABOUT_DIALOG (about));
- priv = (GtkAboutDialogPrivate *)about->priv;
+ priv = about->priv;
tmp = priv->comments;
if (comments)
@@ -1106,13 +1094,9 @@ gtk_about_dialog_set_comments (GtkAboutDialog *about,
G_CONST_RETURN gchar *
gtk_about_dialog_get_license (GtkAboutDialog *about)
{
- GtkAboutDialogPrivate *priv;
-
g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL);
- priv = (GtkAboutDialogPrivate *)about->priv;
-
- return priv->license;
+ return about->priv->license;
}
/**
@@ -1135,7 +1119,7 @@ gtk_about_dialog_set_license (GtkAboutDialog *about,
g_return_if_fail (GTK_IS_ABOUT_DIALOG (about));
- priv = (GtkAboutDialogPrivate *)about->priv;
+ priv = about->priv;
tmp = priv->license;
if (license)
@@ -1167,13 +1151,9 @@ gtk_about_dialog_set_license (GtkAboutDialog *about,
gboolean
gtk_about_dialog_get_wrap_license (GtkAboutDialog *about)
{
- GtkAboutDialogPrivate *priv;
-
g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), FALSE);
- priv = (GtkAboutDialogPrivate *)about->priv;
-
- return priv->wrap_license;
+ return about->priv->wrap_license;
}
/**
@@ -1194,7 +1174,7 @@ gtk_about_dialog_set_wrap_license (GtkAboutDialog *about,
g_return_if_fail (GTK_IS_ABOUT_DIALOG (about));
- priv = (GtkAboutDialogPrivate *)about->priv;
+ priv = about->priv;
wrap_license = wrap_license != FALSE;
@@ -1224,7 +1204,7 @@ gtk_about_dialog_get_website (GtkAboutDialog *about)
g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL);
- priv = (GtkAboutDialogPrivate *)about->priv;
+ priv = about->priv;
return priv->website_url;
}
@@ -1250,7 +1230,7 @@ gtk_about_dialog_set_website (GtkAboutDialog *about,
g_return_if_fail (GTK_IS_ABOUT_DIALOG (about));
- priv = (GtkAboutDialogPrivate *)about->priv;
+ priv = about->priv;
tmp = priv->website_url;
priv->website_url = g_strdup (website);
@@ -1279,7 +1259,7 @@ gtk_about_dialog_get_website_label (GtkAboutDialog *about)
g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL);
- priv = (GtkAboutDialogPrivate *)about->priv;
+ priv = about->priv;
return priv->website_text;
}
@@ -1303,7 +1283,7 @@ gtk_about_dialog_set_website_label (GtkAboutDialog *about,
g_return_if_fail (GTK_IS_ABOUT_DIALOG (about));
- priv = (GtkAboutDialogPrivate *)about->priv;
+ priv = about->priv;
tmp = priv->website_text;
priv->website_text = g_strdup (website_label);
@@ -1334,7 +1314,7 @@ gtk_about_dialog_get_authors (GtkAboutDialog *about)
g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL);
- priv = (GtkAboutDialogPrivate *)about->priv;
+ priv = about->priv;
return (const gchar * const *) priv->authors;
}
@@ -1376,7 +1356,7 @@ gtk_about_dialog_set_authors (GtkAboutDialog *about,
g_return_if_fail (GTK_IS_ABOUT_DIALOG (about));
- priv = (GtkAboutDialogPrivate *)about->priv;
+ priv = about->priv;
tmp = priv->authors;
priv->authors = g_strdupv ((gchar **)authors);
@@ -1407,7 +1387,7 @@ gtk_about_dialog_get_documenters (GtkAboutDialog *about)
g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL);
- priv = (GtkAboutDialogPrivate *)about->priv;
+ priv = about->priv;
return (const gchar * const *)priv->documenters;
}
@@ -1431,7 +1411,7 @@ gtk_about_dialog_set_documenters (GtkAboutDialog *about,
g_return_if_fail (GTK_IS_ABOUT_DIALOG (about));
- priv = (GtkAboutDialogPrivate *)about->priv;
+ priv = about->priv;
tmp = priv->documenters;
priv->documenters = g_strdupv ((gchar **)documenters);
@@ -1462,7 +1442,7 @@ gtk_about_dialog_get_artists (GtkAboutDialog *about)
g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL);
- priv = (GtkAboutDialogPrivate *)about->priv;
+ priv = about->priv;
return (const gchar * const *)priv->artists;
}
@@ -1486,7 +1466,7 @@ gtk_about_dialog_set_artists (GtkAboutDialog *about,
g_return_if_fail (GTK_IS_ABOUT_DIALOG (about));
- priv = (GtkAboutDialogPrivate *)about->priv;
+ priv = about->priv;
tmp = priv->artists;
priv->artists = g_strdupv ((gchar **)artists);
@@ -1512,13 +1492,9 @@ gtk_about_dialog_set_artists (GtkAboutDialog *about,
G_CONST_RETURN gchar *
gtk_about_dialog_get_translator_credits (GtkAboutDialog *about)
{
- GtkAboutDialogPrivate *priv;
-
g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL);
- priv = (GtkAboutDialogPrivate *)about->priv;
-
- return priv->translator_credits;
+ return about->priv->translator_credits;
}
/**
@@ -1552,7 +1528,7 @@ gtk_about_dialog_set_translator_credits (GtkAboutDialog *about,
g_return_if_fail (GTK_IS_ABOUT_DIALOG (about));
- priv = (GtkAboutDialogPrivate *)about->priv;
+ priv = about->priv;
tmp = priv->translator_credits;
priv->translator_credits = g_strdup (translator_credits);
@@ -1582,7 +1558,7 @@ gtk_about_dialog_get_logo (GtkAboutDialog *about)
g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL);
- priv = (GtkAboutDialogPrivate *)about->priv;
+ priv = about->priv;
if (gtk_image_get_storage_type (GTK_IMAGE (priv->logo_image)) == GTK_IMAGE_PIXBUF)
return gtk_image_get_pixbuf (GTK_IMAGE (priv->logo_image));
@@ -1628,7 +1604,7 @@ gtk_about_dialog_set_logo (GtkAboutDialog *about,
g_return_if_fail (GTK_IS_ABOUT_DIALOG (about));
- priv = (GtkAboutDialogPrivate *)about->priv;
+ priv = about->priv;
g_object_freeze_notify (G_OBJECT (about));
@@ -1678,7 +1654,7 @@ gtk_about_dialog_get_logo_icon_name (GtkAboutDialog *about)
g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL);
- priv = (GtkAboutDialogPrivate *)about->priv;
+ priv = about->priv;
if (gtk_image_get_storage_type (GTK_IMAGE (priv->logo_image)) == GTK_IMAGE_ICON_NAME)
gtk_image_get_icon_name (GTK_IMAGE (priv->logo_image), &icon_name, NULL);
@@ -1706,7 +1682,7 @@ gtk_about_dialog_set_logo_icon_name (GtkAboutDialog *about,
g_return_if_fail (GTK_IS_ABOUT_DIALOG (about));
- priv = (GtkAboutDialogPrivate *)about->priv;
+ priv = about->priv;
g_object_freeze_notify (G_OBJECT (about));
@@ -1750,7 +1726,7 @@ follow_if_link (GtkAboutDialog *about,
GtkTextIter *iter)
{
GSList *tags = NULL, *tagp = NULL;
- GtkAboutDialogPrivate *priv = (GtkAboutDialogPrivate *)about->priv;
+ GtkAboutDialogPrivate *priv = about->priv;
gchar *url = NULL;
GtkAboutDialogActivateLinkFunc email_hook, url_hook;
gpointer email_hook_data, url_hook_data;
@@ -1891,7 +1867,7 @@ set_cursor_if_appropriate (GtkAboutDialog *about,
gint x,
gint y)
{
- GtkAboutDialogPrivate *priv = (GtkAboutDialogPrivate *)about->priv;
+ GtkAboutDialogPrivate *priv = about->priv;
GSList *tags = NULL, *tagp = NULL;
GtkTextIter iter;
gboolean hovering_over_link = FALSE;
@@ -1980,7 +1956,7 @@ text_view_new (GtkAboutDialog *about,
GdkColor color;
GdkColor link_color;
GdkColor visited_link_color;
- GtkAboutDialogPrivate *priv = (GtkAboutDialogPrivate *)about->priv;
+ GtkAboutDialogPrivate *priv = about->priv;
linkify_email = (!activate_email_hook_set || activate_email_hook != NULL);
linkify_urls = (!activate_url_hook_set || activate_url_hook != NULL);
@@ -2136,7 +2112,7 @@ display_credits_dialog (GtkWidget *button,
gpointer data)
{
GtkAboutDialog *about = (GtkAboutDialog *)data;
- GtkAboutDialogPrivate *priv = (GtkAboutDialogPrivate *)about->priv;
+ GtkAboutDialogPrivate *priv = about->priv;
GtkWidget *dialog, *notebook;
GtkDialog *credits_dialog;
GtkWidget *content_area;
@@ -2218,7 +2194,7 @@ display_license_dialog (GtkWidget *button,
gpointer data)
{
GtkAboutDialog *about = (GtkAboutDialog *)data;
- GtkAboutDialogPrivate *priv = (GtkAboutDialogPrivate *)about->priv;
+ GtkAboutDialogPrivate *priv = about->priv;
GtkWidget *dialog, *view, *sw;
GtkDialog *license_dialog;
GtkWidget *content_area;
@@ -2371,7 +2347,7 @@ gtk_about_dialog_set_url_hook (GtkAboutDialogActivateLinkFunc func,
static void
close_cb (GtkAboutDialog *about)
{
- GtkAboutDialogPrivate *priv = (GtkAboutDialogPrivate *)about->priv;
+ GtkAboutDialogPrivate *priv = about->priv;
if (priv->license_dialog != NULL)
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]