dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use static_cast

Browse Source
This commit is contained in:
Jonas Kvinge
2021-03-21 18:53:02 +01:00
parent f91a679cdf
commit 59bffed47f
80 changed files with 241 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/widgets/freespacebar.cpp
View File

@@ -126,7 +126,7 @@ void FreeSpaceBar::DrawBar(QPainter* p, const QRect &r) {
p->setRenderHint(QPainter::Antialiasing, true);
QRect bar_rect(r);
bar_rect.setWidth(float(bar_rect.width()) * (float(total_ - free_) / total_));
bar_rect.setWidth(static_cast<int>(float(bar_rect.width()) * (float(total_ - free_) / total_)));
QLinearGradient background_gradient(r.topLeft(), r.bottomLeft());
background_gradient.setColorAt(0, kColorBg1);
@@ -150,7 +150,7 @@ void FreeSpaceBar::DrawBar(QPainter* p, const QRect &r) {
if (additional_) {
QRect additional_rect(bar_rect);
additional_rect.setLeft(bar_rect.right());
additional_rect.setWidth(float(r.width()) * (float(qMin(free_, additional_)) / total_) + 1);
additional_rect.setWidth(static_cast<int>(float(r.width()) * (float(qMin(free_, additional_)) / total_) + 1));
QLinearGradient additional_gradient(additional_rect.topLeft(), additional_rect.bottomLeft());
additional_gradient.setColorAt(0, kColorAdd1);

2
src/widgets/multiloadingindicator.cpp
View File

@@ -81,7 +81,7 @@ void MultiLoadingIndicator::UpdateText() {
task_text[0] = task_text[0].toLower();
if (task.progress_max) {
int percentage = float(task.progress) / task.progress_max * 100;
int percentage = static_cast<int>(float(task.progress) / task.progress_max * 100);
task_text += QString(" %1%").arg(percentage);
}

2
src/widgets/playingwidget.cpp
View File

@@ -367,7 +367,7 @@ void PlayingWidget::UpdateHeight() {
case LargeSongDetails:
if (fit_width_) cover_loader_options_.desired_height_ = width();
else cover_loader_options_.desired_height_ = qMin(kMaxCoverSize, width());
total_height_ = kTopBorder + cover_loader_options_.desired_height_ + kBottomOffset + details_->size().height();
total_height_ = kTopBorder + cover_loader_options_.desired_height_ + kBottomOffset + static_cast<int>(details_->size().height());
break;
}

6
src/widgets/ratingwidget.cpp
View File

@@ -42,7 +42,7 @@ RatingPainter::RatingPainter() {
// Generate the 10 states, better to do it now than on the fly
for (int i = 0 ; i < kStarCount * 2 + 1 ; ++i) {
const float rating = float(i) / 2.0;
const double rating = double(i) / double(2.0);
// Clear the pixmap
stars_[i] = QPixmap(kStarSize * kStarCount, kStarSize);
@@ -91,7 +91,7 @@ double RatingPainter::RatingForPos(const QPoint &pos, const QRect &rect) {
}
void RatingPainter::Paint(QPainter* painter, const QRect &rect, float rating) const {
void RatingPainter::Paint(QPainter* painter, const QRect &rect, double rating) const {
QSize size(qMin(kStarSize * kStarCount, rect.width()), qMin(kStarSize, rect.height()));
QPoint pos(rect.center() - QPoint(size.width() / 2, size.height() / 2));
@@ -118,7 +118,7 @@ QSize RatingWidget::sizeHint() const {
}
void RatingWidget::set_rating(const float rating) {
void RatingWidget::set_rating(const double rating) {
rating_ = rating;
update();

14
src/widgets/ratingwidget.h
View File

@@ -35,7 +35,7 @@ class RatingPainter {
static QRect Contents(const QRect &rect);
static double RatingForPos(const QPoint &pos, const QRect &rect);
void Paint(QPainter *painter, const QRect &rect, float rating) const;
void Paint(QPainter *painter, const QRect &rect, double rating) const;
private:
QPixmap stars_[kStarCount * 2 + 1];
@@ -43,18 +43,18 @@ class RatingPainter {
class RatingWidget : public QWidget {
Q_OBJECT
Q_PROPERTY(float rating READ rating WRITE set_rating)
Q_PROPERTY(double rating READ rating WRITE set_rating)
public:
RatingWidget(QWidget *parent = nullptr);
QSize sizeHint() const override;
float rating() const { return rating_; }
void set_rating(const float rating);
double rating() const { return rating_; }
void set_rating(const double rating);
signals:
void RatingChanged(float);
void RatingChanged(double);
protected:
void paintEvent(QPaintEvent*) override;
@@ -64,8 +64,8 @@ class RatingWidget : public QWidget {
private:
RatingPainter painter_;
float rating_;
float hover_rating_;
double rating_;
double hover_rating_;
};
#endif // RATINGWIDGET_H

14
src/widgets/trackslider.cpp
View File

@@ -128,7 +128,7 @@ void TrackSlider::SetValue(const int elapsed, const int total) {
setting_value_ = false;
UpdateTimes(elapsed / kMsecPerSec);
UpdateTimes(static_cast<int>(elapsed / kMsecPerSec));
}
@@ -137,13 +137,13 @@ void TrackSlider::UpdateTimes(const int elapsed) {
ui_->elapsed->setText(Utilities::PrettyTime(elapsed));
// Update normally if showing remaining time
if (show_remaining_time_) {
ui_->remaining->setText("-" + Utilities::PrettyTime((ui_->slider->maximum() / kMsecPerSec) - elapsed));
ui_->remaining->setText("-" + Utilities::PrettyTime(static_cast<int>((ui_->slider->maximum() / kMsecPerSec) - elapsed)));
}
else {
// Check if slider maximum value is changed before updating
if (slider_maximum_value_ != ui_->slider->maximum() || !ui_->slider->isEnabled()) {
slider_maximum_value_ = ui_->slider->maximum();
ui_->remaining->setText(Utilities::PrettyTime((ui_->slider->maximum() / kMsecPerSec)));
ui_->remaining->setText(Utilities::PrettyTime(static_cast<int>((ui_->slider->maximum() / kMsecPerSec))));
}
}
setEnabled(true);
@@ -169,14 +169,14 @@ void TrackSlider::SetCanSeek(const bool can_seek) {
void TrackSlider::Seek(const int gap) {
if (ui_->slider->isEnabled())
ui_->slider->setValue(ui_->slider->value() + gap * kMsecPerSec);
ui_->slider->setValue(static_cast<int>(ui_->slider->value() + gap * kMsecPerSec));
}
void TrackSlider::ValueMaybeChanged(const int value) {
if (setting_value_) return;
UpdateTimes(value / kMsecPerSec);
emit ValueChangedSeconds(value / kMsecPerSec);
UpdateTimes(static_cast<int>(value / kMsecPerSec));
emit ValueChangedSeconds(static_cast<int>(value / kMsecPerSec));
}
bool TrackSlider::event(QEvent *e) {
@@ -200,7 +200,7 @@ void TrackSlider::ToggleTimeDisplay() {
// We set the value to -1 because the label must be updated
slider_maximum_value_ = -1;
}
UpdateTimes(ui_->slider->value() / kMsecPerSec);
UpdateTimes(static_cast<int>(ui_->slider->value() / kMsecPerSec));
// Save this setting
QSettings s;

16
src/widgets/tracksliderpopup.cpp
View File

@@ -88,12 +88,12 @@ void TrackSliderPopup::UpdatePixmap() {
#else
const int text_width = qMax(font_metrics_.width(text_), small_font_metrics_.width(small_text_));
#endif
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());
const QRect text_rect1(static_cast<int>(kBlurRadius) + kTextMargin, static_cast<int>(kBlurRadius) + kTextMargin, text_width + 2, font_metrics_.height());
const QRect text_rect2(static_cast<int>(kBlurRadius) + kTextMargin, text_rect1.bottom(), text_width, small_font_metrics_.height());
const int bubble_bottom = text_rect2.bottom() + kTextMargin;
const QRect total_rect(0, 0, text_rect1.right() + kBlurRadius + kTextMargin, kBlurRadius + bubble_bottom + kPointLength);
const QRect bubble_rect(kBlurRadius, kBlurRadius, total_rect.width() - kBlurRadius * 2, bubble_bottom - kBlurRadius);
const QRect total_rect(0, 0, text_rect1.right() + static_cast<int>(kBlurRadius) + kTextMargin, static_cast<int>(kBlurRadius) + bubble_bottom + kPointLength);
const QRect bubble_rect(static_cast<int>(kBlurRadius), static_cast<int>(kBlurRadius), total_rect.width() - static_cast<int>(kBlurRadius) * 2, bubble_bottom - static_cast<int>(kBlurRadius));
if (background_cache_.size() != total_rect.size()) {
const QColor highlight(palette().color(QPalette::Active, QPalette::Highlight));
@@ -101,9 +101,9 @@ void TrackSliderPopup::UpdatePixmap() {
const QColor bg_color_2(highlight.darker(120));
QPolygon pointy;
pointy << QPoint(total_rect.width()/2 - kPointWidth, bubble_bottom)
<< QPoint(total_rect.width()/2, total_rect.bottom() - kBlurRadius)
<< QPoint(total_rect.width()/2 + kPointWidth, bubble_bottom);
pointy << QPoint(total_rect.width() / 2 - kPointWidth, bubble_bottom)
<< QPoint(total_rect.width() / 2, total_rect.bottom() - static_cast<int>(kBlurRadius))
<< QPoint(total_rect.width() / 2 + kPointWidth, bubble_bottom);
QPolygon inner_pointy;
inner_pointy << QPoint(pointy[0].x() + 1, pointy[0].y() - 1)
@@ -178,5 +178,5 @@ void TrackSliderPopup::UpdatePixmap() {
}
void TrackSliderPopup::UpdatePosition() {
move(pos_.x() - pixmap_.width() / 2, pos_.y() - pixmap_.height() + kBlurRadius);
move(pos_.x() - pixmap_.width() / 2, pos_.y() - pixmap_.height() + static_cast<int>(kBlurRadius));
}

4
src/widgets/tracksliderslider.cpp
View File

@@ -104,7 +104,7 @@ void TrackSliderSlider::mouseMoveEvent(QMouseEvent *e) {
int slider_min = gr.x();
int slider_max = gr.right() - slider_length + 1;
mouse_hover_seconds_ = QStyle::sliderValueFromPosition(minimum() / kMsecPerSec, maximum() / kMsecPerSec, e->pos().x() - slider_length / 2 - slider_min + 1, slider_max - slider_min);
mouse_hover_seconds_ = QStyle::sliderValueFromPosition(minimum() / static_cast<int>(kMsecPerSec), maximum() / static_cast<int>(kMsecPerSec), e->pos().x() - slider_length / 2 - slider_min + 1, slider_max - slider_min);
#ifndef Q_OS_MACOS
popup_->SetText(Utilities::PrettyTime(mouse_hover_seconds_));
@@ -172,7 +172,7 @@ void TrackSliderSlider::UpdateDeltaTime() {
#ifndef Q_OS_MACOS
if (popup_->isVisible()) {
int delta_seconds = mouse_hover_seconds_ - (value() / kMsecPerSec);
int delta_seconds = mouse_hover_seconds_ - (value() / static_cast<int>(kMsecPerSec));
popup_->SetSmallText(Utilities::PrettyTimeDelta(delta_seconds));
}
#endif