diff options
| author | Harald Fernengel <harald@trolltech.com> | 2009-08-03 13:12:46 (GMT) |
|---|---|---|
| committer | Harald Fernengel <harald@trolltech.com> | 2009-08-03 13:12:46 (GMT) |
| commit | 41a83e1ff19ad1396e6001e6b0ac003c701ba55a (patch) | |
| tree | 609e40eda10418bbf925002c36552074796b96b6 /src/s60main/qts60main_mcrt0.cpp | |
| parent | d1f3b9df2bc5c57d414da73a7d4f9ed7b25df3db (diff) | |
| download | Qt-41a83e1ff19ad1396e6001e6b0ac003c701ba55a.zip Qt-41a83e1ff19ad1396e6001e6b0ac003c701ba55a.tar.gz Qt-41a83e1ff19ad1396e6001e6b0ac003c701ba55a.tar.bz2 | |
Squashed commit of the topic/exceptions branch.
Contains some smaller fixes and renaming of macros. Looks big,
but isn't scary at all ;)
Diffstat (limited to 'src/s60main/qts60main_mcrt0.cpp')
| -rw-r--r-- | src/s60main/qts60main_mcrt0.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/s60main/qts60main_mcrt0.cpp b/src/s60main/qts60main_mcrt0.cpp index 49a47bd..8631989 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; } |