From 870dc0d36f7487401939c977a5bc8a0c0f64e018 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Mon, 8 Jul 2019 22:19:14 +0200 Subject: [PATCH] Replace QFontMetrics::width with horizontalAdvance, dark with darker, background() with window() and QString::null with QString() --- src/analyzer/blockanalyzer.cpp | 6 +++--- src/context/contextview.cpp | 2 +- src/covermanager/albumcoversearcher.cpp | 2 +- src/equalizer/equalizerslider.cpp | 2 +- src/playlist/playlistdelegates.cpp | 6 +++--- src/playlist/playlistview.cpp | 2 +- src/settings/backendsettingspage.cpp | 4 ++-- src/widgets/freespacebar.cpp | 6 +++--- src/widgets/linetextedit.cpp | 2 +- src/widgets/multiloadingindicator.cpp | 2 +- src/widgets/tracksliderpopup.cpp | 2 +- 11 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/analyzer/blockanalyzer.cpp b/src/analyzer/blockanalyzer.cpp index 71864f34a..1504d3f55 100644 --- a/src/analyzer/blockanalyzer.cpp +++ b/src/analyzer/blockanalyzer.cpp @@ -345,12 +345,12 @@ void BlockAnalyzer::paletteChange(const QPalette&) { p.fillRect(0, y * (kHeight + 1), kWidth, kHeight, QColor(r + static_cast(dr * y), g + static_cast(dg * y), b + static_cast(db * y))); { - const QColor bg = palette().color(QPalette::Background).dark(112); + const QColor bg = palette().color(QPalette::Background).darker(112); // make a complimentary fadebar colour // TODO dark is not always correct, dumbo! int h, s, v; - palette().color(QPalette::Background).dark(150).getHsv(&h, &s, &v); + palette().color(QPalette::Background).darker(150).getHsv(&h, &s, &v); const QColor fg(QColor::fromHsv(h + 120, s, v)); const double dr = fg.red() - bg.red(); @@ -380,7 +380,7 @@ void BlockAnalyzer::drawBackground() { } const QColor bg = palette().color(QPalette::Background); - const QColor bgdark = bg.dark(112); + const QColor bgdark = bg.darker(112); background_.fill(bg); diff --git a/src/context/contextview.cpp b/src/context/contextview.cpp index ca5a5ac9b..f84c1b935 100644 --- a/src/context/contextview.cpp +++ b/src/context/contextview.cpp @@ -610,7 +610,7 @@ void ContextView::SetImage(const QImage &image) { // Cache the current pixmap so we can fade between them pixmap_previous_ = QPixmap(size()); - pixmap_previous_.fill(palette().background().color()); + pixmap_previous_.fill(palette().window().color()); pixmap_previous_opacity_ = 1.0; QPainter p(&pixmap_previous_); diff --git a/src/covermanager/albumcoversearcher.cpp b/src/covermanager/albumcoversearcher.cpp index 90a9b5b4d..e93a66d85 100644 --- a/src/covermanager/albumcoversearcher.cpp +++ b/src/covermanager/albumcoversearcher.cpp @@ -86,7 +86,7 @@ void SizeOverlayDelegate::paint(QPainter *painter, const QStyleOptionViewItem &o const QFontMetrics metrics(font); - const int text_width = metrics.width(text); + const int text_width = metrics.horizontalAdvance(text); const QRect icon_rect(option.rect.left(), option.rect.top(), option.rect.width(), option.rect.width()); diff --git a/src/equalizer/equalizerslider.cpp b/src/equalizer/equalizerslider.cpp index 25080dc1b..420984aa3 100644 --- a/src/equalizer/equalizerslider.cpp +++ b/src/equalizer/equalizerslider.cpp @@ -36,7 +36,7 @@ EqualizerSlider::EqualizerSlider(const QString &label, QWidget *parent) ui_->band->setText(label); QFontMetrics fm = ui_->gain->fontMetrics(); - int longestLabelWidth = fm.width(tr("%1 dB").arg(-99.99)); + int longestLabelWidth = fm.horizontalAdvance(tr("%1 dB").arg(-99.99)); ui_->gain->setMinimumWidth(longestLabelWidth); ui_->gain->setText(tr("%1 dB").arg(0)); // Gain [dB] diff --git a/src/playlist/playlistdelegates.cpp b/src/playlist/playlistdelegates.cpp index 06715d806..bb25830c8 100644 --- a/src/playlist/playlistdelegates.cpp +++ b/src/playlist/playlistdelegates.cpp @@ -117,7 +117,7 @@ void QueuedItemDelegate::DrawBox(QPainter *painter, const QRect &line_rect, cons smaller.setPointSize(smaller.pointSize() - 1); smaller.setBold(true); - if (width == -1) width = QFontMetrics(font).width(text + " "); + if (width == -1) width = QFontMetrics(font).horizontalAdvance(text + " "); QRect rect(line_rect); rect.setLeft(rect.right() - width - kQueueBoxBorder); @@ -295,7 +295,7 @@ QString LengthItemDelegate::displayText(const QVariant &value, const QLocale&) c qint64 nanoseconds = value.toLongLong(&ok); if (ok && nanoseconds > 0) return Utilities::PrettyTimeNanosec(nanoseconds); - return QString::null; + return QString(); } @@ -316,7 +316,7 @@ QString DateItemDelegate::displayText(const QVariant &value, const QLocale &loca int time = value.toInt(&ok); if (!ok || time == -1) - return QString::null; + return QString(); return QDateTime::fromTime_t(time).toString(QLocale::system().dateTimeFormat(QLocale::ShortFormat)); diff --git a/src/playlist/playlistview.cpp b/src/playlist/playlistview.cpp index 7111cae88..9ca013aef 100644 --- a/src/playlist/playlistview.cpp +++ b/src/playlist/playlistview.cpp @@ -100,7 +100,7 @@ void PlaylistProxyStyle::drawControl(ControlElement element, const QStyleOption const QFontMetrics &font_metrics = header_option->fontMetrics; // Spaces added to make transition less abrupt - if (rect.width() < font_metrics.width(text + " ")) { + if (rect.width() < font_metrics.horizontalAdvance(text + " ")) { const Playlist::Column column = static_cast(header_option->section); QStyleOptionHeader new_option(*header_option); new_option.text = Playlist::abbreviated_column_name(column); diff --git a/src/settings/backendsettingspage.cpp b/src/settings/backendsettingspage.cpp index 0bb005349..af00a2d4f 100644 --- a/src/settings/backendsettingspage.cpp +++ b/src/settings/backendsettingspage.cpp @@ -58,8 +58,8 @@ BackendSettingsPage::BackendSettingsPage(SettingsDialog *dialog) : SettingsPage( ui_->setupUi(this); setWindowIcon(IconLoader::Load("soundcard")); - ui_->label_bufferminfillvalue->setMinimumWidth(QFontMetrics(ui_->label_bufferminfillvalue->font()).width("WW%")); - ui_->label_replaygainpreamp->setMinimumWidth(QFontMetrics(ui_->label_replaygainpreamp->font()).width("-WW.W dB")); + ui_->label_bufferminfillvalue->setMinimumWidth(QFontMetrics(ui_->label_bufferminfillvalue->font()).horizontalAdvance("WW%")); + ui_->label_replaygainpreamp->setMinimumWidth(QFontMetrics(ui_->label_replaygainpreamp->font()).horizontalAdvance("-WW.W dB")); RgPreampChanged(ui_->stickslider_replaygainpreamp->value()); s_.beginGroup(BackendSettingsPage::kSettingsGroup); diff --git a/src/widgets/freespacebar.cpp b/src/widgets/freespacebar.cpp index 64f503521..9a5fee000 100644 --- a/src/widgets/freespacebar.cpp +++ b/src/widgets/freespacebar.cpp @@ -201,7 +201,7 @@ void FreeSpaceBar::DrawText(QPainter* p, const QRect &r) { int text_width = 0; for (const Label &label : labels) { - text_width += kLabelBoxSize + kLabelBoxPadding + kLabelSpacing + small_metrics.width(label.text); + text_width += kLabelBoxSize + kLabelBoxPadding + kLabelSpacing + small_metrics.horizontalAdvance(label.text); } // Draw the text @@ -216,11 +216,11 @@ void FreeSpaceBar::DrawText(QPainter* p, const QRect &r) { p->setBrush(label.color); p->drawRect(box); - QRect text(x + kLabelBoxSize + kLabelBoxPadding, r.top(), small_metrics.width(label.text), r.height()); + QRect text(x + kLabelBoxSize + kLabelBoxPadding, r.top(), small_metrics.horizontalAdvance(label.text), r.height()); p->setPen(light ? label.color.darker() : label.color); p->drawText(text, Qt::AlignCenter, label.text); - x += kLabelBoxSize + kLabelBoxPadding + kLabelSpacing + small_metrics.width(label.text); + x += kLabelBoxSize + kLabelBoxPadding + kLabelSpacing + small_metrics.horizontalAdvance(label.text); } } diff --git a/src/widgets/linetextedit.cpp b/src/widgets/linetextedit.cpp index 57d993b76..cacb33f68 100644 --- a/src/widgets/linetextedit.cpp +++ b/src/widgets/linetextedit.cpp @@ -48,7 +48,7 @@ QSize LineTextEdit::sizeHint() const { static const int kMargin = 5; int h = 2 * kMargin + qMax(fm.height(), 14); - int w = 2 * kMargin + fm.width("W") * 15; + int w = 2 * kMargin + fm.horizontalAdvance("W") * 15; return QSize(w, h); } diff --git a/src/widgets/multiloadingindicator.cpp b/src/widgets/multiloadingindicator.cpp index 06db3c12a..921712fb0 100644 --- a/src/widgets/multiloadingindicator.cpp +++ b/src/widgets/multiloadingindicator.cpp @@ -53,7 +53,7 @@ MultiLoadingIndicator::MultiLoadingIndicator(QWidget *parent) } QSize MultiLoadingIndicator::sizeHint() const { - const int width = kHorizontalPadding * 2 + spinner_->sizeHint().width() + kSpacing + fontMetrics().width(text_); + const int width = kHorizontalPadding * 2 + spinner_->sizeHint().width() + kSpacing + fontMetrics().horizontalAdvance(text_); const int height = kVerticalPadding * 2 + qMax(spinner_->sizeHint().height(), fontMetrics().height()); return QSize(width, height); diff --git a/src/widgets/tracksliderpopup.cpp b/src/widgets/tracksliderpopup.cpp index 8d801e4df..b2a4b73b7 100644 --- a/src/widgets/tracksliderpopup.cpp +++ b/src/widgets/tracksliderpopup.cpp @@ -87,7 +87,7 @@ void TrackSliderPopup::paintEvent(QPaintEvent*) { void TrackSliderPopup::UpdatePixmap() { - const int text_width = qMax(font_metrics_.width(text_), small_font_metrics_.width(small_text_)); + const int text_width = qMax(font_metrics_.horizontalAdvance(text_), small_font_metrics_.horizontalAdvance(small_text_)); const QRect text_rect1(kBlurRadius + kTextMargin, kBlurRadius + kTextMargin, text_width + 2, font_metrics_.height()); const QRect text_rect2(kBlurRadius + kTextMargin, text_rect1.bottom(), text_width, small_font_metrics_.height());