Bug 906019: Remove GetPropertiesReplyHandler, r=echou,gyeh

...because there is no need for this base class.

--HG--
extra : rebase_source : 0e1c3b40012f6132ae25611c00789b7f206e72d8
This commit is contained in:
Thomas Zimmermann 2013-08-23 11:39:52 +02:00
parent b5fc1147fb
commit 98a772b0d1

View File

@ -812,34 +812,17 @@ GetPropertiesInternal(const nsAString& aPath,
return true;
}
class GetPropertiesReplyHandler : public DBusReplyHandler
{
public:
GetPropertiesReplyHandler(const nsCString& aIface)
: mIface(aIface)
{
MOZ_ASSERT(!mIface.IsEmpty());
}
const nsCString& GetInterface() const
{
return mIface;
}
private:
nsCString mIface;
};
class AppendDeviceNameReplyHandler: public GetPropertiesReplyHandler
class AppendDeviceNameReplyHandler: public DBusReplyHandler
{
public:
AppendDeviceNameReplyHandler(const nsCString& aIface,
const nsString& aDevicePath,
const BluetoothSignal& aSignal)
: GetPropertiesReplyHandler(aIface)
: mIface(aIface)
, mDevicePath(aDevicePath)
, mSignal(aSignal)
{
MOZ_ASSERT(!mIface.IsEmpty());
MOZ_ASSERT(!mDevicePath.IsEmpty());
}
@ -859,7 +842,7 @@ public:
BluetoothValue deviceProperties;
bool success = UnpackPropertiesMessage(aReply, &err, deviceProperties,
GetInterface().get());
mIface.get());
if (!success) {
BT_WARNING("Failed to get device properties");
return;
@ -894,6 +877,7 @@ public:
}
private:
nsCString mIface;
nsString mDevicePath;
BluetoothSignal mSignal;
};