From 01e991840cbcb3bcc742a9fa584953b2165a9d04 Mon Sep 17 00:00:00 2001 From: Manolo Gouy Date: Fri, 25 Mar 2016 16:06:00 +0000 Subject: Remove a bunch of useless #include directives. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11422 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- FL/Fl_Pixmap.H | 3 --- FL/Fl_Sys_Menu_Bar.H | 3 +-- FL/fl_draw.H | 5 ++--- fluid/fluid.cxx | 1 - src/Fl.cxx | 1 - src/Fl_Double_Window.cxx | 1 - src/Fl_Help_View.cxx | 1 - src/Fl_Image.cxx | 1 - src/Fl_Menu_Window.cxx | 1 - src/Fl_Overlay_Window.cxx | 1 - src/Fl_Pixmap.cxx | 1 - src/Fl_get_key_mac.cxx | 2 +- src/fl_draw_pixmap.cxx | 1 - src/fl_font.cxx | 1 - src/fl_read_image.cxx | 1 - src/fl_rect.cxx | 1 - src/fl_scroll_area.cxx | 1 - src/fl_set_font.cxx | 1 - src/fl_shortcut.cxx | 3 --- src/fl_vertex.cxx | 1 - 20 files changed, 4 insertions(+), 27 deletions(-) diff --git a/FL/Fl_Pixmap.H b/FL/Fl_Pixmap.H index e8b643acc..671457c5f 100644 --- a/FL/Fl_Pixmap.H +++ b/FL/Fl_Pixmap.H @@ -22,9 +22,6 @@ #ifndef Fl_Pixmap_H #define Fl_Pixmap_H # include "Fl_Image.H" -#if defined(WIN32) -# include "x.H" -#endif class Fl_Widget; struct Fl_Menu_Item; diff --git a/FL/Fl_Sys_Menu_Bar.H b/FL/Fl_Sys_Menu_Bar.H index b635fedc6..bb99f6af7 100644 --- a/FL/Fl_Sys_Menu_Bar.H +++ b/FL/Fl_Sys_Menu_Bar.H @@ -19,8 +19,7 @@ #ifndef Fl_Sys_Menu_Bar_H #define Fl_Sys_Menu_Bar_H -#include "Fl_Menu_Bar.H" -#include "x.H" +#include #if defined(__APPLE__) || defined(FL_DOXYGEN) // PORTME: Fl_Screen_Driver - system menu bar diff --git a/FL/fl_draw.H b/FL/fl_draw.H index 605f17d51..f5adcb21c 100644 --- a/FL/fl_draw.H +++ b/FL/fl_draw.H @@ -24,13 +24,12 @@ #ifndef fl_draw_H #define fl_draw_H -#include // for Fl_Region #include // for the color names -#include // for fl_set_spot() -#include // for fl_graphics_driver +#include // for fl_graphics_driver + Fl_Region // Image class... class Fl_Image; +class Fl_Window; // Label flags... FL_EXPORT extern char fl_draw_shortcut; diff --git a/fluid/fluid.cxx b/fluid/fluid.cxx index f0eb84ae2..5e3100df5 100644 --- a/fluid/fluid.cxx +++ b/fluid/fluid.cxx @@ -408,7 +408,6 @@ void exit_cb(Fl_Widget *,void *) { } #ifdef __APPLE__ -# include void apple_open_cb(const char *c) { diff --git a/src/Fl.cxx b/src/Fl.cxx index 27cc65b70..b47a90bcd 100644 --- a/src/Fl.cxx +++ b/src/Fl.cxx @@ -34,7 +34,6 @@ #include #include #include -#include #include #include diff --git a/src/Fl_Double_Window.cxx b/src/Fl_Double_Window.cxx index 05b6a5c78..736adba20 100644 --- a/src/Fl_Double_Window.cxx +++ b/src/Fl_Double_Window.cxx @@ -22,7 +22,6 @@ #include #include #include -#include #include #include diff --git a/src/Fl_Help_View.cxx b/src/Fl_Help_View.cxx index 4ae4f298c..8207ae062 100644 --- a/src/Fl_Help_View.cxx +++ b/src/Fl_Help_View.cxx @@ -49,7 +49,6 @@ #include #include #include -#include #include #include #include diff --git a/src/Fl_Image.cxx b/src/Fl_Image.cxx index f11be8ae8..fdaf0bfdb 100644 --- a/src/Fl_Image.cxx +++ b/src/Fl_Image.cxx @@ -19,7 +19,6 @@ #include "config_lib.h" #include #include -#include #include #include #include diff --git a/src/Fl_Menu_Window.cxx b/src/Fl_Menu_Window.cxx index 36ddc4722..56afb1020 100644 --- a/src/Fl_Menu_Window.cxx +++ b/src/Fl_Menu_Window.cxx @@ -25,7 +25,6 @@ #include #include -#include #include #include #include diff --git a/src/Fl_Overlay_Window.cxx b/src/Fl_Overlay_Window.cxx index 07065fbb0..4a7195889 100644 --- a/src/Fl_Overlay_Window.cxx +++ b/src/Fl_Overlay_Window.cxx @@ -25,7 +25,6 @@ #include #include #include -#include #include diff --git a/src/Fl_Pixmap.cxx b/src/Fl_Pixmap.cxx index b6d501fb9..70222fae2 100644 --- a/src/Fl_Pixmap.cxx +++ b/src/Fl_Pixmap.cxx @@ -25,7 +25,6 @@ #include #include -#include #include #include #include diff --git a/src/Fl_get_key_mac.cxx b/src/Fl_get_key_mac.cxx index adcf68be8..52d99e222 100644 --- a/src/Fl_get_key_mac.cxx +++ b/src/Fl_get_key_mac.cxx @@ -20,9 +20,9 @@ // which are actually X keysyms. So this has to translate to macOS // symbols. +#include #include #include -#include // The list of Mac OS virtual keycodes appears with OS 10.5 in // ...../Carbon.framework/Frameworks/HIToolbox.framework/Headers/Events.h diff --git a/src/fl_draw_pixmap.cxx b/src/fl_draw_pixmap.cxx index cf7bd5a72..e37e6cb14 100644 --- a/src/fl_draw_pixmap.cxx +++ b/src/fl_draw_pixmap.cxx @@ -34,7 +34,6 @@ #include #include -#include #include #include "flstring.h" diff --git a/src/fl_font.cxx b/src/fl_font.cxx index c2d8fe66f..6e9f0c4d2 100644 --- a/src/fl_font.cxx +++ b/src/fl_font.cxx @@ -21,7 +21,6 @@ #include "flstring.h" #include #include -#include #include "Fl_Font.H" #include diff --git a/src/fl_read_image.cxx b/src/fl_read_image.cxx index ebf43c324..5f91d0e19 100644 --- a/src/fl_read_image.cxx +++ b/src/fl_read_image.cxx @@ -16,7 +16,6 @@ // http://www.fltk.org/str.php // -#include #include #include #include "flstring.h" diff --git a/src/fl_rect.cxx b/src/fl_rect.cxx index f5b3d0af4..ba5aedbea 100644 --- a/src/fl_rect.cxx +++ b/src/fl_rect.cxx @@ -32,7 +32,6 @@ #include #include #include -#include // ----------------------------------------------------------------------------- // all driver code is now in drivers/XXX/Fl_XXX_Graphics_Driver_xyz.cxx diff --git a/src/fl_scroll_area.cxx b/src/fl_scroll_area.cxx index aa63976f7..ef18685dd 100644 --- a/src/fl_scroll_area.cxx +++ b/src/fl_scroll_area.cxx @@ -22,7 +22,6 @@ #include #include -#include #include #ifdef __APPLE__ #include "drivers/Quartz/Fl_Quartz_Graphics_Driver.h" diff --git a/src/fl_set_font.cxx b/src/fl_set_font.cxx index 0c53e75af..fadc56c13 100644 --- a/src/fl_set_font.cxx +++ b/src/fl_set_font.cxx @@ -20,7 +20,6 @@ // Also see fl_set_fonts.cxx which adds all possible fonts. #include -#include #include #include "flstring.h" #include "Fl_Font.H" diff --git a/src/fl_shortcut.cxx b/src/fl_shortcut.cxx index 3602f913e..0371f7615 100644 --- a/src/fl_shortcut.cxx +++ b/src/fl_shortcut.cxx @@ -40,9 +40,6 @@ #include #include #include "flstring.h" -#if !defined(WIN32) && !defined(__APPLE__) // PORTME: Fl_Screen_Driver - platform keyboard feel -#include -#endif #if defined(WIN32) || defined(__APPLE__) // PORTME: Fl_Screen_Driver - platform keyboard feel #elif defined(FL_PORTING) diff --git a/src/fl_vertex.cxx b/src/fl_vertex.cxx index cc58ea3fe..2e4313e6a 100644 --- a/src/fl_vertex.cxx +++ b/src/fl_vertex.cxx @@ -35,7 +35,6 @@ #include #include "config_lib.h" #include -#include #include #include #include -- cgit v1.2.3