From e1d5ce7a516b5298551c196f7ef7da6d7e409f52 Mon Sep 17 00:00:00 2001 From: "Carlos R. Mafra" Date: Tue, 16 Mar 2010 12:26:47 +0100 Subject: [PATCH] Cleanup includes of wcore.h, defaults.h and pixmap.h Several files were including others for no reason, and this slows down the build time (but probably not measurable on a fast machine). --- src/actions.c | 1 - src/appicon.c | 1 - src/appicon.h | 1 - src/appmenu.c | 1 - src/balloon.c | 1 - src/client.c | 1 - src/cycling.c | 1 - src/defaults.c | 1 - src/dialog.c | 1 - src/dockedapp.c | 1 - src/framewin.h | 2 ++ src/main.c | 1 - src/misc.c | 1 - src/motif.c | 1 - src/moveres.c | 1 - src/pixmap.c | 2 +- src/pixmap.h | 2 +- src/resources.c | 1 - src/session.c | 1 - src/switchpanel.c | 1 - src/texture.c | 1 - src/usermenu.c | 1 - src/wcore.h | 1 - src/workspace.c | 1 - src/xinerama.c | 1 - 25 files changed, 4 insertions(+), 24 deletions(-) diff --git a/src/actions.c b/src/actions.c index f58d7507..f6a08672 100644 --- a/src/actions.c +++ b/src/actions.c @@ -32,7 +32,6 @@ #include #include "WindowMaker.h" -#include "wcore.h" #include "framewin.h" #include "window.h" #include "client.h" diff --git a/src/appicon.c b/src/appicon.c index bc506072..9368c9b4 100644 --- a/src/appicon.c +++ b/src/appicon.c @@ -29,7 +29,6 @@ #include #include "WindowMaker.h" -#include "wcore.h" #include "window.h" #include "icon.h" #include "appicon.h" diff --git a/src/appicon.h b/src/appicon.h index 1115490e..f3e9796c 100644 --- a/src/appicon.h +++ b/src/appicon.h @@ -26,7 +26,6 @@ #include -#include "wcore.h" #include "window.h" #include "icon.h" #include "application.h" diff --git a/src/appmenu.c b/src/appmenu.c index 4f107266..0e182c62 100644 --- a/src/appmenu.c +++ b/src/appmenu.c @@ -32,7 +32,6 @@ #include #include "WindowMaker.h" -#include "wcore.h" #include "menu.h" #include "actions.h" #include "funcs.h" diff --git a/src/balloon.c b/src/balloon.c index c7dfebab..d046afa1 100644 --- a/src/balloon.c +++ b/src/balloon.c @@ -37,7 +37,6 @@ #include "WindowMaker.h" #include "screen.h" #include "texture.h" -#include "wcore.h" #include "framewin.h" #include "icon.h" #include "appicon.h" diff --git a/src/client.c b/src/client.c index 962e7039..718aef5d 100644 --- a/src/client.c +++ b/src/client.c @@ -32,7 +32,6 @@ #include #include "WindowMaker.h" -#include "wcore.h" #include "framewin.h" #include "window.h" #include "properties.h" diff --git a/src/cycling.c b/src/cycling.c index d8c60da3..e1c951e3 100644 --- a/src/cycling.c +++ b/src/cycling.c @@ -30,7 +30,6 @@ #include "WindowMaker.h" #include "GNUstep.h" #include "screen.h" -#include "wcore.h" #include "window.h" #include "framewin.h" #include "keybind.h" diff --git a/src/defaults.c b/src/defaults.c index 8108c98e..c807de97 100644 --- a/src/defaults.c +++ b/src/defaults.c @@ -51,7 +51,6 @@ #include #include "WindowMaker.h" -#include "wcore.h" #include "framewin.h" #include "window.h" #include "texture.h" diff --git a/src/dialog.c b/src/dialog.c index 57ef9279..4c953fda 100644 --- a/src/dialog.c +++ b/src/dialog.c @@ -58,7 +58,6 @@ #include "framewin.h" #include "window.h" #include "actions.h" -#include "defaults.h" #include "xinerama.h" extern WPreferences wPreferences; diff --git a/src/dockedapp.c b/src/dockedapp.c index 957f3934..9c90387d 100644 --- a/src/dockedapp.c +++ b/src/dockedapp.c @@ -28,7 +28,6 @@ #include #include "WindowMaker.h" -#include "wcore.h" #include "window.h" #include "icon.h" #include "appicon.h" diff --git a/src/framewin.h b/src/framewin.h index 18ba07b7..a0c586c4 100644 --- a/src/framewin.h +++ b/src/framewin.h @@ -22,6 +22,8 @@ #ifndef WMFRAMEWINDOW_H_ #define WMFRAMEWINDOW_H_ +#include "wcore.h" +#include "pixmap.h" #define BORDER_TOP 1 #define BORDER_BOTTOM 2 diff --git a/src/main.c b/src/main.c index 3b22dff0..3c9d9f9a 100644 --- a/src/main.c +++ b/src/main.c @@ -48,7 +48,6 @@ #include "menu.h" #include "keybind.h" #include "xmodifier.h" -#include "defaults.h" #include "session.h" #include "dialog.h" diff --git a/src/misc.c b/src/misc.c index df4c1f08..48596768 100644 --- a/src/misc.c +++ b/src/misc.c @@ -44,7 +44,6 @@ #include "window.h" #include "framewin.h" #include "funcs.h" -#include "defaults.h" #include "dialog.h" #include "xutil.h" #include "xmodifier.h" diff --git a/src/motif.c b/src/motif.c index feb123f8..7b674d7d 100644 --- a/src/motif.c +++ b/src/motif.c @@ -33,7 +33,6 @@ #include "WindowMaker.h" -#include "wcore.h" #include "framewin.h" #include "window.h" #include "properties.h" diff --git a/src/moveres.c b/src/moveres.c index e2b92d11..d886f1fa 100644 --- a/src/moveres.c +++ b/src/moveres.c @@ -30,7 +30,6 @@ #include #include "WindowMaker.h" -#include "wcore.h" #include "framewin.h" #include "window.h" #include "client.h" diff --git a/src/pixmap.c b/src/pixmap.c index 9adfd5dd..87549d26 100644 --- a/src/pixmap.c +++ b/src/pixmap.c @@ -29,7 +29,7 @@ #include #include #include "WindowMaker.h" -#include "wcore.h" +#include "pixmap.h" /* *---------------------------------------------------------------------- diff --git a/src/pixmap.h b/src/pixmap.h index 8b046752..6089cda6 100644 --- a/src/pixmap.h +++ b/src/pixmap.h @@ -21,7 +21,7 @@ #ifndef WMPIXMAP_H_ #define WMPIXMAP_H_ - +#include "screen.h" typedef struct WPixmap { Pixmap image; /* icon image */ diff --git a/src/resources.c b/src/resources.c index 2ce8ac02..90c9159d 100644 --- a/src/resources.c +++ b/src/resources.c @@ -34,7 +34,6 @@ #include "WindowMaker.h" #include "texture.h" #include "screen.h" -#include "pixmap.h" int wGetColor(WScreen * scr, char *color_name, XColor * color) { diff --git a/src/session.c b/src/session.c index cbb4e1e5..5b473093 100644 --- a/src/session.c +++ b/src/session.c @@ -74,7 +74,6 @@ #include "window.h" #include "client.h" #include "session.h" -#include "wcore.h" #include "framewin.h" #include "workspace.h" #include "funcs.h" diff --git a/src/switchpanel.c b/src/switchpanel.c index 3bd2fc51..39797289 100644 --- a/src/switchpanel.c +++ b/src/switchpanel.c @@ -27,7 +27,6 @@ #include "WindowMaker.h" #include "screen.h" -#include "wcore.h" #include "framewin.h" #include "window.h" #include "defaults.h" diff --git a/src/texture.c b/src/texture.c index 2029b2f9..d6add836 100644 --- a/src/texture.c +++ b/src/texture.c @@ -37,7 +37,6 @@ #include #include "WindowMaker.h" -#include "wcore.h" #include "texture.h" #include "funcs.h" diff --git a/src/usermenu.c b/src/usermenu.c index 14fa6ef0..781addce 100644 --- a/src/usermenu.c +++ b/src/usermenu.c @@ -71,7 +71,6 @@ #include #include "WindowMaker.h" -#include "wcore.h" #include "menu.h" #include "actions.h" #include "funcs.h" diff --git a/src/wcore.h b/src/wcore.h index 25f6b6c7..27463727 100644 --- a/src/wcore.h +++ b/src/wcore.h @@ -43,7 +43,6 @@ typedef struct _WCoreWindow { } WCoreWindow; -#include "pixmap.h" WCoreWindow *wCoreCreateTopLevel(WScreen *screen, int x, int y, int width, int height, int bwidth); diff --git a/src/workspace.c b/src/workspace.c index 8135881a..d9d9e647 100644 --- a/src/workspace.c +++ b/src/workspace.c @@ -37,7 +37,6 @@ #include #include "WindowMaker.h" -#include "wcore.h" #include "framewin.h" #include "window.h" #include "icon.h" diff --git a/src/xinerama.c b/src/xinerama.c index dbcda223..380a7550 100644 --- a/src/xinerama.c +++ b/src/xinerama.c @@ -26,7 +26,6 @@ #include "screen.h" #include "window.h" #include "framewin.h" -#include "wcore.h" #include "funcs.h" #ifdef XINERAMA -- 2.11.4.GIT