]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
kconfig: gconf: remove global 'model1' and 'model2' variables
authorMasahiro Yamada <masahiroy@kernel.org>
Tue, 24 Jun 2025 15:05:33 +0000 (00:05 +0900)
committerMasahiro Yamada <masahiroy@kernel.org>
Wed, 2 Jul 2025 02:11:52 +0000 (11:11 +0900)
These variables are unnecessary because the current model can be
retrieved using gtk_tree_view_get_model().

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Acked-by: Randy Dunlap <rdunlap@infradead.org>
scripts/kconfig/gconf.c

index e2b98b2205131317a9cc1aff88f52d20c561423c..bf3151382e5db25ecf6d4d4a9512688448608cae 100644 (file)
@@ -44,7 +44,6 @@ static GtkWidget *save_menu_item;
 static GtkTextTag *tag1, *tag2;
 
 static GtkTreeStore *tree1, *tree2;
-static GtkTreeModel *model1, *model2;
 
 static struct menu *browsed; // browsed menu for SINGLE/SPLIT view
 static struct menu *selected; // selected entry
@@ -1266,7 +1265,6 @@ static void init_tree_model(void)
                                          G_TYPE_BOOLEAN, G_TYPE_BOOLEAN,
                                          G_TYPE_BOOLEAN, G_TYPE_BOOLEAN,
                                          G_TYPE_BOOLEAN);
-       model2 = GTK_TREE_MODEL(tree2);
 
        tree1 = gtk_tree_store_new(COL_NUMBER,
                                   G_TYPE_STRING, G_TYPE_STRING,
@@ -1277,7 +1275,6 @@ static void init_tree_model(void)
                                   G_TYPE_BOOLEAN, G_TYPE_BOOLEAN,
                                   G_TYPE_BOOLEAN, G_TYPE_BOOLEAN,
                                   G_TYPE_BOOLEAN);
-       model1 = GTK_TREE_MODEL(tree1);
 }
 
 static void init_left_tree(void)
@@ -1288,7 +1285,7 @@ static void init_left_tree(void)
        GtkTreeViewColumn *column;
        GtkTreeModel *filter;
 
-       filter = gtk_tree_model_filter_new(model1, NULL);
+       filter = gtk_tree_model_filter_new(GTK_TREE_MODEL(tree1), NULL);
 
        gtk_tree_model_filter_set_visible_func(GTK_TREE_MODEL_FILTER(filter),
                                               visible_func, NULL, NULL);
@@ -1329,7 +1326,7 @@ static void init_right_tree(void)
        GtkTreeModel *filter;
        gint i;
 
-       filter = gtk_tree_model_filter_new(model2, NULL);
+       filter = gtk_tree_model_filter_new(GTK_TREE_MODEL(tree2), NULL);
 
        gtk_tree_model_filter_set_visible_func(GTK_TREE_MODEL_FILTER(filter),
                                               visible_func, NULL, NULL);