a6ea4dc · unity8 · git.iko.soy

modules/Unity/Indicators/indicatorsmanager.cpp+11−10

compare with xenial

unifiedsplit

@@ -246,25 +246,25 @@ void IndicatorsManager::endVerify(const QString& path)

246 }

247}

248

249−Indicator::Ptr IndicatorsManager::indicator(const QString& indicator)

249+Indicator::Ptr IndicatorsManager::indicator(const QString& indicator_name)

250{

251− if (!m_indicatorsData.contains(indicator))

251+ if (!m_indicatorsData.contains(indicator_name))

252 {

253− qWarning() << Q_FUNC_INFO << "Invalid plugin name: " << indicator;

253+ qWarning() << Q_FUNC_INFO << "Invalid indicator name: " << indicator_name;

254 return Indicator::Ptr();

255 }

256

257− IndicatorData *data = m_indicatorsData[indicator];

257+ IndicatorData *data = m_indicatorsData[indicator_name];

258 if (data->m_indicator)

259 {

260 return data->m_indicator;

261 }

262

263− Indicator::Ptr plugin(new Indicator(this));

263+ Indicator::Ptr new_indicator(new Indicator(this));

264− data->m_indicator = plugin;

264+ data->m_indicator = new_indicator;

265 QSettings settings(data->m_fileInfo.absoluteFilePath(), QSettings::IniFormat, this);

266− plugin->init(data->m_fileInfo.fileName(), settings);

266+ new_indicator->init(data->m_fileInfo.fileName(), settings);

267− return plugin;

267+ return new_indicator;

268}

269

270QList<Indicator::Ptr> IndicatorsManager::indicators()

@@ -272,8 +272,9 @@ QList<Indicator::Ptr> IndicatorsManager::indicators()

272 QList<Indicator::Ptr> list;

273 Q_FOREACH(IndicatorData* data, m_indicatorsData)

274 {

275− Indicator::Ptr plugin = indicator(data->m_name);

275+ Indicator::Ptr ret = indicator(data->m_name);

276+ if (ret)

276− list.append(plugin);

277+ list.append(ret);

277 }

278 }

278 return list;

279 return list;

279}

280}

modules/Unity/Indicators/indicatorsmanager.h+3−3

@@ -38,7 +38,7 @@ public:

38 Q_INVOKABLE void load();

39 Q_INVOKABLE void unload();

40

41− Indicator::Ptr indicator(const QString& indicator);

41+ Indicator::Ptr indicator(const QString& indicator_name);

42

43 QList<Indicator::Ptr> indicators();

44

@@ -47,8 +47,8 @@ public:

47Q_SIGNALS:

48 void loadedChanged(bool);

49

50− void indicatorLoaded(const QString& indicator);

50+ void indicatorLoaded(const QString& indicator_name);

51− void indicatorAboutToBeUnloaded(const QString& indicator);

51+ void indicatorAboutToBeUnloaded(const QString& indicator_name);

52

53private Q_SLOTS:

54 void onDirectoryChanged(const QString& directory);

modules/Unity/Indicators/indicatorsmodel.h+2−2

@@ -84,8 +84,8 @@ private:

84

85 void notifyDataChanged(QObject *sender, int role);

86 int count() const;

87− QVariant indicatorData(const Indicator::Ptr& plugin, int role) const;

87+ QVariant indicatorData(const Indicator::Ptr& indicator, int role) const;

88− static QVariant defaultData(Indicator::Ptr plugin, int role);

88+ static QVariant defaultData(Indicator::Ptr indicator, int role);

89};

90

91#endif // INDICATORSMODEL_H

modules/Unity/Indicators/qml/messaging/qmldir+1−2

@@ -9,5 +9,4 @@ MessageItem 0.1 MessageItem.qml

9QuickReply 0.1 QuickReply.qml

10SimpleTextMessage 0.1 SimpleTextMessage.qml

11SnapDecision 0.1 SnapDecision.qml

12−TextMessage 0.1 TextMessage.qml

12+TextMessage 0.1 TextMessage.qml

13−MessagingPlugin 0.1 MessagingPlugin.qml