Diffstat (limited to 'noncore/net/opietooth/lib/parser.cc') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/opietooth/lib/parser.cc | 15 |
1 files changed, 10 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 | |||
@@ -54,13 +54,13 @@ Services::ValueList Parser::services() const { | |||
54 | void Parser::parse( const QString& string) { | 54 | void Parser::parse( const QString& string) { |
55 | m_list.clear(); | 55 | m_list.clear(); |
56 | m_complete = true; | 56 | m_complete = true; |
57 | QStringList list = QStringList::split('\n', string,TRUE ); | 57 | QStringList list = QStringList::split('\n', string,TRUE ); |
58 | QStringList::Iterator it; | 58 | QStringList::Iterator it; |
59 | for (it = list.begin(); it != list.end(); ++it ) { | 59 | for (it = list.begin(); it != list.end(); ++it ) { |
60 | qWarning("line:%s:line", (*it).latin1() ); | 60 | //qWarning("line:%s:line", (*it).latin1() ); |
61 | if ( (*it).startsWith("Browsing") ) continue; | 61 | if ( (*it).startsWith("Browsing") ) continue; |
62 | 62 | ||
63 | if ( (*it).stripWhiteSpace().isEmpty() ) { // line is empty because a new Service begins | 63 | if ( (*it).stripWhiteSpace().isEmpty() ) { // line is empty because a new Service begins |
64 | qWarning("could add"); | 64 | qWarning("could add"); |
65 | // now see if complete and add | 65 | // now see if complete and add |
66 | if (m_complete ) { | 66 | if (m_complete ) { |
@@ -77,13 +77,13 @@ void Parser::parse( const QString& string) { | |||
77 | if (parseClassId( (*it) ) ) ;//continue; | 77 | if (parseClassId( (*it) ) ) ;//continue; |
78 | if (parseProtocol( (*it) ) ) ;//continue; | 78 | if (parseProtocol( (*it) ) ) ;//continue; |
79 | if (parseProfile( (*it) ) ) ;//continue; | 79 | if (parseProfile( (*it) ) ) ;//continue; |
80 | } | 80 | } |
81 | // missed the last one | 81 | // missed the last one |
82 | if (m_complete) { | 82 | if (m_complete) { |
83 | qWarning("adding"); | 83 | // qWarning("adding"); |
84 | if (!m_item.serviceName().isEmpty() ) | 84 | if (!m_item.serviceName().isEmpty() ) |
85 | m_list.append(m_item ); | 85 | m_list.append(m_item ); |
86 | } | 86 | } |
87 | QValueList<Services>::Iterator it2; | 87 | QValueList<Services>::Iterator it2; |
88 | 88 | ||
89 | if (m_list.isEmpty() ) | 89 | if (m_list.isEmpty() ) |
@@ -115,30 +115,35 @@ bool Parser::parseRecHandle( const QString& str) { | |||
115 | 115 | ||
116 | } | 116 | } |
117 | return false; | 117 | return false; |
118 | } | 118 | } |
119 | bool Parser::parseClassId( const QString& str) { | 119 | bool Parser::parseClassId( const QString& str) { |
120 | if (str.startsWith("Service Class ID List:") ) { | 120 | if (str.startsWith("Service Class ID List:") ) { |
121 | qWarning("found class id" ); | ||
122 | qWarning("line:%s", str.latin1() ); | ||
121 | m_classOver = true; | 123 | m_classOver = true; |
122 | return true; | 124 | return true; |
123 | }else if ( m_classOver && str.startsWith(" " ) ){ // ok now are the informations in place | 125 | }else if ( m_classOver && str.startsWith(" " ) ){ // ok now are the informations in place |
124 | 126 | qWarning("line with class id" ); | |
127 | qWarning("%s",str.latin1() ); | ||
125 | 128 | ||
126 | // "Obex Object Push" (0x1105) | 129 | // "Obex Object Push" (0x1105) |
127 | // find backwards the " and the from 0 to pos and the mid pos+1 | 130 | // find backwards the " and the from 0 to pos and the mid pos+1 |
128 | // then stripWhiteSpace add name replace '"' with "" | 131 | // then stripWhiteSpace add name replace '"' with "" |
129 | // and then convert 0x1105 toInt() | 132 | // and then convert 0x1105 toInt() |
130 | QString classes; | 133 | QString classes; |
131 | int ids; | 134 | int ids; |
132 | ids = convert( str, classes ); | 135 | ids = convert( str, classes ); |
133 | qWarning("ids %d", ids ); | 136 | qWarning("ids %d", ids ); |
134 | m_item.insertClassId( ids, classes ); | 137 | m_item.insertClassId( ids, classes ); |
135 | 138 | ||
136 | return true; | 139 | return true; |
137 | }else | 140 | }else{ |
141 | qWarning("Else %d", m_classOver ); | ||
138 | m_classOver = false; | 142 | m_classOver = false; |
143 | } | ||
139 | return false; | 144 | return false; |
140 | } | 145 | } |
141 | bool Parser::parseProtocol( const QString& str) { | 146 | bool Parser::parseProtocol( const QString& str) { |
142 | if (str.startsWith("Protocol Descriptor List:") ) { | 147 | if (str.startsWith("Protocol Descriptor List:") ) { |
143 | m_protocolOver = true; | 148 | m_protocolOver = true; |
144 | m_protocolAdded = false; | 149 | m_protocolAdded = false; |