diff -r 11b6825f0862 -r 3a6b55c6390c radiohswidget/src/radiohswidgetprofilereader.cpp --- a/radiohswidget/src/radiohswidgetprofilereader.cpp Tue Jul 06 14:16:27 2010 +0300 +++ b/radiohswidget/src/radiohswidgetprofilereader.cpp Wed Aug 18 09:49:03 2010 +0300 @@ -17,9 +17,6 @@ // System includes #include -// TODO: Profile information should be accessed from QtMobility when it is -// ready. -#include #include "xqsettingsmanager.h" #include "xqsettingskey.h" #include "xqpublishandsubscribeutils.h" @@ -28,13 +25,12 @@ #include "radiohswidgetprofilereader.h" #include "radiohswidget.h" #include "radioservicedef.h" +#include "radio_global.h" #include "radiologger.h" // Constants /** Constant for radio running undefined status. */ const int RADIO_RUNNING_STATUS_UNDEFINED(-1); -/** Constant for Off-line profile. */ -const int OFFLINE_PROFILE(5); /*! \class RadioHsWidgetProfileReader @@ -92,19 +88,21 @@ } /*! - Reads the current profile of the device and \returns \c true if the - current profile is offline, \c false otherwise. + Checks if device is in offline mode and \returns \c true if it is + and \c false if not. */ -bool RadioHsWidgetProfileReader::isCurrentProfileOffline() +bool RadioHsWidgetProfileReader::isInOfflineMode() { LOG_METHOD_RET("%d"); - XQSettingsKey profileKey(XQSettingsKey::TargetCentralRepository, - KCRUidProfileEngine.iUid, KProEngActiveProfile); + XQSettingsKey connectionKey( XQSettingsKey::TargetCentralRepository, + CENREP_CORE_APPLICATION_UIS, ID_NETWORK_CONNECTION_ALLOWED ); + // Read current value. - QVariant profile(mSettingsManager->readItemValue(profileKey)); - if (profile.canConvert(QVariant::Int) && profile.toInt() == OFFLINE_PROFILE) { + const QVariant connectionAllowed = mSettingsManager->readItemValue( connectionKey ); + if ( connectionAllowed.canConvert( QVariant::Int ) && connectionAllowed.toInt() == NetworkNotAllowed ) { return true; } + return false; }