diff --git a/src/declarativeimports/core/colorscope.cpp b/src/declarativeimports/core/colorscope.cpp
index f7134c5cd..87ee45c17 100644
--- a/src/declarativeimports/core/colorscope.cpp
+++ b/src/declarativeimports/core/colorscope.cpp
@@ -1,200 +1,201 @@
 /***************************************************************************
  *   Copyright 2011 Marco Martin <mart@kde.org>                            *
  *   Copyright 2011 Artur Duque de Souza <asouza@kde.org>                  *
  *   Copyright 2013 Sebastian Kügler <sebas@kde.org>                       *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA .        *
  ***************************************************************************/
 
 #include "colorscope.h"
 
 #include <QQmlContext>
 #include <QQmlEngine>
 #include <QColor>
 
 QHash<QObject *, ColorScope *> ColorScope::s_attachedScopes = QHash<QObject *, ColorScope *>();
 
 ColorScope::ColorScope(QQuickItem *parent, QObject *parentObject)
     : QQuickItem(parent),
       m_inherit(false),
       m_group(Plasma::Theme::NormalColorGroup),
       m_parent(parentObject)
 {
     connect(&m_theme, &Plasma::Theme::themeChanged, this, &ColorScope::colorsChanged);
 
     QQuickItem *parentItem = qobject_cast<QQuickItem *>(parentObject);
     if (parentItem) {
         connect(parentItem, &QQuickItem::parentChanged, this, &ColorScope::colorGroupChanged);
         connect(parentItem, &QQuickItem::parentChanged, this, &ColorScope::colorsChanged);
     }
 }
 
 ColorScope::~ColorScope()
 {
     s_attachedScopes.remove(m_parent);
 }
 
 ColorScope *ColorScope::qmlAttachedProperties(QObject *object)
 {
-    if (ColorScope::s_attachedScopes.contains(object)) {
-        return s_attachedScopes.value(object);
+    const auto cs = s_attachedScopes.value(object);
+    if (cs) {
+        return cs;
     }
 
     ColorScope *s = new ColorScope(0, object);
     s_attachedScopes[object] = s;
 
     s->setParent(object);
 
     s->m_inherit = true;
     return s;
 }
 
 ColorScope *ColorScope::findParentScope() const
 {
     QObject *p = 0;
     if (m_parent) {
         QQuickItem *gp = qobject_cast<QQuickItem *>(m_parent);
         if (gp) {
             p = gp->parentItem();
         } else {
             p = m_parent->parent();
         }
     }
 
     if (!p || !m_parent) {
         if (m_parentScope) {
             disconnect(m_parentScope.data(), &ColorScope::colorGroupChanged,
                     this, &ColorScope::colorGroupChanged);
             disconnect(m_parentScope.data(), &ColorScope::colorsChanged,
                     this, &ColorScope::colorsChanged);
         }
         return 0;
     }
 
     ColorScope *c = qobject_cast<ColorScope *>(p);
     if (!c) {
         c = qmlAttachedProperties(p);
     }
 
     if (c != m_parentScope) {
         if (m_parentScope) {
             disconnect(m_parentScope.data(), &ColorScope::colorGroupChanged,
                     this, &ColorScope::colorGroupChanged);
             disconnect(m_parentScope.data(), &ColorScope::colorsChanged,
                     this, &ColorScope::colorsChanged);
         }
         if (c) {
             connect(c, &ColorScope::colorGroupChanged,
                     this, &ColorScope::colorGroupChanged);
             connect(c, &ColorScope::colorsChanged,
                     this, &ColorScope::colorsChanged);
         }
         //HACK
         const_cast<ColorScope *>(this)->m_parentScope = c;
     }
 
 
     return m_parentScope;
 }
 
 void ColorScope::setColorGroup(Plasma::Theme::ColorGroup group)
 {
     if (m_group == group) {
         return;
     }
 
     m_group = group;
 
     emit colorGroupChanged();
     emit colorsChanged();
 }
 
 Plasma::Theme::ColorGroup ColorScope::colorGroup() const
 {
     if (m_inherit) {
         ColorScope *s = findParentScope();
         if (s) {
             return s->colorGroup();
         }
     }
     return m_group;
 }
 
 QColor ColorScope::textColor() const
 {
     return m_theme.color(Plasma::Theme::TextColor, colorGroup());
 }
 
 QColor ColorScope::highlightColor() const
 {
     return m_theme.color(Plasma::Theme::HighlightColor, colorGroup());
 }
 
 QColor ColorScope::highlightedTextColor() const
 {
     return m_theme.color(Plasma::Theme::HighlightedTextColor, colorGroup());
 }
 
 QColor ColorScope::backgroundColor() const
 {
     return m_theme.color(Plasma::Theme::BackgroundColor, colorGroup());
 }
 
 QColor ColorScope::positiveTextColor() const
 {
     return m_theme.color(Plasma::Theme::PositiveTextColor, colorGroup());
 }
 
 QColor ColorScope::neutralTextColor() const
 {
     return m_theme.color(Plasma::Theme::NeutralTextColor, colorGroup());
 }
 
 QColor ColorScope::negativeTextColor() const
 {
     return m_theme.color(Plasma::Theme::NegativeTextColor, colorGroup());
 }
 
 bool ColorScope::inherit() const
 {
     return m_inherit;
 }
 
 void ColorScope::setInherit(bool inherit)
 {
     if (m_inherit == inherit) {
         return;
     }
     m_inherit = inherit;
     emit inheritChanged();
     emit colorsChanged();
 }
 
 void ColorScope::itemChange(ItemChange change, const ItemChangeData &value)
 {
     if (change == QQuickItem::ItemSceneChange) {
         //we have a window: create the representations if needed
         if (value.window) {
             emit colorGroupChanged();
             emit colorsChanged();
         }
     }
 
     QQuickItem::itemChange(change, value);
 }
 
 
 #include "moc_colorscope.cpp"