Fixed static misnomers
authorNathan Heisey <nathanheisey@gmail.com>
Mon, 22 Aug 2011 21:07:16 +0000
changeset 5940377e870b3f49
parent 5939 d9e9c343d264
child 5941 e4e18a80be61
Fixed static misnomers
src/video/bwindow/SDL_bframebuffer.cc
src/video/bwindow/SDL_bmodes.cc
src/video/bwindow/SDL_bmodes.h
src/video/bwindow/SDL_bvideo.cc
src/video/bwindow/SDL_bwindow.cc
     1.1 --- a/src/video/bwindow/SDL_bframebuffer.cc	Mon Aug 22 11:02:05 2011 +0000
     1.2 +++ b/src/video/bwindow/SDL_bframebuffer.cc	Mon Aug 22 21:07:16 2011 +0000
     1.3 @@ -59,8 +59,8 @@
     1.4  	/* format */
     1.5  	display_mode bmode;
     1.6  	bscreen.GetMode(&bmode);
     1.7 -	int32 bpp = ColorSpaceToBitsPerPixel(bmode.space);
     1.8 -	*format = BPPToSDLPxFormat(bpp);
     1.9 +	int32 bpp = BE_ColorSpaceToBitsPerPixel(bmode.space);
    1.10 +	*format = BE_BPPToSDLPxFormat(bpp);
    1.11  
    1.12  	/* Create the new bitmap object */
    1.13  	BBitmap *bitmap = bwin->GetBitmap();
     2.1 --- a/src/video/bwindow/SDL_bmodes.cc	Mon Aug 22 11:02:05 2011 +0000
     2.2 +++ b/src/video/bwindow/SDL_bmodes.cc	Mon Aug 22 21:07:16 2011 +0000
     2.3 @@ -131,7 +131,7 @@
     2.4  
     2.5  
     2.6  
     2.7 -static inline int32 ColorSpaceToBitsPerPixel(uint32 colorspace)
     2.8 +int32 BE_ColorSpaceToBitsPerPixel(uint32 colorspace)
     2.9  {
    2.10  	int bitsperpixel;
    2.11  
    2.12 @@ -162,7 +162,7 @@
    2.13  	return(bitsperpixel);
    2.14  }
    2.15  
    2.16 -static inline int32 BPPToSDLPxFormat(int32 bpp) {
    2.17 +int32 BE_BPPToSDLPxFormat(int32 bpp) {
    2.18  	/* Translation taken from SDL_windowsmodes.c */
    2.19  	switch (bpp) {
    2.20  	case 32:
    2.21 @@ -186,7 +186,7 @@
    2.22  	}
    2.23  }
    2.24  
    2.25 -static inline void _BDisplayModeToSdlDisplayMode(display_mode *bmode,
    2.26 +static void _BDisplayModeToSdlDisplayMode(display_mode *bmode,
    2.27  		SDL_DisplayMode *mode) {
    2.28  	mode->w = bmode->virtual_width;
    2.29  	mode->h = bmode->virtual_height;
    2.30 @@ -205,12 +205,12 @@
    2.31  #endif
    2.32  
    2.33  	/* Set the format */
    2.34 -	int32 bpp = ColorSpaceToBitsPerPixel(bmode->space);
    2.35 -	mode->format = BPPToSDLPxFormat(bpp);
    2.36 +	int32 bpp = BE_ColorSpaceToBitsPerPixel(bmode->space);
    2.37 +	mode->format = BE_BPPToSDLPxFormat(bpp);
    2.38  }
    2.39  
    2.40  /* Later, there may be more than one monitor available */
    2.41 -void _AddDisplay(BScreen *screen) {
    2.42 +static void _AddDisplay(BScreen *screen) {
    2.43  	SDL_VideoDisplay display;
    2.44  	SDL_DisplayMode *mode = (SDL_DisplayMode*)SDL_calloc(1,
    2.45  		sizeof(SDL_DisplayMode));
    2.46 @@ -307,7 +307,8 @@
    2.47  		SDL_SetError("Bad video mode\n");
    2.48  		return -1;
    2.49  	}
    2.50 -free(bmode_list);
    2.51 +	
    2.52 +	free(bmode_list);
    2.53  	
    2.54  #if SDL_VIDEO_OPENGL
    2.55  	/* FIXME: Is there some way to reboot the OpenGL context?  This doesn't
     3.1 --- a/src/video/bwindow/SDL_bmodes.h	Mon Aug 22 11:02:05 2011 +0000
     3.2 +++ b/src/video/bwindow/SDL_bmodes.h	Mon Aug 22 21:07:16 2011 +0000
     3.3 @@ -28,8 +28,8 @@
     3.4  
     3.5  #include "../SDL_sysvideo.h"
     3.6  
     3.7 -extern int32 ColorSpaceToBitsPerPixel(uint32 colorspace);
     3.8 -extern int32 BPPToSDLPxFormat(int32 bpp);
     3.9 +extern int32 BE_ColorSpaceToBitsPerPixel(uint32 colorspace);
    3.10 +extern int32 BE_BPPToSDLPxFormat(int32 bpp);
    3.11  
    3.12  extern int BE_InitModes(_THIS);
    3.13  extern int BE_QuitModes(_THIS);
     4.1 --- a/src/video/bwindow/SDL_bvideo.cc	Mon Aug 22 11:02:05 2011 +0000
     4.2 +++ b/src/video/bwindow/SDL_bvideo.cc	Mon Aug 22 21:07:16 2011 +0000
     4.3 @@ -122,7 +122,7 @@
     4.4  	BE_Available, BE_CreateDevice
     4.5  };
     4.6  
     4.7 -static void BE_DeleteDevice(SDL_VideoDevice * device)
     4.8 +void BE_DeleteDevice(SDL_VideoDevice * device)
     4.9  {
    4.10  	SDL_free(device->driverdata);
    4.11  	SDL_free(device);
    4.12 @@ -152,7 +152,7 @@
    4.13      return (0);
    4.14  }
    4.15  
    4.16 -static int BE_Available(void)
    4.17 +int BE_Available(void)
    4.18  {
    4.19      return (1);
    4.20  }
     5.1 --- a/src/video/bwindow/SDL_bwindow.cc	Mon Aug 22 11:02:05 2011 +0000
     5.2 +++ b/src/video/bwindow/SDL_bwindow.cc	Mon Aug 22 21:07:16 2011 +0000
     5.3 @@ -37,7 +37,7 @@
     5.4  	return ((SDL_BApp*)be_app);
     5.5  }
     5.6  
     5.7 -int _InitWindow(_THIS, SDL_Window *window) {
     5.8 +static int _InitWindow(_THIS, SDL_Window *window) {
     5.9  	uint32 flags = 0;
    5.10  	BRect bounds(
    5.11          window->x,