gnome/nautilus
gnome/nautilus
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/nautilus synced 2024-10-05 15:30:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

general: Uniformize case code style

Browse source 
There are a few non-braced single-statement in the final cases, which
have  gone unnoticed until detected by a recent uncrustify update.

Let's add the missing braces around single-statements even if it's the
last case.
This commit is contained in:
António Fernandes 2021-07-11 13:40:51 +01:00 committed by António Fernandes
parent 9661a9de4c
commit 619970b1e8
22 changed files with 80 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
eel/eel-canvas.c
View file

@ -2952,8 +2952,10 @@ eel_canvas_button (GtkWidget *widget,
break;
default:
{
mask = 0;
}
}
switch (event->type)
{
@ -2988,8 +2990,10 @@ eel_canvas_button (GtkWidget *widget,
break;
default:
{
g_assert_not_reached ();
}
}
return retval;
}

8
src/nautilus-canvas-item.c
View file

@ -378,9 +378,11 @@ nautilus_canvas_item_set_property (GObject *object,
break;
default:
{
g_warning ("nautilus_canvas_item_set_property on unknown argument");
return;
}
}
eel_canvas_item_request_update (EEL_CANVAS_ITEM (object));
}
@ -776,9 +778,11 @@ nautilus_canvas_item_get_max_text_width (NautilusCanvasItem *item)
break;
default:
{
g_warning ("Zoom level not valid. This may incur in missaligned grid");
max_text_width = MAX_TEXT_WIDTH_STANDARD;
}
}
return max_text_width * canvas_item->canvas->pixels_per_unit - 2 * TEXT_BACK_PADDING_X;
}
@ -1526,10 +1530,12 @@ nautilus_canvas_item_event (EelCanvasItem *item,
}
default:
{
/* Don't eat up other events; canvas container might use them. */
return FALSE;
}
}
}
static gboolean
hit_test (NautilusCanvasItem *canvas_item,
@ -2056,9 +2062,11 @@ nautilus_canvas_item_accessible_do_action (AtkAction *accessible,
break;
default:
{
g_warning ("Invalid action passed to NautilusCanvasItemAccessible::do_action");
return FALSE;
}
}
return TRUE;
}

2
src/nautilus-dnd.c
View file

@ -696,8 +696,10 @@ nautilus_drag_drag_data_get_from_cache (GList *cache,
break;
default:
{
return FALSE;
}
}
result = g_string_new (NULL);

4
src/nautilus-file-operations.c
View file

@ -3278,11 +3278,13 @@ report_preparing_count_progress (CommonJob *job,
break;
case OP_KIND_COMPRESS:
{
s = g_strdup_printf (ngettext ("Preparing to compress %'d file",
"Preparing to compress %'d files",
source_info->num_files),
source_info->num_files);
}
}
nautilus_progress_info_take_details (job->progress, s);
nautilus_progress_info_pulse_progress (job->progress);
@ -3339,9 +3341,11 @@ get_scan_primary (OpKind kind)
}
case OP_KIND_COMPRESS:
{
return g_strdup (_("Error while compressing files."));
}
}
}
static void
scan_dir (GFile *dir,

2
src/nautilus-file-utilities.c
View file

@ -655,8 +655,10 @@ special_directory_get_icon (GUserDirectory directory,
ICON_CASE (VIDEOS);
default:
{
return (symbolic) ? g_themed_icon_new (NAUTILUS_ICON_FOLDER) : g_themed_icon_new (NAUTILUS_ICON_FULLCOLOR_FOLDER);
}
}
#undef ICON_CASE
}

4
src/nautilus-file.c
View file

@ -3795,8 +3795,10 @@ nautilus_file_compare_for_sort (NautilusFile *file_1,
break;
default:
{
g_return_val_if_reached (0);
}
}
if (reversed)
{
@ -9416,10 +9418,12 @@ nautilus_drag_can_accept_info (NautilusFile *drop_target_item,
}
default:
{
g_assert_not_reached ();
return FALSE;
}
}
}
static gboolean
is_gone (NautilusFileInfo *file_info)

4
src/nautilus-files-view.c
View file

@ -1760,9 +1760,11 @@ pattern_select_response_cb (GtkWidget *dialog,
break;
default:
{
g_assert_not_reached ();
}
}
}
static void
select_pattern (NautilusFilesView *view)
@ -2308,8 +2310,10 @@ compress_dialog_controller_on_name_accepted (NautilusFileNameWidgetController *c
break;
default:
{
g_assert_not_reached ();
}
}
nautilus_file_operations_compress (source_files, output,
format,

10
src/nautilus-list-model.c
View file

@ -183,6 +183,7 @@ nautilus_list_model_get_column_type (GtkTreeModel *tree_model,
}
default:
{
if (index < NAUTILUS_LIST_MODEL_NUM_COLUMNS + priv->columns->len)
{
return G_TYPE_STRING;
@ -193,6 +194,7 @@ nautilus_list_model_get_column_type (GtkTreeModel *tree_model,
}
}
}
}
static void
nautilus_list_model_ptr_to_iter (NautilusListModel *model,
@ -325,8 +327,10 @@ nautilus_list_model_get_icon_size_for_zoom_level (NautilusListZoomLevel zoom_lev
}
case NAUTILUS_LIST_ZOOM_LEVEL_LARGER:
{
return NAUTILUS_LIST_ICON_SIZE_LARGER;
}
}
g_return_val_if_reached (NAUTILUS_LIST_ICON_SIZE_STANDARD);
}
@ -444,6 +448,7 @@ nautilus_list_model_get_value (GtkTreeModel *tree_model,
break;
default:
{
if (column >= NAUTILUS_LIST_MODEL_NUM_COLUMNS && column < NAUTILUS_LIST_MODEL_NUM_COLUMNS + priv->columns->len)
{
NautilusColumn *nautilus_column;
@ -478,6 +483,7 @@ nautilus_list_model_get_value (GtkTreeModel *tree_model,
}
}
}
}
static gboolean
nautilus_list_model_iter_next (GtkTreeModel *tree_model,
@ -1540,8 +1546,10 @@ nautilus_list_model_get_zoom_level_from_column_id (int column)
}
case NAUTILUS_LIST_MODEL_LARGER_ICON_COLUMN:
{
return NAUTILUS_LIST_ZOOM_LEVEL_LARGER;
}
}
g_return_val_if_reached (NAUTILUS_LIST_ZOOM_LEVEL_STANDARD);
}
@ -1567,8 +1575,10 @@ nautilus_list_model_get_column_id_from_zoom_level (NautilusListZoomLevel zoom_le
}
case NAUTILUS_LIST_ZOOM_LEVEL_LARGER:
{
return NAUTILUS_LIST_MODEL_LARGER_ICON_COLUMN;
}
}
g_return_val_if_reached (NAUTILUS_LIST_MODEL_STANDARD_ICON_COLUMN);
}

2
src/nautilus-list-view.c
View file

@ -2020,9 +2020,11 @@ nautilus_list_view_get_icon_padding_for_zoom_level (NautilusListZoomLevel zoom_l
}
default:
{
g_assert_not_reached ();
}
}
}
static void
set_up_pixbuf_size (NautilusListView *view)

8
src/nautilus-location-entry.c
View file

@ -348,8 +348,10 @@ drag_data_get_callback (GtkWidget *widget,
break;
default:
{
g_assert_not_reached ();
}
}
g_free (uri);
g_object_unref (location);
}
@ -513,6 +515,7 @@ entry_would_have_inserted_characters (const GdkEvent *event)
}
default:
{
if (keyval >= 0x20 && keyval <= 0xFF)
{
if ((state & GDK_CONTROL_MASK) != 0)
@ -525,6 +528,7 @@ entry_would_have_inserted_characters (const GdkEvent *event)
}
}
}
}
/* GTK+ 4 TODO: gdk_event_get_string () and check if length > 0. */
return ((const GdkEventKey *) event)->length;
@ -671,9 +675,11 @@ nautilus_location_entry_icon_release (GtkEntry *gentry,
break;
default:
{
g_assert_not_reached ();
}
}
}
static gboolean
nautilus_location_entry_on_event (GtkWidget *widget,
@ -910,8 +916,10 @@ nautilus_location_entry_set_secondary_action (NautilusLocationEntry *entry
break;
default:
{
g_assert_not_reached ();
}
}
priv->secondary_action = secondary_action;
}

2
src/nautilus-pathbar.c
View file

@ -1257,8 +1257,10 @@ get_gicon (ButtonData *button_data)
}
default:
{
return NULL;
}
}
return NULL;
}

4
src/nautilus-places-view.c
View file

@ -189,9 +189,11 @@ nautilus_places_view_get_property (GObject *object,
break;
default:
{
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
}
}
}
static void
nautilus_places_view_set_property (GObject *object,
@ -216,9 +218,11 @@ nautilus_places_view_set_property (GObject *object,
break;
default:
{
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
}
}
}
static GFile *
nautilus_places_view_get_location (NautilusView *view)

4
src/nautilus-query-editor.c
View file

@ -184,9 +184,11 @@ nautilus_query_editor_get_property (GObject *object,
break;
default:
{
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
}
}
}
static void
nautilus_query_editor_set_property (GObject *object,
@ -213,9 +215,11 @@ nautilus_query_editor_set_property (GObject *object,
break;
default:
{
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
}
}
}
static void
nautilus_query_editor_finalize (GObject *object)

4
src/nautilus-query.c
View file

@ -144,9 +144,11 @@ nautilus_query_get_property (GObject *object,
break;
default:
{
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
}
}
}
static void
nautilus_query_set_property (GObject *object,
@ -207,9 +209,11 @@ nautilus_query_set_property (GObject *object,
break;
default:
{
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
}
}
}
static void
nautilus_query_class_init (NautilusQueryClass *class)

2
src/nautilus-search-engine-model.c
View file

@ -309,9 +309,11 @@ nautilus_search_engine_model_get_property (GObject *object,
break;
default:
{
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
}
}
}
static void
nautilus_search_engine_model_class_init (NautilusSearchEngineModelClass *class)

2
src/nautilus-search-engine-recent.c
View file

@ -399,9 +399,11 @@ nautilus_search_engine_recent_get_property (GObject *object,
break;
default:
{
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
}
}
}
static void
nautilus_search_provider_init (NautilusSearchProviderInterface *iface)

2
src/nautilus-search-engine-tracker.c
View file

@ -545,9 +545,11 @@ nautilus_search_engine_tracker_get_property (GObject *object,
break;
default:
{
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
}
}
}
static void
nautilus_search_engine_tracker_class_init (NautilusSearchEngineTrackerClass *class)

2
src/nautilus-search-engine.c
View file

@ -482,9 +482,11 @@ nautilus_search_engine_get_property (GObject *object,
break;
default:
{
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
}
}
}
static void
nautilus_search_engine_class_init (NautilusSearchEngineClass *class)

4
src/nautilus-search-popover.c
View file

@ -738,9 +738,11 @@ nautilus_search_popover_get_property (GObject *object,
break;
default:
{
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
}
}
}
static void
nautilus_search_popover_set_property (GObject *object,
@ -767,9 +769,11 @@ nautilus_search_popover_set_property (GObject *object,
break;
default:
{
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
}
}
}
static void

2
src/nautilus-special-location-bar.c
View file

@ -65,8 +65,10 @@ set_special_location (NautilusSpecialLocationBar *bar,
break;
default:
{
g_assert_not_reached ();
}
}
gtk_label_set_text (GTK_LABEL (bar->label), message);
g_free (message);

2
src/nautilus-vfs-file.c
View file

@ -294,6 +294,7 @@ vfs_file_get_date (NautilusFile *file,
}
case NAUTILUS_DATE_TYPE_RECENCY:
{
/* Before we have info on a file, the date is unknown. */
if (recency == 0)
{
@ -305,6 +306,7 @@ vfs_file_get_date (NautilusFile *file,
}
return TRUE;
}
}
return FALSE;
}

2
src/nautilus-window-slot.c
View file

@ -2448,9 +2448,11 @@ update_history (NautilusWindowSlot *self,
}
case NAUTILUS_LOCATION_CHANGE_FORWARD:
{
handle_go_direction (self, new_location, TRUE);
return;
}
}
g_return_if_fail (FALSE);
}