From f5be05f1437e777d50c9f8e35d5150aa6467e90b Mon Sep 17 00:00:00 2001
From: Pietro Gagliardi <pietro10@mac.com>
Date: Sun, 15 Apr 2018 21:54:46 -0400
Subject: [PATCH] shouldQuit() -> uiprivShouldQuit().

---
 common/OLD_uipriv.h | 3 ---
 common/shouldquit.c | 2 +-
 common/uipriv.h     | 2 +-
 darwin/main.m       | 2 +-
 darwin/menu.m       | 2 +-
 unix/menu.c         | 2 +-
 windows/menu.cpp    | 2 +-
 windows/utilwin.cpp | 4 ++--
 8 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/common/OLD_uipriv.h b/common/OLD_uipriv.h
index f42baf56..b6e0581d 100644
--- a/common/OLD_uipriv.h
+++ b/common/OLD_uipriv.h
@@ -1,7 +1,4 @@
 
-// shouldquit.c
-extern int shouldQuit(void);
-
 // areaevents.c
 typedef struct clickCounter clickCounter;
 // you should call Reset() to zero-initialize a new instance
diff --git a/common/shouldquit.c b/common/shouldquit.c
index 4e7aa5c3..dddd879c 100644
--- a/common/shouldquit.c
+++ b/common/shouldquit.c
@@ -16,7 +16,7 @@ void uiOnShouldQuit(int (*f)(void *), void *data)
 	onShouldQuitData = data;
 }
 
-int shouldQuit(void)
+int uiprivShouldQuit(void)
 {
 	return (*onShouldQuit)(onShouldQuitData);
 }
diff --git a/common/uipriv.h b/common/uipriv.h
index 4c179c47..7d3ff297 100644
--- a/common/uipriv.h
+++ b/common/uipriv.h
@@ -34,7 +34,7 @@ extern void uiprivDoUserBug(const char *file, const char *line, const char *func
 #define uiprivUserBug(...) uiprivDoUserBug(__FILE__, uiprivMacro_ns(__LINE__), uiprivMacro__func__, __VA_ARGS__)
 
 // shouldquit.c
-extern int shouldQuit(void);
+extern int uiprivShouldQuit(void);
 
 // areaevents.c
 typedef struct clickCounter clickCounter;
diff --git a/darwin/main.m b/darwin/main.m
index f3392ce6..6d149fc3 100644
--- a/darwin/main.m
+++ b/darwin/main.m
@@ -91,7 +91,7 @@ static BOOL stepsIsRunning;
 {
 	// for debugging
 	NSLog(@"in applicationShouldTerminate:");
-	if (shouldQuit()) {
+	if (uiprivShouldQuit()) {
 		canQuit = YES;
 		// this will call terminate:, which is the same as uiQuit()
 		return NSTerminateNow;
diff --git a/darwin/menu.m b/darwin/menu.m
index ca6cce4b..79adbae6 100644
--- a/darwin/menu.m
+++ b/darwin/menu.m
@@ -71,7 +71,7 @@ static void mapItemReleaser(void *key, void *value)
 
 - (IBAction)onQuitClicked:(id)sender
 {
-	if (shouldQuit())
+	if (uiprivShouldQuit())
 		uiQuit();
 }
 
diff --git a/unix/menu.c b/unix/menu.c
index 3d02e939..17189c8e 100644
--- a/unix/menu.c
+++ b/unix/menu.c
@@ -81,7 +81,7 @@ static void defaultOnClicked(uiMenuItem *item, uiWindow *w, void *data)
 
 static void onQuitClicked(uiMenuItem *item, uiWindow *w, void *data)
 {
-	if (shouldQuit())
+	if (uiprivShouldQuit())
 		uiQuit();
 }
 
diff --git a/windows/menu.cpp b/windows/menu.cpp
index 09dfcf30..65791bfb 100644
--- a/windows/menu.cpp
+++ b/windows/menu.cpp
@@ -68,7 +68,7 @@ static void defaultOnClicked(uiMenuItem *item, uiWindow *w, void *data)
 
 static void onQuitClicked(uiMenuItem *item, uiWindow *w, void *data)
 {
-	if (shouldQuit())
+	if (uiprivShouldQuit())
 		uiQuit();
 }
 
diff --git a/windows/utilwin.cpp b/windows/utilwin.cpp
index 28950674..34b72ba8 100644
--- a/windows/utilwin.cpp
+++ b/windows/utilwin.cpp
@@ -23,8 +23,8 @@ static LRESULT CALLBACK utilWindowWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, L
 		return lResult;
 	switch (uMsg) {
 	case WM_QUERYENDSESSION:
-		// TODO block handler
-		if (shouldQuit()) {
+		// TODO block handler (TODO figure out if this meant the Vista-style block handler or not)
+		if (uiprivShouldQuit()) {
 			uiQuit();
 			return TRUE;
 		}