@@ -31,32 +31,20 @@ Indicator::~Indicator()
3131{
3232}
3333
34−void Indicator::init(const QString& busName, const QSettings& settings)
34+void Indicator::init(const QString &profile, const QString& busName, const QSettings& settings)
3535{
3636 setId(settings.value("Indicator Service/Name").toString());
3737 setPosition(settings.value("Indicator Service/Position", QVariant::fromValue(0)).toInt());
3838
3939 QString actionObjectPath = settings.value("Indicator Service/ObjectPath").toString();
40−
41− QVariantMap mapMenuObjectPaths;
42− Q_FOREACH(const QString& childGroup, settings.childGroups())
43− {
44− if (childGroup == "Indicator Service")
45− continue;
46−
47− QString menuPath = childGroup+"/ObjectPath";
48− if (settings.contains(menuPath))
49− {
50− mapMenuObjectPaths[childGroup] = settings.value(menuPath).toString();
51− }
52− }
40+ QString menuObjectPath = settings.value(profile + "/ObjectPath").toString();
5341
5442 QVariantMap properties;
5543 properties.clear();
5644 properties.insert("busType", 1);
5745 properties.insert("busName", busName);
5846 properties.insert("actionsObjectPath", actionObjectPath);
59− properties.insert("menuObjectPaths", mapMenuObjectPaths);
47+ properties.insert("menuObjectPath", menuObjectPath);
6048 setIndicatorProperties(properties);
6149}
6250