gnome-games r8644 - in trunk: aisleriot libgames-support
- From: chpe svn gnome org
- To: svn-commits-list gnome org
- Subject: gnome-games r8644 - in trunk: aisleriot libgames-support
- Date: Tue, 3 Feb 2009 18:24:52 +0000 (UTC)
Author: chpe
Date: Tue Feb 3 18:24:52 2009
New Revision: 8644
URL: http://svn.gnome.org/viewvc/gnome-games?rev=8644&view=rev
Log:
Fix -Wshadow warnings.
Modified:
trunk/aisleriot/board-noclutter.c
trunk/aisleriot/game.c
trunk/aisleriot/sol.c
trunk/libgames-support/games-card-images.c
trunk/libgames-support/games-card.c
trunk/libgames-support/games-clock.c
trunk/libgames-support/games-clock.h
trunk/libgames-support/games-dlg-players.c
trunk/libgames-support/games-scores-backend.c
trunk/libgames-support/games-scores-backend.h
trunk/libgames-support/games-string-utils.c
Modified: trunk/aisleriot/board-noclutter.c
==============================================================================
--- trunk/aisleriot/board-noclutter.c (original)
+++ trunk/aisleriot/board-noclutter.c Tue Feb 3 18:24:52 2009
@@ -3145,7 +3145,7 @@
GByteArray *cards = hslot->cards;
gpointer *card_images = hslot->card_images->pdata;
GdkRectangle card_rect;
- guint i, n_cards;
+ guint j, n_cards;
n_cards = cards->len;
if (n_cards == 0)
@@ -3161,7 +3161,7 @@
card_rect.x += hslot->rect.width - priv->card_size.width;
}
- for (i = n_cards - hslot->exposed; i < n_cards; ++i) {
+ for (j = n_cards - hslot->exposed; j < n_cards; ++j) {
/* Check whether this card needs to be drawn */
/* FIXMEchpe: we can be even smarter here, by checking
* with the rect of the part of the card that's not going
@@ -3173,7 +3173,7 @@
if (PIXBUF_DRAWING_LIKELIHOOD (use_pixbuf_drawing)) {
GdkPixbuf *pixbuf;
- pixbuf = card_images[i];
+ pixbuf = card_images[j];
if (!pixbuf)
goto next;
@@ -3184,7 +3184,7 @@
} else {
GdkPixmap *pixmap;
- pixmap = card_images[i];
+ pixmap = card_images[j];
if (!pixmap)
goto next;
Modified: trunk/aisleriot/game.c
==============================================================================
--- trunk/aisleriot/game.c (original)
+++ trunk/aisleriot/game.c Tue Feb 3 18:24:52 2009
@@ -2357,9 +2357,9 @@
}
if (card_num >= n_cards - exposed) {
- gint index = card_num + exposed - n_cards;
- *xoff = slot->pixeldx * index;
- *yoff = slot->pixeldy * index;
+ gint idx = card_num + exposed - n_cards;
+ *xoff = slot->pixeldx * idx;
+ *yoff = slot->pixeldy * idx;
} else {
*xoff = 0;
*yoff = 0;
Modified: trunk/aisleriot/sol.c
==============================================================================
--- trunk/aisleriot/sol.c (original)
+++ trunk/aisleriot/sol.c Tue Feb 3 18:24:52 2009
@@ -88,7 +88,7 @@
static void
about_url_hook (GtkAboutDialog *about,
- const char *link,
+ const char *uri,
gpointer user_data)
{
#if defined(HAVE_MAEMO)
@@ -98,11 +98,11 @@
"osso_browser",
OSSO_BROWSER_OPEN_NEW_WINDOW_REQ,
NULL,
- DBUS_TYPE_STRING, link,
+ DBUS_TYPE_STRING, uri,
DBUS_TYPE_INVALID);
#elif defined (G_OS_WIN32)
- ShellExecute( NULL, "open", link, NULL, NULL, SW_SHOWNORMAL );
+ ShellExecute( NULL, "open", uri, NULL, NULL, SW_SHOWNORMAL );
#else
GdkScreen *screen;
@@ -110,7 +110,7 @@
screen = gtk_widget_get_screen (GTK_WIDGET (about));
- if (!gtk_show_uri (screen, link, gtk_get_current_event_time (), &error)) {
+ if (!gtk_show_uri (screen, uri, gtk_get_current_event_time (), &error)) {
GtkWidget *dialog;
dialog = gtk_message_dialog_new (GTK_WINDOW (about),
Modified: trunk/libgames-support/games-card-images.c
==============================================================================
--- trunk/libgames-support/games-card-images.c (original)
+++ trunk/libgames-support/games-card-images.c Tue Feb 3 18:24:52 2009
@@ -590,10 +590,8 @@
games_card_images_get_card_pixbuf (GamesCardImages * images,
Card card, gboolean highlighted)
{
- guint index = _games_card_to_index (card);
-
return games_card_images_get_card_pixbuf_by_id (images,
- index,
+ _games_card_to_index (card),
highlighted);
}
@@ -742,10 +740,8 @@
games_card_images_get_card_pixmap (GamesCardImages * images,
Card card, gboolean highlighted)
{
- guint index = _games_card_to_index (card);
-
return games_card_images_get_card_pixmap_by_id (images,
- index,
+ _games_card_to_index (card),
highlighted);
}
Modified: trunk/libgames-support/games-card.c
==============================================================================
--- trunk/libgames-support/games-card.c (original)
+++ trunk/libgames-support/games-card.c Tue Feb 3 18:24:52 2009
@@ -179,7 +179,7 @@
games_card_get_localised_rank_symbol (int rank)
{
#if GLIB_CHECK_VERSION (2, 18, 0)
- static const char *ranks[] = {
+ static const char *rank_texts[] = {
/* Translators: this is the symbol that's on a Joker card */
NC_("card symbol", "JOKER"),
/* Translators: this is the symbol that's on an Ace card */
@@ -214,14 +214,14 @@
g_return_val_if_fail (rank >= GAMES_CARD_JOKER && rank <= GAMES_CARD_ACE_HIGH, NULL);
- return g_dpgettext2 (GETTEXT_PACKAGE, "card symbol", ranks[rank]);
+ return g_dpgettext2 (GETTEXT_PACKAGE, "card symbol", rank_texts[rank]);
#else
- static const char ranks[][6] = { "JOKER", "A", "1", "2", "3", "4", "5", "6", "7", "8", "9", "J", "Q", "K", "A" };
+ static const char rank_texts[][6] = { "JOKER", "A", "1", "2", "3", "4", "5", "6", "7", "8", "9", "J", "Q", "K", "A" };
g_return_val_if_fail (rank >= GAMES_CARD_JOKER && rank <= GAMES_CARD_ACE_HIGH, NULL);
- return ranks[rank];
+ return rank_texts[rank];
#endif /* GLIB >= 2.18.0 */
}
Modified: trunk/libgames-support/games-clock.c
==============================================================================
--- trunk/libgames-support/games-clock.c (original)
+++ trunk/libgames-support/games-clock.c Tue Feb 3 18:24:52 2009
@@ -17,11 +17,11 @@
static void
games_clock_finalize (GObject * object)
{
- GamesClock *clock = GAMES_CLOCK (object);
+ GamesClock *clock_widget = GAMES_CLOCK (object);
- if (clock->timer_id != 0) {
- g_source_remove (clock->timer_id);
- clock->timer_id = 0;
+ if (clock_widget->timer_id != 0) {
+ g_source_remove (clock_widget->timer_id);
+ clock_widget->timer_id = 0;
}
G_OBJECT_CLASS (games_clock_parent_class)->finalize (object);
@@ -36,12 +36,12 @@
}
static void
-games_clock_init (GamesClock * clock)
+games_clock_init (GamesClock *clock_widget)
{
- clock->timer_id = 0;
- clock->seconds = 0;
+ clock_widget->timer_id = 0;
+ clock_widget->seconds = 0;
- gtk_label_set_text (GTK_LABEL (clock), "00:00:00");
+ gtk_label_set_text (GTK_LABEL (clock_widget), "00:00:00");
}
GtkWidget *
@@ -51,84 +51,84 @@
}
static void
-clock_paint (GamesClock * clock)
+clock_paint (GamesClock *clock_widget)
{
char string[32];
int secs;
int mins;
int hours;
- hours = clock->seconds / 3600;
- secs = clock->seconds - hours * 3600;
+ hours = clock_widget->seconds / 3600;
+ secs = clock_widget->seconds - hours * 3600;
mins = secs / 60;
secs = secs - mins * 60;
/* FIXMEchpe: i18n! */
g_snprintf (string, sizeof (string), "%.2d:%.2d:%.2d", hours, mins, secs);
- gtk_label_set_text (GTK_LABEL (clock), string);
+ gtk_label_set_text (GTK_LABEL (clock_widget), string);
}
static gboolean
-games_clock_update (GamesClock * clock)
+games_clock_update (GamesClock *clock_widget)
{
- clock->seconds++;
+ clock_widget->seconds++;
- clock_paint (clock);
+ clock_paint (clock_widget);
return TRUE;
}
void
-games_clock_start (GamesClock * clock)
+games_clock_start (GamesClock *clock_widget)
{
- g_return_if_fail (GAMES_IS_CLOCK (clock));
+ g_return_if_fail (GAMES_IS_CLOCK (clock_widget));
- if (clock->timer_id != 0)
+ if (clock_widget->timer_id != 0)
return;
- clock->timer_id = g_timeout_add (1000,
- (GSourceFunc) games_clock_update, clock);
+ clock_widget->timer_id = g_timeout_add (1000,
+ (GSourceFunc) games_clock_update, clock_widget);
}
void
-games_clock_stop (GamesClock * clock)
+games_clock_stop (GamesClock *clock_widget)
{
- g_return_if_fail (GAMES_IS_CLOCK (clock));
+ g_return_if_fail (GAMES_IS_CLOCK (clock_widget));
- if (clock->timer_id == 0)
+ if (clock_widget->timer_id == 0)
return;
- g_source_remove (clock->timer_id);
- clock->timer_id = 0;
- clock->stopped = clock->seconds;
+ g_source_remove (clock_widget->timer_id);
+ clock_widget->timer_id = 0;
+ clock_widget->stopped = clock_widget->seconds;
}
void
-games_clock_set_seconds (GamesClock * clock,
+games_clock_set_seconds (GamesClock *clock_widget,
time_t seconds)
{
- g_return_if_fail (GAMES_IS_CLOCK (clock));
+ g_return_if_fail (GAMES_IS_CLOCK (clock_widget));
- clock->seconds = seconds;
- clock_paint (clock);
+ clock_widget->seconds = seconds;
+ clock_paint (clock_widget);
}
time_t
-games_clock_get_seconds (GamesClock * clock)
+games_clock_get_seconds (GamesClock *clock_widget)
{
- g_return_val_if_fail ( GAMES_IS_CLOCK (clock), 0);
+ g_return_val_if_fail ( GAMES_IS_CLOCK (clock_widget), 0);
- return clock->seconds;
+ return clock_widget->seconds;
}
void
-games_clock_add_seconds (GamesClock * clock,
+games_clock_add_seconds (GamesClock *clock_widget,
time_t seconds)
{
- g_return_if_fail (GAMES_IS_CLOCK (clock));
+ g_return_if_fail (GAMES_IS_CLOCK (clock_widget));
- clock->seconds += seconds;
- clock_paint (clock);
+ clock_widget->seconds += seconds;
+ clock_paint (clock_widget);
}
Modified: trunk/libgames-support/games-clock.h
==============================================================================
--- trunk/libgames-support/games-clock.h (original)
+++ trunk/libgames-support/games-clock.h Tue Feb 3 18:24:52 2009
@@ -1,5 +1,5 @@
/*
- * clock.h: Clock widget.
+ *clock_widget.h: Clock widget.
*
* Copyright  2001, 2003 Iain Holmes
* Â 2001 Mark McLoughlin
@@ -36,12 +36,12 @@
GType games_clock_get_type (void);
GtkWidget *games_clock_new (void);
-void games_clock_start (GamesClock * clock);
-void games_clock_stop (GamesClock * clock);
-void games_clock_set_seconds (GamesClock * clock,
+void games_clock_start (GamesClock *clock_widget);
+void games_clock_stop (GamesClock *clock_widget);
+void games_clock_set_seconds (GamesClock *clock_widget,
time_t seconds);
-time_t games_clock_get_seconds (GamesClock * clock);
-void games_clock_add_seconds (GamesClock * clock,
+time_t games_clock_get_seconds (GamesClock *clock_widget);
+void games_clock_add_seconds (GamesClock *clock_widget,
time_t seconds);
G_END_DECLS
Modified: trunk/libgames-support/games-dlg-players.c
==============================================================================
--- trunk/libgames-support/games-dlg-players.c (original)
+++ trunk/libgames-support/games-dlg-players.c Tue Feb 3 18:24:52 2009
@@ -109,11 +109,11 @@
GGZSeat seat = ggzmod_get_seat (ggz, p);
GtkTreeIter iter;
const gchar *status = NULL, *name = NULL;
- gchar num[32];
+ gchar numstr[32];
gtk_list_store_append (store, &iter);
- snprintf (num, sizeof (num), "%d", p);
+ snprintf (numstr, sizeof (numstr), "%d", p);
switch (seat.type) {
case GGZ_SEAT_PLAYER:
status = _("Occupied");
@@ -142,7 +142,7 @@
}
gtk_list_store_set (store, &iter,
- PLAYER_COLUMN_SEAT, num,
+ PLAYER_COLUMN_SEAT, numstr,
PLAYER_COLUMN_ISSPECTATOR,
(gboolean) FALSE, PLAYER_COLUMN_SEATNUM,
(gint) p, PLAYER_COLUMN_TYPE, status,
@@ -191,7 +191,7 @@
GtkWidget *tree;
GtkCellRenderer *renderer;
GtkTreeViewColumn *column;
- GtkTreeSelection *select;
+ GtkTreeSelection *selection;
assert (PLAYER_COLUMNS == 5);
store = gtk_list_store_new (PLAYER_COLUMNS,
@@ -224,8 +224,8 @@
PLAYER_COLUMN_NAME, NULL);
gtk_tree_view_append_column (GTK_TREE_VIEW (tree), column);
- select = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree));
- gtk_tree_selection_set_mode (select, GTK_SELECTION_SINGLE);
+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree));
+ gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE);
/* FIXME: This feature is not supported by gnome-games yet.
* g_signal_connect(tree, "button-press-event",
Modified: trunk/libgames-support/games-scores-backend.c
==============================================================================
--- trunk/libgames-support/games-scores-backend.c (original)
+++ trunk/libgames-support/games-scores-backend.c Tue Feb 3 18:24:52 2009
@@ -72,7 +72,8 @@
GamesScoresBackend *
games_scores_backend_new (GamesScoreStyle style,
- gchar * basename, gchar * name)
+ char *base_name,
+ char *name)
{
GamesScoresBackend *backend;
gchar *fullname;
@@ -81,9 +82,9 @@
NULL));
if (name[0] == '\0') /* Name is "" */
- fullname = g_strjoin (".", basename, "scores", NULL);
+ fullname = g_strjoin (".", base_name, "scores", NULL);
else
- fullname = g_strjoin (".", basename, name, "scores", NULL);
+ fullname = g_strjoin (".", base_name, name, "scores", NULL);
backend->priv->timestamp = 0;
backend->priv->style = style;
Modified: trunk/libgames-support/games-scores-backend.h
==============================================================================
--- trunk/libgames-support/games-scores-backend.h (original)
+++ trunk/libgames-support/games-scores-backend.h Tue Feb 3 18:24:52 2009
@@ -54,7 +54,8 @@
GType games_scores_backend_get_type (void);
GamesScoresBackend *games_scores_backend_new (GamesScoreStyle style,
- gchar * basename, gchar * name);
+ char *base_name,
+ char *name);
GList *games_scores_backend_get_scores (GamesScoresBackend * self);
gboolean games_scores_backend_set_scores (GamesScoresBackend * self,
GList * list);
Modified: trunk/libgames-support/games-string-utils.c
==============================================================================
--- trunk/libgames-support/games-string-utils.c (original)
+++ trunk/libgames-support/games-string-utils.c Tue Feb 3 18:24:52 2009
@@ -41,7 +41,7 @@
char *
games_filename_to_display_name (const char *filename)
{
- char *basename, *display_name, *translated, *p;
+ char *base_name, *display_name, *translated, *p;
GString *prettified_name;
gboolean start_of_word, free_segment;
gunichar c;
@@ -50,18 +50,18 @@
g_return_val_if_fail (filename != NULL, NULL);
- basename = g_path_get_basename (filename);
- g_return_val_if_fail (basename != NULL, NULL);
+ base_name = g_path_get_basename (filename);
+ g_return_val_if_fail (base_name != NULL, NULL);
/* Hide extension */
- g_strdelimit (basename, ".", '\0');
+ g_strdelimit (base_name, ".", '\0');
/* Hide undesirable characters */
- g_strdelimit (basename, NULL, ' ');
+ g_strdelimit (base_name, NULL, ' ');
- g_strstrip (basename);
+ g_strstrip (base_name);
- display_name = g_filename_display_name (basename);
- g_free (basename);
+ display_name = g_filename_display_name (base_name);
+ g_free (base_name);
g_return_val_if_fail (display_name != NULL, NULL);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
