|
Line
Link Here
|
| 0 |
-- |
0 |
++ b/applets/kickoff/core/applicationmodel.cpp |
| 1 |
-- |
|
|
| 2 |
-- a/applets/kickoff/core/applicationmodel.cpp |
|
Lines 185-191
Link Here
|
| 185 |
const KSycocaEntry::Ptr p = (*it); |
185 |
const KSycocaEntry::Ptr p = (*it); |
| 186 |
|
186 |
|
| 187 |
if (p->isType(KST_KService)) { |
187 |
if (p->isType(KST_KService)) { |
| 188 |
const KService::Ptr service = p; |
188 |
const KService::Ptr service = KService::Ptr(static_cast<KService*>(p.data())); |
| 189 |
|
189 |
|
| 190 |
if (service->noDisplay()) { |
190 |
if (service->noDisplay()) { |
| 191 |
continue; |
191 |
continue; |
|
Lines 235-241
Link Here
|
| 235 |
|
235 |
|
| 236 |
existingServices[appName] = service; |
236 |
existingServices[appName] = service; |
| 237 |
} else if (p->isType(KST_KServiceGroup)) { |
237 |
} else if (p->isType(KST_KServiceGroup)) { |
| 238 |
const KServiceGroup::Ptr serviceGroup = p; |
238 |
const KServiceGroup::Ptr serviceGroup = KServiceGroup::Ptr(static_cast<KServiceGroup*>(p.data())); |
| 239 |
|
239 |
|
| 240 |
if (serviceGroup->noDisplay() || serviceGroup->childCount() == 0) { |
240 |
if (serviceGroup->noDisplay() || serviceGroup->childCount() == 0) { |
| 241 |
continue; |
241 |
continue; |
|
Lines 612-624
Link Here
|
| 612 |
KSycocaEntry::Ptr e = (*it); |
612 |
KSycocaEntry::Ptr e = (*it); |
| 613 |
|
613 |
|
| 614 |
if (e->isType(KST_KServiceGroup)) { |
614 |
if (e->isType(KST_KServiceGroup)) { |
| 615 |
KServiceGroup::Ptr g(e); |
615 |
KServiceGroup::Ptr g(KServiceGroup::Ptr(static_cast<KServiceGroup*>(e.data()))); |
| 616 |
if (!g->noDisplay()) { |
616 |
if (!g->noDisplay()) { |
| 617 |
if (createNewProgramListForPath(g->relPath())) |
617 |
if (createNewProgramListForPath(g->relPath())) |
| 618 |
seenProgramsChanged = true; |
618 |
seenProgramsChanged = true; |
| 619 |
} |
619 |
} |
| 620 |
} else if (e->isType(KST_KService)) { |
620 |
} else if (e->isType(KST_KService)) { |
| 621 |
KService::Ptr s(e); |
621 |
KService::Ptr s(KService::Ptr(static_cast<KService*>(e.data()))); |
| 622 |
if (s->isApplication() && !s->noDisplay()) { |
622 |
if (s->isApplication() && !s->noDisplay()) { |
| 623 |
QString shortStorageId = s->storageId().remove(".desktop"); |
623 |
QString shortStorageId = s->storageId().remove(".desktop"); |
| 624 |
QHash<QString, QDate>::Iterator it_find = d->seenPrograms.find(shortStorageId); |
624 |
QHash<QString, QDate>::Iterator it_find = d->seenPrograms.find(shortStorageId); |
| 625 |
-- |
625 |
++ b/applets/kicker/plugin/appsmodel.cpp |
| 626 |
-- |
|
|
| 627 |
-- a/applets/kicker/plugin/appsmodel.cpp |
|
Lines 252-258
Link Here
|
| 252 |
const KSycocaEntry::Ptr p = (*it); |
252 |
const KSycocaEntry::Ptr p = (*it); |
| 253 |
|
253 |
|
| 254 |
if (p->isType(KST_KServiceGroup)) { |
254 |
if (p->isType(KST_KServiceGroup)) { |
| 255 |
KServiceGroup::Ptr subGroup = static_cast<KServiceGroup::Ptr >(p); |
255 |
KServiceGroup::Ptr subGroup(static_cast<KServiceGroup*>(p.data())); |
| 256 |
|
256 |
|
| 257 |
if (!subGroup->noDisplay() && subGroup->childCount() > 0) { |
257 |
if (!subGroup->noDisplay() && subGroup->childCount() > 0) { |
| 258 |
m_entryList << new AppGroupEntry(subGroup, this, m_flat, m_appNameFormat); |
258 |
m_entryList << new AppGroupEntry(subGroup, this, m_flat, m_appNameFormat); |
|
Lines 295-301
Link Here
|
| 295 |
const KSycocaEntry::Ptr p = (*it); |
295 |
const KSycocaEntry::Ptr p = (*it); |
| 296 |
|
296 |
|
| 297 |
if (p->isType(KST_KService)) { |
297 |
if (p->isType(KST_KService)) { |
| 298 |
const KService::Ptr service = static_cast<KService::Ptr>(p); |
298 |
const KService::Ptr service(static_cast<KService*>(p.data())); |
| 299 |
|
299 |
|
| 300 |
if (!service->noDisplay()) { |
300 |
if (!service->noDisplay()) { |
| 301 |
bool found = false; |
301 |
bool found = false; |
|
Lines 314-324
Link Here
|
| 314 |
|
314 |
|
| 315 |
} else if (p->isType(KST_KServiceGroup)) { |
315 |
} else if (p->isType(KST_KServiceGroup)) { |
| 316 |
if (m_flat) { |
316 |
if (m_flat) { |
| 317 |
processServiceGroup(static_cast<KServiceGroup::Ptr>(p)); |
317 |
const KServiceGroup::Ptr serviceGroup(static_cast<KServiceGroup*>(p.data())); |
|
|
318 |
processServiceGroup(serviceGroup); |
| 318 |
|
319 |
|
| 319 |
m_sortNeeded = true; |
320 |
m_sortNeeded = true; |
| 320 |
} else { |
321 |
} else { |
| 321 |
const KServiceGroup::Ptr subGroup = static_cast<KServiceGroup::Ptr>(p); |
322 |
const KServiceGroup::Ptr subGroup(static_cast<KServiceGroup*>(p.data())); |
| 322 |
|
323 |
|
| 323 |
if (!subGroup->noDisplay() && subGroup->childCount() > 0) { |
324 |
if (!subGroup->noDisplay() && subGroup->childCount() > 0) { |
| 324 |
m_entryList << new AppGroupEntry(subGroup, this, m_flat, m_appNameFormat); |
325 |
m_entryList << new AppGroupEntry(subGroup, this, m_flat, m_appNameFormat); |
