From: Frank Reininghaus <frank78ac@googlemail.com>
Date: Sun, 10 Feb 2013 18:27:21 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/KDE/4.10'
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/ced9de5b82046d6eb6f6b828fa9bbc874bbea857?hp=-c

Merge remote-tracking branch 'origin/KDE/4.10'
---

ced9de5b82046d6eb6f6b828fa9bbc874bbea857
diff --combined src/panels/folders/folderspanel.cpp
index 8ce853a2a,98c06fb35..46c1b3450
--- a/src/panels/folders/folderspanel.cpp
+++ b/src/panels/folders/folderspanel.cpp
@@@ -152,7 -152,7 +152,7 @@@ void FoldersPanel::showEvent(QShowEvent
          m_controller->setAutoActivationBehavior(KItemListController::ExpansionOnly);
          m_controller->setMouseDoubleClickAction(KItemListController::ActivateAndExpandItem);
          m_controller->setAutoActivationDelay(750);
-         m_controller->setSingleClickActivation(true);
+         m_controller->setSingleClickActivationEnforced(true);
  
          connect(m_controller, SIGNAL(itemActivated(int)), this, SLOT(slotItemActivated(int)));
          connect(m_controller, SIGNAL(itemMiddleClicked(int)), this, SLOT(slotItemMiddleClicked(int)));
@@@ -236,8 -236,7 +236,8 @@@ void FoldersPanel::slotItemDropEvent(in
                               event->buttons(),
                               event->modifiers());
  
 -        const QString error = DragAndDropHelper::dropUrls(destItem, destItem.url(), &dropEvent);
 +        QString error;
 +        DragAndDropHelper::dropUrls(destItem, destItem.url(), &dropEvent, error);
          if (!error.isEmpty()) {
              emit errorMessage(error);
          }
diff --combined src/panels/places/placespanel.cpp
index 9f9306946,919f2ed45..e23732c97
--- a/src/panels/places/placespanel.cpp
+++ b/src/panels/places/placespanel.cpp
@@@ -110,7 -110,7 +110,7 @@@ void PlacesPanel::showEvent(QShowEvent
  
          m_controller = new KItemListController(m_model, m_view, this);
          m_controller->setSelectionBehavior(KItemListController::SingleSelection);
-         m_controller->setSingleClickActivation(true);
+         m_controller->setSingleClickActivationEnforced(true);
  
  	readSettings();
  
@@@ -352,11 -352,7 +352,11 @@@ void PlacesPanel::slotItemDropEvent(in
                           event->buttons(),
                           event->modifiers());
  
 -    DragAndDropHelper::dropUrls(KFileItem(), destUrl, &dropEvent);
 +    QString error;
 +    DragAndDropHelper::dropUrls(KFileItem(), destUrl, &dropEvent, error);
 +    if (!error.isEmpty()) {
 +        emit errorMessage(error);
 +    }
  }
  
  void PlacesPanel::slotItemDropEventStorageSetupDone(int index, bool success)
@@@ -368,11 -364,7 +368,11 @@@
          if (success) {
              KUrl destUrl = m_model->placesItem(index)->url();
  
 -            DragAndDropHelper::dropUrls(KFileItem(), destUrl, m_itemDropEvent);
 +            QString error;
 +            DragAndDropHelper::dropUrls(KFileItem(), destUrl, m_itemDropEvent, error);
 +            if (!error.isEmpty()) {
 +                emit errorMessage(error);
 +            }
          }
  
          delete m_itemDropEventMimeData;
@@@ -392,8 -384,7 +392,8 @@@ void PlacesPanel::slotAboveItemDropEven
  void PlacesPanel::slotUrlsDropped(const KUrl& dest, QDropEvent* event, QWidget* parent)
  {
      Q_UNUSED(parent);
 -    const QString error = DragAndDropHelper::dropUrls(KFileItem(), dest, event);
 +    QString error;
 +    DragAndDropHelper::dropUrls(KFileItem(), dest, event, error);
      if (!error.isEmpty()) {
          emit errorMessage(error);
      }