diff --git a/cmd/macfe/Composer/CFontMenuAttachment.cp b/cmd/macfe/Composer/CFontMenuAttachment.cp index e84e6331b0b5..8b07ab375fff 100644 --- a/cmd/macfe/Composer/CFontMenuAttachment.cp +++ b/cmd/macfe/Composer/CFontMenuAttachment.cp @@ -249,7 +249,7 @@ void CFontMenuAttachment::InstallMenus() LMenuBar *currentMenuBar = LMenuBar::GetCurrentMenuBar(); if (currentMenuBar) { - StValueChanger okayToFail(gDebugThrow, debugAction_Nothing); + StValueChanger okayToFail(UDebugging::gDebugThrow, debugAction_Nothing); currentMenuBar->InstallMenu(sMenu, hierMenu); ResIDT resID; diff --git a/cmd/macfe/Composer/CRecentEditMenuAttachment.cp b/cmd/macfe/Composer/CRecentEditMenuAttachment.cp index b38bcd452ab7..891c67530184 100644 --- a/cmd/macfe/Composer/CRecentEditMenuAttachment.cp +++ b/cmd/macfe/Composer/CRecentEditMenuAttachment.cp @@ -192,7 +192,7 @@ void CRecentEditMenuAttachment::InstallMenus() LMenuBar *currentMenuBar = LMenuBar::GetCurrentMenuBar(); if (currentMenuBar) { - StValueChanger okayToFail(gDebugThrow, debugAction_Nothing); + StValueChanger okayToFail(UDebugging::gDebugThrow, debugAction_Nothing); currentMenuBar->InstallMenu(sMenu, hierMenu); ResIDT resID; diff --git a/cmd/macfe/Composer/CToolsAttachment.cp b/cmd/macfe/Composer/CToolsAttachment.cp index 35efb339137a..7e7513fa0454 100644 --- a/cmd/macfe/Composer/CToolsAttachment.cp +++ b/cmd/macfe/Composer/CToolsAttachment.cp @@ -327,11 +327,11 @@ void CToolsAttachment::InstallMenus() if (menu) { - StValueChanger okayToFail(gDebugThrow, debugAction_Nothing); + StValueChanger okayToFail(UDebugging::gDebugThrow, debugAction_Nothing); currentMenuBar->InstallMenu(menu, hierMenu); } } - StValueChanger okayToFail(gDebugThrow, debugAction_Nothing); + StValueChanger okayToFail(UDebugging::gDebugThrow, debugAction_Nothing); currentMenuBar->InstallMenu(sMenu, InstallMenu_AtEnd); } } diff --git a/cmd/macfe/applevnt/mplugin.cp b/cmd/macfe/applevnt/mplugin.cp index 09c4293857b3..17d994c5998e 100644 --- a/cmd/macfe/applevnt/mplugin.cp +++ b/cmd/macfe/applevnt/mplugin.cp @@ -397,10 +397,10 @@ OSErr CPluginHandler::InitCodeResource(NPNetscapeFuncs* funcs, _np_handle* handl OSErr err = noErr; #ifdef DEBUG - EDebugAction oldThrow = gDebugThrow; - EDebugAction oldSignal = gDebugSignal; - gDebugThrow = debugAction_Nothing; - gDebugSignal = debugAction_Nothing; + EDebugAction oldThrow = UDebugging::gDebugThrow; + EDebugAction oldSignal = UDebugging::gDebugSignal; + UDebugging::gDebugThrow = debugAction_Nothing; + UDebugging::gDebugSignal = debugAction_Nothing; #endif Try_ { @@ -474,8 +474,8 @@ OSErr CPluginHandler::InitCodeResource(NPNetscapeFuncs* funcs, _np_handle* handl EndCatch_ CPrefs::UseApplicationResFile(); // Revert the resource chain #ifdef DEBUG - gDebugThrow = oldThrow; - gDebugSignal = oldSignal; + UDebugging::gDebugThrow = oldThrow; + UDebugging::gDebugSignal = oldSignal; #endif return err; } diff --git a/cmd/macfe/central/CBookmarksAttachment.cp b/cmd/macfe/central/CBookmarksAttachment.cp index 9633217f8ef9..82ae760c3952 100644 --- a/cmd/macfe/central/CBookmarksAttachment.cp +++ b/cmd/macfe/central/CBookmarksAttachment.cp @@ -377,11 +377,11 @@ void CBookmarksAttachment::InstallMenus() if (menu) { - StValueChanger okayToFail(gDebugThrow, debugAction_Nothing); + StValueChanger okayToFail(UDebugging::gDebugThrow, debugAction_Nothing); currentMenuBar->InstallMenu(menu, hierMenu); } } - StValueChanger okayToFail(gDebugThrow, debugAction_Nothing); + StValueChanger okayToFail(UDebugging::gDebugThrow, debugAction_Nothing); currentMenuBar->InstallMenu(sMenu, InstallMenu_AtEnd); #if 0 // no more Guide menu. Leave this here in case mktg wants to replace it with something (pinkerton). diff --git a/cmd/macfe/central/InternetConfig.cp b/cmd/macfe/central/InternetConfig.cp index edcd497fa046..603807839c0c 100644 --- a/cmd/macfe/central/InternetConfig.cp +++ b/cmd/macfe/central/InternetConfig.cp @@ -274,7 +274,7 @@ fInstance(NULL) ICError err; // Detect IC, if present - StValueChanger okayToFail(gDebugThrow, debugAction_Nothing); + StValueChanger okayToFail(UDebugging::gDebugThrow, debugAction_Nothing); err = ::ICStart(&fInstance, emSignature); //ThrowIfOSErr_(err); if (!err) diff --git a/cmd/macfe/gui/CBrowserWindow.cp b/cmd/macfe/gui/CBrowserWindow.cp index dbf973e07a52..3e46ea067ddb 100644 --- a/cmd/macfe/gui/CBrowserWindow.cp +++ b/cmd/macfe/gui/CBrowserWindow.cp @@ -2325,7 +2325,7 @@ void CBrowserWindow::HandleGetURLEvent(const AppleEvent &inAppleEvent, char * winName = NULL; #ifdef DEBUG - StValueChanger changeDebugThrow(gDebugThrow, debugAction_Nothing); + StValueChanger changeDebugThrow(UDebugging::gDebugThrow, debugAction_Nothing); #endif MoreExtractFromAEDesc::GetCString(inAppleEvent, keyDirectObject, url); @@ -2447,20 +2447,15 @@ void CBrowserWindow::HandleOpenURLEvent(const AppleEvent &inAppleEvent, AEDesc &/*outResult*/, CBrowserWindow *inBrowserWindow) { - // The use of "volatile" in the following lines - // (a) generated compiler warnings, because they are passed to routines that - // are not declared with correspondingly volatile parameters. - // (b) do not appear to need to be volatile in the sense given (If they were - // declared as volatile char*, that would be another thing... - char * /*volatile*/ formData = NULL; // Do not free this - char * /*volatile*/ formHeader = NULL; // form headers (MIME type) + char * formData = NULL; // Do not free this + char * formHeader = NULL; // form headers (MIME type) ProcessSerialNumber psn; FSSpec fileSpec; Boolean hasFileSpec = FALSE; Boolean hasFormData = FALSE; Boolean hasPSN = FALSE; Boolean forceReload = FALSE; - OSErr volatile err; + OSErr err; Size actualSize; DescType realType; diff --git a/cmd/macfe/gui/CDateView.cp b/cmd/macfe/gui/CDateView.cp index 347074757a60..18c060265aae 100644 --- a/cmd/macfe/gui/CDateView.cp +++ b/cmd/macfe/gui/CDateView.cp @@ -441,7 +441,7 @@ void CDateView::ShowHideArrows(Boolean inShow) { Filter for incoming data characters. ======================================================================================*/ -EKeyStatus CDateView::DateFieldFilter(TEHandle inMacTEH, Char16 theKey, Char16& theChar, SInt16 inModifiers) { +EKeyStatus CDateView::DateFieldFilter(TEHandle inMacTEH, Char16 theKey, Char16& theChar, UInt16 inModifiers) { EKeyStatus theKeyStatus = keyStatus_PassUp; //Char16 theKey = inKeyEvent.message; diff --git a/lib/mac/UserInterface/CButton.cp b/lib/mac/UserInterface/CButton.cp index ba036e2dd2af..4dafd530cfa2 100644 --- a/lib/mac/UserInterface/CButton.cp +++ b/lib/mac/UserInterface/CButton.cp @@ -135,7 +135,7 @@ void CButton::Draw(RgnHandle inSuperDrawRgnH) StColorPenState::Normalize(); // Fail safe offscreen drawing - StValueChanger okayToFail(gDebugThrow, debugAction_Nothing); + StValueChanger okayToFail(UDebugging::gDebugThrow, debugAction_Nothing); try { LGWorld theOffWorld(theFrame, 0, useTempMem); diff --git a/lib/mac/UserInterface/COffscreenCaption.cp b/lib/mac/UserInterface/COffscreenCaption.cp index 3e0e5493a4ef..3f235e23c120 100644 --- a/lib/mac/UserInterface/COffscreenCaption.cp +++ b/lib/mac/UserInterface/COffscreenCaption.cp @@ -108,7 +108,7 @@ void COffscreenCaption::Draw(RgnHandle inSuperDrawRgnH) StColorPenState::Normalize(); // Fail safe offscreen drawing - StValueChanger okayToFail(gDebugThrow, debugAction_Nothing); + StValueChanger okayToFail(UDebugging::gDebugThrow, debugAction_Nothing); try { LGWorld theOffWorld(theFrame, 0, useTempMem); diff --git a/lib/mac/UserInterface/CTabControl.cp b/lib/mac/UserInterface/CTabControl.cp index 19563353110d..b456a3e0354f 100644 --- a/lib/mac/UserInterface/CTabControl.cp +++ b/lib/mac/UserInterface/CTabControl.cp @@ -188,7 +188,7 @@ void CTabControl::Draw(RgnHandle inSuperDrawRgnH) StColorPenState::Normalize(); // Fail safe offscreen drawing - StValueChanger okayToFail(gDebugThrow, debugAction_Nothing); + StValueChanger okayToFail(UDebugging::gDebugThrow, debugAction_Nothing); try { LGWorld theOffWorld(theFrame, 0, useTempMem);