diff -r 5d007b20cfd0 -r cd2778e5acfe qtmobileextensions/src/sysinfo/cdeviceinfo.cpp
--- a/qtmobileextensions/src/sysinfo/cdeviceinfo.cpp	Tue Aug 31 16:02:37 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,147 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as published by
-* the Free Software Foundation, version 2.1 of the License.
-* 
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public License
-* along with this program.  If not, 
-* see "http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html/".
-*
-* Description:
-*
-*/
-
-#include "cdeviceinfo.h"
-
-#include <etel3rdparty.h>
- 
-CDeviceInfo* CDeviceInfo::NewL()
-    {
-    CDeviceInfo* self = NewLC();
-    CleanupStack::Pop( self );
-    return self;
-    }
-    
-CDeviceInfo* CDeviceInfo::NewLC()
-    {
-    CDeviceInfo* self = new ( ELeave ) CDeviceInfo();
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    return self;
-    }
-
-void CDeviceInfo::ConstructL()
-    {   
-    CActiveScheduler::Add( this );
-    iTelephony = CTelephony::NewL();  
-    iWait = new ( ELeave ) CActiveSchedulerWait();
-    }
-    
-CDeviceInfo::CDeviceInfo()
-:CActive( EPriorityNormal ), iBatteryInfoV1Pkg( iBatteryInfoV1 ),
-        iPhoneIdV1Pkg( iPhoneIdV1 ),
-        iSignalStrengthV1Pckg( iSignalStrengthV1 ),
-        iSubscriberIdV1Pckg( iSubscriberIdV1 )
-    {
-    }
- 
-CDeviceInfo::~CDeviceInfo()
-    {
-    Cancel();
-    delete iTelephony;  
-    }
-
-TBuf<CTelephony::KPhoneSerialNumberSize> CDeviceInfo::imei()
-    {
-    Cancel();
-    iTelephony->GetPhoneId( iStatus, iPhoneIdV1Pkg );
-    SetActive();
-    
-    if ( !iWait->IsStarted() ) 
-        {
-        iWait->Start();
-        }
-    return iPhoneIdV1.iSerialNumber;
-    }
-
-TBuf<CTelephony::KPhoneModelIdSize> CDeviceInfo::model()
-    {
-    Cancel();
-    iTelephony->GetPhoneId( iStatus, iPhoneIdV1Pkg );
-    SetActive();
-    
-    if ( !iWait->IsStarted() ) 
-        {
-        iWait->Start();
-        }
-    return iPhoneIdV1.iModel;
-    }
-
-TBuf<CTelephony::KPhoneManufacturerIdSize> CDeviceInfo::manufacturer()
-    {
-    Cancel();
-    iTelephony->GetPhoneId( iStatus, iPhoneIdV1Pkg );
-    SetActive();
-    
-    if ( !iWait->IsStarted() ) 
-        {
-        iWait->Start();
-        }
-    return iPhoneIdV1.iManufacturer;
-    }
-
-TBuf<CTelephony::KIMSISize> CDeviceInfo::imsi()
-    {
-    Cancel();
-    iTelephony->GetSubscriberId( iStatus,iSubscriberIdV1Pckg );
-    SetActive();
-    
-    if (!iWait->IsStarted()) 
-        {
-        iWait->Start();
-        }
-    return iSubscriberIdV1.iSubscriberId;
-    }
-
-TUint CDeviceInfo::batteryLevel()
-    {
-    Cancel();
-    iTelephony->GetBatteryInfo( iStatus,iBatteryInfoV1Pkg );
-    SetActive();
-    
-    if ( !iWait->IsStarted() ) 
-        {
-        iWait->Start();
-        }
-    return iBatteryInfoV1.iChargeLevel;
-    }
-
-TInt32 CDeviceInfo::signalStrength()
-    {
-    Cancel();
-    iTelephony->GetSignalStrength( iStatus, iSignalStrengthV1Pckg );
-    SetActive();
-    if ( !iWait->IsStarted() )
-        {
-        iWait->Start();
-        }
-    return iSignalStrengthV1.iSignalStrength;
-    }
- 
-void CDeviceInfo::DoCancel()
-    {
-    iTelephony->CancelAsync( CTelephony::EGetPhoneIdCancel );
-    }
- 
-void CDeviceInfo::RunL()
-    {
-    iWait->AsyncStop();
-    }