diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2017-11-25 18:00:06 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2017-11-25 18:00:06 +0000 |
| commit | 8453224119a4c5ff7d47d9cd4924d0b1ccb99b3a (patch) | |
| tree | 15d339b62e98d5858a57aa787334e14f0e2f0ad7 /src/plugins/General/streambrowser/streamwindow.cpp | |
| parent | 6fc05db7c6de9a51beba754f12ff4ac32859977d (diff) | |
| download | qmmp-8453224119a4c5ff7d47d9cd4924d0b1ccb99b3a.tar.gz qmmp-8453224119a4c5ff7d47d9cd4924d0b1ccb99b3a.tar.bz2 qmmp-8453224119a4c5ff7d47d9cd4924d0b1ccb99b3a.zip | |
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
Diffstat (limited to 'src/plugins/General/streambrowser/streamwindow.cpp')
| -rw-r--r-- | src/plugins/General/streambrowser/streamwindow.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
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 ) { |