Squashed commit of the topic/exceptions branch.

Contains some smaller fixes and renaming of macros. Looks big,
but isn't scary at all ;)

1 files changed, 1 insertions, 8 deletions

diff --git a/src/s60main/qts60main_mcrt0.cpp b/src/s60main/qts60main_mcrt0.cpp
index 49a47bdb8a..8631989ba8 100644
--- a/src/s60main/qts60main_mcrt0.cpp
+++ b/src/s60main/qts60main_mcrt0.cpp
@@ -80,14 +80,7 @@ GLDEF_C TInt QtMainWrapper()
     CleanupArrayDelete<char*>::PushL(envp);
     //Call user(application)'s main
 	int ret = 0;
-	try
-		{
-		ret = CALLMAIN(argc, argv, envp);
-    	}
-    catch (...)
-    	{
-    	User::Leave(KErrGeneral);
-    	}
+    QT_TRYCATCH_LEAVING( ret = CALLMAIN(argc, argv, envp); );
     CleanupStack::PopAndDestroy(2,argv);
     return ret;
 }