Merge branch 'Applications/15.08'

diff --combined src/views/dolphinview.cpp
index ba6d7188de6c27bed57e52f9576b7b896daf152b,07b40dceb039cca26fb815072571191921f37d5b..5023859df789bcfdd0a152d380a1aa931e1d762d
--- 1/src/views/dolphinview.cpp
--- 2/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@@ -77,7 -77,7 +77,7 @@@
  
  namespace {
      const int MaxModeEnum = DolphinView::CompactView;
 -};
 +}
  
  DolphinView::DolphinView(const QUrl& url, QWidget* parent) :
      QWidget(parent),
@@@ -177,8 -177,8 +177,8 @@@
              this, &DolphinView::slotVisibleRolesChangedByHeader);
      connect(m_view, &DolphinItemListView::roleEditingCanceled,
              this, &DolphinView::slotRoleEditingCanceled);
-     connect(m_view->header(), &KItemListHeader::columnWidthChanged,
-             this, &DolphinView::slotHeaderColumnWidthChanged);
+     connect(m_view->header(), &KItemListHeader::columnWidthChangeFinished,
+             this, &DolphinView::slotHeaderColumnWidthChangeFinished);
  
      KItemListSelectionManager* selectionManager = controller->selectionManager();
      connect(selectionManager, &KItemListSelectionManager::selectionChanged,
@@@ -971,10 -971,8 +971,8 @@@ void DolphinView::slotHeaderContextMenu
      delete menu;
  }
  
- void DolphinView::slotHeaderColumnWidthChanged(const QByteArray& role, qreal current, qreal previous)
+ void DolphinView::slotHeaderColumnWidthChangeFinished(const QByteArray& role, qreal current)
  {
-     Q_UNUSED(previous);
- 
      const QList<QByteArray> visibleRoles = m_view->visibleRoles();
  
      ViewProperties props(viewPropertiesUrl());