Merge remote-tracking branch 'origin/master' into frameworks

Conflicts:
	lib/konq/konq_operations.cpp

diff --combined src/kitemviews/kitemlistview.cpp
index 0090f8620c90fa34cb90c092d06208ebcfb129f6,222a29cf519f22aee13aaf740de27baae6e5443d..5ef1695e0395f30abc4e22447462267c884b8bd9
--- 1/src/kitemviews/kitemlistview.cpp
--- 2/src/kitemviews/kitemlistview.cpp
+++ b/src/kitemviews/kitemlistview.cpp
@@@ -46,12 -46,7 +46,12 @@@
  
  #include <algorithm>
  
 +#if 0
  #include "kitemlistviewaccessible.h"
 +#else
 +#define QT_NO_ACCESSIBILITY 1
 +#pragma message("TODO: port accessibility to Qt5")
 +#endif
  
  namespace {
      // Time in ms until reaching the autoscroll margin triggers
@@@ -119,16 -114,16 +119,16 @@@ KItemListView::KItemListView(QGraphicsW
      m_layouter = new KItemListViewLayouter(m_sizeHintResolver, this);
  
      m_animation = new KItemListViewAnimation(this);
 -    connect(m_animation, SIGNAL(finished(QGraphicsWidget*,KItemListViewAnimation::AnimationType)),
 -            this, SLOT(slotAnimationFinished(QGraphicsWidget*,KItemListViewAnimation::AnimationType)));
 +    connect(m_animation, &KItemListViewAnimation::finished,
 +            this, &KItemListView::slotAnimationFinished);
  
      m_layoutTimer = new QTimer(this);
      m_layoutTimer->setInterval(300);
      m_layoutTimer->setSingleShot(true);
 -    connect(m_layoutTimer, SIGNAL(timeout()), this, SLOT(slotLayoutTimerFinished()));
 +    connect(m_layoutTimer, &QTimer::timeout, this, &KItemListView::slotLayoutTimerFinished);
  
      m_rubberBand = new KItemListRubberBand(this);
 -    connect(m_rubberBand, SIGNAL(activationChanged(bool)), this, SLOT(slotRubberBandActivationChanged(bool)));
 +    connect(m_rubberBand, &KItemListRubberBand::activationChanged, this, &KItemListView::slotRubberBandActivationChanged);
  
      m_headerWidget = new KItemListHeaderWidget(this);
      m_headerWidget->setVisible(false);
@@@ -272,7 -267,7 +272,7 @@@ void KItemListView::setAutoScroll(bool 
      if (enabled && !m_autoScrollTimer) {
          m_autoScrollTimer = new QTimer(this);
          m_autoScrollTimer->setSingleShot(true);
 -        connect(m_autoScrollTimer, SIGNAL(timeout()), this, SLOT(triggerAutoScrolling()));
 +        connect(m_autoScrollTimer, &QTimer::timeout, this, &KItemListView::triggerAutoScrolling);
          m_autoScrollTimer->start(InitialAutoScrollDelay);
      } else if (!enabled && m_autoScrollTimer) {
          delete m_autoScrollTimer;
@@@ -577,26 -572,26 +577,26 @@@ void KItemListView::setHeaderVisible(bo
          m_headerWidget->setColumns(m_visibleRoles);
          m_headerWidget->setZValue(1);
  
 -        connect(m_headerWidget, SIGNAL(columnWidthChanged(QByteArray,qreal,qreal)),
 -                this, SLOT(slotHeaderColumnWidthChanged(QByteArray,qreal,qreal)));
 -        connect(m_headerWidget, SIGNAL(columnMoved(QByteArray,int,int)),
 -                this, SLOT(slotHeaderColumnMoved(QByteArray,int,int)));
 -        connect(m_headerWidget, SIGNAL(sortOrderChanged(Qt::SortOrder,Qt::SortOrder)),
 -                this, SIGNAL(sortOrderChanged(Qt::SortOrder,Qt::SortOrder)));
 -        connect(m_headerWidget, SIGNAL(sortRoleChanged(QByteArray,QByteArray)),
 -                this, SIGNAL(sortRoleChanged(QByteArray,QByteArray)));
 +        connect(m_headerWidget, &KItemListHeaderWidget::columnWidthChanged,
 +                this, &KItemListView::slotHeaderColumnWidthChanged);
 +        connect(m_headerWidget, &KItemListHeaderWidget::columnMoved,
 +                this, &KItemListView::slotHeaderColumnMoved);
 +        connect(m_headerWidget, &KItemListHeaderWidget::sortOrderChanged,
 +                this, &KItemListView::sortOrderChanged);
 +        connect(m_headerWidget, &KItemListHeaderWidget::sortRoleChanged,
 +                this, &KItemListView::sortRoleChanged);
  
          m_layouter->setHeaderHeight(headerSize.height());
          m_headerWidget->setVisible(true);
      } else if (!visible && m_headerWidget->isVisible()) {
 -        disconnect(m_headerWidget, SIGNAL(columnWidthChanged(QByteArray,qreal,qreal)),
 -                   this, SLOT(slotHeaderColumnWidthChanged(QByteArray,qreal,qreal)));
 -        disconnect(m_headerWidget, SIGNAL(columnMoved(QByteArray,int,int)),
 -                   this, SLOT(slotHeaderColumnMoved(QByteArray,int,int)));
 -        disconnect(m_headerWidget, SIGNAL(sortOrderChanged(Qt::SortOrder,Qt::SortOrder)),
 -                   this, SIGNAL(sortOrderChanged(Qt::SortOrder,Qt::SortOrder)));
 -        disconnect(m_headerWidget, SIGNAL(sortRoleChanged(QByteArray,QByteArray)),
 -                   this, SIGNAL(sortRoleChanged(QByteArray,QByteArray)));
 +        disconnect(m_headerWidget, &KItemListHeaderWidget::columnWidthChanged,
 +                   this, &KItemListView::slotHeaderColumnWidthChanged);
 +        disconnect(m_headerWidget, &KItemListHeaderWidget::columnMoved,
 +                   this, &KItemListView::slotHeaderColumnMoved);
 +        disconnect(m_headerWidget, &KItemListHeaderWidget::sortOrderChanged,
 +                   this, &KItemListView::sortOrderChanged);
 +        disconnect(m_headerWidget, &KItemListHeaderWidget::sortRoleChanged,
 +                   this, &KItemListView::sortRoleChanged);
  
          m_layouter->setHeaderHeight(0);
          m_headerWidget->setVisible(false);
@@@ -642,10 -637,10 +642,10 @@@ void KItemListView::editRole(int index
      m_editingRole = true;
      widget->setEditedRole(role);
  
 -    connect(widget, SIGNAL(roleEditingCanceled(int,QByteArray,QVariant)),
 -            this, SLOT(slotRoleEditingCanceled(int,QByteArray,QVariant)));
 -    connect(widget, SIGNAL(roleEditingFinished(int,QByteArray,QVariant)),
 -            this, SLOT(slotRoleEditingFinished(int,QByteArray,QVariant)));
 +    connect(widget, &KItemListWidget::roleEditingCanceled,
 +            this, &KItemListView::slotRoleEditingCanceled);
 +    connect(widget, &KItemListWidget::roleEditingFinished,
 +            this, &KItemListView::slotRoleEditingFinished);
  }
  
  void KItemListView::paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget)
@@@ -1053,11 -1048,17 +1053,17 @@@ void KItemListView::slotItemsInserted(c
                                                (!verticalScrollOrientation && maximumScrollOffset() > size().width());
              if (decreaseLayouterSize) {
                  const int scrollBarExtent = style()->pixelMetric(QStyle::PM_ScrollBarExtent);
+ 
+                 int scrollbarSpacing = 0;
+                 if (style()->styleHint(QStyle::SH_ScrollView_FrameOnlyAroundContents)) {
+                     scrollbarSpacing = style()->pixelMetric(QStyle::PM_ScrollView_ScrollBarSpacing);
+                 }
+ 
                  QSizeF layouterSize = m_layouter->size();
                  if (verticalScrollOrientation) {
-                     layouterSize.rwidth() -= scrollBarExtent;
+                     layouterSize.rwidth() -= scrollBarExtent + scrollbarSpacing;
                  } else {
-                     layouterSize.rheight() -= scrollBarExtent;
+                     layouterSize.rheight() -= scrollBarExtent + scrollbarSpacing;
                  }
                  m_layouter->setSize(layouterSize);
              }
@@@ -1268,8 -1269,7 +1274,8 @@@ void KItemListView::slotItemsChanged(co
              doLayout(NoAnimation);
          }
      }
 -    QAccessible::updateAccessibility(this, 0, QAccessible::TableModelChanged);
 +#pragma message("TODO: port accessibility otherwise the following line asserts")
 +    //QAccessible::updateAccessibility(this, 0, QAccessible::TableModelChanged);
  }
  
  void KItemListView::slotGroupsChanged()
@@@ -1341,8 -1341,7 +1347,8 @@@ void KItemListView::slotCurrentChanged(
      if (currentWidget) {
          currentWidget->setCurrent(true);
      }
 -    QAccessible::updateAccessibility(this, current+1, QAccessible::Focus);
 +#pragma message("TODO: port accessibility otherwise the following line asserts")
 +    //QAccessible::updateAccessibility(this, current+1, QAccessible::Focus);
  }
  
  void KItemListView::slotSelectionChanged(const KItemSet& current, const KItemSet& previous)
@@@ -1409,12 -1408,12 +1415,12 @@@ void KItemListView::slotRubberBandPosCh
  void KItemListView::slotRubberBandActivationChanged(bool active)
  {
      if (active) {
 -        connect(m_rubberBand, SIGNAL(startPositionChanged(QPointF,QPointF)), this, SLOT(slotRubberBandPosChanged()));
 -        connect(m_rubberBand, SIGNAL(endPositionChanged(QPointF,QPointF)), this, SLOT(slotRubberBandPosChanged()));
 +        connect(m_rubberBand, &KItemListRubberBand::startPositionChanged, this, &KItemListView::slotRubberBandPosChanged);
 +        connect(m_rubberBand, &KItemListRubberBand::endPositionChanged, this, &KItemListView::slotRubberBandPosChanged);
          m_skipAutoScrollForRubberBand = true;
      } else {
 -        disconnect(m_rubberBand, SIGNAL(startPositionChanged(QPointF,QPointF)), this, SLOT(slotRubberBandPosChanged()));
 -        disconnect(m_rubberBand, SIGNAL(endPositionChanged(QPointF,QPointF)), this, SLOT(slotRubberBandPosChanged()));
 +        disconnect(m_rubberBand, &KItemListRubberBand::startPositionChanged, this, &KItemListView::slotRubberBandPosChanged);
 +        disconnect(m_rubberBand, &KItemListRubberBand::endPositionChanged, this, &KItemListView::slotRubberBandPosChanged);
          m_skipAutoScrollForRubberBand = false;
      }
  
@@@ -1541,16 -1540,16 +1547,16 @@@ void KItemListView::setController(KItem
          KItemListController* previous = m_controller;
          if (previous) {
              KItemListSelectionManager* selectionManager = previous->selectionManager();
 -            disconnect(selectionManager, SIGNAL(currentChanged(int,int)), this, SLOT(slotCurrentChanged(int,int)));
 -            disconnect(selectionManager, SIGNAL(selectionChanged(KItemSet,KItemSet)), this, SLOT(slotSelectionChanged(KItemSet,KItemSet)));
 +            disconnect(selectionManager, &KItemListSelectionManager::currentChanged, this, &KItemListView::slotCurrentChanged);
 +            disconnect(selectionManager, &KItemListSelectionManager::selectionChanged, this, &KItemListView::slotSelectionChanged);
          }
  
          m_controller = controller;
  
          if (controller) {
              KItemListSelectionManager* selectionManager = controller->selectionManager();
 -            connect(selectionManager, SIGNAL(currentChanged(int,int)), this, SLOT(slotCurrentChanged(int,int)));
 -            connect(selectionManager, SIGNAL(selectionChanged(KItemSet,KItemSet)), this, SLOT(slotSelectionChanged(KItemSet,KItemSet)));
 +            connect(selectionManager, &KItemListSelectionManager::currentChanged, this, &KItemListView::slotCurrentChanged);
 +            connect(selectionManager, &KItemListSelectionManager::selectionChanged, this, &KItemListView::slotSelectionChanged);
          }
  
          onControllerChanged(controller, previous);
@@@ -1566,22 -1565,22 +1572,22 @@@ void KItemListView::setModel(KItemModel
      KItemModelBase* previous = m_model;
  
      if (m_model) {
 -        disconnect(m_model, SIGNAL(itemsChanged(KItemRangeList,QSet<QByteArray>)),
 -                   this,    SLOT(slotItemsChanged(KItemRangeList,QSet<QByteArray>)));
 -        disconnect(m_model, SIGNAL(itemsInserted(KItemRangeList)),
 -                   this,    SLOT(slotItemsInserted(KItemRangeList)));
 -        disconnect(m_model, SIGNAL(itemsRemoved(KItemRangeList)),
 -                   this,    SLOT(slotItemsRemoved(KItemRangeList)));
 -        disconnect(m_model, SIGNAL(itemsMoved(KItemRange,QList<int>)),
 -                   this,    SLOT(slotItemsMoved(KItemRange,QList<int>)));
 -        disconnect(m_model, SIGNAL(groupsChanged()),
 -                   this,    SLOT(slotGroupsChanged()));
 -        disconnect(m_model, SIGNAL(groupedSortingChanged(bool)),
 -                   this,    SLOT(slotGroupedSortingChanged(bool)));
 -        disconnect(m_model, SIGNAL(sortOrderChanged(Qt::SortOrder,Qt::SortOrder)),
 -                   this,    SLOT(slotSortOrderChanged(Qt::SortOrder,Qt::SortOrder)));
 -        disconnect(m_model, SIGNAL(sortRoleChanged(QByteArray,QByteArray)),
 -                   this,    SLOT(slotSortRoleChanged(QByteArray,QByteArray)));
 +        disconnect(m_model, &KItemModelBase::itemsChanged,
 +                   this,    &KItemListView::slotItemsChanged);
 +        disconnect(m_model, &KItemModelBase::itemsInserted,
 +                   this,    &KItemListView::slotItemsInserted);
 +        disconnect(m_model, &KItemModelBase::itemsRemoved,
 +                   this,    &KItemListView::slotItemsRemoved);
 +        disconnect(m_model, &KItemModelBase::itemsMoved,
 +                   this,    &KItemListView::slotItemsMoved);
 +        disconnect(m_model, &KItemModelBase::groupsChanged,
 +                   this,    &KItemListView::slotGroupsChanged);
 +        disconnect(m_model, &KItemModelBase::groupedSortingChanged,
 +                   this,    &KItemListView::slotGroupedSortingChanged);
 +        disconnect(m_model, &KItemModelBase::sortOrderChanged,
 +                   this,    &KItemListView::slotSortOrderChanged);
 +        disconnect(m_model, &KItemModelBase::sortRoleChanged,
 +                   this,    &KItemListView::slotSortRoleChanged);
  
          m_sizeHintResolver->itemsRemoved(KItemRangeList() << KItemRange(0, m_model->count()));
      }
@@@ -1591,22 -1590,22 +1597,22 @@@
      m_grouped = model->groupedSorting();
  
      if (m_model) {
 -        connect(m_model, SIGNAL(itemsChanged(KItemRangeList,QSet<QByteArray>)),
 -                this,    SLOT(slotItemsChanged(KItemRangeList,QSet<QByteArray>)));
 -        connect(m_model, SIGNAL(itemsInserted(KItemRangeList)),
 -                this,    SLOT(slotItemsInserted(KItemRangeList)));
 -        connect(m_model, SIGNAL(itemsRemoved(KItemRangeList)),
 -                this,    SLOT(slotItemsRemoved(KItemRangeList)));
 -        connect(m_model, SIGNAL(itemsMoved(KItemRange,QList<int>)),
 -                this,    SLOT(slotItemsMoved(KItemRange,QList<int>)));
 -        connect(m_model, SIGNAL(groupsChanged()),
 -                this,    SLOT(slotGroupsChanged()));
 -        connect(m_model, SIGNAL(groupedSortingChanged(bool)),
 -                this,    SLOT(slotGroupedSortingChanged(bool)));
 -        connect(m_model, SIGNAL(sortOrderChanged(Qt::SortOrder,Qt::SortOrder)),
 -                this,    SLOT(slotSortOrderChanged(Qt::SortOrder,Qt::SortOrder)));
 -        connect(m_model, SIGNAL(sortRoleChanged(QByteArray,QByteArray)),
 -                this,    SLOT(slotSortRoleChanged(QByteArray,QByteArray)));
 +        connect(m_model, &KItemModelBase::itemsChanged,
 +                this,    &KItemListView::slotItemsChanged);
 +        connect(m_model, &KItemModelBase::itemsInserted,
 +                this,    &KItemListView::slotItemsInserted);
 +        connect(m_model, &KItemModelBase::itemsRemoved,
 +                this,    &KItemListView::slotItemsRemoved);
 +        connect(m_model, &KItemModelBase::itemsMoved,
 +                this,    &KItemListView::slotItemsMoved);
 +        connect(m_model, &KItemModelBase::groupsChanged,
 +                this,    &KItemListView::slotGroupsChanged);
 +        connect(m_model, &KItemModelBase::groupedSortingChanged,
 +                this,    &KItemListView::slotGroupedSortingChanged);
 +        connect(m_model, &KItemModelBase::sortOrderChanged,
 +                this,    &KItemListView::slotSortOrderChanged);
 +        connect(m_model, &KItemModelBase::sortRoleChanged,
 +                this,    &KItemListView::slotSortRoleChanged);
  
          const int itemCount = m_model->count();
          if (itemCount > 0) {
@@@ -2015,7 -2014,7 +2021,7 @@@ void KItemListView::updateGroupHeaderFo
          groupHeader = groupHeaderCreator()->create(this);
          groupHeader->setParentItem(widget);
          m_visibleGroups.insert(widget, groupHeader);
 -        connect(widget, SIGNAL(geometryChanged()), this, SLOT(slotGeometryOfGroupHeaderParentChanged()));
 +        connect(widget, &KItemListWidget::geometryChanged, this, &KItemListView::slotGeometryOfGroupHeaderParentChanged);
      }
      Q_ASSERT(groupHeader->parentItem() == widget);
  
@@@ -2062,7 -2061,7 +2068,7 @@@ void KItemListView::recycleGroupHeaderF
          header->setParentItem(0);
          groupHeaderCreator()->recycle(header);
          m_visibleGroups.remove(widget);
 -        disconnect(widget, SIGNAL(geometryChanged()), this, SLOT(slotGeometryOfGroupHeaderParentChanged()));
 +        disconnect(widget, &KItemListWidget::geometryChanged, this, &KItemListView::slotGeometryOfGroupHeaderParentChanged);
      }
  }
  
@@@ -2616,8 -2615,8 +2622,8 @@@ void KItemListView::disconnectRoleEditi
          return;
      }
  
 -    widget->disconnect(SIGNAL(roleEditingCanceled(int,QByteArray,QVariant)), this);
 -    widget->disconnect(SIGNAL(roleEditingFinished(int,QByteArray,QVariant)), this);
 +    disconnect(widget, &KItemListWidget::roleEditingCanceled, this, nullptr);
 +    disconnect(widget, &KItemListWidget::roleEditingFinished, this, nullptr);
  }
  
  int KItemListView::calculateAutoScrollingIncrement(int pos, int range, int oldInc)

diff --combined src/kitemviews/kitemlistwidget.cpp
index 38f9d00783b728dde89a7b1bc088175c07603a4e,c261bf1d259a02e04005751f6fd2799395b1100e..a703c2b23c9e3bfce88130a095996da15b6bf794
--- 1/src/kitemviews/kitemlistwidget.cpp
--- 2/src/kitemviews/kitemlistwidget.cpp
+++ b/src/kitemviews/kitemlistwidget.cpp
@@@ -252,7 -252,7 +252,7 @@@ void KItemListWidget::setHovered(bool h
          m_hoverAnimation = new QPropertyAnimation(this, "hoverOpacity", this);
          const int duration = (KGlobalSettings::graphicEffectsLevel() == KGlobalSettings::NoEffects) ? 1 : 200;
          m_hoverAnimation->setDuration(duration);
 -        connect(m_hoverAnimation, SIGNAL(finished()), this, SLOT(slotHoverAnimationFinished()));
 +        connect(m_hoverAnimation, &QPropertyAnimation::finished, this, &KItemListWidget::slotHoverAnimationFinished);
      }
      m_hoverAnimation->stop();
  
@@@ -282,7 -282,7 +282,7 @@@ bool KItemListWidget::isHovered() cons
  void KItemListWidget::setHoverPosition(const QPointF& pos)
  {
      if (m_selectionToggle) {
-         m_selectionToggle->setHovered(m_selectionToggle->contains(pos));
+         m_selectionToggle->setHovered(selectionToggleRect().contains(pos));
      }
  }