Merge branch 'master' into frameworks

diff --combined src/panels/places/placesitemmodel.cpp
index 8eb79a8a82f2cbdba8c2be32e76df7e60bf9fbd1,6accdc837070e7f8d350ee85b3588b1756d28de4..d59d0b03a08bef9c5c88cdc2d014cf3229144b9a
--- 1/src/panels/places/placesitemmodel.cpp
--- 2/src/panels/places/placesitemmodel.cpp
+++ b/src/panels/places/placesitemmodel.cpp
@@@ -30,12 -30,11 +30,12 @@@
  #include <KBookmarkManager>
  #include <KComponentData>
  #include <KDebug>
 -#include <KIcon>
 +#include <QIcon>
  #include <kprotocolinfo.h>
  #include <KLocale>
  #include <KStandardDirs>
  #include <KUser>
 +#include <KGlobal>
  #include "placesitem.h"
  #include <QAction>
  #include <QDate>
@@@ -53,8 -52,8 +53,8 @@@
  #include <views/viewproperties.h>
  
  #ifdef HAVE_BALOO
 -    #include <baloo/query.h>
 -    #include <baloo/indexerconfig.h>
 +    #include <Baloo/Query>
 +    #include <Baloo/IndexerConfig>
  #endif
  
  namespace {
@@@ -99,17 -98,17 +99,17 @@@ PlacesItemModel::PlacesItemModel(QObjec
      m_saveBookmarksTimer = new QTimer(this);
      m_saveBookmarksTimer->setInterval(syncBookmarksTimeout);
      m_saveBookmarksTimer->setSingleShot(true);
 -    connect(m_saveBookmarksTimer, SIGNAL(timeout()), this, SLOT(saveBookmarks()));
 +    connect(m_saveBookmarksTimer, &QTimer::timeout, this, &PlacesItemModel::saveBookmarks);
  
      m_updateBookmarksTimer = new QTimer(this);
      m_updateBookmarksTimer->setInterval(syncBookmarksTimeout);
      m_updateBookmarksTimer->setSingleShot(true);
 -    connect(m_updateBookmarksTimer, SIGNAL(timeout()), this, SLOT(updateBookmarks()));
 +    connect(m_updateBookmarksTimer, &QTimer::timeout, this, &PlacesItemModel::updateBookmarks);
  
 -    connect(m_bookmarkManager, SIGNAL(changed(QString,QString)),
 -            m_updateBookmarksTimer, SLOT(start()));
 -    connect(m_bookmarkManager, SIGNAL(bookmarksChanged(QString)),
 -            m_updateBookmarksTimer, SLOT(start()));
 +    connect(m_bookmarkManager, &KBookmarkManager::changed,
 +            m_updateBookmarksTimer, static_cast<void(QTimer::*)()>(&QTimer::start));
 +    connect(m_bookmarkManager, &KBookmarkManager::bookmarksChanged,
 +            m_updateBookmarksTimer, static_cast<void(QTimer::*)()>(&QTimer::start));
  }
  
  PlacesItemModel::~PlacesItemModel()
@@@ -255,7 -254,7 +255,7 @@@ QAction* PlacesItemModel::ejectAction(i
  {
      const PlacesItem* item = placesItem(index);
      if (item && item->device().is<Solid::OpticalDisc>()) {
 -        return new QAction(KIcon("media-eject"), i18nc("@item", "Eject '%1'", item->text()), 0);
 +        return new QAction(QIcon::fromTheme("media-eject"), i18nc("@item", "Eject '%1'", item->text()), 0);
      }
  
      return 0;
@@@ -304,7 -303,7 +304,7 @@@ QAction* PlacesItemModel::teardownActio
          return new QAction(text, 0);
      }
  
 -    return new QAction(KIcon(iconName), text, 0);
 +    return new QAction(QIcon::fromTheme(iconName), text, 0);
  }
  
  void PlacesItemModel::requestEject(int index)
@@@ -313,8 -312,9 +313,8 @@@
      if (item) {
          Solid::OpticalDrive* drive = item->device().parent().as<Solid::OpticalDrive>();
          if (drive) {
 -            connect(drive, SIGNAL(ejectDone(Solid::ErrorType,QVariant,QString)),
 -                    this, SLOT(slotStorageTeardownDone(Solid::ErrorType,QVariant)),
 -                    Qt::UniqueConnection);
 +            connect(drive, &Solid::OpticalDrive::ejectDone,
 +                    this, &PlacesItemModel::slotStorageTeardownDone);
              drive->eject();
          } else {
              const QString label = item->text();
@@@ -330,8 -330,9 +330,8 @@@ void PlacesItemModel::requestTeardown(i
      if (item) {
          Solid::StorageAccess* access = item->device().as<Solid::StorageAccess>();
          if (access) {
 -            connect(access, SIGNAL(teardownDone(Solid::ErrorType,QVariant,QString)),
 -                    this, SLOT(slotStorageTeardownDone(Solid::ErrorType,QVariant)),
 -                    Qt::UniqueConnection);
 +            connect(access, &Solid::StorageAccess::teardownDone,
 +                    this, &PlacesItemModel::slotStorageTeardownDone);
              access->teardown();
          }
      }
@@@ -359,8 -360,9 +359,8 @@@ void PlacesItemModel::requestStorageSet
  
          m_storageSetupInProgress[access] = index;
  
 -        connect(access, SIGNAL(setupDone(Solid::ErrorType,QVariant,QString)),
 -                this, SLOT(slotStorageSetupDone(Solid::ErrorType,QVariant,QString)),
 -                Qt::UniqueConnection);
 +        connect(access, &Solid::StorageAccess::setupDone,
 +                this, &PlacesItemModel::slotStorageSetupDone);
  
          access->setup();
      }
@@@ -433,8 -435,9 +433,9 @@@ void PlacesItemModel::dropMimeDataBefor
                  text = url.host();
              }
  
-             if (url.isLocalFile() && !QFileInfo(url.toLocalFile()).isDir()) {
-                 // Only directories are allowed
+             if ((url.isLocalFile() && !QFileInfo(url.toLocalFile()).isDir())
+                     || url.protocol() == "trash") {
+                 // Only directories outside the trash are allowed
                  continue;
              }
  
@@@ -599,6 -602,7 +600,6 @@@ void PlacesItemModel::slotStorageSetupD
  {
      Q_UNUSED(udi);
  
 -    Q_ASSERT(!m_storageSetupInProgress.isEmpty());
      const int index = m_storageSetupInProgress.take(sender());
      const PlacesItem*  item = placesItem(index);
      if (!item) {
@@@ -969,8 -973,8 +970,8 @@@ void PlacesItemModel::initializeAvailab
      Q_ASSERT(m_predicate.isValid());
  
      Solid::DeviceNotifier* notifier = Solid::DeviceNotifier::instance();
 -    connect(notifier, SIGNAL(deviceAdded(QString)),   this, SLOT(slotDeviceAdded(QString)));
 -    connect(notifier, SIGNAL(deviceRemoved(QString)), this, SLOT(slotDeviceRemoved(QString)));
 +    connect(notifier, &Solid::DeviceNotifier::deviceAdded,   this, &PlacesItemModel::slotDeviceAdded);
 +    connect(notifier, &Solid::DeviceNotifier::deviceRemoved, this, &PlacesItemModel::slotDeviceRemoved);
  
      const QList<Solid::Device>& deviceList = Solid::Device::listFromQuery(m_predicate);
      foreach (const Solid::Device& device, deviceList) {
@@@ -1228,3 -1232,4 +1229,3 @@@ void PlacesItemModel::showModelState(
  }
  #endif
  
 -#include "placesitemmodel.moc"