From 22055045d0aedfdc59bd02262ba4f772bc98f22e Mon Sep 17 00:00:00 2001 From: rbuj Date: Mon, 2 Sep 2019 21:59:53 +0200 Subject: =?UTF-8?q?remove=20warnings:=20cast=20from=20function=20call=20[-?= =?UTF-8?q?Wbad-function-cast]=20=20dlg-batch-add.c:513:83:=20warning:=20c?= =?UTF-8?q?ast=20from=20function=20call=20of=20type=20=E2=80=98gint?= =?UTF-8?q?=E2=80=99=20{aka=20=E2=80=98int=E2=80=99}=20to=20non-matching?= =?UTF-8?q?=20type=20=E2=80=98double=E2=80=99=20[-Wbad-function-cast]=20?= =?UTF-8?q?=20=20=20513=20|=20=20gtk=5Fspin=5Fbutton=5Fset=5Fvalue=20(GTK?= =?UTF-8?q?=5FSPIN=5FBUTTON=20(GET=5FWIDGET=20("a=5Fvolume=5Fspinbutton"))?= =?UTF-8?q?,=20(double)=20g=5Fsettings=5Fget=5Fint=20(data->settings,=20PR?= =?UTF-8?q?EF=5FBATCH=5FADD=5FVOLUME=5FSIZE)=20/=20MEGABYTE);=20=20=20=20?= =?UTF-8?q?=20=20=20=20|=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20^?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit dlg-new.c:321:81: warning: cast from function call of type ‘gint’ {aka ‘int’} to non-matching type ‘double’ [-Wbad-function-cast] 321 | gtk_spin_button_set_value (GTK_SPIN_BUTTON (data->n_volume_spinbutton), (double) g_settings_get_int (settings, PREF_BATCH_ADD_VOLUME_SIZE) / MEGABYTE); | ^ --- src/dlg-batch-add.c | 2 +- src/dlg-new.c | 4 ++-- src/typedefs.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/dlg-batch-add.c b/src/dlg-batch-add.c index 3597214..50b85d8 100644 --- a/src/dlg-batch-add.c +++ b/src/dlg-batch-add.c @@ -510,7 +510,7 @@ dlg_batch_add_files (FrWindow *window, gtk_button_set_label (GTK_BUTTON (GET_WIDGET ("a_add_button")), FR_STOCK_CREATE_ARCHIVE); gtk_expander_set_expanded (GTK_EXPANDER (GET_WIDGET ("a_other_options_expander")), FALSE /*g_settings_get_boolean (data->settings, PREF_BATCH_ADD_OTHER_OPTIONS)*/); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("a_encrypt_header_checkbutton")), g_settings_get_boolean (data->settings_general, PREF_GENERAL_ENCRYPT_HEADER)); - gtk_spin_button_set_value (GTK_SPIN_BUTTON (GET_WIDGET ("a_volume_spinbutton")), (double) g_settings_get_int (data->settings, PREF_BATCH_ADD_VOLUME_SIZE) / MEGABYTE); + gtk_spin_button_set_value (GTK_SPIN_BUTTON (GET_WIDGET ("a_volume_spinbutton")), g_settings_get_int (data->settings, PREF_BATCH_ADD_VOLUME_SIZE) / MEGABYTE); first_filename = (char*) file_list->data; diff --git a/src/dlg-new.c b/src/dlg-new.c index d0c8e6b..57cd301 100644 --- a/src/dlg-new.c +++ b/src/dlg-new.c @@ -36,7 +36,7 @@ #define GET_WIDGET(x) (_gtk_builder_get_widget (data->builder, (x))) #define DEFAULT_EXTENSION ".tar.gz" #define BAD_CHARS "/\\*" -#define MEGABYTE (1024 * 1024) +#define MEGABYTE (1024.0 * 1024.0) /* called when the main dialog is closed. */ @@ -318,7 +318,7 @@ dlg_new_archive (FrWindow *window, g_object_unref (settings); settings = g_settings_new (ENGRAMPA_SCHEMA_BATCH_ADD); - gtk_spin_button_set_value (GTK_SPIN_BUTTON (data->n_volume_spinbutton), (double) g_settings_get_int (settings, PREF_BATCH_ADD_VOLUME_SIZE) / MEGABYTE); + gtk_spin_button_set_value (GTK_SPIN_BUTTON (data->n_volume_spinbutton), g_settings_get_int (settings, PREF_BATCH_ADD_VOLUME_SIZE) / MEGABYTE); g_object_unref (settings); /* format chooser */ diff --git a/src/typedefs.h b/src/typedefs.h index 22a7417..0206f51 100644 --- a/src/typedefs.h +++ b/src/typedefs.h @@ -26,7 +26,7 @@ #include #include -#define MEGABYTE (1024 * 1024) +#define MEGABYTE (1024.0 * 1024.0) #define ADD_FOLDER_OPTIONS_DIR "engrampa/options" -- cgit v1.2.1