fixed build with qt 5.9

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@8773 90c681e8-e032-0410-971d-27865f9a5e38

11 files changed, 46 insertions, 1 deletions

diff --git a/src/plugins/Ui/qsui/elidinglabel.cpp b/src/plugins/Ui/qsui/elidinglabel.cpp
index 71d13ce74..bba4fb7ff 100644
--- a/src/plugins/Ui/qsui/elidinglabel.cpp
+++ b/src/plugins/Ui/qsui/elidinglabel.cpp
@@ -32,6 +32,10 @@
 #include <QPainter>
 #include <QStyle>
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 11, 0)
+#define horizontalAdvance width
+#endif
+
 /*!
     \class Utils::ElidingLabel
 
diff --git a/src/plugins/Ui/qsui/equalizer.cpp b/src/plugins/Ui/qsui/equalizer.cpp
index 1b58697f6..cb32a202c 100644
--- a/src/plugins/Ui/qsui/equalizer.cpp
+++ b/src/plugins/Ui/qsui/equalizer.cpp
@@ -34,6 +34,10 @@
 #include <qmmp/qmmpsettings.h>
 #include "equalizer.h"
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 11, 0)
+#define horizontalAdvance width
+#endif
+
 Equalizer::Equalizer(QWidget *parent) : QDialog(parent)
 {
     setWindowTitle(tr("Equalizer"));
diff --git a/src/plugins/Ui/qsui/listwidgetdrawer.cpp b/src/plugins/Ui/qsui/listwidgetdrawer.cpp
index 02ba92a2e..3c046fde9 100644
--- a/src/plugins/Ui/qsui/listwidgetdrawer.cpp
+++ b/src/plugins/Ui/qsui/listwidgetdrawer.cpp
@@ -25,6 +25,10 @@
 #include <qmmpui/playlistmanager.h>
 #include "listwidgetdrawer.h"
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 11, 0)
+#define horizontalAdvance width
+#endif
+
 // |= number=|=row1=|=row2=|=extra= duration=|
 
 ListWidgetDrawer::ListWidgetDrawer()
diff --git a/src/plugins/Ui/qsui/playlistheader.cpp b/src/plugins/Ui/qsui/playlistheader.cpp
index 359972454..d2b52caa7 100644
--- a/src/plugins/Ui/qsui/playlistheader.cpp
+++ b/src/plugins/Ui/qsui/playlistheader.cpp
@@ -39,6 +39,10 @@
 #include "playlistheader.h"
 #include "listwidgetdrawer.h"
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 11, 0)
+#define horizontalAdvance width
+#endif
+
 #define INITAL_SIZE 150
 #define MIN_SIZE 30
 #define MAX_COLUMNS 7
diff --git a/src/plugins/Ui/skinned/listwidgetdrawer.cpp b/src/plugins/Ui/skinned/listwidgetdrawer.cpp
index d2d22bf54..1ccbc01f4 100644
--- a/src/plugins/Ui/skinned/listwidgetdrawer.cpp
+++ b/src/plugins/Ui/skinned/listwidgetdrawer.cpp
@@ -25,6 +25,10 @@
 #include "skin.h"
 #include "listwidgetdrawer.h"
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 11, 0)
+#define horizontalAdvance width
+#endif
+
 // |= number=|=row1=|=row2=|=extra= duration=|
 
 ListWidgetDrawer::ListWidgetDrawer()
diff --git a/src/plugins/Ui/skinned/playlistheader.cpp b/src/plugins/Ui/skinned/playlistheader.cpp
index 5467f7996..0507f2f98 100644
--- a/src/plugins/Ui/skinned/playlistheader.cpp
+++ b/src/plugins/Ui/skinned/playlistheader.cpp
@@ -39,6 +39,10 @@
 #include "playlistheader.h"
 #include "listwidgetdrawer.h"
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 11, 0)
+#define horizontalAdvance width
+#endif
+
 #define INITAL_SIZE 150
 #define MAX_COLUMNS 7
 #define MIN_SIZE 30
diff --git a/src/plugins/Ui/skinned/playlistselector.cpp b/src/plugins/Ui/skinned/playlistselector.cpp
index 81bfe8243..d3f3006c9 100644
--- a/src/plugins/Ui/skinned/playlistselector.cpp
+++ b/src/plugins/Ui/skinned/playlistselector.cpp
@@ -34,6 +34,10 @@
 #include "skin.h"
 #include "playlistselector.h"
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 11, 0)
+#define horizontalAdvance width
+#endif
+
 PlayListSelector::PlayListSelector(PlayListManager *manager, QWidget *parent) : QWidget(parent)
 {
     m_scrollable = false;
diff --git a/src/plugins/Ui/skinned/textscroller.cpp b/src/plugins/Ui/skinned/textscroller.cpp
index fbe0523d2..8c571fade 100644
--- a/src/plugins/Ui/skinned/textscroller.cpp
+++ b/src/plugins/Ui/skinned/textscroller.cpp
@@ -35,6 +35,10 @@
 #include "actionmanager.h"
 #include "textscroller.h"
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 11, 0)
+#define horizontalAdvance width
+#endif
+
 #define SCROLL_SEP "   *** "
 #define TITLE_FORMAT "%p%if(%p&%t, - ,)%t%if(%p,,%if(%t,,%f))%if(%l, - %l,)"
 
diff --git a/src/qmmpui/groupedcontainer.cpp b/src/qmmpui/groupedcontainer.cpp
index d126cc37d..27284c723 100644
--- a/src/qmmpui/groupedcontainer.cpp
+++ b/src/qmmpui/groupedcontainer.cpp
@@ -21,6 +21,10 @@
 #include "playlistmodel.h"
 #include "groupedcontainer_p.h"
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
+#define swapItemsAt swap
+#endif
+
 GroupedContainer::GroupedContainer()
 {
     m_update = true;
diff --git a/src/qmmpui/normalcontainer.cpp b/src/qmmpui/normalcontainer.cpp
index a117187ce..96e3f4204 100644
--- a/src/qmmpui/normalcontainer.cpp
+++ b/src/qmmpui/normalcontainer.cpp
@@ -20,6 +20,11 @@
 
 #include "normalcontainer_p.h"
 
+
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
+#define swapItemsAt swap
+#endif
+
 NormalContainer::NormalContainer()
 {}
 
diff --git a/src/qmmpui/playstate.cpp b/src/qmmpui/playstate.cpp
index 34f350b7a..184517109 100644
--- a/src/qmmpui/playstate.cpp
+++ b/src/qmmpui/playstate.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2006-2013 by Ilya Kotov                                 *
+ *   Copyright (C) 2006-2019 by Ilya Kotov                                 *
  *   forkotov02@ya.ru                                                      *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -21,6 +21,10 @@
 #include "qmmpuisettings.h"
 #include "playstate_p.h"
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
+#define swapItemsAt swap
+#endif
+
 PlayState::PlayState(PlayListModel *model) : m_model(model)
 {
     m_ui_settings = QmmpUiSettings::instance();