mirrors/mumble
2
0
Fork 0
mirror of https://github.com/mumble-voip/mumble.git synced 2025-10-26 11:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace some manual version conversions with appropriate MumbleVersion calls.

Browse Source
This commit is contained in:
Stefan Hacker 2011-07-31 02:57:29 +02:00
parent c99661dd55
commit f0c2bfd16a
4 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mumble/ConnectDialog.cpp
View File

@ -486,7 +486,7 @@ QVariant ServerItem::data(int column, int role) const {
arg(boost::accumulators::extended_p_square(* asQuantile)[2] / 1000., 0, 'f', 2)) +
QString::fromLatin1("<tr><th align=left>%1</th><td>%2</td></tr>").arg(ConnectDialog::tr("Bandwidth"), ConnectDialog::tr("%1 kbit/s").arg(uiBandwidth / 1000)) +
QString::fromLatin1("<tr><th align=left>%1</th><td>%2</td></tr>").arg(ConnectDialog::tr("Users"), QString::fromLatin1("%1/%2").arg(uiUsers).arg(uiMaxUsers)) +
QString::fromLatin1("<tr><th align=left>%1</th><td>%2.%3.%4</td></tr>").arg(ConnectDialog::tr("Version")).arg(uiVersion >> 16).arg((uiVersion >> 8) & 0xFF).arg(uiVersion & 0xFF);
QString::fromLatin1("<tr><th align=left>%1</th><td>%2</td></tr>").arg(ConnectDialog::tr("Version")).arg(MumbleVersion::toString(uiVersion));
}
}
qs += QLatin1String("</table>");

5
src/mumble/MainWindow.cpp
View File

@ -1079,10 +1079,7 @@ void MainWindow::on_qaServerInformation_triggered() {
CryptState &cs = c->csCrypt;
QSslCipher qsc = g.sh->qscCipher;
unsigned int version = g.sh->uiVersion;
QString qsVersion=tr("<h2>Version</h2><p>Protocol %1.%2.%3.</p>").arg(QString::number((version >> 16) & 0xFF),
QString::number((version >> 8) & 0xFF),
QString::number(version & 0xFF));
QString qsVersion=tr("<h2>Version</h2><p>Protocol %1.</p>").arg(MumbleVersion::toString(g.sh->uiVersion));
if (g.sh->qsRelease.isEmpty() || g.sh->qsOS.isEmpty() || g.sh->qsOSVersion.isEmpty()) {
qsVersion.append(tr("<p>No build information or OS version available.</p>"));

6
src/mumble/UserInformation.cpp
View File

@ -151,12 +151,8 @@ void UserInformation::update(const MumbleProto::UserStats &msg) {
showcon = true;
const MumbleProto::Version &mpv = msg.version();
unsigned int v = mpv.version();
unsigned int major = (v >> 16) & 0xFFFF;
unsigned int minor = (v >> 8) & 0xFF;
unsigned int patch = (v & 0xFF);
qlVersion->setText(tr("%1.%2.%3 (%4)").arg(major).arg(minor).arg(patch).arg(u8(mpv.release())));
qlVersion->setText(tr("%1 (%2)").arg(MumbleVersion::toString(mpv.version())).arg(u8(mpv.release())));
qlOS->setText(tr("%1 (%2)").arg(u8(mpv.os())).arg(u8(mpv.os_version())));
}
if (msg.celt_versions_size() > 0) {

4
src/murmur/Messages.cpp
View File

@ -39,6 +39,7 @@
#include "Server.h"
#include "ServerUser.h"
#include "DBus.h"
#include "Version.h"
#define MSG_SETUP(st) \
if (uSource->sState != st) { \
@ -1398,7 +1399,8 @@ void Server::msgVersion(ServerUser *uSource, MumbleProto::Version &msg) {
if (msg.has_os_version())
uSource->qsOSVersion = u8(msg.os_version());
}
log(uSource, QString("Client version %1.%2.%3 (%4: %5)").arg(uSource->uiVersion >> 16).arg((uSource->uiVersion >> 8) & 0xff).arg(uSource->uiVersion & 0xFF).arg(uSource->qsOS).arg(uSource->qsRelease));
log(uSource, QString("Client version %1 (%2: %3)").arg(MumbleVersion::toString(uSource->uiVersion)).arg(uSource->qsOS).arg(uSource->qsRelease));
}
void Server::msgUserList(ServerUser *uSource, MumbleProto::UserList &msg) {