| -rw-r--r-- | noncore/net/opietooth/lib/parser.cc | 8 | ||||
| -rw-r--r-- | noncore/net/opietooth/lib/services.cc | 26 | ||||
| -rw-r--r-- | noncore/net/opietooth/lib/services.h | 13 |
3 files changed, 22 insertions, 25 deletions
diff --git a/noncore/net/opietooth/lib/parser.cc b/noncore/net/opietooth/lib/parser.cc index 00ec84a..0699309 100644 --- a/noncore/net/opietooth/lib/parser.cc +++ b/noncore/net/opietooth/lib/parser.cc @@ -99,66 +99,64 @@ bool Parser::parseName( const QString& str) { return true; } return false; } bool Parser::parseRecHandle( const QString& str) { if (str.startsWith("Service RecHandle:" ) ) { QString out = str.mid(18 ).stripWhiteSpace(); qWarning("out %s", out.latin1() ); int value = out.mid(2).toInt(&m_ok, 16 ); if (m_ok && (value != -1) ) m_complete = true; else m_complete = false; qWarning("rec handle %d", value); m_item.setRecHandle( value ); return true; } return false; } bool Parser::parseClassId( const QString& str) { if (str.startsWith("Service Class ID List:") ) { m_classOver = true; return true; - }else if ( m_classOver ) { // ok now are the informations in place + }else if ( m_classOver && str.startsWith(" " ) ){ // ok now are the informations in place - m_classOver = false; // "Obex Object Push" (0x1105) // find backwards the " and the from 0 to pos and the mid pos+1 // then stripWhiteSpace add name replace '"' with "" // and then convert 0x1105 toInt() QString classes; int ids; ids = convert( str, classes ); qWarning("ids %d", ids ); - m_item.setClassIdList( classes ); - m_item.setClassIdList( ids ); + m_item.insertClassId( ids, classes ); return true; }else - m_classOver = true; + m_classOver = false; return false; } bool Parser::parseProtocol( const QString& str) { if (str.startsWith("Protocol Descriptor List:") ) { m_protocolOver = true; m_protocolAdded = false; return true; }else if (m_protocolOver && str.startsWith(" ") ) { // "L2CAP" (0x0100) qWarning("double protocol filter"); if (!m_protocolAdded ) { // the protocol does neither supply a channel nor port so add it now Services::ProtocolDescriptor desc( m_protName, m_protId ); m_item.insertProtocolDescriptor( desc ); } m_protocolAdded = false; { // the find function m_protId = convert(str, m_protName ); } return true; }else if (m_protocolOver && str.startsWith(" ") ) { qWarning("tripple protocol filter"); m_protocolAdded = true; QString dummy = str.stripWhiteSpace(); diff --git a/noncore/net/opietooth/lib/services.cc b/noncore/net/opietooth/lib/services.cc index 93ee70a..23b760b 100644 --- a/noncore/net/opietooth/lib/services.cc +++ b/noncore/net/opietooth/lib/services.cc @@ -92,88 +92,86 @@ Services::ProtocolDescriptor &Services::ProtocolDescriptor::operator=( const Ser } bool operator==( const Services::ProtocolDescriptor &first, const Services::ProtocolDescriptor &second ){ if( ( first.name() == second.name() ) && ( first.id() == second.id() ) && ( first.port() == second.port() ) ) return true; return false; } Services::Services(){ } Services::Services(const Services& service ){ (*this) = service; } Services::~Services(){ } Services &Services::operator=( const Services& ser){ m_name = ser.m_name; m_recHandle = ser.m_recHandle; - m_classList = ser.m_classList; - m_classId = ser.m_classId; + m_classIds = ser.m_classIds; m_protocols = ser.m_protocols; m_profiles = ser.m_profiles; return *this; } bool operator==( const Services& one, const Services& two){ if ( ( one.recHandle() == two.recHandle() ) && - ( one.classIdListInt() == two.classIdListInt() ) && ( one.serviceName() == two.serviceName() ) && - ( one.classIdList() == two.classIdList() ) && ( one.protocolDescriptorList() == two.protocolDescriptorList() ) && - ( one.profileDescriptor() == two.profileDescriptor() ) ) + ( one.profileDescriptor() == two.profileDescriptor() ) + /* ( one.classIdList() == two.classIdList() ) */ ) return true; return false; } QString Services::serviceName() const{ return m_name; } void Services::setServiceName( const QString& service ){ m_name = service; } int Services::recHandle() const{ return m_recHandle; } void Services::setRecHandle( int handle){ m_recHandle = handle; } -QString Services::classIdList() const{ - return m_classList; +QMap<int, QString> Services::classIdList()const { + return m_classIds; +}; +void Services::insertClassId( int id, const QString& str ) { + m_classIds.insert( id, str ); } -void Services::setClassIdList( const QString& str){ - m_classList = str; +void Services::removeClassId(int id) { + m_classIds.remove( id ); } -int Services::classIdListInt() const{ - return m_classId; -} -void Services::setClassIdList(int id){ - m_classId = id; +void Services::clearClassId() { + m_classIds.clear(); } void Services::insertProtocolDescriptor( const ProtocolDescriptor& prot){ m_protocols.append( prot ); } void Services::clearProtocolDescriptorList(){ m_protocols.clear(); } void Services::removeProtocolDescriptor( const ProtocolDescriptor& prot){ m_protocols.remove( prot ); } Services::ProtocolDescriptor::ValueList Services::protocolDescriptorList()const{ return m_protocols; } void Services::insertProfileDescriptor( const ProfileDescriptor& prof){ m_profiles.append( prof ); } void Services::clearProfileDescriptorList(){ m_profiles.clear(); } void Services::removeProfileDescriptor( const ProfileDescriptor& prof){ m_profiles.remove(prof ); } diff --git a/noncore/net/opietooth/lib/services.h b/noncore/net/opietooth/lib/services.h index 881d383..7cce5e1 100644 --- a/noncore/net/opietooth/lib/services.h +++ b/noncore/net/opietooth/lib/services.h @@ -1,28 +1,29 @@ #ifndef OpieToothServices_H #define OpieToothServices_H +#include <qmap.h> #include <qvaluelist.h> namespace OpieTooth { /** * Services lets shows you all available services * on a remote device */ class Services { /** The profile descriptor * */ class ProfileDescriptor{ public: /** typedef */ typedef QValueList<ProfileDescriptor> ValueList; /** c'tor for QValueList */ ProfileDescriptor(); /** * c'tor * @param id The id or name ("Lan Access Using PPP") * @param idInt The id as uint ( 0x1102 ) * @param version Version of the Profile ( 1 ) */ @@ -95,49 +96,49 @@ namespace OpieTooth { void setPort(int ); ProtocolDescriptor &operator=( const ProtocolDescriptor& ); //friend bool operator==( const ProtocolDescriptor&, // const ProtocolDescriptor& ); private: QString m_name; int m_number; int m_channel; }; public: typedef QValueList<Services> ValueList; Services(); Services(const Services& service ); ~Services(); Services &operator=( const Services& ); friend bool operator==(const Services&, const Services& ); QString serviceName()const; void setServiceName( const QString& service ); int recHandle()const; void setRecHandle( int ); - QString classIdList()const; - void setClassIdList( const QString& ); - int classIdListInt()const; - void setClassIdList(int ); + + QMap<int, QString> classIdList()const; + void insertClassId( int id, const QString& className ); + void removeClassId( int id ); + void clearClassId(); void insertProtocolDescriptor(const ProtocolDescriptor& ); void clearProtocolDescriptorList(); void removeProtocolDescriptor( const ProtocolDescriptor& ); ProtocolDescriptor::ValueList protocolDescriptorList()const; void insertProfileDescriptor( const ProfileDescriptor& ); void clearProfileDescriptorList(); void removeProfileDescriptor(const ProfileDescriptor& ); ProfileDescriptor::ValueList profileDescriptor()const; private: + QMap<int, QString> m_classIds; QString m_name; int m_recHandle; - QString m_classList; - int m_classId; QValueList<ProfileDescriptor> m_profiles; QValueList<ProtocolDescriptor> m_protocols; }; }; #endif |