jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2333 from jpark37/qt-warnings-5_14 

UI: Fix Qt 5.14 deprecation warnings
master
Jim 2020-01-20 22:51:10 -08:00 committed by GitHub
parent 632c08910d 263bf48baa
commit 5e377a9d62
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
UI/frontend-plugins/frontend-tools/output-timer.cpp
View File

@ -180,8 +180,8 @@ void OutputTimer::UpdateStreamTimerDisplay()
int minutes = (remainingTime % 3600) / 60;
int hours = remainingTime / 3600;
QString text;
text.sprintf("%02d:%02d:%02d", hours, minutes, seconds);
QString text =
QString::asprintf("%02d:%02d:%02d", hours, minutes, seconds);
ui->streamTime->setText(text);
}
@ -199,8 +199,8 @@ void OutputTimer::UpdateRecordTimerDisplay()
int minutes = (remainingTime % 3600) / 60;
int hours = remainingTime / 3600;
QString text;
text.sprintf("%02d:%02d:%02d", hours, minutes, seconds);
QString text =
QString::asprintf("%02d:%02d:%02d", hours, minutes, seconds);
ui->recordTime->setText(text);
}

8
UI/window-basic-settings.cpp
View File

@ -898,7 +898,7 @@ void OBSBasicSettings::LoadFormats()
audio ? AUDIO_STR : VIDEO_STR);
ui->advOutFFFormat->addItem(
itemText, qVariantFromValue(formatDesc));
itemText, QVariant::fromValue(formatDesc));
}
format = ff_format_desc_next(format);
@ -921,7 +921,7 @@ static void AddCodec(QComboBox *combo, const ff_codec_desc *codec_desc)
CodecDesc cd(ff_codec_desc_name(codec_desc),
ff_codec_desc_id(codec_desc));
combo->addItem(itemText, qVariantFromValue(cd));
combo->addItem(itemText, QVariant::fromValue(cd));
}
#define AV_ENCODER_DEFAULT_STR \
@ -937,7 +937,7 @@ static void AddDefaultCodec(QComboBox *combo, const ff_format_desc *formatDesc,
combo->removeItem(existingIdx);
combo->addItem(QString("%1 (%2)").arg(cd.name, AV_ENCODER_DEFAULT_STR),
qVariantFromValue(cd));
QVariant::fromValue(cd));
}
#define AV_ENCODER_DISABLE_STR \
@ -984,7 +984,7 @@ void OBSBasicSettings::ReloadCodecs(const ff_format_desc *formatDesc)
ui->advOutFFAEncoder->model()->sort(0);
ui->advOutFFVEncoder->model()->sort(0);
QVariant disable = qVariantFromValue(CodecDesc());
QVariant disable = QVariant::fromValue(CodecDesc());
ui->advOutFFAEncoder->insertItem(0, AV_ENCODER_DISABLE_STR, disable);
ui->advOutFFVEncoder->insertItem(0, AV_ENCODER_DISABLE_STR, disable);

6
UI/window-basic-stats.cpp
View File

@ -437,9 +437,9 @@ void OBSBasicStats::RecordingTimeLeft()
int minutes = totalMinutes % 60;
int hours = totalMinutes / 60;
QString text;
text.sprintf("%d %s, %d %s", hours, QT_TO_UTF8(QTStr("Hours")), minutes,
QT_TO_UTF8(QTStr("Minutes")));
QString text = QString::asprintf("%d %s, %d %s", hours,
QT_TO_UTF8(QTStr("Hours")), minutes,
QT_TO_UTF8(QTStr("Minutes")));
recordTimeLeft->setText(text);
recordTimeLeft->setMinimumWidth(recordTimeLeft->width());
}

7
UI/window-basic-status-bar.cpp
View File

@ -215,8 +215,8 @@ void OBSBasicStatusBar::UpdateStreamTime()
int minutes = totalMinutes % 60;
int hours = totalMinutes / 60;
QString text;
text.sprintf("LIVE: %02d:%02d:%02d", hours, minutes, seconds);
QString text = QString::asprintf("LIVE: %02d:%02d:%02d", hours, minutes,
seconds);
streamTime->setText(text);
streamTime->setMinimumWidth(streamTime->width());
@ -260,7 +260,8 @@ void OBSBasicStatusBar::UpdateRecordTime()
int minutes = totalMinutes % 60;
int hours = totalMinutes / 60;
text.sprintf("REC: %02d:%02d:%02d", hours, minutes, seconds);
text = QString::asprintf("REC: %02d:%02d:%02d", hours, minutes,
seconds);
}
recordTime->setText(text);