diff --git a/autotests/kfileplacesmodeltest.cpp b/autotests/kfileplacesmodeltest.cpp
index 36adfbec..ed0fea95 100644
--- a/autotests/kfileplacesmodeltest.cpp
+++ b/autotests/kfileplacesmodeltest.cpp
@@ -1,1050 +1,1070 @@
 /*  This file is part of the KDE project
     Copyright (C) 2007 Kevin Ottens <ervin@kde.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License version 2
     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, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
     02110-1301, USA.
 
 */
 
 #include <QtCore/QObject>
 #include <QtDBus/QDBusInterface>
 
 #include <kbookmarkmanager.h>
 #include <kbookmark.h>
 #include <QDebug>
 #include <kfileplacesmodel.h>
 #include <solid/device.h>
 #include <kconfig.h>
 #include <kconfiggroup.h>
 
 #include <QtTest/QtTest>
 
 #include <stdlib.h>
 #include <qstandardpaths.h>
 
 #ifdef Q_OS_WIN
 //c:\ as root for windows
 #define KDE_ROOT_PATH "C:\\"
 #else
 #define KDE_ROOT_PATH "/"
 #endif
 
 // Avoid QHash randomization so that the order of the devices is stable
 static void seedInit()
 {
     qputenv("QT_HASH_SEED", "0");
     // This env var has no effect because this comes too late. qCpuFeatures() was already called by
     // a Q_CONSTRUCTOR_FUNCTION inside QtGui (see image/qimage_conversions.cpp). Argh. QTBUG-47566.
     qputenv("QT_NO_CPU_FEATURE", "sse4.2");
 }
 Q_CONSTRUCTOR_FUNCTION(seedInit)
 
 class KFilePlacesModelTest : public QObject
 {
     Q_OBJECT
 
 private Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
 
     void testInitialState();
     void testInitialList();
     void testReparse();
     void testInternalBookmarksHaveIds();
     void testHiding();
     void testMove();
     void testPlacesLifecycle();
     void testDevicePlugging();
     void testDragAndDrop();
     void testDeviceSetupTeardown();
     void testEnableBaloo();
     void testRemoteUrls_data();
     void testRemoteUrls();
     void testRefresh();
     void testConvertedUrl_data();
     void testConvertedUrl();
     void testBookmarkObject();
     void testDataChangedSignal();
     void testIconRole_data();
     void testIconRole();
     void testMoveFunction();
 
 private:
     QStringList placesUrls() const;
     QDBusInterface *fakeManager();
     QDBusInterface *fakeDevice(const QString &udi);
 
     KFilePlacesModel *m_places;
     KFilePlacesModel *m_places2; // To check that they always stay in sync
     // actually supposed to work across processes,
     // but much harder to test
 
     QMap<QString, QDBusInterface *> m_interfacesMap;
 };
 
 static QString bookmarksFile()
 {
     return QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/user-places.xbel";
 }
 
 void KFilePlacesModelTest::initTestCase()
 {
     qputenv("KDE_FORK_SLAVES", "yes"); // to avoid a runtime dependency on klauncher
     QStandardPaths::setTestModeEnabled(true);
 
     // Ensure we'll have a clean bookmark file to start
     QFile::remove(bookmarksFile());
 
     // disable baloo by default
     KConfig config(QStringLiteral("baloofilerc"));
     KConfigGroup basicSettings = config.group("Basic Settings");
     basicSettings.writeEntry("Indexing-Enabled", false);
     config.sync();
 
     qRegisterMetaType<QModelIndex>();
     const QString fakeHw = QFINDTESTDATA("fakecomputer.xml");
     QVERIFY(!fakeHw.isEmpty());
     qputenv("SOLID_FAKEHW", QFile::encodeName(fakeHw));
     m_places = new KFilePlacesModel();
     m_places2 = new KFilePlacesModel();
 }
 
 void KFilePlacesModelTest::cleanupTestCase()
 {
     delete m_places;
     delete m_places2;
     qDeleteAll(m_interfacesMap);
     QFile::remove(bookmarksFile());
 }
 
 QStringList KFilePlacesModelTest::placesUrls() const
 {
     QStringList urls;
     for (int row = 0; row < m_places->rowCount(); ++row) {
         QModelIndex index = m_places->index(row, 0);
         urls << m_places->url(index).toDisplayString(QUrl::PreferLocalFile);
     }
     return urls;
  }
 
 #define CHECK_PLACES_URLS(urls)                                              \
     if (placesUrls() != urls) {                                              \
         qDebug() << "Expected:" << urls;                                     \
         qDebug() << "Got:" << placesUrls();                                  \
         QCOMPARE(placesUrls(), urls);                                        \
     }                                                                        \
     for (int row = 0; row < urls.size(); ++row) {                            \
         QModelIndex index = m_places->index(row, 0);                         \
         \
         QCOMPARE(m_places->url(index).toString(), QUrl::fromUserInput(urls[row]).toString()); \
         QCOMPARE(m_places->data(index, KFilePlacesModel::UrlRole).toUrl(),   \
                  QUrl(m_places->url(index)));                                \
         \
         index = m_places2->index(row, 0);                                    \
         \
         QCOMPARE(m_places2->url(index).toString(), QUrl::fromUserInput(urls[row]).toString()); \
         QCOMPARE(m_places2->data(index, KFilePlacesModel::UrlRole).toUrl(),  \
                  QUrl(m_places2->url(index)));                               \
     }                                                                        \
     \
     QCOMPARE(urls.size(), m_places->rowCount());                             \
     QCOMPARE(urls.size(), m_places2->rowCount());
 
 QDBusInterface *KFilePlacesModelTest::fakeManager()
 {
     return fakeDevice(QStringLiteral("/org/kde/solid/fakehw"));
 }
 
 QDBusInterface *KFilePlacesModelTest::fakeDevice(const QString &udi)
 {
     if (m_interfacesMap.contains(udi)) {
         return m_interfacesMap[udi];
     }
 
     QDBusInterface *iface = new QDBusInterface(QDBusConnection::sessionBus().baseService(), udi);
     m_interfacesMap[udi] = iface;
 
     return iface;
 }
 
 void KFilePlacesModelTest::testInitialState()
 {
     QCOMPARE(m_places->rowCount(), 4); // when the xbel file is empty, KFilePlacesModel fills it with 4 default items
     QCoreApplication::processEvents(); // Devices have a delayed loading
     QCOMPARE(m_places->rowCount(), 9);
 }
 
+static const QStringList initialListOfPlaces()
+{
+    return QStringList() << QDir::homePath() << QStringLiteral(KDE_ROOT_PATH) << QStringLiteral("trash:/");
+}
+
+static const QStringList initialListOfShared()
+{
+    return QStringList() << QStringLiteral("remote:/");
+}
+
+static const QStringList initialListOfDevices()
+{
+    return QStringList() << QStringLiteral("/media/nfs") << QStringLiteral("/foreign");
+}
+
+static const QStringList initialListOfRemovableDevices()
+{
+    return QStringList() << QStringLiteral("/media/floppy0") << QStringLiteral("/media/XO-Y4") << QStringLiteral("/media/cdrom");
+}
+
 static const QStringList initialListOfUrls()
 {
-    return QStringList() << QDir::homePath() << QStringLiteral(KDE_ROOT_PATH) << QStringLiteral("trash:/") // places
-                         << QStringLiteral("remote:/")  // shared
-                         << QStringLiteral("/media/nfs") << QStringLiteral("/foreign")
-                         << QStringLiteral("/media/floppy0")  << QStringLiteral("/media/XO-Y4") << QStringLiteral("/media/cdrom");
+    return QStringList() << initialListOfPlaces()
+                         << initialListOfShared()
+                         << initialListOfDevices()
+                         << initialListOfRemovableDevices();
 }
 
 void KFilePlacesModelTest::testInitialList()
 {
     const QStringList urls = initialListOfUrls();
     CHECK_PLACES_URLS(urls);
 }
 
 void KFilePlacesModelTest::testReparse()
 {
     QStringList urls;
 
     // add item
 
     m_places->addPlace(QStringLiteral("foo"), QUrl::fromLocalFile(QStringLiteral("/foo")),
                        QString(), QString());
 
     urls = initialListOfUrls();
 
     // it will be added at the end of places section
     urls.insert(3, QStringLiteral("/foo"));
     CHECK_PLACES_URLS(urls);
 
     // reparse the bookmark file
 
     KBookmarkManager *bookmarkManager = KBookmarkManager::managerForFile(bookmarksFile(), QStringLiteral("kfilePlaces"));
 
     bookmarkManager->notifyCompleteChange(QString());
 
     // check if they are the same
 
     CHECK_PLACES_URLS(urls);
 
     // try to remove item
     m_places->removePlace(m_places->index(3, 0));
 
     urls = initialListOfUrls();
     CHECK_PLACES_URLS(urls);
 }
 
 void KFilePlacesModelTest::testInternalBookmarksHaveIds()
 {
     KBookmarkManager *bookmarkManager = KBookmarkManager::managerForFile(bookmarksFile(), QStringLiteral("kfilePlaces"));
     KBookmarkGroup root = bookmarkManager->root();
 
     // Verify every entry has an id or an udi
     KBookmark bookmark = root.first();
     while (!bookmark.isNull()) {
         QVERIFY(!bookmark.metaDataItem(QStringLiteral("ID")).isEmpty() || !bookmark.metaDataItem(QStringLiteral("UDI")).isEmpty());
         // It's mutualy exclusive though
         QVERIFY(bookmark.metaDataItem(QStringLiteral("ID")).isEmpty() || bookmark.metaDataItem(QStringLiteral("UDI")).isEmpty());
 
         bookmark = root.next(bookmark);
     }
 
     // Verify that adding a bookmark behind its back the model gives it an id
     // (in real life it requires the user to modify the file by hand,
     // unlikely but better safe than sorry).
     // It induces a small race condition which means several ids will be
     // successively set on the same bookmark but no big deal since it won't
     // break the system
     KBookmark foo = root.addBookmark(QStringLiteral("Foo"), QUrl(QStringLiteral("file:/foo")), QStringLiteral("red-folder"));
     QCOMPARE(foo.text(), QStringLiteral("Foo"));
     QVERIFY(foo.metaDataItem(QStringLiteral("ID")).isEmpty());
     bookmarkManager->emitChanged(root);
     QCOMPARE(foo.text(), QStringLiteral("Foo"));
     QVERIFY(!foo.metaDataItem(QStringLiteral("ID")).isEmpty());
 
     // Verify that all the ids are different
     bookmark = root.first();
     QSet<QString> ids;
     while (!bookmark.isNull()) {
         QString id;
         if (!bookmark.metaDataItem(QStringLiteral("UDI")).isEmpty()) {
             id = bookmark.metaDataItem(QStringLiteral("UDI"));
         } else {
             id = bookmark.metaDataItem(QStringLiteral("ID"));
         }
 
         QVERIFY2(!ids.contains(id), "Duplicated ID found!");
         ids << id;
         bookmark = root.next(bookmark);
     }
 
     // Cleanup foo
     root.deleteBookmark(foo);
     bookmarkManager->emitChanged(root);
 }
 
 void KFilePlacesModelTest::testHiding()
 {
     // Verify that nothing is hidden
     for (int row = 0; row < m_places->rowCount(); ++row) {
         QModelIndex index = m_places->index(row, 0);
         QVERIFY(!m_places->isHidden(index));
     }
 
     QModelIndex a = m_places->index(2, 0);
     QModelIndex b = m_places->index(6, 0);
 
     QList<QVariant> args;
     QSignalSpy spy(m_places, SIGNAL(dataChanged(QModelIndex,QModelIndex)));
 
     // Verify that hidden is taken into account and is not global
     m_places->setPlaceHidden(a, true);
     QVERIFY(m_places->isHidden(a));
     QVERIFY(m_places->data(a, KFilePlacesModel::HiddenRole).toBool());
     QVERIFY(!m_places->isHidden(b));
     QVERIFY(!m_places->data(b, KFilePlacesModel::HiddenRole).toBool());
     QCOMPARE(spy.count(), 1);
     args = spy.takeFirst();
     QCOMPARE(args.at(0).toModelIndex(), a);
     QCOMPARE(args.at(1).toModelIndex(), a);
 
     m_places->setPlaceHidden(b, true);
     QVERIFY(m_places->isHidden(a));
     QVERIFY(m_places->data(a, KFilePlacesModel::HiddenRole).toBool());
     QVERIFY(m_places->isHidden(b));
     QVERIFY(m_places->data(b, KFilePlacesModel::HiddenRole).toBool());
     QCOMPARE(spy.count(), 1);
     args = spy.takeFirst();
     QCOMPARE(args.at(0).toModelIndex(), b);
     QCOMPARE(args.at(1).toModelIndex(), b);
 
     m_places->setPlaceHidden(a, false);
     m_places->setPlaceHidden(b, false);
     QVERIFY(!m_places->isHidden(a));
     QVERIFY(!m_places->data(a, KFilePlacesModel::HiddenRole).toBool());
     QVERIFY(!m_places->isHidden(b));
     QVERIFY(!m_places->data(b, KFilePlacesModel::HiddenRole).toBool());
     QCOMPARE(spy.count(), 2);
     args = spy.takeFirst();
     QCOMPARE(args.at(0).toModelIndex(), a);
     QCOMPARE(args.at(1).toModelIndex(), a);
     args = spy.takeFirst();
     QCOMPARE(args.at(0).toModelIndex(), b);
     QCOMPARE(args.at(1).toModelIndex(), b);
 }
 
 void KFilePlacesModelTest::testMove()
 {
     QList<QVariant> args;
     QSignalSpy spy_inserted(m_places, SIGNAL(rowsInserted(QModelIndex,int,int)));
     QSignalSpy spy_removed(m_places, SIGNAL(rowsRemoved(QModelIndex,int,int)));
 
     KBookmarkManager *bookmarkManager = KBookmarkManager::managerForFile(bookmarksFile(), QStringLiteral("kfilePlaces"));
     KBookmarkGroup root = bookmarkManager->root();
     KBookmark system_root = m_places->bookmarkForIndex(m_places->index(1, 0));
     KBookmark before_system_root = m_places->bookmarkForIndex(m_places->index(0, 0));
 
     // Trying move the root at the end of the list, should move it to the end of places section instead
     // to keep it grouped
     KBookmark last = root.first();
     while (!root.next(last).isNull()) {
         last = root.next(last);
     }
     root.moveBookmark(system_root, last);
     bookmarkManager->emitChanged(root);
 
     QStringList urls;
     urls << QDir::homePath() << QStringLiteral("trash:/") << QStringLiteral(KDE_ROOT_PATH)
-         << QStringLiteral("remote:/")
-         << QStringLiteral("/media/nfs") << QStringLiteral("/foreign")
-         << QStringLiteral("/media/floppy0")  << QStringLiteral("/media/XO-Y4") << QStringLiteral("/media/cdrom");
+         << initialListOfShared()
+         << initialListOfDevices()
+         << initialListOfRemovableDevices();
 
     CHECK_PLACES_URLS(urls);
     QCOMPARE(spy_inserted.count(), 1);
     args = spy_inserted.takeFirst();
     QCOMPARE(args.at(0).toModelIndex(), QModelIndex());
     QCOMPARE(args.at(1).toInt(), 2);
     QCOMPARE(args.at(2).toInt(), 2);
     QCOMPARE(spy_removed.count(), 1);
     args = spy_removed.takeFirst();
     QCOMPARE(args.at(0).toModelIndex(), QModelIndex());
     QCOMPARE(args.at(1).toInt(), 1);
     QCOMPARE(args.at(2).toInt(), 1);
 
     // Move the root at the beginning of the list
     root.moveBookmark(system_root, KBookmark());
     bookmarkManager->emitChanged(root);
 
     urls.clear();
     urls << QStringLiteral(KDE_ROOT_PATH) << QDir::homePath() <<  QStringLiteral("trash:/")
-         << QStringLiteral("remote:/")
-         << QStringLiteral("/media/nfs") << QStringLiteral("/foreign")
-         << QStringLiteral("/media/floppy0")  << QStringLiteral("/media/XO-Y4") << QStringLiteral("/media/cdrom");
+         << initialListOfShared()
+         << initialListOfDevices()
+         << initialListOfRemovableDevices();
 
     CHECK_PLACES_URLS(urls);
     QCOMPARE(spy_inserted.count(), 1);
     args = spy_inserted.takeFirst();
     QCOMPARE(args.at(0).toModelIndex(), QModelIndex());
     QCOMPARE(args.at(1).toInt(), 0);
     QCOMPARE(args.at(2).toInt(), 0);
     QCOMPARE(spy_removed.count(), 1);
     args = spy_removed.takeFirst();
     QCOMPARE(args.at(0).toModelIndex(), QModelIndex());
     QCOMPARE(args.at(1).toInt(), 3);
     QCOMPARE(args.at(2).toInt(), 3);
 
     // Move the root in the list (at its original place)
     root.moveBookmark(system_root, before_system_root);
     bookmarkManager->emitChanged(root);
     urls.clear();
-    urls << QDir::homePath() << QStringLiteral(KDE_ROOT_PATH) << QStringLiteral("trash:/")
-         << QStringLiteral("remote:/")
-         << QStringLiteral("/media/nfs") << QStringLiteral("/foreign")
-         << QStringLiteral("/media/floppy0")  << QStringLiteral("/media/XO-Y4") << QStringLiteral("/media/cdrom");
+    urls << initialListOfPlaces()
+         << initialListOfShared()
+         << initialListOfDevices()
+         << initialListOfRemovableDevices();
     CHECK_PLACES_URLS(urls);
     QCOMPARE(spy_inserted.count(), 1);
     args = spy_inserted.takeFirst();
     QCOMPARE(args.at(0).toModelIndex(), QModelIndex());
     QCOMPARE(args.at(1).toInt(), 1);
     QCOMPARE(args.at(2).toInt(), 1);
     QCOMPARE(spy_removed.count(), 1);
     args = spy_removed.takeFirst();
     QCOMPARE(args.at(0).toModelIndex(), QModelIndex());
     QCOMPARE(args.at(1).toInt(), 0);
     QCOMPARE(args.at(2).toInt(), 0);
 }
 
 void KFilePlacesModelTest::testDragAndDrop()
 {
     QList<QVariant> args;
     QSignalSpy spy_moved(m_places, SIGNAL(rowsMoved(QModelIndex,int,int,QModelIndex,int)));
 
     // Monitor rowsInserted() and rowsRemoved() to ensure they are never emitted:
     // Moving with drag and drop is expected to emit rowsMoved()
     QSignalSpy spy_inserted(m_places, SIGNAL(rowsInserted(QModelIndex,int,int)));
     QSignalSpy spy_removed(m_places, SIGNAL(rowsRemoved(QModelIndex,int,int)));
 
     // Move the KDE_ROOT_PATH at the end of the places list
     QModelIndexList indexes;
     indexes << m_places->index(1, 0);
     QMimeData *mimeData = m_places->mimeData(indexes);
     QVERIFY(m_places->dropMimeData(mimeData, Qt::MoveAction, 3, 0, QModelIndex()));
 
     QStringList urls;
     urls << QDir::homePath() << QStringLiteral("trash:/") << QStringLiteral(KDE_ROOT_PATH)
-         << QStringLiteral("remote:/")
-         << QStringLiteral("/media/nfs") << QStringLiteral("/foreign")
-         << QStringLiteral("/media/floppy0")  << QStringLiteral("/media/XO-Y4") << QStringLiteral("/media/cdrom");
+         << initialListOfShared()
+         << initialListOfDevices()
+         << initialListOfRemovableDevices();
     CHECK_PLACES_URLS(urls);
     QCOMPARE(spy_inserted.count(), 0);
     QCOMPARE(spy_removed.count(), 0);
     QCOMPARE(spy_moved.count(), 1);
     args = spy_moved.takeFirst();
     QCOMPARE(args.at(0).toModelIndex(), QModelIndex());
     QCOMPARE(args.at(1).toInt(), 1);
     QCOMPARE(args.at(2).toInt(), 1);
     QCOMPARE(args.at(3).toModelIndex(), QModelIndex());
     QCOMPARE(args.at(4).toInt(), 3);
 
     // Move the KDE_ROOT_PATH at the beginning of the list
     indexes.clear();
     indexes << m_places->index(2, 0);
     mimeData = m_places->mimeData(indexes);
     QVERIFY(m_places->dropMimeData(mimeData, Qt::MoveAction, 0, 0, QModelIndex()));
 
     urls.clear();
     urls << QStringLiteral(KDE_ROOT_PATH) << QDir::homePath() << QStringLiteral("trash:/")
-         << QStringLiteral("remote:/")
-         << QStringLiteral("/media/nfs") << QStringLiteral("/foreign")
-         << QStringLiteral("/media/floppy0")  << QStringLiteral("/media/XO-Y4") << QStringLiteral("/media/cdrom");
+         << initialListOfShared()
+         << initialListOfDevices()
+         << initialListOfRemovableDevices();
     CHECK_PLACES_URLS(urls);
     QCOMPARE(spy_inserted.count(), 0);
     QCOMPARE(spy_removed.count(), 0);
     QCOMPARE(spy_moved.count(), 1);
     args = spy_moved.takeFirst();
     QCOMPARE(args.at(0).toModelIndex(), QModelIndex());
     QCOMPARE(args.at(1).toInt(), 2);
     QCOMPARE(args.at(2).toInt(), 2);
     QCOMPARE(args.at(3).toModelIndex(), QModelIndex());
     QCOMPARE(args.at(4).toInt(), 0);
 
     // Move the KDE_ROOT_PATH in the list (at its original place)
     indexes.clear();
     indexes << m_places->index(0, 0);
     mimeData = m_places->mimeData(indexes);
     QVERIFY(m_places->dropMimeData(mimeData, Qt::MoveAction, 2, 0, QModelIndex()));
 
     urls.clear();
-    urls << QDir::homePath() << QStringLiteral(KDE_ROOT_PATH) << QStringLiteral("trash:/")
-         << QStringLiteral("remote:/")
-         << QStringLiteral("/media/nfs") << QStringLiteral("/foreign")
-         << QStringLiteral("/media/floppy0")  << QStringLiteral("/media/XO-Y4") << QStringLiteral("/media/cdrom");
+    urls << initialListOfPlaces()
+         << initialListOfShared()
+         << initialListOfDevices()
+         << initialListOfRemovableDevices();
     CHECK_PLACES_URLS(urls);
     QCOMPARE(spy_inserted.count(), 0);
     QCOMPARE(spy_removed.count(), 0);
     QCOMPARE(spy_moved.count(), 1);
     args = spy_moved.takeFirst();
     QCOMPARE(args.at(0).toModelIndex(), QModelIndex());
     QCOMPARE(args.at(1).toInt(), 0);
     QCOMPARE(args.at(2).toInt(), 0);
     QCOMPARE(args.at(3).toModelIndex(), QModelIndex());
     QCOMPARE(args.at(4).toInt(), 2);
 
     // Dropping on an item is not allowed
     indexes.clear();
     indexes << m_places->index(4, 0);
     mimeData = m_places->mimeData(indexes);
     QVERIFY(!m_places->dropMimeData(mimeData, Qt::MoveAction, -1, 0, m_places->index(2, 0)));
     CHECK_PLACES_URLS(urls);
     QCOMPARE(spy_inserted.count(), 0);
     QCOMPARE(spy_removed.count(), 0);
     QCOMPARE(spy_moved.count(), 0);
 }
 
 void KFilePlacesModelTest::testPlacesLifecycle()
 {
     QList<QVariant> args;
     QSignalSpy spy_inserted(m_places, SIGNAL(rowsInserted(QModelIndex,int,int)));
     QSignalSpy spy_removed(m_places, SIGNAL(rowsRemoved(QModelIndex,int,int)));
     QSignalSpy spy_changed(m_places, SIGNAL(dataChanged(QModelIndex,QModelIndex)));
 
     m_places->addPlace(QStringLiteral("Foo"), QUrl::fromLocalFile(QStringLiteral("/home/foo")));
 
     QStringList urls;
-    urls << QDir::homePath() << QStringLiteral(KDE_ROOT_PATH) << QStringLiteral("trash:/") <<  QStringLiteral("/home/foo")
-         << QStringLiteral("remote:/")
-         << QStringLiteral("/media/nfs") << QStringLiteral("/foreign")
-         << QStringLiteral("/media/floppy0")  << QStringLiteral("/media/XO-Y4") << QStringLiteral("/media/cdrom");
-
+    urls << initialListOfPlaces() <<  QStringLiteral("/home/foo")
+         << initialListOfShared()
+         << initialListOfDevices()
+         << initialListOfRemovableDevices();
     CHECK_PLACES_URLS(urls);
     QCOMPARE(spy_inserted.count(), 1);
     args = spy_inserted.takeFirst();
     QCOMPARE(args.at(0).toModelIndex(), QModelIndex());
     QCOMPARE(args.at(1).toInt(), 3);
     QCOMPARE(args.at(2).toInt(), 3);
     QCOMPARE(spy_removed.count(), 0);
 
     KBookmarkManager *bookmarkManager = KBookmarkManager::managerForFile(bookmarksFile(), QStringLiteral("kfilePlaces"));
     KBookmarkGroup root = bookmarkManager->root();
     KBookmark before_trash = m_places->bookmarkForIndex(m_places->index(1, 0));
     KBookmark foo = m_places->bookmarkForIndex(m_places->index(3, 0));
 
     root.moveBookmark(foo, before_trash);
     bookmarkManager->emitChanged(root);
 
     urls.clear();
     urls << QDir::homePath() << QStringLiteral(KDE_ROOT_PATH) << QStringLiteral("/home/foo") << QStringLiteral("trash:/")
-         << QStringLiteral("remote:/")
-         << QStringLiteral("/media/nfs") << QStringLiteral("/foreign")
-         << QStringLiteral("/media/floppy0")  << QStringLiteral("/media/XO-Y4") << QStringLiteral("/media/cdrom");
+         << initialListOfShared()
+         << initialListOfDevices()
+         << initialListOfRemovableDevices();
     CHECK_PLACES_URLS(urls);
     QCOMPARE(spy_inserted.count(), 1);
     args = spy_inserted.takeFirst();
     QCOMPARE(args.at(0).toModelIndex(), QModelIndex());
     QCOMPARE(args.at(1).toInt(), 3);
     QCOMPARE(args.at(2).toInt(), 3);
     QCOMPARE(spy_removed.count(), 1);
     args = spy_removed.takeFirst();
     QCOMPARE(args.at(0).toModelIndex(), QModelIndex());
     QCOMPARE(args.at(1).toInt(), 2);
     QCOMPARE(args.at(2).toInt(), 2);
 
     m_places->editPlace(m_places->index(2, 0), QStringLiteral("Foo"), QUrl::fromLocalFile(QStringLiteral("/mnt/foo")));
 
     urls.clear();
     urls << QDir::homePath() << QStringLiteral(KDE_ROOT_PATH) << QStringLiteral("/mnt/foo") << QStringLiteral("trash:/")
-         << QStringLiteral("remote:/")
-         << QStringLiteral("/media/nfs") << QStringLiteral("/foreign")
-         << QStringLiteral("/media/floppy0")  << QStringLiteral("/media/XO-Y4") << QStringLiteral("/media/cdrom");
+         << initialListOfShared()
+         << initialListOfDevices()
+         << initialListOfRemovableDevices();
     CHECK_PLACES_URLS(urls);
     QCOMPARE(spy_inserted.count(), 0);
     QCOMPARE(spy_removed.count(), 0);
     QCOMPARE(spy_changed.count(), 1);
     args = spy_changed.takeFirst();
     QCOMPARE(args.at(0).toModelIndex(), m_places->index(2, 0));
     QCOMPARE(args.at(1).toModelIndex(), m_places->index(2, 0));
 
     foo = m_places->bookmarkForIndex(m_places->index(2, 0));
     foo.setFullText(QStringLiteral("Bar"));
     bookmarkManager->notifyCompleteChange(QString());
 
     urls.clear();
     urls << QDir::homePath() << QStringLiteral(KDE_ROOT_PATH) << QStringLiteral("/mnt/foo") << QStringLiteral("trash:/")
-         << QStringLiteral("remote:/")
-         << QStringLiteral("/media/nfs") << QStringLiteral("/foreign")
-         << QStringLiteral("/media/floppy0")  << QStringLiteral("/media/XO-Y4") << QStringLiteral("/media/cdrom");
+         << initialListOfShared()
+         << initialListOfDevices()
+         << initialListOfRemovableDevices();
+
     CHECK_PLACES_URLS(urls);
     QCOMPARE(spy_inserted.count(), 0);
     QCOMPARE(spy_removed.count(), 0);
     QCOMPARE(spy_changed.count(), 10);
     args = spy_changed[2];
     QCOMPARE(args.at(0).toModelIndex(), m_places->index(2, 0));
     QCOMPARE(args.at(1).toModelIndex(), m_places->index(2, 0));
     spy_changed.clear();
 
     m_places->removePlace(m_places->index(2, 0));
 
     urls.clear();
-    urls << QDir::homePath() << QStringLiteral(KDE_ROOT_PATH) << QStringLiteral("trash:/")
-         << QStringLiteral("remote:/")
-         << QStringLiteral("/media/nfs") << QStringLiteral("/foreign")
-         << QStringLiteral("/media/floppy0")  << QStringLiteral("/media/XO-Y4") << QStringLiteral("/media/cdrom");
+    urls << initialListOfPlaces()
+         << initialListOfShared()
+         << initialListOfDevices()
+         << initialListOfRemovableDevices();
     CHECK_PLACES_URLS(urls);
     QCOMPARE(spy_inserted.count(), 0);
     QCOMPARE(spy_removed.count(), 1);
     args = spy_removed.takeFirst();
     QCOMPARE(args.at(0).toModelIndex(), QModelIndex());
     QCOMPARE(args.at(1).toInt(), 2);
     QCOMPARE(args.at(2).toInt(), 2);
 
     m_places->addPlace(QStringLiteral("Foo"), QUrl::fromLocalFile(QStringLiteral("/home/foo")), QString(), QString(), m_places->index(0, 0));
 
     urls.clear();
     urls << QDir::homePath() << QStringLiteral("/home/foo") << QStringLiteral(KDE_ROOT_PATH) << QStringLiteral("trash:/")
-         << QStringLiteral("remote:/")
-         << QStringLiteral("/media/nfs") << QStringLiteral("/foreign")
-         << QStringLiteral("/media/floppy0")  << QStringLiteral("/media/XO-Y4") << QStringLiteral("/media/cdrom");
+         << initialListOfShared()
+         << initialListOfDevices()
+         << initialListOfRemovableDevices();
     CHECK_PLACES_URLS(urls);
     QCOMPARE(spy_inserted.count(), 1);
     args = spy_inserted.takeFirst();
     QCOMPARE(args.at(0).toModelIndex(), QModelIndex());
     QCOMPARE(args.at(1).toInt(), 1);
     QCOMPARE(args.at(2).toInt(), 1);
     QCOMPARE(spy_removed.count(), 0);
 
     m_places->removePlace(m_places->index(1, 0));
 }
 
 void KFilePlacesModelTest::testDevicePlugging()
 {
     QList<QVariant> args;
     QSignalSpy spy_inserted(m_places, SIGNAL(rowsInserted(QModelIndex,int,int)));
     QSignalSpy spy_removed(m_places, SIGNAL(rowsRemoved(QModelIndex,int,int)));
 
     fakeManager()->call(QStringLiteral("unplug"), "/org/kde/solid/fakehw/volume_part1_size_993284096");
 
     QStringList urls;
-    urls << QDir::homePath() << QStringLiteral(KDE_ROOT_PATH) << QStringLiteral("trash:/")
-         << QStringLiteral("remote:/")
-         << QStringLiteral("/media/nfs") << QStringLiteral("/foreign")
+    urls << initialListOfPlaces()
+         << initialListOfShared()
+         << initialListOfDevices()
          << QStringLiteral("/media/floppy0")  << QStringLiteral("/media/cdrom");
     CHECK_PLACES_URLS(urls);
     QCOMPARE(spy_inserted.count(), 0);
     QCOMPARE(spy_removed.count(), 1);
     args = spy_removed.takeFirst();
     QCOMPARE(args.at(0).toModelIndex(), QModelIndex());
     QCOMPARE(args.at(1).toInt(), 7);
     QCOMPARE(args.at(2).toInt(), 7);
 
     fakeManager()->call(QStringLiteral("plug"), "/org/kde/solid/fakehw/volume_part1_size_993284096");
 
     urls.clear();
-    urls << QDir::homePath() << QStringLiteral(KDE_ROOT_PATH) << QStringLiteral("trash:/")
-         << QStringLiteral("remote:/")
-         << QStringLiteral("/media/nfs") << QStringLiteral("/foreign")
-         << QStringLiteral("/media/floppy0") << QStringLiteral("/media/XO-Y4") << QStringLiteral("/media/cdrom");
+    urls << initialListOfPlaces()
+         << initialListOfShared()
+         << initialListOfDevices()
+         << initialListOfRemovableDevices();
     CHECK_PLACES_URLS(urls);
     QCOMPARE(spy_inserted.count(), 1);
     args = spy_inserted.takeFirst();
     QCOMPARE(args.at(0).toModelIndex(), QModelIndex());
     QCOMPARE(args.at(1).toInt(), 7);
     QCOMPARE(args.at(2).toInt(), 7);
     QCOMPARE(spy_removed.count(), 0);
 
     // Move the device in the list, and check that it memorizes the position across plug/unplug
 
     KBookmarkManager *bookmarkManager = KBookmarkManager::managerForFile(bookmarksFile(), QStringLiteral("kfilePlaces"));
     KBookmarkGroup root = bookmarkManager->root();
     KBookmark before_floppy;
 
     KBookmark device = root.first(); // The device we'll move is the 7th bookmark
     for (int i = 0; i < 6; i++) {
         if (i == 3) {
             // store item before to be able to move it back to original position
             device = before_floppy = root.next(device);
         } else {
             device = root.next(device);
         }
     }
 
     root.moveBookmark(device, before_floppy);
     bookmarkManager->emitChanged(root);
 
     urls.clear();
-    urls << QDir::homePath() << QStringLiteral(KDE_ROOT_PATH) << QStringLiteral("trash:/")
-         << QStringLiteral("remote:/")
-         << QStringLiteral("/media/nfs") << QStringLiteral("/foreign")
+    urls << initialListOfPlaces()
+         << initialListOfShared()
+         << initialListOfDevices()
          << QStringLiteral("/media/XO-Y4") << QStringLiteral("/media/floppy0") << QStringLiteral("/media/cdrom");
     CHECK_PLACES_URLS(urls);
     QCOMPARE(spy_inserted.count(), 1);
     args = spy_inserted.takeFirst();
     QCOMPARE(args.at(0).toModelIndex(), QModelIndex());
     QCOMPARE(args.at(1).toInt(), 7);
     QCOMPARE(args.at(2).toInt(), 7);
     QCOMPARE(spy_removed.count(), 1);
     args = spy_removed.takeFirst();
     QCOMPARE(args.at(0).toModelIndex(), QModelIndex());
     QCOMPARE(args.at(1).toInt(), 6);
     QCOMPARE(args.at(2).toInt(), 6);
 
     fakeManager()->call(QStringLiteral("unplug"), "/org/kde/solid/fakehw/volume_part1_size_993284096");
 
     urls.clear();
-    urls << QDir::homePath() << QStringLiteral(KDE_ROOT_PATH) << QStringLiteral("trash:/")
-         << QStringLiteral("remote:/")
-         << QStringLiteral("/media/nfs") << QStringLiteral("/foreign")
+    urls << initialListOfPlaces()
+         << initialListOfShared()
+         << initialListOfDevices()
          << QStringLiteral("/media/floppy0") << QStringLiteral("/media/cdrom");
     CHECK_PLACES_URLS(urls);
     QCOMPARE(spy_inserted.count(), 0);
     QCOMPARE(spy_removed.count(), 1);
     args = spy_removed.takeFirst();
     QCOMPARE(args.at(0).toModelIndex(), QModelIndex());
     QCOMPARE(args.at(1).toInt(), 6);
     QCOMPARE(args.at(2).toInt(), 6);
 
     fakeManager()->call(QStringLiteral("plug"), "/org/kde/solid/fakehw/volume_part1_size_993284096");
 
     urls.clear();
-    urls << QDir::homePath() << QStringLiteral(KDE_ROOT_PATH) << QStringLiteral("trash:/")
-         << QStringLiteral("remote:/")
-         << QStringLiteral("/media/nfs") << QStringLiteral("/foreign") << QStringLiteral("/media/XO-Y4")
+    urls << initialListOfPlaces()
+         << initialListOfShared()
+         << initialListOfDevices() << QStringLiteral("/media/XO-Y4")
          << QStringLiteral("/media/floppy0") << QStringLiteral("/media/cdrom");
     CHECK_PLACES_URLS(urls);
     QCOMPARE(spy_inserted.count(), 1);
     args = spy_inserted.takeFirst();
     QCOMPARE(args.at(0).toModelIndex(), QModelIndex());
     QCOMPARE(args.at(1).toInt(), 6);
     QCOMPARE(args.at(2).toInt(), 6);
     QCOMPARE(spy_removed.count(), 0);
 
     KBookmark seventh = root.first();
     for (int i = 0; i < 6; i++) {
         seventh = root.next(seventh);
     }
     root.moveBookmark(device, seventh);
     bookmarkManager->emitChanged(root);
 
     urls.clear();
-    urls << QDir::homePath() << QStringLiteral(KDE_ROOT_PATH) << QStringLiteral("trash:/")
-         << QStringLiteral("remote:/")
-         << QStringLiteral("/media/nfs") << QStringLiteral("/foreign")
-         << QStringLiteral("/media/floppy0") << QStringLiteral("/media/XO-Y4") << QStringLiteral("/media/cdrom");
+    urls << initialListOfPlaces()
+         << initialListOfShared()
+         << initialListOfDevices()
+         << initialListOfRemovableDevices();
     CHECK_PLACES_URLS(urls);
     QCOMPARE(spy_inserted.count(), 1);
     args = spy_inserted.takeFirst();
     QCOMPARE(args.at(0).toModelIndex(), QModelIndex());
     QCOMPARE(args.at(1).toInt(), 7);
     QCOMPARE(args.at(2).toInt(), 7);
     QCOMPARE(spy_removed.count(), 1);
     args = spy_removed.takeFirst();
     QCOMPARE(args.at(0).toModelIndex(), QModelIndex());
     QCOMPARE(args.at(1).toInt(), 6);
     QCOMPARE(args.at(2).toInt(), 6);
 }
 
 void KFilePlacesModelTest::testDeviceSetupTeardown()
 {
     QList<QVariant> args;
     QSignalSpy spy_changed(m_places, SIGNAL(dataChanged(QModelIndex,QModelIndex)));
 
     fakeDevice(QStringLiteral("/org/kde/solid/fakehw/volume_part1_size_993284096/StorageAccess"))->call(QStringLiteral("teardown"));
 
     QCOMPARE(spy_changed.count(), 1);
     args = spy_changed.takeFirst();
     QCOMPARE(args.at(0).toModelIndex().row(), 7);
     QCOMPARE(args.at(1).toModelIndex().row(), 7);
 
     fakeDevice(QStringLiteral("/org/kde/solid/fakehw/volume_part1_size_993284096/StorageAccess"))->call(QStringLiteral("setup"));
 
     QCOMPARE(spy_changed.count(), 1);
     args = spy_changed.takeFirst();
     QCOMPARE(args.at(0).toModelIndex().row(), 7);
     QCOMPARE(args.at(1).toModelIndex().row(), 7);
 }
 
 void KFilePlacesModelTest::testEnableBaloo()
 {
     KConfig config(QStringLiteral("baloofilerc"));
     KConfigGroup basicSettings = config.group("Basic Settings");
     basicSettings.writeEntry("Indexing-Enabled", true);
     config.sync();
 
     KFilePlacesModel places_with_baloo;
     QStringList urls;
      for (int row = 0; row < places_with_baloo.rowCount(); ++row) {
          QModelIndex index = places_with_baloo.index(row, 0);
          urls << places_with_baloo.url(index).toDisplayString(QUrl::PreferLocalFile);
     }
 
     QVERIFY(urls.contains("timeline:/today"));
     QVERIFY(urls.contains("timeline:/yesterday"));
     QVERIFY(urls.contains("timeline:/thismonth"));
     QVERIFY(urls.contains("timeline:/lastmonth"));
 
     QVERIFY(urls.contains("search:/documents"));
     QVERIFY(urls.contains("search:/images"));
     QVERIFY(urls.contains("search:/audio"));
     QVERIFY(urls.contains("search:/videos"));
 }
 
 void KFilePlacesModelTest::testRemoteUrls_data()
 {
     QTest::addColumn<QUrl>("url");
     QTest::addColumn<int>("expectedRow");
     QTest::addColumn<QString>("expectedGroup");
 
      QTest::newRow("Ftp") << QUrl(QStringLiteral("ftp://192.168.1.1/ftp")) << 4 << QStringLiteral("Remote");
      QTest::newRow("Samba") << QUrl(QStringLiteral("smb://192.168.1.1/share")) << 4 << QStringLiteral("Remote");
      QTest::newRow("Sftp") << QUrl(QStringLiteral("sftp://192.168.1.1/share")) << 4 << QStringLiteral("Remote");
      QTest::newRow("Fish") << QUrl(QStringLiteral("fish://192.168.1.1/share")) << 4 << QStringLiteral("Remote");
      QTest::newRow("Webdav") << QUrl(QStringLiteral("webdav://192.168.1.1/share")) << 4 << QStringLiteral("Remote");
 }
 
 void KFilePlacesModelTest::testRemoteUrls()
 {
     QFETCH(QUrl, url);
     QFETCH(int, expectedRow);
     QFETCH(QString, expectedGroup);
 
     QList<QVariant> args;
     QSignalSpy spy_inserted(m_places, SIGNAL(rowsInserted(QModelIndex,int,int)));
 
     // insert a new network url
     m_places->addPlace(QStringLiteral("My Shared"), url, QString(), QString(), QModelIndex());
 
     // check if url list is correct after insertion
     QStringList urls;
     urls << QDir::homePath() << QStringLiteral(KDE_ROOT_PATH) << QStringLiteral("trash:/") // places
          << QStringLiteral("remote:/") << url.toString()
          << QStringLiteral("/media/nfs") << QStringLiteral("/foreign")
          << QStringLiteral("/media/floppy0")  << QStringLiteral("/media/XO-Y4") << QStringLiteral("/media/cdrom");
     CHECK_PLACES_URLS(urls);
 
     // check if the new url was inserted in the right position (end of "Remote" section)
     QTRY_COMPARE(spy_inserted.count(), 1);
     args = spy_inserted.takeFirst();
     QCOMPARE(args.at(0).toModelIndex(), QModelIndex());
     QCOMPARE(args.at(1).toInt(), expectedRow);
     QCOMPARE(args.at(2).toInt(), expectedRow);
 
     // check if the new url has the right group "Remote"
     const QModelIndex index = m_places->index(expectedRow, 0);
     QCOMPARE(index.data(KFilePlacesModel::GroupRole).toString(), expectedGroup);
 
     m_places->removePlace(index);
 }
 
 void KFilePlacesModelTest::testRefresh()
 {
     KBookmarkManager *bookmarkManager = KBookmarkManager::managerForFile(bookmarksFile(), QStringLiteral("kfilePlaces"));
     KBookmarkGroup root = bookmarkManager->root();
     KBookmark homePlace = root.first();
     const QModelIndex homePlaceIndex = m_places->index(0, 0);
 
     QCOMPARE(m_places->text(homePlaceIndex), homePlace.fullText());
 
     // modify bookmark
     homePlace.setFullText("Test change the text");
     QVERIFY(m_places->text(homePlaceIndex) != homePlace.fullText());
 
     // reload bookmark data
     m_places->refresh();
     QCOMPARE(m_places->text(homePlaceIndex), homePlace.fullText());
 }
 
 void KFilePlacesModelTest::testConvertedUrl_data()
 {
     QTest::addColumn<QUrl>("url");
     QTest::addColumn<QUrl>("expectedUrl");
 
     // places
     QTest::newRow("Places - Home") << QUrl::fromLocalFile(QDir::homePath())
                                    << QUrl::fromLocalFile(QDir::homePath());
 
     // baloo -search
     const QString jsonQuery(QStringLiteral("{\"dayFilter\": 0,\
                                              \"monthFilter\": 0, \
                                              \"yearFilter\": 0, \
                                              \"type\": [ \"Document\"]}"));
     QUrl url;
     url.setScheme(QStringLiteral("baloosearch"));
     QUrlQuery urlQuery;
     urlQuery.addQueryItem(QStringLiteral("json"), jsonQuery.simplified());
     url.setQuery(urlQuery);
 
     QTest::newRow("Baloo - Documents") << QUrl("search:/documents")
                                        << url;
 
     // baloo - timeline
     const QDate lasMonthDate = QDate::currentDate().addMonths(-1);
     QTest::newRow("Baloo - Last Month") << QUrl("timeline:/lastmonth")
                                         << QUrl(QString("timeline:/%1-%2").arg(lasMonthDate.year()).arg(lasMonthDate.month()));
 
     // devices
     QTest::newRow("Devices - Floppy") << QUrl("file:///media/floppy0")
                                       << QUrl("file:///media/floppy0");
 }
 
 void KFilePlacesModelTest::testConvertedUrl()
 {
     QFETCH(QUrl, url);
     QFETCH(QUrl, expectedUrl);
 
     const QUrl convertedUrl = KFilePlacesModel::convertedUrl(url);
 
     QCOMPARE(expectedUrl.scheme(), convertedUrl.scheme());
     QCOMPARE(expectedUrl.path(), convertedUrl.path());
     QCOMPARE(expectedUrl, convertedUrl);
 }
 
 void KFilePlacesModelTest::testBookmarkObject()
 {
     //make sure that all items return a valid bookmark
     for (int row = 0; row < m_places->rowCount(); row++) {
         const QModelIndex index = m_places->index(row, 0);
         const KBookmark bookmark = m_places->bookmarkForIndex(index);
         QVERIFY(!bookmark.isNull());
     }
 }
 
 void KFilePlacesModelTest::testDataChangedSignal()
 {
     QSignalSpy dataChangedSpy(m_places, &KFilePlacesModel::dataChanged);
 
     const QModelIndex index = m_places->index(1, 0);
     const KBookmark bookmark = m_places->bookmarkForIndex(index);
 
     // call function with the same data
     m_places->editPlace(index, bookmark.fullText(), bookmark.url(), bookmark.icon(), bookmark.metaDataItem(QStringLiteral("OnlyInApp")));
     QCOMPARE(dataChangedSpy.count(), 0);
 
     // call function with different data
     const QString originalText = bookmark.fullText();
     m_places->editPlace(index, QStringLiteral("My text"), bookmark.url(), bookmark.icon(), bookmark.metaDataItem(QStringLiteral("OnlyInApp")));
     QCOMPARE(dataChangedSpy.count(), 1);
     QList<QVariant> args = dataChangedSpy.takeFirst();
     QCOMPARE(args.at(0).toModelIndex().row(), 1);
     QCOMPARE(args.at(0).toModelIndex().column(), 0);
     QCOMPARE(args.at(1).toModelIndex().row(), 1);
     QCOMPARE(args.at(1).toModelIndex().column(), 0);
     QCOMPARE(m_places->text(index), QStringLiteral("My text"));
 
     // restore original value
     dataChangedSpy.clear();
     m_places->editPlace(index, originalText, bookmark.url(), bookmark.icon(), bookmark.metaDataItem(QStringLiteral("OnlyInApp")));
     QCOMPARE(dataChangedSpy.count(), 1);
 }
 
 void KFilePlacesModelTest::testIconRole_data()
 {
     QTest::addColumn<QModelIndex>("index");
     QTest::addColumn<QString>("expectedIconName");
 
     // places
     QTest::newRow("Places - Home") << m_places->index(0, 0)
                                    << QStringLiteral("user-home");
     QTest::newRow("Places - Root") << m_places->index(1, 0)
                                    << QStringLiteral("folder-red");
     QTest::newRow("Places - Trash") << m_places->index(2, 0)
-                                   << QStringLiteral("user-trash-full");
+                                   << QStringLiteral("user-trash");
     QTest::newRow("Remote - Network") << m_places->index(3, 0)
                                     << QStringLiteral("network-workgroup");
     QTest::newRow("Devices - Nfs") << m_places->index(4, 0)
                                     << QStringLiteral("hwinfo");
     QTest::newRow("Devices - foreign") << m_places->index(5, 0)
                                     << QStringLiteral("blockdevice");
     QTest::newRow("Devices - Floppy") << m_places->index(6, 0)
                                     << QStringLiteral("blockdevice");
     QTest::newRow("Devices - cdrom") << m_places->index(7, 0)
                                     << QStringLiteral("blockdevice");
 }
 
 void KFilePlacesModelTest::testIconRole()
 {
     QFETCH(QModelIndex, index);
     QFETCH(QString, expectedIconName);
 
     QCOMPARE(index.data(KFilePlacesModel::IconNameRole).toString(), expectedIconName);
 }
 
 void KFilePlacesModelTest::testMoveFunction()
 {
     QList<QVariant> args;
     QStringList urls = initialListOfUrls();
     QSignalSpy rowsMoved(m_places, &KFilePlacesModel::rowsMoved);
 
     // move item 0 to pos 2
     QVERIFY(m_places->movePlace(0, 3));
     urls.move(0, 2);
     QTRY_COMPARE(rowsMoved.count(), 1);
     args = rowsMoved.takeFirst();
     QCOMPARE(args.at(1).toInt(), 0); // start
     QCOMPARE(args.at(2).toInt(), 0); // end
     QCOMPARE(args.at(4).toInt(), 3); // row (destination)
     QCOMPARE(placesUrls(), urls);
     rowsMoved.clear();
 
     // move it back
     QVERIFY(m_places->movePlace(2, 0));
     urls.move(2, 0);
     QTRY_COMPARE(rowsMoved.count(), 1);
     args = rowsMoved.takeFirst();
     QCOMPARE(args.at(1).toInt(), 2); // start
     QCOMPARE(args.at(2).toInt(), 2); // end
     QCOMPARE(args.at(4).toInt(), 0); // row (destination)
     QCOMPARE(placesUrls(), urls);
     rowsMoved.clear();
 
     // target position is greater than model rows
     // will move to the end of the first group
     QVERIFY(m_places->movePlace(0, 20));
     urls.move(0, 2);
     QTRY_COMPARE(rowsMoved.count(), 1);
     args = rowsMoved.takeFirst();
     QCOMPARE(args.at(1).toInt(), 0); // start
     QCOMPARE(args.at(2).toInt(), 0); // end
     QCOMPARE(args.at(4).toInt(), 3); // row (destination)
     QCOMPARE(placesUrls(), urls);
     rowsMoved.clear();
 
     // move it back
     QVERIFY(m_places->movePlace(2, 0));
     urls.move(2, 0);
     QTRY_COMPARE(rowsMoved.count(), 1);
     args = rowsMoved.takeFirst();
     QCOMPARE(args.at(1).toInt(), 2); // start
     QCOMPARE(args.at(2).toInt(), 2); // end
     QCOMPARE(args.at(4).toInt(), 0); // row (destination)
     QCOMPARE(placesUrls(), urls);
     rowsMoved.clear();
 
     QVERIFY(m_places->movePlace(8, 6));
     urls.move(8, 6);
     QTRY_COMPARE(rowsMoved.count(), 1);
     args = rowsMoved.takeFirst();
     QCOMPARE(args.at(1).toInt(), 8); // start
     QCOMPARE(args.at(2).toInt(), 8); // end
     QCOMPARE(args.at(4).toInt(), 6); // row (destination)
     QCOMPARE(placesUrls(), urls);
     rowsMoved.clear();
 
     // move it back
     QVERIFY(m_places->movePlace(6, 9));
     urls.move(6, 8);
     QTRY_COMPARE(rowsMoved.count(), 1);
     args = rowsMoved.takeFirst();
     QCOMPARE(args.at(1).toInt(), 6); // start
     QCOMPARE(args.at(2).toInt(), 6); // end
     QCOMPARE(args.at(4).toInt(), 9); // row (destination)
     QCOMPARE(placesUrls(), urls);
     rowsMoved.clear();
 
     //use a invalid start position
     QVERIFY(!m_places->movePlace(100, 20));
     QCOMPARE(rowsMoved.count(), 0);
 
     //use same start and target position
     QVERIFY(!m_places->movePlace(1, 1));
     QCOMPARE(rowsMoved.count(), 0);
 }
 
 QTEST_MAIN(KFilePlacesModelTest)
 
 #include "kfileplacesmodeltest.moc"