-rw-r--r-- | noncore/net/opietooth/lib/parser.cc | 13 | ||||
-rw-r--r-- | noncore/net/opietooth/lib/remotedevice.cc | 6 | ||||
-rw-r--r-- | noncore/net/opietooth/lib/remotedevice.h | 4 |
3 files changed, 18 insertions, 5 deletions
diff --git a/noncore/net/opietooth/lib/parser.cc b/noncore/net/opietooth/lib/parser.cc index 0699309..8baf284 100644 --- a/noncore/net/opietooth/lib/parser.cc +++ b/noncore/net/opietooth/lib/parser.cc @@ -57,7 +57,7 @@ void Parser::parse( const QString& string) { QStringList list = QStringList::split('\n', string,TRUE ); QStringList::Iterator it; for (it = list.begin(); it != list.end(); ++it ) { - qWarning("line:%s:line", (*it).latin1() ); + //qWarning("line:%s:line", (*it).latin1() ); if ( (*it).startsWith("Browsing") ) continue; if ( (*it).stripWhiteSpace().isEmpty() ) { // line is empty because a new Service begins @@ -80,7 +80,7 @@ void Parser::parse( const QString& string) { } // missed the last one if (m_complete) { - qWarning("adding"); +// qWarning("adding"); if (!m_item.serviceName().isEmpty() ) m_list.append(m_item ); } @@ -118,10 +118,13 @@ bool Parser::parseRecHandle( const QString& str) { } bool Parser::parseClassId( const QString& str) { if (str.startsWith("Service Class ID List:") ) { + qWarning("found class id" ); + qWarning("line:%s", str.latin1() ); m_classOver = true; return true; }else if ( m_classOver && str.startsWith(" " ) ){ // ok now are the informations in place - + qWarning("line with class id" ); + qWarning("%s",str.latin1() ); // "Obex Object Push" (0x1105) // find backwards the " and the from 0 to pos and the mid pos+1 @@ -134,8 +137,10 @@ bool Parser::parseClassId( const QString& str) { m_item.insertClassId( ids, classes ); return true; - }else + }else{ + qWarning("Else %d", m_classOver ); m_classOver = false; + } return false; } bool Parser::parseProtocol( const QString& str) { diff --git a/noncore/net/opietooth/lib/remotedevice.cc b/noncore/net/opietooth/lib/remotedevice.cc index 08fb397..9cf0cac 100644 --- a/noncore/net/opietooth/lib/remotedevice.cc +++ b/noncore/net/opietooth/lib/remotedevice.cc @@ -46,3 +46,9 @@ QString RemoteDevice::name() const{ void RemoteDevice::setName( const QString& name ){ m_name = name; } +bool RemoteDevice::equals( const RemoteDevice& dev ) const { + if ( m_mac == dev.m_mac && m_name == dev.m_name ) + return true; + else + return false; +}; diff --git a/noncore/net/opietooth/lib/remotedevice.h b/noncore/net/opietooth/lib/remotedevice.h index 23f98bd..f268ccc 100644 --- a/noncore/net/opietooth/lib/remotedevice.h +++ b/noncore/net/opietooth/lib/remotedevice.h @@ -12,17 +12,19 @@ namespace OpieTooth{ RemoteDevice(const RemoteDevice& ); RemoteDevice(const QString &mac, const QString &name ); ~RemoteDevice(); - friend bool operator==(const RemoteDevice&, const RemoteDevice&); +// friend bool operator==(const RemoteDevice&, const RemoteDevice&); RemoteDevice &operator=(const RemoteDevice& ); bool isEmpty()const; QString mac()const; void setMac(const QString& mac ); QString name()const; void setName( const QString& name ); + bool equals( const RemoteDevice& )const; private: QString m_name; QString m_mac; }; + bool operator==( const RemoteDevice&, const RemoteDevice& ); }; #endif |