diff options
| author | Robert Adam <dev@robert-adam.de> | 2021-11-17 11:39:27 +0300 |
|---|---|---|
| committer | Robert Adam <dev@robert-adam.de> | 2022-03-22 20:28:26 +0300 |
| commit | b681d4d033ddc3b9219730c18074b3c811894fe3 (patch) | |
| tree | eb0398a758e50e54599f40202be3e1cea5e84af3 /src | |
| parent | 03a4c6706fd215afcb9c1216a50b473e543003ee (diff) | |
REFAC(client): Prefer std::min over qmin
Diffstat (limited to 'src')
| -rw-r--r-- | src/mumble/ConnectDialog.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/mumble/ConnectDialog.cpp b/src/mumble/ConnectDialog.cpp index e9f1eafb9..c45ac6c5e 100644 --- a/src/mumble/ConnectDialog.cpp +++ b/src/mumble/ConnectDialog.cpp @@ -35,6 +35,7 @@ #include <boost/array.hpp> #ifdef Q_OS_WIN +# define NOMINMAX # include <shlobj.h> #endif @@ -42,6 +43,8 @@ # include <QRandomGenerator> #endif +#include <algorithm> + QMap< QString, QIcon > ServerItem::qmIcons; QList< PublicInfo > ConnectDialog::qlPublicServers; QString ConnectDialog::qsUserCountry, ConnectDialog::qsUserCountryCode, ConnectDialog::qsUserContinentCode; @@ -478,7 +481,7 @@ QVariant ServerItem::data(int column, int role) const { double ploss = 100.0; if (uiSent > 0) - ploss = (uiSent - qMin(uiRecv, uiSent)) * 100. / uiSent; + ploss = (uiSent - std::min(uiRecv, uiSent)) * 100. / uiSent; QString qs; qs += QLatin1String("<table>") |