From 3d23446dcbd423696f72f2cb1ac699eac4b67ee7 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Tue, 3 Feb 2015 17:21:41 -0800 Subject: [PATCH] remove a couple more sprintfs --- interface/src/ui/ApplicationOverlay.cpp | 5 ++--- interface/src/ui/OctreeStatsDialog.cpp | 5 ++--- interface/src/ui/Stats.cpp | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/interface/src/ui/ApplicationOverlay.cpp b/interface/src/ui/ApplicationOverlay.cpp index 0eeac9a90e..6e95327165 100644 --- a/interface/src/ui/ApplicationOverlay.cpp +++ b/interface/src/ui/ApplicationOverlay.cpp @@ -929,14 +929,13 @@ void ApplicationOverlay::renderStatsAndLogs() { // Show on-screen msec timer if (Menu::getInstance()->isOptionChecked(MenuOption::FrameTimer)) { - char frameTimer[10]; quint64 mSecsNow = floor(usecTimestampNow() / 1000.0 + 0.5); - sprintf(frameTimer, "%d\n", (int)(mSecsNow % 1000)); + QString frameTimer = QString("%1\n").arg((int)(mSecsNow % 1000)); int timerBottom = (Menu::getInstance()->isOptionChecked(MenuOption::Stats)) ? 80 : 20; drawText(glCanvas->width() - 100, glCanvas->height() - timerBottom, - 0.30f, 0.0f, 0, frameTimer, WHITE_TEXT); + 0.30f, 0.0f, 0, frameTimer.toUtf8().constData(), WHITE_TEXT); } nodeBoundsDisplay.drawOverlay(); } diff --git a/interface/src/ui/OctreeStatsDialog.cpp b/interface/src/ui/OctreeStatsDialog.cpp index 44b7ea553e..d9c8124180 100644 --- a/interface/src/ui/OctreeStatsDialog.cpp +++ b/interface/src/ui/OctreeStatsDialog.cpp @@ -236,9 +236,8 @@ void OctreeStatsDialog::showOctreeServersOfType(int& serverCount, NodeType_t ser serverCount++; if (serverCount > _octreeServerLabelsCount) { - char label[128] = { 0 }; - sprintf(label, "%s Server %d", serverTypeName, serverCount); - int thisServerRow = _octreeServerLables[serverCount-1] = AddStatItem(label); + QString label = QString("%1 Server %2").arg(serverTypeName).arg(serverCount); + int thisServerRow = _octreeServerLables[serverCount-1] = AddStatItem(label.toUtf8().constData()); _labels[thisServerRow]->setTextFormat(Qt::RichText); _labels[thisServerRow]->setTextInteractionFlags(Qt::TextBrowserInteraction); connect(_labels[thisServerRow], SIGNAL(linkActivated(const QString&)), this, SLOT(moreless(const QString&))); diff --git a/interface/src/ui/Stats.cpp b/interface/src/ui/Stats.cpp index 4919f4fc62..05faf991b6 100644 --- a/interface/src/ui/Stats.cpp +++ b/interface/src/ui/Stats.cpp @@ -441,7 +441,7 @@ void Stats::display( if (_expanded) { SharedNodePointer avatarMixer = DependencyManager::get()->soloNodeOfType(NodeType::AvatarMixer); if (avatarMixer) { - avatarMixerStats = QString("Avatar Mixer: %1 kbps, %1 pps"). + avatarMixerStats = QString("Avatar Mixer: %1 kbps, %2 pps"). arg(roundf(bandwidthRecorder->getAverageInputKilobitsPerSecond(NodeType::AudioMixer) + bandwidthRecorder->getAverageOutputKilobitsPerSecond(NodeType::AudioMixer))). arg(roundf(bandwidthRecorder->getAverageInputPacketsPerSecond(NodeType::AudioMixer) +