Differential D22087 Diff 60630 dataengines/activities/activityengine.cpp

Changeset View

Standalone View

View Options

dataengines/activities/activityengine.cpp

Show All 39 Lines
40void ActivityEngine::init() 40​void ActivityEngine::init()
41{ 41​{
42 if (qApp->applicationName() == QLatin1String("plasma-netbook")) { 42​ if (qApp->applicationName() == QLatin1String("plasma-netbook")) {
43 //hack for the netbook 43​ //hack for the netbook
44 //FIXME can I read a setting or something instead? 44​ //FIXME can I read a setting or something instead?
45 } else { 45​ } else {
46 m_activityController = new KActivities::Controller(this); 46​ m_activityController = new KActivities::Controller(this);
47 m_currentActivity = m_activityController->currentActivity(); 47​ m_currentActivity = m_activityController->currentActivity();
48 QStringList activities = m_activityController->activities(); 48​ const QStringList activities = m_activityController->activities();
49 //setData("allActivities", activities); 49​ //setData("allActivities", activities);
50 foreach (const QString &id, activities) { 50​ for (const QString &id : activities) {
51 insertActivity(id); 51​ insertActivity(id);
52 } 52​ }
53 53​
54 connect(m_activityController, &KActivities::Controller::activityAdded, this, &ActivityEngine::activityAdded); 54​ connect(m_activityController, &KActivities::Controller::activityAdded, this, &ActivityEngine::activityAdded);
55 connect(m_activityController, &KActivities::Controller::activityRemoved, this, &ActivityEngine::activityRemoved); 55​ connect(m_activityController, &KActivities::Controller::activityRemoved, this, &ActivityEngine::activityRemoved);
56 connect(m_activityController, &KActivities::Controller::currentActivityChanged, this, &ActivityEngine::currentActivityChanged); 56​ connect(m_activityController, &KActivities::Controller::currentActivityChanged, this, &ActivityEngine::currentActivityChanged);
57 57​
58 //some convenience sources for times when checking every activity source would suck 58​ //some convenience sources for times when checking every activity source would suck
▲ Show 20 Lines • Show All 97 Lines • ▼ Show 20 Line(s)153{
156 setActivityScores(activities); 156​ setActivityScores(activities);
157} 157​}
158 158​
159void ActivityEngine::setActivityScores(const ActivityDataList &activities) 159​void ActivityEngine::setActivityScores(const ActivityDataList &activities)
160{ 160​{
161 QSet<QString> presentActivities; 161​ QSet<QString> presentActivities;
162 m_activityScores.clear(); 162​ m_activityScores.clear();
163 163​
164 foreach (const ActivityData &activity, activities) { 164​ for (const ActivityData &activity : activities) {
165 if (m_activities.contains(activity.id)) { 165​ if (m_activities.contains(activity.id)) {
166 setData(activity.id, QStringLiteral("Score"), activity.score); 166​ setData(activity.id, QStringLiteral("Score"), activity.score);
167 } 167​ }
168 presentActivities.insert(activity.id); 168​ presentActivities.insert(activity.id);
169 m_activityScores[activity.id] = activity.score; 169​ m_activityScores[activity.id] = activity.score;
170 } 170​ }
171 171​
172 foreach (const QString &activityId, m_activityController->activities()) { 172​ const auto theActivities = m_activityController->activities();
173​ for (const QString &activityId : theActivities) {
173 if (!presentActivities.contains(activityId) && m_activities.contains(activityId)) { 174​ if (!presentActivities.contains(activityId) && m_activities.contains(activityId)) {
174 setData(activityId, QStringLiteral("Score"), 0); 175​ setData(activityId, QStringLiteral("Score"), 0);
175 } 176​ }
176 } 177​ }
177} 178​}
178 179​
179void ActivityEngine::activityAdded(const QString &id) 180​void ActivityEngine::activityAdded(const QString &id)
180{ 181​{
▲ Show 20 Lines • Show All 85 Lines • Show Last 20 Lines