From a3cd1cf54be3c43f56edf604c92c50d8479d7759 Mon Sep 17 00:00:00 2001 From: dhewg Date: Tue, 13 Dec 2011 16:03:27 +0100 Subject: [PATCH] Get rid of all #pragma mark Fixes error: stray '\245' in program --- neo/sys/osx/DOOMController.mm | 7 +------ neo/sys/osx/PickMonitor.cpp | 19 +++---------------- neo/sys/osx/PreferencesDialog.cpp | 13 +------------ neo/sys/osx/macosx_glimp.mm | 4 ---- 4 files changed, 5 insertions(+), 38 deletions(-) diff --git a/neo/sys/osx/DOOMController.mm b/neo/sys/osx/DOOMController.mm index 6c822186..a8e5a1ea 100644 --- a/neo/sys/osx/DOOMController.mm +++ b/neo/sys/osx/DOOMController.mm @@ -838,10 +838,6 @@ int main( int argc, const char *argv[] ) { return NSApplicationMain( argc, argv ); } - -#pragma mark - - - bool FormatRegCode(const char* inRegCode, char* outRegCode) { // Clean up the reg code. Remove spaces. Accept only numbers/letters. @@ -866,9 +862,8 @@ bool FormatRegCode(const char* inRegCode, char* outRegCode) RegCodeHandler =============== */ -static pascal OSStatus RegCodeHandler( EventHandlerCallRef inHandler, EventRef inEvent, void* inUserData ) +static pascal OSStatus RegCodeHandler( EventHandlerCallRef, EventRef inEvent, void* inUserData ) { -#pragma unused( inHandler ) #if 1 // FIXME: the CD key API has changed for startup check support and expansion pack key support return noErr; diff --git a/neo/sys/osx/PickMonitor.cpp b/neo/sys/osx/PickMonitor.cpp index e2fa8da0..8fae33a7 100644 --- a/neo/sys/osx/PickMonitor.cpp +++ b/neo/sys/osx/PickMonitor.cpp @@ -164,17 +164,13 @@ OSErr DisposeUserPaneProcs(ControlRef inUserPane) return noErr; } -#pragma mark - - //----------------------------------------------------------------------------- // drawProc //----------------------------------------------------------------------------- // Custom drawProc for our UserPane control. -static pascal void drawProc(ControlRef inControl, SInt16 inPart) +static pascal void drawProc(ControlRef, SInt16) { - #pragma unused(inControl, inPart) - int i; RGBColor saveForeColor; RGBColor saveBackColor; @@ -249,9 +245,8 @@ static pascal ControlPartCode hitTestProc(ControlRef inControl, Point inWhere) static pascal ControlPartCode trackingProc ( ControlRef inControl, Point inStartPt, - ControlActionUPP inActionProc) + ControlActionUPP) { - #pragma unused (inControl, inStartPt, inActionProc) int i; for (i = 0; i < sNumMonitors; i++) @@ -270,10 +265,6 @@ static pascal ControlPartCode trackingProc ( return kControlNoPart; } - -#pragma mark - - - //----------------------------------------------------------------------------- // SetupPickMonitorPane //----------------------------------------------------------------------------- @@ -387,17 +378,13 @@ OSErr TearDownPickMonitorPane(ControlRef inPane) return err; } -#pragma mark - - //------------------------------------------------------------------------------------ // ¥ PickMonitorHandler //------------------------------------------------------------------------------------ // Our command handler for the PickMonitor dialog. -static pascal OSStatus PickMonitorHandler( EventHandlerCallRef inHandler, EventRef inEvent, void* inUserData ) +static pascal OSStatus PickMonitorHandler( EventHandlerCallRef, EventRef inEvent, void* inUserData ) { - #pragma unused( inHandler ) - HICommand cmd; OSStatus result = eventNotHandledErr; WindowRef theWindow = (WindowRef)inUserData; diff --git a/neo/sys/osx/PreferencesDialog.cpp b/neo/sys/osx/PreferencesDialog.cpp index 5a9b431d..d25ef98e 100644 --- a/neo/sys/osx/PreferencesDialog.cpp +++ b/neo/sys/osx/PreferencesDialog.cpp @@ -78,9 +78,6 @@ struct PrefInfo SInt32 freqMenuIndex; }; - -#pragma mark - - bool R_GetModeInfo( int *width, int *height, int mode ); static int GetScreenIndexForDisplayID( CGDirectDisplayID inDisplayID ) { @@ -203,8 +200,6 @@ void Sys_DoPreferences( void ) { } -#pragma mark - - #define EnablePopupMenuItem(inControl,inMenuItem) EnableMenuItem(GetControlPopupMenuRef(inControl),inMenuItem) #define DisablePopupMenuItem(inControl,inMenuItem) DisableMenuItem(GetControlPopupMenuRef(inControl),inMenuItem) #define IsPopupMenuItemEnabled(inControl,inMenuItem) IsMenuItemEnabled(GetControlPopupMenuRef(inControl),inMenuItem) @@ -577,12 +572,8 @@ static void AdjustDisplayControls(PrefInfo *prefInfo) EnableControl (prefInfo->refreshRatePopup); } -#pragma mark - - -static pascal OSStatus PrefHandler( EventHandlerCallRef inHandler, EventRef inEvent, void* inUserData ) +static pascal OSStatus PrefHandler( EventHandlerCallRef, EventRef inEvent, void* inUserData ) { - #pragma unused( inHandler ) - HICommand cmd; OSStatus result = eventNotHandledErr; PrefInfo* prefInfo = (PrefInfo*)inUserData; @@ -698,8 +689,6 @@ static pascal OSStatus PrefHandler( EventHandlerCallRef inHandler, EventRef inEv return result; } -#pragma mark - - static DEFINE_ONE_SHOT_HANDLER_GETTER(PrefHandler) OSStatus CreateGameDisplayPreferencesDialog(const GameDisplayInfo *inGDInfo, diff --git a/neo/sys/osx/macosx_glimp.mm b/neo/sys/osx/macosx_glimp.mm index c3a68057..ff04d70c 100644 --- a/neo/sys/osx/macosx_glimp.mm +++ b/neo/sys/osx/macosx_glimp.mm @@ -670,9 +670,6 @@ void GLimp_SetGamma(unsigned short red[256], /*****************************************************************************/ -#pragma mark - -#pragma mark ¥ ATI_fragment_shader - static GLuint sGeneratingProgram = 0; static int sCurrentPass; static char sConstString[4096]; @@ -1177,7 +1174,6 @@ void glAlphaFragmentOp2ATI (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, G void glAlphaFragmentOp3ATI (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod) { glColorFragmentOp3ATI ( op, dst, GL_ALPHA, dstMod, arg1, arg1Rep, arg1Mod, arg2, arg2Rep, arg2Mod, arg3, arg3Rep, arg3Mod); } -#pragma mark - GLExtension_t GLimp_ExtensionPointer(const char *name) { NSSymbol symbol;