whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

eglfs_kms: remove deprecated QString uses 

Fixes "warning: ‘QString::QString(const char*)’ is deprecated"

While we're here, make the locals const.

Change-Id: Iee70253a46f91937b93e06cc08cd361716cd669d
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
bb10
Andrew Knight 2015-03-09 12:56:40 +02:00 committed by Andrew Knight
parent 59495d180b
commit 0fce009f1c
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsintegration.cpp
View File

@ -223,25 +223,25 @@ void QEglFSKmsIntegration::loadConfig()
return;
}
QJsonDocument doc = QJsonDocument::fromJson(file.readAll());
const QJsonDocument doc = QJsonDocument::fromJson(file.readAll());
if (!doc.isObject()) {
qCDebug(qLcEglfsKmsDebug) << "Invalid config file" << json
<< "- no top-level JSON object";
return;
}
QJsonObject object = doc.object();
const QJsonObject object = doc.object();
m_hwCursor = object.value("hwcursor").toBool(m_hwCursor);
m_pbuffers = object.value("pbuffers").toBool(m_pbuffers);
m_devicePath = object.value("device").toString();
m_hwCursor = object.value(QStringLiteral("hwcursor")).toBool(m_hwCursor);
m_pbuffers = object.value(QStringLiteral("pbuffers")).toBool(m_pbuffers);
m_devicePath = object.value(QStringLiteral("device")).toString();
QJsonArray outputs = object.value("outputs").toArray();
const QJsonArray outputs = object.value(QStringLiteral("outputs")).toArray();
for (int i = 0; i < outputs.size(); i++) {
QVariantMap outputSettings = outputs.at(i).toObject().toVariantMap();
const QVariantMap outputSettings = outputs.at(i).toObject().toVariantMap();
if (outputSettings.contains("name")) {
QString name = outputSettings.value("name").toString();
if (outputSettings.contains(QStringLiteral("name"))) {
const QString name = outputSettings.value(QStringLiteral("name")).toString();
if (m_outputSettings.contains(name)) {
qCDebug(qLcEglfsKmsDebug) << "Output" << name << "configured multiple times!";