Standardize on QString::toUtf8()
This commit is contained in:
parent
8c9c799f81
commit
792f762c15
4 changed files with 9 additions and 9 deletions
|
|
@ -389,7 +389,7 @@ NvHTTP::getXmlStringFromHex(QString xml,
|
||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
return QByteArray::fromHex(str.toLatin1());
|
return QByteArray::fromHex(str.toUtf8());
|
||||||
}
|
}
|
||||||
|
|
||||||
QString
|
QString
|
||||||
|
|
|
||||||
|
|
@ -184,7 +184,7 @@ NvPairingManager::signMessage(const QByteArray& message)
|
||||||
QByteArray
|
QByteArray
|
||||||
NvPairingManager::saltPin(const QByteArray& salt, QString pin)
|
NvPairingManager::saltPin(const QByteArray& salt, QString pin)
|
||||||
{
|
{
|
||||||
return QByteArray().append(salt).append(pin.toLatin1());
|
return QByteArray().append(salt).append(pin.toUtf8());
|
||||||
}
|
}
|
||||||
|
|
||||||
NvPairingManager::PairState
|
NvPairingManager::PairState
|
||||||
|
|
|
||||||
|
|
@ -1633,8 +1633,8 @@ bool Session::startConnectionAsync()
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
QByteArray hostnameStr = m_Computer->activeAddress.address().toLatin1();
|
QByteArray hostnameStr = m_Computer->activeAddress.address().toUtf8();
|
||||||
QByteArray siAppVersion = m_Computer->appVersion.toLatin1();
|
QByteArray siAppVersion = m_Computer->appVersion.toUtf8();
|
||||||
|
|
||||||
SERVER_INFORMATION hostInfo;
|
SERVER_INFORMATION hostInfo;
|
||||||
hostInfo.address = hostnameStr.data();
|
hostInfo.address = hostnameStr.data();
|
||||||
|
|
@ -1644,7 +1644,7 @@ bool Session::startConnectionAsync()
|
||||||
// Older GFE versions didn't have this field
|
// Older GFE versions didn't have this field
|
||||||
QByteArray siGfeVersion;
|
QByteArray siGfeVersion;
|
||||||
if (!m_Computer->gfeVersion.isEmpty()) {
|
if (!m_Computer->gfeVersion.isEmpty()) {
|
||||||
siGfeVersion = m_Computer->gfeVersion.toLatin1();
|
siGfeVersion = m_Computer->gfeVersion.toUtf8();
|
||||||
}
|
}
|
||||||
if (!siGfeVersion.isEmpty()) {
|
if (!siGfeVersion.isEmpty()) {
|
||||||
hostInfo.serverInfoGfeVersion = siGfeVersion.data();
|
hostInfo.serverInfoGfeVersion = siGfeVersion.data();
|
||||||
|
|
@ -1653,7 +1653,7 @@ bool Session::startConnectionAsync()
|
||||||
// Older GFE and Sunshine versions didn't have this field
|
// Older GFE and Sunshine versions didn't have this field
|
||||||
QByteArray rtspSessionUrlStr;
|
QByteArray rtspSessionUrlStr;
|
||||||
if (!rtspSessionUrl.isEmpty()) {
|
if (!rtspSessionUrl.isEmpty()) {
|
||||||
rtspSessionUrlStr = rtspSessionUrl.toLatin1();
|
rtspSessionUrlStr = rtspSessionUrl.toUtf8();
|
||||||
hostInfo.rtspSessionUrl = rtspSessionUrlStr.data();
|
hostInfo.rtspSessionUrl = rtspSessionUrlStr.data();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1635,7 +1635,7 @@ bool FFmpegVideoDecoder::initialize(PDECODER_PARAMETERS params)
|
||||||
{
|
{
|
||||||
QString h264DecoderHint = qgetenv("H264_DECODER_HINT");
|
QString h264DecoderHint = qgetenv("H264_DECODER_HINT");
|
||||||
if (!h264DecoderHint.isEmpty() && (params->videoFormat & VIDEO_FORMAT_MASK_H264)) {
|
if (!h264DecoderHint.isEmpty() && (params->videoFormat & VIDEO_FORMAT_MASK_H264)) {
|
||||||
QByteArray decoderString = h264DecoderHint.toLocal8Bit();
|
QByteArray decoderString = h264DecoderHint.toUtf8();
|
||||||
if (tryInitializeRendererForUnknownDecoder(avcodec_find_decoder_by_name(decoderString.constData()), params, true)) {
|
if (tryInitializeRendererForUnknownDecoder(avcodec_find_decoder_by_name(decoderString.constData()), params, true)) {
|
||||||
SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION,
|
SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION,
|
||||||
"Using custom H.264 decoder (H264_DECODER_HINT): %s",
|
"Using custom H.264 decoder (H264_DECODER_HINT): %s",
|
||||||
|
|
@ -1652,7 +1652,7 @@ bool FFmpegVideoDecoder::initialize(PDECODER_PARAMETERS params)
|
||||||
{
|
{
|
||||||
QString hevcDecoderHint = qgetenv("HEVC_DECODER_HINT");
|
QString hevcDecoderHint = qgetenv("HEVC_DECODER_HINT");
|
||||||
if (!hevcDecoderHint.isEmpty() && (params->videoFormat & VIDEO_FORMAT_MASK_H265)) {
|
if (!hevcDecoderHint.isEmpty() && (params->videoFormat & VIDEO_FORMAT_MASK_H265)) {
|
||||||
QByteArray decoderString = hevcDecoderHint.toLocal8Bit();
|
QByteArray decoderString = hevcDecoderHint.toUtf8();
|
||||||
if (tryInitializeRendererForUnknownDecoder(avcodec_find_decoder_by_name(decoderString.constData()), params, true)) {
|
if (tryInitializeRendererForUnknownDecoder(avcodec_find_decoder_by_name(decoderString.constData()), params, true)) {
|
||||||
SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION,
|
SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION,
|
||||||
"Using custom HEVC decoder (HEVC_DECODER_HINT): %s",
|
"Using custom HEVC decoder (HEVC_DECODER_HINT): %s",
|
||||||
|
|
@ -1669,7 +1669,7 @@ bool FFmpegVideoDecoder::initialize(PDECODER_PARAMETERS params)
|
||||||
{
|
{
|
||||||
QString av1DecoderHint = qgetenv("AV1_DECODER_HINT");
|
QString av1DecoderHint = qgetenv("AV1_DECODER_HINT");
|
||||||
if (!av1DecoderHint.isEmpty() && (params->videoFormat & VIDEO_FORMAT_MASK_AV1)) {
|
if (!av1DecoderHint.isEmpty() && (params->videoFormat & VIDEO_FORMAT_MASK_AV1)) {
|
||||||
QByteArray decoderString = av1DecoderHint.toLocal8Bit();
|
QByteArray decoderString = av1DecoderHint.toUtf8();
|
||||||
if (tryInitializeRendererForUnknownDecoder(avcodec_find_decoder_by_name(decoderString.constData()), params, true)) {
|
if (tryInitializeRendererForUnknownDecoder(avcodec_find_decoder_by_name(decoderString.constData()), params, true)) {
|
||||||
SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION,
|
SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION,
|
||||||
"Using custom AV1 decoder (AV1_DECODER_HINT): %s",
|
"Using custom AV1 decoder (AV1_DECODER_HINT): %s",
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue