From 12440f3d5f9e1ec57fa5f028d6fd955e9144ee44 Mon Sep 17 00:00:00 2001 From: Bartosz Taudul Date: Fri, 3 Oct 2008 01:20:40 +0200 Subject: [PATCH] Remove LOCAL_C abomination. --- src/audio/symbian/streamplayer.cpp | 4 ++-- src/main/symbian/SDL_main.cpp | 6 +++--- src/main/symbian/sdlexe.cpp | 4 ++-- src/video/symbian/SDL_epocvideo.cpp | 6 +++--- src/video/symbian/dsa.cpp | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/audio/symbian/streamplayer.cpp b/src/audio/symbian/streamplayer.cpp index ec9f6ca..20b8878 100644 --- a/src/audio/symbian/streamplayer.cpp +++ b/src/audio/symbian/streamplayer.cpp @@ -3,7 +3,7 @@ const int KMaxVolume = 256; -LOCAL_C int GetSampleRate(int aRate) +static int GetSampleRate(int aRate) { switch(aRate) { @@ -23,7 +23,7 @@ LOCAL_C int GetSampleRate(int aRate) return KErrNotFound; } -LOCAL_C int GetChannels(int aChannels) +static int GetChannels(int aChannels) { switch(aChannels) { diff --git a/src/main/symbian/SDL_main.cpp b/src/main/symbian/SDL_main.cpp index b6fe5fa..c49a17d 100644 --- a/src/main/symbian/SDL_main.cpp +++ b/src/main/symbian/SDL_main.cpp @@ -524,7 +524,7 @@ void EpocSdlEnv::WaitDeviceChange() gEpocEnv->iAppSrv->RequestValue(CSdlAppServ::EAppSrvWaitDsa); } -LOCAL_C TBool CheckSdl() +static TBool CheckSdl() { int isExit = ETrue; RThread sdl; @@ -575,7 +575,7 @@ void EpocSdlEnvData::Delete() _LIT(KSDLMain, "SDLMain"); -LOCAL_C int MainL() +static int MainL() { gEpocEnv->iCleanupItems = new (ELeave) CArrayFixFlat(8); @@ -619,7 +619,7 @@ LOCAL_C int MainL() return 0; } -LOCAL_C int DoMain(TAny* /*aParam*/) +static int DoMain(TAny* /*aParam*/) { TBool fbsconnected = EFalse; diff --git a/src/main/symbian/sdlexe.cpp b/src/main/symbian/sdlexe.cpp index d8e168e..a8a9bc7 100644 --- a/src/main/symbian/sdlexe.cpp +++ b/src/main/symbian/sdlexe.cpp @@ -16,7 +16,7 @@ class CApaDocument; -LOCAL_C void MakeCCmdLineL(const TDesC8& aParam, CDesC8Array& aArray) +static void MakeCCmdLineL(const TDesC8& aParam, CDesC8Array& aArray) { const TChar dq('\"'); @@ -437,7 +437,7 @@ void CSDLAppUi::HandleResourceChangeL(int aType) { CAknAppUi::HandleResourceChangeL(aType); if(aType == KEikDynamicLayoutVariantSwitch) - { + { iSDLWin->SetRect(ApplicationRect()); iSdl->SetContainerWindowL(iSDLWin->GetWindow(), iEikonEnv->WsSession(), *iEikonEnv->ScreenDevice()); iSdl->Resize(); diff --git a/src/video/symbian/SDL_epocvideo.cpp b/src/video/symbian/SDL_epocvideo.cpp index dfe209b..d268d62 100644 --- a/src/video/symbian/SDL_epocvideo.cpp +++ b/src/video/symbian/SDL_epocvideo.cpp @@ -458,7 +458,7 @@ TDisplayMode GetDisplayMode(int aBitsPerPixel) } -LOCAL_C void glAssert(_THIS) +static void glAssert(_THIS) { const EGLint err = DC(eglGetError)(); if(err != EGL_SUCCESS) @@ -467,7 +467,7 @@ LOCAL_C void glAssert(_THIS) } } -LOCAL_C void CreateGles(_THIS, RWindow& aWindow, int bpp, SDL_PrivateGLData& aData) +static void CreateGles(_THIS, RWindow& aWindow, int bpp, SDL_PrivateGLData& aData) { SDL_GL_LoadLibrary(NULL); //just if its not already loaded aData.iDisplay = DC(eglGetDisplay)(EGL_DEFAULT_DISPLAY); @@ -541,7 +541,7 @@ LOCAL_C void CreateGles(_THIS, RWindow& aWindow, int bpp, SDL_PrivateGLData& aDa } -LOCAL_C void DestroyGles(_THIS) +static void DestroyGles(_THIS) { if( _this->gl_config.driver_loaded) { diff --git a/src/video/symbian/dsa.cpp b/src/video/symbian/dsa.cpp index bb0a2a7..d05fb81 100644 --- a/src/video/symbian/dsa.cpp +++ b/src/video/symbian/dsa.cpp @@ -3,7 +3,7 @@ #include #include -LOCAL_C int BytesPerPixel(TDisplayMode aMode) +static int BytesPerPixel(TDisplayMode aMode) { return ((TDisplayModeUtils::NumDisplayModeBitsPerPixel(aMode) - 1) >> 3) + 1; } @@ -643,7 +643,7 @@ TUint32 TRgbCopy::Color16MA(const TUint32& aPixel) typedef TUint64 TStackMem; -LOCAL_C MRgbCopy* GetCopy(TAny* mem, TDisplayMode aMode) +static MRgbCopy* GetCopy(TAny* mem, TDisplayMode aMode) { if(aMode == EColor256 || aMode == EGray256) { -- 2.11.4.GIT