Skip to content

Commit dd9895c

Browse files
Peter Karlssondotarmin
Peter Karlsson
authored andcommitted
Fixed issue with asprintf
1 parent f70d77f commit dd9895c

File tree

5 files changed

+20
-18
lines changed

5 files changed

+20
-18
lines changed

src/Common/Timecode.cpp

+5-6
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,14 @@ QString Timecode::fromTime(double time, double fps, bool useDropFrameNotation)
2020
int seconds;
2121
int frames;
2222

23-
QString smpteFormat;
24-
2523
hour = (int)(time / 3600);
2624
minutes = (int)((time - hour * 3600) / 60);
2725
seconds = (int)(time - hour * 3600 - minutes * 60);
2826
frames = (int)((time - hour * 3600 - minutes * 60 - seconds) * fps);
2927

30-
if (useDropFrameNotation)
31-
return smpteFormat.asprintf("%02d:%02d:%02d.%02d", hour, minutes, seconds, frames);
32-
else
33-
return smpteFormat.asprintf("%02d:%02d:%02d:%02d", hour, minutes, seconds, frames);
28+
return QString("%1%2%3%4%5").arg(hour, 2, 16)
29+
.arg(minutes, 2, 16)
30+
.arg(seconds, 2, 16)
31+
.arg(useDropFrameNotation ? "." : ":")
32+
.arg(frames, 2, 16);
3433
}

src/Core/Commands/SolidColorCommand.cpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,10 @@ const QString SolidColorCommand::getPremultipliedColor() const
2828
green = (green * alpha) / 255;
2929
blue = (blue * alpha) / 255;
3030

31-
QString color;
32-
return color.asprintf("#%02x%02x%02x%02x", alpha, red, green, blue);
31+
return QString("#%1%2%3%4").arg(alpha, 2, 16)
32+
.arg(red, 2, 16)
33+
.arg(green, 2, 16)
34+
.arg(blue, 2, 16);
3335
}
3436

3537
const QString& SolidColorCommand::getTransition() const

src/Panasonic/PtzDevice.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ void PtzDevice::selectPreset(const QString& address, int preset)
1717
QUrl request(QString("http://%1/cgi-bin/aw_ptz").arg(address));
1818

1919
QUrlQuery query;
20-
query.addQueryItem("cmd", QString("#R%1").arg(QString(preset).asprintf("%02d", preset)));
20+
query.addQueryItem("cmd", QString("#R%1").arg(preset, 2, 10));
2121
query.addQueryItem("res", "1");
2222

2323
request.setQuery(query);

src/Widgets/Inspector/InspectorSolidColorWidget.cpp

+5-4
Original file line numberDiff line numberDiff line change
@@ -123,11 +123,12 @@ void InspectorSolidColorWidget::colorDialogClicked()
123123

124124
if (dialog.exec() == QDialog::Accepted)
125125
{
126-
QString color;
127-
color.asprintf("#%02x%02x%02x%02x", dialog.selectedColor().alpha(), dialog.selectedColor().red(),
128-
dialog.selectedColor().green(), dialog.selectedColor().blue());
126+
QString color = QString("#%1%2%3%4").arg(dialog.selectedColor().alpha(), 2, 16)
127+
.arg(dialog.selectedColor().red(), 2, 16)
128+
.arg(dialog.selectedColor().green(), 2, 16)
129+
.arg(dialog.selectedColor().blue(), 2, 16);
129130

130-
this->lineEditColor->setText(color);
131+
this->lineEditColor->setText(color.toUpper());
131132
}
132133
}
133134

src/Widgets/Rundown/RundownTreeBaseWidget.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -310,18 +310,18 @@ void RundownTreeBaseWidget::removeAllItems()
310310
AbstractRundownWidget* widget = dynamic_cast<AbstractRundownWidget*>(QTreeWidget::itemWidget(item, 0));
311311
if (widget->isGroup())
312312
{
313-
for (int i = item->childCount() - 1; i >= 0; i--)
313+
for (int j = item->childCount() - 1; j >= 0; j--)
314314
{
315-
QWidget* childWidget = QTreeWidget::itemWidget(item->child(i), 0);
315+
QWidget* childWidget = QTreeWidget::itemWidget(item->child(j), 0);
316316

317317
// Remove our items from the auto play queue if it exists.
318-
EventManager::getInstance().fireRemoveItemFromAutoPlayQueueEvent(RemoveItemFromAutoPlayQueueEvent(item->child(i)));
318+
EventManager::getInstance().fireRemoveItemFromAutoPlayQueueEvent(RemoveItemFromAutoPlayQueueEvent(item->child(j)));
319319

320320
// Clear current playing item.
321-
EventManager::getInstance().fireClearCurrentPlayingItemEvent(ClearCurrentPlayingItemEvent(item->child(i)));
321+
EventManager::getInstance().fireClearCurrentPlayingItemEvent(ClearCurrentPlayingItemEvent(item->child(j)));
322322

323323
delete childWidget;
324-
delete item->child(i);
324+
delete item->child(j);
325325
}
326326
}
327327

0 commit comments

Comments
 (0)