From 0350b8445a111b6b39d22961a70ca632dc7cc436 Mon Sep 17 00:00:00 2001
From: "Carlos R. Mafra" <crmafra@gmail.com>
Date: Wed, 14 Apr 2010 11:01:14 +0200
Subject: [PATCH] Remove unneeded extern's in .c files

They were not being used in those files, so let's remove them.
---
 src/actions.c    |  5 -----
 src/appmenu.c    |  2 --
 src/defaults.c   |  7 -------
 src/dock.c       | 10 +---------
 src/misc.c       |  3 ---
 src/monitor.c    |  3 ---
 src/moveres.c    |  5 -----
 src/properties.c |  5 -----
 src/rootmenu.c   |  7 -------
 src/startup.c    | 15 ++-------------
 src/switchmenu.c |  2 --
 src/window.c     |  5 -----
 src/workspace.c  |  2 --
 src/xinerama.c   |  2 --
 14 files changed, 3 insertions(+), 70 deletions(-)

diff --git a/src/actions.c b/src/actions.c
index 16e12675..dea4ebb2 100644
--- a/src/actions.c
+++ b/src/actions.c
@@ -52,13 +52,8 @@
 int ignore_wks_change = 0;
 extern Time LastTimestamp;
 extern Time LastFocusChange;
-
-extern Cursor wCursor[WCUR_LAST];
-
 extern WPreferences wPreferences;
-
 extern Atom _XA_WM_TAKE_FOCUS;
-
 extern void ProcessPendingEvents();
 extern int calcIntersectionLength(int p1, int l1, int p2, int l2);
 
diff --git a/src/appmenu.c b/src/appmenu.c
index 2f001b4b..1f821109 100644
--- a/src/appmenu.c
+++ b/src/appmenu.c
@@ -40,9 +40,7 @@
 
 /******** Global Variables **********/
 extern Atom _XA_WINDOWMAKER_MENU;
-extern Atom _XA_WINDOWMAKER_WM_PROTOCOLS;
 extern Time LastTimestamp;
-
 extern WPreferences wPreferences;
 
 typedef struct {
diff --git a/src/defaults.c b/src/defaults.c
index ed7ad1af..b772e3e8 100644
--- a/src/defaults.c
+++ b/src/defaults.c
@@ -69,18 +69,11 @@
 #endif
 
 /***** Global *****/
-
 extern WDDomain *WDWindowMaker;
 extern WDDomain *WDWindowAttributes;
 extern WDDomain *WDRootMenu;
-
 extern int wScreenCount;
-
-extern Atom _XA_WINDOWMAKER_ICON_SIZE;
-extern Atom _XA_WINDOWMAKER_ICON_TILE;
-
 extern WPreferences wPreferences;
-
 extern WShortKey wKeyBindings[WKBD_LAST];
 
 typedef struct {
diff --git a/src/dock.c b/src/dock.c
index 4fb830b5..7e6d926c 100644
--- a/src/dock.c
+++ b/src/dock.c
@@ -63,21 +63,13 @@
 
 /* in dockedapp.c */
 extern void DestroyDockAppSettingsPanel();
-
 extern void ShowDockAppSettingsPanel(WAppIcon * aicon);
-
-extern XContext wWinContext;
-
 extern Cursor wCursor[WCUR_LAST];
-
 extern WPreferences wPreferences;
-
 extern XContext wWinContext;
+extern void appIconMouseDown(WObjDescriptor *desc, XEvent *event);
 
 #define MOD_MASK wPreferences.modifier_mask
-
-extern void appIconMouseDown(WObjDescriptor * desc, XEvent * event);
-
 #define ICON_SIZE wPreferences.icon_size
 
 /***** Local variables ****/
diff --git a/src/misc.c b/src/misc.c
index 0a2de1c9..f89cd71b 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -48,11 +48,8 @@
 #include "xmodifier.h"
 
 /**** global variables *****/
-
 extern WPreferences wPreferences;
 
-extern Time LastTimestamp;
-
 #ifdef USECPP
 static void putdef(char *line, char *name, char *value)
 {
diff --git a/src/monitor.c b/src/monitor.c
index 46da2bd6..16d6c757 100644
--- a/src/monitor.c
+++ b/src/monitor.c
@@ -41,11 +41,8 @@
 #include "funcs.h"
 
 /****** Global Variables ******/
-
 extern WPreferences wPreferences;
 
-extern int wScreenCount;
-
 int showCrashDialog(int sig)
 {
 	int crashAction;
diff --git a/src/moveres.c b/src/moveres.c
index 7b59e966..040e88df 100644
--- a/src/moveres.c
+++ b/src/moveres.c
@@ -62,14 +62,9 @@
 #define HAS_BORDER_WITH_SELECT(w) ((w)->flags.selected || HAS_BORDER(w))
 
 /****** Global Variables ******/
-extern Time LastTimestamp;
-
 extern Cursor wCursor[WCUR_LAST];
-
 extern WPreferences wPreferences;
 
-extern Atom _XA_WM_PROTOCOLS;
-
 /*
  *----------------------------------------------------------------------
  * checkMouseSamplingRate-
diff --git a/src/properties.c b/src/properties.c
index f4ef1739..ebe2b641 100644
--- a/src/properties.c
+++ b/src/properties.c
@@ -33,22 +33,17 @@
 
 /* atoms */
 extern Atom _XA_WM_STATE;
-extern Atom _XA_WM_CHANGE_STATE;
-extern Atom _XA_WM_PROTOCOLS;
 extern Atom _XA_WM_CLIENT_LEADER;
 extern Atom _XA_WM_TAKE_FOCUS;
 extern Atom _XA_WM_DELETE_WINDOW;
 extern Atom _XA_WM_SAVE_YOURSELF;
-
 extern Atom _XA_GNUSTEP_WM_ATTR;
 extern Atom _XA_GNUSTEP_WM_MINIATURIZE_WINDOW;
-
 extern Atom _XA_WINDOWMAKER_WM_FUNCTION;
 extern Atom _XA_WINDOWMAKER_MENU;
 extern Atom _XA_WINDOWMAKER_WM_PROTOCOLS;
 extern Atom _XA_WINDOWMAKER_NOTICEBOARD;
 extern Atom _XA_WINDOWMAKER_ICON_TILE;
-extern Atom _XA_WINDOWMAKER_ICON_SIZE;
 
 int PropGetNormalHints(Window window, XSizeHints * size_hints, int *pre_iccm)
 {
diff --git a/src/rootmenu.c b/src/rootmenu.c
index 02388b2b..51a57915 100644
--- a/src/rootmenu.c
+++ b/src/rootmenu.c
@@ -56,17 +56,10 @@
 #define MAX_SHORTCUT_LENGTH 32
 
 extern char *Locale;
-
 extern WDDomain *WDRootMenu;
-
 extern Cursor wCursor[WCUR_LAST];
-
-extern Time LastTimestamp;
-
 extern WPreferences wPreferences;
 
-extern int wScreenCount;
-
 static WMenu *readMenuPipe(WScreen * scr, char **file_name);
 static WMenu *readMenuFile(WScreen * scr, char *file_name);
 static WMenu *readMenuDirectory(WScreen * scr, char *title, char **file_name, char *command);
diff --git a/src/startup.c b/src/startup.c
index 1e6d8e4d..9b636876 100644
--- a/src/startup.c
+++ b/src/startup.c
@@ -80,15 +80,11 @@
 #endif
 
 /****** Global Variables ******/
-
 extern WPreferences wPreferences;
-
 extern WDDomain *WDWindowMaker;
 extern WDDomain *WDRootMenu;
 extern WDDomain *WDWindowAttributes;
-
 extern WShortKey wKeyBindings[WKBD_LAST];
-
 extern int wScreenCount;
 
 #ifdef SHAPE
@@ -117,9 +113,7 @@ extern Atom _XA_WM_SAVE_YOURSELF;
 extern Atom _XA_WM_CLIENT_LEADER;
 extern Atom _XA_WM_COLORMAP_WINDOWS;
 extern Atom _XA_WM_COLORMAP_NOTIFY;
-
 extern Atom _XA_GNUSTEP_WM_ATTR;
-
 extern Atom _XA_WINDOWMAKER_MENU;
 extern Atom _XA_WINDOWMAKER_WM_PROTOCOLS;
 extern Atom _XA_WINDOWMAKER_STATE;
@@ -128,10 +122,8 @@ extern Atom _XA_WINDOWMAKER_NOTICEBOARD;
 extern Atom _XA_WINDOWMAKER_COMMAND;
 extern Atom _XA_WINDOWMAKER_ICON_SIZE;
 extern Atom _XA_WINDOWMAKER_ICON_TILE;
-
 extern Atom _XA_GNUSTEP_WM_MINIATURIZE_WINDOW;
 extern Atom _XA_GNUSTEP_TITLEBAR_STATE;
-
 extern Atom _XA_WM_IGNORE_FOCUS_EVENTS;
 
 /* cursors */
@@ -142,17 +134,14 @@ extern Cursor wCursor[WCUR_LAST];
 extern char WDelayedActionSet;
 #endif
 
+extern void NotifyDeadProcess(pid_t pid, unsigned char status);
+
 /***** Local *****/
-
 static WScreen **wScreen = NULL;
-
 static unsigned int _NumLockMask = 0;
 static unsigned int _ScrollLockMask = 0;
-
 static void manageAllWindows(WScreen * scr, int crashed);
 
-extern void NotifyDeadProcess(pid_t pid, unsigned char status);
-
 static int catchXError(Display * dpy, XErrorEvent * error)
 {
 	char buffer[MAXLINE];
diff --git a/src/switchmenu.c b/src/switchmenu.c
index dc97c33a..9d5c6d25 100644
--- a/src/switchmenu.c
+++ b/src/switchmenu.c
@@ -41,10 +41,8 @@
 
 /********* Global Variables *******/
 extern WPreferences wPreferences;
-extern Time LastTimestamp;
 
 static int initialized = 0;
-
 static void observer(void *self, WMNotification * notif);
 static void wsobserver(void *self, WMNotification * notif);
 
diff --git a/src/window.c b/src/window.c
index cd3a0d43..2379c136 100644
--- a/src/window.c
+++ b/src/window.c
@@ -74,14 +74,10 @@ extern Bool wShapeSupported;
 /* contexts */
 extern XContext wWinContext;
 
-/* cursors */
-extern Cursor wCursor[WCUR_LAST];
-
 /* protocol atoms */
 extern Atom _XA_WM_DELETE_WINDOW;
 extern Atom _XA_GNUSTEP_WM_MINIATURIZE_WINDOW;
 extern Atom _XA_WINDOWMAKER_STATE;
-
 extern WPreferences wPreferences;
 extern Time LastTimestamp;
 
@@ -90,7 +86,6 @@ extern void DoWindowBirth(WWindow *wwin);
 
 /***** Local Stuff *****/
 static WWindowState *windowState = NULL;
-
 static FocusMode getFocusMode(WWindow *wwin);
 static int getSavedState(Window window, WSavedState **state);
 static void setupGNUstepHints(WWindow *wwin, GNUstepWMAttributes *gs_hints);
diff --git a/src/workspace.c b/src/workspace.c
index 1b7044c3..474da1ab 100644
--- a/src/workspace.c
+++ b/src/workspace.c
@@ -55,9 +55,7 @@
 
 extern int ignore_wks_change;
 extern WPreferences wPreferences;
-extern XContext wWinContext;
 extern XContext wVEdgeContext;
-
 extern void ProcessPendingEvents();
 
 static WMPropList *dWorkspaces = NULL;
diff --git a/src/xinerama.c b/src/xinerama.c
index 380a7550..7e630335 100644
--- a/src/xinerama.c
+++ b/src/xinerama.c
@@ -36,8 +36,6 @@
 # endif
 #endif
 
-extern WPreferences wPreferences;
-
 void wInitXinerama(WScreen * scr)
 {
 	scr->xine_info.primary_head = 0;