diff -r 06b8e2af4411 -r 6fbed849b4f4 qtmobility/src/publishsubscribe/contextkitlayer.cpp --- a/qtmobility/src/publishsubscribe/contextkitlayer.cpp Fri Jun 11 14:26:25 2010 +0300 +++ b/qtmobility/src/publishsubscribe/contextkitlayer.cpp Wed Jun 23 19:08:38 2010 +0300 @@ -129,19 +129,21 @@ ContextKitHandle::ContextKitHandle (ContextKitHandle *parent, const QString &path) { QString key = path; - if (key.startsWith("/")) + if (key.startsWith(QLatin1Char('/'))) key = key.mid(1); - key = key.replace('/', '.'); + key = key.replace(QLatin1Char('/'), QLatin1Char('.')); if (parent) key = parent->prefix + key; - prefix = (key == "")? "" : key + "."; + if (!key.isEmpty()) + prefix = key + QLatin1Char('.'); + foreach (const QString &k, ContextRegistryInfo::instance()->listKeys()) { if (k == key) - insert ("", k); - else if (k.startsWith (prefix)) - insert (k.mid(prefix.length()).replace ('.', '/'), k); + insert(QString(), k); + else if (k.startsWith(prefix)) + insert(k.mid(prefix.length()).replace (QLatin1Char('.'), QLatin1Char('/')), k); } }