From 207d9b606acf20130a31a5ee88c01505ee959277 Mon Sep 17 00:00:00 2001
From: Bartosz Taudul <wolf.pld@gmail.com>
Date: Fri, 3 Oct 2008 01:52:03 +0200
Subject: [PATCH] Remove "new (ELeave)".

Remove idiotic symbianish placement new.
---
 src/audio/symbian/SDL_epocaudio.cpp | 8 ++++----
 src/main/symbian/SDL_main.cpp       | 8 ++++----
 src/main/symbian/sdlexe.cpp         | 8 ++++----
 src/video/symbian/dsa.cpp           | 6 +++---
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/audio/symbian/SDL_epocaudio.cpp b/src/audio/symbian/SDL_epocaudio.cpp
index d4669ed..a5e3e12 100644
--- a/src/audio/symbian/SDL_epocaudio.cpp
+++ b/src/audio/symbian/SDL_epocaudio.cpp
@@ -76,7 +76,7 @@ class CSimpleWait : public CTimer
 
 CSimpleWait* CSimpleWait::NewL()
 {
-	CSimpleWait* wait = new (ELeave) CSimpleWait();
+	CSimpleWait* wait = new CSimpleWait();
 	CleanupStack::PushL(wait);
 	wait->ConstructL();
 	CleanupStack::Pop();
@@ -165,7 +165,7 @@ CEpocAudio::CEpocAudio(int aBufferSize)
 
 void* CEpocAudio::NewL(int aBufferSize, int aFill)
 {
-	CEpocAudio* eAudioLib = new (ELeave) CEpocAudio(aBufferSize);
+	CEpocAudio* eAudioLib = new CEpocAudio(aBufferSize);
 	CleanupStack::PushL(eAudioLib);
 	eAudioLib->ConstructL(aFill);
 	CleanupStack::Pop();
@@ -199,14 +199,14 @@ TBool CEpocAudio::SetPause(TBool aPause)
 void CEpocAudio::ThreadInitL(TAny* aDevice)
 {
 	iTid = RThread().Id(); 
-	CActiveScheduler* as =  new (ELeave) CActiveScheduler();
+	CActiveScheduler* as =  new CActiveScheduler();
 	CActiveScheduler::Install(as);
 
 	EpocSdlEnv::AppendCleanupItem(TSdlCleanupItem((TSdlCleanupOperation)EPOC_CloseAudio, aDevice));
 
 	iWait = CSimpleWait::NewL();
 
-	iPlayer = new (ELeave) CStreamPlayer(*this, *this);
+	iPlayer = new CStreamPlayer(*this, *this);
 	iPlayer->ConstructL();	
 	iPlayer->OpenStream(iRate, iChannels, iType);
 }
diff --git a/src/main/symbian/SDL_main.cpp b/src/main/symbian/SDL_main.cpp
index c49a17d..3138b16 100644
--- a/src/main/symbian/SDL_main.cpp
+++ b/src/main/symbian/SDL_main.cpp
@@ -577,7 +577,7 @@ _LIT(KSDLMain, "SDLMain");
 
 static int MainL()
 {
-	gEpocEnv->iCleanupItems = new (ELeave) CArrayFixFlat<TSdlCleanupItem>(8);
+	gEpocEnv->iCleanupItems = new CArrayFixFlat<TSdlCleanupItem>(8);
 
 	char** envp=0;
 	/* !! process exits here if there is "exit()" in main! */
@@ -671,10 +671,10 @@ CSDL* CSDL::NewL(int aFlags)
 	Mem::FillZ(gEpocEnv, sizeof(EpocSdlEnvData));
 
 	gEpocEnv->iEpocEnvFlags = aFlags;
-	gEpocEnv->iEventQueue = new (ELeave) CEventQueue();
-	gEpocEnv->iAppSrv = new (ELeave) CSdlAppServ();
+	gEpocEnv->iEventQueue = new CEventQueue();
+	gEpocEnv->iAppSrv = new CSdlAppServ();
 
-	CSDL* sdl = new (ELeave) CSDL();
+	CSDL* sdl = new CSDL();
 
 	gEpocEnv->iSdl = sdl;
 
diff --git a/src/main/symbian/sdlexe.cpp b/src/main/symbian/sdlexe.cpp
index 6adafec..0bc6953 100644
--- a/src/main/symbian/sdlexe.cpp
+++ b/src/main/symbian/sdlexe.cpp
@@ -215,7 +215,7 @@ class CSDLDocument : public CEikDocument
 		CSDLDocument(CEikApplication& aApp) : CEikDocument(aApp) {}
 
 	private:
-		CEikAppUi* CreateAppUiL() { return new (ELeave) CSDLAppUi; }
+		CEikAppUi* CreateAppUiL() { return new CSDLAppUi; }
 };
 
 ////////////////////////////////////////////////////////////////////////////
@@ -226,7 +226,7 @@ class CSDLApplication : public CAknApplication
 		CSDLApplication();
 
 	private:
-		CApaDocument* CreateDocumentL()	{ return new (ELeave) CSDLDocument(*this); }
+		CApaDocument* CreateDocumentL()	{ return new CSDLDocument(*this); }
 		TUid AppDllUid() const		{ return iUid; }
 
 		TUid iUid;
@@ -328,7 +328,7 @@ TBool CSDLAppUi::StartL(TAny* aThis)
 TBool CSDLAppUi::ProcessCommandParametersL(CApaCommandLine &aCommandLine)
 {
 	const TPtrC8 cmdLine = aCommandLine.TailEnd();
-	iParams = new (ELeave) CDesC8ArrayFlat(8);
+	iParams = new CDesC8ArrayFlat(8);
 	MakeCCmdLineL(cmdLine, *iParams);
 	return EFalse;
 }
@@ -371,7 +371,7 @@ void CSDLAppUi::StartL()
 	}
 	iCoeEnv->DeleteResourceFile(iResOffset);
 
-	iWait = new (ELeave) CExitWait(*this);
+	iWait = new CExitWait(*this);
 	iSdl->CallMainL(gSDLClass.Main(), &iWait->iStatus, iParams, 0xA000);
 }
 
diff --git a/src/video/symbian/dsa.cpp b/src/video/symbian/dsa.cpp
index d05fb81..84719a6 100644
--- a/src/video/symbian/dsa.cpp
+++ b/src/video/symbian/dsa.cpp
@@ -76,7 +76,7 @@ template<class T>
 void CBitmapSurface<T>::CreateSurfaceL(const TSize& aSize)
 {
 	Free();
-	iBmp = new (ELeave) CFbsBitmap();
+	iBmp = new CFbsBitmap();
 	User::LeaveIfError(iBmp->Create(aSize, T::DisplayMode()));
 }
 
@@ -242,7 +242,7 @@ void ClipCopy(const TDsa& iDsa, TUint8* aTarget,
 
 CDsa* CDsa::CreateL(RWsSession& aSession)
 {
-	return new (ELeave) CBitmapSurface<CDsaBase>(aSession);
+	return new CBitmapSurface<CDsaBase>(aSession);
 }
 
 void CDsa::Free()
@@ -453,7 +453,7 @@ RWindow* CDsa::Window()
 
 CDsa* CDsa::CreateGlesDsaL()
 {
-	CDsa* dsa = new (ELeave) CDsaGles(Session());
+	CDsa* dsa = new CDsaGles(Session());
 	CWsScreenDevice* dummy = NULL;
 	dsa->ConstructL(*Window(), *dummy);
 	Free();
-- 
2.11.4.GIT