GNOME.org
 

[recipes] Cosmetic cleanup

commit 91e79b3039cfe4c45e400d00b332f12023a23fca
Author: Matthias Clasen <mclasen redhat com>
Date:   Tue Jan 10 08:33:15 2017 -0500

    Cosmetic cleanup
    
    Use a local widget_class instead of casting a million times.

 src/gr-cuisines-page.c |   10 ++--
 src/gr-edit-page.c     |  112 ++++++++++++++++++++++++------------------------
 src/gr-list-page.c     |   22 +++++-----
 src/gr-preferences.c   |   17 ++++---
 src/gr-recipes-page.c  |   16 +++---
 5 files changed, 89 insertions(+), 88 deletions(-)
---
diff --git a/src/gr-cuisines-page.c b/src/gr-cuisines-page.c
index 4300fc9..a0377d7 100644
--- a/src/gr-cuisines-page.c
+++ b/src/gr-cuisines-page.c
@@ -213,11 +213,11 @@ gr_cuisines_page_class_init (GrCuisinesPageClass *klass)
 
         gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/Recipes/gr-cuisines-page.ui");
 
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrCuisinesPage, top_box);
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrCuisinesPage, seasonal_box);
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrCuisinesPage, seasonal_box2);
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrCuisinesPage, seasonal_more);
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrCuisinesPage, 
seasonal_expander_image);
+        gtk_widget_class_bind_template_child (widget_class, GrCuisinesPage, top_box);
+        gtk_widget_class_bind_template_child (widget_class, GrCuisinesPage, seasonal_box);
+        gtk_widget_class_bind_template_child (widget_class, GrCuisinesPage, seasonal_box2);
+        gtk_widget_class_bind_template_child (widget_class, GrCuisinesPage, seasonal_more);
+        gtk_widget_class_bind_template_child (widget_class, GrCuisinesPage, seasonal_expander_image);
 
          gtk_widget_class_bind_template_callback (widget_class, expander_button_clicked);
 }
diff --git a/src/gr-edit-page.c b/src/gr-edit-page.c
index ef7257a..9b98aa5 100644
--- a/src/gr-edit-page.c
+++ b/src/gr-edit-page.c
@@ -1305,62 +1305,62 @@ gr_edit_page_class_init (GrEditPageClass *klass)
 
         gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/Recipes/gr-edit-page.ui");
 
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrEditPage, error_revealer);
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrEditPage, error_label);
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrEditPage, name_label);
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrEditPage, name_entry);
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrEditPage, cuisine_combo);
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrEditPage, category_combo);
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrEditPage, season_combo);
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrEditPage, prep_time_combo);
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrEditPage, cook_time_combo);
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrEditPage, serves_spin);
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrEditPage, spiciness_combo);
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrEditPage, description_field);
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrEditPage, instructions_field);
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrEditPage, gluten_free_check);
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrEditPage, nut_free_check);
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrEditPage, vegan_check);
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrEditPage, vegetarian_check);
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrEditPage, milk_free_check);
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrEditPage, images);
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrEditPage, add_image_button);
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrEditPage, remove_image_button);
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrEditPage, 
rotate_image_left_button);
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrEditPage, 
rotate_image_right_button);
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrEditPage, author_label);
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrEditPage, ingredients_box);
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrEditPage, ingredient_popover);
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrEditPage, new_ingredient_name);
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrEditPage, new_ingredient_amount);
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrEditPage, new_ingredient_unit);
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrEditPage, 
new_ingredient_add_button);
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrEditPage, ing_list);
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrEditPage, ing_search_button);
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrEditPage, ing_search_button_label);
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrEditPage, ing_search_revealer);
-
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrEditPage, unit_list);
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrEditPage, amount_search_button);
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrEditPage, 
amount_search_button_label);
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrEditPage, amount_search_revealer);
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrEditPage, recipe_popover);
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrEditPage, recipe_list);
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrEditPage, recipe_filter_entry);
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrEditPage, add_recipe_button);
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrEditPage, link_image_button);
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrEditPage, image_popover);
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrEditPage, image_flowbox);
-
-        gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (klass), dismiss_error);
-        gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (klass), add_image);
-        gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (klass), remove_image);
-        gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (klass), rotate_image_left);
-        gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (klass), rotate_image_right);
-        gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (klass), images_changed);
-        gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (klass), add_ingredient2);
-        gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (klass), remove_ingredient);
-        gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (klass), ingredient_changed);
+        gtk_widget_class_bind_template_child (widget_class, GrEditPage, error_revealer);
+        gtk_widget_class_bind_template_child (widget_class, GrEditPage, error_label);
+        gtk_widget_class_bind_template_child (widget_class, GrEditPage, name_label);
+        gtk_widget_class_bind_template_child (widget_class, GrEditPage, name_entry);
+        gtk_widget_class_bind_template_child (widget_class, GrEditPage, cuisine_combo);
+        gtk_widget_class_bind_template_child (widget_class, GrEditPage, category_combo);
+        gtk_widget_class_bind_template_child (widget_class, GrEditPage, season_combo);
+        gtk_widget_class_bind_template_child (widget_class, GrEditPage, prep_time_combo);
+        gtk_widget_class_bind_template_child (widget_class, GrEditPage, cook_time_combo);
+        gtk_widget_class_bind_template_child (widget_class, GrEditPage, serves_spin);
+        gtk_widget_class_bind_template_child (widget_class, GrEditPage, spiciness_combo);
+        gtk_widget_class_bind_template_child (widget_class, GrEditPage, description_field);
+        gtk_widget_class_bind_template_child (widget_class, GrEditPage, instructions_field);
+        gtk_widget_class_bind_template_child (widget_class, GrEditPage, gluten_free_check);
+        gtk_widget_class_bind_template_child (widget_class, GrEditPage, nut_free_check);
+        gtk_widget_class_bind_template_child (widget_class, GrEditPage, vegan_check);
+        gtk_widget_class_bind_template_child (widget_class, GrEditPage, vegetarian_check);
+        gtk_widget_class_bind_template_child (widget_class, GrEditPage, milk_free_check);
+        gtk_widget_class_bind_template_child (widget_class, GrEditPage, images);
+        gtk_widget_class_bind_template_child (widget_class, GrEditPage, add_image_button);
+        gtk_widget_class_bind_template_child (widget_class, GrEditPage, remove_image_button);
+        gtk_widget_class_bind_template_child (widget_class, GrEditPage, rotate_image_left_button);
+        gtk_widget_class_bind_template_child (widget_class, GrEditPage, rotate_image_right_button);
+        gtk_widget_class_bind_template_child (widget_class, GrEditPage, author_label);
+        gtk_widget_class_bind_template_child (widget_class, GrEditPage, ingredients_box);
+        gtk_widget_class_bind_template_child (widget_class, GrEditPage, ingredient_popover);
+        gtk_widget_class_bind_template_child (widget_class, GrEditPage, new_ingredient_name);
+        gtk_widget_class_bind_template_child (widget_class, GrEditPage, new_ingredient_amount);
+        gtk_widget_class_bind_template_child (widget_class, GrEditPage, new_ingredient_unit);
+        gtk_widget_class_bind_template_child (widget_class, GrEditPage, new_ingredient_add_button);
+        gtk_widget_class_bind_template_child (widget_class, GrEditPage, ing_list);
+        gtk_widget_class_bind_template_child (widget_class, GrEditPage, ing_search_button);
+        gtk_widget_class_bind_template_child (widget_class, GrEditPage, ing_search_button_label);
+        gtk_widget_class_bind_template_child (widget_class, GrEditPage, ing_search_revealer);
+
+        gtk_widget_class_bind_template_child (widget_class, GrEditPage, unit_list);
+        gtk_widget_class_bind_template_child (widget_class, GrEditPage, amount_search_button);
+        gtk_widget_class_bind_template_child (widget_class, GrEditPage, amount_search_button_label);
+        gtk_widget_class_bind_template_child (widget_class, GrEditPage, amount_search_revealer);
+        gtk_widget_class_bind_template_child (widget_class, GrEditPage, recipe_popover);
+        gtk_widget_class_bind_template_child (widget_class, GrEditPage, recipe_list);
+        gtk_widget_class_bind_template_child (widget_class, GrEditPage, recipe_filter_entry);
+        gtk_widget_class_bind_template_child (widget_class, GrEditPage, add_recipe_button);
+        gtk_widget_class_bind_template_child (widget_class, GrEditPage, link_image_button);
+        gtk_widget_class_bind_template_child (widget_class, GrEditPage, image_popover);
+        gtk_widget_class_bind_template_child (widget_class, GrEditPage, image_flowbox);
+
+        gtk_widget_class_bind_template_callback (widget_class, dismiss_error);
+        gtk_widget_class_bind_template_callback (widget_class, add_image);
+        gtk_widget_class_bind_template_callback (widget_class, remove_image);
+        gtk_widget_class_bind_template_callback (widget_class, rotate_image_left);
+        gtk_widget_class_bind_template_callback (widget_class, rotate_image_right);
+        gtk_widget_class_bind_template_callback (widget_class, images_changed);
+        gtk_widget_class_bind_template_callback (widget_class, add_ingredient2);
+        gtk_widget_class_bind_template_callback (widget_class, remove_ingredient);
+        gtk_widget_class_bind_template_callback (widget_class, ingredient_changed);
 
         gtk_widget_class_bind_template_callback (widget_class, ing_filter_changed);
         gtk_widget_class_bind_template_callback (widget_class, ing_filter_stop);
diff --git a/src/gr-list-page.c b/src/gr-list-page.c
index 737d616..d2cfd47 100644
--- a/src/gr-list-page.c
+++ b/src/gr-list-page.c
@@ -199,17 +199,17 @@ gr_list_page_class_init (GrListPageClass *klass)
 
         gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/Recipes/gr-list-page.ui");
 
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrListPage, top_box);
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrListPage, flow_box);
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrListPage, list_stack);
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrListPage, empty_title);
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrListPage, empty_subtitle);
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrListPage, chef_grid);
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrListPage, chef_image);
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrListPage, chef_fullname);
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrListPage, chef_description);
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrListPage, heading);
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrListPage, diet_description);
+        gtk_widget_class_bind_template_child (widget_class, GrListPage, top_box);
+        gtk_widget_class_bind_template_child (widget_class, GrListPage, flow_box);
+        gtk_widget_class_bind_template_child (widget_class, GrListPage, list_stack);
+        gtk_widget_class_bind_template_child (widget_class, GrListPage, empty_title);
+        gtk_widget_class_bind_template_child (widget_class, GrListPage, empty_subtitle);
+        gtk_widget_class_bind_template_child (widget_class, GrListPage, chef_grid);
+        gtk_widget_class_bind_template_child (widget_class, GrListPage, chef_image);
+        gtk_widget_class_bind_template_child (widget_class, GrListPage, chef_fullname);
+        gtk_widget_class_bind_template_child (widget_class, GrListPage, chef_description);
+        gtk_widget_class_bind_template_child (widget_class, GrListPage, heading);
+        gtk_widget_class_bind_template_child (widget_class, GrListPage, diet_description);
 }
 
 GtkWidget *
diff --git a/src/gr-preferences.c b/src/gr-preferences.c
index d601105..7ed5a8b 100644
--- a/src/gr-preferences.c
+++ b/src/gr-preferences.c
@@ -219,21 +219,22 @@ static void
 gr_preferences_class_init (GrPreferencesClass *klass)
 {
         GObjectClass *object_class = G_OBJECT_CLASS (klass);
+        GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
 
         object_class->finalize = gr_preferences_finalize;
 
         gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (klass),
                                                      "/org/gnome/Recipes/gr-preferences.ui");
 
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrPreferences, fullname);
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrPreferences, name);
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrPreferences, description);
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrPreferences, image);
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrPreferences, error_revealer);
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrPreferences, error_label);
+        gtk_widget_class_bind_template_child (widget_class, GrPreferences, fullname);
+        gtk_widget_class_bind_template_child (widget_class, GrPreferences, name);
+        gtk_widget_class_bind_template_child (widget_class, GrPreferences, description);
+        gtk_widget_class_bind_template_child (widget_class, GrPreferences, image);
+        gtk_widget_class_bind_template_child (widget_class, GrPreferences, error_revealer);
+        gtk_widget_class_bind_template_child (widget_class, GrPreferences, error_label);
 
-        gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (klass), dismiss_error);
-        gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (klass), image_button_clicked);
+        gtk_widget_class_bind_template_callback (widget_class, dismiss_error);
+        gtk_widget_class_bind_template_callback (widget_class, image_button_clicked);
 }
 
 GrPreferences *
diff --git a/src/gr-recipes-page.c b/src/gr-recipes-page.c
index 80c32fc..080f626 100644
--- a/src/gr-recipes-page.c
+++ b/src/gr-recipes-page.c
@@ -137,14 +137,14 @@ gr_recipes_page_class_init (GrRecipesPageClass *klass)
 
         gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/Recipes/gr-recipes-page.ui");
 
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrRecipesPage, today_box);
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrRecipesPage, pick_box);
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrRecipesPage, diet_box);
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrRecipesPage, chefs_box);
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrRecipesPage, 
categories_expander_image);
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrRecipesPage, diet_box2);
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrRecipesPage, diet_more);
-        gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GrRecipesPage, scrolled_win);
+        gtk_widget_class_bind_template_child (widget_class, GrRecipesPage, today_box);
+        gtk_widget_class_bind_template_child (widget_class, GrRecipesPage, pick_box);
+        gtk_widget_class_bind_template_child (widget_class, GrRecipesPage, diet_box);
+        gtk_widget_class_bind_template_child (widget_class, GrRecipesPage, chefs_box);
+        gtk_widget_class_bind_template_child (widget_class, GrRecipesPage, categories_expander_image);
+        gtk_widget_class_bind_template_child (widget_class, GrRecipesPage, diet_box2);
+        gtk_widget_class_bind_template_child (widget_class, GrRecipesPage, diet_more);
+        gtk_widget_class_bind_template_child (widget_class, GrRecipesPage, scrolled_win);
 
         gtk_widget_class_bind_template_callback (widget_class, show_chef_list);
         gtk_widget_class_bind_template_callback (widget_class, expander_button_clicked);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]