equal
deleted
inserted
replaced
509 //service implementing interface doesn't exist in the system db |
509 //service implementing interface doesn't exist in the system db |
510 //so the user db must contain a stale entry so remove it |
510 //so the user db must contain a stale entry so remove it |
511 m_userDb->removeExternalDefaultServiceInterface(interfaceID); |
511 m_userDb->removeExternalDefaultServiceInterface(interfaceID); |
512 |
512 |
513 QList<QServiceInterfaceDescriptor> descriptors; |
513 QList<QServiceInterfaceDescriptor> descriptors; |
514 descriptors = getInterfaces(interfaceName, UserScope); |
514 descriptors = getInterfaces(QServiceFilter(interfaceName), UserScope); |
515 |
515 |
516 //make the latest interface implementation the new |
516 //make the latest interface implementation the new |
517 //default if there is one |
517 //default if there is one |
518 if (descriptors.count() > 0 ) { |
518 if (descriptors.count() > 0 ) { |
519 descriptor = latestDescriptor(descriptors); |
519 descriptor = latestDescriptor(descriptors); |
749 defaultInfo = externalDefaultsInfo[i]; |
749 defaultInfo = externalDefaultsInfo[i]; |
750 descriptor = m_userDb->getInterface(defaultInfo.second); |
750 descriptor = m_userDb->getInterface(defaultInfo.second); |
751 if (m_userDb->lastError().code() == DBError::NotFound) { |
751 if (m_userDb->lastError().code() == DBError::NotFound) { |
752 m_userDb->removeExternalDefaultServiceInterface(defaultInfo.second); |
752 m_userDb->removeExternalDefaultServiceInterface(defaultInfo.second); |
753 QList<QServiceInterfaceDescriptor> descriptors; |
753 QList<QServiceInterfaceDescriptor> descriptors; |
754 descriptors = getInterfaces(defaultInfo.first, UserScope); |
754 descriptors = getInterfaces(QServiceFilter(defaultInfo.first), UserScope); |
755 |
755 |
756 if (descriptors.count() > 0 ) { |
756 if (descriptors.count() > 0 ) { |
757 descriptor = latestDescriptor(descriptors); |
757 descriptor = latestDescriptor(descriptors); |
758 setInterfaceDefault(descriptor, UserScope); |
758 setInterfaceDefault(descriptor, UserScope); |
759 } |
759 } |