Merge lp:~zsombi/ubuntu-ui-toolkit/qml-role-and-loader-removal into lp:ubuntu-ui-toolkit

[Zsombor Egri]

QML Role element and qml-loader removed. Role functionality distributed between StyleTree and ItemStyle. ThemeEngine contains only QML API.

[Juhapekka Piiroinen (juhapekka-piiroinen)]

This MR needs to be resubmitted against the new trunk.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:259
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/651/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/./build=panda-pbuilder,distribution=quantal,flavor=armhf/651/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/./build=pbuilder-master,distribution=quantal,flavor=amd64/651/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/./build=pbuilder-master,distribution=quantal,flavor=i386/651/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/651//rebuild/?

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:260
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/652/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/./build=panda-pbuilder,distribution=quantal,flavor=armhf/652/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/./build=pbuilder-master,distribution=quantal,flavor=amd64/652/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/./build=pbuilder-master,distribution=quantal,flavor=i386/652/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/652//rebuild/?

review: Approve (continuous-integration)

[Tim Peeters (tpeeters)]

27 + // class name may have_QMLTYPE_XX or _QML_XX suffixes

add space after have in the comment

[Tim Peeters (tpeeters)]

    // class name may have_QMLTYPE_XX or _QML_XX suffixes
    className = className.left(className.indexOf("_qml"));
    styleData.className = className;
    styleData.styleClass = className;

Is this correct? It sets the classname to _qml. Shouldn't you use className.right?

[Tim Peeters (tpeeters)]

your addition to CHANGES was reverted when merging trunk

[Tim Peeters (tpeeters)]

result = (rule != 0) && !(rule->path() == path);

why not rule->path() != path?

[Tim Peeters (tpeeters)]

looking good, I only didn't check the tests yet.

[Juhapekka Piiroinen (juhapekka-piiroinen)]

tests looks ok to me

review: Approve

[Tim Peeters (tpeeters)]

okay, great!

review: Approve

[Tim Peeters (tpeeters)]

oh wait, first the small comments I gave above

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
Approved revid is not set in launchpad (maybe a permission problem?).
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-autolanding/277/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-autolanding/./build=panda-pbuilder,distribution=quantal,flavor=armhf/277/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-autolanding/./build=pbuilder-master,distribution=quantal,flavor=amd64/277/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-autolanding/./build=pbuilder-master,distribution=quantal,flavor=i386/277/console

review: Needs Fixing (continuous-integration)

[Zsombor Egri (zsombi)]

On 01/11/2013 01:51 PM, Tim Peeters wrote:
> 27 + // class name may have_QMLTYPE_XX or _QML_XX suffixes
>
> add space after have in the comment
ack

[Zsombor Egri (zsombi)]

On 01/11/2013 01:55 PM, Tim Peeters wrote:
> // class name may have_QMLTYPE_XX or _QML_XX suffixes
> className = className.left(className.indexOf("_qml"));
> styleData.className = className;
> styleData.styleClass = className;
>
> Is this correct? It sets the classname to _qml. Shouldn't you use className.right?
What do you mean it sets classname to _qml? Cuts off everything
starting from index of "_QML", so if a classname is
"ScrollBar_QMLTYPE_72" then the classname will be "scrollbar".

[Zsombor Egri (zsombi)]

On 01/11/2013 02:51 PM, Tim Peeters wrote:
> result = (rule != 0) && !(rule->path() == path);
>
> why not rule->path() != path?
Right :)

[lp:~zsombi/ubuntu-ui-toolkit/qml-role-and-loader-removal]

261. By Zsombor Egri on 2013-01-14

comments applied

262. By Zsombor Egri on 2013-01-14

trunk merge

263. By Zsombor Egri on 2013-01-14

CHANGES updated

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:263
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/658/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/./build=panda-pbuilder,distribution=quantal,flavor=armhf/658/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/./build=pbuilder-master,distribution=quantal,flavor=amd64/658/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/./build=pbuilder-master,distribution=quantal,flavor=i386/658/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/658//rebuild/?

review: Approve (continuous-integration)

[Tim Peeters (tpeeters)]

> On 01/11/2013 01:55 PM, Tim Peeters wrote:
> > // class name may have_QMLTYPE_XX or _QML_XX suffixes
> > className = className.left(className.indexOf("_qml"));
> > styleData.className = className;
> > styleData.styleClass = className;
> >
> > Is this correct? It sets the classname to _qml. Shouldn't you use
> className.right?
> What do you mean it sets classname to _qml? Cuts off everything
> starting from index of "_QML", so if a classname is
> "ScrollBar_QMLTYPE_72" then the classname will be "scrollbar".

You are right. I was thinking _qml was the prefix, not postfix.

[Tim Peeters (tpeeters)]

looks good

review: Approve

=== modified file 'CHANGES'
--- CHANGES	2013-01-08 18:46:48 +0000
+++ CHANGES	2013-01-14 14:26:22 +0000
@@ -15,7 +15,8 @@
 API Changes
 ***********
 
-* None
+* ThemeEngine - contains only public API, no C++ specific API
+* Role element removed
 
 
 SDK 0.1.25

=== modified file 'modules/Ubuntu/Components/plugin/itemstyleattached.cpp'
--- modules/Ubuntu/Components/plugin/itemstyleattached.cpp	2012-11-20 10:07:44 +0000
+++ modules/Ubuntu/Components/plugin/itemstyleattached.cpp	2013-01-14 14:26:22 +0000
@@ -19,10 +19,10 @@
 #include <QtQml/QQmlComponent>
 #include <QtQml/QQmlContext>
 #include <QtQml/QQmlEngine>
+#include <QtQuick/QQuickItem>
 
 #include "itemstyleattached.h"
 #include "itemstyleattached_p.h"
-#include "rule.h"
 #include "themeengine.h"
 #include "themeengine_p.h"
 
@@ -144,12 +144,16 @@
     delegate(0),
     componentContext(0),
     styleRule(0),
-    delegateRule(0),
     delayApplyingStyle(true),
     customStyle(false),
     customDelegate(false),
     connectedToEngine(false)
 {
+    QString className = QString(attachee->metaObject()->className()).toLower();
+    // class name may have _QMLTYPE_XX or _QML_XX suffixes
+    className = className.left(className.indexOf("_qml"));
+    styleData.className = className;
+    styleData.styleClass = className;
     // refresh style upon reparenting!
     // there is no reason to do styling till the parent is not set and this applies
     // to the root objects too as even those have an internal parent
@@ -161,14 +165,43 @@
         componentContext = new QQmlContext(QQmlEngine::contextForObject(attachee));
         componentContext->setContextProperty(itemProperty, attachee);
     }
-
 }
 
 ItemStyleAttachedPrivate::~ItemStyleAttachedPrivate()
 {
     // remove name from the theming engine
-    if (!name.isEmpty())
-        ThemeEngine::instance()->registerName(attachee, QString());
+    if (!styleData.styleId.isEmpty())
+        ThemeEnginePrivate::registerName(attachee, QString());
+}
+
+bool ItemStyleAttachedPrivate::updateStyleSelector()
+{
+    Selector path;
+    SelectorNode::Relationship relation = SelectorNode::Child;
+    QQuickItem *parent = attachee->parentItem();
+    ItemStyleAttached *parentStyle = 0;
+
+    path << styleData;
+
+    while (parent) {
+        parentStyle = ThemeEnginePrivate::attachedStyle(parent);
+        if (!parentStyle)
+            relation = SelectorNode::Descendant;
+        else {
+            path[0].relationship = relation;
+            path.prepend(parentStyle->d_ptr->styleData);
+            relation = SelectorNode::Child;
+        }
+        parent = parent->parentItem();
+    }
+
+    if (path != styleSelector) {
+        styleSelector = path;
+        // need to refresh the style rule(s)
+        styleRule = ThemeEnginePrivate::styleRuleForPath(styleSelector);
+        return true;
+    }
+    return false;
 }
 
 bool ItemStyleAttachedPrivate::updateStyle()
@@ -186,11 +219,9 @@
             style = 0;
         }
         // make sure we have a theme
-        result = (styleRule = ThemeEngine::instance()->lookupStyleRule(attachee));
-        if (!result || (result && !styleRule->style()))
-            result = (styleRule = ThemeEngine::instance()->lookupStyleRule(attachee, true));
-        if (result) {
-            style = styleRule->createStyle(componentContext);
+        if (styleRule && styleRule->style) {
+            style = styleRule->style->create(componentContext);
+            result = (style != 0);
         }
     } else
         result = true;
@@ -218,11 +249,9 @@
             delegate = 0;
         }
         // make sure we have a theme
-        result = (delegateRule = ThemeEngine::instance()->lookupStyleRule(attachee));
-        if (!result || (result && !delegateRule->delegate()))
-            result = (delegateRule = ThemeEngine::instance()->lookupStyleRule(attachee, true));
-        if (result) {
-            delegate = delegateRule->createDelegate(componentContext);
+        if (styleRule && styleRule->delegate) {
+            delegate = qobject_cast<QQuickItem*>(styleRule->delegate->create(componentContext));
+            result = (delegate != 0);
         }
     } else
         result = true;
@@ -269,16 +298,14 @@
 {
     bool result = true;
     Q_Q(ItemStyleAttached);
-    if (ThemeEngine::instance()->registerName(attachee, id)) {
-        name = id;
-        attachee->setProperty("name", name);
+    if (ThemeEnginePrivate::registerName(attachee, id)) {
+        styleData.styleId = id;
+        attachee->setProperty("name", styleData.styleId);
     } else {
-        QString className = q->metaObject()->className();
-        className = className.left(className.indexOf("_QMLTYPE"));
         ThemeEnginePrivate::setError(QString("Instance %1 already registered. Resetting instance for %2.")
-                                     .arg(name)
-                                     .arg(className));
-        name = QString();
+                                     .arg(styleData.styleId)
+                                     .arg(styleData.className));
+        styleData.styleId = QString();
         result = false;
     }
     return result;
@@ -293,26 +320,33 @@
 {
     Q_Q(ItemStyleAttached);
     if (!customStyle || !customDelegate) {
-        if (!connectedToEngine)
+        if (!connectedToEngine) {
             connectedToEngine = (bool)QObject::connect(ThemeEngine::instance(), SIGNAL(themeChanged()), q, SLOT(_q_refreshStyle()));
+            updateStyleSelector();
+        }
     } else {
         if (connectedToEngine)
             connectedToEngine = !QObject::disconnect(ThemeEngine::instance(), SIGNAL(themeChanged()), q, SLOT(_q_refreshStyle()));
+        if (!connectedToEngine)
+            styleRule = 0;
     }
 }
 
 
 /*!
   \internal
-  Internal slot to update the style of an item. The slot is connected to the item's
-  connected() signal. This is called only if the item defines "Component.onCompleted()"
-  attached signal.
+  Internal slot to update the style of an item when the theme is changed. The slot
+  is connected to the engine's themeChanged() signal. The slot should not be used
+  from other methods as it will cause performance problems.
   */
 void ItemStyleAttachedPrivate::_q_refreshStyle()
 {
     // no need to delay style applying any longer
     delayApplyingStyle = false;
 
+    // ... but style refresh is needed as the old styles are dead
+    styleRule = ThemeEnginePrivate::styleRuleForPath(styleSelector);
+
     updateCurrentStyle();
 }
 
@@ -326,7 +360,10 @@
         // the component is most likely used in a delegate or is being deleted
         return;
 
-    _q_refreshStyle();
+    if (updateStyleSelector() || delayApplyingStyle) {
+        delayApplyingStyle = false;
+        updateCurrentStyle();
+    }
 
     // need to reapply styling on each child of the attachee!
     // this will cause performance issues!
@@ -369,7 +406,7 @@
 QString ItemStyleAttached::name() const
 {
     Q_D(const ItemStyleAttached);
-    return d->name;
+    return d->styleData.styleId;
 }
 /*!
   Updates the name property.
@@ -377,10 +414,11 @@
 void ItemStyleAttached::setName(const QString &name)
 {
     Q_D(ItemStyleAttached);
-    if (d->name.compare(name, Qt::CaseInsensitive)) {
+    if (d->styleData.styleId.compare(name, Qt::CaseInsensitive)) {
         if (d->registerName(name.toLower())) {
             d->listenThemeEngine();
-            d->updateCurrentStyle();
+            if (d->updateStyleSelector())
+                d->updateCurrentStyle();
         }
     }
 }
@@ -399,7 +437,7 @@
 QString ItemStyleAttached::styleClass() const
 {
     Q_D(const ItemStyleAttached);
-    return d->styleClass;
+    return d->styleData.styleClass;
 }
 /*!
   Sets the class property value.
@@ -407,10 +445,11 @@
 void ItemStyleAttached::setStyleClass(const QString &styleClass)
 {
     Q_D(ItemStyleAttached);
-    if (d->styleClass.compare(styleClass, Qt::CaseInsensitive)) {
-        d->styleClass = styleClass.toLower();
+    if (d->styleData.styleClass.compare(styleClass, Qt::CaseInsensitive)) {
+        d->styleData.styleClass = styleClass.toLower();
         d->listenThemeEngine();
-        d->updateCurrentStyle();
+        if (d->updateStyleSelector())
+            d->updateCurrentStyle();
     }
 }
 
@@ -421,7 +460,9 @@
 QString ItemStyleAttached::path() const
 {
     Q_D(const ItemStyleAttached);
-    return d->styleRule ? d->styleRule->selector() : QString("(null)");
+    return d->styleRule ?
+                ThemeEnginePrivate::selectorToString(d->styleRule->path()) :
+                QString("(null)");
 }
 
 /*!
@@ -461,7 +502,7 @@
             d->style = 0;
         }
         d->customStyle = (style != 0);
-        if (d->customStyle)
+        if (d->customStyle && d->customDelegate)
             d->styleRule = 0;
         d->style = style;
         d->listenThemeEngine();
@@ -504,8 +545,6 @@
             d->delegate->deleteLater();
         }
         d->customDelegate = (delegate != 0);
-        if (d->customDelegate)
-            d->delegateRule = 0;
         d->delegate = delegate;
         d->listenThemeEngine();
         if (d->updateDelegate())

=== modified file 'modules/Ubuntu/Components/plugin/itemstyleattached.h'
--- modules/Ubuntu/Components/plugin/itemstyleattached.h	2012-11-07 13:07:23 +0000
+++ modules/Ubuntu/Components/plugin/itemstyleattached.h	2013-01-14 14:26:22 +0000
@@ -62,6 +62,7 @@
     Q_DISABLE_COPY(ItemStyleAttached)
     Q_DECLARE_PRIVATE(ItemStyleAttached)
     QScopedPointer<ItemStyleAttachedPrivate> d_ptr;
+    friend class ThemeEnginePrivate;
 
     Q_PRIVATE_SLOT(d_func(), void _q_reapplyStyling(QQuickItem *))
     Q_PRIVATE_SLOT(d_func(), void _q_refreshStyle())

=== modified file 'modules/Ubuntu/Components/plugin/itemstyleattached_p.h'
--- modules/Ubuntu/Components/plugin/itemstyleattached_p.h	2012-11-07 13:07:23 +0000
+++ modules/Ubuntu/Components/plugin/itemstyleattached_p.h	2013-01-14 14:26:22 +0000
@@ -20,11 +20,9 @@
 #define ITEMSTYLEATTACHED_P_H
 
 #include "itemstyleattached.h"
+#include "suffixtree_p.h"
 
-class QQmlComponent;
 class QQmlContext;
-class Rule;
-
 class ItemStyleAttachedPrivate {
     Q_DECLARE_PUBLIC(ItemStyleAttached)
 public:
@@ -35,18 +33,18 @@
     QQuickItem *attachee;
     QObject *style;
     QQuickItem *delegate;
-    QString styleClass;
-    QString name;
+    SelectorNode styleData;
+    Selector styleSelector;
 
     // internal members
     QQmlContext *componentContext;
-    Rule *styleRule;
-    Rule *delegateRule;
+    StyleTreeNode *styleRule;
     bool delayApplyingStyle;
     bool customStyle;
     bool customDelegate;
     bool connectedToEngine;
 
+    bool updateStyleSelector();
     bool updateStyle();
     bool updateDelegate();
     void updateCurrentStyle();

=== modified file 'modules/Ubuntu/Components/plugin/plugin.pro'
--- modules/Ubuntu/Components/plugin/plugin.pro	2013-01-07 07:59:56 +0000
+++ modules/Ubuntu/Components/plugin/plugin.pro	2013-01-14 14:26:22 +0000
@@ -24,10 +24,7 @@
     suffixtree_p.h \
     itemstyleattached.h \
     itemstyleattached_p.h \
-    rule.h \
-    rule_p.h \
-    qmlloader_p.h \
-    qmlthemeloader_p.h \
+    qmlthemeloader.h \
     i18n.h \
     listener.h \
     ucscalingimageprovider.h \
@@ -43,8 +40,6 @@
     suffixtree.cpp \
     themesettings.cpp \
     itemstyleattached.cpp \
-    rule.cpp \
-    qmlloader.cpp \
     qmlthemeloader.cpp \
     i18n.cpp \
     listener.cpp \

=== removed file 'modules/Ubuntu/Components/plugin/qmlloader.cpp'
--- modules/Ubuntu/Components/plugin/qmlloader.cpp	2012-10-24 16:03:03 +0000
+++ modules/Ubuntu/Components/plugin/qmlloader.cpp	1970-01-01 00:00:00 +0000
@@ -1,117 +0,0 @@
-/*
- * Copyright 2012 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * 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 Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Zsombor Egri <[e-mail]>
- */
-
-#include "themeengine.h"
-#include "themeengine_p.h"
-#include "qmlloader_p.h"
-#include "rule.h"
-#include "itemstyleattached.h"
-#include <QtQml/QQmlEngine>
-#include <QtQml/QQmlContext>
-#include <QtQml/QQmlComponent>
-#include <QtQuick/QQuickItem>
-#include <QtCore/QDebug>
-
-/*!
-  \internal
-  The QmlTheme class loads a QML theme and builds up the ThemeEngine's Rule-element
-  suffix-tree.
-  */
-
-/*=============================================================================
-  QML THEME LOADER
-=============================================================================*/
-
-QmlLoader::QmlLoader(QQmlEngine *engine) :
-    QObject(engine),
-    themeComponent(0),
-    async(false)
-{
-    m_engine = engine;
-}
-
-/*!
-  \internal
-  Loads a QML theme and builds up the style rule tree.
-  */
-StyleTreeNode *QmlLoader::loadTheme(const QUrl &path, QStringList &themeFiles)
-{
-    async = false;
-    themeComponent = new QQmlComponent(m_engine, path);
-    // create the root node
-    styleTree = new StyleTreeNode;
-    if (themeComponent->isLoading()) {
-        // the QML engine should be initialized by now, so use 0 for accessing instance
-        async = true;
-        QObject::connect(themeComponent, SIGNAL(statusChanged(QQmlComponent::Status)),
-                         ThemeEngine::instance(), SLOT(_q_continueThemeLoading));
-    } else
-        finalizeThemeLoading();
-
-    if (styleTree)
-        themeFiles << path.path();
-    return styleTree;
-}
-
-/*!
-  \internal
-  Finalizes theme loading. Parses theme for style rules and builds up the cache from it.
-*/
-void QmlLoader::finalizeThemeLoading()
-{
-    if (!themeComponent->isError()) {
-        QObject *theme = themeComponent->create();
-        if (theme) {
-            // parse its children for Styles
-            QList<Rule*> rules = theme->findChildren<Rule*>();
-
-            Q_FOREACH (Rule *rule, rules) {
-                const QString selector = rule->selector();
-                if (selector.isEmpty()) {
-                    qWarning() << "Rule without selector!";
-                    continue;
-                }
-                QList<Selector> pathList = ThemeEnginePrivate::parseSelector(selector);
-                Q_FOREACH (const Selector &path, pathList) {
-                    styleTree->addStyleRule(path, rule);
-                }
-            }
-
-            // emit themeChanged() using meta-object
-            if (async)
-                QMetaObject::invokeMethod(ThemeEngine::instance(), "themeChanged()", Qt::QueuedConnection);
-        }
-    } else {
-        ThemeEnginePrivate::setError(QString("Error loading style\n%1").
-                                     arg(themeComponent->errorString()));
-        // leave the root node as that might have been given already to the
-        // theme engine due to asynchronousity
-        if (async)
-            styleTree->clear();
-        else {
-            delete styleTree;
-            styleTree = 0;
-        }
-    }
-
-    // reset component
-    delete themeComponent;
-    themeComponent = 0;
-}
-
-

=== removed file 'modules/Ubuntu/Components/plugin/qmlloader_p.h'
--- modules/Ubuntu/Components/plugin/qmlloader_p.h	2012-10-24 16:03:03 +0000
+++ modules/Ubuntu/Components/plugin/qmlloader_p.h	1970-01-01 00:00:00 +0000
@@ -1,41 +0,0 @@
-/*
- * Copyright 2012 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * 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 Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Zsombor Egri <[e-mail]>
- */
-
-#ifndef QMLLOADER_P_H
-#define QMLLOADER_P_H
-
-#include "themeengine_p.h"
-#include "themeloader_p.h"
-
-// QML theme loader
-class QmlLoader : public QObject, public ThemeLoader {
-    Q_OBJECT
-public:
-    QmlLoader(QQmlEngine *engine);
-    virtual ~QmlLoader(){}
-    StyleTreeNode *loadTheme(const QUrl &path, QStringList &themeFiles);
-
-private Q_SLOTS:
-    void finalizeThemeLoading();
-private:
-    QQmlComponent *themeComponent;
-    StyleTreeNode *styleTree;
-    bool async;
-};
-
-#endif // QMLLOADER_P_H

=== modified file 'modules/Ubuntu/Components/plugin/qmlthemeloader.cpp'
--- modules/Ubuntu/Components/plugin/qmlthemeloader.cpp	2012-12-07 15:04:12 +0000
+++ modules/Ubuntu/Components/plugin/qmlthemeloader.cpp	2013-01-14 14:26:22 +0000
@@ -19,7 +19,6 @@
 #include "themeengine.h"
 #include "themeengine_p.h"
 #include "qmlthemeloader_p.h"
-#include "rule.h"
 #include <QtQml/QQmlEngine>
 #include <QtQml/QQmlContext>
 #include <QtQml/QQmlComponent>
@@ -85,6 +84,28 @@
 }
 
 /*!
+ * \internal
+ * Create a QQmlComponent from a given QML string using the given engine
+ */
+QQmlComponent *createComponent(QQmlEngine *engine, const QString &qmlCode)
+{
+    if (qmlCode.isEmpty())
+        return 0;
+
+    QQmlComponent *ret = new QQmlComponent(engine);
+    ret->setData(qmlCode.toLatin1(), QUrl());
+    if (ret->isError() || !ret->isReady()) {
+        QString errorString = ret->isError() ? ret->errorString() : "Component not ready";
+        ThemeEnginePrivate::setError(QString("Error on creating style rule: \n%2\n%3")
+                                     .arg(qmlCode)
+                                     .arg(errorString));
+        delete ret;
+        ret = 0;
+    }
+    return ret;
+}
+
+/*!
  * \brief QmlThemeLoader::urlMacro resolves the QmlTheme url() macro.
  */
 QString QmlThemeLoader::urlMacro(const QString &param, const QTextStream &stream)
@@ -433,8 +454,8 @@
 
 bool QmlThemeLoader::generateStyleQml()
 {
-    QString style;
-    QString delegate;
+    QString styleQml;
+    QString delegateQml;
 
     // go through the selector map and build the styles to each
     QHashIterator<Selector, QHash<QString, QString> > i(selectorTable);
@@ -443,25 +464,17 @@
         Selector selector = i.key();
         PropertyHash properties = i.value();
 
-        buildStyleAndDelegate(selector, properties, style, delegate);
+        buildStyleAndDelegate(selector, properties, styleQml, delegateQml);
 
         // normalize selector so we build the Rule with the proper one
         normalizeSelector(selector);
 
-        // creating components from internal QML source is synchronous, unless
-        // one of the imported elements require threaded loading. Therefore we use
-        // Rule to create style and delegate components so Rule can handle
-        // asynchronous completion of those.
-
-        Rule *rule = new Rule(m_engine,
-                                ThemeEnginePrivate::selectorToString(selector),
-                                style,
-                                delegate);
-        if (!ThemeEngine::instance()->error().isEmpty()) {
-            delete rule;
+        QQmlComponent *style = createComponent(m_engine, styleQml);
+        QQmlComponent *delegate = createComponent(m_engine, delegateQml);
+        if (!style && !delegate) {
             return false;
-        } else
-            styleTree->addStyleRule(selector, rule);
+        }
+        styleTree->addStyleRule(selector, style, delegate);
     }
 
     return true;

=== removed file 'modules/Ubuntu/Components/plugin/rule.cpp'
--- modules/Ubuntu/Components/plugin/rule.cpp	2012-11-20 10:07:44 +0000
+++ modules/Ubuntu/Components/plugin/rule.cpp	1970-01-01 00:00:00 +0000
@@ -1,382 +0,0 @@
-/*
- * Copyright 2012 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * 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 Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Zsombor Egri <[e-mail]>
- */
-
-#include "rule.h"
-#include "rule_p.h"
-#include "themeengine.h"
-#include "themeengine_p.h"
-#include <QtQml/QQmlEngine>
-#include <QtQml/QQmlContext>
-#include <QtCore/QString>
-
-/*!
-  \qmltype Rule
-  \internal
-  \inqmlmodule Ubuntu.Components 0.1
-  \ingroup theming
-  \brief The Rule element defines the styling rule to be applied when a item
-  satisfies the conditions specified by the rule. The condition is specified by
-  the selector property, using the CSS selector syntax.
-
-  The following example defines a style rule that is applied on "frame" style
-  class items. items satisfying the condition will use visuals defined in
-  the delegate property and configured based on the values set by the style
-  component.
-
-  \qml
-  // Snapshot of a theme file
-  import QtQuick 2.0
-  import Ubuntu.Components 0.1
-
-  Item {
-      Rule {
-        selector: ".frame"
-        style: QtObject {
-          property color color: "lightgray"
-          property color frameColor: "blue"
-        }
-        delegate: Component {
-          Rectangle {
-            anchors.fill: item
-            color: itemStyle.color
-            radius: 5
-            border {
-              width: 2
-              color: itemStyle.frameColor
-            }
-          }
-        }
-      }
-  }
-  \endqml
-
-
-  Rules can be declared either in a theme or in a ItemStyleAttached, in which case the
-  style will be private for the item, and the item won't load any style from
-  the themes.
-
-  The theming subsystem declares the context property called "item" through which
-  styles can access the targetted item properties, states, signals and functions,
-  everything that is declared public in the item.
-
-  There can be cases when the content of the item is anchored to the visuals or
-  when the content of a item needs to stand on top of the visuals. In these cases
-  delegates can declare an item, which will hold all the item content (item
-  children) and name it as "contentItem". The theming engine will search for this
-  property and if found, will reparent the item content to it.
-
-  Example:
-  \qml
-
-      Rule {
-        selector: ".frame"
-        style: QtObject {
-            property color color: "lightgray"
-            property color frameColor: "blue"
-        }
-        delegate: Component {
-            Rectangle {
-                property alias contentItem: body
-                anchors.fill: item
-                color: itemStyle.color
-                radius: 5
-                border {
-                    width: 2
-                    color: itemStyle.frameColor
-                }
-                Item {
-                    id: body
-                    anchors.fill: parent
-                    anchors.margins: 10
-                }
-            }
-        }
-      }
-
-  \endqml
-  In this example all item content to which the style is applied will get
-  reparented to the body item.
-*/
-
-/*!
-  \preliminary
-  \qmlsignal Rule::ruleChanged()
-  Emitted when the rule creation gets completed.
-*/
-
-
-RulePrivate::RulePrivate(Rule *qq) :
-    q_ptr(qq),
-    style(0),
-    delegate(0),
-    qmlThemeStyle(false)
-{
-}
-
-/*
-  Alternate constructor used in ".qmltheme" styles, when style and delegate component creation may be delayed.
-  */
-RulePrivate::RulePrivate(Rule *qq, QQmlEngine *engine, const QString &selector, const QString &styleRule, const QString &delegateRule) :
-    q_ptr(qq),
-    style(0),
-    delegate(0),
-    selector(selector),
-    styleQml(styleRule),
-    delegateQml(delegateRule),
-    qmlThemeStyle(true)
-{
-    // create style component
-    if (!styleQml.isEmpty())
-        createComponent(engine, styleQml, &style);
-
-    // create delegate component
-    if (!delegateQml.isEmpty())
-        createComponent(engine, delegateQml, &delegate);
-}
-
-/*
-  Destroys style and delegate components in case the rule was created by a ".qmltheme" theme.
-  */
-RulePrivate::~RulePrivate()
-{
-    if (qmlThemeStyle) {
-        if (!style)
-            delete style;
-        style = 0;
-        if (delegate)
-            delete delegate;
-        delegate = 0;
-    }
-}
-
-/*
-  Initiates component creation for a given QML code
-  */
-void RulePrivate::createComponent(QQmlEngine *engine, const QString &qmlCode, QQmlComponent **component)
-{
-    *component = new QQmlComponent(engine);
-    (*component)->setData(qmlCode.toLatin1(), QUrl());
-    if ((*component)->isLoading() && !(*component)->isError()) {
-        QObject::connect(*component, SIGNAL(statusChanged(QQmlComponent::Status)), q_ptr, SLOT(_q_componentCompleted(QQmlComponent::Status)));
-    } else
-        completeComponent(*component);
-}
-
-/*
-  Completes (style or delegate) component creation. If both created style and
-  delegate components are ready, emits the ruleChanged signal to update ItemStyleAttacheds.
-  */
-void RulePrivate::completeComponent(QQmlComponent *sender)
-{
-    Q_ASSERT_X(sender, Q_FUNC_INFO, "Cannot have NULL component");
-    if (sender->isError()) {
-        ThemeEnginePrivate::setError(QString("Error on creating rule for selector[%1]: \n%2\n%3")
-                                     .arg(selector)
-                                     .arg((sender == style) ? styleQml : delegateQml)
-                                     .arg(sender->errorString()));
-    } else if (!sender->isReady()) {
-        ThemeEnginePrivate::setError(QString("Component not ready for selector[%1] \n%2\n%3")
-                                     .arg(selector)
-                                     .arg((sender == style) ? styleQml : delegateQml)
-                                     .arg(sender->errorString()));
-    } else {
-        bool styleCompleted = false, delegateCompleted = false;
-        if (!style || (style && (style->status() == QQmlComponent::Ready)))
-            styleCompleted = true;
-        if (!delegate || (delegate && (delegate->status() == QQmlComponent::Ready)))
-            delegateCompleted = true;
-        if (styleCompleted && delegateCompleted) {
-            Q_Q(Rule);
-            Q_EMIT q->ruleChanged();
-        }
-    }
-}
-
-/*
-  Slot completing the component (style or delegate) creation. Calls completeComponent
-  with the signal sender.
-  */
-void RulePrivate::_q_componentCompleted(QQmlComponent::Status)
-{
-    Q_Q(Rule);
-    QQmlComponent *sender = qobject_cast<QQmlComponent*>(q->sender());
-    completeComponent(sender);
-}
-
-/*=============================================================================
-=============================================================================*/
-
-/*!
-  \class Rule rule.h
-
-  \internal
-*/
-
-/*!
-  Creates the rule element. This is used when QML theme file format is loaded.
-  */
-Rule::Rule(QObject *parent) :
-    QObject(parent),
-    d_ptr(new RulePrivate(this))
-{}
-
-/*!
-  Creates rule element used when QmlTheme format themes are loaded. The style and delegate
-  components are created by the rule element as delayed completion can occur.
-  */
-Rule::Rule(QQmlEngine *engine, const QString &selector, const QString &styleRule, const QString &delegateRule, QObject *parent) :
-    QObject(parent),
-    d_ptr(new RulePrivate(this, engine, selector, styleRule, delegateRule))
-{}
-
-/*!
-  */
-Rule::~Rule()
-{}
-
-/*!
-  */
-void Rule::classBegin()
-{
-    // from QQmlParserStatus
-}
-
-/*!
-  */
-void Rule::componentComplete()
-{
-    // trigger changed signal; this is needed when developer defines a private Rule
-    // for a item so property bindings done with the rule are updated
-    Q_EMIT ruleChanged();
-}
-
-/*!
-  Creates a style object in the \a context. Use this method instead of creating
-  style objects straight from the style component, as this one checks the readyness
-  of the style component of the rule.
-  */
-QObject *Rule::createStyle(QQmlContext *context)
-{
-    Q_D(Rule);
-    if (d->qmlThemeStyle && d->style && (d->style->status() != QQmlComponent::Ready)) {
-        ThemeEnginePrivate::setError(QString("Style not ready for [%1]\n%2")
-                                     .arg(d->selector)
-                                     .arg(d->styleQml));
-        return 0;
-    }
-    return d->style ? d->style->create(context) : 0;
-}
-
-/*!
-  Creates the visuals item in the \a context. Use this method instead of creating
-  visuals straight from the delegate component, as this one checks the readyness
-  of the delegate component of the rule.
-  */
-QQuickItem *Rule::createDelegate(QQmlContext *context)
-{
-    Q_D(Rule);
-    if (d->qmlThemeStyle && d->delegate && (d->delegate->status() != QQmlComponent::Ready)) {
-        ThemeEnginePrivate::setError(QString("Delegate not ready for [%1]\n%2")
-                                     .arg(d->selector)
-                                     .arg(d->delegateQml));
-        return 0;
-    }
-    return d->delegate ? qobject_cast<QQuickItem*>(d->delegate->create(context)) : 0;
-}
-
-
-/*!
-  \qmlproperty string Rule::selector
-  This property holds the rule selector. The selector syntax follows some elements
-  of the CSS-selector syntax as specified in W3C specifications as follows:
-    - Type selectors, e.g: "Button"
-    - Descendant selectors, e.g: "Dialog Button"
-    - Child selectors, e.g: "Dialog > Button"
-    - ID selectors, e.g: "Button#mySpecialButton"
-    - Grouping, e.g: "Button#foo, Checkbox, #bar"
-  */
-
-/*!
-  Rule selector value
-  */
-QString Rule::selector() const
-{
-    Q_D(const Rule);
-    return d->selector;
-}
-
-/*!
-  Sets the rule selector value
-  */
-void Rule::setSelector(const QString &selector)
-{
-    Q_D(Rule);
-    d->selector = selector;
-}
-
-/*!
-  \qmlproperty Component Rule::style
-  This property holds the style configuration component. The style configuration
-  component usually is a QtObject or a derivate of a QtObject, which enumerates
-  the properties that can be configured on the rule delegate. A valid Rule must
-  have either style or delegate, or both style and delegate set.
-  */
-/*!
-  Rule style.
-  */
-QQmlComponent *Rule::style()
-{
-    Q_D(const Rule);
-    return d->style;
-}
-
-/*!
-  Sets the style property
-  */
-void Rule::setStyle(QQmlComponent *style)
-{
-    Q_D(Rule);
-    d->style = style;
-}
-
-/*!
-  \qmlproperty Component Rule::delegate
-  This property holds the visuals component of the style. items implementations
-  can decide on the separation of the visuals, either partially or completely.
-  It is not mandatory for a item to rely fully on the visuals defined in themes.
-  */
-
-/*!
-  Rule delegate.
-  */
-QQmlComponent *Rule::delegate()
-{
-    Q_D(const Rule);
-    return d->delegate;
-}
-
-/*!
-  Sets the delegate property value
-  */
-void Rule::setDelegate(QQmlComponent *delegate)
-{
-    Q_D(Rule);
-    d->delegate = delegate;
-}
-
-#include "moc_rule.cpp"

=== removed file 'modules/Ubuntu/Components/plugin/rule.h'
--- modules/Ubuntu/Components/plugin/rule.h	2012-10-18 13:15:24 +0000
+++ modules/Ubuntu/Components/plugin/rule.h	1970-01-01 00:00:00 +0000
@@ -1,75 +0,0 @@
-/*
- * Copyright 2012 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * 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 Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Zsombor Egri <[e-mail]>
- */
-
-#ifndef STYLE_H
-#define STYLE_H
-
-#include <QtCore/QObject>
-#include <QtCore/QStringList>
-#include <QtQuick/QQuickItem>
-#include <QtQml/QQmlParserStatus>
-
-class RulePrivate;
-class QQmlComponent;
-class QQmlEngine;
-class Rule : public QObject, public QQmlParserStatus
-{
-    Q_OBJECT
-    Q_INTERFACES(QQmlParserStatus)
-
-    Q_PROPERTY(QString selector READ selector WRITE setSelector)
-    Q_PROPERTY(QQmlComponent *style READ style WRITE setStyle)
-    Q_PROPERTY(QQmlComponent *delegate READ delegate WRITE setDelegate)
-
-public:
-    Rule(QObject *parent = 0);
-    Rule(QQmlEngine *engine, const QString &selector, const QString &styleRule, const QString &delegateRule, QObject *parent = 0);
-    ~Rule();
-
-    void classBegin();
-    void componentComplete();
-
-    //create objects from style
-    QObject *createStyle(QQmlContext *context);
-    QQuickItem *createDelegate(QQmlContext *context);
-
-    //internal
-
-Q_SIGNALS:
-    // the signal is emitted once the rule is completed
-    void ruleChanged();
-
-public Q_SLOTS:
-
-public: //getters
-    QString selector() const;
-    QQmlComponent *style();
-    QQmlComponent *delegate();
-private: //setters
-    void setSelector(const QString &selector);
-    void setStyle(QQmlComponent *style);
-    void setDelegate(QQmlComponent *delegate);
-
-private:
-    Q_DISABLE_COPY(Rule)
-    Q_DECLARE_PRIVATE(Rule)
-    QScopedPointer<RulePrivate> d_ptr;
-    Q_PRIVATE_SLOT(d_func(), void _q_componentCompleted(QQmlComponent::Status))
-};
-
-#endif // STYLE_H

=== removed file 'modules/Ubuntu/Components/plugin/rule_p.h'
--- modules/Ubuntu/Components/plugin/rule_p.h	2012-10-18 13:15:24 +0000
+++ modules/Ubuntu/Components/plugin/rule_p.h	1970-01-01 00:00:00 +0000
@@ -1,47 +0,0 @@
-/*
- * Copyright 2012 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * 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 Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Zsombor Egri <[e-mail]>
- */
-
-#ifndef STYLE_P_H
-#define STYLE_P_H
-
-#include "rule.h"
-
-class RulePrivate
-{
-    Q_DECLARE_PUBLIC(Rule)
-
-public:
-    RulePrivate(Rule *qq);
-    RulePrivate(Rule *qq, QQmlEngine *engine, const QString &selector, const QString &styleRule, const QString &delegateRule);
-    ~RulePrivate();
-
-    Rule *q_ptr;
-
-    QQmlComponent *style;
-    QQmlComponent *delegate;
-    QString selector;
-    QString styleQml;
-    QString delegateQml;
-    bool qmlThemeStyle;
-
-    void createComponent(QQmlEngine *engine, const QString &rule, QQmlComponent **component);
-    void completeComponent(QQmlComponent *sender);
-    void _q_componentCompleted(QQmlComponent::Status);
-};
-
-#endif // STYLE_P_H

=== modified file 'modules/Ubuntu/Components/plugin/suffixtree.cpp'
--- modules/Ubuntu/Components/plugin/suffixtree.cpp	2012-10-24 10:41:44 +0000
+++ modules/Ubuntu/Components/plugin/suffixtree.cpp	2013-01-14 14:26:22 +0000
@@ -18,7 +18,6 @@
 
 #include "themeengine.h"
 #include "themeengine_p.h"
-#include "rule.h"
 #include "suffixtree_p.h"
 #include <QtQml/QQmlEngine>
 #include <QtQml/QQmlContext>
@@ -34,7 +33,8 @@
 */
 
 SelectorNode::SelectorNode() :
-    relationship(Descendant)
+    relationship(Descendant),
+    sensitivity(Normal)
 {}
 /*!
     \internal
@@ -61,6 +61,10 @@
         result += "> ";
     if (!styleClass.isEmpty())
         result += "." + styleClass;
+    else if (!className.isEmpty()) {
+        qDebug() << "use" << className;
+        result += '.' + className;
+    }
     if (((sensitivity & IgnoreStyleId) !=  IgnoreStyleId) && !styleId.isEmpty())
         result += "#" + styleId;
     return result;
@@ -68,7 +72,10 @@
 
 bool SelectorNode::operator==(const SelectorNode &other)
 {
-    bool ret = (styleClass == other.styleClass) &&
+    QString myClass = (styleClass.isEmpty()) ? className : styleClass;
+    QString otherClass = (other.styleClass.isEmpty()) ? other.className : other.styleClass;
+
+    bool ret = (myClass == otherClass) &&
                (((sensitivity & IgnoreStyleId) ==  IgnoreStyleId) ? true : styleId == other.styleId) &&
                (((sensitivity & IgnoreRelationship) ==  IgnoreRelationship) ? true : relationship == other.relationship);
     return ret;
@@ -85,12 +92,12 @@
 
 
 StyleTreeNode::StyleTreeNode(StyleTreeNode *parent) :
-    parent(parent), styleNode("", "", SelectorNode::Descendant), styleRule(0)
+    parent(parent), styleNode("", "", SelectorNode::Descendant), style(0), delegate(0)
 {
 }
 
-StyleTreeNode::StyleTreeNode(StyleTreeNode *parent, const SelectorNode &node, Rule *styleRule) :
-    parent(parent), styleNode(node), styleRule(styleRule)
+StyleTreeNode::StyleTreeNode(StyleTreeNode *parent, const SelectorNode &node, QQmlComponent *style, QQmlComponent *delegate) :
+    parent(parent), styleNode(node), style(style), delegate(delegate)
 {
 }
 
@@ -116,7 +123,7 @@
   \internal
   Adds a style rule to the style tree based on the selector path specified.
   */
-void StyleTreeNode::addStyleRule(const Selector &path, Rule *styleRule)
+void StyleTreeNode::addStyleRule(const Selector &path, QQmlComponent *style, QQmlComponent *delegate)
 {
     Selector sparePath = path;
     SelectorNode nextNode = path.last();
@@ -130,26 +137,49 @@
         // check if we have the node already, as it could be part of a previous path that
         // had not yet have a style set
         if (children.contains(nodeKey)) {
-            children.value(nodeKey)->styleRule = styleRule;
+            StyleTreeNode *node = children.value(nodeKey);
+            node->style = style;
+            node->delegate = delegate;
         } else {
             // new leaf
-            StyleTreeNode * node = new StyleTreeNode(this, nextNode, styleRule);
+            StyleTreeNode * node = new StyleTreeNode(this, nextNode, style, delegate);
             children.insert(nodeKey, node);
         }
     } else {
         // check if we have the node in the hash
         if (children.contains(nodeKey)) {
-            children.value(nodeKey)->addStyleRule(sparePath, styleRule);
+            children.value(nodeKey)->addStyleRule(sparePath, style, delegate);
         } else {
-            // new node
-            StyleTreeNode *node = new StyleTreeNode(this, nextNode, 0);
+            // new intermediate node
+            StyleTreeNode *node = new StyleTreeNode(this, nextNode, 0, 0);
             children.insert(nodeKey, node);
-            node->addStyleRule(sparePath, styleRule);
+            node->addStyleRule(sparePath, style, delegate);
         }
     }
 }
 
 /*!
+ * \internal
+ * The method returns the selector path from the current node built using its parent
+ * nodes.
+ */
+Selector StyleTreeNode::path() const
+{
+    Selector result;
+
+    result << styleNode;
+
+    StyleTreeNode *p = parent;
+    while (p) {
+        if (p->parent)
+            result.append(p->styleNode);
+        p = p->parent;
+    }
+    return result;
+}
+
+
+/*!
   \internal
   Search for the style best matching the item path. The path is parsed from the
   tail as the styles are stored in the tree in suffix form. The \a strict
@@ -165,7 +195,7 @@
   returned for the ".box > .frame > .button" Item. If the theme would have only
   the ".box .frame .button" rule defined, the lookup would not match that rule.
 */
-Rule *StyleTreeNode::lookupStyleRule(const Selector &path, bool strict)
+StyleTreeNode *StyleTreeNode::lookupStyleRule(const Selector &path, bool strict)
 {
     // the spare contains the remainder
     Selector sparePath = path;
@@ -175,17 +205,17 @@
         sparePath.removeLast();
     }
 
+    StyleTreeNode *rule = 0;
+
     // special case: root node forwards the lookup to its children
     if (!parent) {
-        return testNode(nextPathNode, sparePath, strict);
+        rule = testNode(nextPathNode, sparePath, strict);
     } else {
         // check whether we have a child that satisfies the node
         // try to remove elements from the path, maybe we still can get a match
-        while (true) {
-            Rule *rule = testNode(nextPathNode, sparePath, strict);
-            if (rule)
-                return rule;
-            if (!sparePath.isEmpty()) {
+        while (!rule) {
+            rule = testNode(nextPathNode, sparePath, strict);
+            if (!rule && !sparePath.isEmpty()) {
                 nextPathNode = sparePath.last();
                 sparePath.removeLast();
             } else
@@ -194,41 +224,35 @@
     }
 
     // we have consumed the path, return the style from the node/leaf
-    return styleRule;
+    if (!rule && (style || delegate))
+        rule = this;
+
+    return rule;
 }
 
 /*!
   \internal
   Test whether a child matches the criteria
 */
-Rule *StyleTreeNode::testNode(SelectorNode &nextNode, const Selector &sparePath, bool &strict)
+StyleTreeNode *StyleTreeNode::testNode(SelectorNode &nextNode, const Selector &sparePath, bool &strict)
 {
-    Rule *rule = 0;
+    StyleTreeNode *rule = 0;
     QString nodeKey = nextNode.toString();
+
     if (children.contains(nodeKey)) {
         rule = children.value(nodeKey)->lookupStyleRule(sparePath, strict);
     }
-    //if (!rule && !strict && (nextNode.relationship == SelectorNode::Child)) {
-    if (!rule && !strict) {
-        // check if we find something without the style name
-        if (!nextNode.styleId.isEmpty())
-            nextNode.styleId = QString();
-        nodeKey = nextNode.toString();
-        strict = true;
-        if (children.contains(nodeKey)) {
-            rule = children.value(nodeKey)->lookupStyleRule(sparePath, strict);
-        }
-        if (!rule && (nextNode.relationship == SelectorNode::Child)) {
-            // check if the searched node had Child relationship; if yes,
-            // change it to Descendant and look after the style again; if
-            // found, the lookup after this point should be strict
-            nextNode.relationship = SelectorNode::Descendant;
-            nodeKey = nextNode.toString();
-            strict = true;
-            if (children.contains(nodeKey)) {
-                rule = children.value(nodeKey)->lookupStyleRule(sparePath, strict);
-            }
-        }
+    if (!rule && !nextNode.styleId.isEmpty()) {
+        nextNode.sensitivity |= SelectorNode::IgnoreStyleId;
+        nodeKey = nextNode.toString();
+        if (children.contains(nodeKey))
+            rule = children.value(nodeKey)->lookupStyleRule(sparePath, strict);
+    }
+    if (!rule && (nextNode.relationship == SelectorNode::Child)) {
+        nextNode.sensitivity |= SelectorNode::IgnoreRelationship;
+        nodeKey = nextNode.toString();
+        if (children.contains(nodeKey))
+            rule = children.value(nodeKey)->lookupStyleRule(sparePath, strict);
     }
 
     return rule;

=== modified file 'modules/Ubuntu/Components/plugin/suffixtree_p.h'
--- modules/Ubuntu/Components/plugin/suffixtree_p.h	2012-10-22 15:32:04 +0000
+++ modules/Ubuntu/Components/plugin/suffixtree_p.h	2013-01-14 14:26:22 +0000
@@ -19,6 +19,9 @@
 #ifndef SUFFIXTREE_P_H
 #define SUFFIXTREE_P_H
 
+#include <QtCore/QHash>
+#include <QtCore/QString>
+
 // node of a selector
 class SelectorNode {
     public:
@@ -29,9 +32,10 @@
         IgnoreStyleId = 0x02,
         IgnoreAll = IgnoreRelationship | IgnoreStyleId};
     SelectorNode();
-    SelectorNode(const QString &styleClass, const QString &styleId, Relationship relationship, NodeSensitivity sensitivity = Normal);
+    SelectorNode(const QString &styleClass, const QString &styleId, Relationship relationship = Descendant, NodeSensitivity sensitivity = Normal);
     QString toString() const;
     bool operator==(const SelectorNode &other);
+    QString className;
     QString styleClass;
     QString styleId;
     Relationship relationship;
@@ -43,20 +47,23 @@
 uint qHash(const Selector &key);
 
 // style rule tree
+class QQmlComponent;
 class StyleTreeNode {
 public:
     StyleTreeNode(StyleTreeNode *parent = 0);
-    StyleTreeNode(StyleTreeNode *parent, const SelectorNode &node, Rule *styleRule);
+    StyleTreeNode(StyleTreeNode *parent, const SelectorNode &node, QQmlComponent *style, QQmlComponent *delegate);
     ~StyleTreeNode();
     void clear();
-    void addStyleRule(const Selector &path, Rule *styleRule);
-    Rule *lookupStyleRule(const Selector &path, bool strict = false);
-    Rule *testNode(SelectorNode &nextNode, const Selector &sparePath, bool &strict);
+    void addStyleRule(const Selector &path, QQmlComponent *style, QQmlComponent *delegate);
+    Selector path() const;
+    StyleTreeNode *lookupStyleRule(const Selector &path, bool strict = false);
+    StyleTreeNode *testNode(SelectorNode &nextNode, const Selector &sparePath, bool &strict);
 
 public:
     StyleTreeNode *parent;
     SelectorNode styleNode;
-    Rule *styleRule;
+    QQmlComponent *style;
+    QQmlComponent *delegate;
     // the key is the next style node's "relationship class#name" combination
     QHash<QString, StyleTreeNode*> children;
 };

=== modified file 'modules/Ubuntu/Components/plugin/themeengine.cpp'
--- modules/Ubuntu/Components/plugin/themeengine.cpp	2012-11-13 16:19:17 +0000
+++ modules/Ubuntu/Components/plugin/themeengine.cpp	2013-01-14 14:26:22 +0000
@@ -18,11 +18,10 @@
 
 #include "themeengine.h"
 #include "themeengine_p.h"
-#include "rule.h"
 #include "itemstyleattached.h"
+#include "itemstyleattached_p.h"
 #include "themeloader_p.h"
 #include "qmlthemeloader_p.h"
-#include "qmlloader_p.h"
 #include <QtCore/QString>
 #include <QtQml/QQmlEngine>
 #include <QtQml/QJSEngine>
@@ -57,7 +56,8 @@
     themeEngine = q_ptr;
 
     // register theme loaders
-    themeLoaders[".qml"] = new QmlLoader(m_engine);
+    // so far we have one single loader, however keep the design so we can add
+    // more of them later if needed
     themeLoaders[".qmltheme"] = new QmlThemeLoader(m_engine);
 
     // connect theme settings to capture theme updates
@@ -157,61 +157,18 @@
 
 /*!
   \internal
-  Traverses and returns the path from \a obj up to root as a list of class
-  and name pairs, setting the relationship between the selector nodes
-  depending on the relationship between the parent and child, i.e. if a certain
-  ItemStyleAttached's parent is also a ItemStyleAttached, the SelectorNode::Child
-  relation, otherwise SelectorNode::Descendant relation is used.
-
-  The obj is an Item derived element and should have class and name properties
-  to be used if styling happens on them.
-  */
-Selector ThemeEnginePrivate::getSelector(QQuickItem *obj, bool forceClassName) const
-{
-    Selector selector;
-    QQuickItem *parent;
-
-    while (obj) {
-        ItemStyleAttached *style = attachedStyle(obj);
-        QString styleClass = style ? style->styleClass() : QString();
-
-        parent = obj->parentItem();
-
-        // we talk about Child relationship when the parent has styling properties
-        // otherwise we talk about Descendant
-        ItemStyleAttached *parentStyle = attachedStyle(parent);
-        SelectorNode::Relationship relation = parentStyle ?
-                    SelectorNode::Child : SelectorNode::Descendant;
-
-        // if class is not defined, use the component's meta class name
-        if (styleClass.isEmpty() || forceClassName) {
-            styleClass = obj->metaObject()->className();
-            styleClass = styleClass.left(styleClass.indexOf("_QMLTYPE")).toLower();
-        }
-        QString styleId = style->name();
-        if (!styleClass.isEmpty() || !styleId.isEmpty()) {
-            selector.prepend(SelectorNode(styleClass, styleId, relation));
-        }
-
-        // get the next ItemStyleAttached, we don't care the rest
-        while (parent && !parentStyle) {
-            parent = parent->parentItem();
-            parentStyle = attachedStyle(parent);
-        }
-        obj = parent;
-    }
-    return selector;
-}
-
-/*!
-  \internal
-  Wrapper function above the style tree lookup. Exposed for functional testing.
+  This method searches for styling components matching the given selector (style path).
 */
-Rule *ThemeEnginePrivate::styleRuleForPath(const Selector &path)
+StyleTreeNode *ThemeEnginePrivate::styleRuleForPath(const Selector &path)
 {
-    if (!m_styleTree)
+    if (!themeEngine->d_ptr->m_styleTree)
         return 0;
-    Rule *rule = m_styleTree->lookupStyleRule(path);
+    if (themeEngine->d_ptr->m_styleCache.contains(path))
+        return themeEngine->d_ptr->m_styleCache.value(path);
+
+    StyleTreeNode *rule = themeEngine->d_ptr->m_styleTree->lookupStyleRule(path);
+    if (rule)
+        themeEngine->d_ptr->m_styleCache.insert(path, rule);
     return rule;
 }
 
@@ -222,6 +179,36 @@
 
 /*!
   \internal
+  Checks whether the instance can be registered to the given name, and registers it.
+  Removes any previous registration.
+*/
+bool ThemeEnginePrivate::registerName(QQuickItem *item, const QString &newName)
+{
+    bool ret = true;
+
+    // check first whether the next ID is valid and can be registered
+    QString prevName(item->property("name").toString());
+    if (newName.isEmpty()) {
+        // remove the previous occurence
+        if (!prevName.isEmpty())
+            themeEngine->d_ptr->m_instanceCache.remove(prevName);
+    } else {
+        if (themeEngine->d_ptr->m_instanceCache.contains(newName))
+            ret = false;
+        else {
+            // remove the previous occurence
+            if (!prevName.isEmpty())
+                themeEngine->d_ptr->m_instanceCache.remove(prevName);
+            // register instance
+            themeEngine->d_ptr->m_instanceCache.insert(newName, item);
+        }
+    }
+
+    return ret;
+}
+
+/*!
+  \internal
   Sets the error string and emits the signal associated to the public property,
   so error handling is propagated to the UI.
   */
@@ -357,61 +344,6 @@
 }
 
 /*!
-  \internal
-  Checks whether the instance can be registered to the given name, and registers it.
-  Removes any previous registration.
-*/
-bool ThemeEngine::registerName(QQuickItem *item, const QString &newName)
-{
-    Q_D(ThemeEngine);
-    bool ret = true;
-
-    // check first whether the next ID is valid and can be registered
-    QString prevName(item->property("name").toString());
-    if (newName.isEmpty()) {
-        // remove the previous occurence
-        if (!prevName.isEmpty())
-            d->m_instanceCache.remove(prevName);
-    } else {
-        if (d->m_instanceCache.contains(newName))
-            ret = false;
-        else {
-            // remove the previous occurence
-            if (!prevName.isEmpty())
-                d->m_instanceCache.remove(prevName);
-            // register instance
-            d->m_instanceCache.insert(newName, item);
-        }
-    }
-
-    return ret;
-}
-
-/*!
-  \internal
-  This method searches for a Rule element that matches the conditions for an
-  Item. The selector identifying the Rule is built up by traversing the \a item
-  parents and considering only those having ItemStyle elements attached in the hierarchy.
-  */
-Rule *ThemeEngine::lookupStyleRule(QQuickItem *item, bool forceClassName)
-{
-    Q_D(ThemeEngine);
-
-    Selector path = d->getSelector(item, forceClassName);
-
-    // check whether we have the path cached
-    if (d->m_styleCache.contains(path)) {
-        return d->m_styleCache.value(path);
-    }
-    Rule *rule = d->styleRuleForPath(path);
-    if (rule) {
-        // cache the rule
-        d->m_styleCache.insert(path, rule);
-    }
-    return rule;
-}
-
-/*!
   \preliminary
   \qmlmethod bool Theme::loadTheme(const QUrl &themeFile)
   Loads a theme file from any location, and updates the \a currentTheme property

=== modified file 'modules/Ubuntu/Components/plugin/themeengine.h'
--- modules/Ubuntu/Components/plugin/themeengine.h	2012-10-24 16:03:03 +0000
+++ modules/Ubuntu/Components/plugin/themeengine.h	2013-01-14 14:26:22 +0000
@@ -21,8 +21,8 @@
 
 #include <QtCore/QObject>
 #include <QtCore/QUrl>
+#include "suffixtree_p.h"
 
-class Rule;
 class QQmlEngine;
 class QJSEngine;
 class QQuickItem;
@@ -42,9 +42,6 @@
     static QObject *initializeEngine(QQmlEngine *engine);
     static ThemeEngine *instance();
 
-    bool registerName(QQuickItem *item, const QString &newId);
-    Rule *lookupStyleRule(QQuickItem *item, bool forceClassName = false);
-
     // getter/setters
     QString error() const;
     void resetError();

=== modified file 'modules/Ubuntu/Components/plugin/themeengine_p.h'
--- modules/Ubuntu/Components/plugin/themeengine_p.h	2012-11-08 10:51:41 +0000
+++ modules/Ubuntu/Components/plugin/themeengine_p.h	2013-01-14 14:26:22 +0000
@@ -50,7 +50,7 @@
     QQmlEngine *m_engine;
     // suffix tree for the styles
     StyleTreeNode *m_styleTree;
-    QHash<Selector, Rule*> m_styleCache;
+    QHash<Selector, StyleTreeNode*> m_styleCache;
     InstanceHash m_instanceCache;
     QStringList importPaths;
     QMap<QString, ThemeLoader*> themeLoaders;
@@ -66,10 +66,10 @@
     void removeWatchedFiles();
     void addWatchedFiles(const QStringList &watchedThemeFiles);
     void loadTheme(const QUrl &themeFile);
-    Selector getSelector(QQuickItem *obj, bool forceClassName) const;
-    Rule *styleRuleForPath(const Selector &path);
 
     // utility functions that are independent from the instance
+    static StyleTreeNode *styleRuleForPath(const Selector &path);
+    static bool registerName(QQuickItem *item, const QString &newName);
     static void setError(const QString &error);
     static ItemStyleAttached *attachedStyle(QObject *obj);
     static QString selectorToString(const Selector &path);

=== modified file 'tests/resources/test.qmltheme'
--- tests/resources/test.qmltheme	2012-12-07 15:04:12 +0000
+++ tests/resources/test.qmltheme	2013-01-14 14:26:22 +0000
@@ -3,9 +3,6 @@
 @qml-mapping(.baseA, , Item);
 @qml-mapping(.testA .baseA, , Text);
 
-@qml-import("test", .);
-@qml-import("test2", .);
-
 .baseA {
     test_base_A_A: "new:: test.qmltheme/.baseA";
     prop_baseA_A: "overload:: test.qmltheme/.baseA";

=== modified file 'tests/unit/tst_theme_engine/tst_theme_enginetest.cpp'
--- tests/unit/tst_theme_engine/tst_theme_enginetest.cpp	2012-11-20 18:00:45 +0000
+++ tests/unit/tst_theme_engine/tst_theme_enginetest.cpp	2013-01-14 14:26:22 +0000
@@ -31,7 +31,6 @@
 
 #include "themeengine.h"
 #include "themeengine_p.h"
-#include "rule.h"
 #include "itemstyleattached.h"
 
 class tst_ThemeEngine : public QObject
@@ -46,9 +45,7 @@
     void cleanupTestCase();
 
     void testCase_initializeEngine();
-    void testCase_registerName();
     void testCase_loadTheme();
-    void testCase_lookupStyleRule();
     void testCase_reparenting();
     void testCase_blockDeclaration();
     void testCase_selectorDelegates();
@@ -91,28 +88,6 @@
     QCOMPARE(result, true);
 }
 
-void tst_ThemeEngine::testCase_registerName()
-{
-    ThemeEngine::instance()->resetError();
-    QQuickItem *item = new QQuickItem(0);
-    // first time must pass
-    bool result = ThemeEngine::instance()->registerName(item, "test");
-    QCOMPARE(result, true);
-    // second time should fail
-    result = ThemeEngine::instance()->registerName(item, "test");
-    QCOMPARE(result, false);
-    // this should pass always
-    result = ThemeEngine::instance()->registerName(item, QString());
-    QCOMPARE(result, true);
-    delete item;
-}
-
-void tst_ThemeEngine::testCase_lookupStyleRule()
-{
-    //ThemeEngine::lookupStyleRule requires a complete QML environment therefore its
-    // functionality will be tested using its privates
-}
-
 void tst_ThemeEngine::testCase_loadTheme()
 {
     ThemeEngine::instance()->resetError();

=== modified file 'tests/unit/tst_theme_engine_private/tst_theme_engine_privatetest.cpp'
--- tests/unit/tst_theme_engine_private/tst_theme_engine_privatetest.cpp	2012-11-14 07:24:18 +0000
+++ tests/unit/tst_theme_engine_private/tst_theme_engine_privatetest.cpp	2013-01-14 14:26:22 +0000
@@ -22,11 +22,12 @@
 #include <QtCore/QCoreApplication>
 #include <QtQml/QQmlEngine>
 #include <QtQuick/QQuickView>
+#include <QtQuick/QQuickItem>
 
 #include "themeengine.h"
 #include "themeengine_p.h"
 #include "itemstyleattached.h"
-#include "rule.h"
+#include "suffixtree_p.h"
 
 class tst_ThemeEnginePrivate : public QObject
 {
@@ -38,6 +39,7 @@
 private Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
+    void testCase_registerName();
     void testCase_loadTheme();
     void testCase_urlMacro();
     void testCase_styleRuleForPath();
@@ -64,10 +66,7 @@
     // declarative does not create the Rule objects but QObjects, and does
     // not give any error...
 
-    const char *uri = QString("Ubuntu.Components").toLatin1();
     ThemeEngine::initializeEngine(quickEngine);
-    qmlRegisterType<Rule>(uri, 0, 1, "Rule");
-    qmlRegisterType<ItemStyleAttached>(uri, 0, 1, "ItemStyle");
 
     // engine privates can be created with its public class; therefore
     // we create an engine class and use its privates
@@ -78,6 +77,22 @@
 {
 }
 
+void tst_ThemeEnginePrivate::testCase_registerName()
+{
+    ThemeEngine::instance()->resetError();
+    QQuickItem *item = new QQuickItem(0);
+    // first time must pass
+    bool result = ThemeEnginePrivate::registerName(item, "test");
+    QCOMPARE(result, true);
+    // second time should fail
+    result = ThemeEnginePrivate::registerName(item, "test");
+    QCOMPARE(result, false);
+    // this should pass always
+    result = ThemeEnginePrivate::registerName(item, QString());
+    QCOMPARE(result, true);
+    delete item;
+}
+
 void tst_ThemeEnginePrivate::testCase_loadTheme()
 {
     engine->errorString = QString();
@@ -102,11 +117,11 @@
     engine->loadTheme(themeFile);
 
     Selector selector = engine->parseSelector(".baseA")[0];
-    Rule *rule = engine->styleRuleForPath(selector);
+    StyleTreeNode *rule = engine->styleRuleForPath(selector);
     QVERIFY2(rule, "Failure");
     if (rule) {
         // create style from the rule so we can check the validity of the URLs
-        QObject *style = rule->createStyle(quickEngine->rootContext());
+        QObject *style = rule->style ? rule->style->create(quickEngine->rootContext()) : 0;
         QVERIFY2(style, "FAILURE");
 
         QString url = style->property("prop_baseA_A").toString();
@@ -143,13 +158,13 @@
     QCOMPARE(engine->errorString, QString());
 
     bool result = true;
-    Rule *rule;
+    StyleTreeNode *rule;
     Selector path, expected;
 
     path << SelectorNode("baseA", "", SelectorNode::Descendant);
     rule = engine->styleRuleForPath(path);
     // should pass
-    result = (rule != 0) && (engine->parseSelector(rule->selector())[0] == path);
+    result = (rule != 0) && (rule->path() == path);
     QCOMPARE(result, true);
 
     path.clear();
@@ -157,7 +172,7 @@
     path << SelectorNode("baseA", "", SelectorNode::Descendant);
     rule = engine->styleRuleForPath(path);
     // should pass
-    result = (rule != 0) && (engine->parseSelector(rule->selector())[0] == path);
+    result = (rule != 0) && (rule->path() == path);
     QCOMPARE(result, true);
 
     path.clear();
@@ -167,7 +182,7 @@
     expected << SelectorNode("baseA", "", SelectorNode::Descendant);
     rule = engine->styleRuleForPath(path);
     // should pass, but should be ".testA .baseA"
-    result = (rule != 0) && (engine->parseSelector(rule->selector())[0] == expected);
+    result = (rule != 0) && (rule->path() == expected);
     QCOMPARE(result, true);
 
     path.clear();
@@ -175,7 +190,7 @@
     path << SelectorNode("baseA", "", SelectorNode::Child);
     rule = engine->styleRuleForPath(path);
     // should pass
-    result = (rule != 0) && (engine->parseSelector(rule->selector())[0] == path);
+    result = (rule != 0) && (rule->path() == path);
     QCOMPARE(result, true);
 
     path.clear();
@@ -183,7 +198,7 @@
     path << SelectorNode("baseA", "", SelectorNode::Descendant);
     rule = engine->styleRuleForPath(path);
     // should fail
-    result = (rule != 0) && !(engine->parseSelector(rule->selector())[0] == path);
+    result = (rule != 0) && (rule->path() != path);
     QCOMPARE(result, true);
 }