diff -r 2a272ef608c4 -r 3507212d340e messagingapp/msgui/appengine/src/conversationsengine.cpp --- a/messagingapp/msgui/appengine/src/conversationsengine.cpp Tue Aug 03 21:34:40 2010 +0530 +++ b/messagingapp/msgui/appengine/src/conversationsengine.cpp Fri Aug 06 23:19:50 2010 +0530 @@ -47,13 +47,13 @@ ConversationsEngine::ConversationsEngine(QObject* parent): QObject(parent), mDraftsModel(NULL) { - QT_TRAP_THROWING(mConversationMsgStoreHandler = new ConversationMsgStoreHandler); + mConversationMsgStoreHandler = q_check_ptr(new ConversationMsgStoreHandler); mConversationsSummaryModel = new ConversationsSummaryModel(this); mConversationsModel = new ConversationsModel(mConversationMsgStoreHandler, this); - QT_TRAP_THROWING( d_ptr = new ConversationsEnginePrivate(mConversationMsgStoreHandler, + d_ptr = q_check_ptr( new ConversationsEnginePrivate(mConversationMsgStoreHandler, mConversationsSummaryModel, mConversationsModel));