From f3c4ef29b2b53f8d20bde26e733cd6e2cd2c5dc1 Mon Sep 17 00:00:00 2001 From: Bartosz Taudul Date: Thu, 2 Oct 2008 23:44:04 +0200 Subject: [PATCH] Drop yet anoter symbian crap. Don't use NONSHARABLE_CLASS. --- src/audio/symbian/SDL_epocaudio.cpp | 4 ++-- src/audio/symbian/streamplayer.h | 2 +- src/main/symbian/SDL_main.cpp | 6 +++--- src/main/symbian/sdlexe.cpp | 12 ++++++------ src/video/symbian/SDL_epocvideo.h | 4 ++-- src/video/symbian/dsa.cpp | 12 ++++++------ symbian/include/internal/dsa.h | 2 +- symbian/include/internal/epoc_sdl.h | 6 +++--- symbian/include/internal/sdlmain.h | 4 ++-- symbian/include/internal/sdls60api.h | 4 ++-- symbian/include/sdlepocapi.h | 4 ++-- 11 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/audio/symbian/SDL_epocaudio.cpp b/src/audio/symbian/SDL_epocaudio.cpp index 4f9d207..d4669ed 100644 --- a/src/audio/symbian/SDL_epocaudio.cpp +++ b/src/audio/symbian/SDL_epocaudio.cpp @@ -64,7 +64,7 @@ static void Audio_DeleteDevice(SDL_AudioDevice *device); const int KAudioBuffers = 2; -NONSHARABLE_CLASS(CSimpleWait) : public CTimer +class CSimpleWait : public CTimer { public: void Wait(TTimeIntervalMicroSeconds32 aWait); @@ -99,7 +99,7 @@ void CSimpleWait::RunL() CActiveScheduler::Stop(); } -NONSHARABLE_CLASS(CEpocAudio) : public CBase, public MStreamObs, public MStreamProvider +class CEpocAudio : public CBase, public MStreamObs, public MStreamProvider { public: static void* NewL(int BufferSize, int aFill); diff --git a/src/audio/symbian/streamplayer.h b/src/audio/symbian/streamplayer.h index 6fc5fef..c7f19e3 100644 --- a/src/audio/symbian/streamplayer.h +++ b/src/audio/symbian/streamplayer.h @@ -24,7 +24,7 @@ class MStreamProvider virtual TPtrC8 Data() = 0; }; -NONSHARABLE_CLASS(CStreamPlayer) : public CBase, public MMdaAudioOutputStreamCallback +class CStreamPlayer : public CBase, public MMdaAudioOutputStreamCallback { public: CStreamPlayer(MStreamProvider& aProvider, MStreamObs& aObs); diff --git a/src/main/symbian/SDL_main.cpp b/src/main/symbian/SDL_main.cpp index 0208824..603a29c 100644 --- a/src/main/symbian/SDL_main.cpp +++ b/src/main/symbian/SDL_main.cpp @@ -27,7 +27,7 @@ class CEikonEnv; class CSdlAppServ; class CEventQueue; -NONSHARABLE_CLASS(EpocSdlEnvData) +class EpocSdlEnvData { public: void Free(); @@ -51,7 +51,7 @@ NONSHARABLE_CLASS(EpocSdlEnvData) EpocSdlEnvData* gEpocEnv; -NONSHARABLE_CLASS(EnvUtils) +class EnvUtils { public: static inline TBool IsOwnThreaded(); @@ -176,7 +176,7 @@ const void* TMainFunc::operator[](int aIndex) const } -NONSHARABLE_CLASS(CSdlAppServ) : public CActive +class CSdlAppServ : public CActive { public: enum diff --git a/src/main/symbian/sdlexe.cpp b/src/main/symbian/sdlexe.cpp index 3a20636..3b1aabc 100644 --- a/src/main/symbian/sdlexe.cpp +++ b/src/main/symbian/sdlexe.cpp @@ -63,7 +63,7 @@ LOCAL_C void MakeCCmdLineL(const TDesC8& aParam, CDesC8Array& aArray) } } -NONSHARABLE_CLASS(TSdlClass) +class TSdlClass { public: TSdlClass(); @@ -126,7 +126,7 @@ TSdlClass gSDLClass; //////////////////////////////////////////////////////////////// -NONSHARABLE_CLASS(CSDLApplication) : public CAknApplication +class CSDLApplication : public CAknApplication { public: CSDLApplication(); @@ -140,7 +140,7 @@ NONSHARABLE_CLASS(CSDLApplication) : public CAknApplication TUid iUid; }; -NONSHARABLE_CLASS(CSDLDocument) : public CEikDocument +class CSDLDocument : public CEikDocument { public: CSDLDocument(CEikApplication& aApp); @@ -151,7 +151,7 @@ NONSHARABLE_CLASS(CSDLDocument) : public CEikDocument //////////////////////////////////////////////////////////////////// -NONSHARABLE_CLASS(CExitWait) : public CActive +class CExitWait : public CActive { public: CExitWait(CAknAppUi& aWait); @@ -167,7 +167,7 @@ NONSHARABLE_CLASS(CExitWait) : public CActive //////////////////////////////////////////////////////////////////////// -NONSHARABLE_CLASS(CSDLWin) : public CCoeControl +class CSDLWin : public CCoeControl { public: CSDLWin() : m_draw(false) {} @@ -183,7 +183,7 @@ NONSHARABLE_CLASS(CSDLWin) : public CCoeControl //////////////////////////////////////////////////////////////////////////// -NONSHARABLE_CLASS(CSDLAppUi) : public CAknAppUi +class CSDLAppUi : public CAknAppUi { public: ~CSDLAppUi(); diff --git a/src/video/symbian/SDL_epocvideo.h b/src/video/symbian/SDL_epocvideo.h index de5c325..b366965 100644 --- a/src/video/symbian/SDL_epocvideo.h +++ b/src/video/symbian/SDL_epocvideo.h @@ -54,6 +54,6 @@ struct SDL_PrivateGLData EGLSurface iContext; EGLSurface iSurface; RLibrary iLibrary; -}; +}; -#endif +#endif diff --git a/src/video/symbian/dsa.cpp b/src/video/symbian/dsa.cpp index cefeb4b..bb0a2a7 100644 --- a/src/video/symbian/dsa.cpp +++ b/src/video/symbian/dsa.cpp @@ -9,7 +9,7 @@ LOCAL_C int BytesPerPixel(TDisplayMode aMode) } template -NONSHARABLE_CLASS(CBitmapSurface) : public T +class CBitmapSurface : public T { public: CBitmapSurface(RWsSession& aSession); @@ -82,7 +82,7 @@ void CBitmapSurface::CreateSurfaceL(const TSize& aSize) ////////////////////////////////////////////////////////////////////// -NONSHARABLE_CLASS(CDsaGles) : public CDsa +class CDsaGles : public CDsa { public: CDsaGles(RWsSession& aSession) : CDsa(aSession) {} @@ -96,7 +96,7 @@ NONSHARABLE_CLASS(CDsaGles) : public CDsa ////////////////////////////////////////////////////////////////////// -NONSHARABLE_CLASS(CDsaBase) : public CDsa, public MDirectScreenAccess +class CDsaBase : public CDsa, public MDirectScreenAccess { protected: CDsaBase(RWsSession& aSession) : CDsa(aSession) { m_updateWholeScreen = false; } @@ -188,7 +188,7 @@ void CDsaBase::Stop() /////////////////////////////////////////////////////////////////////// -NONSHARABLE_CLASS(TDsa) +class TDsa { public: inline TDsa(const CDsa& aDsa) : iDsa(aDsa) {} @@ -480,7 +480,7 @@ void CDsa::CopyMem(const CDsa& /*aDsa*/, TUint32* aTarget, const TUint8* aSource Mem::Copy(aTarget, src, aBytes << 2); } -NONSHARABLE_CLASS(MRgbCopy) +class MRgbCopy { public: virtual void Copy(TUint32* aTarget, const TUint8* aSource, int aBytes, TBool aReversed) = 0; @@ -488,7 +488,7 @@ NONSHARABLE_CLASS(MRgbCopy) }; template -NONSHARABLE_CLASS(TRgbCopy) : public MRgbCopy +class TRgbCopy : public MRgbCopy { public: TRgbCopy(TDisplayMode aMode); diff --git a/symbian/include/internal/dsa.h b/symbian/include/internal/dsa.h index 6e473a8..d256c74 100644 --- a/symbian/include/internal/dsa.h +++ b/symbian/include/internal/dsa.h @@ -10,7 +10,7 @@ class CDsa; typedef void (*TCopyFunction)(const CDsa& aDsa, TUint32* aTarget, const TUint8* aSource, TInt aBytes, TInt aLineLen); -NONSHARABLE_CLASS(CDsa) : public CBase +class CDsa : public CBase { public: enum diff --git a/symbian/include/internal/epoc_sdl.h b/symbian/include/internal/epoc_sdl.h index 6539a44..7222f91 100644 --- a/symbian/include/internal/epoc_sdl.h +++ b/symbian/include/internal/epoc_sdl.h @@ -13,7 +13,7 @@ TInt Panic(TInt aErr, TInt aLine); -NONSHARABLE_CLASS(MEventQueue) +class MEventQueue { public: virtual TInt Append(const TWsEvent& aEvent) = 0; @@ -27,7 +27,7 @@ NONSHARABLE_CLASS(MEventQueue) typedef void (*TSdlCleanupOperation) (TAny* aThis); -NONSHARABLE_CLASS(TSdlCleanupItem) +class TSdlCleanupItem { public: TSdlCleanupItem(TSdlCleanupOperation aOperation, TAny* aItem); @@ -36,7 +36,7 @@ NONSHARABLE_CLASS(TSdlCleanupItem) TThreadId iThread; }; -NONSHARABLE_CLASS(EpocSdlEnv) +class EpocSdlEnv { public: enum {ELastService=100}; diff --git a/symbian/include/internal/sdlmain.h b/symbian/include/internal/sdlmain.h index 73f8e42..c27906e 100644 --- a/symbian/include/internal/sdlmain.h +++ b/symbian/include/internal/sdlmain.h @@ -5,14 +5,14 @@ class CApaApplication; #include -NONSHARABLE_CLASS(MSDLMainObs) +class MSDLMainObs { public: enum TSDLMainObsEvent {EError, ESDLCreated}; virtual TInt SDLMainEvent(TInt aEvent, TInt aParam, CSDL* aSdl) = 0; }; -NONSHARABLE_CLASS(SDLEnv) +class SDLEnv { public: enum TSdlEnvFlags diff --git a/symbian/include/internal/sdls60api.h b/symbian/include/internal/sdls60api.h index d312367..27edbb4 100644 --- a/symbian/include/internal/sdls60api.h +++ b/symbian/include/internal/sdls60api.h @@ -30,7 +30,7 @@ extern "C" } //internal stuff -NONSHARABLE_CLASS(TMainFunc) +class TMainFunc { public: IMPORT_C TMainFunc(); @@ -46,7 +46,7 @@ NONSHARABLE_CLASS(TMainFunc) void* iMainFunc[6]; }; -NONSHARABLE_CLASS(MSDLObserver) +class SDLObserver { public: enum //these events indicates the state changes in SDL diff --git a/symbian/include/sdlepocapi.h b/symbian/include/sdlepocapi.h index d52b97c..3de67bc 100644 --- a/symbian/include/sdlepocapi.h +++ b/symbian/include/sdlepocapi.h @@ -31,7 +31,7 @@ extern "C" } //internal stuff -NONSHARABLE_CLASS(TMainFunc) +class TMainFunc { public: IMPORT_C TMainFunc(); @@ -47,7 +47,7 @@ NONSHARABLE_CLASS(TMainFunc) void* iMainFunc[6]; }; -NONSHARABLE_CLASS(MSDLObserver) +class MSDLObserver { public: enum //these events indicates the state changes in SDL -- 2.11.4.GIT