-rw-r--r-- | noncore/net/opietooth/lib/manager.cc | 2 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/btdeviceitem.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/noncore/net/opietooth/lib/manager.cc b/noncore/net/opietooth/lib/manager.cc index 83100f1..83accf7 100644 --- a/noncore/net/opietooth/lib/manager.cc +++ b/noncore/net/opietooth/lib/manager.cc | |||
@@ -211,25 +211,25 @@ RemoteDevice::ValueList Manager::parseHCIOutput(const QString& output ) { | |||
211 | QStringList strList = QStringList::split('\n', output ); | 211 | QStringList strList = QStringList::split('\n', output ); |
212 | QStringList::Iterator it; | 212 | QStringList::Iterator it; |
213 | QString str; | 213 | QString str; |
214 | for ( it = strList.begin(); it != strList.end(); ++it ) { | 214 | for ( it = strList.begin(); it != strList.end(); ++it ) { |
215 | str = (*it).stripWhiteSpace(); | 215 | str = (*it).stripWhiteSpace(); |
216 | odebug << "Manager: OpieTooth " << str.latin1() << oendl; | 216 | odebug << "Manager: OpieTooth " << str.latin1() << oendl; |
217 | int pos = str.findRev(':' ); | 217 | int pos = str.findRev(':' ); |
218 | if ( pos > 0 ) { | 218 | if ( pos > 0 ) { |
219 | QString mac = str.left(17 ); | 219 | QString mac = str.left(17 ); |
220 | str.remove( 0, 17 ); | 220 | str.remove( 0, 17 ); |
221 | odebug << "Manager: mac " << mac.latin1() << oendl; | 221 | odebug << "Manager: mac " << mac.latin1() << oendl; |
222 | odebug << "Manager: rest: " << str.latin1() << oendl; | 222 | odebug << "Manager: rest: " << str.latin1() << oendl; |
223 | RemoteDevice rem( mac , str.stripWhiteSpace() ); | 223 | RemoteDevice rem( mac , QString::fromUtf8(str.stripWhiteSpace()) ); |
224 | list.append( rem ); | 224 | list.append( rem ); |
225 | } | 225 | } |
226 | } | 226 | } |
227 | return list; | 227 | return list; |
228 | } | 228 | } |
229 | 229 | ||
230 | ////// hcitool cc and hcitool con | 230 | ////// hcitool cc and hcitool con |
231 | 231 | ||
232 | /** | 232 | /** |
233 | * Create it on the stack as don't care | 233 | * Create it on the stack as don't care |
234 | * so we don't need to care for it | 234 | * so we don't need to care for it |
235 | * cause hcitool gets reparented | 235 | * cause hcitool gets reparented |
diff --git a/noncore/net/opietooth/manager/btdeviceitem.cpp b/noncore/net/opietooth/manager/btdeviceitem.cpp index c112463..fb1b1c1 100644 --- a/noncore/net/opietooth/manager/btdeviceitem.cpp +++ b/noncore/net/opietooth/manager/btdeviceitem.cpp | |||
@@ -1,22 +1,22 @@ | |||
1 | 1 | ||
2 | #include "btdeviceitem.h" | 2 | #include "btdeviceitem.h" |
3 | 3 | ||
4 | using namespace OpieTooth; | 4 | using namespace OpieTooth; |
5 | 5 | ||
6 | 6 | ||
7 | BTDeviceItem::BTDeviceItem( QListView* parent, const RemoteDevice& dev ) | 7 | BTDeviceItem::BTDeviceItem( QListView* parent, const RemoteDevice& dev ) |
8 | : BTListItem( parent ) { | 8 | : BTListItem( parent ) { |
9 | 9 | ||
10 | setText( 0, dev.name().utf8() ); | 10 | setText( 0, dev.name() ); |
11 | m_device = dev; | 11 | m_device = dev; |
12 | }; | 12 | }; |
13 | BTDeviceItem::~BTDeviceItem() { | 13 | BTDeviceItem::~BTDeviceItem() { |
14 | // nothing I'm aware of | 14 | // nothing I'm aware of |
15 | } | 15 | } |
16 | RemoteDevice BTDeviceItem::remoteDevice() const { | 16 | RemoteDevice BTDeviceItem::remoteDevice() const { |
17 | return m_device; | 17 | return m_device; |
18 | } | 18 | } |
19 | QString BTDeviceItem::mac()const { | 19 | QString BTDeviceItem::mac()const { |
20 | return m_device.mac(); | 20 | return m_device.mac(); |
21 | } | 21 | } |
22 | QString BTDeviceItem::name() const { | 22 | QString BTDeviceItem::name() const { |