| -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 ) { QStringList strList = QStringList::split('\n', output ); QStringList::Iterator it; QString str; for ( it = strList.begin(); it != strList.end(); ++it ) { str = (*it).stripWhiteSpace(); odebug << "Manager: OpieTooth " << str.latin1() << oendl; int pos = str.findRev(':' ); if ( pos > 0 ) { QString mac = str.left(17 ); str.remove( 0, 17 ); odebug << "Manager: mac " << mac.latin1() << oendl; odebug << "Manager: rest: " << str.latin1() << oendl; - RemoteDevice rem( mac , str.stripWhiteSpace() ); + RemoteDevice rem( mac , QString::fromUtf8(str.stripWhiteSpace()) ); list.append( rem ); } } return list; } ////// hcitool cc and hcitool con /** * Create it on the stack as don't care * so we don't need to care for it * 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 @@ #include "btdeviceitem.h" using namespace OpieTooth; BTDeviceItem::BTDeviceItem( QListView* parent, const RemoteDevice& dev ) : BTListItem( parent ) { - setText( 0, dev.name().utf8() ); + setText( 0, dev.name() ); m_device = dev; }; BTDeviceItem::~BTDeviceItem() { // nothing I'm aware of } RemoteDevice BTDeviceItem::remoteDevice() const { return m_device; } QString BTDeviceItem::mac()const { return m_device.mac(); } QString BTDeviceItem::name() const { |