From 8453224119a4c5ff7d47d9cd4924d0b1ccb99b3a Mon Sep 17 00:00:00 2001
From: trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>
Date: Sat, 25 Nov 2017 18:00:06 +0000
Subject: copy 1.2 branch to trunk

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@7772 90c681e8-e032-0410-971d-27865f9a5e38
---
 src/plugins/General/streambrowser/streamwindow.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/plugins/General/streambrowser/streamwindow.cpp')

diff --git a/src/plugins/General/streambrowser/streamwindow.cpp b/src/plugins/General/streambrowser/streamwindow.cpp
index 7153abe48..c3132ed30 100644
--- a/src/plugins/General/streambrowser/streamwindow.cpp
+++ b/src/plugins/General/streambrowser/streamwindow.cpp
@@ -31,6 +31,7 @@
 #include <QMenu>
 #include <QXmlStreamReader>
 #include <QXmlStreamWriter>
+#include <algorithm>
 #include <qmmp/qmmpsettings.h>
 #include <qmmp/qmmp.h>
 #include <qmmpui/playlistmanager.h>
@@ -59,7 +60,7 @@ StreamWindow::StreamWindow(QWidget *parent) : QWidget(parent)
     //icecast table
     ui.icecastTableView->setModel(m_iceCastFilterModel);
     ui.icecastTableView->verticalHeader()->setDefaultSectionSize(fontMetrics().height() + 3);
-    ui.icecastTableView->verticalHeader()->setResizeMode(QHeaderView::Fixed);
+    ui.icecastTableView->verticalHeader()->setSectionResizeMode(QHeaderView::Fixed);
     ui.icecastTableView->setEditTriggers(QAbstractItemView::NoEditTriggers);
     ui.icecastTableView->setContextMenuPolicy(Qt::CustomContextMenu);
     connect(ui.icecastTableView, SIGNAL(customContextMenuRequested(QPoint)),
@@ -77,7 +78,7 @@ StreamWindow::StreamWindow(QWidget *parent) : QWidget(parent)
     //favorites table
     ui.favoritesTableView->setModel(m_favoritesFilterModel);
     ui.favoritesTableView->verticalHeader()->setDefaultSectionSize(fontMetrics().height() + 3);
-    ui.favoritesTableView->verticalHeader()->setResizeMode(QHeaderView::Fixed);
+    ui.favoritesTableView->verticalHeader()->setSectionResizeMode(QHeaderView::Fixed);
     ui.favoritesTableView->setEditTriggers(QAbstractItemView::NoEditTriggers);
     ui.favoritesTableView->setContextMenuPolicy(Qt::CustomContextMenu);
     connect(ui.favoritesTableView, SIGNAL(customContextMenuRequested(QPoint)),
@@ -231,7 +232,7 @@ void StreamWindow::removeFromFavorites()
     {
         rows_to_remove.append(m_favoritesFilterModel->mapToSource(index).row());
     }
-    qStableSort(rows_to_remove);
+    std::stable_sort(rows_to_remove.begin(), rows_to_remove.end());
     int prev_row = -1;
     for(int i = rows_to_remove.count() - 1; i >= 0; i -= 1 )
     {
-- 
cgit v1.2.3-13-gbd6f