1 files changed, 12 insertions, 14 deletions

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
@@ -115,4 +115,3 @@ Services &Services::operator=( const Services& ser){
     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;
@@ -124,7 +123,6 @@ bool operator==( const Services& one,
     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;
@@ -144,13 +142,13 @@ void Services::setRecHandle( int 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();
 }