diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2019-04-04 21:12:09 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2019-04-04 21:12:09 +0000 |
| commit | 64a0861bc42b2667a562ce8fbf82081282241bbc (patch) | |
| tree | 49dd06206b2ec9b728cef7168421c8fe54faf321 /src/plugins/Ui/skinned/playlistheader.cpp | |
| parent | 245027ffccb6dd722b1c928b0d53a62f095c466e (diff) | |
| download | qmmp-64a0861bc42b2667a562ce8fbf82081282241bbc.tar.gz qmmp-64a0861bc42b2667a562ce8fbf82081282241bbc.tar.bz2 qmmp-64a0861bc42b2667a562ce8fbf82081282241bbc.zip | |
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
Diffstat (limited to 'src/plugins/Ui/skinned/playlistheader.cpp')
| -rw-r--r-- | src/plugins/Ui/skinned/playlistheader.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
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()); } } |
