From 04f8133db5387e73fda7a98c56f184af9afa96ef Mon Sep 17 00:00:00 2001 From: Olliver Schinagl Date: Fri, 19 Jun 2015 15:47:13 +0200 Subject: standarize function pointers Signed-off-by: Olliver Schinagl --- src/eulogium.c | 92 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/src/eulogium.c b/src/eulogium.c index 5106234..618b995 100644 --- a/src/eulogium.c +++ b/src/eulogium.c @@ -71,7 +71,7 @@ static void _but_print_tune_cb(void *data, Evas_Object *obj EINA_UNUSED, void *e static struct button_def but_return = { .text = gettext_noop("RETURN"), .cb = { - .func = &_cb_content_prev_set, + .func = _cb_content_prev_set, .data = NULL, .info = "return button pressed", }, @@ -81,7 +81,7 @@ static struct button_def but_return = { static struct button_def but_print_abort_confirm = { .text = "ABORT", .cb = { - .func = &_print_abort_confirm_cb, + .func = _print_abort_confirm_cb, .data = NULL, .info = "print abort confirm button pressed", }, @@ -91,7 +91,7 @@ static struct button_def but_print_abort_confirm = { static struct button_def but_print_abort = { .text = "Yes", .cb = { - .func = &_print_abort_cb, + .func = _print_abort_cb, .data = NULL, .info = "print abort button pressed", }, @@ -101,7 +101,7 @@ static struct button_def but_print_abort = { static struct button_def but_print_tune = { .text = "TUNE", .cb = { - .func = &_but_print_tune_cb, + .func = _but_print_tune_cb, .data = NULL, .info = "tune progress button pressed", }, @@ -111,7 +111,7 @@ static struct button_def but_print_tune = { static struct button_def but_main_print = { .text = "PRINT", .cb = { - .func = &_cb_button_main_print, + .func = _cb_button_main_print, .data = NULL, .info = "print button pressed", }, @@ -121,7 +121,7 @@ static struct button_def but_main_print = { static struct button_def but_print_ignore = { .text = "IGNORE THIS JOB", .cb = { - .func = &_print_ignore_cb, + .func = _print_ignore_cb, .data = NULL, .info = "print ignore button pressed", }, @@ -131,7 +131,7 @@ static struct button_def but_print_ignore = { static struct button_def but_print_local = { .text = "LOCAL", .cb = { - .func = &_but_print_local_cb, + .func = _but_print_local_cb, .data = NULL, .info = "local storage button pressed", }, @@ -141,7 +141,7 @@ static struct button_def but_print_local = { static struct button_def but_print_mmc = { .text = "SD", .cb = { - .func = &_but_print_usb_cb, + .func = _but_print_usb_cb, .data = NULL, .info = "usb storage button pressed", }, @@ -151,7 +151,7 @@ static struct button_def but_print_mmc = { static struct button_def but_print_usb = { .text = "USB", .cb = { - .func = &_but_print_usb_cb, + .func = _but_print_usb_cb, .data = NULL, .info = "usb storage button pressed", }, @@ -161,7 +161,7 @@ static struct button_def but_print_usb = { static struct button_def but_main_mathot = { .text = "MATERIAL
/HOT END", .cb = { - .func = &_but_main_mathot_cb, + .func = _but_main_mathot_cb, .data = NULL, .info = "material / hot-end button pressed", }, @@ -171,7 +171,7 @@ static struct button_def but_main_mathot = { static struct button_def but_mathot_material = { .text = "MATERIAL", .cb = { - .func = &_but_mathot_material_cb, + .func = _but_mathot_material_cb, .data = NULL, .info = "material button pressed", }, @@ -181,7 +181,7 @@ static struct button_def but_mathot_material = { static struct button_def but_mathot_hotend = { .text = "HOT END", .cb = { - .func = &_but_mathot_hotend_cb, + .func = _but_mathot_hotend_cb, .data = NULL, .info = "hot-end button pressed", }, @@ -191,7 +191,7 @@ static struct button_def but_mathot_hotend = { static struct button_def but_main_system = { .text = "SYSTEM", .cb = { - .func = &_but_main_system_cb, + .func = _but_main_system_cb, .data = NULL, .info = "system button pressed", }, @@ -201,7 +201,7 @@ static struct button_def but_main_system = { static struct button_def but_system_maintenance = { .text = "MAINTE-
NANCE", .cb = { - .func = &_but_system_maintenance_cb, + .func = _but_system_maintenance_cb, .data = NULL, .info = "maintenance button pressed", }, @@ -211,7 +211,7 @@ static struct button_def but_system_maintenance = { static struct button_def but_system_settings = { .text = "SETTINGS", .cb = { - .func = &_but_system_settings_cb, + .func = _but_system_settings_cb, .data = NULL, }, .data = NULL, @@ -220,7 +220,7 @@ static struct button_def but_system_settings = { static struct button_def but_material_change = { .text = "CHANGE", .cb = { - .func = &_but_material_change_cb, + .func = _but_material_change_cb, .data = NULL, }, .data = NULL, @@ -229,7 +229,7 @@ static struct button_def but_material_change = { static struct button_def but_material_settings = { .text = "SETTINGS", .cb = { - .func = &_but_material_settings_cb, + .func = _but_material_settings_cb, .data = NULL, }, .data = NULL, @@ -238,7 +238,7 @@ static struct button_def but_material_settings = { static struct button_def but_settings_material_1 = { .text = "MATERIAL 1", .cb = { - .func = &_but_settings_material_1_cb, /* XXX we should make 1/2 a var */ + .func = _but_settings_material_1_cb, /* XXX we should make 1/2 a var */ .data = NULL, }, .data = NULL, @@ -247,7 +247,7 @@ static struct button_def but_settings_material_1 = { static struct button_def but_settings_material_2 = { .text = "MATERIAL 2", .cb = { - .func = &_but_settings_material_2_cb, /* XXX we should make 1/2 a var */ + .func = _but_settings_material_2_cb, /* XXX we should make 1/2 a var */ .data = NULL, }, .data = NULL, @@ -256,7 +256,7 @@ static struct button_def but_settings_material_2 = { static struct button_def but_change_material_1 = { .text = "MATERIAL 1", .cb = { - .func = &_but_change_material_1_cb, /* XXX we should make 1/2 a var */ + .func = _but_change_material_1_cb, /* XXX we should make 1/2 a var */ .data = NULL, }, .data = NULL, @@ -265,7 +265,7 @@ static struct button_def but_change_material_1 = { static struct button_def but_change_material_2 = { .text = "MATERIAL 2", .cb = { - .func = &_but_change_material_2_cb, /* XXX we should make 1/2 a var */ + .func = _but_change_material_2_cb, /* XXX we should make 1/2 a var */ .data = NULL, }, .data = NULL, @@ -274,7 +274,7 @@ static struct button_def but_change_material_2 = { static struct button_def but_hotend_change = { .text = "CHANGE", .cb = { - .func = &_but_hotend_change_cb, + .func = _but_hotend_change_cb, .data = NULL, }, .data = NULL, @@ -283,7 +283,7 @@ static struct button_def but_hotend_change = { static struct button_def but_hotend_settings = { .text = "SETTINGS", .cb = { - .func = &_but_hotend_settings_cb, + .func = _but_hotend_settings_cb, .data = NULL, }, .data = NULL, @@ -292,7 +292,7 @@ static struct button_def but_hotend_settings = { static struct button_def but_settings_hotend_1 = { .text = "HOT END 1", .cb = { - .func = &_but_settings_hotend_1_cb, /* XXX we should make 1/2 a var */ + .func = _but_settings_hotend_1_cb, /* XXX we should make 1/2 a var */ .data = NULL, }, .data = NULL, @@ -301,7 +301,7 @@ static struct button_def but_settings_hotend_1 = { static struct button_def but_settings_hotend_2 = { .text = "HOT END 2", .cb = { - .func = &_but_settings_hotend_2_cb, /* XXX we should make 1/2 a var */ + .func = _but_settings_hotend_2_cb, /* XXX we should make 1/2 a var */ .data = NULL, }, .data = NULL, @@ -310,7 +310,7 @@ static struct button_def but_settings_hotend_2 = { static struct button_def but_change_hotend_1 = { .text = "HOT END 1", .cb = { - .func = &_but_change_hotend_1_cb, /* XXX we should make 1/2 a var */ + .func = _but_change_hotend_1_cb, /* XXX we should make 1/2 a var */ .data = NULL, }, .data = NULL, @@ -319,7 +319,7 @@ static struct button_def but_change_hotend_1 = { static struct button_def but_change_hotend_2 = { .text = "HOT END 2", .cb = { - .func = &_but_change_hotend_2_cb, /* XXX we should make 1/2 a var */ + .func = _but_change_hotend_2_cb, /* XXX we should make 1/2 a var */ .data = NULL, }, .data = NULL, @@ -335,7 +335,7 @@ static struct menu_def menu_system_settings = { .item = {.type = LIST_ITEM_BUTTON}, .footer = gettext_noop("Return to Main menu"), .footer_alt = NULL, - .func = &_cb_content_prev_set, + .func = _cb_content_prev_set, .toggle_timer = NULL, .data = NULL, }, { @@ -344,7 +344,7 @@ static struct menu_def menu_system_settings = { .item = {.type = LIST_ITEM_BUTTON}, .footer = "Change language", .footer_alt = NULL, - .func = &_but_settings_language_cb, + .func = _but_settings_language_cb, .toggle_timer = NULL, .data = NULL, }, { @@ -353,7 +353,7 @@ static struct menu_def menu_system_settings = { .item = {.type = LIST_ITEM_BUTTON}, .footer = "Manage connectivity", .footer_alt = "WiFi & Ethernet", - .func = &_but_settings_network_cb, + .func = _but_settings_network_cb, .toggle_timer = NULL, .data = NULL, }, { @@ -362,7 +362,7 @@ static struct menu_def menu_system_settings = { .item = {.type = LIST_ITEM_BUTTON}, .footer = "Adjust offset", .footer_alt = NULL, - .func = &_but_settings_hotend_1_offset_cb, + .func = _but_settings_hotend_1_offset_cb, .toggle_timer = NULL, .data = NULL, /* hot end 1 pointer? */ }, { @@ -371,7 +371,7 @@ static struct menu_def menu_system_settings = { .end = NULL, .footer = "Adjust offset", .footer_alt = NULL, - .func = &_but_settings_hotend_2_offset_cb, + .func = _but_settings_hotend_2_offset_cb, .toggle_timer = NULL, .data = NULL, /* hot end 2 pointer? */ }, { @@ -469,16 +469,16 @@ static struct menu_def menu_settings_network = { .item = {.type = LIST_ITEM_BUTTON}, .footer = "Return to Main menu", .footer_alt = NULL, - .func = &_cb_content_prev_set, + .func = _cb_content_prev_set, .toggle_timer = NULL, .data = NULL, }, { .icon = NULL, - .label = "Networking", + .label = "Network info", .end = NULL, .footer = NULL, .footer_alt = NULL, - .func = &_but_network_stats_cb, + .func = _but_network_stats_cb, .toggle_timer = NULL, .data = NULL, }, { @@ -566,7 +566,7 @@ static struct menu_def menu_settings_language = { .end = NULL, .footer = "Return to Main menu", .footer_alt = NULL, - .func = &_cb_content_prev_set, + .func = _cb_content_prev_set, .toggle_timer = NULL, .data = NULL, }, { @@ -593,7 +593,7 @@ static struct menu_def menu_settings_hotend_1_offset = { .end = NULL, .footer = "Return to Main menu", .footer_alt = NULL, - .func = &_cb_content_prev_set, + .func = _cb_content_prev_set, .toggle_timer = NULL, .data = NULL, }, { @@ -665,7 +665,7 @@ static struct menu_def menu_settings_hotend_2_offset = { .end = NULL, .footer = "Return to Main menu", .footer_alt = NULL, - .func = &_cb_content_prev_set, + .func = _cb_content_prev_set, .toggle_timer = NULL, .data = NULL, }, { @@ -737,7 +737,7 @@ static struct menu_def menu_system_maintenance = { .end = NULL, .footer = "Return to Main menu", .footer_alt = NULL, - .func = &_cb_content_prev_set, + .func = _cb_content_prev_set, .toggle_timer = NULL, .data = NULL, }, { @@ -873,7 +873,7 @@ static struct menu_def menu_material_1 = { .end = NULL, .footer = "Return to Main menu", .footer_alt = NULL, - .func = &_cb_content_prev_set, + .func = _cb_content_prev_set, .toggle_timer = NULL, .data = NULL, }, { @@ -927,7 +927,7 @@ static struct menu_def menu_material_1 = { .end = NULL, .footer = NULL, .footer_alt = NULL, - .func = &_but_material_customize_cb, + .func = _but_material_customize_cb, .toggle_timer = NULL, .data = NULL, }, { @@ -963,7 +963,7 @@ static struct menu_def menu_material_2 = { .end = NULL, .footer = "Return to Main menu", .footer_alt = NULL, - .func = &_cb_content_prev_set, + .func = _cb_content_prev_set, .toggle_timer = NULL, .data = NULL, }, { @@ -1053,7 +1053,7 @@ static struct menu_def menu_material_customize = { .end = NULL, .footer = "Return to Main menu", .footer_alt = NULL, - .func = &_cb_content_prev_set, + .func = _cb_content_prev_set, .toggle_timer = NULL, .data = NULL, }, { @@ -1143,7 +1143,7 @@ static struct menu_def menu_print_tune = { .end = NULL, .footer = "Return to print", .footer_alt = NULL, - .func = &_cb_content_prev_set, + .func = _cb_content_prev_set, .toggle_timer = NULL, .data = NULL, }, { @@ -1152,7 +1152,7 @@ static struct menu_def menu_print_tune = { .end = NULL, .footer = "IP: ", .footer_alt = NULL, - .func = &_but_settings_network_cb, + .func = _but_settings_network_cb, .toggle_timer = NULL, .data = NULL, }, { @@ -1244,7 +1244,7 @@ static struct menu_def menu_ = { .end = NULL, .footer = "Return to Main menu", .footer_alt = NULL, - .func = &_cb_content_prev_set, + .func = _cb_content_prev_set, .toggle_timer = NULL, .data = NULL, }, { -- cgit v0.12