From 57371365d8933542ebe7c78651f621e1273733cf Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Mon, 27 Nov 2023 15:33:53 +0100 Subject: Fix compiler warning, dependencies, and trailing whitespace MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The benign warning was: ‘Fl_Browser_::hscrollbar’ will be initialized after [-Wreorder] ‘int Fl_Browser_::linespacing_’ ... --- fluid/factory.cxx | 2 +- fluid/makedepend | 18 +++++++++--------- fluid/sourceview_panel.cxx | 2 +- fluid/template_panel.cxx | 2 +- fluid/template_panel.fl | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) (limited to 'fluid') diff --git a/fluid/factory.cxx b/fluid/factory.cxx index 3a433748d..a60717e30 100644 --- a/fluid/factory.cxx +++ b/fluid/factory.cxx @@ -868,7 +868,7 @@ public: int tsize_; Fl_Color tcolor_; Fl_Batchmode_Terminal(int x, int y, int w, int h, const char *l=NULL) - : Fl_Group(x, y, w, h, l) + : Fl_Group(x, y, w, h, l) { // set the defaults that Fl_Terminal would set box(FL_DOWN_BOX); color(FL_FOREGROUND_COLOR); diff --git a/fluid/makedepend b/fluid/makedepend index 6eedbd947..88d7b722b 100644 --- a/fluid/makedepend +++ b/fluid/makedepend @@ -74,11 +74,11 @@ alignment_panel.o: ../FL/Fl_Scheme.H alignment_panel.o: ../FL/Fl_Scheme_Choice.H alignment_panel.o: ../FL/Fl_Scrollbar.H alignment_panel.o: ../FL/Fl_Shortcut_Button.H -alignment_panel.o: ../FL/Fl_Simple_Terminal.H alignment_panel.o: ../FL/Fl_Slider.H alignment_panel.o: ../FL/Fl_Spinner.H alignment_panel.o: ../FL/fl_string_functions.h alignment_panel.o: ../FL/Fl_Tabs.H +alignment_panel.o: ../FL/Fl_Terminal.H alignment_panel.o: ../FL/Fl_Text_Buffer.H alignment_panel.o: ../FL/Fl_Text_Display.H alignment_panel.o: ../FL/Fl_Text_Editor.H @@ -363,10 +363,10 @@ factory.o: ../FL/Fl_Repeat_Button.H factory.o: ../FL/Fl_RGB_Image.H factory.o: ../FL/Fl_Roller.H factory.o: ../FL/Fl_Scrollbar.H -factory.o: ../FL/Fl_Simple_Terminal.H factory.o: ../FL/Fl_Slider.H factory.o: ../FL/Fl_Spinner.H factory.o: ../FL/Fl_Tabs.H +factory.o: ../FL/Fl_Terminal.H factory.o: ../FL/Fl_Text_Buffer.H factory.o: ../FL/Fl_Text_Display.H factory.o: ../FL/Fl_Text_Editor.H @@ -448,11 +448,11 @@ Fd_Snap_Action.o: ../FL/Fl_Scheme.H Fd_Snap_Action.o: ../FL/Fl_Scheme_Choice.H Fd_Snap_Action.o: ../FL/Fl_Scrollbar.H Fd_Snap_Action.o: ../FL/Fl_Shortcut_Button.H -Fd_Snap_Action.o: ../FL/Fl_Simple_Terminal.H Fd_Snap_Action.o: ../FL/Fl_Slider.H Fd_Snap_Action.o: ../FL/Fl_Spinner.H Fd_Snap_Action.o: ../FL/fl_string_functions.h Fd_Snap_Action.o: ../FL/Fl_Tabs.H +Fd_Snap_Action.o: ../FL/Fl_Terminal.H Fd_Snap_Action.o: ../FL/Fl_Text_Buffer.H Fd_Snap_Action.o: ../FL/Fl_Text_Display.H Fd_Snap_Action.o: ../FL/Fl_Text_Editor.H @@ -530,11 +530,11 @@ file.o: ../FL/Fl_Scheme_Choice.H file.o: ../FL/Fl_Scrollbar.H file.o: ../FL/Fl_Shared_Image.H file.o: ../FL/Fl_Shortcut_Button.H -file.o: ../FL/Fl_Simple_Terminal.H file.o: ../FL/Fl_Slider.H file.o: ../FL/Fl_Spinner.H file.o: ../FL/fl_string_functions.h file.o: ../FL/Fl_Tabs.H +file.o: ../FL/Fl_Terminal.H file.o: ../FL/Fl_Text_Buffer.H file.o: ../FL/Fl_Text_Display.H file.o: ../FL/Fl_Text_Editor.H @@ -623,11 +623,11 @@ fluid.o: ../FL/Fl_Scheme_Choice.H fluid.o: ../FL/Fl_Scrollbar.H fluid.o: ../FL/Fl_Shared_Image.H fluid.o: ../FL/Fl_Shortcut_Button.H -fluid.o: ../FL/Fl_Simple_Terminal.H fluid.o: ../FL/Fl_Slider.H fluid.o: ../FL/Fl_Spinner.H fluid.o: ../FL/fl_string_functions.h fluid.o: ../FL/Fl_Tabs.H +fluid.o: ../FL/Fl_Terminal.H fluid.o: ../FL/Fl_Text_Buffer.H fluid.o: ../FL/Fl_Text_Display.H fluid.o: ../FL/Fl_Text_Editor.H @@ -869,6 +869,7 @@ Fl_Function_Type.o: Fl_Window_Type.h Fl_Function_Type.o: function_panel.h Fl_Function_Type.o: mergeback.h Fl_Function_Type.o: StyleParse.h +Fl_Function_Type.o: undo.h Fl_Function_Type.o: widget_browser.h Fl_Grid_Type.o: ../config.h Fl_Grid_Type.o: ../FL/Enumerations.H @@ -1149,12 +1150,12 @@ Fl_Widget_Type.o: ../FL/Fl_Scrollbar.H Fl_Widget_Type.o: ../FL/Fl_Shared_Image.H Fl_Widget_Type.o: ../FL/Fl_Shortcut_Button.H Fl_Widget_Type.o: ../FL/fl_show_colormap.H -Fl_Widget_Type.o: ../FL/Fl_Simple_Terminal.H Fl_Widget_Type.o: ../FL/Fl_Slider.H Fl_Widget_Type.o: ../FL/Fl_Spinner.H Fl_Widget_Type.o: ../FL/fl_string_functions.h Fl_Widget_Type.o: ../FL/Fl_Table.H Fl_Widget_Type.o: ../FL/Fl_Tabs.H +Fl_Widget_Type.o: ../FL/Fl_Terminal.H Fl_Widget_Type.o: ../FL/Fl_Text_Buffer.H Fl_Widget_Type.o: ../FL/Fl_Text_Display.H Fl_Widget_Type.o: ../FL/Fl_Text_Editor.H @@ -1247,11 +1248,11 @@ Fl_Window_Type.o: ../FL/Fl_Scheme_Choice.H Fl_Window_Type.o: ../FL/Fl_Scrollbar.H Fl_Window_Type.o: ../FL/Fl_Shared_Image.H Fl_Window_Type.o: ../FL/Fl_Shortcut_Button.H -Fl_Window_Type.o: ../FL/Fl_Simple_Terminal.H Fl_Window_Type.o: ../FL/Fl_Slider.H Fl_Window_Type.o: ../FL/Fl_Spinner.H Fl_Window_Type.o: ../FL/fl_string_functions.h Fl_Window_Type.o: ../FL/Fl_Tabs.H +Fl_Window_Type.o: ../FL/Fl_Terminal.H Fl_Window_Type.o: ../FL/Fl_Text_Buffer.H Fl_Window_Type.o: ../FL/Fl_Text_Display.H Fl_Window_Type.o: ../FL/Fl_Text_Editor.H @@ -1299,7 +1300,6 @@ function_panel.o: ../FL/Fl_Browser_.H function_panel.o: ../FL/Fl_Button.H function_panel.o: ../FL/Fl_Cairo.H function_panel.o: ../FL/fl_casts.H -function_panel.o: ../FL/Fl_Check_Button.H function_panel.o: ../FL/Fl_Choice.H function_panel.o: ../FL/fl_config.h function_panel.o: ../FL/Fl_Device.H @@ -1478,11 +1478,11 @@ shell_command.o: ../FL/Fl_Scheme.H shell_command.o: ../FL/Fl_Scheme_Choice.H shell_command.o: ../FL/Fl_Scrollbar.H shell_command.o: ../FL/Fl_Shortcut_Button.H -shell_command.o: ../FL/Fl_Simple_Terminal.H shell_command.o: ../FL/Fl_Slider.H shell_command.o: ../FL/Fl_Spinner.H shell_command.o: ../FL/fl_string_functions.h shell_command.o: ../FL/Fl_Tabs.H +shell_command.o: ../FL/Fl_Terminal.H shell_command.o: ../FL/Fl_Text_Buffer.H shell_command.o: ../FL/Fl_Text_Display.H shell_command.o: ../FL/Fl_Text_Editor.H diff --git a/fluid/sourceview_panel.cxx b/fluid/sourceview_panel.cxx index b32f01498..0b7c52306 100644 --- a/fluid/sourceview_panel.cxx +++ b/fluid/sourceview_panel.cxx @@ -32,7 +32,7 @@ extern void reveal_in_browser(Fl_Type *t); /** Update the header and source code highlighting depending on the currently selected object - + The Source View system offers an immediate preview of the code files that will be generated by FLUID. It also marks the code generated for the last selected item in the header and the source diff --git a/fluid/template_panel.cxx b/fluid/template_panel.cxx index 0911deb7e..33f2cabea 100644 --- a/fluid/template_panel.cxx +++ b/fluid/template_panel.cxx @@ -307,7 +307,7 @@ void template_load() { "er\n}\n", f); fclose(f); } - + template_install(path, "/FLTK_License.fl", tmpl_FLTK_License_fl, sizeof(tmpl_FLTK_License_fl), tmpl_FLTK_License_fl_size); template_install(path, "/1of7GUIs.fl", tmpl_1of7GUIs_fl, sizeof(tmpl_1of7GUIs_fl), tmpl_1of7GUIs_fl_size); sample_templates_generated = 2; diff --git a/fluid/template_panel.fl b/fluid/template_panel.fl index 2a98219b0..790702edc 100644 --- a/fluid/template_panel.fl +++ b/fluid/template_panel.fl @@ -265,7 +265,7 @@ if (sample_templates_generated < 2) { "er\\n}\\n", f); fclose(f); } - + template_install(path, "/FLTK_License.fl", tmpl_FLTK_License_fl, sizeof(tmpl_FLTK_License_fl), tmpl_FLTK_License_fl_size); template_install(path, "/1of7GUIs.fl", tmpl_1of7GUIs_fl, sizeof(tmpl_1of7GUIs_fl), tmpl_1of7GUIs_fl_size); sample_templates_generated = 2; -- cgit v1.2.3