haiku: Rename internal functions from BE_* to HAIKU_*

Fixes Bugzilla #2349.

Author: icculus

src/main/haiku/SDL_BApp.h

@@ -231,7 +231,7 @@ class SDL_BApp : public BApplication {
         SDL_SendMouseMotion(win, 0, 0, x, y);
 
         /* Tell the application that the mouse passed over, redraw needed */
-        BE_UpdateWindowFramebuffer(NULL,win,NULL,-1);
+        HAIKU_UpdateWindowFramebuffer(NULL,win,NULL,-1);
     }
 
     void _HandleMouseButton(BMessage *msg) {
@@ -274,11 +274,11 @@ class SDL_BApp : public BApplication {
         }
 
         /* Make sure this isn't a repeated event (key pressed and held) */
-        if(state == SDL_PRESSED && BE_GetKeyState(scancode) == SDL_PRESSED) {
+        if(state == SDL_PRESSED && HAIKU_GetKeyState(scancode) == SDL_PRESSED) {
             return;
         }
-        BE_SetKeyState(scancode, state);
-        SDL_SendKeyboardKey(state, BE_GetScancodeFromBeKey(scancode));
+        HAIKU_SetKeyState(scancode, state);
+        SDL_SendKeyboardKey(state, HAIKU_GetScancodeFromBeKey(scancode));
 
         if (state == SDL_PRESSED && SDL_EventState(SDL_TEXTINPUT, SDL_QUERY)) {
             const int8 *keyUtf8;

src/video/haiku/SDL_BWin.h

@@ -88,7 +88,7 @@ class SDL_BWin:public BDirectWindow
         _clips = NULL;
 
 #ifdef DRAWTHREAD
-        _draw_thread_id = spawn_thread(BE_DrawThread, "drawing_thread",
+        _draw_thread_id = spawn_thread(HAIKU_DrawThread, "drawing_thread",
                             B_NORMAL_PRIORITY, (void*) this);
         resume_thread(_draw_thread_id);
 #endif

src/video/haiku/SDL_bclipboard.cc

@@ -35,7 +35,7 @@
 extern "C" {
 #endif
 
-int BE_SetClipboardText(_THIS, const char *text) {
+int HAIKU_SetClipboardText(_THIS, const char *text) {
 	BMessage *clip = NULL;
 	if(be_clipboard->Lock()) {
 		be_clipboard->Clear();
@@ -51,7 +51,7 @@ int BE_SetClipboardText(_THIS, const char *text) {
 	return 0;
 }
 
-char *BE_GetClipboardText(_THIS) {
+char *HAIKU_GetClipboardText(_THIS) {
 	BMessage *clip = NULL;
 	const char *text = NULL;	
 	ssize_t length;
@@ -76,9 +76,9 @@ char *BE_GetClipboardText(_THIS) {
 	return result;
 }
 
-SDL_bool BE_HasClipboardText(_THIS) {
+SDL_bool HAIKU_HasClipboardText(_THIS) {
 	SDL_bool result = SDL_FALSE;
-	char *text = BE_GetClipboardText(_this);
+	char *text = HAIKU_GetClipboardText(_this);
 	if (text) {
 		result = text[0] != '\0' ? SDL_TRUE : SDL_FALSE;
 		SDL_free(text);

src/video/haiku/SDL_bclipboard.h

@@ -24,9 +24,9 @@
 #ifndef SDL_BCLIPBOARD_H
 #define SDL_BCLIPBOARD_H
 
-extern int BE_SetClipboardText(_THIS, const char *text);
-extern char *BE_GetClipboardText(_THIS);
-extern SDL_bool BE_HasClipboardText(_THIS);
+extern int HAIKU_SetClipboardText(_THIS, const char *text);
+extern char *HAIKU_GetClipboardText(_THIS);
+extern SDL_bool HAIKU_HasClipboardText(_THIS);
 
 #endif
 

src/video/haiku/SDL_bevents.cc

@@ -28,7 +28,7 @@
 extern "C" {
 #endif
 
-void BE_PumpEvents(_THIS) {
+void HAIKU_PumpEvents(_THIS) {
 	/* Since the event thread is its own thread, this isn't really necessary */
 }
 

src/video/haiku/SDL_bevents.h

@@ -28,7 +28,7 @@
 extern "C" {
 #endif
 
-extern void BE_PumpEvents(_THIS);
+extern void HAIKU_PumpEvents(_THIS);
 
 #ifdef __cplusplus
 }

src/video/haiku/SDL_bframebuffer.cc

@@ -36,7 +36,7 @@ extern "C" {
 #endif
 
 #ifndef DRAWTHREAD
-static int32 BE_UpdateOnce(SDL_Window *window);
+static int32 HAIKU_UpdateOnce(SDL_Window *window);
 #endif
 
 static SDL_INLINE SDL_BWin *_ToBeWin(SDL_Window *window) {
@@ -47,7 +47,7 @@ static SDL_INLINE SDL_BApp *_GetBeApp() {
 	return ((SDL_BApp*)be_app);
 }
 
-int BE_CreateWindowFramebuffer(_THIS, SDL_Window * window,
+int HAIKU_CreateWindowFramebuffer(_THIS, SDL_Window * window,
                                        Uint32 * format,
                                        void ** pixels, int *pitch) {
 	SDL_BWin *bwin = _ToBeWin(window);
@@ -64,8 +64,8 @@ int BE_CreateWindowFramebuffer(_THIS, SDL_Window * window,
 	/* format */
 	display_mode bmode;
 	bscreen.GetMode(&bmode);
-	int32 bpp = BE_ColorSpaceToBitsPerPixel(bmode.space);
-	*format = BE_BPPToSDLPxFormat(bpp);
+	int32 bpp = HAIKU_ColorSpaceToBitsPerPixel(bmode.space);
+	*format = HAIKU_BPPToSDLPxFormat(bpp);
 
 	/* Create the new bitmap object */
 	BBitmap *bitmap = bwin->GetBitmap();
@@ -99,7 +99,7 @@ int BE_CreateWindowFramebuffer(_THIS, SDL_Window * window,
 
 
 
-int BE_UpdateWindowFramebuffer(_THIS, SDL_Window * window,
+int HAIKU_UpdateWindowFramebuffer(_THIS, SDL_Window * window,
                                       const SDL_Rect * rects, int numrects) {
 	if(!window)
 		return 0;
@@ -112,13 +112,13 @@ int BE_UpdateWindowFramebuffer(_THIS, SDL_Window * window,
 	bwin->UnlockBuffer();
 #else
 	bwin->SetBufferDirty(true);
-	BE_UpdateOnce(window);
+	HAIKU_UpdateOnce(window);
 #endif
 
 	return 0;
 }
 
-int32 BE_DrawThread(void *data) {
+int32 HAIKU_DrawThread(void *data) {
 	SDL_BWin *bwin = (SDL_BWin*)data;
 
 	BScreen bscreen;
@@ -181,7 +181,7 @@ int32 BE_DrawThread(void *data) {
 	return B_OK;
 }
 
-void BE_DestroyWindowFramebuffer(_THIS, SDL_Window * window) {
+void HAIKU_DestroyWindowFramebuffer(_THIS, SDL_Window * window) {
 	SDL_BWin *bwin = _ToBeWin(window);
 
 	bwin->LockBuffer();
@@ -202,7 +202,7 @@ void BE_DestroyWindowFramebuffer(_THIS, SDL_Window * window) {
  * solved, but I doubt it- they were pretty sporadic before now.
  */
 #ifndef DRAWTHREAD
-static int32 BE_UpdateOnce(SDL_Window *window) {
+static int32 HAIKU_UpdateOnce(SDL_Window *window) {
 	SDL_BWin *bwin = _ToBeWin(window);
 	BScreen bscreen;
 	if(!bscreen.IsValid()) {

src/video/haiku/SDL_bframebuffer.h

@@ -30,13 +30,13 @@ extern "C" {
 
 #include "../SDL_sysvideo.h"
 
-extern int BE_CreateWindowFramebuffer(_THIS, SDL_Window * window,
+extern int HAIKU_CreateWindowFramebuffer(_THIS, SDL_Window * window,
                                        Uint32 * format,
                                        void ** pixels, int *pitch);
-extern int BE_UpdateWindowFramebuffer(_THIS, SDL_Window * window,
+extern int HAIKU_UpdateWindowFramebuffer(_THIS, SDL_Window * window,
                                        const SDL_Rect * rects, int numrects);
-extern void BE_DestroyWindowFramebuffer(_THIS, SDL_Window * window);
-extern int32 BE_DrawThread(void *data);
+extern void HAIKU_DestroyWindowFramebuffer(_THIS, SDL_Window * window);
+extern int32 HAIKU_DrawThread(void *data);
 
 #ifdef __cplusplus
 }

src/video/haiku/SDL_bkeyboard.cc

@@ -41,7 +41,7 @@ extern "C" {
 static SDL_Scancode keymap[KEYMAP_SIZE];
 static int8 keystate[KEYMAP_SIZE];
 
-void BE_InitOSKeymap(void) {
+void HAIKU_InitOSKeymap(void) {
 		for( uint i = 0; i < SDL_TABLESIZE(keymap); ++i ) {
 			keymap[i] = SDL_SCANCODE_UNKNOWN;
 		}
@@ -159,23 +159,23 @@ void BE_InitOSKeymap(void) {
 		keymap[0x6b]		= SDL_GetScancodeFromKey(SDLK_POWER);
 }
 
-SDL_Scancode BE_GetScancodeFromBeKey(int32 bkey) {
+SDL_Scancode HAIKU_GetScancodeFromBeKey(int32 bkey) {
 	if(bkey > 0 && bkey < (int32)SDL_TABLESIZE(keymap)) {
 		return keymap[bkey];
 	} else {
 		return SDL_SCANCODE_UNKNOWN;
 	}
 }
 
-int8 BE_GetKeyState(int32 bkey) {
+int8 HAIKU_GetKeyState(int32 bkey) {
 	if(bkey > 0 && bkey < KEYMAP_SIZE) {
 		return keystate[bkey];
 	} else {
 		return SDL_RELEASED;
 	}
 }
 
-void BE_SetKeyState(int32 bkey, int8 state) {
+void HAIKU_SetKeyState(int32 bkey, int8 state) {
 	if(bkey > 0 && bkey < KEYMAP_SIZE) {
 		keystate[bkey] = state;
 	}

src/video/haiku/SDL_bkeyboard.h

@@ -30,10 +30,10 @@ extern "C" {
 
 #include "../../../include/SDL_keyboard.h"
 
-extern void BE_InitOSKeymap(void);
-extern SDL_Scancode BE_GetScancodeFromBeKey(int32 bkey);
-extern int8 BE_GetKeyState(int32 bkey);
-extern void BE_SetKeyState(int32 bkey, int8 state);
+extern void HAIKU_InitOSKeymap(void);
+extern SDL_Scancode HAIKU_GetScancodeFromBeKey(int32 bkey);
+extern int8 HAIKU_GetKeyState(int32 bkey);
+extern void HAIKU_SetKeyState(int32 bkey, int8 state);
 
 #ifdef __cplusplus
 }