generic: misc cleanups

This commit is contained in:
Ivailo Monev 2015-10-03 12:35:27 +03:00
parent 04145e76f6
commit 39b9ee37b2
2 changed files with 4 additions and 5 deletions

View file

@ -141,10 +141,9 @@ Kded::~Kded()
delete m_pTimer;
delete m_pDirWatch;
for (QHash<QByteArray,KDEDModule*>::iterator
it(m_modules.begin()), itEnd(m_modules.end());
it != itEnd; ++it)
{
QHashIterator<QString,KDEDModule*> it(m_modules);
while (it.hasNext()) {
it.next();
KDEDModule* module(it.value());
// first disconnect otherwise slotKDEDModuleRemoved() is called

View file

@ -611,7 +611,7 @@ void KIconLoaderPrivate::addBaseThemes(KIconThemeNode *node, const QString &appn
void KIconLoaderPrivate::addInheritedThemes(KIconThemeNode *node, const QString &appname)
{
foreach (const QString it, node->theme->inherits()) {
if ((it) == "hicolor") {
if (it == "hicolor") {
// The icon theme spec says that "hicolor" must be the very last
// of all inherited themes, so don't add it here but at the very end
// of addBaseThemes().