diff -r 5723da102db1 -r 38bbf2dcd608 qtinternetradio/ui/src/irapplication.cpp --- a/qtinternetradio/ui/src/irapplication.cpp Fri Sep 17 08:27:59 2010 +0300 +++ b/qtinternetradio/ui/src/irapplication.cpp Mon Oct 04 00:07:46 2010 +0300 @@ -690,40 +690,13 @@ return retVal; } -#ifdef TERMS_CONDITIONS_VIEW_ENABLED -void IRApplication::handleTermsConsAccepted() -{ - LOG_METHOD; - iSettings->reSetFlagTermsAndConditions(); - IRBaseView * termsConsView = iViewManager->getView(EIRView_TermsConsView); - iViewManager->removeView(termsConsView); - termsConsView->deleteLater(); - - iViewManager->activateView(iStartingViewId); - QEvent* initEvent = new QEvent(iInitEvent); - QCoreApplication::postEvent(this, initEvent, Qt::HighEventPriority); -} -#endif - void IRApplication::launchStartingView(TIRViewId aViewId) { LOG_METHOD; iStartingViewId = aViewId; -#ifdef TERMS_CONDITIONS_VIEW_ENABLED - bool isFirstTimeUsage = false; - iSettings->isFlagTermsAndConditions(isFirstTimeUsage); - - if(isFirstTimeUsage) - { - iViewManager->activateView(EIRView_TermsConsView); - } - else -#endif - { - iViewManager->activateView(iStartingViewId); - QEvent* initEvent = new QEvent(iInitEvent); - QCoreApplication::postEvent(this, initEvent, Qt::HighEventPriority); - } + iViewManager->activateView(iStartingViewId); + QEvent* initEvent = new QEvent(iInitEvent); + QCoreApplication::postEvent(this, initEvent, Qt::HighEventPriority); iAppFullyStarted = true; }