-rw-r--r-- | noncore/net/opietooth/lib/manager.cc | 7 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/bluebase.cpp | 2 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/btconnectionitem.cpp | 1 |
3 files changed, 6 insertions, 4 deletions
diff --git a/noncore/net/opietooth/lib/manager.cc b/noncore/net/opietooth/lib/manager.cc index 1281116..59ade6d 100644 --- a/noncore/net/opietooth/lib/manager.cc +++ b/noncore/net/opietooth/lib/manager.cc | |||
@@ -258,18 +258,19 @@ void Manager::searchConnections() { | |||
258 | emit connections( list ); | 258 | emit connections( list ); |
259 | delete proc; | 259 | delete proc; |
260 | } | 260 | } |
261 | } | 261 | } |
262 | void Manager::slotConnectionExited( OProcess* /*proc*/ ) { | 262 | void Manager::slotConnectionExited( OProcess* proc ) { |
263 | qWarning("exited"); | 263 | qWarning("<<<<<<<<<<<<<<<<<exited"); |
264 | ConnectionState::ValueList list; | 264 | ConnectionState::ValueList list; |
265 | list = parseConnections( m_hcitoolCon ); | 265 | list = parseConnections( m_hcitoolCon ); |
266 | emit connections(list ); | 266 | emit connections(list ); |
267 | delete proc; | ||
267 | } | 268 | } |
268 | void Manager::slotConnectionOutput(OProcess* proc, char* cha, int len) { | 269 | void Manager::slotConnectionOutput(OProcess* proc, char* cha, int len) { |
269 | QCString str(cha, len ); | 270 | QCString str(cha, len ); |
270 | m_hcitoolCon.append( str ); | 271 | m_hcitoolCon.append( str ); |
271 | delete proc; | 272 | //delete proc; |
272 | } | 273 | } |
273 | ConnectionState::ValueList Manager::parseConnections( const QString& out ) { | 274 | ConnectionState::ValueList Manager::parseConnections( const QString& out ) { |
274 | ConnectionState::ValueList list2; | 275 | ConnectionState::ValueList list2; |
275 | QStringList list = QStringList::split('\n', out ); | 276 | QStringList list = QStringList::split('\n', out ); |
diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp index d3abb54..5c5f069 100644 --- a/noncore/net/opietooth/manager/bluebase.cpp +++ b/noncore/net/opietooth/manager/bluebase.cpp | |||
@@ -417,9 +417,9 @@ void BlueBase::addServicesToDevice( const QString& device, Services::ValueList s | |||
417 | * Add the existing connections (pairs) to the connections tab. | 417 | * Add the existing connections (pairs) to the connections tab. |
418 | * This one triggers the search | 418 | * This one triggers the search |
419 | */ | 419 | */ |
420 | void BlueBase::addConnectedDevices() { | 420 | void BlueBase::addConnectedDevices() { |
421 | m_localDevice->searchConnections(); | 421 | m_localDevice->searchConnections(); |
422 | } | 422 | } |
423 | 423 | ||
424 | 424 | ||
425 | /** | 425 | /** |
diff --git a/noncore/net/opietooth/manager/btconnectionitem.cpp b/noncore/net/opietooth/manager/btconnectionitem.cpp index 6fb9c11..b57d1b3 100644 --- a/noncore/net/opietooth/manager/btconnectionitem.cpp +++ b/noncore/net/opietooth/manager/btconnectionitem.cpp | |||
@@ -6,8 +6,9 @@ using namespace OpieTooth; | |||
6 | BTConnectionItem::BTConnectionItem( QListView* parent, const ConnectionState& con ) | 6 | BTConnectionItem::BTConnectionItem( QListView* parent, const ConnectionState& con ) |
7 | : BTListItem( parent ){ | 7 | : BTListItem( parent ){ |
8 | m_con = con; | 8 | m_con = con; |
9 | setText(0, m_con.mac() ); | 9 | setText(0, m_con.mac() ); |
10 | setText(1, m_con.connectionMode() ); | ||
10 | } | 11 | } |
11 | BTConnectionItem::~BTConnectionItem() { | 12 | BTConnectionItem::~BTConnectionItem() { |
12 | 13 | ||
13 | } | 14 | } |