Replace qMin,qMax,qBound,qRound,qAbs with standard funcs
#2236
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tsujan
reviewed
Feb 21, 2025
| @@ -77,7 +79,7 @@ CustomButton::~CustomButton() = default; | |||
| void CustomButton::wheelEvent(QWheelEvent *event) | |||
| { | |||
| QPoint anglePoint = event->angleDelta(); | |||
| bool horizontal(qAbs(event->angleDelta().x()) > qAbs(anglePoint.y())); | |||
| bool horizontal(std::abs(event->angleDelta().x()) > std::abs(anglePoint.y())); | |||
tsujan
reviewed
Feb 21, 2025
| @@ -86,7 +88,7 @@ void LXQtNetworkMonitorConfiguration::loadSettings() | |||
| ui->interfaceCB->addItem(QLatin1String(stats[ix].interface_name)); | |||
|
|
|||
| QString interface = settings().value(QStringLiteral("interface")).toString(); | |||
| ui->interfaceCB->setCurrentIndex(qMax(qMin(0, count - 1), ui->interfaceCB->findText(interface))); | |||
| ui->interfaceCB->setCurrentIndex(std::clamp(count - 1, ui->interfaceCB->findText(interface), 0)); | |||
There was a problem hiding this comment.
QComboBox::findText can be > 0, in which case, clamp will be undefined. So, min and max should be used.
tsujan
reviewed
Feb 21, 2025
| @@ -47,8 +49,8 @@ int AudioEngine::volumeBounded(int volume, AudioDevice* device) const | |||
| { | |||
| int maximum = volumeMax(device); | |||
| double v = ((double) volume / 100.0) * maximum; | |||
| double bounded = qBound<double>(0, v, maximum); | |||
| return qRound((bounded / maximum) * 100); | |||
| double bounded = std::clamp<double>(v, 0.0, maximum); | |||
There was a problem hiding this comment.
I hope maximum >= 0; it seems to be the case; doesn't it?
tsujan
reviewed
Feb 21, 2025
| @@ -215,7 +215,7 @@ void LXQtVolume::handleSinkListChanged() | |||
| { | |||
| if (m_engine->sinks().count() > 0) | |||
| { | |||
| m_defaultSink = m_engine->sinks().at(qBound(0, m_defaultSinkIndex, m_engine->sinks().count()-1)); | |||
| m_defaultSink = m_engine->sinks().at(std::clamp<qsizetype>(m_defaultSinkIndex, 0, m_engine->sinks().count()-1)); | |||
There was a problem hiding this comment.
What if m_engine->sinks().count() is 0? Is it possible here?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.