git.iko.soy/unity8
on xenial help sign in
Move profile setting out of init()
commit44915e587e1ffe25bb0952b0ab708d1be3480da0 authorMichael Terry <michael.terry@canonical.com> dateWed 8 Oct 2014, 10:10 (12 years ago) parentc04d148
3 files changed+5−6
compare with xenial
unifiedsplit
plugins/Unity/Indicators/indicator.cpp+2−4 plugins/Unity/Indicators/indicator.h+1−1 plugins/Unity/Indicators/indicatorsmanager.cpp+2−1
plugins/Unity/Indicators/indicator.cpp+2−4
@@ -31,7 +31,7 @@ Indicator::~Indicator()
3131{
3232}
3333
34−void Indicator::init(const QString &profile, const QString& busName, const QSettings& settings)
34+void Indicator::init(const QString& busName, const QSettings& settings)
3535{
3636 // Save all keys we care about from the QSettings object. It's annoying
3737 // that we can't just copy the object.
@@ -51,9 +51,7 @@ void Indicator::init(const QString &profile, const QString& busName, const QSett
5151 properties.insert("busType", 1);
5252 properties.insert("busName", busName);
5353 properties.insert("actionsObjectPath", actionObjectPath);
54−
55− m_properties = properties;
56− setProfile(profile); // will emit changed signals for us and set position
54+ setIndicatorProperties(properties);
5755}
5856
5957QString Indicator::identifier() const
plugins/Unity/Indicators/indicator.h+1−1
@@ -35,7 +35,7 @@ public:
3535 Indicator(QObject *parent = 0);
3636 virtual ~Indicator();
3737
38− void init(const QString &profile, const QString& busName, const QSettings& settings);
38+ void init(const QString& busName, const QSettings& settings);
3939
4040 QString identifier() const;
4141 int position() const;
plugins/Unity/Indicators/indicatorsmanager.cpp+2−1
@@ -281,7 +281,8 @@ Indicator::Ptr IndicatorsManager::indicator(const QString& indicator_name)
281281 Indicator::Ptr new_indicator(new Indicator(this));
282282 data->m_indicator = new_indicator;
283283 QSettings settings(data->m_fileInfo.absoluteFilePath(), QSettings::IniFormat, this);
284− new_indicator->init(m_profile, data->m_fileInfo.fileName(), settings);
284+ new_indicator->init(data->m_fileInfo.fileName(), settings);
285+ new_indicator->setProfile(m_profile);
285286 QObject::connect(this, SIGNAL(profileChanged(const QString&)), new_indicator.data(), SLOT(setProfile(const QString&)));
286287 return new_indicator;
287288}