summaryrefslogtreecommitdiffstats
path: root/src/s60main
diff options
context:
space:
mode:
authorMarkku Luukkainen <markku.luukkainen@digia.com>2009-06-10 11:58:49 (GMT)
committerMarkku Luukkainen <markku.luukkainen@digia.com>2009-06-10 11:58:49 (GMT)
commit1be834f942b9658733d0f69a8d10a35d3c4988cb (patch)
tree7873983d75ffc181afb192b3a0f77f921069b6ff /src/s60main
parentc7ddb3e5801118fb23a42272c16c660ba3bdb570 (diff)
parent7604f8087f88171ef933d8ae08f501467e647338 (diff)
downloadQt-1be834f942b9658733d0f69a8d10a35d3c4988cb.zip
Qt-1be834f942b9658733d0f69a8d10a35d3c4988cb.tar.gz
Qt-1be834f942b9658733d0f69a8d10a35d3c4988cb.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'src/s60main')
-rw-r--r--src/s60main/qts60main.cpp1
-rw-r--r--src/s60main/qts60main_mcrt0.cpp10
-rw-r--r--src/s60main/qts60mainapplication.cpp1
-rw-r--r--src/s60main/qts60mainappui.cpp8
-rw-r--r--src/s60main/qts60maindocument.cpp1
5 files changed, 18 insertions, 3 deletions
diff --git a/src/s60main/qts60main.cpp b/src/s60main/qts60main.cpp
index 965c02b..d7daf4a 100644
--- a/src/s60main/qts60main.cpp
+++ b/src/s60main/qts60main.cpp
@@ -40,6 +40,7 @@
****************************************************************************/
// INCLUDE FILES
+#include <exception>
#include <eikstart.h>
#include "qts60mainapplication.h"
diff --git a/src/s60main/qts60main_mcrt0.cpp b/src/s60main/qts60main_mcrt0.cpp
index b7bf1a3..49a47bd 100644
--- a/src/s60main/qts60main_mcrt0.cpp
+++ b/src/s60main/qts60main_mcrt0.cpp
@@ -79,7 +79,15 @@ GLDEF_C TInt QtMainWrapper()
CleanupArrayDelete<char*>::PushL(argv);
CleanupArrayDelete<char*>::PushL(envp);
//Call user(application)'s main
- int ret = CALLMAIN(argc,argv,envp);
+ int ret = 0;
+ try
+ {
+ ret = CALLMAIN(argc, argv, envp);
+ }
+ catch (...)
+ {
+ User::Leave(KErrGeneral);
+ }
CleanupStack::PopAndDestroy(2,argv);
return ret;
}
diff --git a/src/s60main/qts60mainapplication.cpp b/src/s60main/qts60mainapplication.cpp
index 680243f..2fada3d 100644
--- a/src/s60main/qts60mainapplication.cpp
+++ b/src/s60main/qts60mainapplication.cpp
@@ -40,6 +40,7 @@
****************************************************************************/
// INCLUDE FILES
+#include <exception>
#include "qts60maindocument.h"
#include "qts60mainapplication.h"
#include <bautils.h>
diff --git a/src/s60main/qts60mainappui.cpp b/src/s60main/qts60mainappui.cpp
index 7d38f33..1ac4f5a 100644
--- a/src/s60main/qts60mainappui.cpp
+++ b/src/s60main/qts60mainappui.cpp
@@ -40,6 +40,7 @@
****************************************************************************/
// INCLUDE FILES
+#include <exception>
#include <avkon.hrh>
#include <eikmenub.h>
#include <eikmenup.h>
@@ -126,7 +127,9 @@ void CQtS60MainAppUi::HandleWsEventL(const TWsEvent& aEvent, CCoeControl *contro
{
int result = 0;
if (qApp)
- result = qApp->s60ProcessEvent(const_cast<TWsEvent*>(&aEvent));
+ QT_TRANSLATE_EXCEPTION_TO_SYMBIAN_LEAVE(
+ result = qApp->s60ProcessEvent(const_cast<TWsEvent*>(&aEvent))
+ );
if (result <= 0)
CAknAppUi::HandleWsEventL(aEvent, control);
@@ -165,7 +168,8 @@ TInt CQtS60MainAppUi::OpenCMainStaticCallBack( TAny* aObject )
//
void CQtS60MainAppUi::OpenCMainCallBack()
{
- TInt ret = QtMainWrapper();
+ TInt ret;
+ TRAPD(err, ret = QtMainWrapper());
Exit();
}
diff --git a/src/s60main/qts60maindocument.cpp b/src/s60main/qts60maindocument.cpp
index b4a2e66..eb7ea42 100644
--- a/src/s60main/qts60maindocument.cpp
+++ b/src/s60main/qts60maindocument.cpp
@@ -40,6 +40,7 @@
****************************************************************************/
// INCLUDE FILES
+#include <exception>
#include "qts60mainappui.h"
#include "qts60maindocument.h"