Merge lp:~nskaggs/ubuntu-filemanager-app/revert-r209 into lp:ubuntu-filemanager-app

[Nicholas Skaggs]

Revert accidental merge

Revert accidental merge of https://code.launchpad.net/~dpm/ubuntu-filemanager-app/placesmodel/+merge/223548

[lp:~nskaggs/ubuntu-filemanager-app/revert-r209]

213. By Nicholas Skaggs on 2014-06-19

also revert test_places ap change

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:212
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/261/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/581
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/581/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-utopic-amd64-ci/59

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/261/rebuild

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:213
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/262/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/582
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/582/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-utopic-amd64-ci/60

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/262/rebuild

review: Approve (continuous-integration)

[Nicholas Skaggs (nskaggs)]

Ran 22 tests in 495.191s
OK

=== modified file 'debian/control'
--- debian/control	2014-06-18 17:37:53 +0000
+++ debian/control	2014-06-19 16:03:59 +0000
@@ -38,19 +38,9 @@
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
  .
- This package contains the Folder List model plugin of the Nemo QML
+ This package contains the Folder List model plugin of the Nemo QML 
  plugins collection.
 
-Package: qtdeclarative5-placesmodel0.1
-Architecture: any
-Multi-Arch: same
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         ${misc:Pre-Depends},
-Description: Places model QML plugin
- This package contains a plugin that enables QML apps to list and
- modify a set of places (bookmarks) in the file system.
-
 Package: ubuntu-filemanager-app-autopilot
 Architecture: all
 Depends: ${misc:Depends},
@@ -59,6 +49,5 @@
          ubuntu-filemanager-app (>= ${source:Version}),
          ubuntu-ui-toolkit-autopilot,
          python3-autopilot,
-         python3-fixtures,
 Description: Autopilot tests for File Manager Application
  This package contains the autopilot tests for the File Manager

=== removed file 'debian/qtdeclarative5-placesmodel0.1.install'
--- debian/qtdeclarative5-placesmodel0.1.install	2014-06-18 09:00:10 +0000
+++ debian/qtdeclarative5-placesmodel0.1.install	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-usr/lib/*/qt5/qml/com/ubuntu/PlacesModel/

=== modified file 'src/app/qml/components/PathBar.qml'
--- src/app/qml/components/PathBar.qml	2014-06-18 09:00:10 +0000
+++ src/app/qml/components/PathBar.qml	2014-06-19 16:03:59 +0000
@@ -117,7 +117,7 @@
                     Label {
                         id: label
                         anchors.centerIn: parent
-                        text: modelData === "" ? "/" : modelData
+                        text: modelData === "" ? "/" : modelData === "~" ? i18n.tr("Home") : modelData
                         color: UbuntuColors.coolGrey
                     }
 

=== modified file 'src/app/qml/components/PlacesSidebar.qml'
--- src/app/qml/components/PlacesSidebar.qml	2014-06-18 13:57:37 +0000
+++ src/app/qml/components/PlacesSidebar.qml	2014-06-19 16:03:59 +0000
@@ -20,7 +20,6 @@
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1
 import Ubuntu.Components.Popups 0.1
-import com.ubuntu.PlacesModel 0.1
 
 Sidebar {
     id: root
@@ -43,6 +42,40 @@
         UbuntuNumberAnimation {}
     }
 
+    ListModel {
+        id: places
+
+        ListElement {
+            objectName: "placeHome"
+            path: "~"
+        }
+
+        ListElement {
+            path: "~/Documents"
+        }
+
+        ListElement {
+            path: "~/Downloads"
+        }
+
+        ListElement {
+            path: "~/Music"
+        }
+
+        ListElement {
+            path: "~/Pictures"
+        }
+
+        ListElement {
+            path: "~/Videos"
+        }
+
+        ListElement {
+            objectName: "placeRoot"
+            path: "/"
+        }
+    }
+
     Column {
         anchors {
             left: parent.left
@@ -54,24 +87,14 @@
             text: i18n.tr("Places")
         }
 
-        PlacesModel {
-            id: userplaces
-
-            // By default, the model only contains the
-            // user directories. Add the file system location too
-            Component.onCompleted: {
-                addLocation("/");
-            }
-        }
-
         Repeater {
             id: placesList
             objectName: "placesList"
 
-            model: userplaces
+            model: places
 
             delegate: Standard {
-                objectName: "place" + folderName(path).replace(/ /g,'')
+                objectName: model.objectName
                 text: folderName(path)
 
                 Image {

=== modified file 'src/app/qml/filemanager.qml'
--- src/app/qml/filemanager.qml	2014-06-18 09:00:10 +0000
+++ src/app/qml/filemanager.qml	2014-06-19 16:03:59 +0000
@@ -21,7 +21,6 @@
 import Ubuntu.Components.Popups 0.1
 import Ubuntu.Unity.Action 1.0 as UnityActions
 import U1db 1.0 as U1db
-import com.ubuntu.PlacesModel 0.1
 
 import "ui"
 
@@ -61,10 +60,6 @@
     backgroundColor: "#797979"
     footerColor: "#808080"
 
-    PlacesModel {
-       id: userplaces
-    }
-
     // HUD Actions
     Action {
         id: settingsAction
@@ -77,7 +72,7 @@
 
     property var pageStack: pageStack
 
-    property var folderTabs: [userplaces.locationHome]
+    property var folderTabs: ["~"]
 
     function openTab(folder) {
         var list = folderTabs
@@ -105,7 +100,7 @@
                 page: FolderListPage {
                     objectName: "folderPage"
 
-                    folder: userplaces.locationHome //modelData
+                    folder: "~"//modelData
                 }
             }
 

=== modified file 'src/app/qml/ui/FolderListPage.qml'
--- src/app/qml/ui/FolderListPage.qml	2014-06-18 09:00:10 +0000
+++ src/app/qml/ui/FolderListPage.qml	2014-06-19 16:03:59 +0000
@@ -20,7 +20,6 @@
 import Ubuntu.Components.Popups 0.1
 import Ubuntu.Components.ListItems 0.1
 import org.nemomobile.folderlistmodel 1.0
-import com.ubuntu.PlacesModel 0.1
 import "../components"
 
 Page {
@@ -64,15 +63,27 @@
         }
     }
 
-    PlacesModel { id: userplaces }
-
+    // This stores the location using ~ to represent home
     property string folder
-    property string path: folder
+    property string homeFolder: "~"
+
+    // This replaces ~ with the actual home folder, since the
+    // plugin doesn't recognize the ~
+    property string path: folder.replace("~", pageModel.homePath())
+
+    function goHome() {
+        goTo(folderListPage.homeFolder)
+    }
 
     function goTo(location) {
-        // This allows us to enter "~" as a shortcut to the home folder
-        // when entering a location on the Go To dialog
-        folderListPage.folder = location.replace("~", userplaces.locationHome)
+        // Since the FolderListModel returns paths using the actual
+        // home folder, this replaces with ~ before actually going
+        // to the specified folder
+        while (location !== '/' && location.substring(location.lastIndexOf('/')+1) === "") {
+            location = location.substring(0, location.length - 1)
+        }
+
+        folderListPage.folder = location.replace(pageModel.homePath(), "~")
         refresh()
     }
 
@@ -102,20 +113,21 @@
     // files will need an icon.
     // TODO: Remove isDir parameter and use new model functions
     function fileIcon(file, isDir) {
+        file = file.replace(pageModel.homePath(), "~")
         var iconPath = isDir ? "/usr/share/icons/Humanity/places/48/folder.svg"
                              : "/usr/share/icons/Humanity/mimes/48/empty.svg"
 
-        if (file === userplaces.locationHome) {
+        if (file === "~") {
             iconPath = "../icons/folder-home.svg"
         } else if (file === i18n.tr("~/Desktop")) {
             iconPath = "/usr/share/icons/Humanity/places/48/user-desktop.svg"
-        } else if (file === userplaces.locationDocuments) {
+        } else if (file === i18n.tr("~/Documents")) {
             iconPath = "/usr/share/icons/Humanity/places/48/folder-documents.svg"
-        } else if (file === userplaces.locationDownloads) {
+        } else if (file === i18n.tr("~/Downloads")) {
             iconPath = "/usr/share/icons/Humanity/places/48/folder-downloads.svg"
-        } else if (file === userplaces.locationMusic) {
+        } else if (file === i18n.tr("~/Music")) {
             iconPath = "/usr/share/icons/Humanity/places/48/folder-music.svg"
-        } else if (file === userplaces.locationPictures) {
+        } else if (file === i18n.tr("~/Pictures")) {
             iconPath = "/usr/share/icons/Humanity/places/48/folder-pictures.svg"
         } else if (file === i18n.tr("~/Public")) {
             iconPath = "/usr/share/icons/Humanity/places/48/folder-publicshare.svg"
@@ -123,7 +135,7 @@
             iconPath = "/usr/share/icons/Humanity/places/48/folder-system.svg"
         } else if (file === i18n.tr("~/Templates")) {
             iconPath = "/usr/share/icons/Humanity/places/48/folder-templates.svg"
-        } else if (file === userplaces.locationVideos) {
+        } else if (file === i18n.tr("~/Videos")) {
             iconPath = "/usr/share/icons/Humanity/places/48/folder-videos.svg"
         } else if (file === "/") {
             iconPath = "/usr/share/icons/Humanity/devices/48/drive-harddisk.svg"
@@ -133,8 +145,9 @@
     }
 
     function folderName(folder) {
+        folder = folder.replace(pageModel.homePath(), "~")
 
-        if (folder === userplaces.locationHome) {
+        if (folder === folderListPage.homeFolder) {
             return i18n.tr("Home")
         } else if (folder === "/") {
             return i18n.tr("File System")
@@ -195,7 +208,7 @@
         path: folderListPage.folder
 
         onPathChanged: {
-            console.log("Path changed to: " + repeaterModel.path)
+            console.log("Path: " + repeaterModel.path)
         }
     }
 

=== modified file 'src/app/qml/ui/PlacesPopover.qml'
--- src/app/qml/ui/PlacesPopover.qml	2014-06-18 09:00:10 +0000
+++ src/app/qml/ui/PlacesPopover.qml	2014-06-19 16:03:59 +0000
@@ -19,12 +19,45 @@
 import Ubuntu.Components 0.1
 import Ubuntu.Components.Popups 0.1
 import Ubuntu.Components.ListItems 0.1
-import com.ubuntu.PlacesModel 0.1
 
 Popover {
     id: root
     objectName: "placesPopover"
 
+    ListModel {
+        id: places
+
+        ListElement {
+            objectName: 'placeHome'
+            path: "~"
+        }
+
+        ListElement {
+            path: "~/Documents"
+        }
+
+        ListElement {
+            path: "~/Downloads"
+        }
+
+        ListElement {
+            path: "~/Music"
+        }
+
+        ListElement {
+            path: "~/Pictures"
+        }
+
+        ListElement {
+            path: "~/Videos"
+        }
+
+        ListElement {
+            objectName: "placeRoot"
+            path: "/"
+        }
+    }
+
     Column {
         anchors {
             left: parent.left
@@ -80,7 +113,7 @@
             id: placesList
             objectName: "placesList"
 
-            model: PlacesModel {}
+            model: places
 
             delegate: Standard {
                 objectName: model.objectName

=== modified file 'src/plugin/CMakeLists.txt'
--- src/plugin/CMakeLists.txt	2014-06-18 09:02:58 +0000
+++ src/plugin/CMakeLists.txt	2014-06-19 16:03:59 +0000
@@ -5,4 +5,3 @@
 find_package(Qt5Widgets)
 
 add_subdirectory(folderlistmodel)
-add_subdirectory(placesmodel)

=== removed directory 'src/plugin/placesmodel'
=== removed file 'src/plugin/placesmodel/CMakeLists.txt'
--- src/plugin/placesmodel/CMakeLists.txt	2014-06-18 09:00:10 +0000
+++ src/plugin/placesmodel/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-)
-
-set(PLUGIN_DIR com/ubuntu/PlacesModel)
-
-set(placesmodel_SRCS
-    placesmodel.cpp
-    placesmodel.h
-    placesmodel_plugin.cpp
-    placesmodel_plugin.h
-)
-
-add_library(PlacesModel MODULE
-    ${placesmodel_SRCS}
-)
-
-qt5_use_modules(PlacesModel Gui Qml Quick Widgets)
-
-# Copy the plugin, the qmldir file and other assets to the build dir for running in QtCreator
-if(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
-    add_custom_command(TARGET PlacesModel POST_BUILD
-        COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/../${PLUGIN_DIR}
-        COMMENT "Creating plugin directory layout in the build directory"
-        COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/qmldir ${CMAKE_CURRENT_BINARY_DIR}/../${PLUGIN_DIR}
-        COMMENT "Copying the qmldir file to the build directory"
-        COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:PlacesModel> ${CMAKE_CURRENT_BINARY_DIR}/../${PLUGIN_DIR}
-        COMMENT "Copying the plugin binary to the build directory"
-    )
-endif(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
-
-# Install plugin file
-install(TARGETS PlacesModel DESTINATION ${QT_IMPORTS_DIR}/${PLUGIN_DIR})
-install(FILES qmldir DESTINATION ${QT_IMPORTS_DIR}/${PLUGIN_DIR})
-

=== removed file 'src/plugin/placesmodel/placesmodel.cpp'
--- src/plugin/placesmodel/placesmodel.cpp	2014-06-18 12:24:06 +0000
+++ src/plugin/placesmodel/placesmodel.cpp	1970-01-01 00:00:00 +0000
@@ -1,174 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License 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 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/>.
- *
- * Author : David Planella <[e-mail]>
- */
-
-#include "placesmodel.h"
-#include <QDebug>
-#include <QDir>
-#include <QAbstractItemModel>
-#include <QCoreApplication>
-#include <QStandardPaths>
-#include <QDebug>
-
-PlacesModel::PlacesModel(QAbstractListModel *parent) :
-    QAbstractListModel(parent)
-{
-
-    QStringList defaultLocations;
-    // Set the storage location to a path that works well
-    // with app isolation
-    QString settingsLocation =
-            QStandardPaths::standardLocations(QStandardPaths::ConfigLocation).first()
-            + "/" + QCoreApplication::applicationName() + "/" + "places.conf";
-    m_settings = new QSettings(settingsLocation, QSettings::IniFormat, this);
-
-    // Prepopulate the model with the user locations
-    // for the first time it's used
-    defaultLocations.append(locationHome());
-    defaultLocations.append(locationDocuments());
-    defaultLocations.append(locationDownloads());
-    defaultLocations.append(locationMusic());
-    defaultLocations.append(locationPictures());
-    defaultLocations.append(locationVideos());
-
-    if (!m_settings->contains("storedLocations")) {
-        m_locations.append(defaultLocations);
-    } else {
-        m_locations = m_settings->value("storedLocations").toStringList();
-    }
-
-    foreach (const QString &location, m_locations) {
-        qDebug() << "Location: " << location;
-    }
-
-}
-
-PlacesModel::~PlacesModel() {
-
-}
-
-QString PlacesModel::standardLocation(QStandardPaths::StandardLocation location) const
-{
-    QStringList locations = QStandardPaths::standardLocations(location);
-    QString standardLocation = "";
-
-    foreach (const QString &location, locations) {
-        // We always return the first location or an empty string
-        // The frontend should check out that it exists
-        if (QDir(location).exists()) {
-            standardLocation = location;
-            break;
-        }
-    }
-
-    return standardLocation;
-}
-
-QString PlacesModel::locationHome() const
-{
-    return standardLocation(QStandardPaths::HomeLocation);
-}
-
-QString PlacesModel::locationDocuments() const
-{
-    return standardLocation(QStandardPaths::DocumentsLocation);
-}
-
-QString PlacesModel::locationDownloads() const
-{
-    return standardLocation(QStandardPaths::DownloadLocation);
-}
-
-QString PlacesModel::locationMusic() const
-{
-    return standardLocation(QStandardPaths::MusicLocation);
-}
-
-QString PlacesModel::locationPictures() const
-{
-    return standardLocation(QStandardPaths::PicturesLocation);
-}
-
-QString PlacesModel::locationVideos() const
-{
-    return standardLocation(QStandardPaths::MoviesLocation);
-}
-
-int PlacesModel::rowCount(const QModelIndex &parent) const
-{
-    Q_UNUSED(parent)
-
-    return m_locations.count();
-}
-
-QVariant PlacesModel::data(const QModelIndex &index, int role) const
-{
-    Q_UNUSED(role)
-
-    return m_locations.at(index.row());
-}
-
-QHash<int, QByteArray> PlacesModel::roleNames() const
-{
-    QHash<int, QByteArray> roles;
-    roles.insert(Qt::UserRole, "path");
-
-    return roles;
-}
-
-void PlacesModel::removeItem(int indexToRemove)
-{
-
-    // Tell Qt that we're going to be changing the model
-    // There's no tree-parent, first new item will be at
-    // indexToRemove, and the last one too
-    beginRemoveRows(QModelIndex(), indexToRemove, indexToRemove);
-
-    // Remove the actual location
-    m_locations.removeAt(indexToRemove);
-
-    // Tell Qt we're done with modifying the model so that
-    // it can update the UI and everything else to reflect
-    // the new state
-    endRemoveRows();
-
-    // Remove the location permanently
-    m_settings->setValue("storedLocations", m_locations);
-}
-
-void PlacesModel::addLocation(const QString &location)
-{
-    // Do not allow for duplicates
-    if (!m_locations.contains(location)) {
-        // Tell Qt that we're going to be changing the model
-        // There's no tree-parent, first new item will be at
-        // m_locations.count(), and the last one too
-        beginInsertRows(QModelIndex(), m_locations.count(), m_locations.count());
-
-        // Append the actual location
-        m_locations.append(location);
-
-
-        // Tell Qt we're done with modifying the model so that
-        // it can update the UI and everything else to reflect
-        // the new state
-        endInsertRows();
-
-        // Store the location permanently
-        m_settings->setValue("storedLocations", m_locations);
-    }
-}

=== removed file 'src/plugin/placesmodel/placesmodel.h'
--- src/plugin/placesmodel/placesmodel.h	2014-06-18 12:24:06 +0000
+++ src/plugin/placesmodel/placesmodel.h	1970-01-01 00:00:00 +0000
@@ -1,64 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License 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 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/>.
- *
- * Author : David Planella <[e-mail]>
- */
-
-#ifndef PLACESMODEL_H
-#define PLACESMODEL_H
-
-#include <QObject>
-#include <QAbstractListModel>
-#include <QStandardPaths>
-#include <QSettings>
-
-class PlacesModel : public QAbstractListModel
-{
-    Q_OBJECT
-
-    Q_PROPERTY(QString locationHome READ locationHome CONSTANT)
-    Q_PROPERTY(QString locationDocuments READ locationDocuments CONSTANT)
-    Q_PROPERTY(QString locationDownloads READ locationDownloads CONSTANT)
-    Q_PROPERTY(QString locationMusic READ locationMusic CONSTANT)
-    Q_PROPERTY(QString locationPictures READ locationPictures CONSTANT)
-    Q_PROPERTY(QString locationVideos READ locationVideos CONSTANT)
-
-public:
-    explicit PlacesModel(QAbstractListModel *parent = 0);
-    ~PlacesModel();
-    QString locationHome() const;
-    QString locationDocuments() const;
-    QString locationDownloads() const;
-    QString locationMusic() const;
-    QString locationPictures() const;
-    QString locationVideos() const;
-    int rowCount(const QModelIndex &parent) const override;
-    QVariant data(const QModelIndex &index, int role) const override;
-    QHash<int, QByteArray> roleNames() const override;
-
-public slots:
-    void addLocation(const QString &location);
-    void removeItem(int indexToRemove);
-
-private:
-    QString standardLocation(QStandardPaths::StandardLocation location) const;
-    QStringList m_locations;
-    QSettings *m_settings;
-};
-
-#endif // PLACESMODEL_H
-
-
-

=== removed file 'src/plugin/placesmodel/placesmodel_plugin.cpp'
--- src/plugin/placesmodel/placesmodel_plugin.cpp	2014-06-18 09:00:10 +0000
+++ src/plugin/placesmodel/placesmodel_plugin.cpp	1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License 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 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/>.
- *
- * Author : David Planella <[e-mail]>
- */
-
-#include <QtQml>
-#include <QtQml/QQmlContext>
-#include "placesmodel_plugin.h"
-#include "placesmodel.h"
-
-void BackendPlugin::registerTypes(const char *uri)
-{
-    Q_ASSERT(uri == QLatin1String(QUOTES(PLUGIN_URI)));
-
-    qmlRegisterType<PlacesModel>(uri, 0, 1, "PlacesModel");
-}
-
-void BackendPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
-{
-    QQmlExtensionPlugin::initializeEngine(engine, uri);
-}

=== removed file 'src/plugin/placesmodel/placesmodel_plugin.h'
--- src/plugin/placesmodel/placesmodel_plugin.h	2014-06-18 09:00:10 +0000
+++ src/plugin/placesmodel/placesmodel_plugin.h	1970-01-01 00:00:00 +0000
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License 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 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/>.
- *
- * Author : David Planella <[e-mail]>
- */
-
-#ifndef PLACESMODEL_PLUGIN_H
-#define PLACESMODEL_PLUGIN_H
-
-#include <QtQml/QQmlEngine>
-#include <QtQml/QQmlExtensionPlugin>
-
-class BackendPlugin : public QQmlExtensionPlugin
-{
-    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
-
-public:
-    void registerTypes(const char *uri);
-    void initializeEngine(QQmlEngine *engine, const char *uri);
-};
-#endif // PLACESMODEL_PLUGIN_H
-
-
-
-
-

=== removed file 'src/plugin/placesmodel/qmldir'
--- src/plugin/placesmodel/qmldir	2014-06-18 09:00:10 +0000
+++ src/plugin/placesmodel/qmldir	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-module com.ubuntu.PlacesModel
-plugin PlacesModel

=== modified file 'tests/autopilot/filemanager/tests/test_places.py'
--- tests/autopilot/filemanager/tests/test_places.py	2014-06-18 13:57:37 +0000
+++ tests/autopilot/filemanager/tests/test_places.py	2014-06-19 16:03:59 +0000
@@ -34,7 +34,7 @@
 
     def test_go_to_root_must_open_the_root_directory(self):
         """Test that opens the File System bookmark from the places section."""
-        self.main_view.go_to_place('placeFileSystem')
+        self.main_view.go_to_place('placeRoot')
 
         folder_list_page = self.main_view.get_folder_list_page()
         self.assertThat(