From 3edd218e3a498ea4c8adc9191ab906ce86f9cf3e Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Tue, 23 Apr 2024 01:58:08 +0200 Subject: [PATCH] Remove redundant casts --- ext/strawberry-tagreader/tagreaderworker.cpp | 6 +++--- src/analyzer/blockanalyzer.cpp | 20 ++++++++++---------- src/analyzer/boomanalyzer.cpp | 2 +- src/analyzer/fht.cpp | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/ext/strawberry-tagreader/tagreaderworker.cpp b/ext/strawberry-tagreader/tagreaderworker.cpp index e1df2353..b3520d8f 100644 --- a/ext/strawberry-tagreader/tagreaderworker.cpp +++ b/ext/strawberry-tagreader/tagreaderworker.cpp @@ -62,7 +62,7 @@ bool TagReaderWorker::HandleMessage(const spb::tagreader::Message &message, spb: return success; } else if (message.has_read_file_request()) { - const QString filename = QString::fromUtf8(message.read_file_request().filename().data(), static_cast(static_cast(message.read_file_request().filename().size()))); + const QString filename = QString::fromUtf8(message.read_file_request().filename().data(), static_cast(message.read_file_request().filename().size())); bool success = reader->ReadFile(filename, reply.mutable_read_file_response()->mutable_metadata()); return success; } @@ -72,7 +72,7 @@ bool TagReaderWorker::HandleMessage(const spb::tagreader::Message &message, spb: return success; } else if (message.has_load_embedded_art_request()) { - const QString filename = QString::fromUtf8(message.load_embedded_art_request().filename().data(), static_cast(static_cast(message.load_embedded_art_request().filename().size()))); + const QString filename = QString::fromUtf8(message.load_embedded_art_request().filename().data(), static_cast(message.load_embedded_art_request().filename().size())); QByteArray data = reader->LoadEmbeddedArt(filename); reply.mutable_load_embedded_art_response()->set_data(data.constData(), data.size()); return true; @@ -83,7 +83,7 @@ bool TagReaderWorker::HandleMessage(const spb::tagreader::Message &message, spb: return success; } else if (message.has_save_song_playcount_to_file_request()) { - const QString filename = QString::fromUtf8(message.save_song_playcount_to_file_request().filename().data(), static_cast(static_cast(message.save_song_playcount_to_file_request().filename().size()))); + const QString filename = QString::fromUtf8(message.save_song_playcount_to_file_request().filename().data(), static_cast(message.save_song_playcount_to_file_request().filename().size())); bool success = reader->SaveSongPlaycountToFile(filename, message.save_song_playcount_to_file_request().metadata()); reply.mutable_save_song_playcount_to_file_response()->set_success(success); return success; diff --git a/src/analyzer/blockanalyzer.cpp b/src/analyzer/blockanalyzer.cpp index 2d18b31b..1eda5d3e 100644 --- a/src/analyzer/blockanalyzer.cpp +++ b/src/analyzer/blockanalyzer.cpp @@ -266,12 +266,12 @@ QColor ensureContrast(const QColor &bg, const QColor &fg, int amount) { // value is the best measure of contrast // if there is enough difference in value already, return fg unchanged - if (dv > static_cast(amount)) return fg; + if (dv > amount) return fg; int ds = abs(bs - fs); // saturation is good enough too. But not as good. TODO adapt this a little - if (ds > static_cast(amount)) return fg; + if (ds > amount) return fg; int dh = abs(bh - fh); @@ -294,7 +294,7 @@ QColor ensureContrast(const QColor &bg, const QColor &fg, int amount) { // low saturation on a low saturation is sad const int tmp = 50 - fs; fs = 50; - if (static_cast(amount) > tmp) { + if (amount > tmp) { amount -= tmp; } else { @@ -310,25 +310,25 @@ QColor ensureContrast(const QColor &bg, const QColor &fg, int amount) { if (amount > 0) adjustToLimits(bs, fs, amount); // see if we need to adjust the hue - if (static_cast(amount) > 0) - fh += static_cast(amount); // cycles around; + if (amount > 0) + fh += amount; // cycles around; return QColor::fromHsv(fh, fs, fv); } - if (fv > bv && bv > static_cast(amount)) { - return QColor::fromHsv(fh, fs, bv - static_cast(amount)); + if (fv > bv && bv > amount) { + return QColor::fromHsv(fh, fs, bv - amount); } - if (fv < bv && fv > static_cast(amount)) { + if (fv < bv && fv > amount) { return QColor::fromHsv(fh, fs, fv - amount); } - if (fv > bv && (255 - fv > static_cast(amount))) { + if (fv > bv && (255 - fv > amount)) { return QColor::fromHsv(fh, fs, fv + amount); } - if (fv < bv && (255 - bv > static_cast(amount))) { + if (fv < bv && (255 - bv > amount)) { return QColor::fromHsv(fh, fs, bv + amount); } diff --git a/src/analyzer/boomanalyzer.cpp b/src/analyzer/boomanalyzer.cpp index 78021472..ad61a66a 100644 --- a/src/analyzer/boomanalyzer.cpp +++ b/src/analyzer/boomanalyzer.cpp @@ -78,7 +78,7 @@ void BoomAnalyzer::resizeEvent(QResizeEvent *e) { bands_ = qMin(static_cast(static_cast(width() + 1) / (kColumnWidth + 1)) + 1, kMaxBandCount); scope_.resize(bands_); - F_ = static_cast(HEIGHT) / (log10(256) * static_cast(1.1) /*<- max. amplitude*/); + F_ = static_cast(HEIGHT) / (log10(256) * 1.1 /*<- max. amplitude*/); barPixmap_ = QPixmap(kColumnWidth - 2, HEIGHT); canvas_ = QPixmap(size()); diff --git a/src/analyzer/fht.cpp b/src/analyzer/fht.cpp index cdbaa7e5..c73ec273 100644 --- a/src/analyzer/fht.cpp +++ b/src/analyzer/fht.cpp @@ -28,7 +28,7 @@ #include #include -FHT::FHT(uint n) : num_((n < 3) ? 0 : 1 << n), exp2_((n < 3) ? static_cast(-1) : static_cast(n)) { +FHT::FHT(uint n) : num_((n < 3) ? 0 : 1 << n), exp2_((n < 3) ? -1 : static_cast(n)) { if (n > 3) { buf_vector_.resize(num_);