Make Qt exception safer.

Squashed commit of the branch haralds-haralds-qt-s60-topics/topic/exceptions,
which also contains the full history.

Rev-By: Harald Fernengel
Rev-By: Ralf Engels

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 47312af..50f7572 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>
@@ -123,7 +124,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);
@@ -162,7 +165,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"