From: Frank Reininghaus <frank78ac@googlemail.com>
Date: Thu, 3 Sep 2015 18:33:48 +0000 (+0200)
Subject: Merge branch 'Applications/15.08'
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/d4fafe529026d23f900c11f28f31e197bb6dc96c?hp=-c

Merge branch 'Applications/15.08'
---

d4fafe529026d23f900c11f28f31e197bb6dc96c
diff --combined src/views/dolphinview.cpp
index ba6d7188d,07b40dceb..5023859df
--- a/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());