--- a/bluetoothmgmt/btmgr/BTManServer/btmanserverburmgr.h Mon May 03 13:34:38 2010 +0300
+++ b/bluetoothmgmt/btmgr/BTManServer/btmanserverburmgr.h Fri May 14 16:59:23 2010 +0300
@@ -157,7 +157,6 @@
void DeleteRestoreFile();
void RenameBackupFileForRestore();
- void UpdateLocalDeviceNameL();
// From CActive:
void RunL();
@@ -213,8 +212,7 @@
static CBTRestoreHandler* NewL(CBTManServerBURMgr& aBURMgr, CBTManServer& aManServer);
~CBTRestoreHandler();
- void RestoreLocalDeviceNameL();
- void RestoreRemoteDeviceTableL(TBTDevAddr& aLocalAddr);
+ void RestoreRegistryL(TBTDevAddr& aLocalAddr);
private:
CBTRestoreHandler(CBTManServerBURMgr& aBURMgr, CBTManServer& aManServer);
@@ -223,6 +221,8 @@
void LoadRestoreDataL();
void NotifyLocalTableChange();
+ void NotifyLocalDeviceNameChange(const TDesC8& aLocalName);
+ void NotifyLocalDeviceNameChange(const TDesC16& aLocalName);
void NotifyRemoteTableChangeL(const TBTDevAddr& aAddress);
private:
@@ -250,6 +250,7 @@
inline TBool HasRegistryData() const;
void GetRegistryVersionL(TUint32& aRegistryVersionMajor, TUint32& aRegistryVersionMinor) const;
+ const TDesC8& GetLocalDeviceNameL() const;
TBool IsLocalAddressNonZeroL() const;
TBool IsLocalAddressEqualL(TBTDevAddr& aAddr) const;
TInt CountRemoteDevicesL() const;
@@ -262,8 +263,6 @@
CBTRegistryBURData();
void ConstructL();
- const TDesC8& GetLocalDeviceNameL() const;
-
private:
TBool iHasRegistryData;