--- a/bluetoothengine/btnotif/btnotifsrv/src/btnotifutil.cpp Tue Aug 31 15:25:10 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
-/*
-* Copyright (c) 2010 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 "btnotifutil.h"
-#include <btservices/btdevrepository.h>
-#include <btmanclient.h>
-#include "bluetoothtrace.h"
-
-// ---------------------------------------------------------------------------
-// If aDevExt contains a valid friendly name, the friendly name will be displayed;
-// Otherwise, if the given name from the parameter of a notifier request is valid,
-// the given name will be displayed;
-// Otherwise, If aDevExt contains a valid device name, the name will be displayed;
-// Otherwise, the a name will be created by this function.
-// ---------------------------------------------------------------------------
-//
-void TBTNotifUtil::GetDeviceUiNameL( TDes& aNameBuf,
- const CBtDevExtension* aDevExt,
- const TDesC& aNameInParam,
- const TBTDevAddr& aAddr)
- {
- CBtDevExtension* tempDev( NULL );
- TPtrC namePtr;
- if ( aDevExt &&
- aDevExt->Device().IsValidFriendlyName() &&
- aDevExt->Device().FriendlyName().Length() != 0 )
- {
- // We always use the friendly name regardless of
- // the device-name of the device is available or not.
- namePtr.Set( aDevExt->Device().FriendlyName() );
- }
- else
- {
- // this will take care of name formating. Either the
- // name from iNameInParam or the address will be
- // the alias:
- tempDev = CBtDevExtension::NewLC( aAddr, aNameInParam );
- namePtr.Set( tempDev->Alias() );
- }
- // Make sure no overflow:
- if ( aNameBuf.MaxLength() < namePtr.Length() )
- {
- aNameBuf.Copy( namePtr.Left( aNameBuf.MaxLength() ) );
- }
- else
- {
- aNameBuf.Copy( namePtr );
- }
- if ( tempDev )
- {
- CleanupStack::PopAndDestroy( tempDev );
- }
- }
-
-