Merge lp:~mhr3/unity-scopes-shell/no-more-unity-core into lp:unity-scopes-shell

[Michal Hruby]

Remove support for unity-core based scopes.

Remove support for unity-core based scopes.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:81
http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-ci/87/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-trusty-amd64-ci/87
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-trusty-armhf-ci/87
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-trusty-armhf-ci/87/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-trusty-i386-ci/87

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-ci/87/rebuild

review: Approve (continuous-integration)

[Paweł Stołowski (stolowski)]

+1

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-03-24 13:09:23 +0000
+++ debian/changelog	2014-03-25 16:56:23 +0000
@@ -1,3 +1,9 @@
+unity-scopes-shell (0.4.0+14.04.20140325-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Drop support for unity-core based scopes
+
+ -- Michal Hruby <[e-mail]>  Tue, 25 Mar 2014 16:48:16 +0000
+
 unity-scopes-shell (0.4.0+14.04.20140324-0ubuntu1) trusty; urgency=low
 
   [ Michal Hruby ]

=== modified file 'debian/control'
--- debian/control	2014-03-06 17:10:12 +0000
+++ debian/control	2014-03-25 16:56:23 +0000
@@ -3,17 +3,14 @@
 Section: libs
 Build-Depends: cmake,
                debhelper (>= 9),
-               libdee-qt5-dev (>= 3.2),
-               libglib2.0-dev,
                libunity-api-dev,
-               libunity-core-6.0-dev (>= 7.1.2+14.04.20140213),
                libunity-scopes-dev (>= 0.4.0~),
                pkg-config,
                qt5-default,
                qtdeclarative5-dev,
                qtdeclarative5-dev-tools,
                qtdeclarative5-qtquick2-plugin,
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Maintainer: Ubuntu Developers <[e-mail]>
 Homepage: https://launchpad.net/unity-scopes-shell
 # if you don't have have commit access to this branch but would like to upload
@@ -28,7 +25,6 @@
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         qtdeclarative5-dee-plugin,
 Provides: unity-scopes-impl,
           unity-scopes-impl-0,
 Breaks: unity8-private (<< 7.84)

=== modified file 'src/Unity/CMakeLists.txt'
--- src/Unity/CMakeLists.txt	2014-02-19 17:43:25 +0000
+++ src/Unity/CMakeLists.txt	2014-03-25 16:56:23 +0000
@@ -3,66 +3,36 @@
 
 # Dependencies
 include(FindPkgConfig)
-pkg_check_modules(QTDEE REQUIRED libdee-qt5>=3.2)
-pkg_check_modules(UNITYCORE REQUIRED unity-core-6.0>=7.1.1)
-pkg_check_modules(SCOPESLIB REQUIRED libunity-scopes>=0.3.1)
+pkg_check_modules(SCOPESLIB REQUIRED libunity-scopes>=0.4.0)
 
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_BINARY_DIR}
-    ${QTDEE_INCLUDE_DIRS}
-    ${UNITYCORE_INCLUDE_DIRS}
     ${SCOPESLIB_INCLUDE_DIRS}
 )
 
 set(QMLPLUGIN_SRC
-    abstractfilteroption.cpp
+    categories.cpp
+    collectors.cpp
+    previewmodel.cpp
+    previewstack.cpp
+    previewwidgetmodel.cpp
+    resultsmodel.cpp
     scope.cpp
     scopes.cpp
-    categories.cpp
-    checkoptionfilter.cpp
-    filter.cpp
-    filteroption.cpp
-    filters.cpp
-    genericoptionsmodel.cpp
-    ratingoptionsmodel.cpp
-    unityoptionsmodel.cpp
-    categoryresults.cpp
+    utils.cpp
     plugin.cpp
-    multirangefilter.cpp
-    radiooptionfilter.cpp
-    ratingsfilter.cpp
-    ratingfilteroption.cpp
-    applicationpreview.cpp
-    genericpreview.cpp
-    moviepreview.cpp
-    musicpreview.cpp
-    musicpreviewtrackmodel.cpp
-    preview.cpp
-    previewaction.cpp
-    previewinfohint.cpp
-    result.cpp
-    showallfilteroption.cpp
-    signalslist.cpp
-    socialpreview.cpp
-    socialpreviewcomment.cpp
     iconutils.cpp
-    variantutils.cpp
 )
 
-add_subdirectory(scopes-ng)
-
 add_library(Unity-qml SHARED ${QMLPLUGIN_SRC})
 
 target_link_libraries(Unity-qml
-    ${QTDEE_LDFLAGS}
-    ${UNITYCORE_LDFLAGS}
     ${SCOPESLIB_LDFLAGS}
-    ScopesNG-qml
     )
 
 qt5_use_modules(Unity-qml Qml Gui DBus)
 
 # export the qmldir qmltypes and plugin files
 export_qmlfiles(Unity Unity)
-export_qmlplugin(Unity 0.1 Unity TARGETS Unity-qml)
+export_qmlplugin(Unity 0.2 Unity TARGETS Unity-qml)

=== removed file 'src/Unity/abstractfilteroption.cpp'
--- src/Unity/abstractfilteroption.cpp	2013-11-08 17:01:37 +0000
+++ src/Unity/abstractfilteroption.cpp	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * Authors:
- *  Pawel Stolowski <[e-mail]>
- *
- * 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; 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "abstractfilteroption.h"
-
-AbstractFilterOption::AbstractFilterOption(QObject *parent)
-    : QObject(parent)
-{
-}

=== removed file 'src/Unity/abstractfilteroption.h'
--- src/Unity/abstractfilteroption.h	2013-11-08 17:01:37 +0000
+++ src/Unity/abstractfilteroption.h	1970-01-01 00:00:00 +0000
@@ -1,58 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * Authors:
- *  Pawel Stolowski <[e-mail]>
- *
- * 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; 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef ABSTRACTFILTEROPTION_H
-#define ABSTRACTFILTEROPTION_H
-
-// Qt
-#include <QObject>
-#include <QMetaType>
-
-class Q_DECL_EXPORT AbstractFilterOption : public QObject
-{
-    Q_OBJECT
-
-    Q_PROPERTY(QString id READ id NOTIFY idChanged)
-    Q_PROPERTY(QString name READ name NOTIFY nameChanged)
-    Q_PROPERTY(QString iconHint READ iconHint NOTIFY iconHintChanged)
-    Q_PROPERTY(bool active READ active WRITE setActive NOTIFY activeChanged)
-
-public:
-    /* getters */
-    virtual QString id() const = 0;
-    virtual QString name() const = 0;
-    virtual QString iconHint() const = 0;
-    virtual bool active() const = 0;
-
-    /* setters */
-    virtual void setActive(bool active) = 0;
-
-protected:
-    AbstractFilterOption(QObject *parent);
-
-Q_SIGNALS:
-    void idChanged(const QString &);
-    void nameChanged(const QString &);
-    void iconHintChanged(const QString &);
-    void activeChanged(bool);
-};
-
-Q_DECLARE_METATYPE(AbstractFilterOption*)
-
-#endif // ABSTRACTFILTEROPTION_H

=== removed file 'src/Unity/applicationpreview.cpp'
--- src/Unity/applicationpreview.cpp	2013-11-08 17:01:37 +0000
+++ src/Unity/applicationpreview.cpp	1970-01-01 00:00:00 +0000
@@ -1,100 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * Authors:
- *  Pawel Stolowski <[e-mail]>
- *
- * 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; 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-// local
-#include "applicationpreview.h"
-#include "iconutils.h"
-
-#include <QDebug>
-
-ApplicationPreview::ApplicationPreview(QObject *parent):
-    Preview(parent),
-    m_unityAppPreview(nullptr)
-{
-}
-
-QString ApplicationPreview::lastUpdate() const
-{
-    if (m_unityAppPreview) {
-        return QString::fromStdString(m_unityAppPreview->last_update());
-    } else {
-        qWarning() << "Preview not set";
-    }
-    return QString();
-}
-
-QString ApplicationPreview::copyright() const
-{
-    if (m_unityAppPreview) {
-        return QString::fromStdString(m_unityAppPreview->copyright());
-    } else {
-        qWarning() << "Preview not set";
-    }
-    return QString();
-}
-
-QString ApplicationPreview::license() const
-{
-    if (m_unityAppPreview) {
-        return QString::fromStdString(m_unityAppPreview->license());
-    } else {
-        qWarning() << "Preview not set";
-    }
-    return QString();
-}
-
-QString ApplicationPreview::appIcon() const
-{
-    if (m_unityAppPreview) {
-        auto giconString = g_icon_to_string(m_unityAppPreview->app_icon());
-        QString result(gIconToDeclarativeImageProviderString(QString::fromUtf8(giconString)));
-        g_free(giconString);
-        return result;
-    } else {
-        qWarning() << "Preview not set";
-    }
-    return QString();
-}
-
-float ApplicationPreview::rating() const
-{
-    if (m_unityAppPreview) {
-        return m_unityAppPreview->rating();
-    } else {
-        qWarning() << "Preview not set";
-    }
-    return 0.0f;
-}
-
-unsigned int ApplicationPreview::numRatings() const
-{
-    if (m_unityAppPreview) {
-        return m_unityAppPreview->num_ratings();
-    } else {
-        qWarning() << "Preview not set";
-    }
-    return 0;
-}
-
-void ApplicationPreview::setUnityPreview(unity::dash::Preview::Ptr unityPreview)
-{
-    m_unityAppPreview = std::dynamic_pointer_cast<unity::dash::ApplicationPreview>(unityPreview);
-
-    Q_EMIT previewChanged();
-}

=== removed file 'src/Unity/applicationpreview.h'
--- src/Unity/applicationpreview.h	2013-11-08 17:01:37 +0000
+++ src/Unity/applicationpreview.h	1970-01-01 00:00:00 +0000
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * Authors:
- *  Pawel Stolowski <[e-mail]>
- *
- * 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; 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef APPLICATIONPREVIEW_H
-#define APPLICATIONPREVIEW_H
-
-// local
-#include "preview.h"
-
-// Qt
-#include <QObject>
-#include <QMetaType>
-
-// libunity-core
-#include <UnityCore/ApplicationPreview.h>
-
-class Q_DECL_EXPORT ApplicationPreview: public Preview
-{
-    Q_OBJECT
-
-    Q_PROPERTY(QString lastUpdate READ lastUpdate NOTIFY previewChanged)
-    Q_PROPERTY(QString copyright READ copyright NOTIFY previewChanged)
-    Q_PROPERTY(QString license READ license NOTIFY previewChanged)
-    Q_PROPERTY(QString appIcon READ appIcon NOTIFY previewChanged)
-    Q_PROPERTY(float rating READ rating NOTIFY previewChanged)
-    Q_PROPERTY(unsigned int numRatings READ numRatings NOTIFY previewChanged)
-
-public:
-    explicit ApplicationPreview(QObject *parent = 0);
-
-    QString lastUpdate() const;
-    QString copyright() const;
-    QString license() const;
-    QString appIcon() const;
-    float rating() const;
-    unsigned int numRatings() const;
-
-Q_SIGNALS:
-    void previewChanged();
-
-protected:
-    void setUnityPreview(unity::dash::Preview::Ptr unityPreview) override;
-
-private:
-    unity::dash::ApplicationPreview::Ptr m_unityAppPreview;
-};
-
-Q_DECLARE_METATYPE(ApplicationPreview *)
-
-#endif

=== removed file 'src/Unity/categories.cpp'
--- src/Unity/categories.cpp	2013-11-08 17:01:37 +0000
+++ src/Unity/categories.cpp	1970-01-01 00:00:00 +0000
@@ -1,299 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * Authors:
- *  Michał Sawicz <[e-mail]>
- *  Michal Hruby <[e-mail]>
- *
- * 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; 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-// self
-#include "categories.h"
-#include "categoryresults.h"
-#include <QDebug>
-
-// TODO: use something from libunity once it's public
-enum CategoryColumn {
-    ID,
-    DISPLAY_NAME,
-    ICON_HINT,
-    RENDERER_NAME,
-    HINTS
-};
-
-Categories::Categories(QObject* parent)
-    : DeeListModel(parent)
-{
-    m_roles[Categories::RoleCategoryId] = "categoryId";
-    m_roles[Categories::RoleName] = "name";
-    m_roles[Categories::RoleIcon] = "icon";
-    m_roles[Categories::RoleRenderer] = "renderer";
-    m_roles[Categories::RoleContentType] = "contentType";
-    m_roles[Categories::RoleRendererHint] = "rendererHint";
-    m_roles[Categories::RoleProgressSource] = "progressSource";
-    m_roles[Categories::RoleHints] = "hints";
-    m_roles[Categories::RoleResults] = "results";
-    m_roles[Categories::RoleCount] = "count";
-
-    // TODO This should not be needed but accumulatting the count changes
-    // makes the visualization more stable and also makes crashes on fast
-    // change of the search term harder to reproduce
-    m_timer.setSingleShot(true);
-    m_timer.setInterval(50);
-    connect(&m_timer, &QTimer::timeout, this, &Categories::onEmitCountChanged);
-}
-
-DeeListModel*
-Categories::getResults(int index) const
-{
-    if (!m_results.contains(index)) {
-        CategoryResults* results = new CategoryResults(const_cast<Categories*>(this));
-        results->setCategoryIndex(index);
-        connect(results, &DeeListModel::countChanged, this, &Categories::onCountChanged);
-
-        unsigned categoryIndex = static_cast<unsigned>(index);
-        auto unity_results = m_unityScope->GetResultsForCategory(categoryIndex);
-        if (unity_results) {
-            results->setModel(unity_results->model());
-        } else {
-            // No results model returned by unity core; this can be the case when the global
-            // results model of this scope is still not set in unity core. Don't set backend
-            // model in DeeListModel - it will still beahve properly as an empty model. Since
-            // we're connected to the category model change signal, and it is set by unity core
-            // at the same time as results model (on channel opening), we'll reset category
-            // results models with proper models when we're notifed again.
-            qWarning() << "No results model for category" << categoryIndex;
-        }
-
-        m_results.insert(index, results);
-    }
-
-    return m_results[index];
-}
-
-void Categories::onCategoriesModelChanged(unity::glib::Object<DeeModel> model)
-{
-    m_updatedCategories.clear();
-    // FIXME: this might destroy the renderer view and re-create it, optimize?
-    Q_FOREACH(DeeListModel* model, m_results) {
-      delete model;
-    }
-    m_results.clear();
-    m_categoryOrder.clear();
-
-    setModel(model);
-}
-
-void Categories::onCategoryOrderChanged(const std::vector<unsigned int>& cat_order)
-{
-    for (unsigned int pos = 0; pos<cat_order.size(); pos++)
-    {
-        unsigned int cat = cat_order[pos];
-        const int old_pos = m_categoryOrder.indexOf(cat);
-
-        if (old_pos < 0) {
-            qWarning() << "No such category index:" << cat;
-            continue;
-        }
-
-        if (static_cast<int>(pos) != old_pos) {
-            int target_pos = pos;
-            if (target_pos > old_pos)
-                target_pos++;
-            const bool status = beginMoveRows(QModelIndex(), old_pos, old_pos, QModelIndex(), target_pos);
-            if (status)
-                m_categoryOrder.move(old_pos, pos);
-            else
-                qWarning() << "beginMoveRows failed:" << old_pos << target_pos;
-            endMoveRows();
-        }
-    }
-}
-
-void
-Categories::setUnityScope(const unity::dash::Scope::Ptr& scope)
-{
-    m_unityScope = scope;
-
-    // no need to call this, we'll get notified
-    //setModel(m_unityScope->categories()->model());
-
-    m_signals.disconnectAll();
-    m_signals << m_unityScope->categories()->model.changed.connect(sigc::mem_fun(this, &Categories::onCategoriesModelChanged));
-
-    // FIXME: Don't handle category order changes for now as it causes UI issues (https://bugs.launchpad.net/unity8/+bug/1239584).
-    //m_signals << m_unityScope->category_order.changed.connect(sigc::mem_fun(this, &Categories::onCategoryOrderChanged));
-}
-
-void
-Categories::onCountChanged()
-{
-    CategoryResults* results = qobject_cast<CategoryResults*>(sender());
-    if (results) {
-        if (!m_updatedCategories.contains(results->categoryIndex())) {
-            m_updatedCategories << results->categoryIndex();
-        }
-        m_timer.start();
-    }
-}
-
-void Categories::onRowCountChanged()
-{
-    QAbstractItemModel* model = qobject_cast<QAbstractItemModel*>(sender());
-    // find the corresponding category index
-    for (auto iter = m_overriddenCategories.begin(); iter != m_overriddenCategories.end(); ++iter) {
-        if (iter.value() == model) {
-            for (int i = 0; i < rowCount(); i++) {
-                auto id = data(index(i), RoleCategoryId).toString();
-                if (id != iter.key()) continue;
-                QVector<int> roles;
-                roles.append(RoleCount);
-                QModelIndex changedIndex = index(i);
-                Q_EMIT dataChanged(changedIndex, changedIndex, roles);
-                break;
-            }
-        }
-    }
-}
-
-void
-Categories::onEmitCountChanged()
-{
-    QVector<int> roles;
-    roles.append(Categories::RoleCount);
-    Q_FOREACH(int categoryIndex, m_updatedCategories) {
-        if (!m_results.contains(categoryIndex)) continue;
-        const int realIndex = m_categoryOrder.indexOf(categoryIndex);
-        const QModelIndex changedIndex = index(realIndex);
-        Q_EMIT dataChanged(changedIndex, changedIndex, roles);
-    }
-    m_updatedCategories.clear();
-}
-
-QHash<int, QByteArray>
-Categories::roleNames() const
-{
-    return m_roles;
-}
-
-void Categories::onOverrideModelDestroyed()
-{
-    QObject* model = sender();
-    auto iter = m_overriddenCategories.begin();
-    while (iter != m_overriddenCategories.end()) {
-        if (iter.value() == model) {
-            iter = m_overriddenCategories.erase(iter);
-            continue;
-        }
-        ++iter;
-    }
-}
-
-void Categories::overrideResults(const QString& categoryId, QAbstractItemModel* model)
-{
-    m_overriddenCategories[categoryId] = model;
-    // watch the model
-    connect(model, &QObject::destroyed, this, &Categories::onOverrideModelDestroyed);
-    connect(model, &QAbstractItemModel::rowsInserted, this, &Categories::onRowCountChanged);
-    connect(model, &QAbstractItemModel::rowsRemoved, this, &Categories::onRowCountChanged);
-    connect(model, &QAbstractItemModel::modelReset, this, &Categories::onRowCountChanged);
-
-    // emit the dataChanged signal if the category is already in the model
-    for (int i = 0; i < rowCount(); i++) {
-        auto id = data(index(i), RoleCategoryId).toString();
-        if (id != categoryId) continue;
-        QVector<int> roles;
-        roles.append(RoleCount);
-        roles.append(RoleResults);
-        QModelIndex changedIndex = index(i);
-        Q_EMIT dataChanged(changedIndex, changedIndex, roles);
-        break;
-    }
-}
-
-QVariant
-Categories::data(const QModelIndex& index, int role) const
-{
-    if (!index.isValid()) {
-        return QVariant();
-    }
-
-    if (m_categoryOrder.size() != rowCount())
-    {
-        // populate category order vector with 0..n
-        m_categoryOrder.clear();
-        const unsigned int lim = rowCount();
-        for (unsigned int i = 0; i<lim; i++) {
-            m_categoryOrder.append(i);
-        }
-    }
-
-    int realRow = index.row();
-    if (index.row() < m_categoryOrder.size()) {
-        realRow = m_categoryOrder[index.row()];
-    } else {
-        qWarning() << "Invalid index" << index.row();
-        return QVariant();
-    }
-
-    const QModelIndex realIndex = createIndex(realRow, index.column());
-
-    switch (role) {
-        case RoleCategoryId:
-            return DeeListModel::data(realIndex, CategoryColumn::ID);
-        case RoleName:
-            return DeeListModel::data(realIndex, CategoryColumn::DISPLAY_NAME);
-        case RoleIcon:
-            return DeeListModel::data(realIndex, CategoryColumn::ICON_HINT);
-        case RoleRenderer:
-            return DeeListModel::data(realIndex, CategoryColumn::RENDERER_NAME);
-        case RoleContentType:
-        {
-            auto hints = DeeListModel::data(realIndex, CategoryColumn::HINTS).toHash();
-            return hints.contains("content-type") ? hints["content-type"] : QVariant(QString("default"));
-        }
-        case RoleRendererHint:
-        {
-            auto hints = DeeListModel::data(realIndex, CategoryColumn::HINTS).toHash();
-            return hints.contains("renderer-hint") ? hints["renderer-hint"] : QVariant(QString());
-        }
-        case RoleProgressSource:
-        {
-            auto hints = DeeListModel::data(realIndex, CategoryColumn::HINTS).toHash();
-            return hints.contains("progress-source") ? hints["progress-source"] : QVariant();
-        }
-        case RoleHints:
-            return DeeListModel::data(realIndex, CategoryColumn::HINTS);
-        case RoleResults:
-            if (m_overriddenCategories.size() > 0)
-            {
-                auto id = DeeListModel::data(realIndex, CategoryColumn::ID).toString();
-                if (m_overriddenCategories.find(id) != m_overriddenCategories.end())
-                    return QVariant::fromValue(m_overriddenCategories[id]);
-            }
-            return QVariant::fromValue(getResults(realRow));
-        case RoleCount:
-            if (m_overriddenCategories.size() > 0)
-            {
-                auto id = DeeListModel::data(realIndex, CategoryColumn::ID).toString();
-                if (m_overriddenCategories.find(id) != m_overriddenCategories.end())
-                {
-                    return QVariant::fromValue(m_overriddenCategories[id]->rowCount());
-                }
-            }
-            return QVariant::fromValue(getResults(realRow)->rowCount());
-        default:
-            return QVariant();
-    }
-}

=== renamed file 'src/Unity/scopes-ng/categories.cpp' => 'src/Unity/categories.cpp'
=== removed file 'src/Unity/categories.h'
--- src/Unity/categories.h	2013-11-08 17:01:37 +0000
+++ src/Unity/categories.h	1970-01-01 00:00:00 +0000
@@ -1,95 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * Authors:
- *  Michał Sawicz <[e-mail]>
- *  Michal Hruby <[e-mail]>
- *
- * 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; 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#ifndef CATEGORIES_H
-#define CATEGORIES_H
-
-// unity-core
-#include <UnityCore/Scope.h>
-
-// dee-qt
-#include "deelistmodel.h"
-
-#include <QPointer>
-#include <QSet>
-#include <QTimer>
-
-// local
-#include "signalslist.h"
-
-class Categories : public DeeListModel
-{
-    Q_OBJECT
-
-    Q_ENUMS(Roles)
-
-public:
-    explicit Categories(QObject* parent = 0);
-
-    enum Roles {
-        RoleCategoryId,
-        RoleName,
-        RoleIcon,
-        RoleRenderer,
-        RoleContentType,
-        RoleRendererHint,
-        RoleProgressSource,
-        RoleHints,
-        RoleResults,
-        RoleCount
-    };
-
-    Q_INVOKABLE void overrideResults(const QString& categoryId, QAbstractItemModel* model);
-
-    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;
-
-    QHash<int, QByteArray> roleNames() const;
-
-    /* setters */
-    void setUnityScope(const unity::dash::Scope::Ptr& scope);
-
-private Q_SLOTS:
-    void onCountChanged();
-    void onRowCountChanged();
-    void onEmitCountChanged();
-    void onOverrideModelDestroyed();
-
-private:
-    void onCategoriesModelChanged(unity::glib::Object<DeeModel> model);
-    void onCategoryOrderChanged(const std::vector<unsigned int>& cat_order);
-
-    DeeListModel* getResults(int index) const;
-
-    unity::dash::Scope::Ptr m_unityScope;
-    QTimer m_timer;
-    QSet<int> m_updatedCategories;
-    QHash<int, QByteArray> m_roles;
-    QMap<QString, QAbstractItemModel*> m_overriddenCategories;
-    mutable QMap<int, DeeListModel*> m_results;
-    SignalsList m_signals;
-
-    /* Category order array contains indices of actual categories in the underlying DeeListModel.
-       It's used internally to reflect category order reported by scope.
-     */
-    mutable QList<unsigned int> m_categoryOrder;
-};
-
-#endif // CATEGORIES_H

=== renamed file 'src/Unity/scopes-ng/categories.h' => 'src/Unity/categories.h'
=== removed file 'src/Unity/categoryresults.cpp'
--- src/Unity/categoryresults.cpp	2013-11-08 17:01:37 +0000
+++ src/Unity/categoryresults.cpp	1970-01-01 00:00:00 +0000
@@ -1,121 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * Authors:
- *  Michal Hruby <[e-mail]>
- *
- * 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; 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-// self
-#include "categoryresults.h"
-#include "iconutils.h"
-
-// TODO: use something from libunity once it's public
-enum ResultsColumn {
-    URI,
-    ICON_HINT,
-    CATEGORY,
-    RESULT_TYPE,
-    MIMETYPE,
-    TITLE,
-    COMMENT,
-    DND_URI,
-    METADATA
-};
-
-CategoryResults::CategoryResults(QObject* parent)
-    : DeeListModel(parent)
-    , m_categoryIndex(-1)
-{
-    m_roles[CategoryResults::RoleUri] = "uri";
-    m_roles[CategoryResults::RoleIconHint] = "icon";
-    m_roles[CategoryResults::RoleCategory] = "category";
-    m_roles[CategoryResults::RoleMimetype] = "mimetype";
-    m_roles[CategoryResults::RoleTitle] = "title";
-    m_roles[CategoryResults::RoleComment] = "comment";
-    m_roles[CategoryResults::RoleDndUri] = "dndUri";
-    m_roles[CategoryResults::RoleMetadata] = "metadata";
-    m_roles[CategoryResults::RoleRendererHints] = "rendererHints";
-}
-
-int CategoryResults::categoryIndex() const
-{
-    return m_categoryIndex;
-}
-
-void CategoryResults::setCategoryIndex(int index)
-{
-    if (m_categoryIndex != index) {
-        m_categoryIndex = index;
-        Q_EMIT categoryIndexChanged(m_categoryIndex);
-    }
-}
-
-QHash<int, QByteArray>
-CategoryResults::roleNames() const
-{
-    return m_roles;
-}
-
-QVariant
-CategoryResults::data(const QModelIndex& index, int role) const
-{
-    if (!index.isValid()) {
-        return QVariant();
-    }
-
-    switch (role) {
-        case RoleUri:
-            return DeeListModel::data(index, ResultsColumn::URI);
-        case RoleIconHint: {
-            QString giconString(DeeListModel::data(index, ResultsColumn::ICON_HINT).toString());
-            if (giconString.isEmpty()) {
-                QString mimetype(DeeListModel::data(index, ResultsColumn::MIMETYPE).toString());
-                QString uri(DeeListModel::data(index, ResultsColumn::URI).toString());
-                QString thumbnailerUri(uriToThumbnailerProviderString(uri, mimetype, DeeListModel::data(index, ResultsColumn::METADATA).toHash()));
-                if (!thumbnailerUri.isNull()) {
-                    return QVariant::fromValue(thumbnailerUri);
-                }
-            }
-            return QVariant::fromValue(gIconToDeclarativeImageProviderString(giconString));
-        }
-        case RoleCategory:
-            return DeeListModel::data(index, ResultsColumn::CATEGORY);
-        case RoleMimetype:
-            return DeeListModel::data(index, ResultsColumn::MIMETYPE);
-        case RoleTitle:
-            return DeeListModel::data(index, ResultsColumn::TITLE);
-        case RoleComment:
-            return DeeListModel::data(index, ResultsColumn::COMMENT);
-        case RoleDndUri:
-            return DeeListModel::data(index, ResultsColumn::DND_URI);
-        case RoleMetadata:
-            return DeeListModel::data(index, ResultsColumn::METADATA);
-        case RoleRendererHints:
-        {
-            QVariantHash hash(DeeListModel::data(index, ResultsColumn::METADATA).toHash());
-            if (hash.contains("content")) {
-                QVariantMap hints;
-                QVariantHash innerHash(hash["content"].toHash());
-                if (innerHash.contains("scope_disabled")) {
-                    hints["scope_disabled"] = innerHash["scope_disabled"];
-                }
-                return hints.empty() ? QVariant() : QVariant::fromValue(hints);
-            }
-            return QVariant();
-        }
-        default:
-            return QVariant();
-    }
-}

=== removed file 'src/Unity/categoryresults.h'
--- src/Unity/categoryresults.h	2013-11-08 17:01:37 +0000
+++ src/Unity/categoryresults.h	1970-01-01 00:00:00 +0000
@@ -1,68 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * Authors:
- *  Michal Hruby <[e-mail]>
- *
- * 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; 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#ifndef CATEGORY_RESULTS_H
-#define CATEGORY_RESULTS_H
-
-// dee-qt
-#include "deelistmodel.h"
-
-class Q_DECL_EXPORT CategoryResults : public DeeListModel
-{
-    Q_OBJECT
-
-    Q_ENUMS(Roles)
-
-    Q_PROPERTY(int categoryIndex READ categoryIndex WRITE setCategoryIndex NOTIFY categoryIndexChanged)
-
-public:
-    explicit CategoryResults(QObject* parent = 0);
-
-    enum Roles {
-        RoleUri,
-        RoleIconHint,
-        RoleCategory,
-        RoleMimetype,
-        RoleTitle,
-        RoleComment,
-        RoleDndUri,
-        RoleMetadata,
-        RoleRendererHints
-    };
-
-    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;
-
-    QHash<int, QByteArray> roleNames() const;
-
-    /* getters */
-    int categoryIndex() const;
-
-    /* setters */
-    void setCategoryIndex(int index);
-
-Q_SIGNALS:
-    void categoryIndexChanged(int index);
-
-private:
-    QHash<int, QByteArray> m_roles;
-    int m_categoryIndex;
-};
-
-#endif // CATEGORY_RESULTS_H

=== removed file 'src/Unity/checkoptionfilter.cpp'
--- src/Unity/checkoptionfilter.cpp	2013-11-08 17:01:37 +0000
+++ src/Unity/checkoptionfilter.cpp	1970-01-01 00:00:00 +0000
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2011 Canonical, Ltd.
- *
- * Authors:
- *  Florian Boucault <[e-mail]>
- *
- * 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; 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-// Self
-#include "checkoptionfilter.h"
-
-// local
-#include "unityoptionsmodel.h"
-
-CheckOptionFilter::CheckOptionFilter(QObject *parent) :
-    Filter(parent),
-    m_unityCheckOptionFilter(nullptr),
-    m_options(nullptr)
-{
-}
-
-GenericOptionsModel* CheckOptionFilter::options() const
-{
-    return m_options;
-}
-
-void CheckOptionFilter::setUnityFilter(unity::dash::Filter::Ptr filter)
-{
-    Filter::setUnityFilter(filter);
-    m_unityCheckOptionFilter = std::dynamic_pointer_cast<unity::dash::CheckOptionFilter>(m_unityFilter);
-    onOptionsChanged(m_unityCheckOptionFilter->options);
-}
-
-void CheckOptionFilter::onOptionsChanged(unity::dash::CheckOptionFilter::CheckOptions options)
-{
-    if (m_options != nullptr) {
-        m_signals.disconnectAll();
-        delete m_options;
-        m_options = nullptr;
-    }
-
-    m_options = new UnityOptionsModel(this, options,
-                                      m_unityCheckOptionFilter->option_added,
-                                      m_unityCheckOptionFilter->option_removed,
-                                      m_unityCheckOptionFilter->show_all_button);
-
-    connect(m_options, SIGNAL(activeChanged(AbstractFilterOption *)), m_options, SLOT(ensureTheOnlyActive(AbstractFilterOption *)));
-    connect(m_options, SIGNAL(showAllActivated()), this, SLOT(clear()));
-
-    /* Property change signals */
-    m_signals << m_unityCheckOptionFilter->options.changed.connect(sigc::mem_fun(this, &CheckOptionFilter::onOptionsChanged));
-
-    Q_EMIT optionsChanged();
-}

=== removed file 'src/Unity/checkoptionfilter.h'
--- src/Unity/checkoptionfilter.h	2013-11-08 17:01:37 +0000
+++ src/Unity/checkoptionfilter.h	1970-01-01 00:00:00 +0000
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2011 Canonical, Ltd.
- *
- * Authors:
- *  Florian Boucault <[e-mail]>
- *
- * 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; 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef CHECKOPTIONFILTER_H
-#define CHECKOPTIONFILTER_H
-
-// Qt
-#include <QObject>
-#include <QMetaType>
-
-// libunity-core
-#include <UnityCore/CheckOptionFilter.h>
-
-// Local
-#include "filter.h"
-#include "signalslist.h"
-
-class Q_DECL_EXPORT CheckOptionFilter : public Filter
-{
-    Q_OBJECT
-
-public:
-    explicit CheckOptionFilter(QObject *parent = nullptr);
-
-    /* getters */
-    GenericOptionsModel* options() const override;
-
-protected:
-    void setUnityFilter(unity::dash::Filter::Ptr filter) override;
-
-private:
-    void onOptionsChanged(unity::dash::CheckOptionFilter::CheckOptions filter);
-
-    unity::dash::CheckOptionFilter::Ptr m_unityCheckOptionFilter;
-    SignalsList m_signals;
-    GenericOptionsModel* m_options;
-};
-
-Q_DECLARE_METATYPE(CheckOptionFilter*)
-
-#endif // CHECKOPTIONFILTER_H

=== renamed file 'src/Unity/scopes-ng/collectors.cpp' => 'src/Unity/collectors.cpp'
=== renamed file 'src/Unity/scopes-ng/collectors.h' => 'src/Unity/collectors.h'
=== removed file 'src/Unity/filter.cpp'
--- src/Unity/filter.cpp	2013-11-08 17:01:37 +0000
+++ src/Unity/filter.cpp	1970-01-01 00:00:00 +0000
@@ -1,129 +0,0 @@
-/*
- * Copyright (C) 2011, 2013 Canonical, Ltd.
- *
- * Authors:
- *  Florian Boucault <[e-mail]>
- *  Pawel Stolowski <[e-mail]>
- *
- * 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; 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-// Self
-#include "filter.h"
-
-// local
-#include "ratingsfilter.h"
-#include "radiooptionfilter.h"
-#include "checkoptionfilter.h"
-#include "multirangefilter.h"
-
-// libunity-core
-#include <UnityCore/Filter.h>
-#include <UnityCore/RatingsFilter.h>
-#include <UnityCore/RadioOptionFilter.h>
-#include <UnityCore/CheckOptionFilter.h>
-#include <UnityCore/MultiRangeFilter.h>
-
-// Qt
-#include <QDebug>
-
-Filter::Filter(QObject *parent) :
-    QObject(parent)
-{
-}
-
-QString Filter::id() const
-{
-    if (!m_unityFilter)
-        return QString::Null();
-    return QString::fromStdString(m_unityFilter->id());
-}
-
-QString Filter::name() const
-{
-    if (!m_unityFilter)
-        return QString::Null();
-    return QString::fromStdString(m_unityFilter->name());
-}
-
-QString Filter::iconHint() const
-{
-    if (!m_unityFilter)
-        return QString::Null();
-    return QString::fromStdString(m_unityFilter->icon_hint());
-}
-
-QString Filter::rendererName() const
-{
-    if (!m_unityFilter)
-        return QString::Null();
-    return QString::fromStdString(m_unityFilter->renderer_name());
-}
-
-bool Filter::visible() const
-{
-    if (!m_unityFilter)
-        return false;
-    return m_unityFilter->visible();
-}
-
-bool Filter::collapsed() const
-{
-    if (!m_unityFilter)
-        return false;
-    return m_unityFilter->collapsed();
-}
-
-bool Filter::filtering() const
-{
-    if (!m_unityFilter)
-        return false;
-    return m_unityFilter->filtering();
-}
-
-void Filter::clear()
-{
-    if (m_unityFilter)
-        m_unityFilter->Clear();
-}
-
-void Filter::setUnityFilter(unity::dash::Filter::Ptr unityFilter)
-{
-    m_unityFilter = unityFilter;
-}
-
-Filter* Filter::newFromUnityFilter(unity::dash::Filter::Ptr unityFilter)
-{
-    Filter* filter;
-
-    if (typeid(*unityFilter) == typeid(unity::dash::RatingsFilter)) {
-        filter = new RatingsFilter;
-    } else if (typeid(*unityFilter) == typeid(unity::dash::CheckOptionFilter)) {
-        filter = new CheckOptionFilter;
-    } else if (typeid(*unityFilter) == typeid(unity::dash::RadioOptionFilter)) {
-        filter = new RadioOptionFilter;
-    } else if (typeid(*unityFilter) == typeid(unity::dash::MultiRangeFilter)) {
-        filter = new MultiRangeFilter;
-    } else {
-        qWarning() << "Filter of unknown type: " << typeid(*unityFilter).name();
-        return nullptr;
-    }
-
-    filter->setUnityFilter(unityFilter);
-    return filter;
-}
-
-bool Filter::hasUnityFilter(unity::dash::Filter::Ptr unityFilter) const
-{
-    return m_unityFilter == unityFilter;
-}

=== removed file 'src/Unity/filter.h'
--- src/Unity/filter.h	2013-11-08 17:01:37 +0000
+++ src/Unity/filter.h	1970-01-01 00:00:00 +0000
@@ -1,75 +0,0 @@
-/*
- * Copyright (C) 2011, 2013 Canonical, Ltd.
- *
- * Authors:
- *  Florian Boucault <[e-mail]>
- *  Pawel Stolowski <[e-mail]>
- *
- * 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; 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef FILTER_H
-#define FILTER_H
-
-// Qt
-#include <QObject>
-#include <QMetaType>
-
-// libunity-core
-#include <UnityCore/Filter.h>
-
-class GenericOptionsModel;
-
-class Q_DECL_EXPORT Filter : public QObject
-{
-    Q_OBJECT
-
-    Q_PROPERTY(QString id READ id CONSTANT)
-    Q_PROPERTY(QString name READ name CONSTANT)
-    Q_PROPERTY(QString iconHint READ iconHint CONSTANT)
-    Q_PROPERTY(QString rendererName READ rendererName CONSTANT)
-    Q_PROPERTY(bool visible READ visible CONSTANT)
-    Q_PROPERTY(bool collapsed READ collapsed CONSTANT)
-    Q_PROPERTY(bool filtering READ filtering CONSTANT)
-    Q_PROPERTY(GenericOptionsModel* options READ options NOTIFY optionsChanged)
-
-public:
-    explicit Filter(QObject *parent = nullptr);
-
-    /* getters */
-    QString id() const;
-    QString name() const;
-    QString iconHint() const;
-    QString rendererName() const;
-    bool visible() const;
-    bool collapsed() const;
-    bool filtering() const;
-    virtual GenericOptionsModel* options() const = 0;
-
-    static Filter* newFromUnityFilter(unity::dash::Filter::Ptr unityFilter);
-    bool hasUnityFilter(unity::dash::Filter::Ptr unityFilter) const;
-
-public Q_SLOTS:
-    void clear();
-
-Q_SIGNALS:
-    void optionsChanged();
-
-protected:
-    unity::dash::Filter::Ptr m_unityFilter;
-    virtual void setUnityFilter(unity::dash::Filter::Ptr unityFilter);
-};
-
-Q_DECLARE_METATYPE(Filter*)
-
-#endif // FILTER_H

=== removed file 'src/Unity/filteroption.cpp'
--- src/Unity/filteroption.cpp	2013-11-08 17:01:37 +0000
+++ src/Unity/filteroption.cpp	1970-01-01 00:00:00 +0000
@@ -1,91 +0,0 @@
-/*
- * Copyright (C) 2011, 2013 Canonical, Ltd.
- *
- * Authors:
- *  Florian Boucault <[e-mail]>
- *  Pawel Stolowski <[e-mail]>
- *
- * 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; 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-// Self
-#include "filteroption.h"
-
-// libunity-core
-#include <UnityCore/Filter.h>
-
-FilterOption::FilterOption(unity::dash::FilterOption::Ptr unityFilterOption, QObject *parent) :
-    AbstractFilterOption(parent), m_unityFilterOption(nullptr)
-{
-    setUnityFilterOption(unityFilterOption);
-}
-
-QString FilterOption::id() const
-{
-    return QString::fromStdString(m_unityFilterOption->id());
-}
-
-QString FilterOption::name() const
-{
-    return QString::fromStdString(m_unityFilterOption->name());
-}
-
-QString FilterOption::iconHint() const
-{
-    return QString::fromStdString(m_unityFilterOption->icon_hint());
-}
-
-bool FilterOption::active() const
-{
-    return m_unityFilterOption->active();
-}
-
-void FilterOption::setActive(bool active)
-{
-    m_unityFilterOption->active = active;
-}
-
-void FilterOption::setUnityFilterOption(unity::dash::FilterOption::Ptr unityFilterOption)
-{
-    if (m_unityFilterOption != nullptr) {
-        m_signals.disconnectAll();
-    }
-
-    m_unityFilterOption = unityFilterOption;
-
-    /* Property change signals */
-    m_signals << m_unityFilterOption->id.changed.connect(sigc::mem_fun(this, &FilterOption::onIdChanged))
-              << m_unityFilterOption->name.changed.connect(sigc::mem_fun(this, &FilterOption::onNameChanged))
-              << m_unityFilterOption->icon_hint.changed.connect(sigc::mem_fun(this, &FilterOption::onIconHintChanged))
-              << m_unityFilterOption->active.changed.connect(sigc::mem_fun(this, &FilterOption::onActiveChanged));
-}
-
-void FilterOption::onIdChanged(const std::string &id)
-{
-    Q_EMIT idChanged(QString::fromStdString(id));
-}
-
-void FilterOption::onNameChanged(const std::string &name)
-{
-    Q_EMIT nameChanged(QString::fromStdString(name));
-}
-
-void FilterOption::onIconHintChanged(const std::string &iconHint)
-{
-    Q_EMIT iconHintChanged(QString::fromStdString(iconHint));
-}
-
-void FilterOption::onActiveChanged(bool active)
-{
-    Q_EMIT activeChanged(active);
-}

=== removed file 'src/Unity/filteroption.h'
--- src/Unity/filteroption.h	2013-11-08 17:01:37 +0000
+++ src/Unity/filteroption.h	1970-01-01 00:00:00 +0000
@@ -1,61 +0,0 @@
-/*
- * Copyright (C) 2011, 2013 Canonical, Ltd.
- *
- * Authors:
- *  Florian Boucault <[e-mail]>
- *  Pawel Stolowski <[e-mail]>
- *
- * 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; 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef FILTEROPTION_H
-#define FILTEROPTION_H
-
-// Local
-#include "abstractfilteroption.h"
-#include "signalslist.h"
-
-// libunity-core
-#include <UnityCore/Filter.h>
-
-class Q_DECL_EXPORT FilterOption : public AbstractFilterOption
-{
-    Q_OBJECT
-
-public:
-    explicit FilterOption(unity::dash::FilterOption::Ptr unityFilterOption, QObject *parent = nullptr);
-
-    /* getters */
-    QString id() const override;
-    QString name() const override;
-    QString iconHint() const override;
-    bool active() const override;
-
-    /* setters */
-    void setActive(bool active) override;
-
-private:
-    void onIdChanged(const std::string &id);
-    void onNameChanged(const std::string &name);
-    void onIconHintChanged(const std::string &iconHint);
-    void onActiveChanged(bool active);
-
-    void setUnityFilterOption(unity::dash::FilterOption::Ptr unityFilterOption);
-    SignalsList m_signals;
-
-    unity::dash::FilterOption::Ptr m_unityFilterOption;
-};
-
-Q_DECLARE_METATYPE(FilterOption*)
-
-#endif // FILTEROPTION_H

=== removed file 'src/Unity/filters.cpp'
--- src/Unity/filters.cpp	2013-11-08 17:01:37 +0000
+++ src/Unity/filters.cpp	1970-01-01 00:00:00 +0000
@@ -1,165 +0,0 @@
-/*
- * Copyright (C) 2011, 2013 Canonical, Ltd.
- *
- * Authors:
- *  Florian Boucault <[e-mail]>
- *  Pawel Stolowski <[e-mail]>
- *
- * 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; 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-// Self
-#include "filters.h"
-
-// Local
-#include "filter.h"
-#include "genericoptionsmodel.h"
-
-// Qt
-#include <QDebug>
-
-Filters::Filters(unity::dash::Filters::Ptr unityFilters, QObject *parent) :
-    QAbstractListModel(parent), m_unityFilters(unityFilters)
-{
-    for (unsigned int i=0; i<m_unityFilters->count(); i++) {
-        unity::dash::Filter::Ptr unityFilter = m_unityFilters->FilterAtIndex(i);
-        addFilter(unityFilter, i);
-    }
-    m_unityFilters->filter_added.connect(sigc::mem_fun(this, &Filters::onFilterAdded));
-    m_unityFilters->filter_changed.connect(sigc::mem_fun(this, &Filters::onFilterChanged));
-    m_unityFilters->filter_removed.connect(sigc::mem_fun(this, &Filters::onFilterRemoved));
-}
-
-Filters::~Filters()
-{
-    while (!m_filters.isEmpty()) {
-        delete m_filters.takeFirst();
-    }
-}
-
-int Filters::rowCount(const QModelIndex& parent) const
-{
-    Q_UNUSED(parent)
-
-    return m_unityFilters->count();
-}
-
-QVariant Filters::data(const QModelIndex& index, int role) const
-{
-    if (!index.isValid()) {
-        return QVariant();
-    }
-
-    Filter* filter = m_filters.at(index.row());
-    switch (role)
-    {
-        case Filters::RoleId:
-            return filter->id();
-        case Filters::RoleName:
-        case Qt::DisplayRole:
-            return filter->name();
-        case Filters::RoleIconHint:
-            return filter->iconHint();
-        case Filters::RoleRendererName:
-            return filter->rendererName();
-        case Filters::RoleVisible:
-            return filter->visible();
-        case Filters::RoleCollapsed:
-            return filter->collapsed();
-        case Filters::RoleFiltering:
-            return filter->filtering();
-        case Filters::RoleOptions:
-            return QVariant::fromValue(filter->options());
-        default:
-            break;
-    }
-    return QVariant();
-}
-
-QHash<int, QByteArray> Filters::roleNames() const
-{
-    QHash<int, QByteArray> roles;
-    roles[Filters::RoleId] = "id";
-    roles[Filters::RoleName] = "name";
-    roles[Filters::RoleIconHint] = "iconHint";
-    roles[Filters::RoleRendererName] = "rendererName";
-    roles[Filters::RoleVisible] = "visible";
-    roles[Filters::RoleCollapsed] = "collapsed";
-    roles[Filters::RoleFiltering] = "filtering";
-    roles[Filters::RoleOptions] = "options";
-    return roles;
-}
-
-Filter* Filters::getFilter(const QString& id) const
-{
-    Q_FOREACH (Filter* filter, m_filters) {
-        if (filter->id() == id) {
-            return filter;
-        }
-    }
-    return nullptr;
-}
-
-void Filters::onFilterAdded(unity::dash::Filter::Ptr unityFilter)
-{
-    if (unityFilter == nullptr) {
-        return;
-    }
-
-    int index = m_filters.count();
-    addFilter(unityFilter, index);
-}
-
-void Filters::onFilterChanged(unity::dash::Filter::Ptr unityFilter)
-{
-    if (unityFilter == nullptr) {
-        return;
-    }
-
-    QModelIndex filterIndex = index(indexForFilter(unityFilter));
-    Q_EMIT dataChanged(filterIndex, filterIndex);
-}
-
-void Filters::onFilterRemoved(unity::dash::Filter::Ptr unityFilter)
-{
-    removeFilter(indexForFilter(unityFilter));
-}
-
-void Filters::addFilter(unity::dash::Filter::Ptr unityFilter, int index)
-{
-    beginInsertRows(QModelIndex(), index, index);
-    Filter* filter = Filter::newFromUnityFilter(unityFilter);
-    if (filter != nullptr) {
-        m_filters.insert(index, filter);
-    }
-    endInsertRows();
-}
-
-void Filters::removeFilter(int index)
-{
-    beginRemoveRows(QModelIndex(), index, index);
-    Filter* filter = m_filters.takeAt(index);
-    delete filter;
-    endRemoveRows();
-}
-
-int Filters::indexForFilter(unity::dash::Filter::Ptr unityFilter)
-{
-    for (int index=0; index<m_filters.count(); index++) {
-        if (m_filters[index]->hasUnityFilter(unityFilter)) {
-            return index;
-        }
-    }
-    qWarning() << "Filter" << QString::fromStdString(unityFilter->name()) << "not found in local cache.";
-    return -1;
-}

=== removed file 'src/Unity/filters.h'
--- src/Unity/filters.h	2013-11-08 17:01:37 +0000
+++ src/Unity/filters.h	1970-01-01 00:00:00 +0000
@@ -1,77 +0,0 @@
-/*
- * Copyright (C) 2011, 2013 Canonical, Ltd.
- *
- * Authors:
- *  Florian Boucault <[e-mail]>
- *  Pawel Stolowski <[e-mail]>
- *
- * 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; 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef FILTERS_H
-#define FILTERS_H
-
-// Qt
-#include <QAbstractListModel>
-#include <QList>
-
-// libunity-core
-#include <UnityCore/Filters.h>
-#include <UnityCore/Filter.h>
-
-class Filter;
-
-class Filters : public QAbstractListModel
-{
-    Q_OBJECT
-
-    Q_ENUMS(Roles)
-
-public:
-    explicit Filters(unity::dash::Filters::Ptr unityFilters, QObject *parent = nullptr);
-    ~Filters();
-
-    enum Roles {
-        RoleId = Qt::UserRole,
-        RoleName,
-        RoleIconHint,
-        RoleRendererName,
-        RoleVisible,
-        RoleCollapsed,
-        RoleFiltering,
-        RoleOptions
-    };
-
-    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
-    int rowCount(const QModelIndex& parent = QModelIndex()) const override;
-    QHash<int, QByteArray> roleNames() const override;
-
-    Filter* getFilter(const QString& id) const;
-
-private:
-    void onFilterAdded(unity::dash::Filter::Ptr unityFilter);
-    void onFilterChanged(unity::dash::Filter::Ptr unityFilter);
-    void onFilterRemoved(unity::dash::Filter::Ptr unityFilter);
-
-    void addFilter(unity::dash::Filter::Ptr unityFilter, int index);
-    void removeFilter(int index);
-
-    int indexForFilter(unity::dash::Filter::Ptr unityFilter);
-
-    unity::dash::Filters::Ptr m_unityFilters;
-    QList<Filter*> m_filters;
-};
-
-Q_DECLARE_METATYPE(Filters*)
-
-#endif // FILTERS_H

=== removed file 'src/Unity/genericoptionsmodel.cpp'
--- src/Unity/genericoptionsmodel.cpp	2013-11-08 17:01:37 +0000
+++ src/Unity/genericoptionsmodel.cpp	1970-01-01 00:00:00 +0000
@@ -1,187 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * Authors:
- *  Pawel Stolowski <[e-mail]>
- *
- * 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; 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-// self
-#include "genericoptionsmodel.h"
-
-// local
-#include "abstractfilteroption.h"
-#include "showallfilteroption.h"
-
-GenericOptionsModel::GenericOptionsModel(bool showAllOption, QObject *parent)
-    : QAbstractListModel(parent)
-{
-    if (showAllOption)
-    {
-        auto showAll = new ShowAllFilterOption(this);
-        connect(showAll, SIGNAL(activeChanged(bool)), this, SLOT(onOptionChanged()));
-        connect(showAll, SIGNAL(activeChanged(bool)), this, SLOT(onShowAllClicked(bool)));
-        addOption(showAll);
-    }
-}
-
-GenericOptionsModel::~GenericOptionsModel()
-{
-    Q_FOREACH(auto opt, m_options)
-    {
-        opt->deleteLater();
-    }
-}
-
-QHash<int, QByteArray> GenericOptionsModel::roleNames() const
-{
-    QHash<int, QByteArray> roles;
-    roles[GenericOptionsModel::RoleId] = "id";
-    roles[GenericOptionsModel::RoleName] = "name";
-    roles[GenericOptionsModel::RoleIconHint] = "iconHint";
-    roles[GenericOptionsModel::RoleActive] = "active";
-    return roles;
-}
-
-QVariant GenericOptionsModel::data(const QModelIndex& index, int role) const
-{
-    if (!index.isValid()) {
-        return QVariant();
-    }
-
-    auto filterOption = m_options[index.row()];
-    switch (role)
-    {
-        case GenericOptionsModel::RoleId:
-            return filterOption->id();
-        case GenericOptionsModel::RoleName:
-        case Qt::DisplayRole:
-            return filterOption->name();
-        case GenericOptionsModel::RoleIconHint:
-            return filterOption->iconHint();
-        case GenericOptionsModel::RoleActive:
-            return filterOption->active();
-        default:
-            break;
-    }
-
-    return QVariant();
-}
-
-int GenericOptionsModel::rowCount(const QModelIndex& /* parent */) const
-{
-    return m_options.size();
-}
-
-void GenericOptionsModel::setActive(int idx, bool value)
-{
-    if (idx >= 0 && idx < m_options.size())
-    {
-        m_options[idx]->setActive(value);
-    }
-}
-
-void GenericOptionsModel::setActive(const QString &id, bool value)
-{
-    Q_FOREACH(auto opt, m_options) {
-        if (opt->id() == id) {
-            opt->setActive(value);
-            break;
-        }
-    }
-}
-
-AbstractFilterOption* GenericOptionsModel::getRawOption(QVector<AbstractFilterOption *>::size_type idx) const
-{
-    if (idx < m_options.size())
-    {
-        return m_options[idx];
-    }
-    return nullptr;
-}
-
-void GenericOptionsModel::ensureTheOnlyActive(AbstractFilterOption *activeOption)
-{
-    if (activeOption->active()) {
-        // disable all other options
-        Q_FOREACH(auto opt, m_options) {
-            if (opt != activeOption && opt->active()) {
-                opt->setActive(false);
-            }
-        }
-    }
-}
-
-void GenericOptionsModel::addOption(AbstractFilterOption *option, int index)
-{
-    if (index >= 0)
-        m_options.insert(index, option);
-    else
-        m_options.append(option);
-
-    connect(option, SIGNAL(idChanged(const QString &)), this, SLOT(onOptionChanged()));
-    connect(option, SIGNAL(nameChanged(const QString &)), this, SLOT(onOptionChanged()));
-    connect(option, SIGNAL(iconHintChanged(const QString &)), this, SLOT(onOptionChanged()));
-    connect(option, SIGNAL(activeChanged(bool)), this, SLOT(onOptionChanged()));
-    connect(option, SIGNAL(activeChanged(bool)), this, SLOT(onActiveChanged()));
-}
-
-void GenericOptionsModel::removeOption(int index)
-{
-    m_options[index]->deleteLater();
-    m_options.remove(index);
-}
-
-int GenericOptionsModel::indexOf(const QString &option_id)
-{
-    int row = 0;
-    Q_FOREACH(auto opt, m_options)
-    {
-        if (opt->id() == option_id)
-        {
-            return row;
-        }
-        ++row;
-    }
-    return -1;
-}
-
-void GenericOptionsModel::onOptionChanged()
-{
-    AbstractFilterOption *option = dynamic_cast<AbstractFilterOption*>(QObject::sender());
-    if (option)
-    {
-        int idx = indexOf(option->id());
-        if (idx >= 0)
-        {
-            QModelIndex optionIndex = index(idx);
-            Q_EMIT dataChanged(optionIndex, optionIndex);
-        }
-    }
-}
-
-void GenericOptionsModel::onActiveChanged()
-{
-    AbstractFilterOption *option = dynamic_cast<AbstractFilterOption*>(QObject::sender());
-    if (option)
-    {
-        Q_EMIT activeChanged(option);
-    }
-}
-
-void GenericOptionsModel::onShowAllClicked(bool active)
-{
-    if (active)
-        Q_EMIT showAllActivated();
-}

=== removed file 'src/Unity/genericoptionsmodel.h'
--- src/Unity/genericoptionsmodel.h	2013-11-08 17:01:37 +0000
+++ src/Unity/genericoptionsmodel.h	1970-01-01 00:00:00 +0000
@@ -1,79 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * Authors:
- *  Pawel Stolowski <[e-mail]>
- *
- * 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; 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef GENERICOPTIONSMODEL_H
-#define GENERICOPTIONSMODEL_H
-
-// Qt
-#include <QObject>
-#include <QAbstractListModel>
-#include <QHash>
-#include <QVector>
-
-class AbstractFilterOption;
-
-class Q_DECL_EXPORT GenericOptionsModel : public QAbstractListModel
-{
-    Q_OBJECT
-
-    Q_ENUMS(Roles)
-
-public:
-    GenericOptionsModel(bool showAllOption = false, QObject *parent = nullptr);
-    ~GenericOptionsModel();
-
-    enum Roles {
-        RoleId = Qt::UserRole,
-        RoleName,
-        RoleIconHint,
-        RoleActive
-    };
-
-    QHash<int, QByteArray> roleNames() const override;
-    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
-    int rowCount(const QModelIndex& parent = QModelIndex()) const override;
-
-    Q_INVOKABLE void setActive(int idx, bool value);
-    Q_INVOKABLE void setActive(const QString &id, bool value);
-
-    AbstractFilterOption* getRawOption(QVector<AbstractFilterOption *>::size_type idx) const;
-
-public Q_SLOTS:
-    virtual void ensureTheOnlyActive(AbstractFilterOption *activeOption);
-
-Q_SIGNALS:
-    void activeChanged(AbstractFilterOption *option);
-    void showAllActivated();
-
-protected Q_SLOTS:
-    void onOptionChanged();
-    void onActiveChanged();
-    void onShowAllClicked(bool active);
-
-protected:
-    void addOption(AbstractFilterOption *option, int index = -1);
-    void removeOption(int index);
-    int indexOf(const QString &option_id);
-
-    QVector<AbstractFilterOption *> m_options;
-};
-
-Q_DECLARE_METATYPE(GenericOptionsModel*)
-
-#endif // GENERICOPTIONSMODEL_H

=== removed file 'src/Unity/genericpreview.cpp'
--- src/Unity/genericpreview.cpp	2013-11-08 17:01:37 +0000
+++ src/Unity/genericpreview.cpp	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * Authors:
- *  Pawel Stolowski <[e-mail]>
- *
- * 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; 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-// local
-#include "genericpreview.h"
-
-GenericPreview::GenericPreview(QObject *parent):
-    Preview(parent)
-{
-}
-
-void GenericPreview::setUnityPreview(unity::dash::Preview::Ptr /* unityPreview */)
-{
-    Q_EMIT previewChanged();
-}

=== removed file 'src/Unity/genericpreview.h'
--- src/Unity/genericpreview.h	2013-11-08 17:01:37 +0000
+++ src/Unity/genericpreview.h	1970-01-01 00:00:00 +0000
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * Authors:
- *  Pawel Stolowski <[e-mail]>
- *
- * 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; 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef GENERICPREVIEW_H
-#define GENERICPREVIEW_H
-
-// local
-#include "preview.h"
-
-// Qt
-#include <QObject>
-#include <QMetaType>
-
-class GenericPreview : public Preview
-{
-    Q_OBJECT
-
-public:
-    explicit GenericPreview(QObject *parent = 0);
-
-Q_SIGNALS:
-    void previewChanged();
-
-protected:
-    void setUnityPreview(unity::dash::Preview::Ptr unityPreview) override;
-};
-
-Q_DECLARE_METATYPE(GenericPreview *)
-
-#endif

=== modified file 'src/Unity/iconutils.cpp'
--- src/Unity/iconutils.cpp	2014-02-19 17:51:44 +0000
+++ src/Unity/iconutils.cpp	2014-03-25 16:56:23 +0000
@@ -19,8 +19,6 @@
 
 #include "iconutils.h"
 
-#include <gio/gio.h>
-
 #include <QStringList>
 #include <QUrl>
 #include <QUrlQuery>
@@ -29,90 +27,17 @@
 #define BASE_THUMBNAILER_URI "image://thumbnailer/"
 #define BASE_ALBUMART_URI "image://albumart/"
 
-QString gIconToDeclarativeImageProviderString(QString const &giconString)
-{
-    if (giconString.isEmpty()) return giconString;
-
-    if (giconString.startsWith('/') || giconString.startsWith(QLatin1String("http")) ||
-            giconString.startsWith(QLatin1String("file:")) || giconString.startsWith(QLatin1String("image:"))) {
-        return giconString;
-    }
-
-    if (!giconString.startsWith(QLatin1String(". "))) {
-        // must be a themed icon
-        QString themedIcon(BASE_THEME_ICON_URI);
-        themedIcon.append(giconString);
-        return themedIcon;
-    }
-
-    // special case annotated icon
-    if (giconString.startsWith(QLatin1String(". UnityProtocolAnnotatedIcon "))) {
-        QString annotatedIcon;
-        QString serializedData(QUrl::fromPercentEncoding(giconString.mid(29).toUtf8()));
-        GVariant *variant = g_variant_parse(G_VARIANT_TYPE_VARDICT, serializedData.toUtf8().constData(), NULL, NULL, NULL);
-        gchar *baseUri;
-        if (variant != NULL && g_variant_lookup(variant, "base-icon", "&s", &baseUri)) {
-            annotatedIcon = gIconToDeclarativeImageProviderString(QString(baseUri));
-            // FIXME: enclose in image://annotated/... once unity supports that
-        }
-        if (variant != NULL) g_variant_unref(variant);
-
-        return annotatedIcon;
-    }
-
-    // handle real gicon strings
-    QString result;
-    GError *error = NULL;
-    GIcon *icon = g_icon_new_for_string(giconString.toLocal8Bit().constData(), &error);
-    if (error != NULL || icon == NULL) {
-        qWarning("Unable to deserialize icon: %s", giconString.toLocal8Bit().constData());
-        g_clear_error(&error);
-        return result;
-    }
-
-    if (G_IS_THEMED_ICON(icon)) {
-        QString themedIcon(BASE_THEME_ICON_URI);
-        QStringList list;
-        const char* const *iconNames = g_themed_icon_get_names(G_THEMED_ICON(icon));
-        if (iconNames != NULL) {
-            for (const char * const *iter = iconNames; *iter != NULL; ++iter) {
-                list << QLatin1String(*iter);
-            }
-        }
-        themedIcon.append(list.join(QString(",")));
-        result = themedIcon;
-    } else if (G_IS_FILE_ICON(icon)) {
-        GFile *file = g_file_icon_get_file(G_FILE_ICON(icon));
-        gchar *uri = g_file_get_uri(file);
-        QString iconUri(uri);
-        g_free(uri);
-        result = iconUri;
-    }
-
-    g_object_unref(icon);
-
-    return result;
-}
-
-QString uriToThumbnailerProviderString(QString const &uri, QString const &mimetype, QVariantHash const &metadata)
+QString uriToThumbnailerProviderString(QString const &uri, QVariantHash const &metadata)
 {
     if (uri.startsWith(QLatin1String("file:///")) || uri.startsWith(QLatin1String("album://"))) {
-        bool isAudio = mimetype.startsWith(QLatin1String("audio/"));
+        bool isAlbum = metadata.contains("album") && metadata.contains("artist");
         QString thumbnailerUri;
-        if (isAudio) {
+        if (isAlbum) {
             thumbnailerUri = BASE_ALBUMART_URI;
-            if (metadata.contains("content")) {
-                QVariantHash contentHash = metadata["content"].toHash();
-                if (contentHash.contains("content")) { // nested content in Home?
-                    contentHash = contentHash["content"].toHash();
-                }
-                if (contentHash.contains("album") && contentHash.contains("artist")) {
-                    QUrlQuery query;
-                    query.addQueryItem(QStringLiteral("artist"), contentHash["artist"].toString());
-                    query.addQueryItem(QStringLiteral("album"), contentHash["album"].toString());
-                    thumbnailerUri.append(query.toString());
-                }
-            }
+            QUrlQuery query;
+            query.addQueryItem(QStringLiteral("artist"), metadata["artist"].toString());
+            query.addQueryItem(QStringLiteral("album"), metadata["album"].toString());
+            thumbnailerUri.append(query.toString());
         } else {
             thumbnailerUri = BASE_THUMBNAILER_URI;
             thumbnailerUri.append(uri.midRef(7));

=== modified file 'src/Unity/iconutils.h'
--- src/Unity/iconutils.h	2013-11-08 17:01:37 +0000
+++ src/Unity/iconutils.h	2014-03-25 16:56:23 +0000
@@ -23,7 +23,6 @@
 #include <QString>
 #include <QVariant>
 
-QString gIconToDeclarativeImageProviderString(QString const &giconString);
-QString uriToThumbnailerProviderString(QString const &uri, QString const &mimetype, QVariantHash const &metadata);
+QString uriToThumbnailerProviderString(QString const &uri, QVariantHash const &metadata);
 
 #endif

=== removed file 'src/Unity/moviepreview.cpp'
--- src/Unity/moviepreview.cpp	2013-11-08 17:01:37 +0000
+++ src/Unity/moviepreview.cpp	1970-01-01 00:00:00 +0000
@@ -1,67 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * Authors:
- *  Pawel Stolowski <[e-mail]>
- *
- * 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; 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-// local
-#include "moviepreview.h"
-
-// Qt
-#include <QDebug>
-
-MoviePreview::MoviePreview(QObject *parent):
-    Preview(parent),
-    m_unityMoviePreview(nullptr)
-{
-}
-
-QString MoviePreview::year() const
-{
-    if (m_unityMoviePreview) {
-        return QString::fromStdString(m_unityMoviePreview->year());
-    } else {
-        qWarning() << "Preview not set";
-    }
-    return QString();
-}
-
-float MoviePreview::rating() const
-{
-    if (m_unityMoviePreview) {
-        return m_unityMoviePreview->rating();
-    } else {
-        qWarning() << "Preview not set";
-    }
-    return 0.0f;
-}
-
-unsigned int MoviePreview::numRatings() const
-{
-    if (m_unityMoviePreview) {
-        return m_unityMoviePreview->num_ratings();
-    } else {
-        qWarning() << "Preview not set";
-    }
-    return 0;
-}
-
-void MoviePreview::setUnityPreview(unity::dash::Preview::Ptr unityPreview)
-{
-    m_unityMoviePreview = std::dynamic_pointer_cast<unity::dash::MoviePreview>(unityPreview);
-
-    Q_EMIT previewChanged();
-}

=== removed file 'src/Unity/moviepreview.h'
--- src/Unity/moviepreview.h	2013-11-08 17:01:37 +0000
+++ src/Unity/moviepreview.h	1970-01-01 00:00:00 +0000
@@ -1,60 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * Authors:
- *  Pawel Stolowski <[e-mail]>
- *
- * 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; 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef MOVIEPREVIEW_H
-#define MOVIEPREVIEW_H
-
-// local
-#include "preview.h"
-
-// Qt
-#include <QObject>
-#include <QMetaType>
-
-// libunity-core
-#include <UnityCore/MoviePreview.h>
-
-class Q_DECL_EXPORT MoviePreview: public Preview
-{
-    Q_OBJECT
-
-    Q_PROPERTY(QString year READ year NOTIFY previewChanged)
-    Q_PROPERTY(float rating READ rating NOTIFY previewChanged)
-    Q_PROPERTY(unsigned int numRatings READ numRatings NOTIFY previewChanged)
-
-public:
-    explicit MoviePreview(QObject *parent = 0);
-
-    QString year() const;
-    float rating() const;
-    unsigned int numRatings() const;
-
-Q_SIGNALS:
-    void previewChanged();
-
-protected:
-    void setUnityPreview(unity::dash::Preview::Ptr unityPreview) override;
-
-private:
-    unity::dash::MoviePreview::Ptr m_unityMoviePreview;
-};
-
-Q_DECLARE_METATYPE(MoviePreview *)
-
-#endif

=== removed file 'src/Unity/multirangefilter.cpp'
--- src/Unity/multirangefilter.cpp	2013-11-08 17:01:37 +0000
+++ src/Unity/multirangefilter.cpp	1970-01-01 00:00:00 +0000
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2011, 2013 Canonical, Ltd.
- *
- * Authors:
- *  Florian Boucault <[e-mail]>
- *  Pawel Stolowski <[e-mail]>
- *
- * 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; 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-// Self
-#include "multirangefilter.h"
-
-// local
-#include "unityoptionsmodel.h"
-
-MultiRangeFilter::MultiRangeFilter(QObject *parent) :
-    Filter(parent), m_unityMultiRangeFilter(nullptr), m_options(nullptr)
-{
-}
-
-GenericOptionsModel* MultiRangeFilter::options() const
-{
-    return m_options;
-}
-
-void MultiRangeFilter::setUnityFilter(unity::dash::Filter::Ptr filter)
-{
-    Filter::setUnityFilter(filter);
-    m_unityMultiRangeFilter = std::dynamic_pointer_cast<unity::dash::MultiRangeFilter>(m_unityFilter);
-
-    onOptionsChanged(m_unityMultiRangeFilter->options);
-}
-
-void MultiRangeFilter::onOptionsChanged(unity::dash::MultiRangeFilter::Options options)
-{
-    if (m_options != nullptr) {
-        m_signals.disconnectAll();
-        delete m_options;
-        m_options = nullptr;
-    }
-
-    m_options = new UnityOptionsModel(this, options,
-                                      m_unityMultiRangeFilter->option_added,
-                                      m_unityMultiRangeFilter->option_removed,
-                                      m_unityMultiRangeFilter->show_all_button);
-
-    connect(m_options, SIGNAL(activeChanged(AbstractFilterOption *)), m_options, SLOT(ensureTheOnlyActive(AbstractFilterOption *)));
-    connect(m_options, SIGNAL(showAllActivated()), this, SLOT(clear()));
-
-    /* Property change signals */
-    m_signals << m_unityMultiRangeFilter->options.changed.connect(sigc::mem_fun(this, &MultiRangeFilter::onOptionsChanged));
-
-    Q_EMIT optionsChanged();
-}

=== removed file 'src/Unity/multirangefilter.h'
--- src/Unity/multirangefilter.h	2013-11-08 17:01:37 +0000
+++ src/Unity/multirangefilter.h	1970-01-01 00:00:00 +0000
@@ -1,60 +0,0 @@
-/*
- * Copyright (C) 2011, 2013 Canonical, Ltd.
- *
- * Authors:
- *  Florian Boucault <[e-mail]>
- *  Pawel Stolowski <[e-mail]>
- *
- * 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; 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef MULTIRANGEFILTER_H
-#define MULTIRANGEFILTER_H
-
-// Qt
-#include <QObject>
-#include <QMetaType>
-
-// libunity-core
-#include <UnityCore/MultiRangeFilter.h>
-
-// Local
-#include "filter.h"
-#include "signalslist.h"
-
-class GenericOptionsModel;
-
-class Q_DECL_EXPORT MultiRangeFilter : public Filter
-{
-    Q_OBJECT
-
-public:
-    explicit MultiRangeFilter(QObject *parent = nullptr);
-
-    /* getters */
-    GenericOptionsModel* options() const override;
-
-protected:
-    void setUnityFilter(unity::dash::Filter::Ptr filter) override;
-
-private:
-    unity::dash::MultiRangeFilter::Ptr m_unityMultiRangeFilter;
-    SignalsList m_signals;
-    GenericOptionsModel* m_options;
-
-    void onOptionsChanged(unity::dash::MultiRangeFilter::Options);
-};
-
-Q_DECLARE_METATYPE(MultiRangeFilter*)
-
-#endif // MULTIRANGEFILTER_H

=== removed file 'src/Unity/musicpreview.cpp'
--- src/Unity/musicpreview.cpp	2013-11-25 11:21:45 +0000
+++ src/Unity/musicpreview.cpp	1970-01-01 00:00:00 +0000
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * Authors:
- *  Pawel Stolowski <[e-mail]>
- *
- * 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; 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "musicpreview.h"
-#include "musicpreviewtrackmodel.h"
-
-#include <QDebug>
-
-MusicPreview::MusicPreview(QObject *parent):
-    Preview(parent),
-    m_unityMusicPreview(nullptr)
-{
-    m_tracks = new MusicPreviewTrackModel(this);
-}
-
-void MusicPreview::setUnityPreview(unity::dash::Preview::Ptr unityPreview)
-{
-    m_unityMusicPreview = std::dynamic_pointer_cast<unity::dash::MusicPreview>(unityPreview);
-    m_tracks->setModel(m_unityMusicPreview->GetTracksModel()->model());
-    m_unityMusicPreview->GetTracksModel()->model.changed.connect(sigc::mem_fun(this, &MusicPreview::onTracksModelChanged));
-
-    Q_EMIT previewChanged();
-    Q_EMIT tracksChanged();
-}
-
-MusicPreviewTrackModel* MusicPreview::tracks() const
-{
-    if (m_unityMusicPreview == nullptr) {
-        qWarning() << "Preview not set";
-    }
-    return m_tracks;
-}
-
-void MusicPreview::onTracksModelChanged(unity::glib::Object<DeeModel> /* model */)
-{
-    m_tracks->setModel(m_unityMusicPreview->GetTracksModel()->model());
-}

=== removed file 'src/Unity/musicpreview.h'
--- src/Unity/musicpreview.h	2013-11-25 11:21:45 +0000
+++ src/Unity/musicpreview.h	1970-01-01 00:00:00 +0000
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * Authors:
- *  Pawel Stolowski <[e-mail]>
- *
- * 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; 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef MUSICPREVIEW_H
-#define MUSICPREVIEW_H
-
-// local
-#include "preview.h"
-
-// Qt
-#include <QObject>
-#include <QMetaType>
-
-// libunity-core
-#include <UnityCore/MusicPreview.h>
-
-class MusicPreviewTrackModel;
-
-class Q_DECL_EXPORT MusicPreview: public Preview
-{
-    Q_OBJECT
-
-    Q_PROPERTY(MusicPreviewTrackModel* tracks READ tracks NOTIFY tracksChanged)
-
-public:
-    explicit MusicPreview(QObject *parent = 0);
-
-    MusicPreviewTrackModel* tracks() const;
-
-Q_SIGNALS:
-    void tracksChanged();
-
-protected:
-    void setUnityPreview(unity::dash::Preview::Ptr unityPreview) override;
-
-private Q_SLOTS:
-    void onTracksModelChanged(unity::glib::Object<DeeModel> model);
-
-private:
-    unity::dash::MusicPreview::Ptr m_unityMusicPreview;
-    MusicPreviewTrackModel *m_tracks;
-};
-
-Q_DECLARE_METATYPE(MusicPreview *)
-
-#endif

=== removed file 'src/Unity/musicpreviewtrackmodel.cpp'
--- src/Unity/musicpreviewtrackmodel.cpp	2013-11-25 12:10:02 +0000
+++ src/Unity/musicpreviewtrackmodel.cpp	1970-01-01 00:00:00 +0000
@@ -1,68 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * 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; 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *  Michael Zanetti <[e-mail]>
- */
-
-#include "musicpreviewtrackmodel.h"
-
-#include <QTime>
-
-// TODO: use something from libunity once it's public
-enum ResultsColumn {
-    URI,
-    TRACK_NO,
-    TITLE,
-    LENGTH,
-    PLAY_STATE,
-    PROGRESS
-};
-
-MusicPreviewTrackModel::MusicPreviewTrackModel(QObject *parent): DeeListModel(parent)
-{
-    m_roles.insert(RoleUri, "uri");
-    m_roles.insert(RoleTrackNo, "trackNo");
-    m_roles.insert(RoleTitle, "title");
-    m_roles.insert(RoleLength, "length");
-}
-
-QVariant MusicPreviewTrackModel::data(const QModelIndex &index, int role) const
-{
-    switch(role) {
-    case RoleUri:
-        return DeeListModel::data(index, ResultsColumn::URI);
-    case RoleTrackNo:
-        return DeeListModel::data(index, ResultsColumn::TRACK_NO);
-    case RoleTitle:
-        return DeeListModel::data(index, ResultsColumn::TITLE);
-    case RoleLength: {
-        QTime length = QTime(0,0).addSecs(DeeListModel::data(index, ResultsColumn::LENGTH).toInt());
-        if (length.hour() > 0) {
-            return length.toString("h:mm:ss");
-        }
-        if (!length.isNull()) {
-            return length.toString("m:ss");
-        }
-        return QVariant();
-    }
-    }
-    return QVariant();
-}
-
-QHash<int, QByteArray> MusicPreviewTrackModel::roleNames() const
-{
-    return m_roles;
-}

=== removed file 'src/Unity/musicpreviewtrackmodel.h'
--- src/Unity/musicpreviewtrackmodel.h	2013-11-25 12:10:02 +0000
+++ src/Unity/musicpreviewtrackmodel.h	1970-01-01 00:00:00 +0000
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * 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; 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *  Michael Zanetti <[e-mail]>
- */
-
-#ifndef MUSICPREVIEWTRACKMODEL_H
-#define MUSICPREVIEWTRACKMODEL_H
-
-#include "deelistmodel.h"
-
-class Q_DECL_EXPORT MusicPreviewTrackModel : public DeeListModel
-{
-    Q_OBJECT
-    Q_ENUMS(Roles)
-
-public:
-    explicit MusicPreviewTrackModel(QObject* parent = 0);
-
-    enum Roles {
-        RoleUri,
-        RoleTrackNo,
-        RoleTitle,
-        RoleLength
-    };
-
-    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;
-
-    QHash<int, QByteArray> roleNames() const;
-
-private:
-    QHash<int, QByteArray> m_roles;
-};
-
-#endif // MUSICPREVIEWTRACKMODEL_H

=== modified file 'src/Unity/plugin.cpp'
--- src/Unity/plugin.cpp	2014-02-20 10:39:15 +0000
+++ src/Unity/plugin.cpp	2014-03-25 16:56:23 +0000
@@ -24,46 +24,18 @@
 #include "plugin.h"
 
 // local
-#include "preview.h"
-#include "previewaction.h"
-#include "previewinfohint.h"
-#include "socialpreviewcomment.h"
+#include "scopes.h"
 #include "scope.h"
-#include "scopes.h"
 #include "categories.h"
-#include "categoryresults.h"
-#include "genericoptionsmodel.h"
-#include "result.h"
-#include "musicpreviewtrackmodel.h"
-
-#include "scopes-ng/scopes.h"
-#include "scopes-ng/scope.h"
-#include "scopes-ng/categories.h"
-#include "scopes-ng/resultsmodel.h"
-#include "scopes-ng/previewstack.h"
-#include "scopes-ng/previewmodel.h"
-#include "scopes-ng/previewwidgetmodel.h"
-
-// libqtdee
-#include "deelistmodel.h"
+#include "resultsmodel.h"
+#include "previewstack.h"
+#include "previewmodel.h"
+#include "previewwidgetmodel.h"
 
 void UnityPlugin::registerTypes(const char *uri)
 {
     Q_ASSERT(uri == QLatin1String("Unity"));
 
-    qmlRegisterUncreatableType<Preview>(uri, 0, 1, "Preview", "Can't create Preview object in QML.");
-    qmlRegisterUncreatableType<PreviewAction>(uri, 0, 1, "PreviewAction", "Can't create PreviewAction object in QML.");
-    qmlRegisterUncreatableType<PreviewInfoHint>(uri, 0, 1, "PreviewInfoHint", "Can't create PreviewInfoHint object in QML.");
-    qmlRegisterUncreatableType<SocialPreviewComment>(uri, 0, 1, "SocialPreviewComment", "Can't create SocialPreviewComment object in QML.");
-    qmlRegisterUncreatableType<GenericOptionsModel>(uri, 0, 1, "GenericOptionsModel", "Can't create options model in QML.");
-    qmlRegisterUncreatableType<Result>(uri, 0, 1, "Result", "Can't create result object in QML.");
-    qmlRegisterType<Scope>(uri, 0, 1, "Scope");
-    qmlRegisterType<Scopes>(uri, 0, 1, "Scopes");
-    qmlRegisterType<Categories>(uri, 0, 1, "Categories");
-    qmlRegisterUncreatableType<CategoryResults>(uri, 0, 1, "CategoryResults", "Can't create new Category Results in QML. Get them from Categories instance.");
-    qmlRegisterType<DeeListModel>(uri, 0, 1, "DeeListModel");
-    qmlRegisterType<MusicPreviewTrackModel>(uri, 0, 1, "MusicPreviewTrackModel");
-
     // new Scopes classes
     qmlRegisterType<scopes_ng::Scope>(uri, 0, 2, "Scope");
     qmlRegisterType<scopes_ng::Scopes>(uri, 0, 2, "Scopes");
@@ -77,7 +49,4 @@
 void UnityPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
 {
     QQmlExtensionPlugin::initializeEngine(engine, uri);
-#ifndef GLIB_VERSION_2_36
-    g_type_init();
-#endif
 }

=== removed file 'src/Unity/preview.cpp'
--- src/Unity/preview.cpp	2013-11-08 17:01:37 +0000
+++ src/Unity/preview.cpp	1970-01-01 00:00:00 +0000
@@ -1,199 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * Authors:
- *  Pawel Stolowski <[e-mail]>
- *
- * 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; 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-// local
-#include "preview.h"
-#include "previewaction.h"
-#include "previewinfohint.h"
-#include "genericpreview.h"
-#include "applicationpreview.h"
-#include "moviepreview.h"
-#include "musicpreview.h"
-#include "socialpreview.h"
-#include "iconutils.h"
-#include "variantutils.h"
-
-// Qt
-#include <QDebug>
-#include <QtAlgorithms>
-
-#include <UnityCore/GenericPreview.h>
-#include <UnityCore/ApplicationPreview.h>
-#include <UnityCore/MoviePreview.h>
-#include <UnityCore/MusicPreview.h>
-#include <UnityCore/SocialPreview.h>
-
-#include <UnityCore/GLibWrapper.h>
-
-Preview::Preview(QObject *parent):
-    QObject(parent),
-    m_unityPreview(nullptr),
-    m_result(new Result(this))
-{
-}
-
-QString Preview::rendererName() const
-{
-    if (m_unityPreview) {
-        return QString::fromStdString(m_unityPreview->renderer_name());
-    } else {
-        qWarning() << "Preview not set";
-    }
-    return QString();
-}
-
-QString Preview::title() const
-{
-    if (m_unityPreview) {
-        return QString::fromStdString(m_unityPreview->title());
-    } else {
-        qWarning() << "Preview not set";
-    }
-    return QString();
-}
-
-QString Preview::subtitle () const
-{
-    if (m_unityPreview) {
-        return QString::fromStdString(m_unityPreview->subtitle());
-    } else {
-        qWarning() << "Preview not set";
-    }
-    return QString();
-}
-
-QString Preview::description() const
-{
-    if (m_unityPreview) {
-        return QString::fromStdString(m_unityPreview->description());
-    } else {
-        qWarning() << "Preview not set";
-    }
-    return QString();
-}
-
-QVariant Preview::actions()
-{
-    return QVariant::fromValue(m_actions);
-}
-
-QVariant Preview::infoHints()
-{
-    return QVariant::fromValue(m_infoHints);
-}
-
-QVariantMap Preview::infoHintsHash() const
-{
-    return m_infoHintsHash;
-}
-
-QString Preview::image() const
-{
-    if (m_unityPreview) {
-        if (m_unityPreview->image() != nullptr) {
-            auto giconString = g_icon_to_string(m_unityPreview->image());
-            QString result(gIconToDeclarativeImageProviderString(QString::fromUtf8(giconString)));
-            g_free(giconString);
-            return result;
-        } else {
-            QString sourceMedia(QString::fromStdString(m_unityPreview->image_source_uri()));
-            QString thumbnailUri(uriToThumbnailerProviderString(sourceMedia, m_result->mimeType(), m_result->metadata().toHash()));
-            if (!thumbnailUri.isNull()) return thumbnailUri;
-        }
-    } else {
-        qWarning() << "Preview not set";
-    }
-    return QString::null;
-}
-
-QVariant Preview::result() const
-{
-    return QVariant::fromValue(m_result);
-}
-
-Preview* Preview::newFromUnityPreview(unity::dash::Preview::Ptr unityPreview)
-{
-    Preview* preview = nullptr;
-
-    if (dynamic_cast<unity::dash::GenericPreview *>(unityPreview.get()) != nullptr) {
-        preview = new GenericPreview();
-    } else if (dynamic_cast<unity::dash::MusicPreview *>(unityPreview.get()) != nullptr) {
-        preview = new MusicPreview();
-    } else if (dynamic_cast<unity::dash::MoviePreview *>(unityPreview.get()) != nullptr) {
-        preview = new MoviePreview();
-    } else if (dynamic_cast<unity::dash::ApplicationPreview *>(unityPreview.get()) != nullptr) {
-        preview = new ApplicationPreview();
-    } else if (dynamic_cast<unity::dash::SocialPreview *>(unityPreview.get()) != nullptr) {
-        preview = new SocialPreview();
-    } else {
-        qWarning() << "Unknown preview type: " << typeid(*unityPreview).name();
-        preview = new GenericPreview();
-    }
-
-    preview->setUnityPreviewBase(unityPreview);
-    preview->setUnityPreview(unityPreview);
-
-    return preview;
-}
-
-void Preview::setUnityPreviewBase(unity::dash::Preview::Ptr unityPreview)
-{
-    m_unityPreview = unityPreview;
-    m_result->setPreview(unityPreview);
-
-    qDeleteAll(m_infoHints);
-    m_infoHints.clear();
-    m_infoHintsHash.clear();
-    qDeleteAll(m_actions);
-    m_actions.clear();
-
-    for (auto unityInfoHint: m_unityPreview->GetInfoHints()) {
-        auto hint = new PreviewInfoHint(this);
-        hint->setUnityInfoHint(unityInfoHint);
-        m_infoHints.append(hint);
-        m_infoHintsHash[hint->id()] = QVariant::fromValue(hint);
-    }
-
-    for (auto unityAction: m_unityPreview->GetActions()) {
-        auto action = new PreviewAction(this);
-        action->setUnityAction(unityAction);
-        m_actions.append(action);
-    }
-}
-
-void Preview::setUnityPreview(unity::dash::Preview::Ptr /* unityPreview */)
-{
-    // default implementation does nothing
-}
-
-void Preview::execute(const QString& actionId, const QHash<QString, QVariant>& hints)
-{
-    if (m_unityPreview) {
-        auto unityHints = convertToHintsMap(hints);
-        m_actionCancellable.Renew();
-        m_unityPreview->PerformAction(actionId.toStdString(), unityHints, nullptr, m_actionCancellable);
-    } else {
-        qWarning() << "Preview not set";
-    }
-}
-
-void Preview::cancelAction()
-{
-    m_actionCancellable.Cancel();
-}

=== removed file 'src/Unity/preview.h'
--- src/Unity/preview.h	2013-11-08 17:01:37 +0000
+++ src/Unity/preview.h	1970-01-01 00:00:00 +0000
@@ -1,89 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * Authors:
- *  Pawel Stolowski <[e-mail]>
- *
- * 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; 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef PREVIEW_H
-#define PREVIEW_H
-
-// Qt
-#include <QObject>
-#include <QString>
-#include <QMetaType>
-#include <QList>
-#include <QVariantMap>
-
-// libunity-core
-#include <UnityCore/Preview.h>
-
-// local
-#include "result.h"
-#include "previewaction.h"
-#include <UnityCore/GLibWrapper.h>
-
-class Q_DECL_EXPORT Preview : public QObject
-{
-    Q_OBJECT
-
-    Q_PROPERTY(QString rendererName READ rendererName NOTIFY previewChanged)
-    Q_PROPERTY(QString title READ title NOTIFY previewChanged)
-    Q_PROPERTY(QString subtitle READ subtitle NOTIFY previewChanged)
-    Q_PROPERTY(QString description READ description NOTIFY previewChanged)
-    Q_PROPERTY(QVariant actions READ actions NOTIFY previewChanged)
-    Q_PROPERTY(QVariant infoHints READ infoHints NOTIFY previewChanged)
-    Q_PROPERTY(QVariantMap infoMap READ infoHintsHash NOTIFY previewChanged)
-    Q_PROPERTY(QString image READ image NOTIFY previewChanged)
-    Q_PROPERTY(QVariant result READ result NOTIFY previewChanged)
-
-public:
-    explicit Preview(QObject *parent = 0);
-    static Preview* newFromUnityPreview(unity::dash::Preview::Ptr unityPreview);
-
-    QString rendererName() const;
-    QString title() const;
-    QString subtitle() const;
-    QString description() const;
-    QVariant actions();
-    QVariant infoHints();
-    QVariantMap infoHintsHash() const;
-    QString image() const;
-    QVariant result() const;
-
-    Q_INVOKABLE void execute(const QString& actionId, const QHash<QString, QVariant>& hints);
-    Q_INVOKABLE void cancelAction();
-
-Q_SIGNALS:
-    void previewChanged();
-
-protected:
-    virtual void setUnityPreview(unity::dash::Preview::Ptr unityPreview);
-
-    unity::dash::Preview::Ptr m_unityPreview;
-    Result* m_result;
-
-private:
-    void setUnityPreviewBase(unity::dash::Preview::Ptr unityPreview);
-
-    QList<QObject *> m_actions;
-    QList<QObject *> m_infoHints;
-    QVariantMap m_infoHintsHash;
-    unity::glib::Cancellable m_actionCancellable;
-};
-
-Q_DECLARE_METATYPE(Preview *)
-
-#endif

=== removed file 'src/Unity/previewaction.cpp'
--- src/Unity/previewaction.cpp	2013-11-08 17:01:37 +0000
+++ src/Unity/previewaction.cpp	1970-01-01 00:00:00 +0000
@@ -1,75 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * Authors:
- *  Pawel Stolowski <[e-mail]>
- *
- * 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; 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "previewaction.h"
-
-PreviewAction::PreviewAction(QObject *parent)
-    : QObject(parent),
-      m_unityAction(nullptr)
-{
-}
-
-void PreviewAction::setUnityAction(unity::dash::Preview::ActionPtr unityAction)
-{
-    m_unityAction = unityAction;
-
-    Q_EMIT previewActionChanged();
-}
-
-QString PreviewAction::id() const
-{
-    if (m_unityAction)
-        return QString::fromStdString(m_unityAction->id);
-    return QString();
-}
-
-QString PreviewAction::displayName() const
-{
-    if (m_unityAction)
-        return QString::fromStdString(m_unityAction->display_name);
-    return QString();
-}
-
-QString PreviewAction::iconHint() const
-{
-    if (m_unityAction)
-        return QString::fromStdString(m_unityAction->icon_hint);
-    return QString();
-}
-
-QString PreviewAction::extraText() const
-{
-    if (m_unityAction)
-        return QString::fromStdString(m_unityAction->extra_text);
-    return QString();
-}
-
-QString PreviewAction::activationUri() const
-{
-    if (m_unityAction)
-        return QString::fromStdString(m_unityAction->activation_uri);
-    return QString();
-}
-
-LayoutHint PreviewAction::layoutHint() const
-{
-    if (m_unityAction)
-        return static_cast<LayoutHint>(m_unityAction->layout_hint);
-    return LayoutHint::None;
-}

=== removed file 'src/Unity/previewaction.h'
--- src/Unity/previewaction.h	2013-11-08 17:01:37 +0000
+++ src/Unity/previewaction.h	1970-01-01 00:00:00 +0000
@@ -1,71 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * Authors:
- *  Pawel Stolowski <[e-mail]>
- *
- * 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; 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef PREVIEWACTION_H
-#define PREVIEWACTION_H
-
-// Qt
-#include <QObject>
-#include <QList>
-
-// libuinity-core
-#include <UnityCore/Preview.h>
-
-enum LayoutHint // keep in sync with unty::dash::LayoutHint
-{
-    None,
-    Left,
-    Right,
-    Top,
-    Bottom
-};
-
-class Q_DECL_EXPORT PreviewAction : public QObject
-{
-    Q_OBJECT
-
-    Q_PROPERTY(QString id READ id NOTIFY previewActionChanged)
-    Q_PROPERTY(QString displayName READ displayName NOTIFY previewActionChanged)
-    Q_PROPERTY(QString iconHint READ iconHint NOTIFY previewActionChanged)
-    Q_PROPERTY(QString extraText READ extraText NOTIFY previewActionChanged)
-    Q_PROPERTY(QString activationUri READ activationUri NOTIFY previewActionChanged)
-    Q_PROPERTY(LayoutHint layoutHint READ layoutHint NOTIFY previewActionChanged)
-
-public:
-    explicit PreviewAction(QObject *parent = 0);
-    void setUnityAction(unity::dash::Preview::ActionPtr unityAction);
-
-    QString id() const;
-    QString displayName() const;
-    QString iconHint() const;
-    QString extraText() const;
-    QString activationUri() const;
-    LayoutHint layoutHint() const;
-
-Q_SIGNALS:
-    void previewActionChanged();
-
-private:
-    unity::dash::Preview::ActionPtr m_unityAction;
-};
-
-Q_DECLARE_METATYPE(PreviewAction *)
-Q_DECLARE_METATYPE(LayoutHint)
-
-#endif

=== removed file 'src/Unity/previewinfohint.cpp'
--- src/Unity/previewinfohint.cpp	2013-11-08 17:01:37 +0000
+++ src/Unity/previewinfohint.cpp	1970-01-01 00:00:00 +0000
@@ -1,67 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * Authors:
- *  Pawel Stolowski <[e-mail]>
- *
- * 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; 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <deelistmodel.h>
-// local
-#include "previewinfohint.h"
-
-PreviewInfoHint::PreviewInfoHint(QObject *parent):
-    QObject(parent),
-    m_unityInfoHint(nullptr)
-{
-}
-
-void PreviewInfoHint::setUnityInfoHint(unity::dash::Preview::InfoHintPtr unityInfoHint)
-{
-    m_unityInfoHint = unityInfoHint;
-
-    Q_EMIT previewInfoHintChanged();
-}
-
-QString PreviewInfoHint::id() const
-{
-    if (m_unityInfoHint) {
-        return QString::fromStdString(m_unityInfoHint->id);
-    }
-    return QString();
-}
-
-QString PreviewInfoHint::displayName() const
-{
-    if (m_unityInfoHint) {
-        return QString::fromStdString(m_unityInfoHint->display_name);
-    }
-    return QString();
-}
-
-QString PreviewInfoHint::iconHint() const
-{
-   if (m_unityInfoHint) {
-       return QString::fromStdString(m_unityInfoHint->icon_hint);
-   }
-   return QString();
-}
-
-QVariant PreviewInfoHint::value() const
-{
-    if (m_unityInfoHint) {
-        return DeeListModel::VariantForData(m_unityInfoHint->value);
-    }
-    return QVariant();
-}

=== removed file 'src/Unity/previewinfohint.h'
--- src/Unity/previewinfohint.h	2013-11-08 17:01:37 +0000
+++ src/Unity/previewinfohint.h	1970-01-01 00:00:00 +0000
@@ -1,58 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * Authors:
- *  Pawel Stolowski <[e-mail]>
- *
- * 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; 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef PREVIEWINFOHINT_H
-#define PREVIEWINFOHINT_H
-
-// Qt
-#include <QObject>
-#include <QString>
-#include <QVariant>
-
-// libunity-core
-#include <UnityCore/Preview.h>
-
-class PreviewInfoHint : public QObject
-{
-    Q_OBJECT
-
-    Q_PROPERTY(QString id READ id NOTIFY previewInfoHintChanged)
-    Q_PROPERTY(QString displayName READ displayName NOTIFY previewInfoHintChanged)
-    Q_PROPERTY(QString iconHint READ iconHint NOTIFY previewInfoHintChanged)
-    Q_PROPERTY(QVariant value READ value NOTIFY previewInfoHintChanged)
-
-public:
-    explicit PreviewInfoHint(QObject *parent = 0);
-    void setUnityInfoHint(unity::dash::Preview::InfoHintPtr unityInfoHint);
-
-    QString id() const;
-    QString displayName() const;
-    QString iconHint() const;
-    QVariant value() const;
-
-Q_SIGNALS:
-    void previewInfoHintChanged();
-
-private:
-    unity::dash::Preview::InfoHintPtr m_unityInfoHint;
-};
-
-Q_DECLARE_METATYPE(PreviewInfoHint *)
-
-#endif

=== renamed file 'src/Unity/scopes-ng/previewmodel.cpp' => 'src/Unity/previewmodel.cpp'
=== renamed file 'src/Unity/scopes-ng/previewmodel.h' => 'src/Unity/previewmodel.h'
=== renamed file 'src/Unity/scopes-ng/previewstack.cpp' => 'src/Unity/previewstack.cpp'
=== renamed file 'src/Unity/scopes-ng/previewstack.h' => 'src/Unity/previewstack.h'
=== renamed file 'src/Unity/scopes-ng/previewwidgetmodel.cpp' => 'src/Unity/previewwidgetmodel.cpp'
=== renamed file 'src/Unity/scopes-ng/previewwidgetmodel.h' => 'src/Unity/previewwidgetmodel.h'
=== removed file 'src/Unity/radiooptionfilter.cpp'
--- src/Unity/radiooptionfilter.cpp	2013-11-08 17:01:37 +0000
+++ src/Unity/radiooptionfilter.cpp	1970-01-01 00:00:00 +0000
@@ -1,61 +0,0 @@
-/*
- * Copyright (C) 2011, 2013 Canonical, Ltd.
- *
- * Authors:
- *  Florian Boucault <[e-mail]>
- *  Pawel Stolowski <[e-mail]>
- *
- * 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; 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-// Self
-#include "radiooptionfilter.h"
-
-// local
-#include "unityoptionsmodel.h"
-
-RadioOptionFilter::RadioOptionFilter(QObject *parent) :
-    Filter(parent), m_unityRadioOptionFilter(nullptr), m_options(nullptr)
-{
-}
-
-GenericOptionsModel* RadioOptionFilter::options() const
-{
-    return m_options;
-}
-
-void RadioOptionFilter::setUnityFilter(unity::dash::Filter::Ptr filter)
-{
-    Filter::setUnityFilter(filter);
-    m_unityRadioOptionFilter = std::dynamic_pointer_cast<unity::dash::RadioOptionFilter>(m_unityFilter);
-
-    onOptionsChanged(m_unityRadioOptionFilter->options);
-}
-
-void RadioOptionFilter::onOptionsChanged(unity::dash::RadioOptionFilter::RadioOptions)
-{
-    if (m_options != nullptr) {
-        m_signals.disconnectAll();
-        delete m_options;
-        m_options = nullptr;
-    }
-    m_options = new UnityOptionsModel(this, m_unityRadioOptionFilter->options,
-                                      m_unityRadioOptionFilter->option_added,
-                                      m_unityRadioOptionFilter->option_removed,
-                                      m_unityRadioOptionFilter->show_all_button);
-    connect(m_options, SIGNAL(showAllActivated()), this, SLOT(clear()));
-
-    m_signals << m_unityRadioOptionFilter->options.changed.connect(sigc::mem_fun(this, &RadioOptionFilter::onOptionsChanged));
-
-    Q_EMIT optionsChanged();
-}

=== removed file 'src/Unity/radiooptionfilter.h'
--- src/Unity/radiooptionfilter.h	2013-11-08 17:01:37 +0000
+++ src/Unity/radiooptionfilter.h	1970-01-01 00:00:00 +0000
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2011, 2013 Canonical, Ltd.
- *
- * Authors:
- *  Florian Boucault <[e-mail]>
- *  Pawel Stolowski <[e-mail]>
- *
- * 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; 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef RADIOOPTIONFILTER_H
-#define RADIOOPTIONFILTER_H
-
-// Qt
-#include <QObject>
-#include <QMetaType>
-
-// libunity-core
-#include <UnityCore/RadioOptionFilter.h>
-
-// Local
-#include "filter.h"
-#include "filteroption.h"
-#include "signalslist.h"
-
-class Q_DECL_EXPORT RadioOptionFilter : public Filter
-{
-    Q_OBJECT
-
-public:
-    explicit RadioOptionFilter(QObject *parent = nullptr);
-
-    /* getters */
-    GenericOptionsModel* options() const override;
-
-protected:
-    void setUnityFilter(unity::dash::Filter::Ptr filter) override;
-
-private:
-    unity::dash::RadioOptionFilter::Ptr m_unityRadioOptionFilter;
-    GenericOptionsModel* m_options;
-    SignalsList m_signals;
-
-    void onOptionsChanged(unity::dash::RadioOptionFilter::RadioOptions);
-};
-
-Q_DECLARE_METATYPE(RadioOptionFilter*)
-
-#endif // RADIOOPTIONFILTER_H

=== removed file 'src/Unity/ratingfilteroption.cpp'
--- src/Unity/ratingfilteroption.cpp	2013-11-08 17:01:37 +0000
+++ src/Unity/ratingfilteroption.cpp	1970-01-01 00:00:00 +0000
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * Authors:
- *  Pawel Stolowski <[e-mail]>
- *
- * 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; 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-// self
-#include "ratingfilteroption.h"
-
-RatingFilterOption::RatingFilterOption(const QString &id, float value, QObject *parent) :
-    AbstractFilterOption(parent),
-    m_active(false),
-    m_id(id),
-    m_value(value)
-{
-}
-
-QString RatingFilterOption::id() const
-{
-    return m_id;
-}
-
-QString RatingFilterOption::name() const
-{
-    return QString::Null();
-}
-
-QString RatingFilterOption::iconHint() const
-{
-    return QString::Null();
-}
-
-float RatingFilterOption::value() const
-{
-    return m_value;
-}
-
-bool RatingFilterOption::active() const
-{
-    return m_active;
-}
-
-void RatingFilterOption::setActive(bool active)
-{
-    if (active != m_active) {
-        m_active = active;
-        Q_EMIT activeChanged(m_active);
-    }
-}

=== removed file 'src/Unity/ratingfilteroption.h'
--- src/Unity/ratingfilteroption.h	2013-11-08 17:01:37 +0000
+++ src/Unity/ratingfilteroption.h	1970-01-01 00:00:00 +0000
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * Authors:
- *  Pawel Stolowski <[e-mail]>
- *
- * 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; 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef RATINGFILTEROPTION_H
-#define RATINGFILTEROPTION_H
-
-// local
-#include "abstractfilteroption.h"
-
-class Q_DECL_EXPORT RatingFilterOption : public AbstractFilterOption
-{
-    Q_OBJECT
-
-    Q_PROPERTY(float value READ value CONSTANT)
-
-public:
-    explicit RatingFilterOption(const QString &id, float ratingValue, QObject *parent = nullptr);
-
-    /* getters */
-    QString id() const override;
-    QString name() const override;
-    QString iconHint() const override;
-    bool active() const override;
-    float value() const;
-
-    /* setters */
-    void setActive(bool active) override;
-
-private:
-    bool m_active;
-    QString m_id;
-    float m_value;
-};
-
-Q_DECLARE_METATYPE(RatingFilterOption*)
-
-#endif // RATINGFILTEROPTION_H

=== removed file 'src/Unity/ratingoptionsmodel.cpp'
--- src/Unity/ratingoptionsmodel.cpp	2013-11-08 17:01:37 +0000
+++ src/Unity/ratingoptionsmodel.cpp	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * Authors:
- *  Pawel Stolowski <[e-mail]>
- *
- * 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; 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-// self
-#include "ratingoptionsmodel.h"
-
-// local
-#include "ratingfilteroption.h"
-
-RatingOptionsModel::RatingOptionsModel(bool showAllOption, QObject *parent) :
-    GenericOptionsModel(showAllOption, parent)
-{
-    for (int i=1; i<=5; i++) {
-        auto opt = new RatingFilterOption(QString::number(i), i*0.2f, this);
-        addOption(opt);
-    }
-}

=== removed file 'src/Unity/ratingoptionsmodel.h'
--- src/Unity/ratingoptionsmodel.h	2013-11-08 17:01:37 +0000
+++ src/Unity/ratingoptionsmodel.h	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * Authors:
- *  Pawel Stolowski <[e-mail]>
- *
- * 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; 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef RATINGOPTIONSMODEL_H
-#define RATINGOPTIONSMODEL_H
-
-#include "genericoptionsmodel.h"
-
-class RatingOptionsModel : public GenericOptionsModel
-{
-    Q_OBJECT
-
-public:
-    RatingOptionsModel(bool showAllOption, QObject *parent);
-};
-
-#endif // RATINGOPTIONSMODEL_H

=== removed file 'src/Unity/ratingsfilter.cpp'
--- src/Unity/ratingsfilter.cpp	2013-11-08 17:01:37 +0000
+++ src/Unity/ratingsfilter.cpp	1970-01-01 00:00:00 +0000
@@ -1,73 +0,0 @@
-/*
- * Copyright (C) 2011, 2013 Canonical, Ltd.
- *
- * Authors:
- *  Florian Boucault <[e-mail]>
- *  Pawel Stolowski <[e-mail]>
- *
- * 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; 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-// Self
-#include "ratingsfilter.h"
-
-// local
-#include "ratingfilteroption.h"
-#include "ratingoptionsmodel.h"
-
-RatingsFilter::RatingsFilter(QObject *parent) :
-    Filter(parent),
-    m_unityRatingsFilter(nullptr),
-    m_options(nullptr)
-{
-}
-
-GenericOptionsModel* RatingsFilter::options() const
-{
-    return m_options;
-}
-
-float RatingsFilter::rating() const
-{
-    if (m_unityRatingsFilter)
-    {
-        return m_unityRatingsFilter->rating;
-    }
-    return 0.0f;
-}
-
-void RatingsFilter::setUnityFilter(unity::dash::Filter::Ptr filter)
-{
-    Filter::setUnityFilter(filter);
-    m_unityRatingsFilter = std::dynamic_pointer_cast<unity::dash::RatingsFilter>(m_unityFilter);
-
-    delete m_options;
-
-    m_options = new RatingOptionsModel(m_unityRatingsFilter->show_all_button, this);
-    connect(m_options, SIGNAL(activeChanged(AbstractFilterOption *)), m_options, SLOT(ensureTheOnlyActive(AbstractFilterOption *)));
-    connect(m_options, SIGNAL(activeChanged(AbstractFilterOption *)), this, SLOT(onActiveChanged(AbstractFilterOption *)));
-    connect(m_options, SIGNAL(showAllActivated()), this, SLOT(clear()));
-
-    Q_EMIT optionsChanged();
-}
-
-void RatingsFilter::onActiveChanged(AbstractFilterOption *option)
-{
-    RatingFilterOption *ratingOption = dynamic_cast<RatingFilterOption*>(option);
-    if (ratingOption != nullptr)
-    {
-        const float val = ratingOption->active() ? ratingOption->value() : 0.0f;
-        m_unityRatingsFilter->rating = val;
-        Q_EMIT ratingChanged(val);
-    }
-}

=== removed file 'src/Unity/ratingsfilter.h'
--- src/Unity/ratingsfilter.h	2013-11-08 17:01:37 +0000
+++ src/Unity/ratingsfilter.h	1970-01-01 00:00:00 +0000
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2011, 2013 Canonical, Ltd.
- *
- * Authors:
- *  Florian Boucault <[e-mail]>
- *  Pawel Stolowski <[e-mail]>
- *
- * 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; 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef RATINGSFILTER_H
-#define RATINGSFILTER_H
-
-// Qt
-#include <QObject>
-#include <QMetaType>
-
-// libunity-core
-#include <UnityCore/RatingsFilter.h>
-
-// Local
-#include "filter.h"
-
-class GenericOptionsModel;
-class AbstractFilterOption;
-
-class Q_DECL_EXPORT RatingsFilter : public Filter
-{
-    Q_OBJECT
-
-    Q_PROPERTY(float rating READ rating NOTIFY ratingChanged)
-
-public:
-    explicit RatingsFilter(QObject *parent = nullptr);
-
-    /* getters */
-    GenericOptionsModel* options() const override;
-    float rating() const;
-
-Q_SIGNALS:
-    void ratingChanged(float);
-
-protected:
-    void setUnityFilter(unity::dash::Filter::Ptr filter) override;
-
-protected Q_SLOTS:
-    void onActiveChanged(AbstractFilterOption *option);
-
-private:
-    unity::dash::RatingsFilter::Ptr m_unityRatingsFilter;
-    GenericOptionsModel *m_options;
-};
-
-Q_DECLARE_METATYPE(RatingsFilter*)
-
-#endif // RATINGSFILTER_H

=== removed file 'src/Unity/result.cpp'
--- src/Unity/result.cpp	2013-11-08 17:01:37 +0000
+++ src/Unity/result.cpp	1970-01-01 00:00:00 +0000
@@ -1,82 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * Authors:
- *  Pawel Stolowski <[e-mail]>
- *
- * 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; 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "result.h"
-#include "variantutils.h"
-
-Result::Result(QObject *parent) :
-    QObject(parent)
-{
-}
-
-Result::Result(unity::dash::Preview::Ptr preview, QObject *parent) :
-    QObject(parent),
-    m_preview(preview)
-{
-}
-
-void Result::setPreview(unity::dash::Preview::Ptr preview)
-{
-    m_preview = preview;
-}
-
-QString Result::uri() const
-{
-    return m_preview != nullptr ? QString::fromStdString(m_preview->preview_result.uri) : QString::null;
-}
-
-QString Result::iconHint() const
-{
-    return m_preview != nullptr ? QString::fromStdString(m_preview->preview_result.icon_hint) : QString::null;
-}
-
-unsigned Result::categoryIndex() const
-{
-    return m_preview != nullptr ? m_preview->preview_result.category_index : 0;
-}
-
-unsigned Result::resultType() const
-{
-    return m_preview != nullptr ? m_preview->preview_result.result_type : 0;
-}
-
-QString Result::mimeType() const
-{
-    return m_preview != nullptr ? QString::fromStdString(m_preview->preview_result.mimetype) : QString::null;
-}
-
-QString Result::title() const
-{
-    return m_preview != nullptr ? QString::fromStdString(m_preview->preview_result.name) : QString::null;
-}
-
-QString Result::comment() const
-{
-    return m_preview != nullptr ? QString::fromStdString(m_preview->preview_result.comment) : QString::null;
-}
-
-QString Result::dndUri() const
-{
-    return m_preview != nullptr ? QString::fromStdString(m_preview->preview_result.dnd_uri) : QString::null;
-}
-
-QVariant Result::metadata() const
-{
-    return m_preview != nullptr ? convertToQVariantHash(m_preview->preview_result.hints) : QVariant();
-}

=== removed file 'src/Unity/result.h'
--- src/Unity/result.h	2014-01-22 17:58:23 +0000
+++ src/Unity/result.h	1970-01-01 00:00:00 +0000
@@ -1,69 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * Authors:
- *  Pawel Stolowski <[e-mail]>
- *
- * 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; 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef RESULT_H
-#define RESULT_H
-
-// Qt
-#include <QObject>
-#include <QVariant>
-
-// libunity-core
-#include <UnityCore/Preview.h>
-
-class Q_DECL_EXPORT Result : public QObject
-{
-    Q_OBJECT
-
-    Q_PROPERTY(QString uri READ uri CONSTANT)
-    Q_PROPERTY(QString iconHint READ iconHint CONSTANT)
-    Q_PROPERTY(unsigned categoryIndex READ categoryIndex CONSTANT)
-    Q_PROPERTY(unsigned resultType READ resultType CONSTANT)
-    Q_PROPERTY(QString mimeType READ mimeType CONSTANT)
-    Q_PROPERTY(QString title READ title CONSTANT)
-    Q_PROPERTY(QString comment READ comment CONSTANT)
-    Q_PROPERTY(QString dndUri READ dndUri CONSTANT)
-    Q_PROPERTY(QVariant metadata READ metadata CONSTANT)
-
-public:
-    Result(QObject *parent = nullptr);
-    Result(unity::dash::Preview::Ptr preview, QObject *parent = nullptr);
-
-    void setPreview(unity::dash::Preview::Ptr preview);
-
-    QString uri() const;
-    QString iconHint() const;
-    unsigned categoryIndex() const;
-    unsigned resultType() const;
-    QString mimeType() const;
-    QString title() const;
-    QString comment() const;
-    QString dndUri() const;
-    QVariant metadata() const;
-
-private:
-    /* Keep reference to the original preview to access result attributes via it, rather than keeping copies of them;
-       this will save us a bit on copying, especially as UI is mostly interested in just uri.
-     */
-    unity::dash::Preview::Ptr m_preview;
-};
-
-Q_DECLARE_METATYPE(Result*)
-
-#endif

=== renamed file 'src/Unity/scopes-ng/resultsmodel.cpp' => 'src/Unity/resultsmodel.cpp'
--- src/Unity/scopes-ng/resultsmodel.cpp	2014-02-18 21:21:49 +0000
+++ src/Unity/resultsmodel.cpp	2014-03-25 16:56:23 +0000
@@ -22,7 +22,7 @@
 
 // local
 #include "utils.h"
-#include "../iconutils.h"
+#include "iconutils.h"
 
 namespace scopes_ng {
 
@@ -177,24 +177,12 @@
             if (image.isEmpty()) {
                 QString uri(QString::fromStdString(result->uri()));
                 // FIXME: figure out a better way and get rid of this, it's an awful hack
-                QString mimetype;
                 QVariantHash result_meta;
-                if (result->contains("mimetype")) {
-                    mimetype = scopeVariantToQVariant(result->value("mimetype")).toString();
-                    // if we have mimetype, we might have some more
-                    QVariantHash album_meta;
-                    if (result->contains("artist")) {
-                        album_meta["artist"] = scopeVariantToQVariant(result->value("artist"));
-                    }
-                    if (result->contains("album")) {
-                        album_meta["album"] = scopeVariantToQVariant(result->value("album"));
-                    }
-                    // nest the data, so we're compatible with the way old scopes did this
-                    if (album_meta.size() > 0) {
-                        result_meta["content"] = album_meta;
-                    }
+                if (result->contains("artist") && result->contains("album")) {
+                    result_meta["artist"] = scopeVariantToQVariant(result->value("artist"));
+                    result_meta["album"] = scopeVariantToQVariant(result->value("album"));
                 }
-                QString thumbnailerUri(uriToThumbnailerProviderString(uri, mimetype, result_meta));
+                QString thumbnailerUri(uriToThumbnailerProviderString(uri, result_meta));
                 if (!thumbnailerUri.isNull()) {
                     return thumbnailerUri;
                 }

=== renamed file 'src/Unity/scopes-ng/resultsmodel.h' => 'src/Unity/resultsmodel.h'
=== removed file 'src/Unity/scope.cpp'
--- src/Unity/scope.cpp	2014-02-07 18:41:00 +0000
+++ src/Unity/scope.cpp	1970-01-01 00:00:00 +0000
@@ -1,408 +0,0 @@
-/*
- * Copyright (C) 2011 Canonical, Ltd.
- *
- * Authors:
- *  Florian Boucault <[e-mail]>
- *  Michal Hruby <[e-mail]>
- *
- * 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; 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-// Self
-#include "scope.h"
-
-// local
-#include "categories.h"
-#include "preview.h"
-#include "variantutils.h"
-
-// Qt
-#include <QUrl>
-#include <QUrlQuery>
-#include <QDebug>
-#include <QtGui/QDesktopServices>
-#include <QQmlEngine>
-#include <QFileInfo>
-#include <QDir>
-
-#include <UnityCore/Variant.h>
-#include <UnityCore/GLibWrapper.h>
-
-#include <libintl.h>
-#include <glib.h>
-
-Scope::Scope(QObject *parent) : QObject(parent)
-    , m_formFactor("phone")
-    , m_isActive(false)
-    , m_searchInProgress(false)
-{
-    m_categories.reset(new Categories(this));
-
-    connect(this, &Scope::isActiveChanged, this, &Scope::scopeIsActiveChanged);
-}
-
-QString Scope::id() const
-{
-    return QString::fromStdString(m_unityScope->id());
-}
-
-QString Scope::name() const
-{
-    return QString::fromStdString(m_unityScope->name());
-}
-
-QString Scope::iconHint() const
-{
-    return QString::fromStdString(m_unityScope->icon_hint());
-}
-
-QString Scope::description() const
-{
-    return QString::fromStdString(m_unityScope->description());
-}
-
-QString Scope::searchHint() const
-{
-    return QString::fromStdString(m_unityScope->search_hint());
-}
-
-bool Scope::searchInProgress() const
-{
-    return m_searchInProgress;
-}
-
-bool Scope::visible() const
-{
-    return m_unityScope->visible();
-}
-
-QString Scope::shortcut() const
-{
-    return QString::fromStdString(m_unityScope->shortcut());
-}
-
-bool Scope::connected() const
-{
-    return m_unityScope->connected();
-}
-
-Categories* Scope::categories() const
-{
-    return m_categories.get();
-}
-
-QString Scope::searchQuery() const
-{
-    return m_searchQuery;
-}
-
-QString Scope::noResultsHint() const
-{
-    return m_noResultsHint;
-}
-
-QString Scope::formFactor() const
-{
-    return m_formFactor;
-}
-
-bool Scope::isActive() const
-{
-    return m_isActive;
-}
-
-Filters* Scope::filters() const
-{
-    return m_filters.get();
-}
-
-void Scope::setSearchQuery(const QString& search_query)
-{
-    /* Checking for m_searchQuery.isNull() which returns true only when the string
-       has never been set is necessary because when search_query is the empty
-       string ("") and m_searchQuery is the null string,
-       search_query != m_searchQuery is still true.
-    */
-    using namespace std::placeholders;
-
-    if (m_searchQuery.isNull() || search_query != m_searchQuery) {
-        m_searchQuery = search_query;
-        m_cancellable.Renew();
-        m_unityScope->Search(search_query.toStdString(), std::bind(&Scope::onSearchFinished, this, _1, _2, _3), m_cancellable);
-        Q_EMIT searchQueryChanged();
-        if (!m_searchInProgress) {
-            m_searchInProgress = true;
-            Q_EMIT searchInProgressChanged();
-        }
-    }
-}
-
-void Scope::setNoResultsHint(const QString& hint) {
-    if (hint != m_noResultsHint) {
-        m_noResultsHint = hint;
-        Q_EMIT noResultsHintChanged();
-    }
-}
-
-void Scope::setFormFactor(const QString& form_factor) {
-    if (form_factor != m_formFactor) {
-        m_formFactor = form_factor;
-        if (m_unityScope) {
-            m_unityScope->form_factor = m_formFactor.toStdString();
-            synchronizeStates(); // will trigger a re-search
-        }
-        Q_EMIT formFactorChanged();
-    }
-}
-
-void Scope::setActive(const bool active) {
-    if (active != m_isActive) {
-        m_isActive = active;
-        Q_EMIT isActiveChanged(m_isActive);
-    }
-}
-
-unity::dash::LocalResult Scope::createLocalResult(const QVariant &uri, const QVariant &icon_hint,
-                                                  const QVariant &category, const QVariant &result_type,
-                                                  const QVariant &mimetype, const QVariant &title,
-                                                  const QVariant &comment, const QVariant &dnd_uri,
-                                                  const QVariant &metadata)
-{
-    unity::dash::LocalResult res;
-    res.uri = uri.toString().toStdString();
-    res.icon_hint = icon_hint.toString().toStdString();
-    res.category_index = category.toUInt();
-    res.result_type = result_type.toUInt();
-    res.mimetype = mimetype.toString().toStdString();
-    res.name = title.toString().toStdString();
-    res.comment = comment.toString().toStdString();
-    res.dnd_uri = dnd_uri.toString().toStdString();
-    res.hints = convertToHintsMap(metadata);
-
-    return res;
-}
-
-// FIXME: Change to use row index.
-void Scope::activate(const QVariant &uri, const QVariant &icon_hint, const QVariant &category,
-                     const QVariant &result_type, const QVariant &mimetype, const QVariant &title,
-                     const QVariant &comment, const QVariant &dnd_uri, const QVariant &metadata)
-{
-    auto res = createLocalResult(uri, icon_hint, category, result_type, mimetype, title, comment, dnd_uri, metadata);
-    m_unityScope->Activate(res);
-}
-
-// FIXME: Change to use row index.
-void Scope::preview(const QVariant &uri, const QVariant &icon_hint, const QVariant &category,
-             const QVariant &result_type, const QVariant &mimetype, const QVariant &title,
-             const QVariant &comment, const QVariant &dnd_uri, const QVariant &metadata)
-{
-    QVariant real_metadata(metadata);
-    // handle overridden results, since QML doesn't support defining maps
-    if (metadata.type() == QVariant::String) {
-        real_metadata = QVariant::fromValue(subscopeUriToMetadataHash(metadata.toString()));
-    }
-
-    auto res = createLocalResult(uri, icon_hint, category, result_type, mimetype, title, comment, dnd_uri, real_metadata);
-    m_previewCancellable.Renew();
-
-    // canned queries don't have previews, must be activated
-    if (uri.toString().startsWith("x-unity-no-preview-scopes-query://")) {
-        m_unityScope->Activate(res);
-    } else {
-        m_unityScope->Preview(res, nullptr, m_previewCancellable);
-    }
-}
-
-void Scope::cancelActivation()
-{
-    m_previewCancellable.Cancel();
-}
-
-void Scope::onActivated(unity::dash::LocalResult const& result, unity::dash::ScopeHandledType type, unity::glib::HintsMap const& hints)
-{
-    Q_EMIT activated();
-    // note: we will not get called on SHOW_PREVIEW, instead UnityCore will signal preview_ready.
-    switch (type)
-    {
-        case unity::dash::NOT_HANDLED:
-            fallbackActivate(QString::fromStdString(result.uri));
-            break;
-        case unity::dash::SHOW_DASH:
-            Q_EMIT showDash();
-            break;
-        case unity::dash::HIDE_DASH:
-            Q_EMIT hideDash();
-            break;
-        case unity::dash::GOTO_DASH_URI:
-            if (hints.find("goto-uri") != hints.end()) {
-                Q_EMIT gotoUri(QString::fromStdString(g_variant_get_string(hints.at("goto-uri"), nullptr)));
-            } else {
-                qWarning() << "Missing goto-uri hint for GOTO_DASH_URI activation reply";
-            }
-            break;
-        case unity::dash::PERFORM_SEARCH:
-            if (hints.find("query") != hints.end()) {
-                // note: this will emit searchQueryChanged, and shell will call setSearchQuery back with a new query,
-                // but it will get ignored.
-                setSearchQuery(QString::fromStdString(g_variant_get_string(hints.at("query"), nullptr)));
-            }
-            break;
-        default:
-            qWarning() << "Unhandled activation response:" << type;
-    }
-}
-
-void Scope::onPreviewReady(unity::dash::LocalResult const& /* result */, unity::dash::Preview::Ptr const& preview)
-{
-    Q_EMIT activated();
-    auto prv = Preview::newFromUnityPreview(preview);
-    // is this the best solution? QML may need to keep more than one preview instance around, so we can't own it.
-    // passing it by value is not possible.
-    QQmlEngine::setObjectOwnership(prv, QQmlEngine::JavaScriptOwnership);
-    Q_EMIT previewReady(prv);
-}
-
-void Scope::fallbackActivate(const QString& uri)
-{
-    /* Tries various methods to trigger a sensible action for the given 'uri'.
-       If it has no understanding of the given scheme it falls back on asking
-       Qt to open the uri.
-    */
-    QUrl url(uri);
-    if (url.scheme() == "file") {
-        /* Override the files place's default URI handler: we want the file
-           manager to handle opening folders, not the dash.
-
-           Ref: https://bugs.launchpad.net/upicek/+bug/689667
-        */
-        QDesktopServices::openUrl(url);
-        return;
-    }
-    if (url.scheme() == "application") {
-        QString path(url.path().isEmpty() ? url.authority() : url.path());
-        if (path.startsWith('/')) {
-            Q_FOREACH(const QString &dir, QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation)) {
-                if (path.startsWith(dir)) {
-                    path.remove(dir);
-                    path.replace('/', '-');
-                    break;
-                }
-            }
-        }
-
-        Q_EMIT activateApplication(QFileInfo(path).completeBaseName());
-        return;
-    }
-
-    qDebug() << "Trying to open" << uri;
-
-    /* Try our luck */
-    QDesktopServices::openUrl(uri); //url?
-}
-
-void Scope::setUnityScope(const unity::dash::Scope::Ptr& scope)
-{
-    m_unityScope = scope;
-
-    m_categories->setUnityScope(m_unityScope);
-    m_filters.reset(new Filters(m_unityScope->filters, this));
-
-    m_unityScope->form_factor = m_formFactor.toStdString();
-    /* Property change signals */
-    m_unityScope->id.changed.connect(sigc::mem_fun(this, &Scope::idChanged));
-    m_unityScope->name.changed.connect(sigc::mem_fun(this, &Scope::nameChanged));
-    m_unityScope->icon_hint.changed.connect(sigc::mem_fun(this, &Scope::iconHintChanged));
-    m_unityScope->description.changed.connect(sigc::mem_fun(this, &Scope::descriptionChanged));
-    m_unityScope->search_hint.changed.connect(sigc::mem_fun(this, &Scope::searchHintChanged));
-    m_unityScope->visible.changed.connect(sigc::mem_fun(this, &Scope::visibleChanged));
-    m_unityScope->shortcut.changed.connect(sigc::mem_fun(this, &Scope::shortcutChanged));
-    m_unityScope->connected.changed.connect(sigc::mem_fun(this, &Scope::connectedChanged));
-    m_unityScope->results_dirty.changed.connect(sigc::mem_fun(this, &Scope::resultsDirtyToggled));
-
-    /* FIXME: signal should be forwarded instead of calling the handler directly */
-    m_unityScope->activated.connect(sigc::mem_fun(this, &Scope::onActivated));
-
-    m_unityScope->preview_ready.connect(sigc::mem_fun(this, &Scope::onPreviewReady));
-
-    /* Synchronize local states with m_unityScope right now and whenever
-       m_unityScope becomes connected */
-    /* FIXME: should emit change notification signals for all properties */
-    connect(this, SIGNAL(connectedChanged(bool)), SLOT(synchronizeStates()));
-    synchronizeStates();
-}
-
-unity::dash::Scope::Ptr Scope::unityScope() const
-{
-    return m_unityScope;
-}
-
-void Scope::synchronizeStates()
-{
-    using namespace std::placeholders;
-
-    if (connected()) {
-        /* Forward local states to m_unityScope */
-        if (!m_searchQuery.isNull()) {
-            m_cancellable.Renew();
-            m_unityScope->Search(m_searchQuery.toStdString(), std::bind(&Scope::onSearchFinished, this, _1, _2, _3), m_cancellable);
-            if (!m_searchInProgress) {
-                m_searchInProgress = true;
-                Q_EMIT searchInProgressChanged();
-            }
-        }
-    }
-}
-
-void Scope::scopeIsActiveChanged()
-{
-    if (!isActive() || !m_unityScope || !m_unityScope->results_dirty()) return;
-
-    // force new search
-    synchronizeStates();
-}
-
-void Scope::resultsDirtyToggled(bool results_dirty)
-{
-    if (!results_dirty || !isActive()) return;
-
-    // force new search
-    synchronizeStates();
-}
-
-void Scope::onSearchFinished(std::string const& /* query */, unity::glib::HintsMap const& hints, unity::glib::Error const& err)
-{
-    QString hint;
-
-    GError* error = const_cast<unity::glib::Error&>(err);
-
-    if (!err || !g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
-        if (m_searchInProgress) {
-            m_searchInProgress = false;
-            Q_EMIT searchInProgressChanged();
-        }
-    } else {
-        // no need to check the results hint, we're still searching
-        return;
-    }
-
-    if (!m_unityScope->results()->count()) {
-        unity::glib::HintsMap::const_iterator it = hints.find("no-results-hint");
-        if (it != hints.end()) {
-            hint = QString::fromStdString(it->second.GetString());
-        } else {
-            hint = QString::fromUtf8(dgettext("unity", "Sorry, there is nothing that matches your search."));
-        }
-    }
-
-    setNoResultsHint(hint);
-}

=== renamed file 'src/Unity/scopes-ng/scope.cpp' => 'src/Unity/scope.cpp'
--- src/Unity/scopes-ng/scope.cpp	2014-03-06 18:41:48 +0000
+++ src/Unity/scope.cpp	2014-03-25 16:56:23 +0000
@@ -43,7 +43,6 @@
 #include <QDir>
 
 #include <libintl.h>
-#include <glib.h>
 
 #include <unity/scopes/ListenerBase.h>
 #include <unity/scopes/CategorisedResult.h>

=== removed file 'src/Unity/scope.h'
--- src/Unity/scope.h	2013-11-28 17:33:23 +0000
+++ src/Unity/scope.h	1970-01-01 00:00:00 +0000
@@ -1,154 +0,0 @@
-/*
- * Copyright (C) 2011 Canonical, Ltd.
- *
- * Authors:
- *  Florian Boucault <[e-mail]>
- *
- * 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; 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef SCOPE_H
-#define SCOPE_H
-
-// Qt
-#include <QObject>
-#include <QString>
-#include <QMetaType>
-
-// libunity-core
-#include <UnityCore/Scope.h>
-#include <UnityCore/Results.h>
-#include <UnityCore/GLibWrapper.h>
-
-#include "categories.h"
-#include "filters.h"
-
-class Preview;
-
-class Scope : public QObject
-{
-    Q_OBJECT
-
-    Q_PROPERTY(QString id READ id NOTIFY idChanged)
-    Q_PROPERTY(QString name READ name NOTIFY nameChanged)
-    Q_PROPERTY(QString iconHint READ iconHint NOTIFY iconHintChanged)
-    Q_PROPERTY(QString description READ description NOTIFY descriptionChanged)
-    Q_PROPERTY(QString searchHint READ searchHint NOTIFY searchHintChanged)
-    Q_PROPERTY(bool searchInProgress READ searchInProgress NOTIFY searchInProgressChanged)
-    Q_PROPERTY(bool visible READ visible NOTIFY visibleChanged)
-    Q_PROPERTY(QString shortcut READ shortcut NOTIFY shortcutChanged)
-    Q_PROPERTY(bool connected READ connected NOTIFY connectedChanged)
-    Q_PROPERTY(Categories* categories READ categories NOTIFY categoriesChanged)
-    Q_PROPERTY(Filters* filters READ filters NOTIFY filtersChanged)
-
-    Q_PROPERTY(QString searchQuery READ searchQuery WRITE setSearchQuery NOTIFY searchQueryChanged)
-    Q_PROPERTY(QString noResultsHint READ noResultsHint WRITE setNoResultsHint NOTIFY noResultsHintChanged)
-    Q_PROPERTY(QString formFactor READ formFactor WRITE setFormFactor NOTIFY formFactorChanged)
-    Q_PROPERTY(bool isActive READ isActive WRITE setActive NOTIFY isActiveChanged)
-
-public:
-    explicit Scope(QObject *parent = 0);
-
-    /* getters */
-    QString id() const;
-    QString name() const;
-    QString iconHint() const;
-    QString description() const;
-    QString searchHint() const;
-    bool visible() const;
-    QString shortcut() const;
-    bool connected() const;
-    bool searchInProgress() const;
-    Categories* categories() const;
-    Filters* filters() const;
-    QString searchQuery() const;
-    QString noResultsHint() const;
-    QString formFactor() const;
-    bool isActive() const;
-
-    /* setters */
-    void setSearchQuery(const QString& search_query);
-    void setNoResultsHint(const QString& hint);
-    void setFormFactor(const QString& form_factor);
-    void setActive(const bool);
-
-    Q_INVOKABLE void activate(const QVariant &uri, const QVariant &icon_hint, const QVariant &category,
-                              const QVariant &result_type, const QVariant &mimetype, const QVariant &title,
-                              const QVariant &comment, const QVariant &dnd_uri, const QVariant &metadata);
-    Q_INVOKABLE void preview(const QVariant &uri, const QVariant &icon_hint, const QVariant &category,
-                              const QVariant &result_type, const QVariant &mimetype, const QVariant &title,
-                              const QVariant &comment, const QVariant &dnd_uri, const QVariant &metadata);
-    Q_INVOKABLE void cancelActivation();
-
-    void setUnityScope(const unity::dash::Scope::Ptr& scope);
-    unity::dash::Scope::Ptr unityScope() const;
-
-Q_SIGNALS:
-    void idChanged(const std::string&);
-    void dbusNameChanged(const std::string&);
-    void dbusPathChanged(const std::string&);
-    void nameChanged(const std::string&);
-    void iconHintChanged(const std::string&);
-    void descriptionChanged(const std::string&);
-    void searchHintChanged(const std::string&);
-    void searchInProgressChanged();
-    void visibleChanged(bool);
-    void shortcutChanged(const std::string&);
-    void connectedChanged(bool);
-    void categoriesChanged();
-    void searchQueryChanged();
-    void noResultsHintChanged();
-    void formFactorChanged();
-    void isActiveChanged(bool);
-    void filtersChanged();
-
-    // signals triggered by activate(..) or preview(..) requests.
-    void previewReady(Preview *preview);
-    void showDash();
-    void hideDash();
-    void gotoUri(const QString &uri);
-    void activated();
-
-    void activateApplication(const QString &desktop);
-
-private Q_SLOTS:
-    void synchronizeStates();
-    void scopeIsActiveChanged();
-    void onSearchFinished(std::string const &, unity::glib::HintsMap const &, unity::glib::Error const&);
-
-private:
-    unity::dash::LocalResult createLocalResult(const QVariant &uri, const QVariant &icon_hint,
-                                               const QVariant &category, const QVariant &result_type,
-                                               const QVariant &mimetype, const QVariant &title,
-                                               const QVariant &comment, const QVariant &dnd_uri,
-                                               const QVariant &metadata);
-    void onActivated(unity::dash::LocalResult const& result, unity::dash::ScopeHandledType type, unity::glib::HintsMap const& hints);
-    void onPreviewReady(unity::dash::LocalResult const& result, unity::dash::Preview::Ptr const& preview);
-    void fallbackActivate(const QString& uri);
-    void resultsDirtyToggled(bool);
-
-    unity::dash::Scope::Ptr m_unityScope;
-    std::unique_ptr<Categories> m_categories;
-    std::unique_ptr<Filters> m_filters;
-    QString m_searchQuery;
-    QString m_noResultsHint;
-    QString m_formFactor;
-    bool m_isActive;
-    bool m_searchInProgress;
-    unity::glib::Cancellable m_cancellable;
-    unity::glib::Cancellable m_previewCancellable;
-};
-
-Q_DECLARE_METATYPE(Scope*)
-
-#endif // SCOPE_H

=== renamed file 'src/Unity/scopes-ng/scope.h' => 'src/Unity/scope.h'
=== removed directory 'src/Unity/scopes-ng'
=== removed file 'src/Unity/scopes-ng/CMakeLists.txt'
--- src/Unity/scopes-ng/CMakeLists.txt	2014-02-19 17:43:25 +0000
+++ src/Unity/scopes-ng/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
-# Dependencies
-include(FindPkgConfig)
-pkg_check_modules(SCOPESLIB REQUIRED libunity-scopes>=0.3.1)
-
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${SCOPESLIB_INCLUDE_DIRS}
-)
-
-set(PLUGIN_SRC
-    categories.cpp
-    collectors.cpp
-    previewmodel.cpp
-    previewstack.cpp
-    previewwidgetmodel.cpp
-    resultsmodel.cpp
-    scope.cpp
-    scopes.cpp
-    utils.cpp
-)
-
-add_library(ScopesNG-qml STATIC ${PLUGIN_SRC})
-set_target_properties(ScopesNG-qml PROPERTIES COMPILE_FLAGS "-fPIC")
-
-qt5_use_modules(ScopesNG-qml Qml Gui DBus)

=== renamed file 'src/Unity/scopes-ng/scopes.cpp' => 'src/Unity/scopes.cpp'
=== removed file 'src/Unity/scopes.cpp'
--- src/Unity/scopes.cpp	2013-11-25 10:38:12 +0000
+++ src/Unity/scopes.cpp	1970-01-01 00:00:00 +0000
@@ -1,179 +0,0 @@
-/*
- * Copyright (C) 2011 Canonical, Ltd.
- *
- * Authors:
- *  Florian Boucault <[e-mail]>
- *
- * 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; 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-// Self
-#include "scopes.h"
-
-// Local
-#include "scope.h"
-
-// Qt
-#include <QDebug>
-#include <QtCore/QStringList>
-#include <QtGui/QKeySequence>
-
-Scopes::Scopes(QObject *parent)
-    : QAbstractListModel(parent)
-    , m_unityScopes(std::make_shared<unity::dash::GSettingsScopes>())
-    , m_loaded(false)
-{
-    m_roles[Scopes::RoleScope] = "scope";
-    m_roles[Scopes::RoleId] = "id";
-    m_roles[Scopes::RoleVisible] = "visible";
-    m_roles[Scopes::RoleTitle] = "title";
-
-    m_unityScopes->scope_added.connect(sigc::mem_fun(this, &Scopes::onScopeAdded));
-    m_unityScopes->scope_removed.connect(sigc::mem_fun(this, &Scopes::onScopeRemoved));
-    m_unityScopes->scopes_reordered.connect(sigc::mem_fun(this, &Scopes::onScopesReordered));
-    m_unityScopes->LoadScopes();
-}
-
-QHash<int, QByteArray> Scopes::roleNames() const
-{
-    return m_roles;
-}
-
-int Scopes::rowCount(const QModelIndex& parent) const
-{
-    Q_UNUSED(parent)
-
-    return m_scopes.count();
-}
-
-QVariant Scopes::data(const QModelIndex& index, int role) const
-{
-    Q_UNUSED(role)
-
-    if (!index.isValid()) {
-        return QVariant();
-    }
-
-    Scope* scope = m_scopes.at(index.row());
-
-    if (role == Scopes::RoleScope) {
-        return QVariant::fromValue(scope);
-    } else if (role == Scopes::RoleId) {
-        return QVariant::fromValue(scope->id());
-    } else if (role == Scopes::RoleVisible) {
-        return QVariant::fromValue(scope->visible());
-    } else if (role == Scopes::RoleTitle) {
-        return QVariant::fromValue(scope->name());
-    } else {
-        return QVariant();
-    }
-}
-
-QVariant Scopes::get(int row) const
-{
-    return data(QAbstractListModel::index(row), 0);
-}
-
-QVariant Scopes::get(const QString& scope_id) const
-{
-    Q_FOREACH(Scope* scope, m_scopes) {
-        if (scope->id() == scope_id) {
-            return QVariant::fromValue(scope);
-        }
-    }
-
-    return QVariant();
-}
-
-bool Scopes::loaded() const
-{
-    return m_loaded;
-}
-
-void Scopes::onScopeAdded(const unity::dash::Scope::Ptr& scope, int /*position*/)
-{
-    int index = m_scopes.count();
-    beginInsertRows(QModelIndex(), index, index);
-    addUnityScope(scope);
-    endInsertRows();
-
-    // FIXME: do only once after all loaded?
-    m_loaded = true;
-    Q_EMIT loadedChanged(m_loaded);
-}
-
-void Scopes::onScopesLoaded()
-{
-}
-
-void Scopes::onScopeRemoved(const unity::dash::Scope::Ptr& scope)
-{
-    auto id = QString::fromStdString(scope->id);
-    auto index = findScopeById(id);
-    if (index >= 0) {
-        beginRemoveRows(QModelIndex(), index, index);
-        removeUnityScope(index);
-        endRemoveRows();
-
-        Q_EMIT scopeRemoved(id, index);
-    }
-}
-
-void Scopes::onScopesReordered(const unity::dash::Scopes::ScopeList& scopes)
-{
-    // FIXME Should use beginMoveRows()/endMoveRows() to not recreate the UI for every scope.
-    beginResetModel();
-
-    // remove existing scopes
-    for (auto i=m_scopes.count()-1; i>=0; i--) {
-        removeUnityScope(i);
-    }
-
-    // re-create scopes
-    for (uint i=0; i<scopes.size(); i++) {
-        addUnityScope(scopes[i]);
-    }
-    endResetModel();
-}
-
-void Scopes::onScopePropertyChanged()
-{
-    QModelIndex scopeIndex = index(m_scopes.indexOf(qobject_cast<Scope*>(sender())));
-    Q_EMIT dataChanged(scopeIndex, scopeIndex);
-}
-
-void Scopes::addUnityScope(const unity::dash::Scope::Ptr& unity_scope)
-{
-    Scope* scope = new Scope(this);
-    scope->setUnityScope(unity_scope);
-    /* DOCME */
-    QObject::connect(scope, SIGNAL(visibleChanged(bool)), this, SLOT(onScopePropertyChanged()));
-    m_scopes.append(scope);
-}
-
-void Scopes::removeUnityScope(int index)
-{
-    Scope* scope = m_scopes.takeAt(index);
-
-    delete scope;
-}
-
-int Scopes::findScopeById(const QString& scope_id)
-{
-    for (int i=0; i<m_scopes.count(); i++) {
-        if (m_scopes[i]->id() == scope_id) {
-            return i;
-        }
-    }
-    return -1;
-}

=== renamed file 'src/Unity/scopes-ng/scopes.h' => 'src/Unity/scopes.h'
=== removed file 'src/Unity/scopes.h'
--- src/Unity/scopes.h	2013-11-25 10:38:12 +0000
+++ src/Unity/scopes.h	1970-01-01 00:00:00 +0000
@@ -1,95 +0,0 @@
-/*
- * Copyright (C) 2011 Canonical, Ltd.
- *
- * Authors:
- *  Florian Boucault <[e-mail]>
- *
- * 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; 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef SCOPES_H
-#define SCOPES_H
-
-// Qt
-#include <QAbstractListModel>
-#include <QList>
-
-// libunity-core
-#include <UnityCore/Scope.h>
-#include <UnityCore/GSettingsScopes.h>
-
-namespace unity
-{
-namespace dash
-{
-class Scopes;
-}
-}
-
-class Hotkey;
-class Scope;
-
-class Scopes : public QAbstractListModel
-{
-    Q_OBJECT
-
-    Q_ENUMS(Roles)
-
-    Q_PROPERTY(bool loaded READ loaded NOTIFY loadedChanged)
-
-public:
-    explicit Scopes(QObject *parent = 0);
-    ~Scopes() = default;
-
-    enum Roles {
-        RoleScope,
-        RoleId,
-        RoleVisible,
-        RoleTitle
-    };
-
-    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;
-    Q_INVOKABLE int rowCount(const QModelIndex& parent = QModelIndex()) const;
-
-    Q_INVOKABLE QVariant get(int row) const;
-    Q_INVOKABLE QVariant get(const QString& scope_id) const;
-
-    QHash<int, QByteArray> roleNames() const;
-
-    bool loaded() const;
-
-Q_SIGNALS:
-    void activateScopeRequested(const QString& scope_id);
-    void loadedChanged(bool loaded);
-    void scopeRemoved(const QString& scope_id, int index);
-
-private Q_SLOTS:
-    void onScopesLoaded();
-    void onScopeAdded(const unity::dash::Scope::Ptr& scope, int position);
-    void onScopeRemoved(const unity::dash::Scope::Ptr& scope);