diff -r 7d48bed6ce0c -r 987c9837762f cellular/psuinotes/src/psuiutils.cpp
--- a/cellular/psuinotes/src/psuiutils.cpp	Tue Aug 31 15:45:17 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,153 +0,0 @@
-/*
- * 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:
- *
- */
-
-#include <xqsysinfo.h>
-#include <xqsettingsmanager.h>
-#include <xqsettingskey.h>
-#include <BTSapDomainPSKeys.h>
-#include <settingsinternalcrkeys.h>
-#include <CoreApplicationUIsSDKCRKeys.h>
-#include <NumberGroupingCRKeys.h>
-
-#include <etelmm.h>
-#include <exterror.h>               
-#include <gsmerror.h>
-
-#include <hbglobal.h>
-#include "psuiutils.h"
-#include "psuilogging.h"
-
-/*!
-  PsUiTools::errorCodeTextMapping.
- */
-bool PsUiUtils::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;
-}
-
-PsUiSettingsWrapper::PsUiSettingsWrapper(QObject *parent): 
-    QObject(parent)
-{
-    m_Settings = new XQSettingsManager();
-}
-
-PsUiSettingsWrapper::~PsUiSettingsWrapper()
-{
-    delete m_Settings;
-}
-
-bool PsUiSettingsWrapper::isFeatureCallWaitingDistiquishNotProvisionedEnabled()
-{
-    bool enabled = readCenrepValue(KCRUidPhoneSettings.iUid, KPSetCallWaiting).toBool();
-    DPRINT << "enabled: " << enabled;
-    return enabled;
-}
-
-bool PsUiSettingsWrapper::isPhoneOffline() const
-{
-    bool offLinesupport(false);
-    if (XQSysInfo::isSupported(KFeatureIdOfflineMode)) {
-        offLinesupport = !readCenrepValue(
-                KCRUidCoreApplicationUIs.iUid, 
-                KCoreAppUIsNetworkConnectionAllowed).toBool();
-    }
-    return offLinesupport;
-}
-
-QVariant PsUiSettingsWrapper::readCenrepValue(
-    const long int uid, const unsigned long int key) const
-{
-    XQSettingsKey settingsKey(XQSettingsKey::TargetCentralRepository, uid, key);
-    QVariant ret = m_Settings->readItemValue(settingsKey);
-    DPRINT << "ret: " << ret;
-    return ret;
-}
-
-bool PsUiSettingsWrapper::numberGroupingSupported() const
- {
-     return readCenrepValue(KCRUidNumberGrouping.iUid, KNumberGrouping).toBool();
- }
-