diff -r 10eaf342f539 -r 00c7ae862740 emailuis/nmailui/src/main.cpp --- a/emailuis/nmailui/src/main.cpp Tue Jun 29 17:12:28 2010 +0300 +++ b/emailuis/nmailui/src/main.cpp Fri Jul 02 15:55:16 2010 +0300 @@ -1,35 +1,31 @@ /* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* -*/ - + * Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies). + * All rights reserved. + * This component and the accompanying materials are made available + * under the terms of "Eclipse Public License v1.0" + * which accompanies this distribution, and is available + * at the URL "http://www.eclipse.org/legal/epl-v10.html". + * + * Initial Contributors: + * Nokia Corporation - initial contribution. + * + * Contributors: + * + * Description: + * + */ #include "nmuiheaders.h" -//parameter values const QString NmActivityName("EmailInboxView"); /*! - int main -*/ + The main function. + */ int main(int argc, char *argv[]) { - NM_FUNCTION; + HbApplication app(argc,argv,Hb::NoSplash); - HbApplication app(argc, argv); - // Load the translation file. QTranslator translator; QString lang = QLocale::system().name(); @@ -37,24 +33,21 @@ QString path = "Z:/resource/qt/translations/"; translator.load(appName + lang, path); app.installTranslator(&translator); - + app.setApplicationName(hbTrId("txt_mail_title_mail")); - + NmApplication *nmApplication = NULL; - quint32 accountId = 0; - if (app.activateReason() == Hb::ActivationReasonActivity && app.activateId() == NmActivityName) - { + if (app.activateReason() == Hb::ActivationReasonActivity && + app.activateId() == NmActivityName) { QVariant data = app.activateParams().take("accountId"); QString accountIdString = data.toString(); accountId = accountIdString.toULongLong(); nmApplication = new NmApplication(&app,accountId); - } - else - { + } else { nmApplication = new NmApplication(&app); - } - + } + int ret = app.exec(); delete nmApplication; return ret;