aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/plugins/General/history/historywindow.cpp16
-rw-r--r--src/plugins/Ui/qsui/elidinglabel.cpp2
-rw-r--r--src/plugins/Ui/qsui/equalizer.cpp2
-rw-r--r--src/plugins/Ui/qsui/listwidgetdrawer.cpp48
-rw-r--r--src/plugins/Ui/qsui/playlistheader.cpp10
-rw-r--r--src/plugins/Ui/skinned/listwidgetdrawer.cpp48
-rw-r--r--src/plugins/Ui/skinned/playlistheader.cpp18
-rw-r--r--src/plugins/Ui/skinned/playlistselector.cpp14
-rw-r--r--src/plugins/Ui/skinned/textscroller.cpp2
-rw-r--r--src/qmmpui/groupedcontainer.cpp8
-rw-r--r--src/qmmpui/normalcontainer.cpp4
-rw-r--r--src/qmmpui/playstate.cpp2
12 files changed, 87 insertions, 87 deletions
diff --git a/src/plugins/General/history/historywindow.cpp b/src/plugins/General/history/historywindow.cpp
index cbba39987..4c9ffacc9 100644
--- a/src/plugins/General/history/historywindow.cpp
+++ b/src/plugins/General/history/historywindow.cpp
@@ -125,8 +125,8 @@ void HistoryWindow::loadHistory()
m_ui->historyTreeWidget->topLevelItem(topLevelCount++)->setText(0, dateStr);
m_ui->historyTreeWidget->topLevelItem(topLevelCount - 1)->setFirstColumnSpanned(true);
m_ui->historyTreeWidget->topLevelItem(topLevelCount - 1)->setTextAlignment(0, Qt::AlignCenter);
- m_ui->historyTreeWidget->topLevelItem(topLevelCount - 1)->setBackgroundColor(0, bgColor);
- m_ui->historyTreeWidget->topLevelItem(topLevelCount - 1)->setTextColor(0, textColor);
+ m_ui->historyTreeWidget->topLevelItem(topLevelCount - 1)->setBackground(0, bgColor);
+ m_ui->historyTreeWidget->topLevelItem(topLevelCount - 1)->setForeground(0, textColor);
}
else if(m_ui->historyTreeWidget->topLevelItem(topLevelCount - 1)->text(0) != dateStr)
{
@@ -134,8 +134,8 @@ void HistoryWindow::loadHistory()
m_ui->historyTreeWidget->topLevelItem(topLevelCount++)->setText(0, dateStr);
m_ui->historyTreeWidget->topLevelItem(topLevelCount - 1)->setFirstColumnSpanned(true);
m_ui->historyTreeWidget->topLevelItem(topLevelCount - 1)->setTextAlignment(0, Qt::AlignCenter);
- m_ui->historyTreeWidget->topLevelItem(topLevelCount - 1)->setBackgroundColor(0, bgColor);
- m_ui->historyTreeWidget->topLevelItem(topLevelCount - 1)->setTextColor(0, textColor);
+ m_ui->historyTreeWidget->topLevelItem(topLevelCount - 1)->setBackground(0, bgColor);
+ m_ui->historyTreeWidget->topLevelItem(topLevelCount - 1)->setForeground(0, textColor);
}
QTreeWidgetItem *topLevelItem = m_ui->historyTreeWidget->topLevelItem(topLevelCount - 1);
@@ -200,8 +200,8 @@ void HistoryWindow::loadDistribution()
m_ui->distributionTreeWidget->topLevelItem(topLevelCount++)->setText(0, monthStr);
m_ui->distributionTreeWidget->topLevelItem(topLevelCount - 1)->setFirstColumnSpanned(true);
m_ui->distributionTreeWidget->topLevelItem(topLevelCount - 1)->setTextAlignment(0, Qt::AlignCenter);
- m_ui->distributionTreeWidget->topLevelItem(topLevelCount - 1)->setBackgroundColor(0, bgColor);
- m_ui->distributionTreeWidget->topLevelItem(topLevelCount - 1)->setTextColor(0, textColor);
+ m_ui->distributionTreeWidget->topLevelItem(topLevelCount - 1)->setBackground(0, bgColor);
+ m_ui->distributionTreeWidget->topLevelItem(topLevelCount - 1)->setForeground(0, textColor);
}
else if(m_ui->distributionTreeWidget->topLevelItem(topLevelCount - 1)->text(0) != monthStr)
{
@@ -209,8 +209,8 @@ void HistoryWindow::loadDistribution()
m_ui->distributionTreeWidget->topLevelItem(topLevelCount++)->setText(0, monthStr);
m_ui->distributionTreeWidget->topLevelItem(topLevelCount - 1)->setFirstColumnSpanned(true);
m_ui->distributionTreeWidget->topLevelItem(topLevelCount - 1)->setTextAlignment(0, Qt::AlignCenter);
- m_ui->distributionTreeWidget->topLevelItem(topLevelCount - 1)->setBackgroundColor(0, bgColor);
- m_ui->distributionTreeWidget->topLevelItem(topLevelCount - 1)->setTextColor(0, textColor);
+ m_ui->distributionTreeWidget->topLevelItem(topLevelCount - 1)->setBackground(0, bgColor);
+ m_ui->distributionTreeWidget->topLevelItem(topLevelCount - 1)->setForeground(0, textColor);
}
QTreeWidgetItem *topLevelItem = m_ui->distributionTreeWidget->topLevelItem(topLevelCount - 1);
diff --git a/src/plugins/Ui/qsui/elidinglabel.cpp b/src/plugins/Ui/qsui/elidinglabel.cpp
index 7fda25390..71d13ce74 100644
--- a/src/plugins/Ui/qsui/elidinglabel.cpp
+++ b/src/plugins/Ui/qsui/elidinglabel.cpp
@@ -70,7 +70,7 @@ void ElidingLabel::paintEvent(QPaintEvent *)
QRect contents = contentsRect().adjusted(m, m, -m, -m);
QFontMetrics fm = fontMetrics();
QString txt = text();
- if (txt.length() > 4 && fm.width(txt) > contents.width()) {
+ if (txt.length() > 4 && fm.horizontalAdvance(txt) > contents.width()) {
setToolTip(txt);
txt = fm.elidedText(txt, m_elideMode, contents.width());
} else {
diff --git a/src/plugins/Ui/qsui/equalizer.cpp b/src/plugins/Ui/qsui/equalizer.cpp
index c494217af..1b58697f6 100644
--- a/src/plugins/Ui/qsui/equalizer.cpp
+++ b/src/plugins/Ui/qsui/equalizer.cpp
@@ -99,7 +99,7 @@ Equalizer::Equalizer(QWidget *parent) : QDialog(parent)
QLabel *label2 = new QLabel(this);
label2->setText(tr("%1dB").arg(0));
label2->setFrameShape(QFrame::Box);
- label2->setMinimumWidth(fontMetrics().width(tr("+%1dB").arg(20) + 5));
+ label2->setMinimumWidth(fontMetrics().horizontalAdvance(tr("+%1dB").arg(20) + 5));
label2->setAlignment(Qt::AlignCenter);
slidersLayout->addWidget(label2, 0, i, Qt::AlignHCenter);
connect(slider, SIGNAL(valueChanged(int)), SLOT(updateLabel()));
diff --git a/src/plugins/Ui/qsui/listwidgetdrawer.cpp b/src/plugins/Ui/qsui/listwidgetdrawer.cpp
index b819fed4d..02ba92a2e 100644
--- a/src/plugins/Ui/qsui/listwidgetdrawer.cpp
+++ b/src/plugins/Ui/qsui/listwidgetdrawer.cpp
@@ -102,7 +102,7 @@ void ListWidgetDrawer::readSettings()
m_font.setBold(true);
m_bold_metrics = new QFontMetrics(m_font);
m_font.setBold(false);
- m_padding = m_metrics->width("9")/2;
+ m_padding = m_metrics->horizontalAdvance("9")/2;
m_row_height = m_metrics->lineSpacing() + 1;
}
@@ -134,7 +134,7 @@ void ListWidgetDrawer::calculateNumberWidth(int count)
{
//song numbers width
if(m_show_number && m_align_numbres && count)
- m_number_width = m_bold_metrics->width("9") * QString::number(count).size();
+ m_number_width = m_bold_metrics->horizontalAdvance("9") * QString::number(count).size();
else
m_number_width = 0;
}
@@ -171,10 +171,10 @@ void ListWidgetDrawer::prepareRow(ListWidgetRow *row)
row->lengthColumnWidth = 0;
if(m_show_lengths && !row->length.isEmpty())
- row->lengthColumnWidth += metrics->width(row->length) + m_padding;
+ row->lengthColumnWidth += 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
@@ -196,10 +196,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] = metrics->elidedText (row->titles[i], Qt::ElideRight, text_size);
row->extraString = m_extra_metrics->elidedText(row->extraString, Qt::ElideRight,
- size - 3 * m_padding - metrics->width(row->titles[i]));
+ size - 3 * m_padding - metrics->horizontalAdvance(row->titles[i]));
}
else
{
@@ -269,7 +269,7 @@ void ListWidgetDrawer::drawSeparator(QPainter *painter, ListWidgetRow *row, bool
painter->setPen(row->flags & ListWidgetRow::SELECTED ? m_highlighted : m_group_text);
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();
@@ -280,7 +280,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)
{
@@ -292,7 +292,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)
{
@@ -345,14 +345,14 @@ void ListWidgetDrawer::drawTrack(QPainter *painter, ListWidgetRow *row, bool rtl
}
}
- sx -= metrics->width(row->titles[0]);
+ sx -= metrics->horizontalAdvance(row->titles[0]);
painter->drawText(sx - m_padding, sy, row->titles[0]);
sx = row->rect.x() + m_padding;
if(m_show_lengths && !row->length.isEmpty())
{
painter->drawText(sx, sy, row->length);
- sx += metrics->width(row->length);
+ sx += metrics->horizontalAdvance(row->length);
sx += m_padding;
}
@@ -372,18 +372,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 - metrics->width(row->titles[i]);
+ title_x = sx - m_padding - metrics->horizontalAdvance(row->titles[i]);
extra_x = draw_extra ? sx - row->sizes[i] + m_padding : 0;
}
else
{
- title_x = sx - row->sizes[i] / 2 - metrics->width(row->titles[i]) / 2 +
- (draw_extra ? (m_extra_metrics->width(row->extraString) + m_padding) / 2 : 0);
- extra_x = draw_extra ? title_x - metrics->width(row->extraString) - m_padding : 0;
+ title_x = sx - row->sizes[i] / 2 - metrics->horizontalAdvance(row->titles[i]) / 2 +
+ (draw_extra ? (m_extra_metrics->horizontalAdvance(row->extraString) + m_padding) / 2 : 0);
+ extra_x = draw_extra ? title_x - metrics->horizontalAdvance(row->extraString) - m_padding : 0;
}
painter->drawText(title_x, sy, row->titles[i]);
@@ -415,7 +415,7 @@ void ListWidgetDrawer::drawTrack(QPainter *painter, ListWidgetRow *row, bool rtl
{
sx += row->numberColumnWidth;
QString number = QString("%1").arg(row->number);
- painter->drawText(sx - m_padding - metrics->width(number), sy, number);
+ painter->drawText(sx - m_padding - metrics->horizontalAdvance(number), sy, number);
if(m_show_splitters)
{
painter->setPen(row->flags & ListWidgetRow::SELECTED ? m_highlighted : m_splitter);
@@ -429,14 +429,14 @@ void ListWidgetDrawer::drawTrack(QPainter *painter, ListWidgetRow *row, bool rtl
if(m_show_lengths && !row->length.isEmpty())
{
- sx -= metrics->width(row->length);
+ sx -= 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);
}
@@ -451,18 +451,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 - metrics->width(row->titles[i]);
+ title_x = sx + row->sizes[i] - m_padding - metrics->horizontalAdvance(row->titles[i]);
extra_x = draw_extra ? sx + m_padding : 0;
}
else
{
- title_x = sx + row->sizes[i] / 2 - metrics->width(row->titles[i]) / 2 -
- (draw_extra ? (m_extra_metrics->width(row->extraString) + m_padding) / 2 : 0);
- extra_x = draw_extra ? title_x + metrics->width(row->titles[i]) + m_padding : 0;
+ title_x = sx + row->sizes[i] / 2 - metrics->horizontalAdvance(row->titles[i]) / 2 -
+ (draw_extra ? (m_extra_metrics->horizontalAdvance(row->extraString) + m_padding) / 2 : 0);
+ extra_x = draw_extra ? title_x + metrics->horizontalAdvance(row->titles[i]) + m_padding : 0;
}
painter->drawText(title_x, sy, row->titles[i]);
diff --git a/src/plugins/Ui/qsui/playlistheader.cpp b/src/plugins/Ui/qsui/playlistheader.cpp
index 2ce470fcc..359972454 100644
--- a/src/plugins/Ui/qsui/playlistheader.cpp
+++ b/src/plugins/Ui/qsui/playlistheader.cpp
@@ -124,7 +124,7 @@ void PlayListHeader::readSettings()
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()) //do not load settings several times
{
@@ -437,7 +437,7 @@ void PlayListHeader::mousePressEvent(QMouseEvent *e)
if(rtl)
{
- if(e->pos().x() < m_model->data(m_pressed_column, RECT).toRect().x() + m_metrics->width("9"))
+ if(e->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;
@@ -450,7 +450,7 @@ void PlayListHeader::mousePressEvent(QMouseEvent *e)
}
else
{
- if(e->pos().x() > m_model->data(m_pressed_column, RECT).toRect().right() - m_metrics->width("9"))
+ if(e->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;
@@ -565,14 +565,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);
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;
diff --git a/src/qmmpui/groupedcontainer.cpp b/src/qmmpui/groupedcontainer.cpp
index 5b9bd562f..d126cc37d 100644
--- a/src/qmmpui/groupedcontainer.cpp
+++ b/src/qmmpui/groupedcontainer.cpp
@@ -387,7 +387,7 @@ void GroupedContainer::reverseList()
QList<PlayListTrack *> tracks = takeAllTracks();
for (int i = 0; i < tracks.size()/2 ;i++)
- tracks.swap(i, tracks.size() - i - 1);
+ tracks.swapItemsAt(i, tracks.size() - i - 1);
addTracks(tracks);
}
@@ -398,14 +398,14 @@ void GroupedContainer::randomizeList()
{
for (int j = 0; j < m_groups[i]->trackList.size(); j++)
{
- m_groups[i]->trackList.swap(qrand() % m_groups[i]->trackList.size(),
- qrand() % m_groups[i]->trackList.size());
+ m_groups[i]->trackList.swapItemsAt(qrand() % m_groups[i]->trackList.size(),
+ qrand() % m_groups[i]->trackList.size());
}
}
for(int i = 0; i < m_groups.count(); ++i)
{
- m_groups.swap(qrand() % m_groups.size(), qrand() % m_groups.size());
+ m_groups.swapItemsAt(qrand() % m_groups.size(), qrand() % m_groups.size());
}
m_update = true;
diff --git a/src/qmmpui/normalcontainer.cpp b/src/qmmpui/normalcontainer.cpp
index f1ef088f7..a117187ce 100644
--- a/src/qmmpui/normalcontainer.cpp
+++ b/src/qmmpui/normalcontainer.cpp
@@ -229,7 +229,7 @@ void NormalContainer::reverseList()
{
for (int i = 0; i < m_items.size()/2; i++)
{
- m_items.swap(i, m_items.size() - i - 1);
+ m_items.swapItemsAt(i, m_items.size() - i - 1);
swapTrackNumbers(&m_items, i, m_items.size() - i - 1);
}
}
@@ -237,7 +237,7 @@ void NormalContainer::reverseList()
void NormalContainer::randomizeList()
{
for (int i = 0; i < m_items.size(); i++)
- m_items.swap(qrand()%m_items.size(), qrand()%m_items.size());
+ m_items.swapItemsAt(qrand()%m_items.size(), qrand()%m_items.size());
for(int i = 0; i < m_items.count(); ++i)
m_items[i]->setTrackIndex(i);
diff --git a/src/qmmpui/playstate.cpp b/src/qmmpui/playstate.cpp
index 0d6e70758..34f350b7a 100644
--- a/src/qmmpui/playstate.cpp
+++ b/src/qmmpui/playstate.cpp
@@ -97,7 +97,7 @@ void ShufflePlayState::prepare()
}
for (int i = 0; i < m_shuffled_indexes.count(); i++)
- m_shuffled_indexes.swap(i, qrand()%m_shuffled_indexes.size());
+ m_shuffled_indexes.swapItemsAt(i, qrand()%m_shuffled_indexes.size());
m_shuffled_indexes.prepend(m_model->currentIndex());
}
generated by cgit v1.2.3-13-gbd6f (git 2.30.0) at 2025-12-15 16:05:30 +0000