From d254a0eb2c656053e67cd6563e5b625ebe440b29 Mon Sep 17 00:00:00 2001 From: Oliver Ruiz Dorantes Date: Sun, 1 Mar 2009 16:01:41 +0000 Subject: [PATCH] - Fix gcc4 build(Monni) - Remove Items added to Remote List from inquiry list, this fixes elements being shared among more than 1 list. Both lists behave better now. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29369 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/preferences/bluetooth/DeviceListItem.cpp | 2 +- src/preferences/bluetooth/DeviceListItem.h | 2 +- src/preferences/bluetooth/InquiryPanel.cpp | 4 ++-- src/preferences/bluetooth/RemoteDevicesView.cpp | 1 + 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/preferences/bluetooth/DeviceListItem.cpp b/src/preferences/bluetooth/DeviceListItem.cpp index 654c937d15..cb8bb8416c 100644 --- a/src/preferences/bluetooth/DeviceListItem.cpp +++ b/src/preferences/bluetooth/DeviceListItem.cpp @@ -27,7 +27,7 @@ DeviceListItem::DeviceListItem(BluetoothDevice* bDevice) } -DeviceListItem::DeviceListItem(bdaddr_t bdaddr, DeviceClass dClass, int32 rssi = 0) +DeviceListItem::DeviceListItem(bdaddr_t bdaddr, DeviceClass dClass, int32 rssi) : BListItem(), fDevice(NULL), fAddress(bdaddr), diff --git a/src/preferences/bluetooth/DeviceListItem.h b/src/preferences/bluetooth/DeviceListItem.h index c01ca769fa..5a6493fd1b 100644 --- a/src/preferences/bluetooth/DeviceListItem.h +++ b/src/preferences/bluetooth/DeviceListItem.h @@ -19,7 +19,7 @@ class DeviceListItem : public BListItem { public: DeviceListItem(BluetoothDevice* bDevice); - DeviceListItem(bdaddr_t bdaddr, DeviceClass dClass, int32 rssi = 0); + DeviceListItem(bdaddr_t bdaddr, DeviceClass dClass, int32 rssi = 0); ~DeviceListItem(); diff --git a/src/preferences/bluetooth/InquiryPanel.cpp b/src/preferences/bluetooth/InquiryPanel.cpp index 28bca24424..697f29c9c2 100644 --- a/src/preferences/bluetooth/InquiryPanel.cpp +++ b/src/preferences/bluetooth/InquiryPanel.cpp @@ -184,8 +184,8 @@ InquiryPanel::MessageReceived(BMessage *message) { message->PrintToStream(); int32 index = fRemoteList->CurrentSelection(0); - DeviceListItem* item = (DeviceListItem*) fRemoteList->ItemAt(index); - + DeviceListItem* item = (DeviceListItem*) fRemoteList->RemoveItem(index);; + BMessage message(kMsgAddToRemoteList); message.AddPointer("device", item); diff --git a/src/preferences/bluetooth/RemoteDevicesView.cpp b/src/preferences/bluetooth/RemoteDevicesView.cpp index 19a516faee..ae977ab3b3 100644 --- a/src/preferences/bluetooth/RemoteDevicesView.cpp +++ b/src/preferences/bluetooth/RemoteDevicesView.cpp @@ -118,6 +118,7 @@ RemoteDevicesView::MessageReceived(BMessage *msg) BListItem* device; msg->FindPointer("device", (void**)&device); fDeviceList->AddItem(device); + fDeviceList->Invalidate(); } break; default: