Merge lp:~mzanetti/qtubuntu/drop-appmanager into lp:qtubuntu

[Michael Zanetti]

drop applicationmanager module from qtubuntu.

It won't work any more with upcoming changes in unity-api.

 * Are there any related MPs required for this MP to build/function as expected? Please list.

N/A

 * Did you perform an exploratory manual test run of your code change and any related functionality?

Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

Yes (version bump only)

 * If you changed the UI, has there been a design review?

N/A

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:214
http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/131/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-trusty-armhf-ci/42
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-trusty-armhf-ci/42/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-ci/131/rebuild

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

Please remove libunity-api-dev from the list of dependencies (are all the others necessary? libdbus-1-dev? qtdeclarative5-dev?)

README contains obsolete info now, best update it. The deploy.sh script too. And bits in tests/ could also go.

Since this breaks SF support, packaging changes are probably needed. Bumping the version number maybe. Good to ask a packaging expert about this.

review: Needs Fixing

[lp:~mzanetti/qtubuntu/drop-appmanager]

215. By Michael Zanetti on 2014-03-25

drop unity-api from depends

216. By Michael Zanetti on 2014-03-25

bump changelog

[Michael Zanetti (mzanetti)]

> Please remove libunity-api-dev from the list of dependencies (are all the
> others necessary? libdbus-1-dev? qtdeclarative5-dev?)

done. the others seem to be required still.

>
> README contains obsolete info now, best update it. The deploy.sh script too.
> And bits in tests/ could also go.

Couldn't find anything in the README. deploy.sh should be clean already.

>
> Since this breaks SF support, packaging changes are probably needed. Bumping
> the version number maybe. Good to ask a packaging expert about this.

done

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:216
http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/132/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-trusty-armhf-ci/43
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-trusty-armhf-ci/43/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-ci/132/rebuild

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

Yay for deleting obsolete code! Approved

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Yes
 * Did CI run pass? If not, please explain why.
Is fine

review: Approve

[lp:~mzanetti/qtubuntu/drop-appmanager]

217. By Michael Zanetti on 2014-03-31

drop qtutubutu-shell from provides

218. By Michael Zanetti on 2014-03-31

break unity8 << 7.85

219. By Michael Zanetti on 2014-03-31

also break old versions of ubuntu-touch-session

Unmerged revisions

=== modified file 'debian/changelog'
--- debian/changelog	2014-03-18 20:20:51 +0000
+++ debian/changelog	2014-03-31 15:14:06 +0000
@@ -1,3 +1,9 @@
+qtubuntu (0.54-0ubuntu1) trusty; urgency=medium
+
+  * Drop Unity.Application module.
+
+ -- Michael Zanetti <[e-mail]>  Tue, 25 Mar 2014 20:30:15 +0100
+
 qtubuntu (0.53+14.04.20140318-0ubuntu1) trusty; urgency=low
 
   [ Chris Coulson ]

=== modified file 'debian/control'
--- debian/control	2014-01-09 15:12:01 +0000
+++ debian/control	2014-03-31 15:14:06 +0000
@@ -12,7 +12,6 @@
                libhybris-dev,
                libplatform-api1-dev (>= 0.20),
                libudev-dev,
-               libunity-api-dev,
                libxrender-dev,
                libxkbcommon-dev,
                qt5-default,
@@ -34,9 +33,10 @@
 Replaces: qthybris (<< 0.37),
           qtubuntu (<< 0.52),
           qtubuntu-desktop
-Breaks: qthybris (<< 0.37)
-Provides: qtubuntu-shell,
-          qtubuntu,
+Breaks: qthybris (<< 0.37),
+        unity8 (<< 7.85),
+        ubuntu-touch-session (<< 0.107),
+Provides: qtubuntu,
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          libqt5sensors5,
@@ -56,9 +56,9 @@
 Conflicts: qtubuntu-android
 Replaces: qtubuntu (<< 0.52),
           qtubuntu-android
-Breaks: qthybris (<< 0.37)
-Provides: qtubuntu-shell,
-          qtubuntu,
+Breaks: qthybris (<< 0.37),
+        unity8 (<< 7.85),
+Provides: qtubuntu,
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          libqt5sensors5,

=== modified file 'debian/qtubuntu-android.install'
--- debian/qtubuntu-android.install	2013-08-30 14:32:02 +0000
+++ debian/qtubuntu-android.install	2014-03-31 15:14:06 +0000
@@ -1,2 +1,1 @@
 usr/lib/*/qt5/plugins/platforms/*
-usr/lib/*/qt5/imports/Unity/*

=== modified file 'debian/qtubuntu-desktop.install'
--- debian/qtubuntu-desktop.install	2013-12-09 17:31:20 +0000
+++ debian/qtubuntu-desktop.install	2014-03-31 15:14:06 +0000
@@ -1,2 +1,1 @@
 usr/lib/*/qt5/plugins/platforms/*
-usr/lib/*/qt5/imports/Unity/*

=== modified file 'deploy.sh'
--- deploy.sh	2013-06-19 22:37:32 +0000
+++ deploy.sh	2014-03-31 15:14:06 +0000
@@ -4,8 +4,6 @@
 adb push src/platforms/ubuntu/libqubuntumir.so /data/ubuntu/usr/lib/arm-linux-gnueabihf/qt5/plugins/platforms
 adb push src/platforms/ubuntu/libqubuntumirserver.so /data/ubuntu/usr/lib/arm-linux-gnueabihf/qt5/plugins/platforms
 adb push src/platforms/ubuntulegacy/libqubuntulegacy.so /data/ubuntu/usr/lib/arm-linux-gnueabihf/qt5/plugins/platforms
-adb push src/modules/application/libubuntuapplicationplugin.so /data/ubuntu/usr/lib/arm-linux-gnueabihf/qt5/imports/Ubuntu/Application
-adb push src/modules/application/qmldir /data/ubuntu/usr/lib/arm-linux-gnueabihf/qt5/imports/Ubuntu/Application
 adb push tests/qmlscene_ubuntu/qmlscene-ubuntu /data/ubuntu/usr/bin
 adb push tests/clipboard/clipboard /data/ubuntu/usr/lib/arm-linux-gnueabihf/qt5/tests
 adb push tests/Logo.qml /data/ubuntu/usr/lib/arm-linux-gnueabihf/qt5/tests

=== removed directory 'src/modules'
=== removed directory 'src/modules/application'
=== removed file 'src/modules/application/OSKController.qml'
--- src/modules/application/OSKController.qml	2013-09-05 16:30:22 +0000
+++ src/modules/application/OSKController.qml	1970-01-01 00:00:00 +0000
@@ -1,21 +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 Lesser General Public License version 3, as published by
- * the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
- * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.0
-
-Item {
-	// this is a fake OSKController, only for compatibility with Unity-Mir
-}

=== removed file 'src/modules/application/application.cc'
--- src/modules/application/application.cc	2013-09-12 15:45:12 +0000
+++ src/modules/application/application.cc	1970-01-01 00:00:00 +0000
@@ -1,123 +0,0 @@
-// This file is part of QtUbuntu, a set of Qt components for Ubuntu.
-// Copyright © 2013 Canonical Ltd.
-//
-// This program is free software: you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 3, as published by
-// the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
-// SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-#include "application.h"
-#include "desktopdata.h"
-#include "logging.h"
-
-using namespace unity::shell::application;
-
-Application::Application(
-    DesktopData* desktopData, qint64 pid, Application::Stage stage, Application::State state,
-    int timerId)
-    : ApplicationInfoInterface(desktopData->appId())
-    , desktopData_(desktopData)
-    , pid_(pid)
-    , stage_(stage)
-    , state_(state)
-    , focused_(false)
-    , fullscreen_(false)
-    , timerId_(timerId) {
-  DASSERT(desktopData != NULL);
-  DLOG("Application::Application (this=%p, desktopData=%p, pid=%lld, stage=%d, state=%d, "
-       "timerId=%d)", this, desktopData, pid, static_cast<int>(stage), static_cast<int>(state),
-       timerId);
-}
-
-Application::~Application() {
-  DLOG("Application::~Application");
-  delete desktopData_;
-}
-
-QString Application::appId() const {
-  return desktopData_->appId();
-}
-
-QString Application::name() const {
-  return desktopData_->name();
-}
-
-QString Application::comment() const {
-  return desktopData_->comment();
-}
-
-QUrl Application::icon() const {
-  QString iconString = desktopData_->icon().toString();
-  QString pathString = desktopData_->path();
-
-  if (QFileInfo(iconString).exists()) {
-    return desktopData_->icon();
-  } else if (QFileInfo(pathString + '/' + iconString).exists()) {
-    return QUrl(pathString + '/' + iconString);
-  } else {
-    return QUrl("image://theme/" + iconString);
-  }
-}
-
-QString Application::exec() const {
-  return desktopData_->exec();
-}
-
-qint64 Application::pid() const {
-  return pid_;
-}
-
-Application::Stage Application::stage() const {
-  return stage_;
-}
-
-Application::State Application::state() const {
-  return state_;
-}
-
-bool Application::focused() const {
-  return focused_;
-}
-
-bool Application::fullscreen() const {
-  return fullscreen_;
-}
-
-void Application::setStage(Application::Stage stage) {
-  DLOG("Application::setStage (this=%p, stage=%d)", this, static_cast<int>(stage));
-  if (stage_ != stage) {
-    stage_ = stage;
-    emit stageChanged(stage);
-  }
-}
-
-void Application::setState(Application::State state) {
-  DLOG("Application::setState (this=%p, state=%d)", this, static_cast<int>(state));
-  if (state_ != state) {
-    state_ = state;
-    emit stateChanged(state);
-  }
-}
-
-void Application::setFocused(bool focused) {
-    DLOG("Application::setFocused (this=%p, focused=%d)", this, static_cast<int>(focused));
-    if (focused_ != focused) {
-      focused_ = focused;
-      emit focusedChanged(focused);
-    }
-}
-
-void Application::setFullscreen(bool fullscreen) {
-  DLOG("Application::setFullscreen (this=%p, fullscreen=%s)", this, fullscreen ? "yes" : "no");
-  if (fullscreen_ != fullscreen) {
-    fullscreen_ = fullscreen;
-    emit fullscreenChanged(fullscreen);
-  }
-}

=== removed file 'src/modules/application/application.h'
--- src/modules/application/application.h	2013-09-05 14:56:54 +0000
+++ src/modules/application/application.h	1970-01-01 00:00:00 +0000
@@ -1,71 +0,0 @@
-// This file is part of QtUbuntu, a set of Qt components for Ubuntu.
-// Copyright © 2013 Canonical Ltd.
-//
-// This program is free software: you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 3, as published by
-// the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
-// SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-#ifndef APPLICATION_H
-#define APPLICATION_H
-
-#include <QtCore/QtCore>
-
-// unity-api
-#include <unity/shell/application/ApplicationInfoInterface.h>
-
-class DesktopData;
-
-class Application : public unity::shell::application::ApplicationInfoInterface {
-  Q_OBJECT
-
-  Q_PROPERTY(bool fullscreen READ fullscreen NOTIFY fullscreenChanged)
-
- public:
-  Application(DesktopData* desktopData, qint64 pid, Stage stage, State state, int timerId);
-  ~Application();
-
-  QString appId() const override;
-  QString name() const override;
-  QString comment() const override;
-  QUrl icon() const override;
-  Stage stage() const override;
-  State state() const override;
-  bool focused() const override;
-  bool fullscreen() const;
-
-  // used internally, not for QML
-  QString exec() const;
-  qint64 pid() const;
-
- Q_SIGNALS:
-  void fullscreenChanged(bool fullscreen);
-
- private:
-  void setStage(Stage stage);
-  void setState(State state);
-  void setFocused(bool focused);
-  void setFullscreen(bool fullscreen);
-  int timerId() const { return timerId_; }
-
-  DesktopData* desktopData_;
-  qint64 pid_;
-  Stage stage_;
-  State state_;
-  bool focused_;
-  bool fullscreen_;
-  int timerId_;
-
-  friend class ApplicationManager;
-};
-
-Q_DECLARE_METATYPE(Application*)
-
-#endif  // APPLICATION_H

=== removed file 'src/modules/application/application.pro'
--- src/modules/application/application.pro	2014-01-30 14:57:43 +0000
+++ src/modules/application/application.pro	1970-01-01 00:00:00 +0000
@@ -1,45 +0,0 @@
-TARGET = unityapplicationplugin
-TEMPLATE = lib
-
-QT += quick
-CONFIG += link_pkgconfig
-
-# CONFIG += c++11 # only enables C++0x
-QMAKE_CXXFLAGS += -std=c++11 -fvisibility=hidden -fvisibility-inlines-hidden
-QMAKE_CXXFLAGS_RELEASE += -Werror     # so no stop on warning in debug builds
-QMAKE_LFLAGS = -std=c++11 -Wl,-no-undefined
-
-PKGCONFIG += unity-shell-application
-
-CONFIG(debug) {
-  QMAKE_CXXFLAGS_DEBUG += -Werror
-}
-
-SOURCES = plugin.cc \
-          application_manager.cc \
-          application_image.cc \
-          application_window.cc \
-          application.cc \
-          input_filter_area.cc \
-          desktopdata.cpp
-
-HEADERS = application_manager.h \
-          application_image.h \
-          application_window.h \
-          application.h \
-          input_filter_area.h \
-          desktopdata.h \
-          logging.h \
-          /usr/include/unity/shell/application/ApplicationInfoInterface.h \
-          /usr/include/unity/shell/application/ApplicationManagerInterface.h
-
-CONFIG += plugin
-
-LIBS += -lubuntu_application_api
-
-target.path += $$[QT_INSTALL_IMPORTS]/Unity/Application
-INSTALLS += target
-
-assets.files = qmldir OSKController.qml
-assets.path = $$[QT_INSTALL_IMPORTS]/Unity/Application
-INSTALLS += assets

=== removed file 'src/modules/application/application_image.cc'
--- src/modules/application/application_image.cc	2013-08-30 16:33:16 +0000
+++ src/modules/application/application_image.cc	1970-01-01 00:00:00 +0000
@@ -1,205 +0,0 @@
-// This file is part of QtUbuntu, a set of Qt components for Ubuntu.
-// Copyright © 2013 Canonical Ltd.
-//
-// This program is free software: you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 3, as published by
-// the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
-// SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-#include "application_image.h"
-#include "application.h"
-#include "logging.h"
-#include <QtGui/QPainter>
-#include <QtCore/QCoreApplication>
-#include <QtCore/QThread>
-#include <ubuntu/ui/ubuntu_ui_session_service.h>
-
-class ApplicationImageEvent : public QEvent {
- public:
-  ApplicationImageEvent(QEvent::Type type, QImage image, const QRect& sourceRect)
-      : QEvent(type)
-      , image_(image)
-      , sourceRect_(sourceRect) {
-    DLOG("ApplicationImageEvent::ApplicationImageEvent (this=%p, type=%d)", this, type);
-  }
-  ~ApplicationImageEvent() {
-    DLOG("ApplicationImageEvent::~ApplicationImageEvent");
-  }
-  static const QEvent::Type type_;
-  QImage image_;
-  QRect sourceRect_;
-};
-
-const QEvent::Type ApplicationImageEvent::type_ =
-    static_cast<QEvent::Type>(QEvent::registerEventType());
-
-static void snapshotCallback(const void* pixels, unsigned int bufferWidth, unsigned int bufferHeight,
-                             unsigned int sourceX, unsigned int sourceY,
-                             unsigned int sourceWidth, unsigned int sourceHeight,
-                             unsigned int stride, void* context) {
-  // FIXME(loicm) stride from Ubuntu Platform API is wrong.
-  Q_UNUSED(stride);
-  DLOG("snapshotCallback (pixels=%p, bufferWidth=%u, bufferHeight=%u, sourceX=%u, sourceY=%u, sourceWidth=%u, sourceHeight=%u, stride=%u, context=%p)",
-       pixels, bufferWidth, bufferHeight, sourceX, sourceY, sourceHeight, sourceHeight, stride, context);
-  DASSERT(context != NULL);
-  // Copy the pixels and post an event to the GUI thread so that we can safely schedule an update.
-  ApplicationImage* applicationImage = static_cast<ApplicationImage*>(context);
-
-  if (pixels == NULL || bufferWidth == 0 || bufferHeight == 0) {
-      QCoreApplication::postEvent(applicationImage, new ApplicationImageEvent(
-                                  ApplicationImageEvent::type_, QImage(), QRect()));
-  } else {
-    QRect sourceRect(sourceX, sourceY, sourceWidth, sourceHeight);
-    QImage image(static_cast<const uchar*>(pixels), bufferWidth, bufferHeight, bufferWidth * 4,
-                 QImage::Format_ARGB32_Premultiplied);
-    QCoreApplication::postEvent(applicationImage, new ApplicationImageEvent(
-          ApplicationImageEvent::type_, image.rgbSwapped(), sourceRect));
-  }
-}
-
-QHash<Application*, QPair<QImage, QRect> > ApplicationImage::imageCache_;
-
-ApplicationImage::ApplicationImage(QQuickPaintedItem* parent)
-    : QQuickPaintedItem(parent)
-    , source_(NULL)
-    , fillMode_(Stretch)
-    , ready_(false) {
-  DLOG("ApplicationImage::ApplicationImage (this=%p, parent=%p)", this, parent);
-  setRenderTarget(QQuickPaintedItem::FramebufferObject);
-  setFillColor(QColor(0, 0, 0, 255));
-  setOpaquePainting(true);
-}
-
-ApplicationImage::~ApplicationImage() {
-  DLOG("ApplicationImage::~ApplicationImage");
-}
-
-void ApplicationImage::customEvent(QEvent* event) {
-  DLOG("ApplicationImage::customEvent (this=%p, event=%p)", this, event);
-  DASSERT(QThread::currentThread() == thread());
-  ApplicationImageEvent* imageEvent = static_cast<ApplicationImageEvent*>(event);
-  // Store the new image and schedule an update.
-  image_ = imageEvent->image_;
-  sourceRect_ = imageEvent->sourceRect_;
-  DLOG("ApplicationImage: inserted image in cache (this=%p)", this);
-  imageCache_.insert(source_, QPair<QImage, QRect>(image_, sourceRect_));
-  connect(source_, &Application::destroyed,
-          this, &ApplicationImage::onSourceDestroyed, Qt::UniqueConnection);
-  update();
-  if (!ready_) {
-    ready_ = true;
-    emit readyChanged();
-  }
-}
-
-void ApplicationImage::setSource(Application* source) {
-  DLOG("ApplicationImage::setApplication (this=%p, source=%p)", this, source);
-  if (source_ != source) {
-    source_ = source;
-    image_ = QImage();
-    sourceRect_ = QRect();
-    if (ready_) {
-      ready_ = false;
-      emit readyChanged();
-    }
-    emit sourceChanged();
-  }
-}
-
-void ApplicationImage::setFillMode(FillMode fillMode) {
-  DLOG("ApplicationImage::setApplication (this=%p, fillMode=%d)", this, fillMode);
-  if (fillMode_ != fillMode) {
-    fillMode_ = fillMode;
-    update();
-    emit fillModeChanged();
-  }
-}
-
-void ApplicationImage::scheduleUpdate() {
-  DLOG("ApplicationImage::scheduleUpdate (this=%p)", this);
-  if (ready_) {
-    ready_ = false;
-    emit readyChanged();
-  }
-  if (source_ != NULL && source_->state() == Application::Running)
-    ubuntu_ui_session_snapshot_running_session_with_id(source_->pid(), snapshotCallback, this);
-  else {
-    update();
-  }
-}
-
-void ApplicationImage::updateFromCache() {
-  DLOG("ApplicationImage::updateFromCache (this=%p)", this);
-  if (imageCache_.contains(source_)) {
-    DLOG("ApplicationImage: using image from cache (this=%p)", this);
-    QPair<QImage, QRect> value = imageCache_.value(source_);
-    if (image_ != value.first || sourceRect_ != value.second) {
-      image_ = value.first;
-      sourceRect_ = value.second;
-      update();
-    }
-    if (!ready_) {
-      ready_ = true;
-      emit readyChanged();
-    }
-  }
-}
-
-
-void ApplicationImage::paint(QPainter* painter) {
-  DLOG("ApplicationImage::paint (this=%p, painter=%p)", this, painter);
-  if (source_ != NULL && !image_.isNull() && sourceRect_.isValid()
-      && source_->state() == Application::Running) {
-    painter->setCompositionMode(QPainter::CompositionMode_Source);
-
-    QRect targetRect;
-    QRect sourceRect;
-
-    switch(fillMode_) {
-      case Stretch:
-        targetRect = QRect(0, 0, width(), height());
-        sourceRect = sourceRect_;
-        break;
-      case PreserveAspectCrop:
-        // assume AlignTop and AlignLeft alignment
-        targetRect = QRect(0, 0, width(), height());
-        float widthScale = width() / float(sourceRect_.width());
-        float heightScale = height() / float(sourceRect_.height());
-
-        if (widthScale > heightScale) {
-          int croppedHeight = height() / widthScale;
-          sourceRect = QRect(sourceRect_.x(), sourceRect_.y(), sourceRect_.width(), croppedHeight);
-        } else {
-          int croppedWidth = width() / heightScale;
-          sourceRect = QRect(sourceRect_.x(), sourceRect_.y(), croppedWidth, sourceRect_.height());
-        }
-        break;
-    }
-
-    painter->drawImage(targetRect, image_, sourceRect);
-  }
-}
-
-void ApplicationImage::onSourceDestroyed() {
-  DLOG("ApplicationImage::onSourceDestroyed (this=%p)", this);
-  if (imageCache_.remove(source_) != 0) {
-    DLOG("ApplicationImage: removed image from cache (this=%p)", this);
-  }
-  image_ = QImage();
-  sourceRect_ = QRect();
-  if (ready_) {
-    ready_ = false;
-    emit readyChanged();
-  }
-  if (source_ != NULL) {
-    source_ = NULL;
-    emit sourceChanged();
-  }
-}

=== removed file 'src/modules/application/application_image.h'
--- src/modules/application/application_image.h	2013-02-26 01:03:00 +0000
+++ src/modules/application/application_image.h	1970-01-01 00:00:00 +0000
@@ -1,71 +0,0 @@
-// This file is part of QtUbuntu, a set of Qt components for Ubuntu.
-// Copyright © 2013 Canonical Ltd.
-//
-// This program is free software: you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 3, as published by
-// the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
-// SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-#ifndef APPLICATION_IMAGE_H
-#define APPLICATION_IMAGE_H
-
-#include <QtQuick/QQuickPaintedItem>
-#include <QtGui/QImage>
-
-class Application;
-
-class ApplicationImage : public QQuickPaintedItem {
-  Q_OBJECT
-  Q_ENUMS(FillMode)
-  Q_PROPERTY(Application* source READ source WRITE setSource NOTIFY sourceChanged)
-  Q_PROPERTY(FillMode fillMode READ fillMode WRITE setFillMode NOTIFY fillModeChanged)
-  Q_PROPERTY(bool ready READ ready NOTIFY readyChanged)
-
- public:
-  explicit ApplicationImage(QQuickPaintedItem* parent = 0);
-  ~ApplicationImage();
-
-  enum FillMode { Stretch, PreserveAspectCrop };
-
-  // QObject methods.
-  void customEvent(QEvent* event);
-
-  // QQuickPaintedItem methods.
-  void paint(QPainter* painter);
-
-  // ApplicationImage methods.
-  Application* source() const { return source_; }
-  void setSource(Application* source);
-  FillMode fillMode() const  { return fillMode_; }
-  void setFillMode(FillMode);
-  bool ready() const { return ready_; }
-  Q_INVOKABLE void scheduleUpdate();
-  Q_INVOKABLE void updateFromCache();
-
- Q_SIGNALS:
-  void sourceChanged();
-  void fillModeChanged();
-  void readyChanged();
-
- private Q_SLOTS:
-  void onSourceDestroyed();
-
- private:
-  QImage image_;
-  Application* source_;
-  FillMode fillMode_;
-  bool ready_;
-  QRect sourceRect_;
-  // cache of application screenshots keeping pairs of image and source rectangle
-  // for applications that are alive
-  static QHash<Application*, QPair<QImage, QRect> > imageCache_;
-};
-
-#endif  // APPLICATION_IMAGE_H

=== removed file 'src/modules/application/application_manager.cc'
--- src/modules/application/application_manager.cc	2013-09-05 19:01:56 +0000
+++ src/modules/application/application_manager.cc	1970-01-01 00:00:00 +0000
@@ -1,612 +0,0 @@
-// This file is part of QtUbuntu, a set of Qt components for Ubuntu.
-// Copyright © 2013 Canonical Ltd.
-//
-// This program is free software: you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 3, as published by
-// the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
-// SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-// FIXME(loicm) Desktop file loading should be executed on a dedicated I/O thread.
-
-#include "application_manager.h"
-#include "application.h"
-#include "desktopdata.h"
-#include "logging.h"
-#include <sys/types.h>
-#include <signal.h>
-#include <unistd.h>
-#include <errno.h>
-#include <pwd.h>
-
-#include <QRegularExpression>
-
-using namespace unity::shell::application;
-
-// Size of the side stage in grid units.
-const int kSideStageWidth = 40;
-
-// The time (in ms) to wait before closing a process that's not been matched by a new session.
-const int kTimeBeforeClosingProcess = 10000;
-
-class TaskEvent : public QEvent {
- public:
-  enum Task { kAddApplication = 0, kRemoveApplication, kUnfocusApplication, kFocusApplication,
-              kRequestFocus, kRequestFullscreen };
-  TaskEvent(QString appId, int id, int stage, int task, QEvent::Type type)
-      : QEvent(type)
-      , appId_(appId)
-      , id_(id)
-      , stage_(stage)
-      , task_(task) {
-    DLOG("TaskEvent::TaskEvent (this=%p, appId='%s', id=%d, stage=%d, task=%d, type=%d)",
-         this, qPrintable(appId), id, stage, task, type);
-  }
-  ~TaskEvent() {
-    DLOG("TaskEvent::~TaskEvent");
-  }
-  QString appId_;
-  int id_;
-  int stage_;
-  int task_;
-};
-
-// FIXME(kaleo, loicm): If we keep that keyboard geometry/visibilty API, we should integrate that
-//     event type in the existing task event system.
-class KeyboardGeometryEvent : public QEvent {
- public:
-  KeyboardGeometryEvent(QRect geometry, QEvent::Type type)
-      : QEvent(type)
-      , geometry_(geometry) {
-    DLOG("KeyboardGeometryEvent::KeyboardGeometryEvent (this=%p, type=%d)", this, type);
-  }
-  ~KeyboardGeometryEvent() {
-    DLOG("KeyboardGeometryEvent::~KeyboardGeometryEvent");
-  }
-
-  QRect geometry_;
-};
-
-static void continueTask(int pid, void* context)
-{
-  DLOG("continueTask(pid=%d, context=%p)", pid, context);
-  Q_UNUSED(context)
-  kill(pid, SIGCONT);
-}
-
-static void suspendTask(int pid, void* context)
-{
-  DLOG("suspendTask(pid=%d, context=%p)", pid, context);
-  Q_UNUSED(context)
-  kill(pid, SIGSTOP);
-}
-
-static void sessionBornCallback(ubuntu_ui_session_properties session, void* context) {
-  DLOG("sessionBornCallback (session=%p, context=%p)", session, context);
-  DASSERT(context != NULL);
-  // Post a task to be executed on the ApplicationManager thread (GUI thread).
-  ApplicationManager* manager = static_cast<ApplicationManager*>(context);
-
-  // Determine appId from the absolute path to the desktop file of the application
-  QString appId = QString(ubuntu_ui_session_properties_get_desktop_file_hint(session))
-          .split(QLatin1String("/"))
-          .last()
-          .remove(QRegularExpression("\\.desktop$"));
-
-  QCoreApplication::postEvent(manager, new TaskEvent(
-      appId,
-      ubuntu_ui_session_properties_get_application_instance_id(session),
-      ubuntu_ui_session_properties_get_application_stage_hint(session),
-      TaskEvent::kAddApplication, manager->eventType()));
-}
-
-static void sessionDiedCallback(ubuntu_ui_session_properties session, void* context) {
-  DLOG("sessionDiedCallback (session=%p, context=%p)", session, context);
-  DASSERT(context != NULL);
-  // Post a task to be executed on the ApplicationManager thread (GUI thread).
-  ApplicationManager* manager = static_cast<ApplicationManager*>(context);
-  QCoreApplication::postEvent(manager, new TaskEvent(
-      QString(), ubuntu_ui_session_properties_get_application_instance_id(session),
-      ubuntu_ui_session_properties_get_application_stage_hint(session),
-      TaskEvent::kRemoveApplication, manager->eventType()));
-}
-
-static void sessionUnfocusedCallback(ubuntu_ui_session_properties session, void* context) {
-  DLOG("sessionUnfocusedCallback (session=%p, context=%p)", session, context);
-  DASSERT(context != NULL);
-  // Post a task to be executed on the ApplicationManager thread (GUI thread).
-  ApplicationManager* manager = static_cast<ApplicationManager*>(context);
-  QCoreApplication::postEvent(manager, new TaskEvent(
-      QString(), ubuntu_ui_session_properties_get_application_instance_id(session),
-      ubuntu_ui_session_properties_get_application_stage_hint(session),
-      TaskEvent::kUnfocusApplication, manager->eventType()));
-}
-
-static void sessionFocusedCallback(ubuntu_ui_session_properties session, void* context) {
-  DLOG("sessionFocusedCallback (session=%p, context=%p)", session, context);
-  DASSERT(context != NULL);
-  // Post a task to be executed on the ApplicationManager thread (GUI thread).
-  ApplicationManager* manager = static_cast<ApplicationManager*>(context);
-  QCoreApplication::postEvent(manager, new TaskEvent(
-      QString(), ubuntu_ui_session_properties_get_application_instance_id(session),
-      ubuntu_ui_session_properties_get_application_stage_hint(session),
-      TaskEvent::kFocusApplication, manager->eventType()));
-}
-
-static void sessionRequestedFullscreenCallback(
-    ubuntu_ui_session_properties session, void* context) {
-  DLOG("sessionRequestedFullscreenCallback (session=%p, context=%p)", session, context);
-  DASSERT(context != NULL);
-  // Post a task to be executed on the ApplicationManager thread (GUI thread).
-  ApplicationManager* manager = static_cast<ApplicationManager*>(context);
-  QCoreApplication::postEvent(manager, new TaskEvent(
-      QString(), ubuntu_ui_session_properties_get_application_instance_id(session), 0,
-      TaskEvent::kRequestFullscreen, manager->eventType()));
-}
-
-static void sessionRequestedCallback(ubuntu_ui_well_known_application application, void* context) {
-  DLOG("sessionRequestedCallback (application=%d, context=%p)", application, context);
-  DASSERT(context != NULL);
-  // Post a task to be executed on the ApplicationManager thread (GUI thread).
-  ApplicationManager* manager = static_cast<ApplicationManager*>(context);
-  QCoreApplication::postEvent(manager, new TaskEvent(
-      QString(), static_cast<int>(application), 0, TaskEvent::kRequestFocus, manager->eventType()));
-}
-
-static void keyboardGeometryChanged(int x, int y, int width, int height, void* context) {
-  DLOG("keyboardGeometryChanged (x=%d, y=%d, width=%d, height=%d, context=%p)", x, y, width, height, context);
-  DASSERT(context != NULL);
-  // Post a task to be executed on the ApplicationManager thread (GUI thread).
-  ApplicationManager* manager = static_cast<ApplicationManager*>(context);
-  QCoreApplication::postEvent(manager,
-        new KeyboardGeometryEvent(QRect(x, y, width, height),
-                                  manager->keyboardGeometryEventType()));
-}
-
-ApplicationManager::ApplicationManager(QObject* parent)
-    : ApplicationManagerInterface(parent)
-    , keyboardHeight_(0)
-    , keyboardVisible_(false)
-    , pidHash_()
-    , eventType_(static_cast<QEvent::Type>(QEvent::registerEventType()))
-    , keyboardGeometryEventType_(static_cast<QEvent::Type>(QEvent::registerEventType())) {
-  static int once = false;
-  if (!once) {
-    DLOG("starting application watcher");
-    static ubuntu_ui_session_lifecycle_observer watcher = {
-      sessionRequestedCallback, sessionBornCallback, sessionUnfocusedCallback,
-      sessionFocusedCallback, keyboardGeometryChanged, sessionRequestedFullscreenCallback,
-      sessionDiedCallback, this
-    };
-    ubuntu_ui_session_install_session_lifecycle_observer(&watcher);
-
-    static ubuntu_ui_task_controller controller = {
-        continueTask, suspendTask, this
-    };
-    ubuntu_ui_install_task_controller(&controller);
-
-    once = true;
-  }
-  DLOG("ApplicationManager::ApplicationManager (this=%p)", this);
-}
-
-ApplicationManager::~ApplicationManager() {
-  DLOG("ApplicationManager::~ApplicationManager");
-  pidHash_.clear();
-  for (auto app : applications_) {
-      delete app;
-  }
-  applications_.clear();
-}
-
-int ApplicationManager::rowCount(const QModelIndex& parent) const {
-  DLOG("ApplicationManager::rowCount (this=%p)", this);
-  return !parent.isValid() ? applications_.size() : 0;
-}
-
-QVariant ApplicationManager::data(const QModelIndex& index, int role) const {
-  DLOG("ApplicationManager::data (this=%p, role=%d)", this, role);
-  if (index.row() < 0 || index.row() >= applications_.size())
-    return QVariant();
-
-  auto app = applications_.at(index.row());
-  switch(role) {
-  case RoleAppId:
-      return app->appId();
-  case RoleName:
-      return app->name();
-  case RoleComment:
-      return app->comment();
-  case RoleIcon:
-      return app->icon();
-  case RoleStage:
-      return app->stage();
-  case RoleState:
-      return app->state();
-  case RoleFocused:
-      return app->focused();
-  default:
-      return QVariant();
-  }
-}
-
-Application *ApplicationManager::get(int row) const {
-  DLOG("ApplicationManager::get (this=%p, row=%d)", this, row);
-  if (row < 0 || row >= applications_.size())
-    return nullptr;
-
-  return applications_.at(row);
-}
-
-Application *ApplicationManager::findApplication(const QString &appId) const {
-  DLOG("ApplicationManager::findApplication (this=%p, appId=%s)", this, qPrintable(appId));
-  for (Application *app : applications_) {
-    if (app->appId() == appId) {
-      return app;
-    }
-  }
-  return nullptr;
-}
-
-void ApplicationManager::move(int from, int to) {
-  DLOG("ApplicationManager::move (this=%p, from=%d, to=%d)", this, from, to);
-  if (from == to) return;
-
-  if (from >= 0 && from < applications_.size() && to >= 0 && to < applications_.size()) {
-      QModelIndex parent;
-    /* When moving an item down, the destination index needs to be incremented
-       by one, as explained in the documentation:
-       http://qt-project.org/doc/qt-5.0/qtcore/qabstractitemmodel.html#beginMoveRows */
-    beginMoveRows(parent, from, from, parent, to + (to > from ? 1 : 0));
-    applications_.move(from, to);
-    endMoveRows();
-  }
-}
-
-void ApplicationManager::killProcess(qint64 pid) {
-  DLOG("ApplicationManager::kill (this=%p, pid=%lld)", this, pid);
-#if !defined(QT_NO_DEBUG)
-  int result = kill(static_cast<pid_t>(pid), SIGKILL);
-  if (result != -1) {
-    LOG("killed process with pid %lld", pid);
-  } else {
-    LOG("couldn't kill process with pid %lld: %s", pid, strerror(errno));
-  }
-#else
-  kill(static_cast<pid_t>(pid), SIGKILL);
-#endif
-}
-
-void ApplicationManager::customEvent(QEvent* event) {
-  DLOG("ApplicationManager::customEvent (this=%p, event=%p)", this, event);
-  DASSERT(QThread::currentThread() == thread());
-
-  // FIXME(kaleo, loicm) If we keep that keyboard geometry/visibilty API, we should integrate that
-  //     event type in the existing task event system. Moreover, Qt code shouldn't use C++ RTTI
-  //     (which is slow) but the Qt meta object implementation.
-  KeyboardGeometryEvent* keyboardGeometryEvent = dynamic_cast<KeyboardGeometryEvent*>(event);
-  if (keyboardGeometryEvent != NULL) {
-      bool visible = keyboardGeometryEvent->geometry_.isValid();
-      int height = keyboardGeometryEvent->geometry_.height();
-      if (height != keyboardHeight_) {
-          keyboardHeight_ = height;
-          emit keyboardHeightChanged();
-      }
-      if (visible != keyboardVisible_) {
-          keyboardVisible_ = visible;
-          emit keyboardVisibleChanged();
-      }
-      return;
-  }
-
-  TaskEvent* taskEvent = static_cast<TaskEvent*>(event);
-  switch (taskEvent->task_) {
-
-    case TaskEvent::kAddApplication: {
-      DLOG("handling add application task");
-      const int kPid = taskEvent->id_;
-      Application* application = pidHash_.value(kPid, NULL);
-      if (application) {
-        DLOG("got a match in the application lists, setting '%s' (%d) to running", qPrintable(application->name()), kPid);
-#if !defined(QT_NO_DEBUG)
-        // Ensure we're in sync with Ubuntu Platform.
-        ASSERT(applications_.contains(application));
-#endif
-        application->setState(Application::Running);
-        killTimer(application->timerId());
-      } else {
-        DLOG("didn't get a match in the application lists, loading the desktop file");
-        DesktopData* desktopData = new DesktopData(taskEvent->appId_);
-        if (desktopData->loaded()) {
-          Application* application = new Application(
-              desktopData, kPid, Application::MainStage, Application::Running, -1);
-          pidHash_.insert(kPid, application);
-          DLOG("desktopFile loaded, storing '%s' (%d) in the application list", qPrintable(desktopData->name()), kPid);
-          add(application);
-        } else {
-          DLOG("unknown application, not storing in the application lists");
-          delete desktopData;
-        }
-      }
-      break;
-    }
-
-    case TaskEvent::kRemoveApplication: {
-      DLOG("handling remove application task");
-      const int kPid = taskEvent->id_;
-      Application* application = pidHash_.take(kPid);
-      if (application != NULL) {
-        DLOG("removing application '%s' (%d) from the application lists", qPrintable(application->name()), kPid);
-        if (application->state() == Application::Starting) {
-          killTimer(application->timerId());
-        }
-
-        remove(application);
-        if (application->focused()) {
-          emit focusedApplicationIdChanged();
-        }
-        application->deleteLater();
-      } else {
-        DLOG("Unknown application, not stored in the application lists");
-      }
-      break;
-    }
-
-    case TaskEvent::kUnfocusApplication: {
-      DLOG("handling unfocus application task");
-      // Reset the currently focused application.
-      Application* application = pidHash_.value(taskEvent->id_);
-      if (application != NULL) {
-        application->setFocused(false);
-        emit focusedApplicationIdChanged();
-      }
-      break;
-    }
-
-    case TaskEvent::kFocusApplication: {
-      DLOG("handling focus application task");
-      // Update the currently focused application.
-      Application* application = pidHash_.value(taskEvent->id_);
-      if (application != NULL) {
-        application->setFocused(true);
-        //move application to top of applications_ list
-        int index = applications_.indexOf(application);
-        this->move(index, 0);
-        emit focusedApplicationIdChanged();
-      }
-      break;
-    }
-
-    case TaskEvent::kRequestFullscreen: {
-      DLOG("handling request fullscreen task");
-      Application* application = pidHash_.value(taskEvent->id_);
-      if (application != NULL) {
-        application->setFullscreen(true);
-      }
-      break;
-    }
-
-    case TaskEvent::kRequestFocus: {
-      DLOG("handling request focus task");
-      emit focusRequested(static_cast<FavoriteApplication>(taskEvent->id_));
-      break;
-    }
-
-    default: {
-      DNOT_REACHED();
-      break;
-    }
-  }
-}
-
-void ApplicationManager::timerEvent(QTimerEvent* event) {
-  DLOG("ApplicationManager::timerEvent (this=%p, event=%p)", this, event);
-
-  const int kTimerId = event->timerId();
-  Application* application = findFromTimerId(kTimerId);
-
-  // Remove application from list and kill it.
-  if (application != NULL) {
-    const qint64 kPid = application->pid();
-    DLOG("application '%s' (%lld) hasn't been matched, killing it", qPrintable(application->name()), kPid);
-    DASSERT(pidHash_.contains(kPid));
-    pidHash_.remove(kPid);
-    remove(application);
-    delete application;
-    killProcess(kPid);
-  }
-  killTimer(kTimerId);
-}
-
-int ApplicationManager::keyboardHeight() const {
-  DLOG("ApplicationManager::keyboardHeight (this=%p)", this);
-  return keyboardHeight_;
-}
-
-bool ApplicationManager::keyboardVisible() const {
-  DLOG("ApplicationManager::keyboardVisible (this=%p)", this);
-  return keyboardVisible_;
-}
-
-int ApplicationManager::sideStageWidth() const {
-  DLOG("ApplicationManager::sideStageWidth (this=%p)", this);
-  return kSideStageWidth;
-}
-
-bool ApplicationManager::focusApplication(const QString &appId) {
-  Application *application = this->findApplication(appId);
-  if (application == nullptr)
-    return false;
-
-  DLOG("ApplicationManager::focusApplication (this=%p, app_pid=%lld)", this, application->pid());
-  ubuntu_ui_session_focus_running_session_with_id(application->pid());
-  return true;
-}
-
-void ApplicationManager::focusFavoriteApplication(
-    ApplicationManager::FavoriteApplication application) {
-  DLOG("ApplicationManager::focusFavoriteApplication (this=%p, application=%d)",
-       this, static_cast<int>(application));
-  ubuntu_ui_session_trigger_switch_to_well_known_application(
-      static_cast<ubuntu_ui_well_known_application>(application));
-}
-
-void ApplicationManager::unfocusCurrentApplication() {
-  DLOG("ApplicationManager::unfocusCurrentApplication (this=%p)", this);
-  // FIXME(loicm): Add that once supported in Ubuntu Platform API.
-  // ubuntu_ui_session_unfocus_running_sessions(static_cast<StageHint>(stageHint));
-  ubuntu_ui_session_unfocus_running_sessions();
-}
-
-QString ApplicationManager::focusedApplicationId() const {
-  for (Application *app : applications_) {
-    if (app->focused())
-      return app->appId();
-  }
-  return QString();
-}
-
-Application *ApplicationManager::startApplication(const QString &appId, const QStringList &arguments) {
-    return startApplication(appId, NoFlag, arguments);
-}
-
-Application *ApplicationManager::startApplication(const QString &appId, ApplicationManager::ExecFlags flags,
-                                                  const QStringList &arguments) {
-  DLOG("ApplicationManager::startProcess (this=%p, flags=%d)", this, (int) flags);
-  // Load desktop file.
-  DesktopData* desktopData = new DesktopData(appId);
-  if (!desktopData->loaded()) {
-    delete desktopData;
-    return NULL;
-  }
-
-  QStringList argumentsCopy = arguments;
-
-  // Format arguments.
-  // FIXME(loicm) Special field codes are simply ignored for now.
-  //     http://standards.freedesktop.org/desktop-entry-spec/latest/ar01s06.html
-  QStringList execArguments = desktopData->exec().split(" ", QString::SkipEmptyParts);
-  DASSERT(execArguments.size() > 0);
-  QString exec(execArguments[0]);
-  const int kSize = execArguments.size();
-  for (int i = kSize - 1; i > 0; i--) {
-    if ((execArguments[i].size() == 2) && (execArguments[i][0].toLatin1() == '%')) {
-      const char kChar = execArguments[i][1].toLatin1();
-      if (kChar == 'F' || kChar == 'u' || kChar == 'U' || kChar == 'd' || kChar == 'D'
-          || kChar == 'n' || kChar == 'N' || kChar == 'i' || kChar == 'c' || kChar == 'k'
-          || kChar == 'v' || kChar == 'm') {
-        continue;
-      }
-    }
-    argumentsCopy.prepend(execArguments[i]);
-  }
-  argumentsCopy.append(QString("--desktop_file_hint=") + desktopData->file());
-  if (flags.testFlag(ApplicationManager::ForceMainStage))
-    argumentsCopy.append(QString("--stage_hint=main_stage"));
-  else if (desktopData->stageHint() == "SideStage")
-    argumentsCopy.append(QString("--stage_hint=side_stage"));
-
-#if !defined(QT_NO_DEBUG)
-  LOG("starting process '%s' with arguments:", qPrintable(exec));
-  for (int i = 0; i < argumentsCopy.size(); i++)
-    LOG("  '%s'", qPrintable(argumentsCopy[i]));
-#endif
-
-  // Start process.
-  bool result;
-  qint64 pid = 0;
-  QString path = "/";
-  // respect Path from .desktop file
-  if (desktopData->path() != "") {
-    path = desktopData->path();
-  } else {
-    struct passwd* passwd = getpwuid(getuid());
-    if (passwd)
-      path = passwd->pw_dir;
-  }
-  DLOG("current working directory: '%s'", qPrintable(path));
-  QByteArray envSetAppId = QString("APP_ID=%1").arg(appId).toLocal8Bit();
-  putenv(envSetAppId.data()); // envSetAppId must be available and unmodified until the env var is unset
-  result = QProcess::startDetached(exec, argumentsCopy, path, &pid);
-  QByteArray envClearAppId = QString("APP_ID").toLocal8Bit();
-  putenv(envClearAppId.data()); // now it's safe to deallocate envSetAppId.
-  DLOG_IF(result == false, "process failed to start");
-  if (result == true) {
-    DLOG("started process with pid %lld, adding '%s' to application lists", pid, qPrintable(desktopData->name()));
-
-    //decide stage
-    Application::Stage stage = Application::MainStage;
-    if (desktopData->stageHint() == "SideStage" && !flags.testFlag(ApplicationManager::ForceMainStage)) {
-        stage = Application::SideStage;
-    }
-
-    Application* application = new Application(
-        desktopData, pid, stage, Application::Starting,
-        startTimer(kTimeBeforeClosingProcess));
-    pidHash_.insert(pid, application);
-
-    add(application);
-    return application;
-  } else {
-    return nullptr;
-  }
-}
-
-bool ApplicationManager::stopApplication(const QString &appId) {
-  DLOG("ApplicationManager::stopProcess (this=%p, application=%p)", this, qPrintable(appId));
-
-  Application *application = this->findApplication(appId);
-  if (application == nullptr)
-    return false;
-
-  const qint64 kPid = application->pid();
-  if (pidHash_.remove(kPid) > 0) {
-    remove(application);
-    application->deleteLater();
-    killProcess(kPid);
-  }
-  return true;
-}
-
-void ApplicationManager::add(Application* application) {
-  DASSERT(application != NULL);
-  DLOG("ApplicationManager::add (this=%p, application='%s')", this, qPrintable(application->name()));
-
-#if !defined(QT_NO_DEBUG)
-  for (int i = 0; i < applications_.size(); i++)
-    ASSERT(applications_.at(i) != application);
-#endif
-  beginInsertRows(QModelIndex(), applications_.size(), applications_.size());
-  applications_.append(application);
-  endInsertRows();
-  emit countChanged();
-}
-
-void ApplicationManager::remove(Application *application) {
-  DASSERT(application != NULL);
-  DLOG("ApplicationManager::remove (this=%p, application='%s')", this, qPrintable(application->name()));
-
-  int i = applications_.indexOf(application);
-  if (i != -1) {
-    beginRemoveRows(QModelIndex(), i, i);
-    applications_.removeAt(i);
-    endRemoveRows();
-    emit countChanged();
-  }
-}
-
-Application* ApplicationManager::findFromTimerId(int timerId) {
-  DLOG("ApplicationManager::findFromTimerId (this=%p, timerId=%d)", this, timerId);
-
-  const int kSize = applications_.size();
-  for (int i = 0; i < kSize; i++)
-    if (applications_[i]->timerId() == timerId)
-      return applications_[i];
-  return NULL;
-}

=== removed file 'src/modules/application/application_manager.h'
--- src/modules/application/application_manager.h	2013-09-09 11:26:44 +0000
+++ src/modules/application/application_manager.h	1970-01-01 00:00:00 +0000
@@ -1,139 +0,0 @@
-// This file is part of QtUbuntu, a set of Qt components for Ubuntu.
-// Copyright © 2013 Canonical Ltd.
-//
-// This program is free software: you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 3, as published by
-// the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
-// SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-#ifndef APPLICATION_MANAGER_H
-#define APPLICATION_MANAGER_H
-
-#include <QtCore/QtCore>
-#include <ubuntu/application/ui/window.h>
-#include <ubuntu/application/ui/options.h>
-#include <ubuntu/application/ui/input/event.h>
-#include <ubuntu/ui/ubuntu_ui_session_service.h>
-
-/* FIXME: undef required so that this class compiles properly.
-   '#define Bool int' is part of <X11/Xlib.h> which is included
-   by the following chain of includes:
-   - <EGL/eglplatform.h> included by
-   - <EGL/egl.h> included by
-   - <ubuntu/application/ui/window.h>
-*/
-#undef Bool
-
-// unity-api
-#include <unity/shell/application/ApplicationManagerInterface.h>
-
-// local
-#include "application.h"
-
-class ApplicationManager : public unity::shell::application::ApplicationManagerInterface {
-  Q_OBJECT
-  Q_ENUMS(SurfaceRole)
-  Q_ENUMS(StageHint)
-  Q_ENUMS(FormFactorHint)
-  Q_ENUMS(FavoriteApplication)
-  Q_FLAGS(ExecFlags)
-
-  // FIXME(kaleo, loicm): That keyboard API might need a cleaner design.
-  Q_PROPERTY(int keyboardHeight READ keyboardHeight NOTIFY keyboardHeightChanged)
-  Q_PROPERTY(bool keyboardVisible READ keyboardVisible NOTIFY keyboardVisibleChanged)
-
-  Q_PROPERTY(int sideStageWidth READ sideStageWidth CONSTANT)
-
- public:
-  ApplicationManager(QObject *parent = nullptr);
-  ~ApplicationManager();
-
-  // Mapping enums to Ubuntu Platform API enums.
-  enum SurfaceRole {
-    Dash = U_DASH_ROLE, Default = U_MAIN_ROLE, Indicators = U_INDICATOR_ROLE,
-    Notifications = U_NOTIFICATIONS_ROLE, Greeter = U_GREETER_ROLE,
-    Launcher = U_LAUNCHER_ROLE, OnScreenKeyboard = U_ON_SCREEN_KEYBOARD_ROLE,
-    ShutdownDialog = U_SHUTDOWN_DIALOG_ROLE
-  };
-  enum StageHint {
-    MainStage = U_MAIN_STAGE, IntegrationStage = U_INTEGRATION_STAGE,
-    ShareStage = U_SHARE_STAGE, ContentPickingStage = U_CONTENT_PICKING_STAGE,
-    SideStage = U_SIDE_STAGE, ConfigurationStage = U_CONFIGURATION_STAGE
-  };
-  enum FormFactorHint {
-    DesktopFormFactor = U_DESKTOP, PhoneFormFactor = U_PHONE,
-    TabletFormFactor = U_TABLET
-  };
-  enum FavoriteApplication {
-    CameraApplication = CAMERA_APP, GalleryApplication = GALLERY_APP,
-    BrowserApplication = BROWSER_APP, ShareApplication = SHARE_APP,
-    PhoneApplication = PHONE_APP, DialerApplication = DIALER_APP,
-    MessagingApplication = MESSAGING_APP, AddressbookApplication = ADDRESSBOOK_APP
-  };
-  enum Flag {
-    NoFlag = 0x0,
-    ForceMainStage = 0x1,
-  };
-  Q_DECLARE_FLAGS(ExecFlags, Flag)
-
-  // QObject methods.
-  void customEvent(QEvent* event);
-  void timerEvent(QTimerEvent* event);
-
-  int keyboardHeight() const;
-  bool keyboardVisible() const;
-  int sideStageWidth() const;
-
-  // QAbstractItemModel methods.
-  int rowCount(const QModelIndex& parent = QModelIndex()) const override;
-  QVariant data(const QModelIndex& index, int role) const override;
-  Q_INVOKABLE Application *get(int index) const override;
-  Q_INVOKABLE Application *findApplication(const QString &appId) const override;
-
-  Q_INVOKABLE void move(int from, int to);
-
-  // Application control methods
-  Q_INVOKABLE bool focusApplication(const QString &appId) override;
-  Q_INVOKABLE void focusFavoriteApplication(FavoriteApplication application);
-  Q_INVOKABLE void unfocusCurrentApplication() override;
-  Q_INVOKABLE Application *startApplication(const QString &appId, const QStringList &arguments = QStringList()) override;
-  Q_INVOKABLE Application *startApplication(const QString &appId, ExecFlags flags, const QStringList &arguments = QStringList());
-  Q_INVOKABLE bool stopApplication(const QString &appId) override;
-
-  QString focusedApplicationId() const override;
-
-  QEvent::Type eventType() { return eventType_; }
-  QEvent::Type keyboardGeometryEventType() { return keyboardGeometryEventType_; }
-
- Q_SIGNALS:
-  void keyboardHeightChanged();
-  void keyboardVisibleChanged();
-  void focusRequested(FavoriteApplication favoriteApplication);
-
- private:
-  void killProcess(qint64 pid);
-
-  void add(Application *application);
-  void remove(Application* application);
-  Application* findFromTimerId(int timerId);
-
-  int keyboardHeight_;
-  bool keyboardVisible_;
-  QList<Application*> applications_;
-  QHash<int,Application*> pidHash_;
-  QEvent::Type eventType_;
-  QEvent::Type keyboardGeometryEventType_;
-};
-
-Q_DECLARE_OPERATORS_FOR_FLAGS(ApplicationManager::ExecFlags)
-
-Q_DECLARE_METATYPE(ApplicationManager*)
-
-#endif  // APPLICATION_MANAGER_H

=== removed file 'src/modules/application/application_window.cc'
--- src/modules/application/application_window.cc	2013-02-14 16:31:33 +0000
+++ src/modules/application/application_window.cc	1970-01-01 00:00:00 +0000
@@ -1,45 +0,0 @@
-// This file is part of QtUbuntu, a set of Qt components for Ubuntu.
-// Copyright © 2013 Canonical Ltd.
-//
-// This program is free software: you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 3, as published by
-// the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
-// SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-#include "application_window.h"
-#include "application_manager.h"
-#include "logging.h"
-
-ApplicationWindow::ApplicationWindow(QObject* parent)
-    : QObject(parent)
-    , role_(static_cast<int>(ApplicationManager::Default))
-    , opaque_(0) {
-  DLOG("ApplicationWindow::ApplicationWindow (this=%p)", this);
-}
-
-ApplicationWindow::~ApplicationWindow() {
-  DLOG("ApplicationWindow::~ApplicationWindow");
-}
-
-void ApplicationWindow::setRole(int role) {
-  DLOG("ApplicationWindow::setRole (this=%p, role=%d)", this, role);
-  if (role_ != role) {
-    role_ = role;
-    emit roleChanged();
-  }
-}
-
-void ApplicationWindow::setOpaque(bool opaque) {
-  DLOG("ApplicationWindow::setOpaque (this=%p, opaque=%d)", this, static_cast<int>(opaque));
-  if (opaque_ != static_cast<int>(opaque)) {
-    opaque_ = static_cast<int>(opaque);
-    emit opaqueChanged();
-  }
-}

=== removed file 'src/modules/application/application_window.h'
--- src/modules/application/application_window.h	2013-02-14 16:31:33 +0000
+++ src/modules/application/application_window.h	1970-01-01 00:00:00 +0000
@@ -1,44 +0,0 @@
-// This file is part of QtUbuntu, a set of Qt components for Ubuntu.
-// Copyright © 2013 Canonical Ltd.
-//
-// This program is free software: you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 3, as published by
-// the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
-// SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-#ifndef APPLICATION_WINDOW_H
-#define APPLICATION_WINDOW_H
-
-#include <QtCore/QtCore>
-
-class ApplicationWindow : public QObject {
-  Q_OBJECT
-  Q_PROPERTY(int role READ role WRITE setRole NOTIFY roleChanged)
-  Q_PROPERTY(int opaque READ opaque WRITE setOpaque NOTIFY opaqueChanged)
-
- public:
-  explicit ApplicationWindow(QObject* parent);
-  ~ApplicationWindow();
-
-  int role() const { return role_; }
-  void setRole(int role);
-  bool opaque() const { return static_cast<bool>(opaque_); }
-  void setOpaque(bool opaque);
-
- Q_SIGNALS:
-  void roleChanged();
-  void opaqueChanged();
-
- private:
-  int role_;
-  int opaque_;
-};
-
-#endif  // APPLICATION_WINDOW_H

=== removed file 'src/modules/application/desktopdata.cpp'
--- src/modules/application/desktopdata.cpp	2013-09-12 13:22:35 +0000
+++ src/modules/application/desktopdata.cpp	1970-01-01 00:00:00 +0000
@@ -1,157 +0,0 @@
-// This file is part of QtUbuntu, a set of Qt components for Ubuntu.
-// Copyright © 2013 Canonical Ltd.
-//
-// This program is free software: you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 3, as published by
-// the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
-// SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-#include "desktopdata.h"
-
-#include <QFile>
-#include <QDir>
-
-#include "logging.h"
-
-// Retrieves the size of an array at compile time.
-#define ARRAY_SIZE(a) \
-    ((sizeof(a) / sizeof(*(a))) / static_cast<size_t>(!(sizeof(a) % sizeof(*(a)))))
-
-DesktopData::DesktopData(QString appId)
-    : appId_(appId)
-    , file_(findDesktopFile(appId))
-    , entries_(DesktopData::kNumberOfEntries, "") {
-    DLOG("DesktopData::DesktopData (this=%p, appId='%s')", this, appId.toLatin1().data());
-    DASSERT(appId != NULL);
-    loaded_ = load();
-}
-
-DesktopData::~DesktopData() {
-    DLOG("DesktopData::~DesktopData");
-    entries_.clear();
-}
-
-QString DesktopData::findDesktopFile(const QString &appId) const
-{
-    int dashPos = -1;
-    QString helper = appId;
-
-    QStringList searchDirs;
-    searchDirs << QDir::homePath() + "/.local/share/applications";
-    searchDirs << "/usr/share/applications";
-
-#ifdef TEST_MODE
-    searchDirs << "";
-#endif
-
-    do {
-        if (dashPos != -1) {
-            helper = helper.replace(dashPos, 1, '/');
-        }
-
-        Q_FOREACH(const QString &searchDir, searchDirs) {
-            QFileInfo fileInfo(QDir(searchDir), helper + ".desktop");
-            if (fileInfo.exists()) {
-                return fileInfo.absoluteFilePath();
-            }
-        }
-
-        dashPos = helper.indexOf("-");
-    } while (dashPos != -1);
-
-    return QString();
-}
-
-bool DesktopData::load() {
-    DLOG("DesktopData::load (this=%p, appId='%s')", this, qPrintable(appId_));
-
-    if (this->file().isNull() || this->file().isEmpty()) {
-        DLOG("No desktop file found for appId: %s", qPrintable(appId_));
-        return false;
-    }
-
-    const struct { const char* const name; int size; unsigned int flag; } kEntryNames[] = {
-        { "Name=", sizeof("Name=") - 1, 1 << DesktopData::kNameIndex },
-        { "Comment=", sizeof("Comment=") - 1, 1 << DesktopData::kCommentIndex },
-        { "Icon=", sizeof("Icon=") - 1, 1 << DesktopData::kIconIndex },
-        { "Exec=", sizeof("Exec=") - 1, 1 << DesktopData::kExecIndex },
-        { "Path=", sizeof("Path=") - 1, 1 << DesktopData::kPathIndex },
-        { "X-Ubuntu-StageHint=", sizeof("X-Ubuntu-StageHint=") - 1, 1 << DesktopData::kStageHintIndex }
-    };
-    const unsigned int kAllEntriesMask =
-            (1 << DesktopData::kNameIndex) | (1 << DesktopData::kCommentIndex)
-            | (1 << DesktopData::kIconIndex) | (1 << DesktopData::kExecIndex)
-            | (1 << DesktopData::kPathIndex) | (1 << DesktopData::kStageHintIndex);
-    const unsigned int kMandatoryEntriesMask =
-            (1 << DesktopData::kNameIndex) | (1 << DesktopData::kIconIndex)
-            | (1 << DesktopData::kExecIndex);
-    const int kEntriesCount = ARRAY_SIZE(kEntryNames);
-    const int kBufferSize = 256;
-    static char buffer[kBufferSize];
-
-    QFile file(this->file());
-
-    // Open file.
-    if (!file.open(QFile::ReadOnly | QIODevice::Text)) {
-        DLOG("can't open file: %s", file.errorString().toLatin1().data());
-        return false;
-    }
-
-    // Validate "magic key" (standard group header).
-    if (file.readLine(buffer, kBufferSize) != -1) {
-        if (strncmp(buffer, "[Desktop Entry]", sizeof("[Desktop Entry]" - 1))) {
-            DLOG("not a desktop file");
-            return false;
-        }
-    }
-
-    int length;
-    unsigned int entryFlags = 0;
-    while ((length = file.readLine(buffer, kBufferSize)) != -1) {
-        // Skip empty lines.
-        if (length > 1) {
-            // Stop when reaching unsupported next group header.
-            if (buffer[0] == '[') {
-                DLOG("reached next group header, leaving loop");
-                break;
-            }
-            // Lookup entries ignoring duplicates if any.
-            for (int i = 0; i < kEntriesCount; i++) {
-                if (!strncmp(buffer, kEntryNames[i].name, kEntryNames[i].size)) {
-                    if (~entryFlags & kEntryNames[i].flag) {
-                        buffer[length-1] = '\0';
-                        entries_[i] = QString::fromLatin1(&buffer[kEntryNames[i].size]);
-                        entryFlags |= kEntryNames[i].flag;
-                        break;
-                    }
-                }
-            }
-            // Stop when matching the right number of entries.
-            if (entryFlags == kAllEntriesMask) {
-                break;
-            }
-        }
-    }
-
-    // Check that the mandatory entries are set.
-    if ((entryFlags & kMandatoryEntriesMask) == kMandatoryEntriesMask) {
-        DLOG("loaded desktop file with name='%s', comment='%s', icon='%s', exec='%s', path='%s', stagehint='%s'",
-             entries_[DesktopData::kNameIndex].toLatin1().data(),
-                entries_[DesktopData::kCommentIndex].toLatin1().data(),
-                entries_[DesktopData::kIconIndex].toLatin1().data(),
-                entries_[DesktopData::kExecIndex].toLatin1().data(),
-                entries_[DesktopData::kPathIndex].toLatin1().data(),
-                entries_[DesktopData::kStageHintIndex].toLatin1().data());
-        return true;
-    } else {
-        DLOG("not a valid desktop file, missing mandatory entries in the standard group header");
-        return false;
-    }
-}

=== removed file 'src/modules/application/desktopdata.h'
--- src/modules/application/desktopdata.h	2013-09-12 13:22:35 +0000
+++ src/modules/application/desktopdata.h	1970-01-01 00:00:00 +0000
@@ -1,56 +0,0 @@
-// This file is part of QtUbuntu, a set of Qt components for Ubuntu.
-// Copyright © 2013 Canonical Ltd.
-//
-// This program is free software: you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 3, as published by
-// the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
-// SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-#ifndef DESKTOPDATA_H
-#define DESKTOPDATA_H
-
-#include <QString>
-#include <QVector>
-#include <QUrl>
-
-class DesktopData {
-public:
-    DesktopData(QString appId);
-    ~DesktopData();
-
-    QString appId() const { return appId_; }
-    QString file() const { return file_; };
-    QString name() const { return entries_[kNameIndex]; }
-    QString comment() const { return entries_[kCommentIndex]; }
-    QUrl icon() const { return QUrl(entries_[kIconIndex]); }
-    QString exec() const { return entries_[kExecIndex]; }
-    QString path() const { return entries_[kPathIndex]; }
-    QString stageHint() const { return entries_[kStageHintIndex]; }
-    bool loaded() const { return loaded_; }
-    QString findDesktopFile(const QString &appId) const;
-
-private:
-    static const int kNameIndex = 0,
-    kCommentIndex = 1,
-    kIconIndex = 2,
-    kExecIndex = 3,
-    kPathIndex = 4,
-    kStageHintIndex = 5,
-    kNumberOfEntries = 6;
-
-    bool load();
-
-    QString appId_;
-    QString file_;
-    QVector<QString> entries_;
-    bool loaded_;
-};
-
-#endif // DESKTOPDATA_H

=== removed file 'src/modules/application/input_filter_area.cc'
--- src/modules/application/input_filter_area.cc	2013-11-06 12:21:46 +0000
+++ src/modules/application/input_filter_area.cc	1970-01-01 00:00:00 +0000
@@ -1,144 +0,0 @@
-// This file is part of QtUbuntu, a set of Qt components for Ubuntu.
-// Copyright © 2013 Canonical Ltd.
-//
-// This program is free software: you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 3, as published by
-// the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
-// SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-#include "input_filter_area.h"
-#include "logging.h"
-#include <ubuntu/ui/ubuntu_ui_session_service.h>
-
-InputFilterArea::InputFilterArea(QQuickItem* parent)
-    : QQuickItem(parent)
-    , blockInput_(false)
-    , trapHandle_(0) {
-  DLOG("InputFilterArea::InputFilterArea (this=%p, parent=%p)", this, parent);
-}
-
-InputFilterArea::~InputFilterArea() {
-  DLOG("InputFilterArea::~InputFilterArea");
-
-  disableInputTrap();
-}
-
-void InputFilterArea::setBlockInput(bool blockInput) {
-  DLOG("InputFilterArea::setBlockInput (this=%p, blockInput=%d)", this, blockInput);
-
-  if (blockInput_ != blockInput) {
-    blockInput_ = blockInput;
-    if (blockInput) {
-      enableInputTrap();
-    } else {
-      disableInputTrap();
-    }
-    emit blockInputChanged();
-  }
-}
-
-void InputFilterArea::geometryChanged(const QRectF & newGeometry, const QRectF & oldGeometry) {
-  DLOG("InputFilterArea::geometryChanged (this=%p)", this);
-
-  if (newGeometry != oldGeometry) {
-    geometry_ = newGeometry;
-    if (blockInput_) {
-      setInputTrap(relativeToAbsoluteGeometry(geometry_));
-    }
-  }
-  QQuickItem::geometryChanged(newGeometry, oldGeometry);
-}
-
-void InputFilterArea::onAscendantChanged() {
-  DLOG("InputFilterArea::onAscendantChanged (this=%p)", this);
-
-  listenToAscendantsChanges();
-  setInputTrap(relativeToAbsoluteGeometry(geometry_));
-}
-
-void InputFilterArea::onAscendantGeometryChanged() {
-  DLOG("InputFilterArea::onAscendantGeometryChanged (this=%p)", this);
-
-  setInputTrap(relativeToAbsoluteGeometry(geometry_));
-}
-
-void InputFilterArea::listenToAscendantsChanges() {
-  DLOG("InputFilterArea::listenToAscendantsChanges (this=%p)", this);
-
-  disconnectFromAscendantsChanges();
-
-  /* FIXME: Listen to geometry changes and parent changes on all the ascendants.
-     Listening on x, y, width, height changes on all the ascendants is
-     necessary because there is no API that notifies of absolute geometry
-     changes.
-     Ref.: https://bugreports.qt-project.org/browse/QTBUG-19746
-  */
-  connections_.append(connect(this, &QQuickItem::parentChanged, this, &InputFilterArea::onAscendantChanged));
-  QQuickItem* parent = parentItem();
-  while (parent != NULL) {
-    connections_.append(connect(parent, &QQuickItem::parentChanged, this, &InputFilterArea::onAscendantChanged));
-    connections_.append(connect(parent, &QQuickItem::xChanged, this, &InputFilterArea::onAscendantGeometryChanged));
-    connections_.append(connect(parent, &QQuickItem::yChanged, this, &InputFilterArea::onAscendantGeometryChanged));
-    connections_.append(connect(parent, &QQuickItem::widthChanged, this, &InputFilterArea::onAscendantGeometryChanged));
-    connections_.append(connect(parent, &QQuickItem::heightChanged, this, &InputFilterArea::onAscendantGeometryChanged));
-    parent = parent->parentItem();
-  }
-}
-
-void InputFilterArea::disconnectFromAscendantsChanges() {
-  DLOG("InputFilterArea::disconnectFromAscendantsChanges (this=%p)", this);
-
-  // disconnect all previously connected signals
-  Q_FOREACH (QMetaObject::Connection connection, connections_) {
-    disconnect(connection);
-  }
-  connections_.clear();
-}
-
-void InputFilterArea::setInputTrap(const QRect & geometry) {
-  DLOG("InputFilterArea::setInputTrap (this=%p)", this);
-
-  if (geometry != trapGeometry_) {
-    trapGeometry_ = geometry;
-    if (trapHandle_ != 0) {
-      ubuntu_ui_unset_surface_trap(trapHandle_);
-      trapHandle_ = 0;
-    }
-    if (geometry.isValid()) {
-      trapHandle_ = ubuntu_ui_set_surface_trap(geometry.x(), geometry.y(), geometry.width(), geometry.height());
-    }
-  }
-}
-
-void InputFilterArea::enableInputTrap() {
-  DLOG("InputFilterArea::enableInputTrap (this=%p)", this);
-
-  setInputTrap(relativeToAbsoluteGeometry(geometry_));
-  listenToAscendantsChanges();
-}
-
-void InputFilterArea::disableInputTrap() {
-  DLOG("InputFilterArea::disableInputTrap (this=%p)", this);
-
-  if (trapHandle_ != 0) {
-    ubuntu_ui_unset_surface_trap(trapHandle_);
-    trapHandle_ = 0;
-  }
-  trapGeometry_ = QRect();
-  disconnectFromAscendantsChanges();
-}
-
-QRect InputFilterArea::relativeToAbsoluteGeometry(const QRectF & relativeGeometry) {
-  if (parentItem()) {
-    return parentItem()->mapRectToScene(relativeGeometry).toRect();
-  } else {
-    return relativeGeometry.toRect();
-  }
-}

=== removed file 'src/modules/application/input_filter_area.h'
--- src/modules/application/input_filter_area.h	2013-11-06 12:21:46 +0000
+++ src/modules/application/input_filter_area.h	1970-01-01 00:00:00 +0000
@@ -1,59 +0,0 @@
-// This file is part of QtUbuntu, a set of Qt components for Ubuntu.
-// Copyright © 2013 Canonical Ltd.
-//
-// This program is free software: you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 3, as published by
-// the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
-// SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-#ifndef INPUT_FILTER_AREA_H
-#define INPUT_FILTER_AREA_H
-
-#include <QtQuick/QQuickItem>
-#include <QtCore/QLinkedList>
-#include <QtCore/QMetaObject>
-
-class InputFilterArea : public QQuickItem {
-  Q_OBJECT
-  Q_PROPERTY(bool blockInput READ blockInput WRITE setBlockInput NOTIFY blockInputChanged)
-
- public:
-  explicit InputFilterArea(QQuickItem* parent = 0);
-  ~InputFilterArea();
-
-  bool blockInput() const { return blockInput_; }
-  void setBlockInput(bool blockInput);
-
- Q_SIGNALS:
-  void blockInputChanged();
-
- protected:
-  virtual void geometryChanged(const QRectF & newGeometry, const QRectF & oldGeometry);
-
- private Q_SLOTS:
-  void onAscendantChanged();
-  void onAscendantGeometryChanged();
-
- private:
-  void listenToAscendantsChanges();
-  void disconnectFromAscendantsChanges();
-  void setInputTrap(const QRect & geometry);
-  void enableInputTrap();
-  void disableInputTrap();
-  QRect relativeToAbsoluteGeometry(const QRectF &relativeGeometry);
-
-  bool blockInput_;
-  unsigned int trapHandle_;
-  QRectF geometry_;
-  QRect trapGeometry_;
-  QLinkedList<QMetaObject::Connection> connections_;
-};
-
-#endif  // INPUT_FILTER_AREA_H

=== removed file 'src/modules/application/logging.h'
--- src/modules/application/logging.h	2013-02-14 16:31:33 +0000
+++ src/modules/application/logging.h	1970-01-01 00:00:00 +0000
@@ -1,38 +0,0 @@
-// This file is part of QtUbuntu, a set of Qt components for Ubuntu.
-// Copyright © 2013 Canonical Ltd.
-//
-// This program is free software: you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 3, as published by
-// the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
-// SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-#ifndef UBUNTU_APPLICATION_PLUGIN_LOGGING_H
-#define UBUNTU_APPLICATION_PLUGIN_LOGGING_H
-
-// Logging and assertion macros.
-#define LOG(...) qDebug(__VA_ARGS__)
-#define LOG_IF(cond,...) do { if (cond) qDebug(__VA_ARGS__); } while(0)
-#define ASSERT(cond) ((!(cond)) ? qt_assert(#cond,__FILE__,__LINE__) : qt_noop())
-#define NOT_REACHED() qt_assert("Not reached!",__FILE__,__LINE__)
-
-// Logging and assertion macros are compiled out for release builds.
-#if !defined(QT_NO_DEBUG)
-#define DLOG(...) LOG(__VA_ARGS__)
-#define DLOG_IF(cond,...) LOG_IF((cond), __VA_ARGS__)
-#define DASSERT(cond) ASSERT((cond))
-#define DNOT_REACHED() NOT_REACHED()
-#else
-#define DLOG(...) qt_noop()
-#define DLOG_IF(cond,...) qt_noop()
-#define DASSERT(cond) qt_noop()
-#define DNOT_REACHED() qt_noop()
-#endif
-
-#endif  // UBUNTU_APPLICATION_PLUGIN_LOGGING_H

=== removed file 'src/modules/application/plugin.cc'
--- src/modules/application/plugin.cc	2013-11-19 17:17:37 +0000
+++ src/modules/application/plugin.cc	1970-01-01 00:00:00 +0000
@@ -1,55 +0,0 @@
-// This file is part of QtUbuntu, a set of Qt components for Ubuntu.
-// Copyright © 2013 Canonical Ltd.
-//
-// This program is free software: you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 3, as published by
-// the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
-// SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-#include <qqmlcomponent.h>
-#include <qqmlextensionplugin.h>
-
-#include <QtQuick/QQuickWindow>
-#include "application.h"
-#include "application_manager.h"
-#include "application_image.h"
-#include "application_window.h"
-#include "input_filter_area.h"
-#include "logging.h"
-
-static QObject* applicationManagerSingleton(QQmlEngine* engine, QJSEngine* scriptEngine) {
-  Q_UNUSED(engine);
-  Q_UNUSED(scriptEngine);
-  DLOG("applicationManagerSingleton (engine=%p, scriptEngine=%p)", engine, scriptEngine);
-  return new ApplicationManager();
-}
-
-class UbuntuApplicationPlugin : public QQmlExtensionPlugin {
-  Q_OBJECT
-  Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0")
-
-  virtual void registerTypes(const char* uri) {
-    DLOG("UbuntuApplicationPlugin::registerTypes (this=%p, uri='%s')", this, uri);
-    ASSERT(QLatin1String(uri) == QLatin1String("Unity.Application"));
-    qmlRegisterUncreatableType<unity::shell::application::ApplicationManagerInterface>(
-      uri, 0, 1, "ApplicationManagerInterface", "Abstract Interface. Cannot be created in QML");
-    qmlRegisterSingletonType<ApplicationManager>(
-        uri, 0, 1, "ApplicationManager", applicationManagerSingleton);
-    qmlRegisterUncreatableType<unity::shell::application::ApplicationInfoInterface>(
-      uri, 0, 1, "ApplicationInfoInterface", "Abstract Interface. Cannot be created in QML");
-    qmlRegisterUncreatableType<Application>(
-        uri, 0, 1, "ApplicationInfo", "ApplicationInfo can't be instantiated");
-    qmlRegisterExtendedType<QQuickWindow, ApplicationWindow>(uri, 0, 1, "Window");
-    qmlRegisterType<ApplicationImage>(uri, 0, 1, "ApplicationImage");
-    qmlRegisterType<InputFilterArea>(uri, 0, 1, "InputFilterArea");
-  }
-};
-
-#include "plugin.moc"

=== removed file 'src/modules/application/qmldir'
--- src/modules/application/qmldir	2013-09-06 16:04:58 +0000
+++ src/modules/application/qmldir	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-module Unity.Application
-plugin unityapplicationplugin
-OSKController 0.1 OSKController.qml

=== removed file 'src/modules/modules.pro'
--- src/modules/modules.pro	2012-11-30 16:33:11 +0000
+++ src/modules/modules.pro	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-TEMPLATE = subdirs
-
-SUBDIRS += application

=== modified file 'src/src.pro'
--- src/src.pro	2013-09-03 18:03:17 +0000
+++ src/src.pro	2014-03-31 15:14:06 +0000
@@ -1,3 +1,3 @@
 TEMPLATE = subdirs
 
-SUBDIRS += platforms modules
+SUBDIRS += platforms