diff -r 8a27654f7b62 -r 20fda83a6398 bluetoothmgmt/btmgr/BTManServer/BTRegistryDB.h
--- a/bluetoothmgmt/btmgr/BTManServer/BTRegistryDB.h	Fri Mar 12 15:49:00 2010 +0200
+++ b/bluetoothmgmt/btmgr/BTManServer/BTRegistryDB.h	Mon Mar 15 12:44:59 2010 +0200
@@ -1,4 +1,4 @@
-// Copyright (c) 1999-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1999-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"
@@ -106,6 +106,8 @@
 // 1.1 - Adjusted the Time/Date fields for 64 bit integers (remote device table).
 // 1.2 - Added additional fields Link-key type and UI cookie (remote device table).
 
+// Note: Any changes to the registry version will also require changes to the CBTRegistryBURData class.
+
 // Useful SQL literals
 _LIT(KSQLIsNotNull, " IS NOT NULL");
 _LIT(KSQLCommaSpace, ", ");
@@ -173,6 +175,7 @@
 	void UpdateNameL(const TBTDevAddr& aAddress, const TDesC8& aName, TBTManServerRequest aRequest);
 // for local device table
 	TBTLocalDevice* GetLocalDeviceLC();
+	TBTLocalDevice* GetLocalDeviceL();
 	void UpdateLocalDeviceL(const TBTLocalDevice& aDevice);
 // CSY table
 	const TBTCommPortSettings* GetCommPortSettingsLC(const TBTCommPortSettings& aPort);
@@ -184,6 +187,8 @@
 	RDbView* OpenCommPortLC(const TBTCommPortSettings& aSettings);
 	RDbView* OpenCommPortL(const TBTCommPortSettings& aSettings);
 
+	void GetDefaultDeviceFromIniL(TBTLocalDevice& aDevice);
+
 private:
 	RDbTable* OpenTableL(const TDesC& aTable);	// opens and transfers ownership
 	RDbTable* OpenPersistTableL();	// opens and transfers ownership
@@ -209,7 +214,6 @@
 	CBTRegistry();
 	void DeleteCorruptRegistryL();
 	void SetupDefaultRegistryL();
-	void GetDefaultDeviceFromIniL(TBTLocalDevice& aDevice);
 	TBool FindVar(const TDesC8& aPtr, const TDesC8& aVarName, TPtrC8& aResult) const;
 	TBool FindVar(const TDesC8& aPtr, const TDesC8& aVarName, TInt& aResult) const;
 	TInt SetDeviceName(const TDesC& aDeviceName, TBTLocalDevice& aDevice);