diff -r 1eef62f5c541 -r 2a5d4ab426d3 phonesettings/cpphonesettingsplugins/cptelephonyutils/src/cpplugincommon.cpp --- a/phonesettings/cpphonesettingsplugins/cptelephonyutils/src/cpplugincommon.cpp Mon Aug 23 15:42:12 2010 +0300 +++ b/phonesettings/cpphonesettingsplugins/cptelephonyutils/src/cpplugincommon.cpp Fri Sep 03 13:33:36 2010 +0300 @@ -59,82 +59,6 @@ return XQSysInfo::isSupported(KFeatureIdCsVideoTelephony); } -/*! - Tools::errorCodeTextMapping. - */ -bool Tools::errorCodeTextMapping(const int errorcode, QString &errorText) -{ - DPRINT; - errorText.clear(); - bool errorTextFound(true); - - switch(errorcode){ - case KErrGsmSSSubscriptionViolation: - errorText = hbTrId("txt_phone_info_barring_operation_not_successful"); - break; - case KErrGsmSSUnknownSubscriber: - case KErrGsmSSAbsentSubscriber: - case KErrGsmSSIllegalOperation: - case KErrGsmSSIllegalSubscriber: - case KErrGsmSSIllegalEquipment: - case KErrGsmSSCallBarred: - case KErrGsmSSDataMissing: - errorText = hbTrId("txt_phone_info_not_allowed"); - break; - case KErrGsmSSIncompatibility: - errorText = hbTrId("txt_phone_info_conflict_error"); - break; - case KErrGsmSSSystemFailure: - errorText = hbTrId("txt_phone_info_result_unknown"); - break; - case KErrGsmSSUnexpectedDataValue: - case KErrGsmSSResourcesUnavailable: - errorText = hbTrId("txt_phone_info_request_rejected"); - break; - case KErrGsmSSNegativePasswordCheck: - case KErrGsmSSPasswordRegistrationFailure: - errorText = hbTrId("Password error"); - break; - case KErrGsmSSPasswordAttemptsViolation: - errorText = hbTrId("txt_phone_info_barring_password_blocked"); - break; - case KErrGsmSMSNoNetworkService: - case KErrGsmNoService: - errorText = hbTrId("No network coverage"); - break; - case KErrSsActivationDataLost: - errorText = hbTrId("Check network services"); - break; - case KErrGsmOfflineOpNotAllowed: - if(XQSysInfo::isSupported(KFeatureIdOfflineMode)){ - XQSettingsManager *xqsettingsManager = new XQSettingsManager(); - XQSettingsKey key(XQSettingsKey::TargetPublishAndSubscribe, - KPSUidBluetoothSapConnectionState.iUid, - KBTSapConnectionState); - QVariant startupValue = xqsettingsManager->readItemValue(key); - int value = startupValue.toInt(); - delete xqsettingsManager; - xqsettingsManager = NULL; - if (value == EBTSapConnected){ - errorText = hbTrId("Operation not possible in SIM access profile mode"); - } else { - errorText = hbTrId("Operation not possible in Off-line mode"); - } - } else { - errorText = hbTrId("txt_phone_info_request_not_completed"); - } - break; - case KErrGsmSSUnknownAlphabet: - errorText = hbTrId("txt_phone_info_invalid_phone_number"); - break; - default: - errorText = hbTrId("txt_phone_info_request_not_completed"); - break; - } - - return errorTextFound; -} - CpSettingsWrapper::CpSettingsWrapper(QObject *parent): QObject(parent), m_settings(NULL),