on xenial help sign in
removed plugin naming. replaced with inidicator
commita6ea4dc7758e6a55847ebce9b812510ee2ce5bfd authorNick Dedekind <nicholas.dedekind@gmail.com> dateThu 27 Jun 2013, 15:09 (13 years ago) parente0c01f4
4 files changed+17−17
modules/Unity/Indicators/indicatorsmanager.cpp+11−10 modules/Unity/Indicators/indicatorsmanager.h+3−3 modules/Unity/Indicators/indicatorsmodel.h+2−2 modules/Unity/Indicators/qml/messaging/qmldir+1−2
modules/Unity/Indicators/indicatorsmanager.cpp+11−10
@@ -246,25 +246,25 @@ void IndicatorsManager::endVerify(const QString& path)
246246 }
247247}
248248
249−Indicator::Ptr IndicatorsManager::indicator(const QString& indicator)
249+Indicator::Ptr IndicatorsManager::indicator(const QString& indicator_name)
250250{
251− if (!m_indicatorsData.contains(indicator))
251+ if (!m_indicatorsData.contains(indicator_name))
252252 {
253− qWarning() << Q_FUNC_INFO << "Invalid plugin name: " << indicator;
253+ qWarning() << Q_FUNC_INFO << "Invalid indicator name: " << indicator_name;
254254 return Indicator::Ptr();
255255 }
256256
257− IndicatorData *data = m_indicatorsData[indicator];
257+ IndicatorData *data = m_indicatorsData[indicator_name];
258258 if (data->m_indicator)
259259 {
260260 return data->m_indicator;
261261 }
262262
263− Indicator::Ptr plugin(new Indicator(this));
264− data->m_indicator = plugin;
263+ Indicator::Ptr new_indicator(new Indicator(this));
264+ data->m_indicator = new_indicator;
265265 QSettings settings(data->m_fileInfo.absoluteFilePath(), QSettings::IniFormat, this);
266− plugin->init(data->m_fileInfo.fileName(), settings);
267− return plugin;
266+ new_indicator->init(data->m_fileInfo.fileName(), settings);
267+ return new_indicator;
268268}
269269
270270QList<Indicator::Ptr> IndicatorsManager::indicators()
@@ -272,8 +272,9 @@ QList<Indicator::Ptr> IndicatorsManager::indicators()
272272 QList<Indicator::Ptr> list;
273273 Q_FOREACH(IndicatorData* data, m_indicatorsData)
274274 {
275− Indicator::Ptr plugin = indicator(data->m_name);
276− list.append(plugin);
275+ Indicator::Ptr ret = indicator(data->m_name);
276+ if (ret)
277+ list.append(ret);
277278 }
278279 return list;
279280}
modules/Unity/Indicators/indicatorsmanager.h+3−3
@@ -38,7 +38,7 @@ public:
3838 Q_INVOKABLE void load();
3939 Q_INVOKABLE void unload();
4040
41− Indicator::Ptr indicator(const QString& indicator);
41+ Indicator::Ptr indicator(const QString& indicator_name);
4242
4343 QList<Indicator::Ptr> indicators();
4444
@@ -47,8 +47,8 @@ public:
4747Q_SIGNALS:
4848 void loadedChanged(bool);
4949
50− void indicatorLoaded(const QString& indicator);
51− void indicatorAboutToBeUnloaded(const QString& indicator);
50+ void indicatorLoaded(const QString& indicator_name);
51+ void indicatorAboutToBeUnloaded(const QString& indicator_name);
5252
5353private Q_SLOTS:
5454 void onDirectoryChanged(const QString& directory);
modules/Unity/Indicators/indicatorsmodel.h+2−2
@@ -84,8 +84,8 @@ private:
8484
8585 void notifyDataChanged(QObject *sender, int role);
8686 int count() const;
87− QVariant indicatorData(const Indicator::Ptr& plugin, int role) const;
88− static QVariant defaultData(Indicator::Ptr plugin, int role);
87+ QVariant indicatorData(const Indicator::Ptr& indicator, int role) const;
88+ static QVariant defaultData(Indicator::Ptr indicator, int role);
8989};
9090
9191#endif // INDICATORSMODEL_H
modules/Unity/Indicators/qml/messaging/qmldir+1−2
@@ -9,5 +9,4 @@ MessageItem 0.1 MessageItem.qml
99QuickReply 0.1 QuickReply.qml
1010SimpleTextMessage 0.1 SimpleTextMessage.qml
1111SnapDecision 0.1 SnapDecision.qml
12−TextMessage 0.1 TextMessage.qml
13−MessagingPlugin 0.1 MessagingPlugin.qml
12+TextMessage 0.1 TextMessage.qml