fixed qt 5.13 warnings

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

4 files changed, 41 insertions, 41 deletions

diff --git a/src/plugins/Ui/skinned/listwidgetdrawer.cpp b/src/plugins/Ui/skinned/listwidgetdrawer.cpp
index 2f34cfee8..d2d22bf54 100644
--- a/src/plugins/Ui/skinned/listwidgetdrawer.cpp
+++ b/src/plugins/Ui/skinned/listwidgetdrawer.cpp
@@ -76,7 +76,7 @@ void ListWidgetDrawer::readSettings()
     m_update = true;
     m_metrics = new QFontMetrics(m_font);
     m_extra_metrics = new QFontMetrics(m_extra_font);
-    m_padding = m_metrics->width("9")/2;
+    m_padding = m_metrics->horizontalAdvance("9")/2;
     m_row_height = m_metrics->lineSpacing() + 1;
 }
 
@@ -102,7 +102,7 @@ void ListWidgetDrawer::calculateNumberWidth(int count)
 {
     //song numbers width
     if(m_show_numbers && m_align_numbers && count)
-        m_number_width = m_metrics->width("9") * QString::number(count).size();
+        m_number_width = m_metrics->horizontalAdvance("9") * QString::number(count).size();
     else
         m_number_width = 0;
 }
@@ -137,10 +137,10 @@ void ListWidgetDrawer::prepareRow(ListWidgetRow *row)
             row->lengthColumnWidth = 0;
 
         if(m_show_lengths && !row->length.isEmpty())
-            row->lengthColumnWidth += m_metrics->width(row->length) + m_padding;
+            row->lengthColumnWidth += m_metrics->horizontalAdvance(row->length) + m_padding;
 
         if(!row->extraString.isEmpty())
-            row->lengthColumnWidth += m_extra_metrics->width(row->extraString) + m_padding;
+            row->lengthColumnWidth += m_extra_metrics->horizontalAdvance(row->extraString) + m_padding;
     }
 
     //elide title
@@ -162,10 +162,10 @@ void ListWidgetDrawer::prepareRow(ListWidgetRow *row)
         int size = row->sizes[i];
         if(i == row->trackStateColumn && !row->extraString.isEmpty())
         {
-            int text_size = qMax(0, size - 3 * m_padding - m_extra_metrics->width(row->extraString));
+            int text_size = qMax(0, size - 3 * m_padding - m_extra_metrics->horizontalAdvance(row->extraString));
             row->titles[i] = m_metrics->elidedText (row->titles[i], Qt::ElideRight, text_size);
             row->extraString = m_extra_metrics->elidedText(row->extraString, Qt::ElideRight,
-                                                           size - 3 * m_padding - m_metrics->width(row->titles[i]));
+                                                           size - 3 * m_padding - m_metrics->horizontalAdvance(row->titles[i]));
         }
         else
         {
@@ -210,7 +210,7 @@ void ListWidgetDrawer::drawSeparator(QPainter *painter, ListWidgetRow *row, bool
     painter->setPen(m_normal);
 
     if(rtl)
-        sx = row->rect.right() - sx - m_metrics->width(row->titles[0]);
+        sx = row->rect.right() - sx - m_metrics->horizontalAdvance(row->titles[0]);
     else
         sx += row->rect.x();
 
@@ -222,7 +222,7 @@ void ListWidgetDrawer::drawSeparator(QPainter *painter, ListWidgetRow *row, bool
     if(rtl)
     {
         painter->drawLine(row->rect.x() + 5, sy, sx - 5, sy);
-        painter->drawLine(sx + m_metrics->width(row->titles[0]) + 5, sy,
+        painter->drawLine(sx + m_metrics->horizontalAdvance(row->titles[0]) + 5, sy,
                           row->rect.right() - row->numberColumnWidth - m_padding, sy);
         if(m_show_splitters && row->numberColumnWidth)
         {
@@ -234,7 +234,7 @@ void ListWidgetDrawer::drawSeparator(QPainter *painter, ListWidgetRow *row, bool
     else
     {
         painter->drawLine(sx - 45, sy, sx - 5, sy);
-        painter->drawLine(sx + m_metrics->width(row->titles[0]) + 5, sy,
+        painter->drawLine(sx + m_metrics->horizontalAdvance(row->titles[0]) + 5, sy,
                           row->rect.width(), sy);
         if(m_show_splitters && row->numberColumnWidth)
         {
@@ -273,7 +273,7 @@ void ListWidgetDrawer::drawTrack(QPainter *painter, ListWidgetRow *row, bool rtl
                 }
             }
 
-            sx -= m_metrics->width(row->titles[0]);
+            sx -= m_metrics->horizontalAdvance(row->titles[0]);
             painter->setPen(row->flags & ListWidgetRow::CURRENT ? m_current : m_normal);
             painter->drawText(sx - m_padding, sy, row->titles[0]);
 
@@ -282,7 +282,7 @@ void ListWidgetDrawer::drawTrack(QPainter *painter, ListWidgetRow *row, bool rtl
             if(m_show_lengths && !row->length.isEmpty())
             {
                 painter->drawText(sx, sy, row->length);
-                sx += m_metrics->width(row->length);
+                sx += m_metrics->horizontalAdvance(row->length);
                 sx += m_padding;
             }
 
@@ -302,18 +302,18 @@ void ListWidgetDrawer::drawTrack(QPainter *painter, ListWidgetRow *row, bool rtl
                 if(row->alignment[i] == ListWidgetRow::ALIGN_LEFT)
                 {
                     title_x = sx - row->sizes[i] + m_padding;
-                    extra_x = draw_extra ? sx - m_padding - m_extra_metrics->width(row->extraString) : 0;
+                    extra_x = draw_extra ? sx - m_padding - m_extra_metrics->horizontalAdvance(row->extraString) : 0;
                 }
                 else if(row->alignment[i] == ListWidgetRow::ALIGN_RIGHT)
                 {
-                    title_x = sx - m_padding - m_metrics->width(row->titles[i]);
+                    title_x = sx - m_padding - m_metrics->horizontalAdvance(row->titles[i]);
                     extra_x = draw_extra ? sx - row->sizes[i] + m_padding : 0;
                 }
                 else
                 {
-                    title_x = sx - row->sizes[i] / 2 - m_metrics->width(row->titles[i]) / 2 +
-                            (draw_extra ? (m_extra_metrics->width(row->extraString) + m_padding) / 2 : 0);
-                    extra_x = draw_extra ? title_x - m_metrics->width(row->extraString) - m_padding : 0;
+                    title_x = sx - row->sizes[i] / 2 - m_metrics->horizontalAdvance(row->titles[i]) / 2 +
+                            (draw_extra ? (m_extra_metrics->horizontalAdvance(row->extraString) + m_padding) / 2 : 0);
+                    extra_x = draw_extra ? title_x - m_metrics->horizontalAdvance(row->extraString) - m_padding : 0;
                 }
 
                 painter->drawText(title_x, sy, row->titles[i]);
@@ -345,7 +345,7 @@ void ListWidgetDrawer::drawTrack(QPainter *painter, ListWidgetRow *row, bool rtl
                 sx += row->numberColumnWidth;
                 painter->setPen(row->flags & ListWidgetRow::CURRENT ? m_current : m_normal);
                 QString number = QString("%1").arg(row->number);
-                painter->drawText(sx - m_padding - m_metrics->width(number), sy, number);
+                painter->drawText(sx - m_padding - m_metrics->horizontalAdvance(number), sy, number);
                 if(m_show_splitters)
                 {
                     painter->setPen(m_alternate_splitter_color ? m_current : m_normal);
@@ -361,14 +361,14 @@ void ListWidgetDrawer::drawTrack(QPainter *painter, ListWidgetRow *row, bool rtl
 
             if(m_show_lengths && !row->length.isEmpty())
             {
-                sx -= m_metrics->width(row->length);
+                sx -= m_metrics->horizontalAdvance(row->length);
                 painter->drawText(sx, sy, row->length);
                 sx -= m_padding;
             }
 
             if(!row->extraString.isEmpty())
             {
-                sx -= m_extra_metrics->width(row->extraString);
+                sx -= m_extra_metrics->horizontalAdvance(row->extraString);
                 painter->setFont(m_extra_font);
                 painter->drawText(sx, sy, row->extraString);
             }
@@ -383,18 +383,18 @@ void ListWidgetDrawer::drawTrack(QPainter *painter, ListWidgetRow *row, bool rtl
                 if(row->alignment[i] == ListWidgetRow::ALIGN_LEFT)
                 {
                     title_x = sx + m_padding;
-                    extra_x = draw_extra ? sx + row->sizes[i] - m_padding - m_extra_metrics->width(row->extraString) : 0;
+                    extra_x = draw_extra ? sx + row->sizes[i] - m_padding - m_extra_metrics->horizontalAdvance(row->extraString) : 0;
                 }
                 else if(row->alignment[i] == ListWidgetRow::ALIGN_RIGHT)
                 {
-                    title_x = sx + row->sizes[i] - m_padding - m_metrics->width(row->titles[i]);
+                    title_x = sx + row->sizes[i] - m_padding - m_metrics->horizontalAdvance(row->titles[i]);
                     extra_x = draw_extra ? sx + m_padding : 0;
                 }
                 else
                 {
-                    title_x = sx + row->sizes[i] / 2 - m_metrics->width(row->titles[i]) / 2 -
-                            (draw_extra ? (m_extra_metrics->width(row->extraString) + m_padding) / 2 : 0);
-                    extra_x = draw_extra ? title_x + m_metrics->width(row->titles[i]) + m_padding : 0;
+                    title_x = sx + row->sizes[i] / 2 - m_metrics->horizontalAdvance(row->titles[i]) / 2 -
+                            (draw_extra ? (m_extra_metrics->horizontalAdvance(row->extraString) + m_padding) / 2 : 0);
+                    extra_x = draw_extra ? title_x + m_metrics->horizontalAdvance(row->titles[i]) + m_padding : 0;
                 }
 
                 painter->drawText(title_x, sy, row->titles[i]);
diff --git a/src/plugins/Ui/skinned/playlistheader.cpp b/src/plugins/Ui/skinned/playlistheader.cpp
index 442aab3cf..5467f7996 100644
--- a/src/plugins/Ui/skinned/playlistheader.cpp
+++ b/src/plugins/Ui/skinned/playlistheader.cpp
@@ -135,11 +135,11 @@ void PlayListHeader::readSettings()
     }
 
     m_metrics = new QFontMetrics(m_font);
-    m_padding = m_metrics->width("9")/2;
+    m_padding = m_metrics->horizontalAdvance("9")/2;
 
     QFont pl_font;
     pl_font.fromString(settings.value("pl_font", qApp->font().toString()).toString());
-    m_pl_padding = QFontMetrics(pl_font).width("9")/2;
+    m_pl_padding = QFontMetrics(pl_font).horizontalAdvance("9")/2;
 
     if(!m_model->isSettingsLoaded())
     {
@@ -443,7 +443,7 @@ void PlayListHeader::mousePressEvent(QMouseEvent *e)
 
             if(rtl)
             {
-                if(m_pressed_pos.x() < m_model->data(m_pressed_column, RECT).toRect().x() + m_metrics->width("9"))
+                if(m_pressed_pos.x() < m_model->data(m_pressed_column, RECT).toRect().x() + m_metrics->horizontalAdvance("9"))
                 {
                     m_old_size = size(m_pressed_column);
                     m_task = RESIZE;
@@ -456,7 +456,7 @@ void PlayListHeader::mousePressEvent(QMouseEvent *e)
             }
             else
             {
-                if(m_pressed_pos.x() > m_model->data(m_pressed_column, RECT).toRect().right() - m_metrics->width("9"))
+                if(m_pressed_pos.x() > m_model->data(m_pressed_column, RECT).toRect().right() - m_metrics->horizontalAdvance("9"))
                 {
                     m_old_size = size(m_pressed_column);
                     m_task = RESIZE;
@@ -571,14 +571,14 @@ void PlayListHeader::mouseMoveEvent(QMouseEvent *e)
         {
             if(rtl)
             {
-                if(column >= 0 && x < m_model->data(column, RECT).toRect().x() + m_metrics->width("9"))
+                if(column >= 0 && x < m_model->data(column, RECT).toRect().x() + m_metrics->horizontalAdvance("9"))
                     setCursor(Qt::SplitHCursor);
                 else
                     setCursor(Qt::ArrowCursor);
             }
             else
             {
-                if(column >= 0 && x > m_model->data(column, RECT).toRect().right() - m_metrics->width("9"))
+                if(column >= 0 && x > m_model->data(column, RECT).toRect().right() - m_metrics->horizontalAdvance("9"))
                     setCursor(Qt::SplitHCursor);
                 else
                     setCursor(Qt::ArrowCursor);
@@ -690,7 +690,7 @@ void PlayListHeader::paintEvent(QPaintEvent *)
                 painter.drawLine(rect.right(), 0, rect.right(), height());
             }
 
-            painter.drawText(rect.right() - m_padding - m_metrics->width(name(0)),
+            painter.drawText(rect.right() - m_padding - m_metrics->horizontalAdvance(name(0)),
                     m_metrics->ascent(), name(0));
             if(m_sorting_column == 0)
             {
@@ -715,7 +715,7 @@ void PlayListHeader::paintEvent(QPaintEvent *)
                 continue;
             }
 
-            painter.drawText(rect.right() - m_padding - m_metrics->width(name(i)),
+            painter.drawText(rect.right() - m_padding - m_metrics->horizontalAdvance(name(i)),
                              m_metrics->ascent(), name(i));
 
             painter.drawLine(rect.x() - 1, 0, rect.x() - 1, height() + 1);
@@ -737,7 +737,7 @@ void PlayListHeader::paintEvent(QPaintEvent *)
             painter.setPen(m_normal_bg);
             painter.drawText(m_mouse_pos.x() - m_press_offset +
                              m_model->data(m_pressed_column, RECT).toRect().width() - m_padding -
-                             m_metrics->width(m_model->data(m_pressed_column, NAME).toString()),
+                             m_metrics->horizontalAdvance(m_model->data(m_pressed_column, NAME).toString()),
                              m_metrics->ascent(), m_model->data(m_pressed_column, NAME).toString());
         }
     }
diff --git a/src/plugins/Ui/skinned/playlistselector.cpp b/src/plugins/Ui/skinned/playlistselector.cpp
index 5c526e8bc..81bfe8243 100644
--- a/src/plugins/Ui/skinned/playlistselector.cpp
+++ b/src/plugins/Ui/skinned/playlistselector.cpp
@@ -93,18 +93,18 @@ void PlayListSelector::updateTabs()
         if(m_rects.isEmpty())
             rect.setX(9);
         else
-            rect.setX(m_rects.last().x() + m_rects.last().width() + m_metrics->width(m_pl_separator));
+            rect.setX(m_rects.last().x() + m_rects.last().width() + m_metrics->horizontalAdvance(m_pl_separator));
         rect.setY(0);
-        rect.setWidth(m_metrics->width(text));
+        rect.setWidth(m_metrics->horizontalAdvance(text));
         rect.setHeight(m_metrics->ascent ());
         m_rects.append(rect);
     }
 
     if(m_show_new_pl_button)
     {
-        rect.setX(m_rects.last().x() + m_rects.last().width() + m_metrics->width("  "));
+        rect.setX(m_rects.last().x() + m_rects.last().width() + m_metrics->horizontalAdvance("  "));
         rect.setY(0);
-        rect.setWidth(m_metrics->width(m_pl_button));
+        rect.setWidth(m_metrics->horizontalAdvance(m_pl_button));
         rect.setHeight(m_metrics->ascent ());
         m_extra_rects.append(rect);
     }
@@ -365,7 +365,7 @@ QRect PlayListSelector::firstVisible()
 {
     for(int i = 0; i < m_rects.size(); ++i)
     {
-        if(m_rects.at(i).right() + m_metrics->width(m_pl_separator) >= 9 + m_offset)
+        if(m_rects.at(i).right() + m_metrics->horizontalAdvance(m_pl_separator) >= 9 + m_offset)
             return m_rects.at(i);
     }
     return m_rects.at(0);
@@ -375,12 +375,12 @@ QRect PlayListSelector::lastVisible()
 {
     for(int i = m_extra_rects.size() - 1; i >= 0; --i)
     {
-        if(m_extra_rects.at(i).x() - m_offset -  m_metrics->width("  ") - 2 <= width() - 40)
+        if(m_extra_rects.at(i).x() - m_offset -  m_metrics->horizontalAdvance("  ") - 2 <= width() - 40)
             return m_extra_rects.at(i);
     }
     for(int i = m_rects.size() - 1; i >= 0; --i)
     {
-        if(m_rects.at(i).x() - m_offset - m_metrics->width(m_pl_separator) - 2 <= width() - 40)
+        if(m_rects.at(i).x() - m_offset - m_metrics->horizontalAdvance(m_pl_separator) - 2 <= width() - 40)
             return m_rects.at(i);
     }
     return m_extra_rects.isEmpty() ? m_rects.last() : m_extra_rects.last();
diff --git a/src/plugins/Ui/skinned/textscroller.cpp b/src/plugins/Ui/skinned/textscroller.cpp
index fe911ecd4..fbe0523d2 100644
--- a/src/plugins/Ui/skinned/textscroller.cpp
+++ b/src/plugins/Ui/skinned/textscroller.cpp
@@ -265,7 +265,7 @@ void TextScroller::preparePixmap(const QString &text, bool scrollable)
     if(scrollable)
     {
          int textWidth = m_bitmap ? QString(text + SCROLL_SEP).size() * 5
-                                  : m_metrics->width(text + SCROLL_SEP);
+                                  : m_metrics->horizontalAdvance(text + SCROLL_SEP);
          int count = 150*m_ratio / textWidth + 1;
          int width = count * textWidth;
          QString fullText;