Merge lp:~aacid/unity-2d/unity-2d_remove_places_code into lp:unity-2d

[Albert Astals Cid]

Remove Places related code as it is not used anymore

[Gerry Boland (gerboland)]

review: Approve

=== modified file 'libunity-2d-private/Unity2d/plugin.cpp'
--- libunity-2d-private/Unity2d/plugin.cpp	2011-11-29 12:13:27 +0000
+++ libunity-2d-private/Unity2d/plugin.cpp	2012-01-19 14:43:26 +0000
@@ -24,15 +24,12 @@
 
 #include "dashsettings.h"
 #include "launcherapplication.h"
-#include "place.h"
-#include "placeentry.h"
 #include "launcherdevice.h"
 #include "trash.h"
 #include "workspaces.h"
 #include "listaggregatormodel.h"
 #include "launcherapplicationslist.h"
 #include "launcherdeviceslist.h"
-#include "launcherplaceslist.h"
 #include "iconimageprovider.h"
 #include "blendedimageprovider.h"
 #include "qsortfilterproxymodelqml.h"
@@ -130,10 +127,6 @@
     qmlRegisterType<LauncherApplicationsList>(uri, 0, 1, "LauncherApplicationsList");
     qmlRegisterType<LauncherApplication>(uri, 0, 1, "LauncherApplication");
 
-    qmlRegisterType<LauncherPlacesList>(uri, 0, 1, "LauncherPlacesList");
-    qmlRegisterType<Place>(uri, 0, 1, "Place");
-    qmlRegisterType<PlaceEntry>(uri, 0, 1, "PlaceEntry");
-    /* DeeListModel is exposed to QML by PlaceEntry */
     qmlRegisterType<DeeListModel>(uri, 0, 1, "DeeListModel");
 
     qmlRegisterType<LauncherDevicesList>(uri, 0, 1, "LauncherDevicesList");

=== modified file 'libunity-2d-private/src/CMakeLists.txt'
--- libunity-2d-private/src/CMakeLists.txt	2011-11-29 12:13:27 +0000
+++ libunity-2d-private/src/CMakeLists.txt	2012-01-19 14:43:26 +0000
@@ -50,9 +50,6 @@
     launcherdevice.cpp
     launcherdeviceslist.cpp
     launcherutility.cpp
-    placeentry.cpp
-    place.cpp
-    launcherplaceslist.cpp
     trash.cpp
     launchermenu.cpp
     webfavorite.cpp

=== removed file 'libunity-2d-private/src/launcherplaceslist.cpp'
--- libunity-2d-private/src/launcherplaceslist.cpp	2011-07-29 13:49:34 +0000
+++ libunity-2d-private/src/launcherplaceslist.cpp	1970-01-01 00:00:00 +0000
@@ -1,139 +0,0 @@
-/*
- * Copyright (C) 2010 Canonical, Ltd.
- *
- * Authors:
- *  Olivier Tilloy <[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 "launcherplaceslist.h"
-#include "place.h"
-
-#include <QDir>
-
-#define PLACES_DIR "/usr/share/unity/places/"
-#define FILTER "*.place"
-
-LauncherPlacesList::LauncherPlacesList(QObject* parent) :
-    ListAggregatorModel(parent)
-{
-    QHash<int, QByteArray> roles;
-    roles[Place::RoleItem] = "item";
-    roles[Place::RoleShowEntry] = "showEntry";
-    setRoleNames(roles);
-
-    QDir dir(PLACES_DIR);
-    QStringList filters;
-    filters << FILTER;
-    dir.setNameFilters(filters);
-    m_placeFiles = dir.entryList();
-    QStringList::const_iterator iter;
-    for (iter = m_placeFiles.begin(); iter != m_placeFiles.end(); ++iter) {
-        addPlace(dir.absoluteFilePath(*iter));
-    }
-
-    // Monitor the directory for new/deleted places
-    m_watch = new QFileSystemWatcher;
-    m_watch->addPath(dir.absolutePath());
-    QObject::connect(m_watch, SIGNAL(directoryChanged(const QString&)),
-                     this, SLOT(onDirectoryChanged(const QString&)));
-}
-
-LauncherPlacesList::~LauncherPlacesList()
-{
-    delete m_watch;
-
-    QList<QAbstractItemModel*>::iterator iter;
-    for(iter = m_models.begin(); iter != m_models.end(); ) {
-        Place* place = static_cast<Place*>(*iter);
-        removeListModel(place);
-        delete place;
-        iter = m_models.begin();
-    }
-}
-
-Place*
-LauncherPlacesList::addPlace(const QString& file)
-{
-    Place* place = new Place(this);
-    aggregateListModel(place);
-    place->setFileName(file);
-    return place;
-}
-
-Place*
-LauncherPlacesList::removePlace(const QString& file)
-{
-    QList<QAbstractItemModel*>::iterator iter;
-    for (iter = m_models.begin(); iter != m_models.end(); ++iter) {
-        Place* place = static_cast<Place*>(*iter);
-        if (place->fileName() == file) {
-            removeListModel(place);
-            return place;
-        }
-    }
-    return NULL;
-}
-
-void
-LauncherPlacesList::onDirectoryChanged(const QString& path)
-{
-    QDir dir(path);
-    QStringList filters;
-    filters << FILTER;
-    dir.setNameFilters(filters);
-    QStringList newPlaceFiles = dir.entryList();
-    QStringList::const_iterator iter;
-
-    // Any places removed?
-    for (iter = m_placeFiles.begin(); iter != m_placeFiles.end(); ++iter) {
-        if (!newPlaceFiles.contains(*iter)) {
-            Place* place = removePlace(dir.absoluteFilePath(*iter));
-            delete place;
-        }
-    }
-
-    // Any new places?
-    for (iter = newPlaceFiles.begin(); iter != newPlaceFiles.end(); ++iter) {
-        if (!m_placeFiles.contains(*iter)) {
-            addPlace(dir.absoluteFilePath(*iter));
-        }
-    }
-
-    m_placeFiles = newPlaceFiles;
-}
-
-PlaceEntry*
-LauncherPlacesList::findPlaceEntry(const QString& fileName, const QString& groupName)
-{
-    Q_FOREACH(QAbstractItemModel* model, m_models) {
-        Place* place = static_cast<Place*>(model);
-        if (place->fileName() == fileName) {
-            return place->findPlaceEntry(groupName);
-        }
-    }
-
-    return NULL;
-}
-
-void
-LauncherPlacesList::startAllPlaceServices()
-{
-    Q_FOREACH(QAbstractItemModel* model, m_models) {
-        Place* place = static_cast<Place*>(model);
-        place->connectToRemotePlace();
-    }
-}
-
-#include "launcherplaceslist.moc"

=== removed file 'libunity-2d-private/src/launcherplaceslist.h'
--- libunity-2d-private/src/launcherplaceslist.h	2011-07-29 13:49:34 +0000
+++ libunity-2d-private/src/launcherplaceslist.h	1970-01-01 00:00:00 +0000
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2010 Canonical, Ltd.
- *
- * Authors:
- *  Olivier Tilloy <[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 LAUNCHERPLACESLIST_H
-#define LAUNCHERPLACESLIST_H
-
-#include "listaggregatormodel.h"
-
-#include <QStringList>
-#include <QFileSystemWatcher>
-
-class Place;
-class PlaceEntry;
-
-class LauncherPlacesList : public ListAggregatorModel
-{
-    Q_OBJECT
-
-public:
-    LauncherPlacesList(QObject* parent = 0);
-    ~LauncherPlacesList();
-
-    Q_INVOKABLE PlaceEntry* findPlaceEntry(const QString& fileName, const QString& groupName);
-    Q_INVOKABLE void startAllPlaceServices();
-
-private:
-    QStringList m_placeFiles;
-    QFileSystemWatcher* m_watch;
-
-    Place* addPlace(const QString& file);
-    Place* removePlace(const QString& file);
-
-private Q_SLOTS:
-    void onDirectoryChanged(const QString&);
-};
-
-#endif // LAUNCHERPLACESLIST_H
-

=== removed file 'libunity-2d-private/src/place.cpp'
--- libunity-2d-private/src/place.cpp	2012-01-13 15:05:44 +0000
+++ libunity-2d-private/src/place.cpp	1970-01-01 00:00:00 +0000
@@ -1,456 +0,0 @@
-/*
- * Copyright (C) 2010 Canonical, Ltd.
- *
- * Authors:
- *  Olivier Tilloy <[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 "launcherapplication.h"
-#include "place.h"
-
-// libunity-2d
-#include <unity2dtr.h>
-#include <debug_p.h>
-
-#include <QHash>
-#include <QByteArray>
-#include <QStringList>
-#include <QDBusPendingReply>
-#include <QDBusServiceWatcher>
-#include <QDBusConnectionInterface>
-#include <QTimer>
-#include <QUrl>
-#include <QDesktopServices>
-#include <QDBusReply>
-
-static const char* UNITY_PLACE_INTERFACE = "com.canonical.Unity.Place";
-static const char* UNITY_ACTIVATION_INTERFACE = "com.canonical.Unity.Activation";
-
-Place::Place(QObject* parent) :
-    QAbstractListModel(parent),
-    m_file(NULL),
-    m_online(false),
-    m_dbusIface(NULL),
-    m_querying(false)
-{
-    QHash<int, QByteArray> roles;
-    roles[RoleItem] = "item";
-    roles[RoleShowEntry] = "showEntry";
-    setRoleNames(roles);
-
-    m_serviceWatcher = new QDBusServiceWatcher(this);
-    m_serviceWatcher->setConnection(QDBusConnection::sessionBus());
-    connect(m_serviceWatcher, SIGNAL(serviceRegistered(QString)),
-            SLOT(onPlaceServiceRegistered()));
-    connect(m_serviceWatcher, SIGNAL(serviceUnregistered(QString)),
-            SLOT(onPlaceServiceUnregistered()));
-}
-
-Place::Place(const Place &other)
-{
-    if (other.m_file != NULL) {
-        setFileName(other.m_file->fileName());
-    }
-}
-
-Place::~Place()
-{
-    delete m_dbusIface;
-    delete m_file;
-    m_entries.clear();
-    m_static_entries.clear();
-}
-
-QString
-Place::fileName() const
-{
-    return m_file->fileName();
-}
-
-void
-Place::setFileName(const QString &file)
-{
-    if (!m_dbusName.isNull()) {
-        m_serviceWatcher->removeWatchedService(m_dbusName);
-    }
-
-    if (m_dbusIface != NULL) {
-        delete m_dbusIface;
-    }
-
-    m_file = new QSettings(file, QSettings::IniFormat);
-    if (m_file->childGroups().contains("Place")) {
-        m_dbusName = m_file->value("Place/DBusName").toString();
-        m_dbusObjectPath = m_file->value("Place/dbusObjectPath").toString();
-
-        QString gettextDomain = m_file->value("Desktop Entry/X-Ubuntu-Gettext-Domain").toString();
-
-        QStringList entries = m_file->childGroups().filter("Entry:");
-        QStringList::const_iterator iter;
-        uint i = 0;
-        for(iter = entries.begin(); iter != entries.end(); ++iter) {
-            PlaceEntry* entry = new PlaceEntry(this);
-            entry->setFileName(file);
-            entry->setGroupName(iter->mid(6));
-            m_file->beginGroup(*iter);
-            entry->setDbusName(m_dbusName);
-            entry->setDbusObjectPath(m_file->value("DBusObjectPath").toString());
-            entry->setName(u2dTr(m_file->value("Name").toString().toUtf8().constData(),
-                                 gettextDomain.toUtf8().constData()));
-            entry->setIcon(m_file->value("Icon").toString());
-            entry->setSearchHint(u2dTr(m_file->value("SearchHint").toString().toUtf8().constData(),
-                                 gettextDomain.toUtf8().constData()));
-            if (m_file->contains("Shortcut")) {
-                QString value = m_file->value("Shortcut").toString();
-                if (value.size() == 1) {
-                    Qt::Key key = (Qt::Key) value.at(0).toUpper().unicode();
-                    entry->setShortcutKey(key);
-                } else {
-                    /* Note: some text editors insert the decomposed form of
-                       e.g. accented characters (e.g. 0xc3 + 0xa9 for "É"
-                       instead of the canonical form 0xc9). Unfortunately Qt
-                       doesn’t seem to be able to perform composition, so in
-                       such cases setting the shortcut key fails. See
-                       http://www.unicode.org/reports/tr15/ for details. */
-                    UQ_WARNING << "Invalid shorcut key (should be one single character):" << value;
-                }
-            }
-            if (!m_file->contains("ShowEntry")) {
-                entry->setShowEntry(true);
-            } else {
-                entry->setShowEntry(m_file->value("ShowEntry").toBool());
-            }
-            m_file->endGroup();
-            entry->setPosition(i++);
-            connect(entry, SIGNAL(positionChanged(uint)),
-                    SLOT(onEntryPositionChanged(uint)));
-            m_static_entries[entry->dbusObjectPath()] = entry;
-            int index = m_entries.size();
-            beginInsertRows(QModelIndex(), index, index);
-            m_entries.append(entry);
-            endInsertRows();
-        }
-
-        /* Monitor the corresponding D-Bus place service */
-        m_serviceWatcher->addWatchedService(m_dbusName);
-
-        /* Connect to the live place immediately if the service is already running
-           otherwise wait for around 10 seconds as to not impact startup time */
-        QDBusConnectionInterface* iface = QDBusConnection::sessionBus().interface();
-        QDBusReply<bool> registered = iface->isServiceRegistered(m_dbusName);
-        if (registered) {
-            onPlaceServiceRegistered();
-        } else {
-            QTimer::singleShot(10000, this, SLOT(connectToRemotePlace()));
-        }
-    } else {
-        delete m_file;
-        m_file = NULL;
-        UQ_WARNING << "Invalid place file, missing [Place] group";
-    }
-}
-
-QString
-Place::dbusName() const
-{
-    return m_dbusName;
-}
-
-QString
-Place::dbusObjectPath() const
-{
-    return m_dbusObjectPath;
-}
-
-bool
-Place::online() const
-{
-    return m_online;
-}
-
-QVariant
-Place::data(const QModelIndex& index, int role) const
-{
-    if (!index.isValid()) {
-        return QVariant();
-    }
-
-    PlaceEntry* entry = m_entries.at(index.row());
-    if (role == Place::RoleItem) {
-        return QVariant::fromValue(entry);
-    } else if (role == Place::RoleShowEntry) {
-        return QVariant::fromValue(QString(entry->showEntry() ? "true" : "false"));
-    } else {
-        return QVariant();
-    }
-}
-
-int
-Place::rowCount(const QModelIndex& parent) const
-{
-    Q_UNUSED(parent)
-
-    return m_entries.size();
-}
-
-void
-Place::connectToRemotePlace()
-{
-    if ((m_dbusIface != NULL) && m_dbusIface->isValid()) {
-        return;
-    }
-
-    if (m_dbusIface == NULL) {
-        m_dbusIface = new QDBusInterface(m_dbusName, m_dbusObjectPath,
-                                         UNITY_PLACE_INTERFACE);
-    }
-
-    QDBusConnection connection = m_dbusIface->connection();
-    if (!connection.isConnected()) {
-        UQ_WARNING << "ERROR: unable to connect to bus:"
-                   << connection.lastError();
-        return;
-    }
-
-    if (!m_dbusIface->isValid()) {
-        /* A call to the interface will spawn the corresponding place daemon. */
-        getEntries();
-    }
-}
-
-void
-Place::getEntries()
-{
-    if (m_querying) {
-        /* A call to GetEntries is already pending. */
-        return;
-    }
-    m_querying = true;
-
-    /* Update the list of online entries. */
-    QDBusPendingCall pcall = m_dbusIface->asyncCall("GetEntries");
-    QDBusPendingCallWatcher* watcher = new QDBusPendingCallWatcher(pcall, this);
-    connect(watcher, SIGNAL(finished(QDBusPendingCallWatcher*)),
-            SLOT(gotEntries(QDBusPendingCallWatcher*)));
-}
-
-void
-Place::startMonitoringEntries()
-{
-    QDBusConnection connection = m_dbusIface->connection();
-    connection.connect(m_dbusName, m_dbusObjectPath, UNITY_PLACE_INTERFACE,
-                       "EntryAdded", this, SLOT(onEntryAdded(const PlaceEntryInfoStruct&)));
-    connection.connect(m_dbusName, m_dbusObjectPath, UNITY_PLACE_INTERFACE,
-                       "EntryRemoved", this, SLOT(onEntryRemoved(const QString&)));
-}
-
-void
-Place::stopMonitoringEntries()
-{
-    QDBusConnection connection = m_dbusIface->connection();
-    connection.disconnect(m_dbusName, m_dbusObjectPath, UNITY_PLACE_INTERFACE,
-                          "EntryAdded", this, SLOT(onEntryAdded(const PlaceEntryInfoStruct&)));
-    connection.disconnect(m_dbusName, m_dbusObjectPath, UNITY_PLACE_INTERFACE,
-                          "EntryRemoved", this, SLOT(onEntryRemoved(const QString&)));
-}
-
-void
-Place::onPlaceServiceRegistered()
-{
-    connectToRemotePlace();
-
-    m_online = true;
-    Q_EMIT onlineChanged(m_online);
-
-    startMonitoringEntries();
-    getEntries();
-}
-
-void
-Place::onPlaceServiceUnregistered()
-{
-    m_online = false;
-    Q_EMIT onlineChanged(m_online);
-
-    stopMonitoringEntries();
-
-    for (int i = rowCount() - 1; i >= 0; --i) {
-        PlaceEntry* entry = m_entries.at(i);
-        if (!m_static_entries.contains(entry->dbusObjectPath())) {
-            beginRemoveRows(QModelIndex(), i, i);
-            m_entries.removeAt(i);
-            endRemoveRows();
-            delete entry;
-        } else {
-            entry->setSensitive(false);
-        }
-    }
-}
-
-void
-Place::onEntryAdded(const PlaceEntryInfoStruct& p)
-{
-    PlaceEntry* entry = NULL;
-    if (m_static_entries.contains(p.dbus_path)) {
-        entry = m_static_entries.value(p.dbus_path);
-    } else {
-        entry = new PlaceEntry(this);
-        entry->setDbusName(m_dbusName);
-        entry->setDbusObjectPath(p.dbus_path);
-    }
-
-    entry->updateInfo(p);
-    connect(entry, SIGNAL(positionChanged(uint)),
-            SLOT(onEntryPositionChanged(uint)), Qt::UniqueConnection);
-    entry->setSensitive(true);
-    int index = m_entries.size();
-    beginInsertRows(QModelIndex(), index, index);
-    m_entries.append(entry);
-    endInsertRows();
-    entry->connectToRemotePlaceEntry();
-    Q_EMIT entryAdded(entry);
-}
-
-void
-Place::onEntryRemoved(const QString& dbusObjectPath)
-{
-    PlaceEntry* entry = NULL;
-    QList<PlaceEntry*>::const_iterator i;
-    for (i = m_entries.constBegin(); i != m_entries.constEnd(); ++i) {
-        if ((*i)->dbusObjectPath() == dbusObjectPath) {
-            entry = *i;
-            break;
-        }
-    }
-
-    if (entry != NULL) {
-        Q_EMIT entryRemoved(entry);
-        int index = m_entries.indexOf(entry);
-        beginRemoveRows(QModelIndex(), index, index);
-        m_entries.removeOne(entry);
-        endRemoveRows();
-
-        if (!m_static_entries.contains(entry->dbusObjectPath())) {
-            delete entry;
-        } else {
-            entry->setSensitive(false);
-        }
-    }
-}
-
-void
-Place::onEntryPositionChanged(uint position)
-{
-    /* This doesn’t seem to be implemented/used in Unity, but it can’t hurt… */
-    // TODO: may require some sanity checks.
-    PlaceEntry* entry = static_cast<PlaceEntry*>(sender());
-    int from = m_entries.indexOf(entry);
-    if (from != -1) {
-        beginMoveRows(QModelIndex(), from, from, QModelIndex(), position);
-        m_entries.move(from, position);
-        endMoveRows();
-    }
-}
-
-void
-Place::gotEntries(QDBusPendingCallWatcher* watcher)
-{
-    QDBusPendingReply<QList<PlaceEntryInfoStruct> > reply = *watcher;
-    if (reply.isError()) {
-        UQ_WARNING << "ERROR:" << m_dbusName << reply.error().message();
-        onPlaceServiceUnregistered();
-    } else {
-        QList<PlaceEntryInfoStruct> entries = reply.argumentAt<0>();
-        QList<PlaceEntryInfoStruct>::const_iterator i;
-        for (i = entries.constBegin(); i != entries.constEnd(); ++i) {
-            if (m_static_entries.contains(i->dbus_path)) {
-                PlaceEntry* entry = m_static_entries.value(i->dbus_path);
-                entry->updateInfo(*i);
-                if (m_entries.contains(entry)) {
-                    entry->setSensitive(true);
-                } else {
-                    int index = m_entries.size();
-                    beginInsertRows(QModelIndex(), index, index);
-                    m_entries.append(entry);
-                    endInsertRows();
-                }
-                entry->connectToRemotePlaceEntry();
-            } else {
-                onEntryAdded(*i);
-            }
-        }
-    }
-    watcher->deleteLater();
-    m_querying = false;
-}
-
-PlaceEntry*
-Place::findPlaceEntry(const QString& groupName)
-{
-    Q_FOREACH(PlaceEntry* entry, m_entries) {
-        if (entry->groupName() == groupName) {
-            return entry;
-        }
-    }
-
-    return NULL;
-}
-
-void
-Place::activate(const QString& uri)
-{
-    /* Tries various methods to trigger a sensible action for the given 'uri'.
-       First it asks the place backend via its 'Activate' method. If that fails
-       it does its best to select a relevant action for the uri's scheme. 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;
-    }
-
-    QDBusInterface dbusActivationInterface(m_dbusName, m_dbusObjectPath,
-                                           UNITY_ACTIVATION_INTERFACE);
-    QDBusReply<uint> reply = dbusActivationInterface.call("Activate", uri);
-    if (reply != 0) {
-        return;
-    }
-
-    if (url.scheme() == "application") {
-        LauncherApplication application;
-        /* Cannot set the desktop file to url.host(), because the QUrl constructor
-           converts the host name to lower case to conform to the Nameprep
-           RFC (see http://doc.qt.nokia.com/qurl.html#FormattingOption-enum).
-           Ref: https://bugs.launchpad.net/unity-place-applications/+bug/784478 */
-        QString desktopFile = uri.mid(uri.indexOf("://") + 3);
-        application.setDesktopFile(desktopFile);
-        application.activate();
-        return;
-    }
-
-    UQ_WARNING << "FIXME: Possibly no handler for scheme: " << url.scheme();
-    UQ_WARNING << "Trying to open" << uri;
-    /* Try our luck */
-    QDesktopServices::openUrl(url);
-}
-
-#include "place.moc"

=== removed file 'libunity-2d-private/src/place.h'
--- libunity-2d-private/src/place.h	2012-01-13 15:05:44 +0000
+++ libunity-2d-private/src/place.h	1970-01-01 00:00:00 +0000
@@ -1,116 +0,0 @@
-/*
- * Copyright (C) 2010 Canonical, Ltd.
- *
- * Authors:
- *  Olivier Tilloy <[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 PLACE_H
-#define PLACE_H
-
-#include <QAbstractListModel>
-#include <QString>
-#include <QSettings>
-#include <QList>
-#include <QHash>
-#include <QMetaType>
-#include <QDBusInterface>
-#include <QDBusPendingCallWatcher>
-#include <QDBusServiceWatcher>
-
-#include "placeentry.h"
-
-class Place : public QAbstractListModel
-{
-    Q_OBJECT
-
-    Q_ENUMS(Roles)
-
-    Q_PROPERTY(QString fileName READ fileName WRITE setFileName)
-    Q_PROPERTY(QString dbusName READ dbusName)
-    Q_PROPERTY(QString dbusObjectPath READ dbusObjectPath)
-    Q_PROPERTY(bool online READ online NOTIFY onlineChanged)
-
-public:
-    Place(QObject* parent = 0);
-    Place(const Place& other);
-    ~Place();
-
-    enum Roles {
-        RoleItem,
-        RoleShowEntry
-    };
-
-    /* getters */
-    QString fileName() const;
-    QString dbusName() const;
-    QString dbusObjectPath() const;
-    bool online() const;
-
-    /* setters */
-    void setFileName(const QString& file);
-
-    /* methods */
-    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;
-    int rowCount(const QModelIndex& parent = QModelIndex()) const;
-
-    PlaceEntry* findPlaceEntry(const QString& groupName);
-    Q_INVOKABLE void activate(const QString& uri);
-
-Q_SIGNALS:
-    void entryAdded(PlaceEntry*);
-    void entryRemoved(PlaceEntry*);
-
-    void onlineChanged(bool);
-
-private:
-    QSettings* m_file;
-    QString m_dbusName;
-    QString m_dbusObjectPath;
-    QDBusServiceWatcher* m_serviceWatcher;
-
-    /* Initial dictionary (dbusObjectPath → entry) as parsed in the place file */
-    QHash<QString, PlaceEntry*> m_static_entries;
-
-    /* Online entries (ordered) */
-    QList<PlaceEntry*> m_entries;
-
-    bool m_online;
-    QDBusInterface* m_dbusIface;
-
-    void getEntries();
-    void startMonitoringEntries();
-    void stopMonitoringEntries();
-    bool m_querying;
-
-public Q_SLOTS:
-    /* Connect to the remote representation of the place on DBus and monitor
-       changes. */
-    void connectToRemotePlace();
-
-private Q_SLOTS:
-    void onEntryAdded(const PlaceEntryInfoStruct&);
-    void onEntryRemoved(const QString&);
-    void onEntryPositionChanged(uint);
-
-    void onPlaceServiceRegistered();
-    void onPlaceServiceUnregistered();
-
-    void gotEntries(QDBusPendingCallWatcher*);
-};
-
-Q_DECLARE_METATYPE(Place*)
-
-#endif // PLACE_H

=== removed file 'libunity-2d-private/src/placeentry.cpp'
--- libunity-2d-private/src/placeentry.cpp	2012-01-13 15:05:44 +0000
+++ libunity-2d-private/src/placeentry.cpp	1970-01-01 00:00:00 +0000
@@ -1,937 +0,0 @@
-/*
- * Copyright (C) 2010 Canonical, Ltd.
- *
- * Authors:
- *  Olivier Tilloy <[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 "placeentry.h"
-#include "place.h"
-#include "launchermenu.h"
-
-// libunity-2d
-#include <dashclient.h>
-#include <debug_p.h>
-
-// QtDee
-#include "deelistmodel.h"
-
-#include <QDBusMetaType>
-#include <QAction>
-#include <QDebug>
-
-// Marshall the RendererInfoStruct data into a D-Bus argument
-QDBusArgument &operator<<(QDBusArgument &argument, const RendererInfoStruct &r)
-{
-    argument.beginStructure();
-    argument << r.default_renderer;
-    argument << r.groups_model;
-    argument << r.results_model;
-    argument.beginMap(QVariant::String, QVariant::String);
-    QMap<QString, QString>::const_iterator i;
-    for (i = r.renderer_hints.constBegin(); i != r.renderer_hints.constEnd(); ++i) {
-        argument.beginMapEntry();
-        argument << i.key() << i.value();
-        argument.endMapEntry();
-    }
-    argument.endMap();
-    argument.endStructure();
-    return argument;
-}
-
-// Retrieve the RendererInfoStruct data from the D-Bus argument
-const QDBusArgument &operator>>(const QDBusArgument &argument, RendererInfoStruct &r)
-{
-    argument.beginStructure();
-    argument >> r.default_renderer;
-    argument >> r.groups_model;
-    argument >> r.results_model;
-    r.renderer_hints.clear();
-    argument.beginMap();
-    while (!argument.atEnd()) {
-        QString key;
-        QString value;
-        argument.beginMapEntry();
-        argument >> key >> value;
-        argument.endMapEntry();
-        r.renderer_hints[key] = value;
-    }
-    argument.endMap();
-    argument.endStructure();
-    return argument;
-}
-
-
-// Marshall the PlaceEntryInfoStruct data into a D-Bus argument
-QDBusArgument &operator<<(QDBusArgument &argument, const PlaceEntryInfoStruct &p)
-{
-    argument.beginStructure();
-    argument << p.dbus_path;
-    argument << p.name;
-    argument << p.icon;
-    argument << p.position;
-    argument.beginArray(QVariant::String);
-    QStringList::const_iterator i;
-    for (i = p.mimetypes.constBegin(); i != p.mimetypes.constEnd(); ++i) {
-        argument << *i;
-    }
-    argument.endArray();
-    argument << p.sensitive;
-    argument << p.sections_model;
-    argument.beginMap(QVariant::String, QVariant::String);
-    QMap<QString, QString>::const_iterator j;
-    for (j = p.hints.constBegin(); j != p.hints.constEnd(); ++j) {
-        argument.beginMapEntry();
-        argument << j.key() << j.value();
-        argument.endMapEntry();
-    }
-    argument.endMap();
-    argument << p.entry_renderer_info;
-    argument << p.global_renderer_info;
-    argument.endStructure();
-    return argument;
-}
-
-// Retrieve the PlaceEntryInfoStruct data from the D-Bus argument
-const QDBusArgument &operator>>(const QDBusArgument &argument, PlaceEntryInfoStruct &p)
-{
-    argument.beginStructure();
-    argument >> p.dbus_path;
-    argument >> p.name;
-    argument >> p.icon;
-    argument >> p.position;
-    argument.beginArray();
-    p.mimetypes.clear();
-    while (!argument.atEnd()) {
-        QString mimetype;
-        argument >> mimetype;
-        p.mimetypes.append(mimetype);
-    }
-    argument.endArray();
-    argument >> p.sensitive;
-    argument >> p.sections_model;
-    p.hints.clear();
-    argument.beginMap();
-    while (!argument.atEnd()) {
-        QString key;
-        QString value;
-        argument.beginMapEntry();
-        argument >> key >> value;
-        argument.endMapEntry();
-        p.hints[key] = value;
-    }
-    argument.endMap();
-    /* The PlaceEntryInfoChanged signal on the com.canonical.Unity.PlaceEntry
-       interface omits the two RenderingInfo structs. */
-    if (!argument.atEnd()) {
-        argument >> p.entry_renderer_info;
-        argument >> p.global_renderer_info;
-    }
-    argument.endStructure();
-    return argument;
-}
-
-
-static const char* UNITY_PLACE_ENTRY_INTERFACE = "com.canonical.Unity.PlaceEntry";
-static const char* SECTION_PROPERTY = "section";
-
-PlaceEntry::PlaceEntry(QObject* parent) :
-    LauncherItem(parent),
-    m_position(0),
-    m_sensitive(false),
-    m_sections(NULL),
-    m_showEntry(false),
-    m_activeSection(-1),
-    m_active(false),
-    m_place((Place*)parent),
-    m_entryGroupsModel(NULL),
-    m_entryResultsModel(NULL),
-    m_globalGroupsModel(NULL),
-    m_globalResultsModel(NULL),
-    m_dbusIface(NULL)
-{
-    qDBusRegisterMetaType<RendererInfoStruct>();
-    qDBusRegisterMetaType<PlaceEntryInfoStruct>();
-    qDBusRegisterMetaType<QList<PlaceEntryInfoStruct> >();
-    qDBusRegisterMetaType<QHash<QString, QString>>();
-
-    connect(DashClient::instance(), SIGNAL(activePageChanged(const QString&)),
-        SLOT(slotActivePageChanged(const QString&)));
-}
-
-PlaceEntry::PlaceEntry(const PlaceEntry& other) :
-    m_fileName(other.m_fileName),
-    m_groupName(other.m_groupName),
-    m_dbusName(other.m_dbusName),
-    m_dbusObjectPath(other.m_dbusObjectPath),
-    m_icon(other.m_icon),
-    m_name(other.m_name),
-    m_position(other.m_position),
-    m_mimetypes(other.m_mimetypes),
-    m_sensitive(other.m_sensitive),
-    m_activeSection(other.m_activeSection),
-    m_active(other.m_active),
-    m_place(other.m_place),
-
-    m_entrySearchQuery(other.m_entrySearchQuery),
-    m_entryRendererName(other.m_entryRendererName),
-    m_entryGroupsModelName(other.m_entryGroupsModelName),
-    m_entryResultsModelName(other.m_entryResultsModelName),
-
-    m_globalSearchQuery(other.m_globalSearchQuery),
-    m_globalRendererName(other.m_globalRendererName),
-    m_globalGroupsModelName(other.m_globalGroupsModelName),
-    m_globalResultsModelName(other.m_globalResultsModelName)
-{
-    setSections(other.m_sections);
-    setHints(other.m_hints);
-
-    setEntryGroupsModel(other.m_entryGroupsModel);
-    setEntryResultsModel(other.m_entryResultsModel);
-    setEntryRendererHints(other.m_entryRendererHints);
-
-    setGlobalGroupsModel(other.m_globalGroupsModel);
-    setGlobalResultsModel(other.m_globalResultsModel);
-    setGlobalRendererHints(other.m_globalRendererHints);
-}
-
-PlaceEntry::~PlaceEntry()
-{
-    delete m_sections;
-    delete m_dbusIface;
-}
-
-bool
-PlaceEntry::running() const
-{
-    return false;
-}
-
-int
-PlaceEntry::windowCount() const
-{
-    return 0;
-}
-
-bool
-PlaceEntry::urgent() const
-{
-    return false;
-}
-
-QString
-PlaceEntry::name() const
-{
-    return m_name;
-}
-
-void
-PlaceEntry::setName(const QString& name)
-{
-    m_name = name;
-}
-
-QString
-PlaceEntry::icon() const
-{
-    return m_icon;
-}
-
-void
-PlaceEntry::setIcon(const QString& icon)
-{
-    m_icon = icon;
-}
-
-bool
-PlaceEntry::launching() const
-{
-    /* This basically means no launching animation when opening the device.
-       Unity behaves likes this. */
-    return false;
-}
-
-QString
-PlaceEntry::fileName() const
-{
-    return m_fileName;
-}
-
-void
-PlaceEntry::setFileName(const QString& fileName)
-{
-    m_fileName = fileName;
-}
-
-QString
-PlaceEntry::groupName() const
-{
-    return m_groupName;
-}
-
-void
-PlaceEntry::setGroupName(const QString& groupName)
-{
-    m_groupName = groupName;
-}
-
-QString
-PlaceEntry::dbusName() const
-{
-    return m_dbusName;
-}
-
-QString
-PlaceEntry::dbusObjectPath() const
-{
-    return m_dbusObjectPath;
-}
-
-uint
-PlaceEntry::position() const
-{
-    return m_position;
-}
-
-QStringList
-PlaceEntry::mimetypes() const
-{
-    return m_mimetypes;
-}
-
-bool
-PlaceEntry::sensitive() const
-{
-    return m_sensitive;
-}
-
-DeeListModel*
-PlaceEntry::sections() const
-{
-    return m_sections;
-}
-
-QMap<QString, QVariant>
-PlaceEntry::hints() const
-{
-    return m_hints;
-}
-
-QString
-PlaceEntry::searchHint() const
-{
-    return m_searchHint;
-}
-
-bool
-PlaceEntry::showEntry() const
-{
-    return m_showEntry;
-}
-
-int
-PlaceEntry::activeSection() const
-{
-    return m_activeSection;
-}
-
-bool
-PlaceEntry::active() const
-{
-    return m_active;
-}
-
-Place*
-PlaceEntry::place() const
-{
-    return m_place;
-}
-
-QString
-PlaceEntry::entrySearchQuery() const
-{
-    return m_entrySearchQuery;
-}
-
-QString
-PlaceEntry::entryRendererName() const
-{
-    return m_entryRendererName;
-}
-
-QString
-PlaceEntry::entryGroupsModelName() const
-{
-    return m_entryGroupsModelName;
-}
-
-DeeListModel*
-PlaceEntry::entryGroupsModel()
-{
-    if (m_entryGroupsModel == NULL) {
-        if (!m_entryGroupsModelName.isNull()) {
-            m_entryGroupsModel = new DeeListModel;
-            m_entryGroupsModel->setName(m_entryGroupsModelName);
-        }
-    }
-    return m_entryGroupsModel;
-}
-
-QString
-PlaceEntry::entryResultsModelName() const
-{
-    return m_entryResultsModelName;
-}
-
-DeeListModel*
-PlaceEntry::entryResultsModel()
-{
-    if (m_entryResultsModel == NULL) {
-        if (!m_entryResultsModelName.isNull()) {
-            m_entryResultsModel = new DeeListModel;
-            m_entryResultsModel->setName(m_entryResultsModelName);
-        }
-    }
-    return m_entryResultsModel;
-}
-
-QMap<QString, QVariant>
-PlaceEntry::entryRendererHints() const
-{
-    return m_entryRendererHints;
-}
-
-QString
-PlaceEntry::globalSearchQuery() const
-{
-    return m_globalSearchQuery;
-}
-
-QString
-PlaceEntry::globalRendererName() const
-{
-    return m_globalRendererName;
-}
-
-QString
-PlaceEntry::globalGroupsModelName() const
-{
-    return m_globalGroupsModelName;
-}
-
-DeeListModel*
-PlaceEntry::globalGroupsModel()
-{
-    if (m_globalGroupsModel == NULL) {
-        if (!m_globalGroupsModelName.isNull()) {
-            m_globalGroupsModel = new DeeListModel;
-            m_globalGroupsModel->setName(m_globalGroupsModelName);
-        }
-    }
-    return m_globalGroupsModel;
-}
-
-QString
-PlaceEntry::globalResultsModelName() const
-{
-    return m_globalResultsModelName;
-}
-
-DeeListModel*
-PlaceEntry::globalResultsModel()
-{
-    if (m_globalResultsModel == NULL) {
-        if (!m_globalResultsModelName.isNull()) {
-            m_globalResultsModel = new DeeListModel;
-            m_globalResultsModel->setName(m_globalResultsModelName);
-        }
-    }
-    return m_globalResultsModel;
-}
-
-QMap<QString, QVariant>
-PlaceEntry::globalRendererHints() const
-{
-    return m_globalRendererHints;
-}
-
-void
-PlaceEntry::setDbusName(const QString& dbusName)
-{
-    m_dbusName = dbusName;
-}
-
-void
-PlaceEntry::setDbusObjectPath(const QString& dbusObjectPath)
-{
-    m_dbusObjectPath = dbusObjectPath;
-}
-
-void
-PlaceEntry::setPosition(uint position)
-{
-    if (position != m_position) {
-        m_position = position;
-        Q_EMIT positionChanged(position);
-    }
-}
-
-void
-PlaceEntry::setMimetypes(const QStringList& mimetypes)
-{
-    m_mimetypes = mimetypes;
-    Q_EMIT mimetypesChanged();
-}
-
-void
-PlaceEntry::setSensitive(bool sensitive)
-{
-    if (sensitive != m_sensitive) {
-        m_sensitive = sensitive;
-        Q_EMIT sensitiveChanged(sensitive);
-    }
-}
-
-void
-PlaceEntry::setSections(DeeListModel* sections)
-{
-    if (sections == NULL) {
-        return;
-    }
-    if (m_sections != NULL) {
-        delete m_sections;
-    }
-    m_sections = sections;
-    Q_EMIT sectionsChanged();
-}
-
-void
-PlaceEntry::setHints(const QMap<QString, QVariant>& hints)
-{
-    m_hints = hints;
-    Q_EMIT hintsChanged();
-}
-
-void
-PlaceEntry::setSearchHint(const QString& searchHint)
-{
-    if (m_searchHint != searchHint) {
-        m_searchHint = searchHint;
-        Q_EMIT searchHintChanged(m_searchHint);
-    }
-}
-
-void
-PlaceEntry::setShowEntry(bool showEntry)
-{
-    if (m_showEntry != showEntry) {
-        m_showEntry = showEntry;
-        Q_EMIT showEntryChanged(m_showEntry);
-    }
-}
-
-void
-PlaceEntry::setActiveSection(int activeSection)
-{
-    if (activeSection != m_activeSection) {
-        m_activeSection = activeSection;
-        if (m_dbusIface != NULL) {
-            /* the cast to uint is necessary for the D-Bus call to succeed as the
-               interface expects that type */
-            m_dbusIface->asyncCall("SetActiveSection", (uint)m_activeSection);
-        }
-        Q_EMIT activeSectionChanged();
-    }
-}
-
-void
-PlaceEntry::setActive(bool active)
-{
-    if (active != m_active) {
-        m_active = active;
-        if (m_dbusIface != NULL) {
-            m_dbusIface->asyncCall("SetActive", m_active);
-        }
-        Q_EMIT activeChanged();
-
-        if (m_dbusIface && m_active) {
-            /* SetActiveSection needs to be called after SetActive(true)
-               in order for it to have an effect. */
-            m_dbusIface->asyncCall("SetActiveSection", m_activeSection);
-        }
-    }
-}
-
-void
-PlaceEntry::setEntrySearchQuery(const QString& entrySearchQuery)
-{
-    if (entrySearchQuery != m_entrySearchQuery) {
-        m_entrySearchQuery = entrySearchQuery;
-        if (m_dbusIface != NULL) {
-            QHash<QString, QString> searchHints;
-            m_dbusIface->asyncCall("SetSearch", m_entrySearchQuery, qVariantFromValue(searchHints));
-        }
-        Q_EMIT entrySearchQueryChanged();
-    }
-}
-
-void
-PlaceEntry::setEntryRendererName(const QString& entryRendererName)
-{
-    if (entryRendererName != m_entryRendererName) {
-        m_entryRendererName = entryRendererName;
-        Q_EMIT entryRendererNameChanged();
-    }
-}
-
-void
-PlaceEntry::setEntryGroupsModelName(const QString& entryGroupsModelName)
-{
-    if (entryGroupsModelName != m_entryGroupsModelName) {
-        m_entryGroupsModelName = entryGroupsModelName;
-        delete m_entryGroupsModel;
-        m_entryGroupsModel = NULL;
-        Q_EMIT entryGroupsModelNameChanged();
-        Q_EMIT entryGroupsModelChanged();
-    }
-}
-
-void
-PlaceEntry::setEntryGroupsModel(DeeListModel* entryGroupsModel)
-{
-    if (entryGroupsModel == NULL) {
-        return;
-    }
-    if (m_entryGroupsModel != NULL) {
-        delete m_entryGroupsModel;
-    }
-    m_entryGroupsModel = entryGroupsModel;
-    Q_EMIT entryGroupsModelChanged();
-}
-
-void
-PlaceEntry::setEntryResultsModelName(const QString& entryResultsModelName)
-{
-    if (entryResultsModelName != m_entryResultsModelName) {
-        m_entryResultsModelName = entryResultsModelName;
-        delete m_entryResultsModel;
-        m_entryResultsModel = NULL;
-        Q_EMIT entryResultsModelNameChanged();
-        Q_EMIT entryResultsModelChanged();
-    }
-}
-
-void
-PlaceEntry::setEntryResultsModel(DeeListModel* entryResultsModel)
-{
-    if (entryResultsModel == NULL) {
-        return;
-    }
-    if (m_entryResultsModel != NULL) {
-        delete m_entryResultsModel;
-    }
-    m_entryResultsModel = entryResultsModel;
-    Q_EMIT entryResultsModelChanged();
-}
-
-void
-PlaceEntry::setEntryRendererHints(const QMap<QString, QVariant>& entryRendererHints)
-{
-    m_entryRendererHints = entryRendererHints;
-    Q_EMIT entryRendererHintsChanged();
-}
-
-void
-PlaceEntry::setGlobalSearchQuery(const QString& globalSearchQuery)
-{
-    if (globalSearchQuery != m_globalSearchQuery) {
-        m_globalSearchQuery = globalSearchQuery;
-        if (m_dbusIface != NULL) {
-            QHash<QString, QString> searchHints;
-            m_dbusIface->asyncCall("SetGlobalSearch", m_globalSearchQuery, qVariantFromValue(searchHints));
-        }
-        Q_EMIT globalSearchQueryChanged();
-    }
-}
-
-void
-PlaceEntry::setGlobalRendererName(const QString& globalRendererName)
-{
-    if (globalRendererName != m_globalRendererName) {
-        m_globalRendererName = globalRendererName;
-        Q_EMIT globalRendererNameChanged();
-    }
-}
-
-void
-PlaceEntry::setGlobalGroupsModelName(const QString& globalGroupsModelName)
-{
-    if (globalGroupsModelName != m_globalGroupsModelName) {
-        m_globalGroupsModelName = globalGroupsModelName;
-        delete m_globalGroupsModel;
-        m_globalGroupsModel = NULL;
-        Q_EMIT globalGroupsModelNameChanged();
-        Q_EMIT globalGroupsModelChanged();
-    }
-}
-
-void
-PlaceEntry::setGlobalGroupsModel(DeeListModel* globalGroupsModel)
-{
-    if (globalGroupsModel == NULL) {
-        return;
-    }
-    if (m_globalGroupsModel != NULL) {
-        delete m_globalGroupsModel;
-    }
-    m_globalGroupsModel = globalGroupsModel;
-    Q_EMIT globalGroupsModelChanged();
-}
-
-void
-PlaceEntry::setGlobalResultsModelName(const QString& globalResultsModelName)
-{
-    if (globalResultsModelName != m_globalResultsModelName) {
-        m_globalResultsModelName = globalResultsModelName;
-        delete m_globalResultsModel;
-        m_globalResultsModel = NULL;
-        Q_EMIT globalResultsModelNameChanged();
-        Q_EMIT globalResultsModelChanged();
-    }
-}
-
-void
-PlaceEntry::setGlobalResultsModel(DeeListModel* globalResultsModel)
-{
-    if (globalResultsModel == NULL) {
-        return;
-    }
-    if (m_globalResultsModel != NULL) {
-        delete m_globalResultsModel;
-    }
-    m_globalResultsModel = globalResultsModel;
-    Q_EMIT globalResultsModelChanged();
-}
-
-void
-PlaceEntry::setGlobalRendererHints(const QMap<QString, QVariant>& globalRendererHints)
-{
-    m_globalRendererHints = globalRendererHints;
-    Q_EMIT globalRendererHintsChanged();
-}
-
-
-void
-PlaceEntry::slotActivePageChanged(const QString& page)
-{
-    bool active = false;
-    if (!m_dbusObjectPath.isEmpty() && page == m_dbusObjectPath) {
-        active = true;
-    }
-
-    if (active != m_active) {
-        m_active = active;
-        Q_EMIT activeChanged();
-    }
-}
-
-void
-PlaceEntry::activate()
-{
-    activateEntry(0);
-}
-
-void
-PlaceEntry::activateEntry(const int section)
-{
-    if (!m_sensitive) {
-        startRemotePlaceOnDemand();
-    }
-
-    if (m_active) {
-        DashClient::instance()->setActivePage(QString());
-    } else {
-        /* FIXME: DashClient::setActivePage has changed but PlaceEntry is deprecated anyway */
-        //DashClient::instance()->setActivePage(m_dbusObjectPath, m_fileName, m_groupName, section);
-    }
-}
-
-void
-PlaceEntry::startRemotePlaceOnDemand()
-{
-    /* On-demand startup of the place. */
-    Place* place = qobject_cast<Place*>(parent());
-    place->connectToRemotePlace();
-}
-
-void
-PlaceEntry::createMenuActions()
-{
-    if (!m_sensitive) {
-        /* Monitor updates to the list of sections upon starting the remote
-           place. */
-        startMonitoringSections();
-
-        startRemotePlaceOnDemand();
-    }
-
-    if (m_sections == NULL) {
-        return;
-    }
-
-    for (int i = 0; i < m_sections->rowCount(); ++i) {
-        QAction* section = new QAction(m_menu);
-        QString sectionName = m_sections->data(m_sections->index(i)).toString();
-        /* Escape ampersands so that they are not considered as keyboard accelerators. */
-        sectionName.replace("&", "&&");
-        section->setText(sectionName);
-        section->setProperty(SECTION_PROPERTY, QVariant(i));
-        m_menu->addAction(section);
-        QObject::connect(section, SIGNAL(triggered()), this, SLOT(onSectionTriggered()));
-    }
-}
-
-void
-PlaceEntry::startMonitoringSections()
-{
-    connect(this, SIGNAL(sectionsChanged()), SLOT(slotSectionsChanged()));
-}
-
-void
-PlaceEntry::stopMonitoringSections()
-{
-    disconnect(SIGNAL(sectionsChanged()), this, SLOT(slotSectionsChanged()));
-}
-
-void
-PlaceEntry::slotSectionsChanged()
-{
-    /* This is a one-shot slot. */
-    stopMonitoringSections();
-
-    createMenuActions();
-}
-
-void
-PlaceEntry::onSectionTriggered()
-{
-    QAction* action = static_cast<QAction*>(sender());
-    int section = action->property(SECTION_PROPERTY).toInt();
-    m_menu->hide();
-    activateEntry(section);
-}
-
-void
-PlaceEntry::connectToRemotePlaceEntry()
-{
-    delete m_dbusIface;
-    m_dbusIface = new QDBusInterface(m_dbusName, m_dbusObjectPath,
-                                     UNITY_PLACE_ENTRY_INTERFACE);
-    QDBusConnection connection = m_dbusIface->connection();
-    if (!connection.isConnected()) {
-        return;
-    }
-
-    // Connect to RendererInfoChanged and PlaceEntryInfoChanged signals
-    connection.connect(m_dbusName, m_dbusObjectPath, UNITY_PLACE_ENTRY_INTERFACE,
-                       "RendererInfoChanged", this,
-                       SLOT(onRendererInfoChanged(const RendererInfoStruct&)));
-    connection.connect(m_dbusName, m_dbusObjectPath, UNITY_PLACE_ENTRY_INTERFACE,
-                       "PlaceEntryInfoChanged", this,
-                       SLOT(updateInfo(const PlaceEntryInfoStruct&)));
-
-    /* Update state of D-Bus daemon according to the values of local properties */
-    QHash<QString, QString> searchHints;
-    m_dbusIface->asyncCall("SetSearch", m_entrySearchQuery, qVariantFromValue(searchHints));
-    m_dbusIface->asyncCall("SetGlobalSearch", m_globalSearchQuery, qVariantFromValue(searchHints));
-    m_dbusIface->asyncCall("SetActive", m_active);
-    m_dbusIface->asyncCall("SetActiveSection", m_activeSection);
-}
-
-void
-PlaceEntry::updateInfo(const PlaceEntryInfoStruct& info)
-{
-    if (!info.name.isEmpty()) {
-        setName(info.name);
-    }
-    if (!info.icon.isEmpty()) {
-        setIcon(info.icon);
-    }
-    setPosition(info.position);
-    setMimetypes(info.mimetypes);
-    setSensitive(info.sensitive);
-    setSection(info.sections_model);
-
-    QMap<QString, QVariant> hints;
-    QMap<QString, QString>::const_iterator i;
-    for (i = info.hints.constBegin(); i != info.hints.constEnd(); ++i) {
-        hints[i.key()] = QVariant(i.value());
-    }
-    setHints(hints);
-
-    setEntryRendererName(info.entry_renderer_info.default_renderer);
-    setEntryGroupsModelName(info.entry_renderer_info.groups_model);
-    setEntryResultsModelName(info.entry_renderer_info.results_model);
-
-    QMap<QString, QVariant> entryRendererHints;
-    for (i = info.entry_renderer_info.renderer_hints.constBegin();
-        i != info.entry_renderer_info.renderer_hints.constEnd(); ++i) {
-        entryRendererHints[i.key()] = QVariant(i.value());
-    }
-    setEntryRendererHints(entryRendererHints);
-
-    setGlobalRendererName(info.global_renderer_info.default_renderer);
-    setGlobalGroupsModelName(info.global_renderer_info.groups_model);
-    setGlobalResultsModelName(info.global_renderer_info.results_model);
-
-    QMap<QString, QVariant> globalRendererHints;
-    for (i = info.global_renderer_info.renderer_hints.constBegin();
-        i != info.global_renderer_info.renderer_hints.constEnd(); ++i) {
-        globalRendererHints[i.key()] = QVariant(i.value());
-    }
-    setGlobalRendererHints(globalRendererHints);
-
-    Q_EMIT updated();
-    Q_EMIT rendererInfoChanged();
-}
-
-void
-PlaceEntry::setSection(const QString& sectionModelName)
-{
-    DeeListModel* sections = new DeeListModel;
-    sections->setName(sectionModelName);
-    setSections(sections);
-}
-
-void
-PlaceEntry::onRendererInfoChanged(const RendererInfoStruct& r)
-{
-    setEntryRendererName(r.default_renderer);
-    setEntryGroupsModelName(r.groups_model);
-    setEntryResultsModelName(r.results_model);
-
-    QMap<QString, QVariant> entryRendererHints;
-    QMap<QString, QString>::const_iterator i;
-    for (i = r.renderer_hints.constBegin();
-         i != r.renderer_hints.constEnd(); ++i) {
-        entryRendererHints[i.key()] = QVariant(i.value());
-    }
-    setEntryRendererHints(entryRendererHints);
-
-    Q_EMIT updated();
-    Q_EMIT rendererInfoChanged();
-}
-
-#include "placeentry.moc"

=== removed file 'libunity-2d-private/src/placeentry.h'
--- libunity-2d-private/src/placeentry.h	2012-01-13 15:05:44 +0000
+++ libunity-2d-private/src/placeentry.h	1970-01-01 00:00:00 +0000
@@ -1,290 +0,0 @@
-/*
- * Copyright (C) 2010 Canonical, Ltd.
- *
- * Authors:
- *  Olivier Tilloy <[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 PLACEENTRY_H
-#define PLACEENTRY_H
-
-#include "launcheritem.h"
-
-// QtDee
-class DeeListModel;
-
-#include <QMetaType>
-#include <QDBusInterface>
-#include <QDBusArgument>
-
-// https://wiki.ubuntu.com/Unity/Places#RendererInfo
-struct RendererInfoStruct
-{
-    QString default_renderer;
-    QString groups_model;
-    QString results_model;
-    QMap<QString, QString> renderer_hints;
-};
-Q_DECLARE_METATYPE(RendererInfoStruct)
-
-// Marshalling and unmarshalling of RendererInfoStruct
-QDBusArgument &operator<<(QDBusArgument &, const RendererInfoStruct &);
-const QDBusArgument &operator>>(const QDBusArgument &, RendererInfoStruct &);
-
-
-// https://wiki.ubuntu.com/Unity/Places#PlaceEntryInfo
-struct PlaceEntryInfoStruct
-{
-    QString dbus_path;
-    QString name;
-    QString icon;
-    uint position;
-    QStringList mimetypes;
-    bool sensitive;
-    QString sections_model;
-    QMap<QString, QString> hints;
-    RendererInfoStruct entry_renderer_info;
-    RendererInfoStruct global_renderer_info;
-};
-Q_DECLARE_METATYPE(PlaceEntryInfoStruct)
-Q_DECLARE_METATYPE(QList<PlaceEntryInfoStruct>)
-
-// Marshalling and unmarshalling of PlaceEntryInfoStruct
-QDBusArgument &operator<<(QDBusArgument &, const PlaceEntryInfoStruct &);
-const QDBusArgument &operator>>(const QDBusArgument &, PlaceEntryInfoStruct &);
-
-class Place;
-
-class PlaceEntry : public LauncherItem
-{
-    Q_OBJECT
-
-    Q_PROPERTY(QString fileName READ fileName WRITE setFileName)
-    Q_PROPERTY(QString groupName READ groupName WRITE setGroupName)
-    Q_PROPERTY(QString dbusName READ dbusName WRITE setDbusName)
-    Q_PROPERTY(QString dbusObjectPath READ dbusObjectPath WRITE setDbusObjectPath)
-    Q_PROPERTY(uint position READ position WRITE setPosition NOTIFY positionChanged)
-    Q_PROPERTY(QStringList mimetypes READ mimetypes WRITE setMimetypes NOTIFY mimetypesChanged)
-    Q_PROPERTY(bool sensitive READ sensitive WRITE setSensitive NOTIFY sensitiveChanged)
-    Q_PROPERTY(DeeListModel* sections READ sections WRITE setSections NOTIFY sectionsChanged)
-    Q_PROPERTY(QMap hints READ hints WRITE setHints NOTIFY hintsChanged)
-    Q_PROPERTY(QString searchHint READ searchHint WRITE setSearchHint NOTIFY searchHintChanged)
-    Q_PROPERTY(bool showEntry READ showEntry WRITE setShowEntry NOTIFY showEntryChanged)
-    Q_PROPERTY(int activeSection READ activeSection WRITE setActiveSection NOTIFY activeSectionChanged)
-    Q_PROPERTY(bool active READ active WRITE setActive NOTIFY activeChanged)
-    Q_PROPERTY(Place* place READ place)
-
-    /* Entry rendering info */
-    Q_PROPERTY(QString entrySearchQuery READ entrySearchQuery WRITE setEntrySearchQuery NOTIFY entrySearchQueryChanged)
-    Q_PROPERTY(QString entryRendererName READ entryRendererName WRITE setEntryRendererName NOTIFY entryRendererNameChanged)
-    Q_PROPERTY(QString entryGroupsModelName READ entryGroupsModelName WRITE setEntryGroupsModelName NOTIFY entryGroupsModelNameChanged)
-    Q_PROPERTY(DeeListModel* entryGroupsModel READ entryGroupsModel WRITE setEntryGroupsModel NOTIFY entryGroupsModelChanged)
-    Q_PROPERTY(QString entryResultsModelName READ entryResultsModelName WRITE setEntryResultsModelName NOTIFY entryResultsModelNameChanged)
-    Q_PROPERTY(DeeListModel* entryResultsModel READ entryResultsModel WRITE setEntryResultsModel NOTIFY entryResultsModelChanged)
-    Q_PROPERTY(QMap entryRendererHints READ entryRendererHints WRITE setEntryRendererHints NOTIFY entryRendererHintsChanged)
-
-    /* Global rendering info */
-    Q_PROPERTY(QString globalSearchQuery READ globalSearchQuery WRITE setGlobalSearchQuery NOTIFY globalSearchQueryChanged)
-    Q_PROPERTY(QString globalRendererName READ globalRendererName WRITE setGlobalRendererName NOTIFY globalRendererNameChanged)
-    Q_PROPERTY(QString globalGroupsModelName READ globalGroupsModelName WRITE setGlobalGroupsModelName NOTIFY globalGroupsModelNameChanged)
-    Q_PROPERTY(DeeListModel* globalGroupsModel READ globalGroupsModel WRITE setGlobalGroupsModel NOTIFY globalGroupsModelChanged)
-    Q_PROPERTY(QString globalResultsModelName READ globalResultsModelName WRITE setGlobalResultsModelName NOTIFY globalResultsModelNameChanged)
-    Q_PROPERTY(DeeListModel* globalResultsModel READ globalResultsModel WRITE setGlobalResultsModel NOTIFY globalResultsModelChanged)
-    Q_PROPERTY(QMap globalRendererHints READ globalRendererHints WRITE setGlobalRendererHints NOTIFY globalRendererHintsChanged)
-
-public:
-    PlaceEntry(QObject* parent = 0);
-    PlaceEntry(const PlaceEntry& other);
-    ~PlaceEntry();
-
-    /* getters */
-    virtual bool active() const;
-    virtual bool running() const;
-    virtual int windowCount() const;
-    virtual bool urgent() const;
-    virtual QString name() const;
-    virtual QString icon() const;
-    virtual bool launching() const;
-    QString fileName() const;
-    QString groupName() const;
-    QString dbusName() const;
-    QString dbusObjectPath() const;
-    uint position() const;
-    QStringList mimetypes() const;
-    bool sensitive() const;
-    DeeListModel* sections() const;
-    QMap<QString, QVariant> hints() const;
-    QString searchHint() const;
-    bool showEntry() const;
-    int activeSection() const;
-    Place* place() const;
-
-    QString entrySearchQuery() const;
-    QString entryRendererName() const;
-    QString entryGroupsModelName() const;
-    DeeListModel* entryGroupsModel();
-    QString entryResultsModelName() const;
-    DeeListModel* entryResultsModel();
-    QMap<QString, QVariant> entryRendererHints() const;
-
-    QString globalSearchQuery() const;
-    QString globalRendererName() const;
-    QString globalGroupsModelName() const;
-    DeeListModel* globalGroupsModel();
-    QString globalResultsModelName() const;
-    DeeListModel* globalResultsModel();
-    QMap<QString, QVariant> globalRendererHints() const;
-
-    /* setters */
-    void setName(const QString &);
-    void setIcon(const QString &);
-    void setFileName(const QString &);
-    void setGroupName(const QString &);
-    void setDbusName(const QString &);
-    void setDbusObjectPath(const QString &);
-    void setPosition(uint);
-    void setMimetypes(const QStringList &);
-    void setSensitive(bool);
-    void setSections(DeeListModel*);
-    void setHints(const QMap<QString, QVariant> &);
-    void setSearchHint(const QString&);
-    void setShowEntry(bool);
-    void setActiveSection(int);
-    void setActive(bool);
-
-    void setEntrySearchQuery(const QString &);
-    void setEntryRendererName(const QString &);
-    void setEntryGroupsModelName(const QString &);
-    void setEntryGroupsModel(DeeListModel*);
-    void setEntryResultsModelName(const QString &);
-    void setEntryResultsModel(DeeListModel*);
-    void setEntryRendererHints(const QMap<QString, QVariant> &);
-
-    void setGlobalSearchQuery(const QString &);
-    void setGlobalRendererName(const QString &);
-    void setGlobalGroupsModelName(const QString &);
-    void setGlobalGroupsModel(DeeListModel*);
-    void setGlobalResultsModelName(const QString &);
-    void setGlobalResultsModel(DeeListModel*);
-    void setGlobalRendererHints(const QMap<QString, QVariant>&);
-
-    /* methods */
-    Q_INVOKABLE virtual void activate();
-    Q_INVOKABLE virtual void createMenuActions();
-
-    /* Connect to the remote representation of the entry on DBus and monitor
-       changes. */
-    void connectToRemotePlaceEntry();
-
-    void updateInfo(const PlaceEntryInfoStruct& info);
-
-Q_SIGNALS:
-    void positionChanged(uint);
-    void mimetypesChanged();
-    void sensitiveChanged(bool);
-    void sectionsChanged();
-    void hintsChanged();
-    void searchHintChanged(QString);
-    void showEntryChanged(bool);
-    void activeSectionChanged();
-    void activeChanged();
-
-    void entrySearchQueryChanged();
-    void entryRendererNameChanged();
-    void entryGroupsModelNameChanged();
-    void entryGroupsModelChanged();
-    void entryResultsModelNameChanged();
-    void entryResultsModelChanged();
-    void entryRendererHintsChanged();
-
-    void globalSearchQueryChanged();
-    void globalRendererNameChanged();
-    void globalGroupsModelNameChanged();
-    void globalGroupsModelChanged();
-    void globalResultsModelNameChanged();
-    void globalResultsModelChanged();
-    void globalRendererHintsChanged();
-
-    void updated();
-    void rendererInfoChanged();
-
-private:
-    QString m_fileName;
-    QString m_groupName;
-    QString m_dbusName;
-    QString m_dbusObjectPath;
-    QString m_icon;
-    QString m_name;
-    uint m_position;
-    QStringList m_mimetypes;
-    bool m_sensitive;
-    DeeListModel* m_sections;
-    /* m_hints should be a QMap<QString, QString> really, but it has to hold
-       QVariant values in order to allow exposing it as a property (see
-       http://doc.trolltech.com/properties.html#requirements-for-declaring-properties). */
-    QMap<QString, QVariant> m_hints;
-    QString m_searchHint;
-    bool m_showEntry;
-    int m_activeSection;
-    bool m_active;
-    Place* m_place;
-
-    QString m_entrySearchQuery;
-    QString m_entryRendererName;
-    QString m_entryGroupsModelName;
-    DeeListModel* m_entryGroupsModel;
-    QString m_entryResultsModelName;
-    DeeListModel* m_entryResultsModel;
-    /* The remark about m_hints also applies to m_entryRendererHints. */
-    QMap<QString, QVariant> m_entryRendererHints;
-
-    QString m_globalSearchQuery;
-    QString m_globalRendererName;
-    QString m_globalGroupsModelName;
-    DeeListModel* m_globalGroupsModel;
-    QString m_globalResultsModelName;
-    DeeListModel* m_globalResultsModel;
-    /* The remark about m_hints also applies to m_globalRendererHints. */
-    QMap<QString, QVariant> m_globalRendererHints;
-
-    QDBusInterface* m_dbusIface;
-
-    void setSection(const QString&);
-    void activateEntry(const int section);
-
-    void startRemotePlaceOnDemand();
-
-private Q_SLOTS:
-    void onRendererInfoChanged(const RendererInfoStruct&);
-
-    void startMonitoringSections();
-    void stopMonitoringSections();
-    void slotSectionsChanged();
-
-    void slotActivePageChanged(const QString& page);
-
-    /* Contextual menu callbacks */
-    void onSectionTriggered();
-};
-
-Q_DECLARE_METATYPE(PlaceEntry*)
-
-/* Necessary workaround otherwise the preprocessor complains about
-   Q_DECLARE_METATYPE receiving 2 arguments instead of 1 */
-typedef QHash<QString, QString> __QHashQStringQString;
-Q_DECLARE_METATYPE(__QHashQStringQString)
-
-#endif // PLACEENTRY_H
-